velopert · choijinwon · Dec 6, 2018 · Dec 6, 2018 · Dec 6, 2018 · Dec 6, 2018
diff --git 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.
diff --git 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
diff --git 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,5 @@
     "node-sass": "^4.5.3",
     "sass-loader": "^6.0.6"
   },
-  "proxy": "https://api.bitimulate.com/"
+ "proxy": "http://221.148.121.120:4000"
 }
diff --git 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`.
     -->
-    <title>Bitimulate - 가상화폐 모의 거래소</title>
+    <title>Kaiser - 가상화폐 모의 거래소</title>
     <meta name="description" content="과연 당신은 가상화폐 시장에서 수익을 낼 수 있을까요? 모의거래를 통해 알아보세요. 매달 수익률 랭킹 1위에게 상금이 지급됩니다." >
   </head>
   <body>
@@ -42,12 +42,12 @@
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
     <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-    <script>
+    <!-- <script>
       (adsbygoogle = window.adsbygoogle || []).push({
         google_ad_client: "ca-pub-6807457667706869",
         enable_page_level_ads: true
       });
     </script>
-
+     -->
   </body>
 </html>
diff --git a/bitimulate-frontend/scripts/start.js b/bitimulate-frontend/scripts/start.js
@@ -41,7 +41,7 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
 
 // Tools like Cloud9 rely on this.
 const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000;
-const HOST = process.env.HOST || '0.0.0.0';
+const HOST = process.env.HOST || '221.148.121.120';
 
 // 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
@@ -11,12 +11,12 @@ import axios from 'axios';
 
 window.axios = axios;
 const socketURI = process.env.NODE_ENV === 'production'
-                    ? 'wss://api.bitimulate.com/ws'
-                    : 'ws://localhost:4000/ws'
+                    ? '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://api.bitimulate.com';
+  axios.defaults.baseURL = 'https://221.148.121.120:4000';
 }
 
 console.log(socketURI);

diff --git 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