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-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/package.json b/bitimulate-frontend/package.json index d162609..4597bd4 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,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 index 76f1994..4031baf 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 - 가상화폐 모의 거래소 @@ -42,12 +42,12 @@ To create a production bundle, use `npm run build` or `yarn build`. --> -