서민정 / SEARCH-AND-CHAT

Go to a project
Toggle navigation Toggle navigation pinning
서민정
5e12e27d 1 parent ee442760

update directroy

Expand all
Inline Side-by-side
Showing 9 changed files with 86 additions and 11 deletions
...@@ -4,4 +4,6 @@ ...@@ -4,4 +4,6 @@
4 - 뉴스 크롤링 후 이미지 사이즈 80*80 인 것을 원본으로 변환할 수 있는 방법은..? 4 - 뉴스 크롤링 후 이미지 사이즈 80*80 인 것을 원본으로 변환할 수 있는 방법은..?
5 - 구글 [Cloud Authentication](https://cloud.google.com/docs/authentication/getting-started?hl=ko) 으로 사용해서 로컬에서 실행시키는데, 5 - 구글 [Cloud Authentication](https://cloud.google.com/docs/authentication/getting-started?hl=ko) 으로 사용해서 로컬에서 실행시키는데,
6 만약 배포를 해야한다면 이 부분은 어떻게 해야할지 ..? 6 만약 배포를 해야한다면 이 부분은 어떻게 해야할지 ..?
7 -- 사용자 인증 기능 추가 -> 회원 등록 시 관심가수를 입력받아서 로그인 할 때마다 최신 & 정확 & 소식 을 전달해줌 / 비회원으로도 이용가능_지금과 같이
...\ No newline at end of file ...\ No newline at end of file
7 +- 사용자 인증 기능 추가 -> 회원 등록 시 관심가수를 입력받아서 로그인 할 때마다 최신 & 정확 & 소식 을 전달해줌 / 비회원으로도 이용가능_지금과 같이
8 +--> React Router 사용해서 /<> 에 따라서 login/register/chatpage 가 되도록 구현해야함.
9 + -> 로그인,회원가입 페이지는 Boiler-plate 사용하기.............................도전
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2289,7 +2289,8 @@ ...@@ -2289,7 +2289,8 @@
2289 }, 2289 },
2290 "kind-of": { 2290 "kind-of": {
2291 "version": "6.0.2", 2291 "version": "6.0.2",
2292 - "resolved": "" 2292 + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
2293 + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
2293 } 2294 }
2294 } 2295 }
2295 }, 2296 },
...@@ -4255,6 +4256,11 @@ ...@@ -4255,6 +4256,11 @@
4255 "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", 4256 "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
4256 "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" 4257 "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
4257 }, 4258 },
4259 + "deepmerge": {
4260 + "version": "2.2.1",
4261 + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
4262 + "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
4263 + },
4258 "default-gateway": { 4264 "default-gateway": {
4259 "version": "2.7.2", 4265 "version": "2.7.2",
4260 "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz", 4266 "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz",
...@@ -5442,7 +5448,8 @@ ...@@ -5442,7 +5448,8 @@
5442 }, 5448 },
5443 "kind-of": { 5449 "kind-of": {
5444 "version": "6.0.2", 5450 "version": "6.0.2",
5445 - "resolved": "" 5451 + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
5452 + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
5446 } 5453 }
5447 } 5454 }
5448 }, 5455 },
...@@ -5843,6 +5850,22 @@ ...@@ -5843,6 +5850,22 @@
5843 "mime-types": "^2.1.12" 5850 "mime-types": "^2.1.12"
5844 } 5851 }
5845 }, 5852 },
5853 + "formik": {
5854 + "version": "1.5.8",
5855 + "resolved": "https://registry.npmjs.org/formik/-/formik-1.5.8.tgz",
5856 + "integrity": "sha512-fNvPe+ddbh+7xiByT25vuso2p2hseG/Yvuj211fV1DbCjljUEG9OpgRpcb7g7O3kxHX/q31cbZDzMxJXPWSNwA==",
5857 + "requires": {
5858 + "create-react-context": "^0.2.2",
5859 + "deepmerge": "^2.1.1",
5860 + "hoist-non-react-statics": "^3.3.0",
5861 + "lodash": "^4.17.14",
5862 + "lodash-es": "^4.17.14",
5863 + "prop-types": "^15.6.1",
5864 + "react-fast-compare": "^2.0.1",
5865 + "tiny-warning": "^1.0.2",
5866 + "tslib": "^1.9.3"
5867 + }
5868 + },
5846 "forwarded": { 5869 "forwarded": {
5847 "version": "0.1.2", 5870 "version": "0.1.2",
5848 "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", 5871 "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
...@@ -8683,6 +8706,11 @@ ...@@ -8683,6 +8706,11 @@
8683 "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", 8706 "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
8684 "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" 8707 "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
8685 }, 8708 },
8709 + "lodash-es": {
8710 + "version": "4.17.15",
8711 + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
8712 + "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
8713 + },
8686 "lodash._reinterpolate": { 8714 "lodash._reinterpolate": {
8687 "version": "3.0.0", 8715 "version": "3.0.0",
8688 "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", 8716 "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
...@@ -13101,6 +13129,11 @@ ...@@ -13101,6 +13129,11 @@
13101 "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.4.tgz", 13129 "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.4.tgz",
13102 "integrity": "sha512-fp+U98OMZcnduQ+NSEiQa4s/XMsbp+5KlydmkbESOw4P69iWZ68ZMFM5a2BuE0FgqPBKApJyRuYHR95jM8lAmg==" 13130 "integrity": "sha512-fp+U98OMZcnduQ+NSEiQa4s/XMsbp+5KlydmkbESOw4P69iWZ68ZMFM5a2BuE0FgqPBKApJyRuYHR95jM8lAmg=="
13103 }, 13131 },
13132 + "react-fast-compare": {
13133 + "version": "2.0.4",
13134 + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz",
13135 + "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw=="
13136 + },
13104 "react-is": { 13137 "react-is": {
13105 "version": "16.8.6", 13138 "version": "16.8.6",
13106 "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", 13139 "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
...@@ -14228,7 +14261,8 @@ ...@@ -14228,7 +14261,8 @@
14228 }, 14261 },
14229 "kind-of": { 14262 "kind-of": {
14230 "version": "6.0.2", 14263 "version": "6.0.2",
14231 - "resolved": "" 14264 + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
14265 + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
14232 } 14266 }
14233 } 14267 }
14234 }, 14268 },
......
1 import React from "react"; 1 import React from "react";
2 import { Typography, Icon } from 'antd'; 2 import { Typography, Icon } from 'antd';
3 import Chatbot from './Chatbot/Chatbot'; 3 import Chatbot from './Chatbot/Chatbot';
4 +
5 +
4 const { Title } = Typography; 6 const { Title } = Typography;
5 7
6 function App() { 8 function App() {
...@@ -10,13 +12,10 @@ function App() { ...@@ -10,13 +12,10 @@ function App() {
10 <Title level={2} >CHATBOT&nbsp;<Icon type="robot" /></Title> 12 <Title level={2} >CHATBOT&nbsp;<Icon type="robot" /></Title>
11 </div> 13 </div>
12 <div style={{ display: 'flex', justifyContent: 'center' }}> 14 <div style={{ display: 'flex', justifyContent: 'center' }}>
13 -
14 <Chatbot /> 15 <Chatbot />
15 -
16 -
17 </div> 16 </div>
18 </div> 17 </div>
19 ) 18 )
20 } 19 }
21 20
22 -export default App 21 +export default App;
......
1 +import React from 'react'
2 +import {Icon} from 'antd';
3 +
4 +function Footer() {
5 + return (
6 + <div style={{
7 + height: '80px', display: 'flex',
8 + flexDirection: 'column', alignItems: 'center',
9 + justifyContent: 'center', fontSize:'1rem'
10 + }}>
11 + <p> CHATBOT APP <Icon type="smile" /></p>
12 + </div>
13 + )
14 +}
15 +
16 +export default Footer
1 +import React, { Suspense } from "react";
2 +import { Typography, Icon } from 'antd';
3 +import Chatbot from '../Chatbot/Chatbot';
4 +import { withRouter } from "react-router-dom";
5 +const { Title } = Typography;
6 +
7 +
8 +function chatpage() {
9 + return (
10 + <div>
11 + <div style={{ display: 'flex', justifyContent: 'center', marginTop: '1rem' }}>
12 + <Title level={2} >CHATBOT&nbsp;<Icon type="robot" /></Title>
13 + </div>
14 + <div style={{ display: 'flex', justifyContent: 'center' }}>
15 + <Chatbot />
16 + </div>
17 + </div>
18 + )
19 +}
20 +
21 +export default withRouter(chatpage);
...\ No newline at end of file ...\ No newline at end of file
This diff is collapsed. Click to expand it.
...@@ -14,16 +14,19 @@ ...@@ -14,16 +14,19 @@
14 "dev": "concurrently \"npm run backend\" \"npm run start --prefix client\"" 14 "dev": "concurrently \"npm run backend\" \"npm run start --prefix client\""
15 }, 15 },
16 "author": "Jaewon Ahn", 16 "author": "Jaewon Ahn",
17 - "contributors": ["Minjeong Seo"], 17 + "contributors": [
18 + "Minjeong Seo"
19 + ],
18 "license": "ISC", 20 "license": "ISC",
19 "dependencies": { 21 "dependencies": {
20 "actions-on-google": "^2.12.0", 22 "actions-on-google": "^2.12.0",
23 + "axios": "^0.19.2",
21 "body-parser": "^1.18.3", 24 "body-parser": "^1.18.3",
25 + "cheerio": "^1.0.0-rc.3",
22 "dialogflow": "^0.8.2", 26 "dialogflow": "^0.8.2",
23 "dialogflow-fulfillment": "^0.6.1", 27 "dialogflow-fulfillment": "^0.6.1",
24 "express": "^4.16.4", 28 "express": "^4.16.4",
25 - "cheerio": "^1.0.0-rc.3", 29 + "yup": "^0.29.1"
26 - "axios" : "^0.19.2"
27 }, 30 },
28 "devDependencies": { 31 "devDependencies": {
29 "concurrently": "^4.1.0", 32 "concurrently": "^4.1.0",
......