Merge pull request #228 from IT-Academy-BCN/workflow

TEst deploy
IT-Academy-BCN · Feb 27, 2024 · ca0282f · ca0282f
2 parents 9c3124c + d904578
commit ca0282f
Show file tree

Hide file tree

Showing 188 changed files with 41 additions and 8 deletions.
diff --git a/.github/workflows/deploy.dev.yml b/.github/workflows/deploy.dev.yml
@@ -1,9 +1,11 @@
-name: Upload Image to Docker Hub
+name: Upload Image to Docker Hub & Deploy to Dev
 
 on:
-  push:
+  pull_request:
+    types:
+      - closed
     branches:
-      - workflow
+      - develop
 
 jobs:
   #sonarcloud:
@@ -26,6 +28,7 @@ jobs:
 
   docker:
     #needs: sonarcloud
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
       -
@@ -39,9 +42,23 @@ jobs:
           do
             key=$(echo $key | tr '.' '_')
             echo "$key=$value" >> $GITHUB_ENV
+            echo "$key=$value"
           done < conf/.env.CI.dev
           echo "Done"
 
+      - name: Setup git-crypt
+        run: | 
+          sudo apt-get update
+          sudo apt-get install -y git-crypt
+
+      - name: Decrypt secrets
+        env:
+          GIT_CRYPT_KEY: ${{ secrets.GIT_CRYPT_KEY }}
+        run: |
+          echo "$GIT_CRYPT_KEY" | base64 --decode > git_crypt.key
+          git-crypt unlock git_crypt.key
+          rm git_crypt.key
+
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -82,10 +99,26 @@ jobs:
           tags: itacademybcn/itachallenges:itachallenge-nginx-${{ env.MICROSERVICE_VERSION }}
 
   deploy:
+    if: github.event.pull_request.merged == true
     needs: docker
     runs-on: ubuntu-latest
     steps:
-      - name: Execute SSH
+      -
+        name: Checkout code
+        uses: actions/checkout@v4
+      -
+        name: Load env from file
+        run: |
+          echo "Loading env vars from .env file"
+          while IFS='=' read -r key value
+          do
+            key=$(echo $key | tr '.' '_')
+            echo "$key=$value" >> $GITHUB_ENV
+            echo "$key=$value"
+          done < conf/.env.CI.dev
+          echo "Done"
+      -
+        name: Execute SSH
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.SSH_HOST_URL }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM nginx:stable-alpine
-COPY nginx_conf/nginx.conf /etc/nginx/nginx.conf
+COPY ["nginx_conf/nginx.conf", "/etc/nginx/nginx.conf"]
 ADD ["dist/ita-challenges-frontend/*", "/usr/share/nginx/html/"]
 
 EXPOSE 80

diff --git a/GUIDELINES_CA.md b/GUIDELINES_CA.md
diff --git a/GUIDELINES_EN.md b/GUIDELINES_EN.md
diff --git a/GUIDELINES_ES.md b/GUIDELINES_ES.md
diff --git a/README.md b/README.md
diff --git a/angular.json b/angular.json
diff --git a/conf/.env.CI.dev b/conf/.env.CI.dev
@@ -1,2 +1,2 @@
 MICROSERVICE_DEPLOY=ita-challenges-frontend
-MICROSERVICE_VERSION=2.0.2-RELEASE
+MICROSERVICE_VERSION=2.0.42-RELEASE
diff --git a/conf/.env.dev b/conf/.env.dev
diff --git a/contributors.md b/contributors.md
diff --git a/jest.config.js b/jest.config.js
diff --git a/jest.config.pact.js b/jest.config.pact.js
diff --git a/nginx_conf/nginx.conf b/nginx_conf/nginx.conf
diff --git a/nginx_conf/nginx.conf.default b/nginx_conf/nginx.conf.default
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ita-challenges-frontend",
-  "version": "2.0.2-RELEASE",
+  "version": "2.0.42-RELEASE",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.conf.dev.json",

diff --git a/proxy.conf.dev.json b/proxy.conf.dev.json
diff --git a/setup-jest.ts b/setup-jest.ts
diff --git a/sonar-project.properties b/sonar-project.properties
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
diff --git a/src/app/app.component.html b/src/app/app.component.html
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
diff --git a/src/app/core/core-routing.module.ts b/src/app/core/core-routing.module.ts
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
diff --git a/src/app/core/layout/footer/footer.component.html b/src/app/core/layout/footer/footer.component.html
@@ -1 +1 @@
-<p class="version d-flex justify-content-end p-3"> v {{ currentApplicationVersion }}</p>
+<p class="version d-flex justify-content-end p-3">{{ currentApplicationVersion }}</p>
diff --git a/src/app/core/layout/footer/footer.component.scss b/src/app/core/layout/footer/footer.component.scss
diff --git a/src/app/core/layout/footer/footer.component.spec.ts b/src/app/core/layout/footer/footer.component.spec.ts
diff --git a/src/app/core/layout/footer/footer.component.ts b/src/app/core/layout/footer/footer.component.ts
diff --git a/src/app/core/layout/header/header.component.html b/src/app/core/layout/header/header.component.html
diff --git a/src/app/core/layout/header/header.component.scss b/src/app/core/layout/header/header.component.scss
diff --git a/src/app/core/layout/header/header.component.spec.ts b/src/app/core/layout/header/header.component.spec.ts
diff --git a/src/app/core/layout/header/header.component.ts b/src/app/core/layout/header/header.component.ts
diff --git a/src/app/core/layout/header/mobile-nav/mobile-nav.component.html b/src/app/core/layout/header/mobile-nav/mobile-nav.component.html
diff --git a/src/app/core/layout/header/mobile-nav/mobile-nav.component.scss b/src/app/core/layout/header/mobile-nav/mobile-nav.component.scss
diff --git a/src/app/core/layout/header/mobile-nav/mobile-nav.component.spec.ts b/src/app/core/layout/header/mobile-nav/mobile-nav.component.spec.ts
diff --git a/src/app/core/layout/header/mobile-nav/mobile-nav.component.ts b/src/app/core/layout/header/mobile-nav/mobile-nav.component.ts
diff --git a/src/app/core/layout/main-menu/main-menu.component.html b/src/app/core/layout/main-menu/main-menu.component.html
diff --git a/src/app/core/layout/main-menu/main-menu.component.scss b/src/app/core/layout/main-menu/main-menu.component.scss
diff --git a/src/app/core/layout/main-menu/main-menu.component.spec.ts b/src/app/core/layout/main-menu/main-menu.component.spec.ts
diff --git a/src/app/core/layout/main-menu/main-menu.component.ts b/src/app/core/layout/main-menu/main-menu.component.ts
diff --git a/src/app/core/layout/main/main.component.html b/src/app/core/layout/main/main.component.html
diff --git a/src/app/core/layout/main/main.component.scss b/src/app/core/layout/main/main.component.scss
diff --git a/src/app/core/layout/main/main.component.spec.ts b/src/app/core/layout/main/main.component.spec.ts
diff --git a/src/app/core/layout/main/main.component.ts b/src/app/core/layout/main/main.component.ts
diff --git a/src/app/interceptors/jwt-interceptor.ts b/src/app/interceptors/jwt-interceptor.ts
diff --git a/src/app/models/breadcrumb.ts b/src/app/models/breadcrumb.ts
diff --git a/src/app/models/challenge-details.model.ts b/src/app/models/challenge-details.model.ts
diff --git a/src/app/models/challenge-example.model.ts b/src/app/models/challenge-example.model.ts
diff --git a/src/app/models/challenge.model.ts b/src/app/models/challenge.model.ts
diff --git a/src/app/models/data-challenge.model.ts b/src/app/models/data-challenge.model.ts
diff --git a/src/app/models/filter-challenge.model.ts b/src/app/models/filter-challenge.model.ts
diff --git a/src/app/models/language.model.ts b/src/app/models/language.model.ts
diff --git a/src/app/models/resource.model.ts b/src/app/models/resource.model.ts
diff --git a/src/app/models/solution.model.ts b/src/app/models/solution.model.ts
diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts
diff --git a/src/app/modules/challenge/challenge-routing.module.ts b/src/app/modules/challenge/challenge-routing.module.ts
diff --git a/src/app/modules/challenge/challenge.module.ts b/src/app/modules/challenge/challenge.module.ts
diff --git a/src/app/modules/challenge/components/challenge-header/challenge-header.component.html b/src/app/modules/challenge/components/challenge-header/challenge-header.component.html
diff --git a/src/app/modules/challenge/components/challenge-header/challenge-header.component.scss b/src/app/modules/challenge/components/challenge-header/challenge-header.component.scss
diff --git a/src/app/modules/challenge/components/challenge-header/challenge-header.component.spec.ts b/src/app/modules/challenge/components/challenge-header/challenge-header.component.spec.ts
diff --git a/src/app/modules/challenge/components/challenge-header/challenge-header.component.ts b/src/app/modules/challenge/components/challenge-header/challenge-header.component.ts
diff --git a/src/app/modules/challenge/components/challenge-info/challenge-info.component.html b/src/app/modules/challenge/components/challenge-info/challenge-info.component.html
diff --git a/src/app/modules/challenge/components/challenge-info/challenge-info.component.scss b/src/app/modules/challenge/components/challenge-info/challenge-info.component.scss
diff --git a/src/app/modules/challenge/components/challenge-info/challenge-info.component.spec.ts b/src/app/modules/challenge/components/challenge-info/challenge-info.component.spec.ts
diff --git a/src/app/modules/challenge/components/challenge-info/challenge-info.component.ts b/src/app/modules/challenge/components/challenge-info/challenge-info.component.ts
diff --git a/src/app/modules/challenge/components/challenge/challenge.component.html b/src/app/modules/challenge/components/challenge/challenge.component.html
diff --git a/src/app/modules/challenge/components/challenge/challenge.component.scss b/src/app/modules/challenge/components/challenge/challenge.component.scss
diff --git a/src/app/modules/challenge/components/challenge/challenge.component.spec.ts b/src/app/modules/challenge/components/challenge/challenge.component.spec.ts
diff --git a/src/app/modules/challenge/components/challenge/challenge.component.ts b/src/app/modules/challenge/components/challenge/challenge.component.ts
diff --git a/src/app/modules/modals/filters-modal/filters-modal.component.html b/src/app/modules/modals/filters-modal/filters-modal.component.html
diff --git a/src/app/modules/modals/filters-modal/filters-modal.component.scss b/src/app/modules/modals/filters-modal/filters-modal.component.scss
diff --git a/src/app/modules/modals/filters-modal/filters-modal.component.spec.ts b/src/app/modules/modals/filters-modal/filters-modal.component.spec.ts
diff --git a/src/app/modules/modals/filters-modal/filters-modal.component.ts b/src/app/modules/modals/filters-modal/filters-modal.component.ts
diff --git a/src/app/modules/modals/login-modal/login-modal.component.html b/src/app/modules/modals/login-modal/login-modal.component.html
diff --git a/src/app/modules/modals/login-modal/login-modal.component.scss b/src/app/modules/modals/login-modal/login-modal.component.scss
diff --git a/src/app/modules/modals/login-modal/login-modal.component.spec.ts b/src/app/modules/modals/login-modal/login-modal.component.spec.ts
diff --git a/src/app/modules/modals/login-modal/login-modal.component.ts b/src/app/modules/modals/login-modal/login-modal.component.ts
diff --git a/src/app/modules/modals/modals.module.ts b/src/app/modules/modals/modals.module.ts
diff --git a/src/app/modules/modals/register-modal/register-modal.component.html b/src/app/modules/modals/register-modal/register-modal.component.html
diff --git a/src/app/modules/modals/register-modal/register-modal.component.scss b/src/app/modules/modals/register-modal/register-modal.component.scss
diff --git a/src/app/modules/modals/register-modal/register-modal.component.spec.ts b/src/app/modules/modals/register-modal/register-modal.component.spec.ts
diff --git a/src/app/modules/modals/register-modal/register-modal.component.ts b/src/app/modules/modals/register-modal/register-modal.component.ts
diff --git a/src/app/modules/modals/restricted-modal/restricted-modal.component.html b/src/app/modules/modals/restricted-modal/restricted-modal.component.html
diff --git a/src/app/modules/modals/restricted-modal/restricted-modal.component.scss b/src/app/modules/modals/restricted-modal/restricted-modal.component.scss
diff --git a/src/app/modules/modals/restricted-modal/restricted-modal.component.spec.ts b/src/app/modules/modals/restricted-modal/restricted-modal.component.spec.ts
diff --git a/src/app/modules/modals/restricted-modal/restricted-modal.component.ts b/src/app/modules/modals/restricted-modal/restricted-modal.component.ts
diff --git a/src/app/modules/modals/send-solution-modal/send-solution-modal.component.html b/src/app/modules/modals/send-solution-modal/send-solution-modal.component.html
diff --git a/src/app/modules/modals/send-solution-modal/send-solution-modal.component.scss b/src/app/modules/modals/send-solution-modal/send-solution-modal.component.scss
diff --git a/src/app/modules/modals/send-solution-modal/send-solution-modal.component.spec.ts b/src/app/modules/modals/send-solution-modal/send-solution-modal.component.spec.ts
diff --git a/src/app/modules/modals/send-solution-modal/send-solution-modal.component.ts b/src/app/modules/modals/send-solution-modal/send-solution-modal.component.ts
diff --git a/src/app/modules/profile/components/profile-header/profile-header.component.html b/src/app/modules/profile/components/profile-header/profile-header.component.html
diff --git a/src/app/modules/profile/components/profile-header/profile-header.component.scss b/src/app/modules/profile/components/profile-header/profile-header.component.scss
diff --git a/src/app/modules/profile/components/profile-header/profile-header.component.spec.ts b/src/app/modules/profile/components/profile-header/profile-header.component.spec.ts
diff --git a/src/app/modules/profile/components/profile-header/profile-header.component.ts b/src/app/modules/profile/components/profile-header/profile-header.component.ts
diff --git a/src/app/modules/profile/components/profile/profile.component.html b/src/app/modules/profile/components/profile/profile.component.html
diff --git a/src/app/modules/profile/components/profile/profile.component.scss b/src/app/modules/profile/components/profile/profile.component.scss
diff --git a/src/app/modules/profile/components/profile/profile.component.spec.ts b/src/app/modules/profile/components/profile/profile.component.spec.ts
diff --git a/src/app/modules/profile/components/profile/profile.component.ts b/src/app/modules/profile/components/profile/profile.component.ts
diff --git a/src/app/modules/profile/profile-routing.module.ts b/src/app/modules/profile/profile-routing.module.ts
diff --git a/src/app/modules/profile/profile.module.ts b/src/app/modules/profile/profile.module.ts
diff --git a/src/app/modules/starter/components/starter-filters/starter-filters.component.html b/src/app/modules/starter/components/starter-filters/starter-filters.component.html
diff --git a/src/app/modules/starter/components/starter-filters/starter-filters.component.scss b/src/app/modules/starter/components/starter-filters/starter-filters.component.scss
diff --git a/src/app/modules/starter/components/starter-filters/starter-filters.component.spec.ts b/src/app/modules/starter/components/starter-filters/starter-filters.component.spec.ts
diff --git a/src/app/modules/starter/components/starter-filters/starter-filters.component.ts b/src/app/modules/starter/components/starter-filters/starter-filters.component.ts
diff --git a/src/app/modules/starter/components/starter/starter.component.html b/src/app/modules/starter/components/starter/starter.component.html
diff --git a/src/app/modules/starter/components/starter/starter.component.scss b/src/app/modules/starter/components/starter/starter.component.scss
diff --git a/src/app/modules/starter/components/starter/starter.component.spec.ts b/src/app/modules/starter/components/starter/starter.component.spec.ts
diff --git a/src/app/modules/starter/components/starter/starter.component.ts b/src/app/modules/starter/components/starter/starter.component.ts
diff --git a/src/app/modules/starter/starter-routing.module.ts b/src/app/modules/starter/starter-routing.module.ts
diff --git a/src/app/modules/starter/starter.module.ts b/src/app/modules/starter/starter.module.ts
diff --git a/src/app/services/auth.service.spec.ts b/src/app/services/auth.service.spec.ts
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
diff --git a/src/app/services/breadcrumb.service.spec.ts b/src/app/services/breadcrumb.service.spec.ts
diff --git a/src/app/services/breadcrumb.service.ts b/src/app/services/breadcrumb.service.ts
diff --git a/src/app/services/challenge.service.spec.ts b/src/app/services/challenge.service.spec.ts
diff --git a/src/app/services/challenge.service.ts b/src/app/services/challenge.service.ts
diff --git a/src/app/services/solution.service.spec.ts b/src/app/services/solution.service.spec.ts
diff --git a/src/app/services/solution.service.ts b/src/app/services/solution.service.ts
diff --git a/src/app/services/starter.service.spec.ts b/src/app/services/starter.service.spec.ts
diff --git a/src/app/services/starter.service.ts b/src/app/services/starter.service.ts
diff --git a/src/app/shared/components/breadcrumb/breadcrumb.component.html b/src/app/shared/components/breadcrumb/breadcrumb.component.html
diff --git a/src/app/shared/components/breadcrumb/breadcrumb.component.scss b/src/app/shared/components/breadcrumb/breadcrumb.component.scss
diff --git a/src/app/shared/components/breadcrumb/breadcrumb.component.spec.ts b/src/app/shared/components/breadcrumb/breadcrumb.component.spec.ts
diff --git a/src/app/shared/components/breadcrumb/breadcrumb.component.ts b/src/app/shared/components/breadcrumb/breadcrumb.component.ts
diff --git a/src/app/shared/components/challenge-card/challenge-card.component.scss b/src/app/shared/components/challenge-card/challenge-card.component.scss
diff --git a/src/app/shared/components/challenge-card/challenge-card.component.spec.ts b/src/app/shared/components/challenge-card/challenge-card.component.spec.ts
diff --git a/src/app/shared/components/challenge-card/challenge-card.component.ts b/src/app/shared/components/challenge-card/challenge-card.component.ts
diff --git a/src/app/shared/components/pagination/pagination.component.html b/src/app/shared/components/pagination/pagination.component.html
diff --git a/src/app/shared/components/pagination/pagination.component.scss b/src/app/shared/components/pagination/pagination.component.scss
diff --git a/src/app/shared/components/pagination/pagination.component.spec.ts b/src/app/shared/components/pagination/pagination.component.spec.ts
diff --git a/src/app/shared/components/pagination/pagination.component.ts b/src/app/shared/components/pagination/pagination.component.ts
diff --git a/src/app/shared/components/resource-card/resource-card.component.html b/src/app/shared/components/resource-card/resource-card.component.html
diff --git a/src/app/shared/components/resource-card/resource-card.component.scss b/src/app/shared/components/resource-card/resource-card.component.scss
diff --git a/src/app/shared/components/resource-card/resource-card.component.spec.ts b/src/app/shared/components/resource-card/resource-card.component.spec.ts
diff --git a/src/app/shared/components/resource-card/resource-card.component.ts b/src/app/shared/components/resource-card/resource-card.component.ts
diff --git a/src/app/shared/components/shared-components.module.ts b/src/app/shared/components/shared-components.module.ts
diff --git a/src/app/shared/components/solution/solution.component.html b/src/app/shared/components/solution/solution.component.html
diff --git a/src/app/shared/components/solution/solution.component.scss b/src/app/shared/components/solution/solution.component.scss
diff --git a/src/app/shared/components/solution/solution.component.spec.ts b/src/app/shared/components/solution/solution.component.spec.ts
diff --git a/src/app/shared/components/solution/solution.component.ts b/src/app/shared/components/solution/solution.component.ts
diff --git a/src/assets/.gitkeep b/src/assets/.gitkeep
diff --git a/src/assets/dummy/challenge.json b/src/assets/dummy/challenge.json
diff --git a/src/assets/dummy/data-challenge.json b/src/assets/dummy/data-challenge.json
diff --git a/src/assets/dummy/data-typings.d.ts b/src/assets/dummy/data-typings.d.ts
diff --git a/src/assets/dummy/user-login.json b/src/assets/dummy/user-login.json
diff --git a/src/assets/dummy/user-register.json b/src/assets/dummy/user-register.json
diff --git a/src/assets/i18n/cat.json b/src/assets/i18n/cat.json
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
diff --git a/src/assets/i18n/i18n.module.ts b/src/assets/i18n/i18n.module.ts
diff --git a/src/assets/img/favicon.ico b/src/assets/img/favicon.ico
diff --git a/src/assets/img/icon/arrow_left.svg b/src/assets/img/icon/arrow_left.svg
diff --git a/src/assets/img/icon/arrow_right.svg b/src/assets/img/icon/arrow_right.svg
diff --git a/src/assets/img/icon/badge.svg b/src/assets/img/icon/badge.svg
diff --git a/src/assets/img/icon/bullseye-pointer.svg b/src/assets/img/icon/bullseye-pointer.svg
diff --git a/src/assets/img/icon/chart-pie-slice.svg b/src/assets/img/icon/chart-pie-slice.svg
diff --git a/src/assets/img/icon/folder-upload.svg b/src/assets/img/icon/folder-upload.svg
diff --git a/src/assets/img/icon/hamburguer-white.svg b/src/assets/img/icon/hamburguer-white.svg
diff --git a/src/assets/img/icon/language_icon_Java.svg b/src/assets/img/icon/language_icon_Java.svg
diff --git a/src/assets/img/icon/language_icon_Javascript.svg b/src/assets/img/icon/language_icon_Javascript.svg
diff --git a/src/assets/img/icon/language_icon_PHP.svg b/src/assets/img/icon/language_icon_PHP.svg
diff --git a/src/assets/img/icon/language_icon_Python.svg b/src/assets/img/icon/language_icon_Python.svg
diff --git a/src/assets/img/icon/lock-color.svg b/src/assets/img/icon/lock-color.svg
diff --git a/src/assets/img/icon/lock.svg b/src/assets/img/icon/lock.svg
diff --git a/src/assets/img/icon/megaphone.svg b/src/assets/img/icon/megaphone.svg
diff --git a/src/assets/img/icon/setting.svg b/src/assets/img/icon/setting.svg
diff --git a/src/assets/img/icon/sort-selected.svg b/src/assets/img/icon/sort-selected.svg
diff --git a/src/assets/img/icon/sort.svg b/src/assets/img/icon/sort.svg
diff --git a/src/assets/img/icon/tick-pink.svg b/src/assets/img/icon/tick-pink.svg
diff --git a/src/assets/img/icon/user.svg b/src/assets/img/icon/user.svg
diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png
diff --git a/src/assets/img/users/user-1.png b/src/assets/img/users/user-1.png
diff --git a/src/assets/postman/ITA-Challenges.postman_collection.json b/src/assets/postman/ITA-Challenges.postman_collection.json
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
diff --git a/src/index.html b/src/index.html
diff --git a/src/main.ts b/src/main.ts
diff --git a/src/styles.scss b/src/styles.scss
diff --git a/src/styles/_buttons.scss b/src/styles/_buttons.scss
diff --git a/src/styles/_colors.scss b/src/styles/_colors.scss
diff --git a/src/styles/_fonts.scss b/src/styles/_fonts.scss
diff --git a/src/styles/_forms.scss b/src/styles/_forms.scss
diff --git a/src/styles/_global.scss b/src/styles/_global.scss
diff --git a/src/styles/_modals.scss b/src/styles/_modals.scss
diff --git a/tsconfig.app.json b/tsconfig.app.json
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<p class="version d-flex justify-content-end p-3"> v {{ currentApplicationVersion }}</p>
		<p class="version d-flex justify-content-end p-3">{{ currentApplicationVersion }}</p>