Merge pull request #8 from sprint5-part2-team9/조혜진

Feat: Input, Dropdown components
part2-team9 · Apr 9, 2024 · c6c3942 · c6c3942
2 parents c66f455 + 2c75094
commit c6c3942
Show file tree

Hide file tree

Showing 14 changed files with 532 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
+    "classnames": "^2.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.22.3",

diff --git a/src/App.js b/src/App.js
@@ -3,12 +3,14 @@ import "./global.scss";
 import "./reset.scss";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
 import Home from "./pages/Home/Home";
+import FromMsgPage from "./pages/Msg/FromMsg/FromMsgPage";
 
 function App() {
   return (
     <BrowserRouter>
       <Routes>
         <Route path="/" element={<Home />} />
+        <Route path="/post/:id/message" element={<FromMsgPage />} />
       </Routes>
     </BrowserRouter>
   );

diff --git a/src/assets/dropdown_down.png b/src/assets/dropdown_down.png
diff --git a/src/assets/dropdown_top.png b/src/assets/dropdown_top.png
diff --git a/src/components/Header.module.scss b/src/components/Header.module.scss
@@ -14,7 +14,7 @@ $headerH: 65px;
   display: flex;
   justify-content: space-between;
   align-items: center;
-  max-width: 1248px;
+  max-width: 1200px;
   width: 100%;
 }
 
@@ -26,8 +26,8 @@ $headerH: 65px;
   font-size: 19.971px;
   line-height: normal;
   &::before {
-    content: '';
-    background-image: url('../assets/Rolling_icon.png');
+    content: "";
+    background-image: url("../assets/Rolling_icon.png");
     display: inline-block;
     width: 27.818px;
     height: 27.658px;