diff --git a/package.json b/package.json index 39fcad25..918fdcb6 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-hook-form": "^7.51.4", + "react-icons": "^5.2.1", "react-router-dom": "^6.23.1", "zustand": "^4.5.2" }, diff --git a/src/assets/logo.svg b/src/assets/logo.svg new file mode 100644 index 00000000..348b4414 --- /dev/null +++ b/src/assets/logo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/common/Header.tsx b/src/components/common/Header.tsx new file mode 100644 index 00000000..e229fb2d --- /dev/null +++ b/src/components/common/Header.tsx @@ -0,0 +1,30 @@ +import { Link, NavLink } from 'react-router-dom'; +import logo from '@assets/logo.svg'; +import { FaUserCircle } from 'react-icons/fa'; +import { FiHome } from 'react-icons/fi'; + +export default function Header() { + // ToDo: 로그인 기능 구현 후, 로그아웃 로직 연결하기 + // ToDo: 유저 정보를 토대로 응원 아이디 변경하기 + return ( +
+
+ + GrowUp Logo + +
+ +
+ ); +} diff --git a/src/globals.css b/src/globals.css index b87074e1..ba7dc3fe 100644 --- a/src/globals.css +++ b/src/globals.css @@ -54,7 +54,7 @@ /* text color */ --text-color-default: #2c2c2c; - --text-color-bold: #5e5e5e; + --text-color-emphasis: #5e5e5e; --text-color-error: #be0000; --text-color-blue: #0909e7; diff --git a/src/layouts/DefaultLayout.tsx b/src/layouts/DefaultLayout.tsx index 99ca7bc1..5de02882 100644 --- a/src/layouts/DefaultLayout.tsx +++ b/src/layouts/DefaultLayout.tsx @@ -1,9 +1,10 @@ import { Outlet } from 'react-router-dom'; +import Header from '@/components/common/Header'; export default function DefaultLayout() { return ( <> -

Default Layout

+
); diff --git a/tailwind.config.js b/tailwind.config.js index 6d7b30c0..b897e147 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -23,7 +23,7 @@ export default { }, fontSize: { regular: 'var(--font-size-regular)', - bold: 'var(--font-size-bold)', + large: 'var(--font-size-large)', 404: 'var(--font-size-404)', }, fontWeight: { @@ -41,7 +41,7 @@ export default { }, textColor: { default: 'var(--text-color-default)', - bold: 'var(--text-color-bold)', + emphasis: 'var(--text-color-emphasis)', error: 'var(--text-color-error)', blue: 'var(--text-color-blue)', }, diff --git a/yarn.lock b/yarn.lock index 026c68cb..1d6a3404 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3538,6 +3538,11 @@ react-hook-form@^7.51.4: resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.51.4.tgz" integrity sha512-V14i8SEkh+V1gs6YtD0hdHYnoL4tp/HX/A45wWQN15CYr9bFRmmRdYStSO5L65lCCZRF+kYiSKhm9alqbcdiVA== +react-icons@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-5.2.1.tgz#28c2040917b2a2eda639b0f797bff1888e018e4a" + integrity sha512-zdbW5GstTzXaVKvGSyTaBalt7HSfuK5ovrzlpyiWHAFXndXTdd/1hdDHI4xBM1Mn7YriT6aqESucFl9kEXzrdw== + react-is@^16.13.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"