diff --git a/src/components/Layout/Layout.module.scss b/src/components/Layout/Layout.module.scss index 836caf972..42ac8b9a2 100644 --- a/src/components/Layout/Layout.module.scss +++ b/src/components/Layout/Layout.module.scss @@ -1,7 +1,23 @@ @use '../../styles/variables'; @use '../../styles/theme'; -.Layout { +.layout { width: 100vw; height: 100vh; + display: flex; + flex-direction: column; + min-height: 100vh; +} +.main { + flex: 1; +} +.footer { + color: var(--primary-color); + font-family: var(--body-alt-font-family); + font-size: 16px; + letter-spacing: 0.15px; + text-align: center; + padding: 20px 40px; + line-height: 18px; + text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.14), 0px 3px 4px rgba(0, 0, 0, 0.12), 0px 1px 5px rgba(0, 0, 0, 0.2); } diff --git a/src/components/Layout/Layout.tsx b/src/components/Layout/Layout.tsx index e985a459b..93d58088f 100644 --- a/src/components/Layout/Layout.tsx +++ b/src/components/Layout/Layout.tsx @@ -15,34 +15,37 @@ type LayoutProps = { }; const Layout: FC = ({ children }) => { - const { menu, assets, options } = useContext(ConfigContext); + const { menu, assets, options, footerText } = useContext(ConfigContext); const { blurImage } = useContext(UIStateContext); const [sideBarOpen, setSideBarOpen] = useState(false); const hasDynamicBlur = options.dynamicBlur === true; return (
- {hasDynamicBlur && blurImage && } -
setSideBarOpen(true)} - playlistMenuItems={menu.map((item) => ( - - ))} - logoSrc={assets.banner} - /> - setSideBarOpen(false)} - playlistMenuItems={menu.map((item) => ( - - ))} - /> - {children} +
+ {hasDynamicBlur && blurImage && } +
setSideBarOpen(true)} + playlistMenuItems={menu.map((item) => ( + + ))} + logoSrc={assets.banner} + /> + setSideBarOpen(false)} + playlistMenuItems={menu.map((item) => ( + + ))} + /> + {children} +
+ {!!footerText &&
{footerText}
}
); }; diff --git a/src/components/Layout/__snapshots__/Layout.test.tsx.snap b/src/components/Layout/__snapshots__/Layout.test.tsx.snap index 077800b59..ded0c4bb9 100644 --- a/src/components/Layout/__snapshots__/Layout.test.tsx.snap +++ b/src/components/Layout/__snapshots__/Layout.test.tsx.snap @@ -2,21 +2,87 @@ exports[` renders layout 1`] = `
-
-
+
+
+
+ + + +
+
- -
-
-
diff --git a/src/components/Root/__snapshots__/Root.test.tsx.snap b/src/components/Root/__snapshots__/Root.test.tsx.snap index c6349cb63..40e2adf27 100644 --- a/src/components/Root/__snapshots__/Root.test.tsx.snap +++ b/src/components/Root/__snapshots__/Root.test.tsx.snap @@ -2,21 +2,86 @@ exports[` renders and matches snapshot 1`] = `
-
-
+
+
+
+ + + +
+
-
-