webview 연동을 위해 배포 (#20)

* setting: 폴더이름 오타수정 * 라우팅 및 레이아웃 추가 (#10) * wip: 라우터 추가 * etc: commit prefix 추가 * wip: 라우팅, 공통 레이아웃 추가 * styled theme작성 (#11) * setting: (#8) styled components에 theme주입 및 폰트적용 * setting: (#8) media주입 * 컨플릭트 해결 및 assets 추가 (#12) * wip: 라우터 추가 * wip: 라우팅, 공통 레이아웃 추가 * etc: 컨플리트 해결 * etc: added assets * feat: svg컴포넌트 작성 (#13) * feat: svg컴포넌트 작성 * feat: lodash-es 모듈 추가 * 레이아웃 css 추가 (#14) * wip: 라우터 추가 * wip: 라우팅, 공통 레이아웃 추가 * etc: assets 추가 * wip: layout css 추가 * feat: answer type 추가(#2) * answer list UI 추가(#2) *wip: answer component 추가 *wip: answer list component 추가 * merge develop feature/answerlist (#2) * feat: like button state 추가(#2) * answer place holder 추가(#2) wip: place holder style 추가 * Feature/layout (#15) * setting: 폴더이름 오타수정 * 라우팅 및 레이아웃 추가 (#10) * wip: 라우터 추가 * etc: commit prefix 추가 * wip: 라우팅, 공통 레이아웃 추가 * styled theme작성 (#11) * setting: (#8) styled components에 theme주입 및 폰트적용 * setting: (#8) media주입 * 컨플릭트 해결 및 assets 추가 (#12) * wip: 라우터 추가 * wip: 라우팅, 공통 레이아웃 추가 * etc: 컨플리트 해결 * etc: added assets * feat: svg컴포넌트 작성 (#13) * feat: svg컴포넌트 작성 * feat: lodash-es 모듈 추가 * wip: 라우터 추가 * wip: 라우팅, 공통 레이아웃 추가 * etc: assets 추가 * wip: layout css 추가 * feat: 카드 UI 완성 Co-authored-by: danivelop <[email protected]> Co-authored-by: danivelop <[email protected]> * feat: (#6) 고민리스트 UI작성 (#16) * 답변 리스트 UI 수정 (#2) * feat: AnswerItem UI 수정 * wip: AnswerList UI 수정 * pr 피드백 반영 *refact: colors 적용 *refact: array key 추가 *refact: 프래그먼트 제거 * concern 리덕스 및 saga로직 작성 (#19) * feat: 모델 작성 및 redux util 작성 * concern reducer 및 saga로직 작성 Co-authored-by: danivelop <[email protected]> Co-authored-by: danivelop <[email protected]> Co-authored-by: godjoy <[email protected]> Co-authored-by: godjoy <[email protected]>
mash-up-kr · Mar 12, 2021 · e91a0ea · e91a0ea
1 parent 51608c6
commit e91a0ea
Show file tree

Hide file tree

Showing 56 changed files with 1,575 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@
 - hot-fix 핫 버그 수정
 - bug-fix 버그 수정
 - refactor 기능 수정 추가 및 코드 수정
+- wip 작업 중일 때
 
 #### Commit Prefix
 

diff --git a/package.json b/package.json
@@ -3,16 +3,22 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "axios": "0.21.1",
     "chalk": "4.1.0",
     "cross-env": "7.0.2",
+    "immutable": "4.0.0-rc.12",
+    "lodash-es": "4.17.21",
     "node-plop": "0.26.2",
     "plop": "2.7.4",
     "prettier": "2.1.1",
     "react": "16.13.1",
     "react-app-polyfill": "1.0.6",
     "react-dom": "16.13.1",
+    "react-redux": "7.2.2",
     "react-router-dom": "5.2.0",
     "react-scripts": "4.0.3",
+    "redux": "4.0.5",
+    "redux-saga": "1.1.3",
     "rimraf": "3.0.2",
     "sanitize.css": "12.0.1",
     "serve": "11.3.2",
@@ -26,6 +32,7 @@
     "@testing-library/react": "11.0.2",
     "@types/fontfaceobserver": "0.0.6",
     "@types/jest": "25.1.4",
+    "@types/lodash-es": "4.17.4",
     "@types/node": "14.6.4",
     "@types/react": "17.0.0",
     "@types/react-dom": "16.9.8",

diff --git a/public/index.html b/public/index.html
@@ -10,35 +10,12 @@
       content="Web site created using create-react-app"
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      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`.
-    -->
+    <link rel="stylesheet" type="text/css" href="https://cdn.rawgit.com/innks/NanumSquareRound/master/nanumsquareround.min.css">
     <title>React App</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
-
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
   </body>
 </html>
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,7 +1,17 @@
 import React from 'react'
+import { BrowserRouter } from 'react-router-dom'
+import { GlobalStyle } from 'global-styles'
+import Routes from 'Routes'
 
 function App() {
-  return <div>hello world!</div>
+  return (
+    <>
+      <BrowserRouter>
+        <Routes />
+      </BrowserRouter>
+      <GlobalStyle />
+    </>
+  )
 }
 
 export default App
diff --git a/src/Routes.tsx b/src/Routes.tsx
@@ -0,0 +1,20 @@
+import React, { FC } from 'react'
+import {
+  Route,
+  RouteComponentProps,
+  Switch,
+  withRouter,
+} from 'react-router-dom'
+import Concerns from 'pages/Concerns'
+import Concern from 'pages/Concern'
+
+const Routes: FC<RouteComponentProps> = () => {
+  return (
+    <Switch>
+      <Route exact path="/concerns" component={Concerns} />
+      <Route exact path="/concern/:edit" component={Concern} />
+    </Switch>
+  )
+}
+
+export default withRouter(Routes)
diff --git a/src/assets/etc.svg b/src/assets/etc.svg