diff --git a/TokanPages.ClientApp/src/Api/Models/Components/headerContentDto.ts b/TokanPages.ClientApp/src/Api/Models/Components/headerContentDto.ts index 4045317a3..93438b885 100644 --- a/TokanPages.ClientApp/src/Api/Models/Components/headerContentDto.ts +++ b/TokanPages.ClientApp/src/Api/Models/Components/headerContentDto.ts @@ -8,5 +8,6 @@ export interface HeaderContentDto { subtitle: string; description: string; action: LinkDto; + resume: LinkDto; }; } diff --git a/TokanPages.ClientApp/src/Components/Document/View/__snapshots__/documentView.test.tsx.snap b/TokanPages.ClientApp/src/Components/Document/View/__snapshots__/documentView.test.tsx.snap index 4585a0064..60a544a58 100644 --- a/TokanPages.ClientApp/src/Components/Document/View/__snapshots__/documentView.test.tsx.snap +++ b/TokanPages.ClientApp/src/Components/Document/View/__snapshots__/documentView.test.tsx.snap @@ -10,53 +10,45 @@ exports[`test component: documentView should render correctly ''
-
- - - -
-
-
+ + + + + +
+ - -
-

- Policy text -

-
- -
+
+

+ Policy text +

+
+
@@ -72,53 +64,45 @@ exports[`test component: documentView should render correctly ''
-
- - - -
-
-
+ + + + + +
+ - -
-

- Showcase text -

-
- -
+
+

+ Showcase text +

+
+
@@ -134,53 +118,45 @@ exports[`test component: documentView should render correctly ''
-
- - - -
-
-
+ + + + + +
+ - -
-

- Story text -

-
- -
+
+

+ Story text +

+
+
@@ -196,53 +172,45 @@ exports[`test component: documentView should render correctly ''
- -
+ + + + + +
+ - -
-

- Terms text -

-
- -
+
+

+ Terms text +

+
+
diff --git a/TokanPages.ClientApp/src/Components/Document/View/documentView.tsx b/TokanPages.ClientApp/src/Components/Document/View/documentView.tsx index 7b8ce3c44..4d6ebebbe 100644 --- a/TokanPages.ClientApp/src/Components/Document/View/documentView.tsx +++ b/TokanPages.ClientApp/src/Components/Document/View/documentView.tsx @@ -26,25 +26,27 @@ export const DocumentView = (props: DocumentViewProps): JSX.Element => { const element = document?.querySelector(hash); if (element) { - element.scrollIntoView({ behavior: "smooth" }); + setTimeout( + () => + element.scrollIntoView({ + block: "start", + behavior: "smooth", + }), + 500 + ); } - - }, [ hash, props.isLoading ]); + }, [hash, props.isLoading]); return (
-
- -
-
- {props.isLoading ? ( - - ) : ( - - )} -
+ + {props.isLoading ? ( + + ) : ( + + )}
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 acf8669d2..c264eab31 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 @@ -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
+ ); +}; + const ActiveButton = (props: ContentHeaderState): JSX.Element => { const classes = HeaderStyle(); @@ -83,7 +103,10 @@ export const HeaderView = (): JSX.Element => { {header?.isLoading ? ( ) : ( - + <> + + + )} diff --git a/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationStyle.tsx b/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationStyle.tsx index e33155048..571eea09e 100644 --- a/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationStyle.tsx +++ b/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationStyle.tsx @@ -52,7 +52,7 @@ export const NavigationStyle = makeStyles(theme => ({ marginRight: 5, }, languages_wrapper: { - display: "flex", + display: "flex", alignItems: "center", }, languagesBox: { @@ -70,7 +70,7 @@ export const NavigationStyle = makeStyles(theme => ({ languages_check: { paddingLeft: 5, color: Colours.colours.darkViolet1, - }, + }, content_right_side: { display: "flex", justifyContent: "flex-end", diff --git a/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.tsx b/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.tsx index abe9c214c..02bfa5cb3 100644 --- a/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.tsx +++ b/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.tsx @@ -104,8 +104,8 @@ const RenderLanguageSelection = (props: Properties): JSX.Element => { return ; } - return null - } + return null; + }; return ( diff --git a/TokanPages.ClientApp/src/Shared/Components/DocumentContentWrapper/index.tsx b/TokanPages.ClientApp/src/Shared/Components/DocumentContentWrapper/index.tsx index ce179c50b..6994b931b 100644 --- a/TokanPages.ClientApp/src/Shared/Components/DocumentContentWrapper/index.tsx +++ b/TokanPages.ClientApp/src/Shared/Components/DocumentContentWrapper/index.tsx @@ -19,4 +19,4 @@ export const DocumentContentWrapper = (props: DocumentContentWrapperProps): JSX. ); -} +}; diff --git a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderImage/renderImage.tsx b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderImage/renderImage.tsx index 69a5bb068..4caecbaf2 100644 --- a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderImage/renderImage.tsx +++ b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderImage/renderImage.tsx @@ -1,6 +1,7 @@ import * as React from "react"; import { Card, CardContent, CardMedia, Typography } from "@material-ui/core"; import { API_BASE_URI } from "../../../../../Api/Request"; +import { ReactHtmlParser } from "../../../../../Shared/Services/Renderers"; import { TextItem } from "../../Models/TextModel"; import { RenderImageStyle } from "./renderImageStyle"; import Validate from "validate.js"; @@ -9,8 +10,8 @@ const RenderDescription = (props: { text: string }): JSX.Element => { const classes = RenderImageStyle(); return ( - - {props.text} + + ); diff --git a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderImage/renderImageStyle.tsx b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderImage/renderImageStyle.tsx index d3118db98..b008f677c 100644 --- a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderImage/renderImageStyle.tsx +++ b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderImage/renderImageStyle.tsx @@ -11,11 +11,8 @@ export const RenderImageStyle = makeStyles(() => ({ cursor: "pointer", }, text: { - color: Colours.colours.gray1, - paddingTop: 1, - paddingBottom: 1, - paddingLeft: 10, - paddingRight: 10, + fontSize: 14, lineHeight: 1.8, + color: Colours.colours.gray1, }, })); diff --git a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderText/renderText.tsx b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderText/renderText.tsx index 37a909f30..4be8a07dc 100644 --- a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderText/renderText.tsx +++ b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderText/renderText.tsx @@ -7,8 +7,8 @@ import { useHash } from "../../../../../Shared/Hooks"; import { ReactHtmlParser } from "../../../../../Shared/Services/Renderers"; import "../../../../../Theme/Css/customDropCap.css"; -interface DataProps { - data?: string +interface DataProps { + data?: string; text?: string; } @@ -26,13 +26,13 @@ const RenderItemLink = (props: DataProps): JSX.Element => { window.history.pushState(null, "", window.location.pathname + data); } } - }, [ hash, data ]); + }, [hash, data]); return ( - @@ -41,7 +41,7 @@ const RenderItemLink = (props: DataProps): JSX.Element => { ); -} +}; const RenderTitle = (props: DataProps): JSX.Element => { const classes = RenderTextStyle(); diff --git a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderText/renderTextStyle.tsx b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderText/renderTextStyle.tsx index 89036a54d..8f4957141 100644 --- a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderText/renderTextStyle.tsx +++ b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderText/renderTextStyle.tsx @@ -8,13 +8,18 @@ export const RenderTextStyle = makeStyles(() => ({ color: Colours.colours.gray3, }, wrapper: { - display: "flex", - alignItems: "center" + display: "flex", + alignItems: "center", }, link: { cursor: "pointer", textAlign: "center", verticalAlign: "middle", + fontWeight: 400, + "&:hover": { + fontWeight: 500, + color: Colours.colours.darkViolet1, + }, }, title: { fontSize: 28, diff --git a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderVideo/renderVideo.tsx b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderVideo/renderVideo.tsx index 0573357dd..155a55f62 100644 --- a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderVideo/renderVideo.tsx +++ b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderVideo/renderVideo.tsx @@ -3,14 +3,15 @@ import { Card, CardContent, CardMedia, Typography } from "@material-ui/core"; import { TextItem } from "../../Models/TextModel"; import { RenderVideoStyle } from "./renderVideoStyle"; import { API_BASE_URI } from "../../../../../Api/Request"; +import { ReactHtmlParser } from "../../../../../Shared/Services/Renderers"; import Validate from "validate.js"; const RenderDescription = (props: { text: string }): JSX.Element => { const classes = RenderVideoStyle(); return ( - - {props.text} + + ); diff --git a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderVideo/renderVideoStyle.tsx b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderVideo/renderVideoStyle.tsx index 3666e919e..c30a2b08a 100644 --- a/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderVideo/renderVideoStyle.tsx +++ b/TokanPages.ClientApp/src/Shared/Components/RenderContent/Renderers/RenderVideo/renderVideoStyle.tsx @@ -11,11 +11,8 @@ export const RenderVideoStyle = makeStyles(() => ({ cursor: "pointer", }, text: { - color: Colours.colours.gray1, - paddingTop: 1, - paddingBottom: 1, - paddingLeft: 10, - paddingRight: 10, + fontSize: 14, lineHeight: 1.8, + color: Colours.colours.gray1, }, })); diff --git a/TokanPages.ClientApp/src/Shared/Hooks/UseHash/index.ts b/TokanPages.ClientApp/src/Shared/Hooks/UseHash/index.ts index a850b4fe1..dcb5c6684 100644 --- a/TokanPages.ClientApp/src/Shared/Hooks/UseHash/index.ts +++ b/TokanPages.ClientApp/src/Shared/Hooks/UseHash/index.ts @@ -8,9 +8,8 @@ export const useHash = () => { setHash(window.location.hash); }; - window.addEventListener("hashchange", onHashChange); - return () => window.removeEventListener("hashchange", onHashChange); - + window.addEventListener("hashchange", onHashChange); + return () => window.removeEventListener("hashchange", onHashChange); }, []); return hash; diff --git a/TokanPages.ClientApp/src/Store/Actions/Content/contentDocument.ts b/TokanPages.ClientApp/src/Store/Actions/Content/contentDocument.ts index e93113dd3..a033118f7 100644 --- a/TokanPages.ClientApp/src/Store/Actions/Content/contentDocument.ts +++ b/TokanPages.ClientApp/src/Store/Actions/Content/contentDocument.ts @@ -11,7 +11,7 @@ import { GET_GUITAR_CONTENT, GET_PHOTOGRAPHY_CONTENT, GET_FOOTBALL_CONTENT, - GET_ABOUT_CONTENT + GET_ABOUT_CONTENT, } from "../../../Api/Request"; export const REQUEST_POLICY = "REQUEST_POLICY_CONTENT"; @@ -109,7 +109,17 @@ type Electronics = RequestElectronics | ReceiveElectronics; type Football = RequestFootball | ReceiveFootball; type Guitar = RequestGuitar | ReceiveGuitar; type Photography = RequestPhotography | ReceivePhotography; -export type TKnownActions = Policy | Terms | About | Story | Showcase | Bicycle | Electronics | Football | Guitar | Photography; +export type TKnownActions = + | Policy + | Terms + | About + | Story + | Showcase + | Bicycle + | Electronics + | Football + | Guitar + | Photography; export const ContentDocumentAction = { getPolicy: (): ApplicationAction => (dispatch, getState) => { diff --git a/TokanPages.ClientApp/src/Store/Defaults/Content/contentHeader.ts b/TokanPages.ClientApp/src/Store/Defaults/Content/contentHeader.ts index df8433430..470b419ca 100644 --- a/TokanPages.ClientApp/src/Store/Defaults/Content/contentHeader.ts +++ b/TokanPages.ClientApp/src/Store/Defaults/Content/contentHeader.ts @@ -12,5 +12,9 @@ export const ContentHeader: ContentHeaderState = { text: "", href: "", }, + resume: { + text: "", + href: "", + }, }, }; diff --git a/TokanPages.ClientApp/src/routes.tsx b/TokanPages.ClientApp/src/routes.tsx index f57f9c1d4..8069e1b00 100644 --- a/TokanPages.ClientApp/src/routes.tsx +++ b/TokanPages.ClientApp/src/routes.tsx @@ -63,7 +63,7 @@ export const Routes = (): JSX.Element => { {props.page} - ) + ); }; let buffer: JSX.Element[] = []; diff --git a/TokanPages.ClientApp/yarn.lock b/TokanPages.ClientApp/yarn.lock index 081f83047..580e5db64 100644 --- a/TokanPages.ClientApp/yarn.lock +++ b/TokanPages.ClientApp/yarn.lock @@ -12325,20 +12325,15 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@^7.4.5: - version "7.5.9" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" - integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== - -ws@^7.4.6: - version "7.5.7" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" - integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== +ws@^7.4.5, ws@^7.4.6: + version "7.5.10" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9" + integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ== ws@^8.4.2: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" - integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== + version "8.17.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" + integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== xml-name-validator@^3.0.0: version "3.0.0" diff --git a/yarn.lock b/yarn.lock index f7409c331..6b503d050 100644 --- a/yarn.lock +++ b/yarn.lock @@ -790,11 +790,11 @@ brace-expansion@^2.0.1: balanced-match "^1.0.0" braces@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" builtins@^5.0.0: version "5.0.1" @@ -1387,10 +1387,10 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1"