diff --git a/hybrid/src/components/buttons/ShiningButton.tsx b/hybrid/src/components/buttons/ShiningButton.tsx index 495a6ae..d5cdcff 100644 --- a/hybrid/src/components/buttons/ShiningButton.tsx +++ b/hybrid/src/components/buttons/ShiningButton.tsx @@ -3,12 +3,18 @@ import styled from 'styled-components'; interface ShinningButtonProps { value: string; + moveTo: string; + clickHandler?: () => void; } -export default function ShiningButton({ value }: ShinningButtonProps) { +export default function ShiningButton({ + value, + moveTo, + clickHandler, +}: ShinningButtonProps) { return ( - + diff --git a/hybrid/src/components/layout/Footer.tsx b/hybrid/src/components/layout/Footer.tsx index 7360179..b709578 100644 --- a/hybrid/src/components/layout/Footer.tsx +++ b/hybrid/src/components/layout/Footer.tsx @@ -2,14 +2,14 @@ import styled from 'styled-components'; export default function Footer() { return ( - +

GitHub | Rule | Contact

Copyright © 2023 OkMoK. All rights reserved.

-
+ ); } -const FooterContainer = styled.footer` +const Container = styled.footer` ${({ theme }) => theme.flexs.centerColumn}; height: 3rem; margin: 1.5rem; diff --git a/hybrid/src/components/layout/Header.tsx b/hybrid/src/components/layout/Header.tsx index 8c24fff..0d6e1cd 100644 --- a/hybrid/src/components/layout/Header.tsx +++ b/hybrid/src/components/layout/Header.tsx @@ -1,17 +1,14 @@ import styled from 'styled-components'; +import Logo from './Logo'; + interface HeaderProps { children?: React.ReactNode; } + export default function Header({ children }: HeaderProps) { return ( -

- O - k - M - o - K -

+ {children}
); @@ -21,35 +18,8 @@ const Container = styled.header` ${({ theme }) => theme.flexs.center}; height: 5rem; margin: 1.5rem; - h1 { - font-size: ${({ theme }) => theme.fontsizes.xxlarge}; - span { - margin: 0 0.2rem; - } - span:nth-child(1) { - color: ${({ theme }) => theme.colors.red}; - } - span:nth-child(2) { - color: ${({ theme }) => theme.colors.green}; - } - span:nth-child(3) { - color: ${({ theme }) => theme.colors.blue}; - } - span:nth-child(4) { - color: ${({ theme }) => theme.colors.yellow}; - } - span:nth-child(5) { - color: ${({ theme }) => theme.colors.aqua}; - } - } @media (${({ theme: { device } }) => device.mobile}) { height: 2.5rem; margin: 0.8rem; - h1 { - font-size: ${({ theme }) => theme.fontsizes.xlarge}; - span { - margin: 0 0.1rem; - } - } } `; diff --git a/hybrid/src/components/layout/LoginLayout.tsx b/hybrid/src/components/layout/LoginLayout.tsx index 6a87e29..855cbb4 100644 --- a/hybrid/src/components/layout/LoginLayout.tsx +++ b/hybrid/src/components/layout/LoginLayout.tsx @@ -1,4 +1,6 @@ -import Header from './Header'; +import styled from 'styled-components'; +import { LayoutContainer } from '@/styles/common-style'; +import Logo from './Logo'; import Footer from './Footer'; interface LoginLayoutProps { @@ -7,10 +9,23 @@ interface LoginLayoutProps { export default function LoginLayout({ children }: LoginLayoutProps) { return ( - <> -
-
{children}
+ + + + + {children}