implemented select menu and right section completed

Yttrium69 · Nov 20, 2023 · 3779ee0 · 3779ee0
1 parent ce98a4a
commit 3779ee0
Show file tree

Hide file tree

Showing 43 changed files with 8,327 additions and 8,047 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,11 +7,16 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "@types/jest": "^27.5.2",
+    "@types/jquery": "^3.5.27",
     "@types/node": "^16.18.61",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
+    "file-saver": "^2.0.5",
+    "global": "^4.4.0",
+    "jquery": "^3.7.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-router-dom": "^6.19.0",
     "react-scripts": "5.0.1",
     "sass": "^1.69.5",
     "typescript": "^4.9.5",
@@ -40,5 +45,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "devDependencies": {
+    "@types/file-saver": "^2.0.7"
   }
 }
diff --git a/public/img/main/arrow_base.svg b/public/img/main/arrow_base.svg
diff --git a/public/img/main/arrow_middle.svg b/public/img/main/arrow_middle.svg
diff --git a/public/img/main/arrow_top.svg b/public/img/main/arrow_top.svg
diff --git a/public/img/main/무제-1.png → public/img/main/perfume.png b/public/img/main/무제-1.png → public/img/main/perfume.png
diff --git a/public/img/note/bergamot.jpg b/public/img/note/bergamot.jpg
diff --git a/public/img/note/bergamot.png b/public/img/note/bergamot.png
diff --git a/public/img/note/citrus.jpg b/public/img/note/citrus.jpg
diff --git a/public/img/note/citrus.png b/public/img/note/citrus.png
diff --git a/public/img/note/coconut.jpg b/public/img/note/coconut.jpg
diff --git a/public/img/note/coconut.png b/public/img/note/coconut.png
diff --git a/public/img/note/coconut_new.jpg b/public/img/note/coconut_new.jpg
diff --git a/public/img/note/eucalyptus.jpg b/public/img/note/eucalyptus.jpg
diff --git a/public/img/note/eucalyptus.png b/public/img/note/eucalyptus.png
diff --git a/public/img/note/floral.jpg b/public/img/note/floral.jpg
diff --git a/public/img/note/floral.png b/public/img/note/floral.png
diff --git a/public/img/note/flowder.jpg b/public/img/note/flowder.jpg
diff --git a/public/img/note/flowder.png b/public/img/note/flowder.png
diff --git a/public/img/note/lavender.jpg b/public/img/note/lavender.jpg
diff --git a/public/img/note/lavender.png b/public/img/note/lavender.png
diff --git a/public/img/note/minty.jpg b/public/img/note/minty.jpg
diff --git a/public/img/note/minty.png b/public/img/note/minty.png
diff --git a/public/img/note/musk.jpg b/public/img/note/musk.jpg
diff --git a/public/img/note/musk.png b/public/img/note/musk.png
diff --git a/public/img/note/strawberry.jpg b/public/img/note/strawberry.jpg
diff --git a/public/img/note/strawberry.png b/public/img/note/strawberry.png
diff --git a/public/img/note/vanilla.jpg b/public/img/note/vanilla.jpg
diff --git a/public/img/note/vanilla.png b/public/img/note/vanilla.png
diff --git a/public/img/note/woody.jpg b/public/img/note/woody.jpg
diff --git a/public/img/note/woody.png b/public/img/note/woody.png
diff --git a/public/index.html b/public/index.html
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>GAMSUNG</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/src/App.tsx b/src/App.tsx
@@ -2,11 +2,23 @@ import React from 'react';
 import Main from './view/Main';
 import './CSS/base.scss';
 import './CSS/components.scss';
+import Admin from './view/Admin';
+import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
 
 function App() {
   return (
     <div className="App">
-      <Main></Main>
+      <Router>
+        <Routes>
+          <Route
+            path="/"
+            element={
+              <Main />
+            }
+          />
+          <Route path="/admin" element={<Admin />} />
+        </Routes>
+      </Router>
     </div>
   );
 }

diff --git a/src/CSS/base.scss b/src/CSS/base.scss
@@ -24,15 +24,6 @@ $black: #32353C;
 $line_gray: #DCE1E8;
 $font_gray: #4E5968;
 
-:export{
-  color{
-    label_0: $label_0;
-    label_1: $label_1;
-    label_2: $label_2;
-    label_3: $label_3;
-    label_4: $label_4;
-  }
-}
 
 //lines
 $gray_line: 1px solid $line_gray;
@@ -195,10 +186,27 @@ $card_shadow: 0px 4px 8px 0px rgba(161, 170, 179, 0.30);
 
 html{
     font-size: 16px;
+    ::-webkit-scrollbar {
+      width: 12px;
+      background-color: none;
+      cursor: pointer;
+    }
+    ::-webkit-scrollbar-thumb {
+      background-color: #2f354227;
+      width: 4px;
+      cursor: pointer;
+      border-radius: 10rem;
+    }
+    // ::-webkit-scrollbar-track {
+    //   background-color: rgb(107, 21, 21);
+    //   width: 10px;
+    // }
+
 }
 
 body{
     background-color: $background;
+    overflow: hidden;
 }