Merge pull request #5 from marina-yhm/test

Feat: Navbar구현

package.json

@@ -7,7 +7,9 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "axios": "^1.5.1",
+    "bootstrap": "^5.3.2",
     "react": "^18.2.0",
+    "react-bootstrap": "^2.9.1",
     "react-dom": "^18.2.0",
     "react-icons": "^4.11.0",
     "react-redux": "^8.1.3",

src/App.css

@@ -36,3 +36,38 @@
     transform: rotate(360deg);
   }
 }
+
+@font-face {
+  font-family: "Bold";
+  src: url("./assets/font/Pretendard-Bold.otf");
+}
+
+@font-face {
+  font-family: "ExtraBold";
+  src: url("./assets/font/Pretendard-ExtraBold.otf");
+}
+
+@font-face {
+  font-family: "ExtraLight";
+  src: url("./assets/font/Pretendard-ExtraLight.otf");
+}
+
+@font-face {
+  font-family: "Light";
+  src: url("./assets/font/Pretendard-Light.otf");
+}
+
+@font-face {
+  font-family: "Medium";
+  src: url("./assets/font/Pretendard-Medium.otf");
+}
+
+@font-face {
+  font-family: "Regular";
+  src: url("./assets/font/Pretendard-Regular.otf");
+}
+
+@font-face {
+  font-family: "SemiBold";
+  src: url("./assets/font/Pretendard-SemiBold.otf");
+}

src/App.js

@@ -1,19 +1,24 @@
+import { Route, Routes } from "react-router-dom";
+import Footer from "../src/components/views/Footer/Footer";
+import Header from "../src/components/views/Header/Header";
+import Inventory from "../src/pages/Inventory/Inventory";
+import Mypage from "../src/pages/Mypage/Mypage";
+import Sales from "../src/pages/Sales/Sales";
 import "./App.css";
-import { Route, Routes, Navigate } from "react-router-dom";
-import LandingPage from "../src/pages/LandingPage/LandingPage";
-import TestPage from "../src/pages/TestPage/TestPage";
+import Home from "./pages/Home/Home";
 
 function App() {
   return (
     <div className="App">
+      <Header />
       <Routes>
-        {/* 메인페이지 */}
-        <Route path="/" element={<LandingPage />} />
-        {/* 없는 경로로 갈경우 메인페이지로 강제 이동 */}
-        <Route path="/*" element={<Navigate to="/"></Navigate>}></Route>
-        {/* 테스트 페이지 */}
-        <Route path="/test" element={<TestPage />} />
+        <Route path="/" element={<Home />} />
+        <Route path="/Inventory" element={<Inventory />} />
+        <Route path="/Sales" element={<Sales />} />
+        <Route path="/Mypage" element={<Mypage />} />
       </Routes>
+
+      <Footer />
     </div>
   );
 }