From 4974fecae65c41e4c6186c33250693bb9b7b854b Mon Sep 17 00:00:00 2001 From: Elisee ADJIGUIDI Date: Mon, 26 Jun 2023 00:32:43 +0200 Subject: [PATCH] quit branch --- .env | 15 +++++---------- .gitignore | 3 ++- docker-compose.yml | 4 ---- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.env b/.env index 6449f712..763e166b 100644 --- a/.env +++ b/.env @@ -12,14 +12,9 @@ #URL NGINX_ENVSUBST_TEMPLATE_SUFFIX=".conf" - -# BASE_URL=http://localhost -BASE_URL=localhost:8080 -REACT_APP_BASE_URL=localhost:8080 -REDIRECT_URI=http://localhost:8080/api/auth/login -#postgres var -# POSTGRES_HOST=127.0.0.1 -# DB_TYPE=postgres +BASE_URL=bess-f2r2s14:8080 +REACT_APP_BASE_URL=bess-f2r2s14:8080 +REDIRECT_URI=http://bess-f2r2s14:8080/api/auth/login POSTGRES_HOST=postgresql POSTGRES_USER=postgres POSTGRES_PASSWORD=postgres @@ -42,5 +37,5 @@ REACT_HOST=0.0.0.0 #auth var JWT_SECRET=secrethere # REDIRECT_URI=http://localhost:80/api/auth/login -API_SECRET=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 -CLIENT_UID=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41 \ No newline at end of file +API_SECRET=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 +CLIENT_UID=u-s4t2ud-a58c0bac83e6a599129ff519650335526c634890b80bd360bce3a8007db4897e \ No newline at end of file diff --git a/.gitignore b/.gitignore index ace7e3a2..d9d0b8f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -#.env +.env +containers/react/.env backend/node_modules/ containers/backend/dist/ diff --git a/docker-compose.yml b/docker-compose.yml index fdde8234..d15b89f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,11 +24,7 @@ services: # depends_on: # - nginx ports: -<<<<<<< HEAD - - 8081:8081 -======= - 8001:8001 ->>>>>>> origin/ereali volumes: - ./containers/react:/app # - ./containers/react:/app