diff --git a/.env b/.env index c7ff3bf..4cc1526 100644 --- a/.env +++ b/.env @@ -1,2 +1 @@ teamname="wiq_es04c" -API_URI="172.167.244.198" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e72a227..8d7347f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,8 +21,7 @@ services: MYSQL_DATABASE: questions_db MYSQL_CHARSET: utf8mb4 MYSQL_COLLATION: utf8mb4_unicode_ci - DB_PORT: 3306 - + DB_PORT: 3306 ports: - "3306:3306" volumes: @@ -37,7 +36,7 @@ services: authservice: container_name: authservice-${teamname:-wiq_es04c} - image: ghcr.io/arquisoft/${teamname:-wiq_es04c}/authservice:latest + image: ghcr.io/arquisoft/wiq_es04c/authservice:latest profiles: ["dev", "prod"] build: ./users/authservice depends_on: @@ -51,7 +50,7 @@ services: userservice: container_name: userservice-${teamname:-wiq_es04c} - image: ghcr.io/arquisoft/${teamname:-wiq_es04c}/userservice:latest + image: ghcr.io/arquisoft/wiq_es04c/userservice:latest profiles: ["dev", "prod"] build: ./users/userservice depends_on: @@ -65,7 +64,7 @@ services: gatewayservice: container_name: gatewayservice-${teamname:-wiq_es04c} - image: ghcr.io/arquisoft/${teamname:-wiq_es04c}/gatewayservice:latest + image: ghcr.io/arquisoft/wiq_es04c/gatewayservice:latest profiles: ["dev", "prod"] build: ./gatewayservice depends_on: @@ -81,10 +80,9 @@ services: AUTH_SERVICE_URL: http://authservice:8002 USER_SERVICE_URL: http://userservice:8001 - questionservice: container_name: questionservice-${teamname:-wiq_es04c} - image: ghcr.io/arquisoft/${teamname:-wiq_es04c}/questionservice:latest + image: ghcr.io/arquisoft/wiq_es04c/questionservice:latest profiles: ["dev", "prod"] build: ./questionservice depends_on: @@ -99,15 +97,13 @@ services: webapp: container_name: webapp-${teamname:-wiq_es04c} - image: ghcr.io/arquisoft/${teamname:-wiq_es04c}/webapp:latest + image: ghcr.io/arquisoft/wiq_es04c/webapp:latest profiles: ["dev", "prod"] build: ./webapp depends_on: - gatewayservice ports: - - "3000:3000" - environment: - - API_URI=${API_URI} + - "3000:3000" prometheus: image: prom/prometheus diff --git a/webapp/.env b/webapp/.env index 367e9d4..c810bde 100644 --- a/webapp/.env +++ b/webapp/.env @@ -1,2 +1 @@ -REACT_APP_API_ENDPOINT=http://localhost:8000 -API_URI=172.167.244.198 +REACT_APP_API_ENDPOINT=http://localhost:8000 \ No newline at end of file diff --git a/webapp/src/components/login/Login.js b/webapp/src/components/login/Login.js index 8fbf8c0..3c1a854 100644 --- a/webapp/src/components/login/Login.js +++ b/webapp/src/components/login/Login.js @@ -32,7 +32,6 @@ const Login = () => { const loginUser = async () => { try { - console.log("ApiEndpoint al hacer login es: "+apiEndpoint) const response = await axios.post(`${apiEndpoint}/login`, { username, password }); // Extract data from the response