[Feat] 브랜치 병합

- 좌/우측 컴포넌트 구현으로 인한 브랜치 병합 Issues #43
codestates-seb · Sep 4, 2023 · 35abb87 · 35abb87
2 parents deb6d40 + a903437
commit 35abb87
Show file tree

Hide file tree

Showing 33 changed files with 1,560 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1 @@
+READMD 파일
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -17,6 +17,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-redux": "^8.1.2",
+    "react-router-dom": "^6.15.0",
     "styled-components": "^6.0.7"
   },
   "devDependencies": {

diff --git a/client/src/App.css b/client/src/App.css
@@ -2,4 +2,5 @@
   box-sizing: border-box;
   margin: 0px;
   list-style: none;
+  text-decoration: none;
 }
diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -1,8 +1,12 @@
 import "./App.css";
 import MainPage from "./page/MainPage";
-
+import { BrowserRouter } from "react-router-dom";
 function App() {
-  return <MainPage />;
+  return (
+    <BrowserRouter>
+      <MainPage />
+    </BrowserRouter>
+  );
 }
 
 export default App;
diff --git a/client/src/asset/icon/dot_Icon.png b/client/src/asset/icon/dot_Icon.png
diff --git a/client/src/asset/images/menu.png b/client/src/asset/images/menu.png
diff --git a/client/src/asset/logos/LG_logo.svg b/client/src/asset/logos/LG_logo.svg
diff --git a/client/src/asset/logos/POSCO_logo.svg b/client/src/asset/logos/POSCO_logo.svg
diff --git a/client/src/asset/logos/SK_logo.png b/client/src/asset/logos/SK_logo.png
diff --git a/client/src/asset/logos/Samsung_logo.svg b/client/src/asset/logos/Samsung_logo.svg