From dd89cfa662922e7f0112524cbd32a22e9f29e267 Mon Sep 17 00:00:00 2001 From: Tomasz 'Tom' Kandula Date: Fri, 24 May 2024 23:23:26 +0200 Subject: [PATCH 1/5] feat: restyle --- .../Articles/ArticleFeature/View/articleFeatureView.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TokanPages.ClientApp/src/Components/Articles/ArticleFeature/View/articleFeatureView.tsx b/TokanPages.ClientApp/src/Components/Articles/ArticleFeature/View/articleFeatureView.tsx index aa38317ea..02644bbb5 100644 --- a/TokanPages.ClientApp/src/Components/Articles/ArticleFeature/View/articleFeatureView.tsx +++ b/TokanPages.ClientApp/src/Components/Articles/ArticleFeature/View/articleFeatureView.tsx @@ -55,7 +55,7 @@ export const ArticleFeatureView = (): JSX.Element => { - + {features?.isLoading ? ( @@ -63,7 +63,7 @@ export const ArticleFeatureView = (): JSX.Element => { features?.content?.text1 )} - + {features?.isLoading ? ( @@ -72,7 +72,7 @@ export const ArticleFeatureView = (): JSX.Element => { )} - + {features?.isLoading ? ( ) : ( From 4ab8f19454612053a875d4ba661e129ef3b8a5c7 Mon Sep 17 00:00:00 2001 From: Tomasz 'Tom' Kandula Date: Fri, 24 May 2024 23:43:25 +0200 Subject: [PATCH 2/5] feat: add new property for the remote content --- .../src/Api/Models/Components/headerContentDto.ts | 1 + TokanPages.ClientApp/src/Store/Defaults/Content/contentHeader.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/TokanPages.ClientApp/src/Api/Models/Components/headerContentDto.ts b/TokanPages.ClientApp/src/Api/Models/Components/headerContentDto.ts index 188000dd4..4045317a3 100644 --- a/TokanPages.ClientApp/src/Api/Models/Components/headerContentDto.ts +++ b/TokanPages.ClientApp/src/Api/Models/Components/headerContentDto.ts @@ -5,6 +5,7 @@ export interface HeaderContentDto { language: string; photo: string; caption: string; + subtitle: string; description: string; action: LinkDto; }; diff --git a/TokanPages.ClientApp/src/Store/Defaults/Content/contentHeader.ts b/TokanPages.ClientApp/src/Store/Defaults/Content/contentHeader.ts index aa2ebedd3..df8433430 100644 --- a/TokanPages.ClientApp/src/Store/Defaults/Content/contentHeader.ts +++ b/TokanPages.ClientApp/src/Store/Defaults/Content/contentHeader.ts @@ -6,6 +6,7 @@ export const ContentHeader: ContentHeaderState = { language: "", photo: "", caption: "", + subtitle: "", description: "", action: { text: "", From 722b9c955db6bbed3e22a25face51d591d16fea7 Mon Sep 17 00:00:00 2001 From: Tomasz 'Tom' Kandula Date: Fri, 24 May 2024 23:43:41 +0200 Subject: [PATCH 3/5] feat: add subtitle, restyle --- .../src/Components/Layout/Header/headerStyle.tsx | 16 ++++++++++++++-- .../src/Components/Layout/Header/headerView.tsx | 7 +++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/TokanPages.ClientApp/src/Components/Layout/Header/headerStyle.tsx b/TokanPages.ClientApp/src/Components/Layout/Header/headerStyle.tsx index 43e898209..4a48e3f78 100644 --- a/TokanPages.ClientApp/src/Components/Layout/Header/headerStyle.tsx +++ b/TokanPages.ClientApp/src/Components/Layout/Header/headerStyle.tsx @@ -11,6 +11,7 @@ export const HeaderStyle = makeStyles(theme => ({ }, content_box: { marginTop: "auto", + marginRight: 30, paddingTop: 60, paddingBottom: 60, paddingLeft: 80, @@ -27,15 +28,26 @@ export const HeaderStyle = makeStyles(theme => ({ maxWidth: 900, padding: 15, marginLeft: 0, + marginRight: 0, }, }, content_caption: { - fontSize: "3.5rem", + color: Colours.colours.gray3, + fontSize: "3.4rem", + fontWeight: 700, + lineHeight: 1.2, + }, + content_subtitle: { + color: Colours.colours.gray3, + fontSize: "1.4rem", + fontWeight: 700, + lineHeight: 1.2, }, content_description: { - color: Colours.colours.black, + color: Colours.colours.gray3, fontSize: "1.125rem", fontWeight: 400, + lineHeight: 1.2, }, image_skeleton: { height: 300, diff --git a/TokanPages.ClientApp/src/Components/Layout/Header/headerView.tsx b/TokanPages.ClientApp/src/Components/Layout/Header/headerView.tsx index bf1a632db..eb6b16a29 100644 --- a/TokanPages.ClientApp/src/Components/Layout/Header/headerView.tsx +++ b/TokanPages.ClientApp/src/Components/Layout/Header/headerView.tsx @@ -65,6 +65,13 @@ export const HeaderView = (): JSX.Element => { )} + + {header?.isLoading ? ( + + ) : ( + + )} + {header?.isLoading ? ( From 9c5ba81e03864a4270975262efe2570e469d1838 Mon Sep 17 00:00:00 2001 From: Tomasz 'Tom' Kandula Date: Fri, 24 May 2024 23:44:25 +0200 Subject: [PATCH 4/5] test: update snapshot --- .../__snapshots__/headerView.test.tsx.snap | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/TokanPages.ClientApp/src/Components/Layout/Header/__snapshots__/headerView.test.tsx.snap b/TokanPages.ClientApp/src/Components/Layout/Header/__snapshots__/headerView.test.tsx.snap index 470d5d8d2..acf8669d2 100644 --- a/TokanPages.ClientApp/src/Components/Layout/Header/__snapshots__/headerView.test.tsx.snap +++ b/TokanPages.ClientApp/src/Components/Layout/Header/__snapshots__/headerView.test.tsx.snap @@ -11,7 +11,7 @@ exports[`test component: headerView should render correctly '' whe class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-7" > @@ -19,7 +19,7 @@ exports[`test component: headerView should render correctly '' whe class="MuiGrid-root makeStyles-section_container-2 MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-5" >
' whe
+
+ +
I do programming for a living...