Merge pull request #86 from woowa-techcamp-2021/dev

v0.4.0
woowa-techcamp-2021 · Aug 19, 2021 · eae35cd · eae35cd
2 parents d754eee + c27d2d6
commit eae35cd
Show file tree

Hide file tree

Showing 138 changed files with 2,963 additions and 730 deletions.
diff --git a/client/.eslintrc.json b/client/.eslintrc.json
@@ -17,6 +17,7 @@
     "react/prop-types": "off",
     "@typescript-eslint/no-empty-interface": "off",
     "import/no-unresolved": "off",
+    "import/prefer-default-export": "off",
     "@typescript-eslint/no-shadow": "off",
     "no-param-reassign": ["error", { "props": true, "ignorePropertyModificationsFor": ["state"] }]
   },

diff --git a/client/package.json b/client/package.json
@@ -23,7 +23,9 @@
   "dependencies": {
     "@reduxjs/toolkit": "^1.6.1",
     "@types/redux-logger": "^3.0.9",
+    "@types/stylis": "^4.0.1",
     "axios": "^0.21.1",
+    "nanoid": "^3.1.25",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-redux": "^7.2.4",
@@ -32,8 +34,8 @@
     "redux-saga": "^1.1.3",
     "redux-saga-test-plan": "^4.0.3",
     "sanitize-html": "^2.4.0",
-    "styled-components": "^5.3.0",
-    "styled-reset": "^4.3.4"
+    "styled-reset": "^4.3.4",
+    "stylis": "^4.0.10"
   },
   "devDependencies": {
     "@babel/cli": "^7.14.8",
@@ -47,7 +49,6 @@
     "@types/react": "^17.0.17",
     "@types/react-dom": "^17.0.9",
     "@types/react-redux": "^7.1.18",
-    "@types/styled-components": "^5.1.12",
     "@typescript-eslint/eslint-plugin": "^4.29.1",
     "@typescript-eslint/parser": "^4.29.1",
     "babel-cli": "^6.26.0",

diff --git a/client/public/index.html b/client/public/index.html
@@ -5,6 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>배민문구사</title>
+    <style></style>
     <base href="/" />
   </head>
   <body>

diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -1,16 +1,22 @@
 import React from 'react';
 import { BrowserRouter, Switch, Route } from 'lib/router';
-import { MainPage, NotFoundPage, LoginPage, SignupPage } from 'pages';
+
+import { MAIN_URL, ITEM_LIST_URL, ITEM_URL, AUTH_URL, SIGNIN_URL, SIGNUP_URL } from 'constants/urls';
+
+import { MainPage, NotFoundPage, ItemListPage, LoginPage, SignupPage, AuthPage, ItemDetailPage } from 'pages';
 import Theme from './styles/theme';
 
 const App: React.FC = () => {
   return (
     <Theme>
       <BrowserRouter>
         <Switch>
-          <Route exact path="/" component={MainPage} />
-          <Route exact path="/login" component={LoginPage} />
-          <Route exact path="/signup" component={SignupPage} />
+          <Route exact path={MAIN_URL} component={MainPage} />
+          <Route exact path={SIGNIN_URL} component={LoginPage} />
+          <Route exact path={SIGNUP_URL} component={SignupPage} />
+          <Route exact path={`${ITEM_URL}/:id`} component={ItemDetailPage} />
+          <Route exact path={ITEM_LIST_URL} component={ItemListPage} />
+          <Route exact path={AUTH_URL} component={AuthPage} />
           <Route path="" component={NotFoundPage} />
         </Switch>
       </BrowserRouter>

diff --git a/client/src/assets/icons/account.png b/client/src/assets/icons/account.png
diff --git a/client/src/assets/icons/account.svg b/client/src/assets/icons/account.svg
diff --git a/client/src/assets/icons/arrow_forward.svg b/client/src/assets/icons/arrow_forward.svg
diff --git a/client/src/assets/icons/badge_best.png b/client/src/assets/icons/badge_best.png
diff --git a/client/src/assets/icons/badge_best.svg b/client/src/assets/icons/badge_best.svg
diff --git a/client/src/assets/icons/badge_green.png b/client/src/assets/icons/badge_green.png
diff --git a/client/src/assets/icons/badge_green.svg b/client/src/assets/icons/badge_green.svg
diff --git a/client/src/assets/icons/badge_new.png b/client/src/assets/icons/badge_new.png