quit branch

.env

@@ -12,14 +12,9 @@
 
 #URL
 NGINX_ENVSUBST_TEMPLATE_SUFFIX=".conf"
-
+BASE_URL=bess-f2r2s14:8080
-# BASE_URL=http://localhost
+REACT_APP_BASE_URL=bess-f2r2s14:8080
-BASE_URL=localhost:8080
+REDIRECT_URI=http://bess-f2r2s14:8080/api/auth/login
-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
 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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
+API_SECRET=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
-CLIENT_UID=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41
+CLIENT_UID=u-s4t2ud-a58c0bac83e6a599129ff519650335526c634890b80bd360bce3a8007db4897e

.gitignore

@@ -1,4 +1,5 @@
-#.env
+.env
+containers/react/.env
 backend/node_modules/
 containers/backend/dist/
 

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