From 9e6569717949ded7505fb4be39879ff05aebcd6d Mon Sep 17 00:00:00 2001 From: Andreas Sahle Date: Mon, 30 Mar 2020 12:33:57 +0200 Subject: [PATCH] feat(layout): more buttons in header --- .../design-system/assets/svg/plus-square.svg | 1 + .../poolbase-app/design-system/theme/index.ts | 9 ++-- .../src/app/components/Header.tsx | 45 +++++++++++-------- .../src/app/components/PageLayout.tsx | 4 +- .../poolbase-app/src/app/pages/_document.tsx | 2 +- 5 files changed, 36 insertions(+), 25 deletions(-) create mode 100644 packages/poolbase-app/design-system/assets/svg/plus-square.svg diff --git a/packages/poolbase-app/design-system/assets/svg/plus-square.svg b/packages/poolbase-app/design-system/assets/svg/plus-square.svg new file mode 100644 index 0000000..c380e24 --- /dev/null +++ b/packages/poolbase-app/design-system/assets/svg/plus-square.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/poolbase-app/design-system/theme/index.ts b/packages/poolbase-app/design-system/theme/index.ts index acc25f0..1906807 100644 --- a/packages/poolbase-app/design-system/theme/index.ts +++ b/packages/poolbase-app/design-system/theme/index.ts @@ -151,7 +151,8 @@ export const colors = { grayDark: baseColors.gray[8], text: baseColors.gray[8], textInverted: baseColors.gray[2], - background: baseColors.white, + background: baseColors.gray[2], + backgroundInverted: baseColors.gray[8], primary: baseColors.blue[7], primaryHover: baseColors.blue[8], secondary: baseColors.gray[6], @@ -165,9 +166,10 @@ export const colors = { textMuted: baseColors.gray[6], modes: { dark: { - text: baseColors.gray[2], - textInverted: baseColors.gray[3], + text: baseColors.gray[4], + textInverted: baseColors.gray[5], background: baseColors.gray[9], + backgroundInverted: baseColors.black, primary: '#0cf', secondary: '#90c', }, @@ -380,6 +382,7 @@ const heading = { lineHeight: 'heading', m: 0, mb: 1, + color: 'text', }; export const styles = { diff --git a/packages/poolbase-app/src/app/components/Header.tsx b/packages/poolbase-app/src/app/components/Header.tsx index 7545071..0887c74 100644 --- a/packages/poolbase-app/src/app/components/Header.tsx +++ b/packages/poolbase-app/src/app/components/Header.tsx @@ -7,32 +7,46 @@ import logout from '../utils/auth/logout'; import Moon from '../../../design-system/assets/svg/moon.svg'; import Sun from '../../../design-system/assets/svg/sun.svg'; import Logout from '../../../design-system/assets/svg/log-out.svg'; +import Add from '../../../design-system/assets/svg/plus-square.svg'; interface PropsWithAuthUser { AuthUser: AuthUser; } +const NaviIconButton = props => ( + +); export default function Header({ AuthUser }: PropsWithAuthUser): JSX.Element { const [colorMode, setColorMode] = useColorMode(); return (
- { + Router.push('/add-url'); }} + > + + + => { try { await logout(); @@ -43,20 +57,13 @@ export default function Header({ AuthUser }: PropsWithAuthUser): JSX.Element { }} > - - + setColorMode(colorMode === 'light' ? 'dark' : 'light')} aria-label={`Toggle ${colorMode === 'light' ? 'Dark' : 'Light'}`} > {colorMode === 'light' ? : } - +
); } diff --git a/packages/poolbase-app/src/app/components/PageLayout.tsx b/packages/poolbase-app/src/app/components/PageLayout.tsx index a816d5e..0834619 100644 --- a/packages/poolbase-app/src/app/components/PageLayout.tsx +++ b/packages/poolbase-app/src/app/components/PageLayout.tsx @@ -25,13 +25,13 @@ const PageLayout: NextPage = ( ) : (
-
{children}
+
{children}
)} diff --git a/packages/poolbase-app/src/app/pages/_document.tsx b/packages/poolbase-app/src/app/pages/_document.tsx index ad96158..a9323e7 100755 --- a/packages/poolbase-app/src/app/pages/_document.tsx +++ b/packages/poolbase-app/src/app/pages/_document.tsx @@ -51,7 +51,7 @@ export default class CustomDocument extends Document { height: '100%', '& > div': { height: '100%', - } + }, }} >