Merge branch 'develop'

Arquisoft · Mar 23, 2023 · 9924040 · 9924040
2 parents 64bfb07 + a919ae2
commit 9924040
Show file tree

Hide file tree

Showing 97 changed files with 40,241 additions and 37 deletions.
diff --git a/.github/workflows/lomap_es5c.yml b/.github/workflows/lomap_es5c.yml
@@ -11,15 +11,15 @@ jobs:
       run:
         working-directory: webapp
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 18
-    - run: npm ci
-    - run: npm test --coverage --watchAll
-    - name: Analyze with SonarCloud
-      uses: sonarsource/sonarcloud-github-action@master
-      env:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - run: npm ci
+      - run: npm test --coverage --watchAll
+      - name: Analyze with SonarCloud
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
   unit-test-restapi:
@@ -28,40 +28,40 @@ jobs:
       run:
         working-directory: restapi
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 18
-    - run: npm ci
-    - run: npm test --coverage --watchAll
-    - name: Analyze with SonarCloud
-      uses: sonarsource/sonarcloud-github-action@master
-      env:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - run: npm ci
+      - run: npm test --coverage --watchAll
+      - name: Analyze with SonarCloud
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
   e2e-tests:
     needs: [unit-test-webapp, unit-test-restapi]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 18
-    - run: npm --prefix webapp install
-    - run: npm --prefix restapi install
-    - run: npm --prefix webapp run build
-    - run: npm --prefix webapp run test:e2e
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - run: npm --prefix webapp install
+      - run: npm --prefix restapi install
+      - run: npm --prefix webapp run build
+      - run: npm --prefix webapp run test:e2e
   docker-push-webapp:
     name: Push webapp Docker Image to GitHub Packages
     runs-on: ubuntu-latest
     needs: [e2e-tests]
     steps:
-    - uses: actions/checkout@v3
-    - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@v5
-      env:
-        API_URI: http://${{ secrets.DEPLOY_HOST }}:5000/api
-      with:
+      - uses: actions/checkout@v3
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@v5
+        env:
+          API_URI: http://${{ secrets.DEPLOY_HOST }}:5001/api
+        with:
           name: arquisoft/lomap_es5c/webapp
           username: ${{ github.actor }}
           password: ${{ secrets.DOCKER_PUSH_TOKEN }}
@@ -73,10 +73,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: [e2e-tests]
     steps:
-    - uses: actions/checkout@v3
-    - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@v5
-      with:
+      - uses: actions/checkout@v3
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@v5
+        with:
           name: arquisoft/lomap_es5c/restapi
           username: ${{ github.actor }}
           password: ${{ secrets.DOCKER_PUSH_TOKEN }}
@@ -97,5 +97,5 @@ jobs:
   #         wget https://raw.githubusercontent.com/arquisoft/lomap_es5c/master/docker-compose-deploy.yml -O docker-compose.yml
   #         docker-compose stop
   #         docker-compose rm -f
-  #         docker-compose pull   
+  #         docker-compose pull
   #         docker-compose up -d
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,6 @@ yarn-error.log*
 #documentation build does not go into master
 docs/build
 
+#mongoDB key
+.env
+