Merge branch 'master' into PruebaConjunto

.github/workflows/build.yml

@@ -29,4 +29,4 @@ jobs:
       uses: sonarsource/sonarcloud-github-action@master
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/release.yml

@@ -51,7 +51,6 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -71,7 +70,6 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -88,7 +86,6 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -99,13 +96,44 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
         workdir: users/userservice
+  docker-push-questionservice:
+    name: Push question service Docker Image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - uses: actions/checkout@v4
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: arquisoft/wiq_es2a/questionservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: questions/template-questions
+  docker-push-recordservice:
+    name: Push record service Docker Image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - uses: actions/checkout@v4
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: arquisoft/wiq_es2a/recordservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: recordhistory
   docker-push-gatewayservice:
     name: Push gateway service Docker Image to GitHub Packages
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Update OpenAPI configuration
@@ -123,7 +151,7 @@ jobs:
   deploy:
     name: Deploy over SSH
     runs-on: ubuntu-latest
-    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp]
+    needs: [docker-push-userservice,docker-push-authservice,docker-push-questionservice,docker-push-recordservice,docker-push-gatewayservice,docker-push-webapp]
     steps:
     - name: Deploy over SSH
       uses: fifsky/ssh-action@master

README.md

@@ -10,6 +10,8 @@
 - Yeray Rodríguez Granda - UO284247
 - Pablo López Tamargo - UO287694
 
+20.117.189.51:3000
+
 This is a base repo for the [Software Architecture course](http://arquisoft.github.io/) in [2023/2024 edition](https://arquisoft.github.io/course2324.html). 
 
 This repo is a basic application composed of several components.

webapp/package.json

@@ -58,4 +58,4 @@
     "serve": "^14.2.1",
     "start-server-and-test": "^2.0.3"
   }
-}
+}

webapp/src/App.js

@@ -69,4 +69,4 @@ function App() {
   return isAuthenticated ? <Route {...props} /> : <Navigate to="/login" />;
 } */
 
-export default App;
+export default App;

webapp/src/components/AddUser.js

@@ -63,4 +63,4 @@ const AddUser = () => {
   );
 };
 
-export default AddUser;
+export default AddUser;

webapp/src/components/HomeScreen.js

@@ -73,4 +73,4 @@ const HomeScreen = () => {
 };
 
 export default HomeScreen;
-
+

webapp/src/components/Login.js

@@ -74,4 +74,4 @@ const Login = () => {
   );
 };
 
-export default Login;
+export default Login;