update directroy

서민정
Commit 5e12e27df86492c1f7f28fcc8010dbf786202557 5e12e27d 1 parent ee442760
Showing 9 changed files with 85 additions and 10 deletions
README.md
client/package-lock.json
client/src/App.js
client/src/views/Footer.js
client/src/views/chatpage.js
client/src/views/loginpage.js
client/src/views/registerpage.js
package-lock.json
package.json
--- a/README.md
View file @5e12e27
+++ b/README.md
View file @5e12e27
@@ -5,3 +5,5 @@
 - 구글 [Cloud Authentication](https://cloud.google.com/docs/authentication/getting-started?hl=ko) 으로 사용해서 로컬에서 실행시키는데, 
 만약 배포를 해야한다면 이 부분은 어떻게 해야할지 ..?
 - 사용자 인증 기능 추가 -> 회원 등록 시 관심가수를 입력받아서 로그인 할 때마다 최신 & 정확 & 소식 을 전달해줌 / 비회원으로도 이용가능_지금과 같이
+--> React Router 사용해서 /<> 에 따라서 login/register/chatpage 가 되도록 구현해야함.
+ -> 로그인,회원가입 페이지는 Boiler-plate 사용하기.............................도전
\ No newline at end of file
--- a/client/package-lock.json
View file @5e12e27
+++ b/client/package-lock.json
View file @5e12e27
@@ -2289,7 +2289,8 @@
         },
         "kind-of": {
           "version": "6.0.2",
-          "resolved": ""
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         }
       }
     },
@@ -4255,6 +4256,11 @@
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
     },
+    "deepmerge": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
+      "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
+    },
     "default-gateway": {
       "version": "2.7.2",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz",
@@ -5442,7 +5448,8 @@
         },
         "kind-of": {
           "version": "6.0.2",
-          "resolved": ""
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         }
       }
     },
@@ -5843,6 +5850,22 @@
         "mime-types": "^2.1.12"
       }
     },
+    "formik": {
+      "version": "1.5.8",
+      "resolved": "https://registry.npmjs.org/formik/-/formik-1.5.8.tgz",
+      "integrity": "sha512-fNvPe+ddbh+7xiByT25vuso2p2hseG/Yvuj211fV1DbCjljUEG9OpgRpcb7g7O3kxHX/q31cbZDzMxJXPWSNwA==",
+      "requires": {
+        "create-react-context": "^0.2.2",
+        "deepmerge": "^2.1.1",
+        "hoist-non-react-statics": "^3.3.0",
+        "lodash": "^4.17.14",
+        "lodash-es": "^4.17.14",
+        "prop-types": "^15.6.1",
+        "react-fast-compare": "^2.0.1",
+        "tiny-warning": "^1.0.2",
+        "tslib": "^1.9.3"
+      }
+    },
     "forwarded": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
@@ -8683,6 +8706,11 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
       "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
+    "lodash-es": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
+      "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
+    },
     "lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
@@ -13101,6 +13129,11 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.4.tgz",
       "integrity": "sha512-fp+U98OMZcnduQ+NSEiQa4s/XMsbp+5KlydmkbESOw4P69iWZ68ZMFM5a2BuE0FgqPBKApJyRuYHR95jM8lAmg=="
     },
+    "react-fast-compare": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz",
+      "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw=="
+    },
     "react-is": {
       "version": "16.8.6",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
@@ -14228,7 +14261,8 @@
         },
         "kind-of": {
           "version": "6.0.2",
-          "resolved": ""
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         }
       }
     },
--- a/client/src/App.js
View file @5e12e27
+++ b/client/src/App.js
View file @5e12e27
 import React from "react";
 import { Typography, Icon } from 'antd';
 import Chatbot from './Chatbot/Chatbot';
+
+
 const { Title } = Typography;
 function App() {
@@ -10,13 +12,10 @@ function App() {
         <Title level={2} >CHATBOT&nbsp;<Icon type="robot" /></Title>
       </div>
       <div style={{ display: 'flex', justifyContent: 'center' }}>
-       
         <Chatbot />
-
-
       </div>
     </div>
   )
 }
-export default App
+export default App;
--- a/client/src/views/Footer.js 0 → 100644
View file @5e12e27
+++ b/client/src/views/Footer.js 0 → 100644
View file @5e12e27
+import React from 'react'
+import {Icon} from 'antd';
+
+function Footer() {
+    return (
+        <div style={{
+            height: '80px', display: 'flex',
+            flexDirection: 'column', alignItems: 'center',
+            justifyContent: 'center', fontSize:'1rem'
+        }}>
+           <p> CHATBOT APP <Icon type="smile" /></p>
+        </div>
+    )
+}
+
+export default Footer
--- a/client/src/views/chatpage.js 0 → 100644
View file @5e12e27
+++ b/client/src/views/chatpage.js 0 → 100644
View file @5e12e27
+import React, { Suspense } from "react";
+import { Typography, Icon } from 'antd';
+import Chatbot from '../Chatbot/Chatbot';
+import { withRouter } from "react-router-dom";
+const { Title } = Typography;
+
+
+function chatpage() {
+  return (
+    <div>
+      <div style={{ display: 'flex', justifyContent: 'center', marginTop: '1rem' }}>
+        <Title level={2} >CHATBOT&nbsp;<Icon type="robot" /></Title>
+      </div>
+      <div style={{ display: 'flex', justifyContent: 'center' }}>
+        <Chatbot />
+      </div>
+    </div>
+  )
+}
+
+export default withRouter(chatpage);
\ No newline at end of file
--- a/client/src/views/loginpage.js 0 → 100644
View file @5e12e27
+++ b/client/src/views/loginpage.js 0 → 100644
View file @5e12e27
--- a/client/src/views/registerpage.js 0 → 100644
View file @5e12e27
+++ b/client/src/views/registerpage.js 0 → 100644
View file @5e12e27
--- a/package-lock.json
View file @5e12e27
+++ b/package-lock.json
View file @5e12e27
--- a/package.json
View file @5e12e27
+++ b/package.json
View file @5e12e27
@@ -14,16 +14,19 @@
     "dev": "concurrently \"npm run backend\"  \"npm run start --prefix client\""
   },
   "author": "Jaewon Ahn",
-  "contributors": ["Minjeong Seo"],
+  "contributors": [
+    "Minjeong Seo"
+  ],
   "license": "ISC",
   "dependencies": {
     "actions-on-google": "^2.12.0",
+    "axios": "^0.19.2",
     "body-parser": "^1.18.3",
+    "cheerio": "^1.0.0-rc.3",
     "dialogflow": "^0.8.2",
     "dialogflow-fulfillment": "^0.6.1",
     "express": "^4.16.4",
-    "cheerio": "^1.0.0-rc.3",
+    "yup": "^0.29.1"
-    "axios" : "^0.19.2"
   },
   "devDependencies": {
     "concurrently": "^4.1.0",