Merge branch 'master' into develop

Arquisoft · May 2, 2024 · fffbb23 · fffbb23
2 parents 2b489b2 + a4788c8
commit fffbb23
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -69,16 +69,17 @@ jobs:
     - uses: actions/checkout@v4
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@v5
-      env:
-        API_URI: http://${{ secrets.DEPLOY_HOST }}:8000
       with:
           name: arquisoft/wiq_es6c/webapp
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
           workdir: webapp
-          buildargs: API_URI
+          buildargs: API_URI1, API_URI2
           platforms: linux/arm64
+      env:
+            API_URI1: http://${{ secrets.DEPLOY_HOST }}:8000
+            API_URI2: http://${{ secrets.DEPLOY_HOST }}:8100
   docker-push-authservice:
     name: Push auth service Docker Image to GitHub Packages
     runs-on: ubuntu-latest

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -155,6 +155,7 @@ services:
     build: ./webapp
     depends_on:
       - gatewayservice
+      - apisgatewayservice
     ports:
       - "3000:3000" 
     restart: always

diff --git a/webapp/.env b/webapp/.env
@@ -1,2 +1,2 @@
 REACT_APP_API_ENDPOINT=http://localhost:8000
-REACT_APIS_ENDPOINT=http://localhost:8100
+REACT_APP_APIS_ENDPOINT=http://localhost:8100
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
@@ -6,8 +6,11 @@ WORKDIR /app
 #Install the dependencies
 RUN npm install
 
-ARG API_URI="http://localhost:8000"
-ENV REACT_APP_API_ENDPOINT=$API_URI
+ARG API_URI1="http://localhost:8000"
+ENV REACT_APP_API_ENDPOINT=$API_URI1
+
+ARG API_URI2="http://localhost:8100"
+ENV REACT_APP_APIS_ENDPOINT=$API_URI2
 
 #Create an optimized version of the webapp
 RUN npm run build

diff --git a/webapp/src/storeQuestion/App.jsx b/webapp/src/storeQuestion/App.jsx
@@ -11,7 +11,7 @@ function App() {
   const [currentPage, setCurrentPage] = useState(1);
   const itemsPerPage = 10; // Número de preguntas por página
 
-  const apiEndpoint = process.env.REACT_APIS_ENDPOINT || 'http://localhost:8100';
+  const apiEndpoint = process.env.REACT_APP_APIS_ENDPOINT || 'http://localhost:8100';
 
   useEffect(() => {
     const obtenerPreguntas = async () => {

diff --git a/webapp/src/usersRanking/App.jsx b/webapp/src/usersRanking/App.jsx
@@ -11,7 +11,8 @@ function App() {
   const [currentPage, setCurrentPage] = useState(1);
   const itemsPerPage = 10; // Número de usuarios por página
 
-  const apiEndpoint = process.env.REACT_APIS_ENDPOINT || 'http://localhost:8100';
+  const apiEndpoint = process.env.REACT_APP_APIS_ENDPOINT || 'http://localhost:8100';
+  console.log(process.env.REACT_APP_APIS_ENDPOINT)
 
   useEffect(() => {
     const obtenerUsuarios = async () => {