서민정

upload gcp configuration files

1 +# This file specifies files that are *not* uploaded to Google Cloud Platform
2 +# using gcloud. It follows the same syntax as .gitignore, with the addition of
3 +# "#!include" directives (which insert the entries of the given .gitignore-style
4 +# file at that point).
5 +#
6 +# For more information, run:
7 +# $ gcloud topic gcloudignore
8 +#
9 +.gcloudignore
10 +# If you would like to upload your .git directory, .gitignore file or files
11 +# from your .gitignore file, remove the corresponding line
12 +# below:
13 +.git
14 +.gitignore
15 +
16 +# Node.js dependencies:
17 +node_modules/
18 +
19 +/node_modules
20 +/build
21 +/client/node_modules
22 +
23 +.DS_Store
24 +
25 +npm-debug.log*
26 +yarn-debug.log*
27 +yarn-error.log*
28 +
29 +.vscode
30 +
31 +dev.js
32 +./server/config/dev.js
1 +# Copyright 2017, Google, Inc.
2 +# Licensed under the Apache License, Version 2.0 (the "License");
3 +# you may not use this file except in compliance with the License.
4 +# You may obtain a copy of the License at
5 +#
6 +# http://www.apache.org/licenses/LICENSE-2.0
7 +#
8 +# Unless required by applicable law or agreed to in writing, software
9 +# distributed under the License is distributed on an "AS IS" BASIS,
10 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11 +# See the License for the specific language governing permissions and
12 +# limitations under the License.
13 +
14 +# [START gae_flex_quickstart_yaml]
15 +runtime: nodejs10
16 +
17 +# This sample incurs costs to run on the App Engine flexible environment.
18 +# The settings below are to reduce costs during testing and are not appropriate
19 +# for production use. For more information, see:
20 +# https://cloud.google.com/appengine/docs/flexible/nodejs/configuring-your-app-with-app-yaml
21 +
22 +
23 +# [END gae_flex_quickstart_yaml]
1 +# Copyright 2017, Google, Inc.
2 +# Licensed under the Apache License, Version 2.0 (the "License");
3 +# you may not use this file except in compliance with the License.
4 +# You may obtain a copy of the License at
5 +#
6 +# http://www.apache.org/licenses/LICENSE-2.0
7 +#
8 +# Unless required by applicable law or agreed to in writing, software
9 +# distributed under the License is distributed on an "AS IS" BASIS,
10 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11 +# See the License for the specific language governing permissions and
12 +# limitations under the License.
13 +
14 +# [START gae_flex_quickstart_yaml]
15 +runtime: nodejs10
16 +
17 +
18 +# [END gae_flex_quickstart_yaml]
...@@ -2289,8 +2289,7 @@ ...@@ -2289,8 +2289,7 @@
2289 }, 2289 },
2290 "kind-of": { 2290 "kind-of": {
2291 "version": "6.0.2", 2291 "version": "6.0.2",
2292 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", 2292 + "resolved": ""
2293 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
2294 } 2293 }
2295 } 2294 }
2296 }, 2295 },
...@@ -4256,11 +4255,6 @@ ...@@ -4256,11 +4255,6 @@
4256 "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", 4255 "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
4257 "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" 4256 "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
4258 }, 4257 },
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 - },
4264 "default-gateway": { 4258 "default-gateway": {
4265 "version": "2.7.2", 4259 "version": "2.7.2",
4266 "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz", 4260 "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz",
...@@ -5158,9 +5152,9 @@ ...@@ -5158,9 +5152,9 @@
5158 "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" 5152 "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
5159 }, 5153 },
5160 "eventemitter3": { 5154 "eventemitter3": {
5161 - "version": "3.1.0", 5155 + "version": "4.0.4",
5162 - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", 5156 + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
5163 - "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==" 5157 + "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="
5164 }, 5158 },
5165 "eventlistener": { 5159 "eventlistener": {
5166 "version": "0.0.1", 5160 "version": "0.0.1",
...@@ -5448,8 +5442,7 @@ ...@@ -5448,8 +5442,7 @@
5448 }, 5442 },
5449 "kind-of": { 5443 "kind-of": {
5450 "version": "6.0.2", 5444 "version": "6.0.2",
5451 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", 5445 + "resolved": ""
5452 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
5453 } 5446 }
5454 } 5447 }
5455 }, 5448 },
...@@ -5786,11 +5779,11 @@ ...@@ -5786,11 +5779,11 @@
5786 } 5779 }
5787 }, 5780 },
5788 "follow-redirects": { 5781 "follow-redirects": {
5789 - "version": "1.7.0", 5782 + "version": "1.11.0",
5790 - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz", 5783 + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz",
5791 - "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==", 5784 + "integrity": "sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==",
5792 "requires": { 5785 "requires": {
5793 - "debug": "^3.2.6" 5786 + "debug": "^3.0.0"
5794 }, 5787 },
5795 "dependencies": { 5788 "dependencies": {
5796 "debug": { 5789 "debug": {
...@@ -5802,9 +5795,9 @@ ...@@ -5802,9 +5795,9 @@
5802 } 5795 }
5803 }, 5796 },
5804 "ms": { 5797 "ms": {
5805 - "version": "2.1.1", 5798 + "version": "2.1.2",
5806 - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", 5799 + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
5807 - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" 5800 + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
5808 } 5801 }
5809 } 5802 }
5810 }, 5803 },
...@@ -5850,22 +5843,6 @@ ...@@ -5850,22 +5843,6 @@
5850 "mime-types": "^2.1.12" 5843 "mime-types": "^2.1.12"
5851 } 5844 }
5852 }, 5845 },
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 - },
5869 "forwarded": { 5846 "forwarded": {
5870 "version": "0.1.2", 5847 "version": "0.1.2",
5871 "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", 5848 "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
...@@ -6955,11 +6932,11 @@ ...@@ -6955,11 +6932,11 @@
6955 "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==" 6932 "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w=="
6956 }, 6933 },
6957 "http-proxy": { 6934 "http-proxy": {
6958 - "version": "1.17.0", 6935 + "version": "1.18.1",
6959 - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", 6936 + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
6960 - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", 6937 + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
6961 "requires": { 6938 "requires": {
6962 - "eventemitter3": "^3.0.0", 6939 + "eventemitter3": "^4.0.0",
6963 "follow-redirects": "^1.0.0", 6940 "follow-redirects": "^1.0.0",
6964 "requires-port": "^1.0.0" 6941 "requires-port": "^1.0.0"
6965 } 6942 }
...@@ -8706,11 +8683,6 @@ ...@@ -8706,11 +8683,6 @@
8706 "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", 8683 "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
8707 "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" 8684 "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
8708 }, 8685 },
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 - },
8714 "lodash._reinterpolate": { 8686 "lodash._reinterpolate": {
8715 "version": "3.0.0", 8687 "version": "3.0.0",
8716 "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", 8688 "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
...@@ -13129,11 +13101,6 @@ ...@@ -13129,11 +13101,6 @@
13129 "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.4.tgz", 13101 "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.4.tgz",
13130 "integrity": "sha512-fp+U98OMZcnduQ+NSEiQa4s/XMsbp+5KlydmkbESOw4P69iWZ68ZMFM5a2BuE0FgqPBKApJyRuYHR95jM8lAmg==" 13102 "integrity": "sha512-fp+U98OMZcnduQ+NSEiQa4s/XMsbp+5KlydmkbESOw4P69iWZ68ZMFM5a2BuE0FgqPBKApJyRuYHR95jM8lAmg=="
13131 }, 13103 },
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 - },
13137 "react-is": { 13104 "react-is": {
13138 "version": "16.8.6", 13105 "version": "16.8.6",
13139 "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", 13106 "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
...@@ -14261,8 +14228,7 @@ ...@@ -14261,8 +14228,7 @@
14261 }, 14228 },
14262 "kind-of": { 14229 "kind-of": {
14263 "version": "6.0.2", 14230 "version": "6.0.2",
14264 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", 14231 + "resolved": ""
14265 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
14266 } 14232 }
14267 } 14233 }
14268 }, 14234 },
......
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
2 "name": "client", 2 "name": "client",
3 "version": "0.1.0", 3 "version": "0.1.0",
4 "private": true, 4 "private": true,
5 + "engines": {
6 + "node": "10.x.x",
7 + "npm": "6.13.4"
8 + },
5 "dependencies": { 9 "dependencies": {
6 "antd": "^3.26.5", 10 "antd": "^3.26.5",
7 "axios": "^0.18.1", 11 "axios": "^0.18.1",
......
...@@ -2,6 +2,7 @@ const proxy = require("http-proxy-middleware"); ...@@ -2,6 +2,7 @@ const proxy = require("http-proxy-middleware");
2 2
3 module.exports = function(app) { 3 module.exports = function(app) {
4 4
5 - app.use(proxy("/api", { target: "http://localhost:5000/" })); 5 + app.use(proxy("/api", { target: "https://oss-chatbot-app.ue.r.appspot.com" }));
6 6
7 }; 7 };
8 +// target: "http://localhost:5000/"
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -21,7 +21,7 @@ if (process.env.NODE_ENV === "production") { ...@@ -21,7 +21,7 @@ if (process.env.NODE_ENV === "production") {
21 app.use(express.static("client/build")); 21 app.use(express.static("client/build"));
22 22
23 // index.html for all page routes 23 // index.html for all page routes
24 - app.get("*", (req, res) => { 24 + app.get("/", (req, res) => {
25 res.sendFile(path.resolve(__dirname, "client", "build", "index.html")); 25 res.sendFile(path.resolve(__dirname, "client", "build", "index.html"));
26 }); 26 });
27 } 27 }
......
This diff is collapsed. Click to expand it.
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
4 "description": "chatbot-app", 4 "description": "chatbot-app",
5 "main": "index.js", 5 "main": "index.js",
6 "engines": { 6 "engines": {
7 - "node": "10.15.0", 7 + "node": "10.x.x",
8 - "npm": "6.9.0" 8 + "npm": "6.13.4"
9 }, 9 },
10 "scripts": { 10 "scripts": {
11 "start": "node index.js", 11 "start": "node index.js",
12 + "dev": "concurrently \"npm run backend\" \"npm run start --prefix client\"",
12 "backend": "nodemon index.js", 13 "backend": "nodemon index.js",
13 - "frontend": "npm run front --prefix client", 14 + "frontend": "npm run front --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": [ 17 "contributors": [
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
19 ], 19 ],
20 "license": "ISC", 20 "license": "ISC",
21 "dependencies": { 21 "dependencies": {
22 + "@google-cloud/bigquery": "^4.7.0",
22 "actions-on-google": "^2.12.0", 23 "actions-on-google": "^2.12.0",
23 "axios": "^0.19.2", 24 "axios": "^0.19.2",
24 "body-parser": "^1.18.3", 25 "body-parser": "^1.18.3",
......
1 -if (process.env.NODE_ENV === 'production'){ 1 +if (process.env.NODE_ENV === "production"){
2 - module.exports = require('./prod'); 2 + module.exports = require("./prod");
3 }else{ 3 }else{
4 - module.exports = require('./dev'); 4 + module.exports = require("./dev");
5 } 5 }
...\ No newline at end of file ...\ No newline at end of file
......