From beb7f065486eb8f8ec8262032c0fcf4a772ee14c Mon Sep 17 00:00:00 2001 From: Gabriele De Rosa Date: Sat, 29 Feb 2020 02:07:52 +0100 Subject: [PATCH 1/7] update readme --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9ffd905..f7a8fa9 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ The previous command starts both the [daemon](./daemon) and the web interface. ## Docker #### Manual 1. [Start the `coingraph-daemon`](./daemon/README.md#start-container) and then -2. +2. Run the container ```shell docker run -d \ -p 3000:3000 \ @@ -39,12 +39,10 @@ The previous command starts both the [daemon](./daemon) and the web interface. ``` #### Using `docker-compose` -Open `docker-compose.yml` and eventually change environment variables. - -And then +Open `docker-compose.yml` and eventually change environment variables. And then ```shell docker-compose up -d --build ``` ## License -_Coingraph_ is made with ♥ by [derogab](https://github.com/derogab) and the [amazing dev team](https://github.com/derogab/coingraph/graphs/contributors). It is released under the MIT license. +[_Coingraph_](https://github.com/derogab/coingraph) is made with ♥ by [derogab](https://github.com/derogab) and the [amazing dev team](https://github.com/derogab/coingraph/graphs/contributors). It is released under the MIT license. From 10594ad1e4392ae809bfe86a43fdb92ca0b8d1bf Mon Sep 17 00:00:00 2001 From: Gabriele De Rosa Date: Sat, 29 Feb 2020 12:48:08 +0100 Subject: [PATCH 2/7] io socket url on env --- .env | 1 + docker-compose.yml | 1 + src/index.js | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.env b/.env index ec6bda2..180ed3b 100644 --- a/.env +++ b/.env @@ -1 +1,2 @@ +REACT_APP_DAEMON_SOCKET_URL=http://localhost REACT_APP_DAEMON_SOCKET_PORT=8081 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a65c57e..9f5efe1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,4 +31,5 @@ services: ports: - '3000:3000' environment: + - REACT_APP_DAEMON_SOCKET_URL=http://localhost - REACT_APP_DAEMON_SOCKET_PORT=8081 \ No newline at end of file diff --git a/src/index.js b/src/index.js index 73668d9..47b40d3 100644 --- a/src/index.js +++ b/src/index.js @@ -9,8 +9,9 @@ import * as serviceWorker from './serviceWorker'; dotenv.config(); +const SOCKET_URL = process.env.REACT_APP_DAEMON_SOCKET_URL || 'http://localhost'; const SOCKET_PORT = process.env.REACT_APP_DAEMON_SOCKET_PORT || 8081; -const socketIo = io(`http://localhost:${SOCKET_PORT}`); +const socketIo = io(`${SOCKET_URL}:${SOCKET_PORT}`); ReactDOM.render(, document.getElementById('root')); From 6edcc44243807ce11787e1bd53dc9b128fb265d6 Mon Sep 17 00:00:00 2001 From: Gabriele De Rosa Date: Sat, 29 Feb 2020 13:18:13 +0100 Subject: [PATCH 3/7] minor fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f7a8fa9..89f4e52 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Coingraph is a **real-time graph for cryptocurrencies**. -![header](./assets/header.png) +![](./assets/header.png) ## Dependencies ```shell From a297cd0db5df0f3d8c16cceeb50bf169ea5a7c21 Mon Sep 17 00:00:00 2001 From: Gabriele De Rosa Date: Thu, 5 Mar 2020 01:34:36 +0100 Subject: [PATCH 4/7] minor change --- .github/FUNDING.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 30c8652..ed7d497 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1 @@ -github: derogab patreon: derogab From 1515efc38581d463959bfeed87d08a1c1feedffd Mon Sep 17 00:00:00 2001 From: Gabriele De Rosa Date: Thu, 5 Mar 2020 01:49:06 +0100 Subject: [PATCH 5/7] docker badges --- README.md | 5 +++++ daemon/README.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/README.md b/README.md index 89f4e52..775d106 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,11 @@ yarn run all The previous command starts both the [daemon](./daemon) and the web interface. ## Docker + +[![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/derogab/coingraph?include_prereleases&style=flat-square)](https://github.com/derogab/coingraph/releases) +![Docker Image Size (tag)](https://img.shields.io/docker/image-size/derogab/coingraph-client/latest?style=flat-square) +![Docker Pulls](https://img.shields.io/docker/pulls/derogab/coingraph-client?style=flat-square) + #### Manual 1. [Start the `coingraph-daemon`](./daemon/README.md#start-container) and then 2. Run the container diff --git a/daemon/README.md b/daemon/README.md index 0573e6b..d23a9ed 100644 --- a/daemon/README.md +++ b/daemon/README.md @@ -30,6 +30,11 @@ node app.js \ Info: custom params overwrite default preferences in `.env`. ## Docker + +[![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/derogab/coingraph?include_prereleases&style=flat-square)](https://github.com/derogab/coingraph/releases) +![Docker Image Size (tag)](https://img.shields.io/docker/image-size/derogab/coingraph-daemon/latest?style=flat-square) +![Docker Pulls](https://img.shields.io/docker/pulls/derogab/coingraph-daemon?style=flat-square) + ###### Build image from source ```shell docker build -t derogab/coingraph-daemon . From 2356e462d7b78dd050009e399687d9ec49f29653 Mon Sep 17 00:00:00 2001 From: Gabriele De Rosa Date: Thu, 5 Mar 2020 01:52:00 +0100 Subject: [PATCH 6/7] versioning --- daemon/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/package.json b/daemon/package.json index 0e2759f..078dd91 100644 --- a/daemon/package.json +++ b/daemon/package.json @@ -1,6 +1,6 @@ { "name": "coingraph-daemon", - "version": "1.0.2", + "version": "1.1.0", "description": "A daemon for coingraph", "main": "app.js", "dependencies": { diff --git a/package.json b/package.json index efd963e..daa2503 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coingraph", - "version": "1.0.2", + "version": "1.1.0", "private": true, "dependencies": { "axios": "^0.19.0", From f634fdc03f9f7277b156cb81fd41a3e56867e923 Mon Sep 17 00:00:00 2001 From: Gabriele De Rosa Date: Thu, 5 Mar 2020 01:57:45 +0100 Subject: [PATCH 7/7] update readme --- README.md | 4 ++-- daemon/README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 775d106..a2b3a48 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ The previous command starts both the [daemon](./daemon) and the web interface. ## Docker [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/derogab/coingraph?include_prereleases&style=flat-square)](https://github.com/derogab/coingraph/releases) -![Docker Image Size (tag)](https://img.shields.io/docker/image-size/derogab/coingraph-client/latest?style=flat-square) -![Docker Pulls](https://img.shields.io/docker/pulls/derogab/coingraph-client?style=flat-square) +[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/derogab/coingraph-client/latest?style=flat-square)](https://hub.docker.com/r/derogab/coingraph-client) +[![Docker Pulls](https://img.shields.io/docker/pulls/derogab/coingraph-client?style=flat-square)](https://hub.docker.com/r/derogab/coingraph-client) #### Manual 1. [Start the `coingraph-daemon`](./daemon/README.md#start-container) and then diff --git a/daemon/README.md b/daemon/README.md index d23a9ed..9481640 100644 --- a/daemon/README.md +++ b/daemon/README.md @@ -32,8 +32,8 @@ Info: custom params overwrite default preferences in `.env`. ## Docker [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/derogab/coingraph?include_prereleases&style=flat-square)](https://github.com/derogab/coingraph/releases) -![Docker Image Size (tag)](https://img.shields.io/docker/image-size/derogab/coingraph-daemon/latest?style=flat-square) -![Docker Pulls](https://img.shields.io/docker/pulls/derogab/coingraph-daemon?style=flat-square) +[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/derogab/coingraph-daemon/latest?style=flat-square)](https://hub.docker.com/r/derogab/coingraph-daemon) +[![Docker Pulls](https://img.shields.io/docker/pulls/derogab/coingraph-daemon?style=flat-square)](https://hub.docker.com/r/derogab/coingraph-daemon) ###### Build image from source ```shell