From cbdfb8dc30cb24ebaf85a474286efae8fc8f782c Mon Sep 17 00:00:00 2001 From: Nicolas Herbaut Date: Thu, 11 Jun 2020 16:08:36 +0200 Subject: [PATCH 1/5] GA code --- blade/app/templates/layout/layout.html | 12 +++++++++++- blade/app/templates/layout/navbar.html | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/blade/app/templates/layout/layout.html b/blade/app/templates/layout/layout.html index e56515a..5b86a31 100644 --- a/blade/app/templates/layout/layout.html +++ b/blade/app/templates/layout/layout.html @@ -11,6 +11,16 @@ {% endblock %} + + + + - \ No newline at end of file + diff --git a/blade/app/templates/layout/navbar.html b/blade/app/templates/layout/navbar.html index 9920f9d..683f051 100644 --- a/blade/app/templates/layout/navbar.html +++ b/blade/app/templates/layout/navbar.html @@ -19,4 +19,5 @@ - \ No newline at end of file + + From 6bee0630bc25562e1934cbdb7cae08de7bac3b20 Mon Sep 17 00:00:00 2001 From: Nicolas Herbaut Date: Thu, 11 Jun 2020 16:15:00 +0200 Subject: [PATCH 2/5] reco subdomain --- blade/app/templates/layout/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade/app/templates/layout/layout.html b/blade/app/templates/layout/layout.html index 5b86a31..b570445 100644 --- a/blade/app/templates/layout/layout.html +++ b/blade/app/templates/layout/layout.html @@ -18,7 +18,7 @@ function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); - gtag('config', 'UA-169201303-1'); + gtag('config', 'UA-169201303-2'); From b6d23a153faf85a29b5db871f8d0ae003f546ef6 Mon Sep 17 00:00:00 2001 From: Nicolas Herbaut Date: Tue, 23 Mar 2021 00:39:19 +0100 Subject: [PATCH 3/5] added docker compose for deployment, changed the api target domain specified it on the front config --- blade/front/Dockerfile | 3 +- blade/front/src/static/js/variables.js | 2 +- docker-compose.yml | 59 ++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 docker-compose.yml diff --git a/blade/front/Dockerfile b/blade/front/Dockerfile index 296401e..ba847ce 100644 --- a/blade/front/Dockerfile +++ b/blade/front/Dockerfile @@ -1,7 +1,8 @@ FROM node:10 WORKDIR /blade/front -COPY . . +COPY package.json . RUN npm install +COPY . . EXPOSE 3000 CMD ["npm", "start"] diff --git a/blade/front/src/static/js/variables.js b/blade/front/src/static/js/variables.js index 3d55b8c..46e8702 100644 --- a/blade/front/src/static/js/variables.js +++ b/blade/front/src/static/js/variables.js @@ -1 +1 @@ -exports.apiUrl = "http://blade-back:5000"; +exports.apiUrl = "https://recommender-api.blade-blockchain.eu"; diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..7bad98b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,59 @@ +version: '3.3' +services: + traefik: + image: traefik:v2.4 + command: + #- "--api.insecure=true" + # - "--accesslog=true" + - "--providers.docker=true" + - "--providers.docker.exposedbydefault=false" + - "--entrypoints.websecure.address=:443" + - "--certificatesresolvers.myresolver.acme.tlschallenge=true" + - "--certificatesresolvers.myresolver.acme.email=nicolas.herbaut@gmail.com" + - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" + # - "--log.level=DEBUG" + ports: + - "443:443" + - "8080:8080" + volumes: + - "./letsencrypt:/letsencrypt" + - "/var/run/docker.sock:/var/run/docker.sock" + - "/var/log/traefik/:/var/log" + + + blade-front: + image: bladesorbonne/blade-img-front + container_name: blade-front + labels: + - "traefik.enable=true" + - "traefik.http.routers.blade-front.tls.certresolver=myresolver" + - "traefik.http.routers.blade-front.rule=host(`recommender.blade-blockchain.eu`)" + - "traefik.http.routers.blade-front.entrypoints=websecure" + - "traefik.http.services.blade-front.loadbalancer.server.port=3000" + expose: + - "3000" + stdin_open: #gross haack for react webapp + true + ports: + - "3000:3000" + depends_on: + - blade-api + blade-api: + image: bladesorbonne/blade-img-api + container_name: blade-api + labels: + - "traefik.enable=true" + - "traefik.http.routers.blade-api.tls.certresolver=myresolver" + - "traefik.http.routers.blade-api.rule=host(`recommender-api.blade-blockchain.eu`)" + - "traefik.http.routers.blade-api.entrypoints=websecure" + - "traefik.http.services.blade-api.loadbalancer.server.port=5000" + - "traefik.http.middlewares.testheader.headers.accessControlAllowHeaders=content-type" + - "traefik.http.middlewares.testheader.headers.accesscontrolallowmethods=GET,OPTIONS,PUT,POST" + - "traefik.http.middlewares.testheader.headers.accesscontrolalloworiginlist=*" + - "traefik.http.middlewares.testheader.headers.accesscontrolmaxage=100" + - "traefik.http.middlewares.testheader.headers.addvaryheader=true" + - "traefik.http.routers.blade-api.middlewares=testheader@docker" + expose: + - "5000" + depends_on: + - traefik \ No newline at end of file From 81c6f03db67677461ad303bbd2aa36f82ffd0133 Mon Sep 17 00:00:00 2001 From: Nicolas Herbaut Date: Tue, 23 Mar 2021 00:44:20 +0100 Subject: [PATCH 4/5] updated publications --- .../pages/Publications/Publications.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/blade/front/src/components/pages/Publications/Publications.js b/blade/front/src/components/pages/Publications/Publications.js index e1b8c40..1aa06cb 100644 --- a/blade/front/src/components/pages/Publications/Publications.js +++ b/blade/front/src/components/pages/Publications/Publications.js @@ -15,6 +15,22 @@ class Publications extends PureComponent {

Associated publications

+ + + +
Six, Nicolas. From d8483d9650db88c169d3e4c5d68094035f623693 Mon Sep 17 00:00:00 2001 From: Nicolas Herbaut Date: Tue, 23 Mar 2021 00:46:31 +0100 Subject: [PATCH 5/5] fixed link in pub --- blade/front/src/components/pages/Publications/Publications.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade/front/src/components/pages/Publications/Publications.js b/blade/front/src/components/pages/Publications/Publications.js index 1aa06cb..164b9da 100644 --- a/blade/front/src/components/pages/Publications/Publications.js +++ b/blade/front/src/components/pages/Publications/Publications.js @@ -16,7 +16,7 @@ class Publications extends PureComponent {

Associated publications