From 37b6b7ba4fa2a64e15f8cf127ea83ec6662bed70 Mon Sep 17 00:00:00 2001 From: brooketopcoder Date: Tue, 29 Mar 2022 17:45:07 -0700 Subject: [PATCH 1/4] PROD-1075 #comment update layout; #time 3h --- .../content-layout/ContentLayout.module.scss | 2 -- src/lib/content-layout/ContentLayout.tsx | 3 +- src/lib/styles/_cards.scss | 1 + src/utils/settings/Settings.module.scss | 6 +++- src/utils/settings/Settings.tsx | 13 +++---- .../settings/profile-settings-background.svg | 36 +++++++------------ 6 files changed, 28 insertions(+), 33 deletions(-) diff --git a/src/lib/content-layout/ContentLayout.module.scss b/src/lib/content-layout/ContentLayout.module.scss index c644e9e2f..758a18b42 100644 --- a/src/lib/content-layout/ContentLayout.module.scss +++ b/src/lib/content-layout/ContentLayout.module.scss @@ -4,7 +4,6 @@ @include content-height; padding: 0; display: grid; - background-color: $tc-white; grid-template-columns: 1fr; justify-content: center; @@ -14,7 +13,6 @@ .content-inner { flex: 1; - background-color: $tc-white; max-width: $xl-max-content; padding: 0; } diff --git a/src/lib/content-layout/ContentLayout.tsx b/src/lib/content-layout/ContentLayout.tsx index 666b463bc..100be616a 100644 --- a/src/lib/content-layout/ContentLayout.tsx +++ b/src/lib/content-layout/ContentLayout.tsx @@ -7,6 +7,7 @@ import styles from './ContentLayout.module.scss' export interface ContentLayoutProps { children?: ReactNode + contentClass?: string title: string titleClass?: string } @@ -14,7 +15,7 @@ export interface ContentLayoutProps { const ContentLayout: FC = (props: ContentLayoutProps) => { return ( -
+
diff --git a/src/lib/styles/_cards.scss b/src/lib/styles/_cards.scss index 39a362570..59974a203 100644 --- a/src/lib/styles/_cards.scss +++ b/src/lib/styles/_cards.scss @@ -9,6 +9,7 @@ .card-title { @include font-weight-semi-bold; + @include font-barlow; text-transform: uppercase; } } \ No newline at end of file diff --git a/src/utils/settings/Settings.module.scss b/src/utils/settings/Settings.module.scss index c95087225..152255883 100644 --- a/src/utils/settings/Settings.module.scss +++ b/src/utils/settings/Settings.module.scss @@ -1,5 +1,9 @@ -.page-header { +.content { background: url('./profile-settings-background.svg'); + background-size: 100% 100%; +} + +.page-header { padding: 48px 180px; h1 { diff --git a/src/utils/settings/Settings.tsx b/src/utils/settings/Settings.tsx index 4d2cd170e..345e03b6d 100644 --- a/src/utils/settings/Settings.tsx +++ b/src/utils/settings/Settings.tsx @@ -31,6 +31,7 @@ const Settings: FC<{}> = () => { return ( @@ -51,15 +52,15 @@ const Settings: FC<{}> = () => {
- - Basic Information - +
+ Basic Information +
- - Reset Password - +
+ Reset Password +
diff --git a/src/utils/settings/profile-settings-background.svg b/src/utils/settings/profile-settings-background.svg index f81063e50..bfbcfd36e 100644 --- a/src/utils/settings/profile-settings-background.svg +++ b/src/utils/settings/profile-settings-background.svg @@ -1,24 +1,14 @@ - - - - - - - - + + + + + + + + From 80dfff45b8da362f4600b87f06ee3bf31d7459c5 Mon Sep 17 00:00:00 2001 From: brooketopcoder Date: Tue, 29 Mar 2022 17:48:32 -0700 Subject: [PATCH 2/4] PROD-1075 #comment clean-up #time 5m --- src/lib/styles/_cards.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/styles/_cards.scss b/src/lib/styles/_cards.scss index 59974a203..dbf27fef6 100644 --- a/src/lib/styles/_cards.scss +++ b/src/lib/styles/_cards.scss @@ -12,4 +12,4 @@ @include font-barlow; text-transform: uppercase; } -} \ No newline at end of file +} From d74be3f3b5dd20fb676a5a541563abe8ad990306 Mon Sep 17 00:00:00 2001 From: brooketopcoder Date: Wed, 30 Mar 2022 10:13:58 -0700 Subject: [PATCH 3/4] PROD-1075 #comment PR comments #time 10m --- .../ProfileSelector/ProfileSelector.tsx | 3 ++- .../profile-logged-in/ProfileLoggedIn.tsx | 13 +++++++++++-- .../profile-panel/ProfilePanel.tsx | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/header/utility-selectors/UtilitySelector/ProfileSelector/ProfileSelector.tsx b/src/header/utility-selectors/UtilitySelector/ProfileSelector/ProfileSelector.tsx index 6758ec4f7..909168150 100644 --- a/src/header/utility-selectors/UtilitySelector/ProfileSelector/ProfileSelector.tsx +++ b/src/header/utility-selectors/UtilitySelector/ProfileSelector/ProfileSelector.tsx @@ -1,5 +1,6 @@ import { FC, useContext } from 'react' +import { SETTINGS_TITLE } from '../../../../config' import { profileContext, ProfileContextData } from '../../../../lib' import '../../../../lib/styles/index.scss' @@ -23,7 +24,7 @@ const ProfileSelector: FC<{}> = () => { return (
{!isLoggedIn && } - {isLoggedIn && } + {isLoggedIn && }
) } diff --git a/src/header/utility-selectors/UtilitySelector/ProfileSelector/profile-logged-in/ProfileLoggedIn.tsx b/src/header/utility-selectors/UtilitySelector/ProfileSelector/profile-logged-in/ProfileLoggedIn.tsx index 8c5ed4118..59c01a6af 100644 --- a/src/header/utility-selectors/UtilitySelector/ProfileSelector/profile-logged-in/ProfileLoggedIn.tsx +++ b/src/header/utility-selectors/UtilitySelector/ProfileSelector/profile-logged-in/ProfileLoggedIn.tsx @@ -11,7 +11,11 @@ import { import { ProfilePanel } from './profile-panel' import styles from './ProfileLoggedIn.module.scss' -const ProfileLoggedIn: FC<{}> = () => { +interface ProfileLoggedInProps { + settingsTitle: string +} + +const ProfileLoggedIn: FC = (props: ProfileLoggedInProps) => { const { profile }: ProfileContextData = useContext(profileContext) const [profilePanelOpen, setProfilePanelOpen]: [boolean, Dispatch>] = useState(false) @@ -41,7 +45,12 @@ const ProfileLoggedIn: FC<{}> = () => {
)}
- {profilePanelOpen && } + {profilePanelOpen && ( + + )} ) } diff --git a/src/header/utility-selectors/UtilitySelector/ProfileSelector/profile-logged-in/profile-panel/ProfilePanel.tsx b/src/header/utility-selectors/UtilitySelector/ProfileSelector/profile-logged-in/profile-panel/ProfilePanel.tsx index e76f1dcb8..a6af31c73 100644 --- a/src/header/utility-selectors/UtilitySelector/ProfileSelector/profile-logged-in/profile-panel/ProfilePanel.tsx +++ b/src/header/utility-selectors/UtilitySelector/ProfileSelector/profile-logged-in/profile-panel/ProfilePanel.tsx @@ -1,7 +1,6 @@ import { FC, useContext } from 'react' import { Link } from 'react-router-dom' -import { SETTINGS_TITLE } from '../../../../../../config' import { authUrlLogout, profileContext, @@ -13,6 +12,7 @@ import { import styles from './ProfilePanel.module.scss' interface ProfilePanelProps { + settingsTitle: string toggleProfilePanel: () => void } @@ -34,9 +34,9 @@ const ProfilePanel: FC = (props: ProfilePanelProps) => { props.toggleProfilePanel()} - to={getPath(SETTINGS_TITLE)} + to={getPath(props.settingsTitle)} > - {SETTINGS_TITLE} + {props.settingsTitle} Log Out From 9b55a02a7898058504184e16a4a701e6392d5dd6 Mon Sep 17 00:00:00 2001 From: brooketopcoder Date: Wed, 30 Mar 2022 12:02:56 -0700 Subject: [PATCH 4/4] PROD-1070 #comment profile settings bg #time 10m --- .../settings/profile-settings-background.svg | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/utils/settings/profile-settings-background.svg b/src/utils/settings/profile-settings-background.svg index bfbcfd36e..f890f36be 100644 --- a/src/utils/settings/profile-settings-background.svg +++ b/src/utils/settings/profile-settings-background.svg @@ -1,12 +1,13 @@ - - + + - +