Skip to content
Snippets Groups Projects
Unverified Commit 58e32cfa authored by Douglas Fabris's avatar Douglas Fabris Committed by GitHub
Browse files

Chore: Settings UI issue (#26053)

parent bef0b2dc
No related branches found
No related tags found
No related merge requests found
...@@ -80,10 +80,10 @@ const UserCard = forwardRef(function UserCard( ...@@ -80,10 +80,10 @@ const UserCard = forwardRef(function UserCard(
)} )}
</Box> </Box>
<Box display='flex' flexDirection='column' flexGrow={1} flexShrink={1} mis='x24' width='1px'> <Box display='flex' flexDirection='column' flexGrow={1} flexShrink={1} mis='x24' width='1px'>
<Box mbe='x4' withTruncatedText display='flex'> <Box mbe='x4' withTruncatedText display='flex' alignItems='center'>
{!name ? <Skeleton width='100%' /> : <UserCardUsername status={status} name={name} />} {!name ? <Skeleton width='100%' /> : <UserCardUsername status={status} name={name} />}
{nickname && ( {nickname && (
<Box flexGrow={1} flexShrink={1} flexBasis={0} title={t('Nickname')} color='hint' mis='x4' fontScale='p2' withTruncatedText> <Box flexGrow={1} flexShrink={1} flexBasis={0} title={nickname} color='hint' mis='x4' fontScale='p2' withTruncatedText>
({nickname}) ({nickname})
</Box> </Box>
)} )}
......
...@@ -44,9 +44,7 @@ const SettingsGroupCard = ({ id, title, description }: SettingsGroupCard): React ...@@ -44,9 +44,7 @@ const SettingsGroupCard = ({ id, title, description }: SettingsGroupCard): React
</Box> </Box>
</Card.Body> </Card.Body>
<Card.Footer> <Card.Footer>
<Button small onClick={handleOpenGroup}> <Button onClick={handleOpenGroup}>{t('Open')}</Button>
{t('Open')}
</Button>
</Card.Footer> </Card.Footer>
</Card> </Card>
); );
......
...@@ -26,7 +26,7 @@ const SettingsPage = (): ReactElement => { ...@@ -26,7 +26,7 @@ const SettingsPage = (): ReactElement => {
<Page.ScrollableContentWithShadow p='0'> <Page.ScrollableContentWithShadow p='0'>
{isLoadingGroups && <Skeleton />} {isLoadingGroups && <Skeleton />}
<Grid mi='x16'> <Grid mi='x16' mbe='x18'>
{!isLoadingGroups && {!isLoadingGroups &&
!!groups.length && !!groups.length &&
groups.map((group) => ( groups.map((group) => (
......
...@@ -195,29 +195,29 @@ ...@@ -195,29 +195,29 @@
"@rocket.chat/api-client": "workspace:^", "@rocket.chat/api-client": "workspace:^",
"@rocket.chat/apps-engine": "alpha", "@rocket.chat/apps-engine": "alpha",
"@rocket.chat/core-typings": "workspace:^", "@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "~0.31.12", "@rocket.chat/css-in-js": "~0.31.14",
"@rocket.chat/emitter": "~0.31.12", "@rocket.chat/emitter": "~0.31.14",
"@rocket.chat/favicon": "workspace:^", "@rocket.chat/favicon": "workspace:^",
"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1", "@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1",
"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2", "@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2",
"@rocket.chat/fuselage": "^0.31.14", "@rocket.chat/fuselage": "~0.31.14",
"@rocket.chat/fuselage-hooks": "~0.31.14-dev.9", "@rocket.chat/fuselage-hooks": "~0.31.14",
"@rocket.chat/fuselage-polyfills": "~0.31.12", "@rocket.chat/fuselage-polyfills": "~0.31.14",
"@rocket.chat/fuselage-toastbar": "^0.32.0-dev.22", "@rocket.chat/fuselage-toastbar": "~0.31.14",
"@rocket.chat/fuselage-tokens": "^0.32.0-dev.9", "@rocket.chat/fuselage-tokens": "~0.31.14",
"@rocket.chat/fuselage-ui-kit": "~0.32.0-dev.15", "@rocket.chat/fuselage-ui-kit": "~0.32.0-dev.15",
"@rocket.chat/gazzodown": "workspace:^", "@rocket.chat/gazzodown": "workspace:^",
"@rocket.chat/icons": "~0.31.14", "@rocket.chat/icons": "~0.31.14",
"@rocket.chat/logo": "~0.31.12", "@rocket.chat/logo": "~0.31.14",
"@rocket.chat/memo": "~0.31.12", "@rocket.chat/memo": "~0.31.14",
"@rocket.chat/message-parser": "next", "@rocket.chat/message-parser": "~0.31.14",
"@rocket.chat/model-typings": "workspace:^", "@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^", "@rocket.chat/models": "workspace:^",
"@rocket.chat/mp3-encoder": "^0.24.0", "@rocket.chat/mp3-encoder": "^0.24.0",
"@rocket.chat/onboarding-ui": "~0.31.12", "@rocket.chat/onboarding-ui": "~0.31.14",
"@rocket.chat/poplib": "workspace:^", "@rocket.chat/poplib": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^", "@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "~0.31.12", "@rocket.chat/string-helpers": "~0.31.14",
"@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-client": "workspace:^",
"@rocket.chat/ui-contexts": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^",
"@rocket.chat/ui-kit": "~0.32.0-dev.0", "@rocket.chat/ui-kit": "~0.32.0-dev.0",
......
...@@ -78,7 +78,7 @@ export class SetupWizard extends BasePage { ...@@ -78,7 +78,7 @@ export class SetupWizard extends BasePage {
} }
get standaloneServer(): Locator { get standaloneServer(): Locator {
return this.page.locator('//button[contains(text(), "Continue as standalone")]'); return this.page.locator('//a[contains(text(), "Continue as standalone")]');
} }
get standaloneConfirmText(): Locator { get standaloneConfirmText(): Locator {
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
"@babel/core": "^7.18.5", "@babel/core": "^7.18.5",
"@mdx-js/react": "^1.6.22", "@mdx-js/react": "^1.6.22",
"@rocket.chat/core-typings": "workspace:^", "@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "^0.31.13", "@rocket.chat/css-in-js": "^0.31.14",
"@rocket.chat/fuselage": "next", "@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-tokens": "^0.31.13", "@rocket.chat/fuselage-tokens": "^0.31.14",
"@rocket.chat/message-parser": "next", "@rocket.chat/message-parser": "next",
"@rocket.chat/styled": "^0.31.13", "@rocket.chat/styled": "^0.31.14",
"@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-client": "workspace:^",
"@rocket.chat/ui-contexts": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^",
"@storybook/addon-actions": "^6.5.9", "@storybook/addon-actions": "^6.5.9",
...@@ -62,10 +62,11 @@ ...@@ -62,10 +62,11 @@
], ],
"peerDependencies": { "peerDependencies": {
"@rocket.chat/core-typings": "workspace:^", "@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "*",
"@rocket.chat/fuselage": "*", "@rocket.chat/fuselage": "*",
"@rocket.chat/fuselage-tokens": "^0.31.13", "@rocket.chat/fuselage-tokens": "*",
"@rocket.chat/message-parser": "*", "@rocket.chat/message-parser": "*",
"@rocket.chat/styled": "^0.31.13", "@rocket.chat/styled": "*",
"@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-client": "workspace:^",
"@rocket.chat/ui-contexts": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^",
"katex": "*", "katex": "*",
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
"devDependencies": { "devDependencies": {
"@babel/preset-env": "^7.11.5", "@babel/preset-env": "^7.11.5",
"@rocket.chat/eslint-config": "^0.4.0", "@rocket.chat/eslint-config": "^0.4.0",
"@rocket.chat/fuselage-tokens": "~0.31.14",
"@rocket.chat/logo": "~0.31.14",
"@storybook/addon-actions": "^6.5.8", "@storybook/addon-actions": "^6.5.8",
"@storybook/addon-backgrounds": "^6.5.8", "@storybook/addon-backgrounds": "^6.5.8",
"@storybook/addon-essentials": "^6.5.8", "@storybook/addon-essentials": "^6.5.8",
...@@ -78,9 +80,11 @@ ...@@ -78,9 +80,11 @@
"webpack-cli": "^3.3.12", "webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0" "webpack-dev-server": "^3.11.0"
}, },
"peerDependencies": {
"@rocket.chat/fuselage-tokens": "*",
"@rocket.chat/logo": "*"
},
"dependencies": { "dependencies": {
"@rocket.chat/fuselage-tokens": "~0.31.11",
"@rocket.chat/logo": "^0.31.11",
"@rocket.chat/sdk": "^1.0.0-alpha.42", "@rocket.chat/sdk": "^1.0.0-alpha.42",
"@rocket.chat/ui-kit": "^0.14.1", "@rocket.chat/ui-kit": "^0.14.1",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment