From a9e66f271af9ef6c28f3a0a48eb3f99e7a93a6af Mon Sep 17 00:00:00 2001 From: zanivan Date: Mon, 21 Aug 2023 18:01:09 -0300 Subject: [PATCH 01/22] Tweaks to sidebar --- .../profile-dashboard/components/Header.tsx | 1 - .../profile-dashboard/components/Sidebar.tsx | 48 +++++++++---------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/docs/data/joy/getting-started/templates/profile-dashboard/components/Header.tsx b/docs/data/joy/getting-started/templates/profile-dashboard/components/Header.tsx index 746e72e993fe86..f8e8cdb9ffd023 100644 --- a/docs/data/joy/getting-started/templates/profile-dashboard/components/Header.tsx +++ b/docs/data/joy/getting-started/templates/profile-dashboard/components/Header.tsx @@ -20,7 +20,6 @@ export default function Header() { py: 1, px: 2, gap: 1, - boxShadow: 'sm', }} > ({ color: theme.vars.palette.text.tertiary, @@ -72,7 +74,6 @@ export default function Sidebar() { left: 0, width: '100vw', height: '100vh', - opacity: 'calc(var(--SideNavigation-slideIn, 0) - 0.2)', transition: 'opacity 0.4s', transform: { @@ -84,7 +85,7 @@ export default function Sidebar() { /> - MUI + MUI } placeholder="Search" /> @@ -98,10 +99,10 @@ export default function Sidebar() { }} > @@ -159,9 +160,7 @@ export default function Sidebar() { - - My Profile - + My Profile New user @@ -173,11 +172,13 @@ export default function Sidebar() { @@ -198,35 +199,32 @@ export default function Sidebar() { - - Used space - + + Used space + + + + Your team has used 80% of your available space. Need more? - - - - Upgrade plan - - - Dismiss - - + + - + - - Siriwat K. - + Siriwat K. siriwatk@test.com From 168cd8fed0b202ea0c0e218efaf2333f37e9f3c9 Mon Sep 17 00:00:00 2001 From: zanivan Date: Mon, 21 Aug 2023 18:01:27 -0300 Subject: [PATCH 02/22] Removed unnecessary imports --- .../templates/profile-dashboard/components/Sidebar.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/data/joy/getting-started/templates/profile-dashboard/components/Sidebar.tsx b/docs/data/joy/getting-started/templates/profile-dashboard/components/Sidebar.tsx index 79cce7d858c704..6415666c2d569e 100644 --- a/docs/data/joy/getting-started/templates/profile-dashboard/components/Sidebar.tsx +++ b/docs/data/joy/getting-started/templates/profile-dashboard/components/Sidebar.tsx @@ -9,7 +9,6 @@ import Card from '@mui/joy/Card'; import Divider from '@mui/joy/Divider'; import IconButton from '@mui/joy/IconButton'; import Input from '@mui/joy/Input'; -import Link from '@mui/joy/Link'; import LinearProgress from '@mui/joy/LinearProgress'; import List from '@mui/joy/List'; import ListItem from '@mui/joy/ListItem'; From f252f5323d061278563ed65b70f807b6a5454b99 Mon Sep 17 00:00:00 2001 From: zanivan Date: Mon, 21 Aug 2023 18:22:17 -0300 Subject: [PATCH 03/22] Tweaks to field sizes and styles --- .../components/CountrySelector.tsx | 1 + .../components/EditorToolbar.tsx | 10 ++++---- .../components/FileUpload.tsx | 12 ++++++---- .../components/MyProfile.tsx | 24 +++++++++---------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/docs/data/joy/getting-started/templates/profile-dashboard/components/CountrySelector.tsx b/docs/data/joy/getting-started/templates/profile-dashboard/components/CountrySelector.tsx index c55a76bc6f1eb0..ffad77fc4fccae 100644 --- a/docs/data/joy/getting-started/templates/profile-dashboard/components/CountrySelector.tsx +++ b/docs/data/joy/getting-started/templates/profile-dashboard/components/CountrySelector.tsx @@ -15,6 +15,7 @@ export default function ContrySelector({ sx, ...props }: FormControlProps) { > Country option.code === value.code} defaultValue={{ code: 'TH', label: 'Thailand', phone: '66' }} diff --git a/docs/data/joy/getting-started/templates/profile-dashboard/components/EditorToolbar.tsx b/docs/data/joy/getting-started/templates/profile-dashboard/components/EditorToolbar.tsx index 69d9f489923f9d..a10ecbb80f28e8 100644 --- a/docs/data/joy/getting-started/templates/profile-dashboard/components/EditorToolbar.tsx +++ b/docs/data/joy/getting-started/templates/profile-dashboard/components/EditorToolbar.tsx @@ -14,22 +14,22 @@ export default function EditorToolbar({ sx, ...props }: BoxProps) { ...(Array.isArray(sx) ? sx : [sx]), ]} > - - + - + - + - + diff --git a/docs/data/joy/getting-started/templates/profile-dashboard/components/FileUpload.tsx b/docs/data/joy/getting-started/templates/profile-dashboard/components/FileUpload.tsx index 7f50326288d249..67455ffe704342 100644 --- a/docs/data/joy/getting-started/templates/profile-dashboard/components/FileUpload.tsx +++ b/docs/data/joy/getting-started/templates/profile-dashboard/components/FileUpload.tsx @@ -29,9 +29,6 @@ export default function FileUpload({ { gap: 1.5, alignItems: 'flex-start', - ...(progress >= 100 && { - borderColor: 'primary.500', - }), }, ...(Array.isArray(sx) ? sx : [sx]), ]} @@ -55,8 +52,13 @@ export default function FileUpload({ = 100 && { + color: 'var(--joy-palette-success-solidBg)', + }), + }, + ]} /> {progress}% diff --git a/docs/data/joy/getting-started/templates/profile-dashboard/components/MyProfile.tsx b/docs/data/joy/getting-started/templates/profile-dashboard/components/MyProfile.tsx index 189aebbd33b1d6..43ca8a33dea423 100644 --- a/docs/data/joy/getting-started/templates/profile-dashboard/components/MyProfile.tsx +++ b/docs/data/joy/getting-started/templates/profile-dashboard/components/MyProfile.tsx @@ -31,7 +31,7 @@ export default function MyProfile() { mx: 'auto', }} > - + My profile @@ -48,17 +48,12 @@ export default function MyProfile() { position: 'relative', zIndex: 1, height: 'var(--_shadow-height)', - background: - 'radial-gradient(closest-side, rgba(0 0 0 / 0.12), transparent 100%)', }, }} /> ({ - '--Chip-minHeight': '20px', - '--ListItem-minHeight': '48px', top: 'calc(-1 * (var(--main-paddingTop, 0px) - var(--Header-height, 0px)))', zIndex: 10, width: '100%', @@ -75,9 +70,6 @@ export default function MyProfile() { flex: 'none', zIndex: 1, right: 0, - borderBottom: '1px solid transparent', - background: `linear-gradient(to left, ${theme.vars.palette.background.body}, rgb(0 0 0 / 0))`, - backgroundClip: 'content-box', }, '&::-webkit-scrollbar': { width: 0, @@ -151,17 +143,18 @@ export default function MyProfile() { First name - + Last name - + Email } placeholder="email" @@ -191,14 +184,18 @@ export default function MyProfile() { Role - + Timezone - } + defaultValue="1" + >