From 142a628aae5114bfff4b4acd27ca08523ca0e8df Mon Sep 17 00:00:00 2001 From: choijinwon Date: Thu, 6 Dec 2018 12:30:56 +0900 Subject: [PATCH 1/5] Revert "Update README.md" This reverts commit a8235ced9547451a275e6c361a28ab6d74217408. --- README.md | 4 ++-- bitimulate-frontend/package.json | 8 ++++++++ bitimulate-frontend/scripts/start.js | 4 ++++ bitimulate-frontend/src/index.js | 9 +++++++++ bitimulate-frontend/yarn.lock | 16 ++++++++++++++++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6ca4e53..91895b9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # bitimulate -> Bitimulate is closed; the service is not available anymore. +> This service is now available at https://bitimulate.com/ ## About @@ -91,4 +91,4 @@ $ yarn start ### Questions -Feel free to submit new issue when you have questions or find some bugs. +Feel free to submit new issue when you have questions or find some bugs. \ No newline at end of file diff --git a/bitimulate-frontend/package.json b/bitimulate-frontend/package.json index d162609..1dcc22d 100644 --- a/bitimulate-frontend/package.json +++ b/bitimulate-frontend/package.json @@ -16,7 +16,11 @@ "classnames": "^2.2.5", "css-loader": "0.28.4", "dotenv": "4.0.0", +<<<<<<< HEAD + "echarts": "^4.2.0-rc.2", +======= "echarts": "^3.7.1", +>>>>>>> a8235ced9547451a275e6c361a28ab6d74217408 "eslint": "3.19.0", "eslint-config-react-app": "^1.0.5", "eslint-loader": "1.7.1", @@ -122,5 +126,9 @@ "node-sass": "^4.5.3", "sass-loader": "^6.0.6" }, +<<<<<<< HEAD + "proxy": "http://221.148.121.120:4000" +======= "proxy": "https://api.bitimulate.com/" +>>>>>>> a8235ced9547451a275e6c361a28ab6d74217408 } diff --git a/bitimulate-frontend/scripts/start.js b/bitimulate-frontend/scripts/start.js index 2686e7f..9131030 100644 --- a/bitimulate-frontend/scripts/start.js +++ b/bitimulate-frontend/scripts/start.js @@ -41,7 +41,11 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) { // Tools like Cloud9 rely on this. const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000; +<<<<<<< HEAD +const HOST = process.env.HOST || '221.148.121.120'; +======= const HOST = process.env.HOST || '0.0.0.0'; +>>>>>>> a8235ced9547451a275e6c361a28ab6d74217408 // We attempt to use the default port but if it is busy, we offer the user to // run on a different port. `detect()` Promise resolves to the next free port. diff --git a/bitimulate-frontend/src/index.js b/bitimulate-frontend/src/index.js index 8acfd92..699381e 100644 --- a/bitimulate-frontend/src/index.js +++ b/bitimulate-frontend/src/index.js @@ -11,12 +11,21 @@ import axios from 'axios'; window.axios = axios; const socketURI = process.env.NODE_ENV === 'production' +<<<<<<< HEAD + ? 'wss://221.148.121.120/ws' + : 'ws://221.148.121.120:4000/ws' + +if(process.env.NODE_ENV === 'production') { + axios.defaults.withCredentials = true; + axios.defaults.baseURL = 'https://221.148.121.120:4000'; +======= ? 'wss://api.bitimulate.com/ws' : 'ws://localhost:4000/ws' if(process.env.NODE_ENV === 'production') { axios.defaults.withCredentials = true; axios.defaults.baseURL = 'https://api.bitimulate.com'; +>>>>>>> a8235ced9547451a275e6c361a28ab6d74217408 } console.log(socketURI); diff --git a/bitimulate-frontend/yarn.lock b/bitimulate-frontend/yarn.lock index 49a1aa5..0721033 100644 --- a/bitimulate-frontend/yarn.lock +++ b/bitimulate-frontend/yarn.lock @@ -2436,11 +2436,20 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" +<<<<<<< HEAD +echarts@^4.2.0-rc.2: + version "4.2.0-rc.2" + resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.2.0-rc.2.tgz#6a98397aafa81b65cbf0bc15d9afdbfb244df91e" + integrity sha512-5Y4Kyi4eNsRM9Cnl7Q8C6PFVjznBJv1VIiMm/VSQ9zyqeo+ce1695GqUd9v4zfVx+Ow1gnwMJX67h0FNvarScw== + dependencies: + zrender "4.0.5" +======= echarts@^3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/echarts/-/echarts-3.7.1.tgz#fad25d4b1cbb7ec28f1b0fa890e9a0d86056b2d5" dependencies: zrender "^3.6.1" +>>>>>>> a8235ced9547451a275e6c361a28ab6d74217408 ee-first@1.1.1: version "1.1.1" @@ -7861,6 +7870,13 @@ yargs@~3.10.0: decamelize "^1.0.0" window-size "0.1.0" +<<<<<<< HEAD +zrender@4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.0.5.tgz#6e8f738971ce2cd624aac82b2156729b1c0e5a82" + integrity sha512-SintgipGEJPT9Sz2ABRoE4ZD7Yzy7oR7j7KP6H+C9FlbHWnLUfGVK7E8UV27pGwlxAMB0EsnrqhXx5XjAfv/KA== +======= zrender@^3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/zrender/-/zrender-3.6.1.tgz#362e8c4eb6c970a8d97c84daa8d65f37921b826b" +>>>>>>> a8235ced9547451a275e6c361a28ab6d74217408 From a8b21698b26008d5002012a54010330f6f2a40d9 Mon Sep 17 00:00:00 2001 From: choijinwon Date: Thu, 6 Dec 2018 13:05:18 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=85=8B=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bitimulate-backend/.env.bak | 4 ++-- bitimulate-frontend/public/index.html | 2 +- bitimulate-frontend/scripts/start.js | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/bitimulate-backend/.env.bak b/bitimulate-backend/.env.bak index d92b3e8..c210829 100644 --- a/bitimulate-backend/.env.bak +++ b/bitimulate-backend/.env.bak @@ -1,6 +1,6 @@ PORT=4000 -POLONIEX_API=LXN550AK-ZRG9BXCK-F84XU46N-XQJFJ9FV -POLONIEX_SECRET_KEY=7b56e2bd0fe9b26767ecc8bb43b8eab7d093f73e032f763fc554d4d9dae039b6d03b7fcf21fae20478e2000146086c343ffbed66f155a7a0d15b27d1930fff3b +POLONIEX_API=VATTKM6T-1WTUORJP-94YMRQQL-DSQYXKBI +POLONIEX_SECRET_KEY=bf87f34fa3aba0a28e87be0856d71b0d9baf5c93ca3373bc4d913ae6ede90859bf6eb8566a086b4dc515d73d2506d21f5080d825a89619490c5b67c750b6d1a4 MONGO_URI=mongodb://localhost/bitimulate PASSWORD_HASH_KEY=1234 JWT_SECRET=1234 \ No newline at end of file diff --git a/bitimulate-frontend/public/index.html b/bitimulate-frontend/public/index.html index 76f1994..cc02546 100644 --- a/bitimulate-frontend/public/index.html +++ b/bitimulate-frontend/public/index.html @@ -23,7 +23,7 @@ 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`. --> - Bitimulate - 가상화폐 모의 거래소 + Kaiser - 가상화폐 모의 거래소 diff --git a/bitimulate-frontend/scripts/start.js b/bitimulate-frontend/scripts/start.js index 9131030..30c2a06 100644 --- a/bitimulate-frontend/scripts/start.js +++ b/bitimulate-frontend/scripts/start.js @@ -41,11 +41,7 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) { // Tools like Cloud9 rely on this. const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000; -<<<<<<< HEAD const HOST = process.env.HOST || '221.148.121.120'; -======= -const HOST = process.env.HOST || '0.0.0.0'; ->>>>>>> a8235ced9547451a275e6c361a28ab6d74217408 // We attempt to use the default port but if it is busy, we offer the user to // run on a different port. `detect()` Promise resolves to the next free port. From c0676a30107179556053b653db8ca605dcab2c81 Mon Sep 17 00:00:00 2001 From: choijinwon Date: Thu, 6 Dec 2018 13:12:08 +0900 Subject: [PATCH 3/5] =?UTF-8?q?packang=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bitimulate-frontend/package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bitimulate-frontend/package.json b/bitimulate-frontend/package.json index 1dcc22d..4597bd4 100644 --- a/bitimulate-frontend/package.json +++ b/bitimulate-frontend/package.json @@ -126,9 +126,5 @@ "node-sass": "^4.5.3", "sass-loader": "^6.0.6" }, -<<<<<<< HEAD - "proxy": "http://221.148.121.120:4000" -======= - "proxy": "https://api.bitimulate.com/" ->>>>>>> a8235ced9547451a275e6c361a28ab6d74217408 + "proxy": "http://221.148.121.120:4000" } From 89c0f6c98cae7951be138ec56541707d01ee716e Mon Sep 17 00:00:00 2001 From: choijinwon Date: Thu, 6 Dec 2018 13:14:56 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=EA=B4=91=EA=B3=A0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bitimulate-frontend/public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitimulate-frontend/public/index.html b/bitimulate-frontend/public/index.html index cc02546..4031baf 100644 --- a/bitimulate-frontend/public/index.html +++ b/bitimulate-frontend/public/index.html @@ -42,12 +42,12 @@ To create a production bundle, use `npm run build` or `yarn build`. --> -