From 57bac963cb7d5b2083d2a970ee23767cf30452c8 Mon Sep 17 00:00:00 2001
From: "guilhem.carron" <gcarron@grandlyon.com>
Date: Wed, 11 Aug 2021 10:23:11 +0200
Subject: [PATCH] FIx dev
---
.gitignore | 4 ++--
configs/tokenskey.json | 3 ---
docker-compose.old.yml => docker-compose.local.yml | 0
docker-compose.yml | 4 ++--
public/manifest.json | 14 ++------------
src/react-app-env.d.ts | 1 -
6 files changed, 6 insertions(+), 20 deletions(-)
delete mode 100644 configs/tokenskey.json
rename docker-compose.old.yml => docker-compose.local.yml (100%)
delete mode 100644 src/react-app-env.d.ts
diff --git a/.gitignore b/.gitignore
index 59f3cb4f..70d1ca62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,13 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
+/configs/tokenskey.json
/node_modules
/.pnp
.pnp.js
# testing
/coverage
-
# production
/build
@@ -21,4 +21,4 @@
npm-debug.log*
yarn-debug.log*
-yarn-error.log*
+yarn-error.log*
\ No newline at end of file
diff --git a/configs/tokenskey.json b/configs/tokenskey.json
deleted file mode 100644
index 005f9dc4..00000000
--- a/configs/tokenskey.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "Key": "IZOEJFgX0z/Bfx403KdRjfA6FTMcJiOtUb9a4vMWhlU="
-}
\ No newline at end of file
diff --git a/docker-compose.old.yml b/docker-compose.local.yml
similarity index 100%
rename from docker-compose.old.yml
rename to docker-compose.local.yml
diff --git a/docker-compose.yml b/docker-compose.yml
index 03b47b9b..9c6be045 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3.7'
services:
nginx:
- image: test
+ image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-client:latest
restart: unless-stopped
ports:
- 443:443
@@ -29,7 +29,7 @@ services:
retries: 60
backend:
- image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server:back
+ image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server:latest
networks:
backoffice:
depends_on:
diff --git a/public/manifest.json b/public/manifest.json
index 080d6c77..e83c48a4 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,21 +1,11 @@
{
- "short_name": "React App",
- "name": "Create React App Sample",
+ "short_name": "Ecolyo Backoffice",
+ "name": "Ecolyo Backoffice",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
- },
- {
- "src": "logo192.png",
- "type": "image/png",
- "sizes": "192x192"
- },
- {
- "src": "logo512.png",
- "type": "image/png",
- "sizes": "512x512"
}
],
"start_url": ".",
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
deleted file mode 100644
index 6431bc5f..00000000
--- a/src/react-app-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="react-scripts" />
--
GitLab