From 15f61dcdf9a0882ee87be5ecd6ff39ec5979124e Mon Sep 17 00:00:00 2001 From: Kong Chae Won Date: Sun, 27 Sep 2020 23:10:20 +0900 Subject: [PATCH 01/10] =?UTF-8?q?chore:=20=F0=9F=A4=96=20remove=20commente?= =?UTF-8?q?d=20codes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/rollingService.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/services/rollingService.js b/services/rollingService.js index 913710b..40bf8e5 100644 --- a/services/rollingService.js +++ b/services/rollingService.js @@ -23,16 +23,6 @@ const rollingService = { console.log(res); return res.data || []; }, - - // getRollingByName: async (name, password) => { - // // const name = "ddd"; - // // const password = "dd"; - // console.log(name, password); - // let res = await baseAPI.get( - // `/api/rolling?name=${encodeURI(name)}&password=${encodeURI(password)}` - // ); - // return res.data || []; - // }, getRolling: async () => { let res = await baseAPI.get(`/api/v1/count`); return res.data || []; From 9fa05b574d58694782a54561438fad405ae7d681 Mon Sep 17 00:00:00 2001 From: Kong Chae Won Date: Sun, 27 Sep 2020 23:56:53 +0900 Subject: [PATCH 02/10] =?UTF-8?q?chore:=20=F0=9F=A4=96=20update=20deploy?= =?UTF-8?q?=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .npmrc | 1 + package.json | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..4d936e8 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +unsafe-perm=true diff --git a/package.json b/package.json index beeace9..d5ceb93 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,10 @@ "author": "DANNIEL ", "license": "MIT", "scripts": { - "dev": "next", - "build": "next build", - "start": "next start" + "dev": "next dev", + "start": "next start -p 8081", + "build": "npm run clean && next build", + "clean": "rm -rf .next" }, "dependencies": { "@fullpage/react-fullpage": "0.1.17", From 143cc168174d33cc99dccc2246a5f872f9476786 Mon Sep 17 00:00:00 2001 From: Kong Chae Won Date: Mon, 28 Sep 2020 00:25:29 +0900 Subject: [PATCH 03/10] =?UTF-8?q?chore:=20=F0=9F=A4=96=20update=20gitignor?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index defb31a..cec76a0 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,8 @@ $RECYCLE.BIN/ .DS_Store .next + +# Elastic Beanstalk Files +.elasticbeanstalk/* +!.elasticbeanstalk/*.cfg.yml +!.elasticbeanstalk/*.global.yml From dcf6a0de3b236a976eaa06b4b4017d93692656a3 Mon Sep 17 00:00:00 2001 From: Kong Chae Won Date: Mon, 28 Sep 2020 00:35:59 +0900 Subject: [PATCH 04/10] remove comment --- services/rollingService.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/services/rollingService.js b/services/rollingService.js index 40bf8e5..74c9827 100644 --- a/services/rollingService.js +++ b/services/rollingService.js @@ -81,19 +81,6 @@ const rollingService = { throw new Error(message); }, - // postRolling: async (object) => { - // console.log("ddd"); - // await baseAPI - // .post(`/api/rolling`, object) - // .then((res) => { - // console.log(res.data); - // return 1; - // }) - // .catch((err) => { - // console.log(err); - // return 0; - // }); - // }, postRolling: async (receiver, password) => { console.log('postRolling : ', receiver, password); await baseAPI From 9621f57858e7caa9b753716d3a7ab5906674bc77 Mon Sep 17 00:00:00 2001 From: Kong Chae Won Date: Mon, 28 Sep 2020 00:43:46 +0900 Subject: [PATCH 05/10] add deploy-dev --- .ebignore | 2 ++ package.json | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .ebignore diff --git a/.ebignore b/.ebignore new file mode 100644 index 0000000..3978a0f --- /dev/null +++ b/.ebignore @@ -0,0 +1,2 @@ +.git +.gitignore diff --git a/package.json b/package.json index d5ceb93..d1301be 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "dev": "next dev", "start": "next start -p 8081", "build": "npm run clean && next build", - "clean": "rm -rf .next" + "clean": "rm -rf .next", + "deploy-dev": "npm install && npm run build && eb deploy RollingPaperClient-dev" }, "dependencies": { "@fullpage/react-fullpage": "0.1.17", From ef9bfbd716956a294ea736cf334de9a87e1c02d5 Mon Sep 17 00:00:00 2001 From: Kong Chae Won Date: Mon, 28 Sep 2020 01:01:42 +0900 Subject: [PATCH 06/10] add ebextension --- .ebextensions/options.config | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .ebextensions/options.config diff --git a/.ebextensions/options.config b/.ebextensions/options.config new file mode 100644 index 0000000..529e18c --- /dev/null +++ b/.ebextensions/options.config @@ -0,0 +1,3 @@ +option_settings: + aws:elasticbeanstalk:application:environment: + NODE_ENV: production From 5a8e3926205afa9c405abb9dfcc11e21599746c4 Mon Sep 17 00:00:00 2001 From: Kong Chae Won Date: Mon, 28 Sep 2020 01:28:49 +0900 Subject: [PATCH 07/10] Use apilb --- services/rollingService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/rollingService.js b/services/rollingService.js index 74c9827..2ac2629 100644 --- a/services/rollingService.js +++ b/services/rollingService.js @@ -2,7 +2,7 @@ import axios from 'axios'; // let BASE_URL = "https://donghoon.tk"; -let BASE_URL = 'https://apis.rollingpaper.site'; +let BASE_URL = 'https://apilb.rollingpaper.site'; const baseAPI = axios.create({ baseURL: BASE_URL, From dcf4a0993a9a34ed907a3b24efe7a4718d8d4b2d Mon Sep 17 00:00:00 2001 From: Kong Chae Won Date: Mon, 28 Sep 2020 01:40:00 +0900 Subject: [PATCH 08/10] Update script --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d1301be..17988b0 100644 --- a/package.json +++ b/package.json @@ -7,10 +7,9 @@ "license": "MIT", "scripts": { "dev": "next dev", - "start": "next start -p 8081", + "start": "next start", "build": "npm run clean && next build", - "clean": "rm -rf .next", - "deploy-dev": "npm install && npm run build && eb deploy RollingPaperClient-dev" + "clean": "rm -rf .next" }, "dependencies": { "@fullpage/react-fullpage": "0.1.17", From 635bc86a2c638e1a27c0845a58399af1b9afbff1 Mon Sep 17 00:00:00 2001 From: Kong Chae Won Date: Mon, 28 Sep 2020 10:59:47 +0900 Subject: [PATCH 09/10] Trim password --- pages/create.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pages/create.js b/pages/create.js index 5bcd3ab..498dbc4 100644 --- a/pages/create.js +++ b/pages/create.js @@ -34,11 +34,12 @@ const Index = () => { const classes = useStyles(); const [name, setName] = useState(''); const [password, setPassword] = useState(''); - const onSubmit = async () => { + const onSubmit = () => { + const trimmedPassword = password.trim() try { - await rollingService.postRolling(name, password).then(async (res) => { + rollingService.postRolling(name, trimmedPassword).then(async (res) => { console.log(res); - window.location.href = `/sender/main?name=${name}&num=${password}`; + window.location.href = `/sender/main?name=${name}&num=${trimmedPassword}`; }); } catch (err) { console.log(err); @@ -125,8 +126,8 @@ const Index = () => { 생성 및 조회하기 ) : ( - 모두 작성해주세요 - )} + 모두 작성해주세요 + )} From 1ee5802b2a9a50adf48f12095259435923bcb3f1 Mon Sep 17 00:00:00 2001 From: Kong Chae Won Date: Mon, 28 Sep 2020 11:03:40 +0900 Subject: [PATCH 10/10] Remove eb config --- .ebextensions/options.config | 3 --- .ebignore | 2 -- .gitignore | 5 ----- 3 files changed, 10 deletions(-) delete mode 100644 .ebextensions/options.config delete mode 100644 .ebignore diff --git a/.ebextensions/options.config b/.ebextensions/options.config deleted file mode 100644 index 529e18c..0000000 --- a/.ebextensions/options.config +++ /dev/null @@ -1,3 +0,0 @@ -option_settings: - aws:elasticbeanstalk:application:environment: - NODE_ENV: production diff --git a/.ebignore b/.ebignore deleted file mode 100644 index 3978a0f..0000000 --- a/.ebignore +++ /dev/null @@ -1,2 +0,0 @@ -.git -.gitignore diff --git a/.gitignore b/.gitignore index cec76a0..defb31a 100644 --- a/.gitignore +++ b/.gitignore @@ -104,8 +104,3 @@ $RECYCLE.BIN/ .DS_Store .next - -# Elastic Beanstalk Files -.elasticbeanstalk/* -!.elasticbeanstalk/*.cfg.yml -!.elasticbeanstalk/*.global.yml