ita-social-projects
diff --git a/‎.github/workflows/main.yml‎
Lines changed: 37 additions & 28 deletions b/‎.github/workflows/main.yml‎
Lines changed: 37 additions & 28 deletions
diff --git a/‎.gitignore‎
Lines changed: 10 additions & 0 deletions b/‎.gitignore‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎.prettierignore‎
Lines changed: 1 addition & 1 deletion b/‎.prettierignore‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 6 additions & 1 deletion b/‎README.md‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎angular.json‎
Lines changed: 0 additions & 1 deletion b/‎angular.json‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎azure-pipelines-prod.yml‎
Lines changed: 29 additions & 0 deletions b/‎azure-pipelines-prod.yml‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎azure-pipelines.yml‎
Lines changed: 29 additions & 0 deletions b/‎azure-pipelines.yml‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎package-lock.json‎
Lines changed: 30 additions & 5 deletions b/‎package-lock.json‎
Lines changed: 30 additions & 5 deletions
diff --git a/‎package.json‎
Lines changed: 3 additions & 1 deletion b/‎package.json‎
Lines changed: 3 additions & 1 deletion
@@ -9,6 +9,11 @@ on:
     branches: [prod-branch, dev]
   workflow_dispatch:
 
+permissions:
+  contents: read
+  checks: write
+  pull-requests: write
+
 env:
   repository: client
   dockerRepoName: skyere/greencity-front
@@ -46,9 +51,9 @@ jobs:
           npm install
           wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
           sudo apt-get install ./google-chrome-stable_current_amd64.deb -y --allow-downgrades
-          wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.0.0.4432-linux.zip
-          unzip sonar-scanner-cli-6.0.0.4432-linux.zip
-          sudo mv sonar-scanner-6.0.0.4432-linux /opt/sonar-scanner
+
+      - name: Build Test Environment
+        run: npx ts-node ./scripts/setenv.ts
 
       - name: JS Linter
         run: npm run lint
@@ -69,39 +74,44 @@ jobs:
             exit 1
           fi
 
-      - name: Sonar scan
+      - name: SonarCloud Scan
+        uses: SonarSource/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          PR_KEY="${{ github.event.pull_request.number }}"
-          PR_BRANCH="${{ github.head_ref }}"
-          PR_BASE="${{ github.base_ref }}"
-          PR_ARGS=""
-          if [ -n "$PR_KEY" ]; then
-            PR_ARGS="-Dsonar.pullrequest.key=$PR_KEY -Dsonar.pullrequest.branch=$PR_BRANCH -Dsonar.pullrequest.base=$PR_BASE -Dsonar.pullrequest.provider=github"
-          fi
-
-          /opt/sonar-scanner/bin/sonar-scanner \
-            -Dsonar.organization=ita-social-projects \
-            -Dsonar.projectKey=ita-social-projects-green-city-client \
-            -Dsonar.host.url=https://sonarcloud.io \
-            -Dsonar.login=$SONAR_TOKEN \
-            -Dsonar.sources=src \
-            -Dsonar.exclusions=**/node_modules/**,src/app/component/user/components/profile/calendar/calendar-image.*,src/app/component/user/components/profile/calendar/calendar-week/calendar-image.*,src/environments/environment.prod.*,src/app/image-pathes/auth-images.*,src/app/image-pathes/profile-icons.*,src/app/image-pathes/profile-images.*,src/app/image-pathes/single-news-images.*,src/app/image-pathes/sign-in-icons.*,src/app/component/about/about-routing.module.*,src/app/component/about/about.module.*,src/app/component/eco-news/eco-news-routing.module.*,src/app/component/eco-news/eco-news.module.*,src/app/component/map/map-routing.module.*,src/app/component/map/map.module.*,src/app/component/user/user-routing.module.*,src/app/component/user/user.module.*,src/app/app-routing.module.*,src/app/component/shared/shared.module.*,src/app/component/admin/admin-routing.module.*,src/app/component/admin/admin.module.*,src/app/app.module.*,src/app/component/auth/auth.module.*,src/app/component/core/core.module.*,src/app/component/home/home.module.*,src/app/component/layout/layout.module.*,src/app/model/weekDays.model.*,src/app/model/achievement/AchievementDto.*,src/app/model/advice/AdviceDto.*,src/app/model/filtering/filter-discount-dto.model.*,src/app/model/filtering/filter-distance-dto.model.*,src/app/model/filtering/filter-place-dto.model.*,src/app/model/habit-fact/HabitFactDto.*,src/app/model/habit/HabitStatisticLogDto.*,src/app/model/habit/HabitStatisticMapDto.*,src/app/model/habit/HabitStatisticsDto.*,src/app/model/habit/NewHabitDto.*,src/app/component/home/models/NewsDto.*,src/app/service/subscription/SubscriptionDto.*,src/app/model/user/userFilterDto.model.*,src/app/store/effects/ecoEvents.effects.*,src/app/ubs/ubs-admin/components/ubs-admin-certificate/ubs-admin-certificate.component.*,src/app/shared/interceptors/interceptor.service.*,src/app/store/reducers/ecoEvents.reducer.*,**/*.mock.ts,**/greencity.routing.module.*,**/*.model.ts \
-            -Dsonar.tests=src \
-            -Dsonar.test.inclusions=**/*.spec.ts \
-            -Dsonar.javascript.lcov.reportPaths=coverage/GreenCityClient/lcov.info \
-            $PR_ARGS
+        with:
+          args: >
+            -Dsonar.organization=ita-social-projects
+            -Dsonar.projectKey=ita-social-projects-green-city-client
+            -Dsonar.host.url=https://sonarcloud.io
+            -Dsonar.sources=src
+            -Dsonar.exclusions=**/node_modules/**,src/app/component/user/components/profile/calendar/calendar-image.*,src/app/component/user/components/profile/calendar/calendar-week/calendar-image.*,src/environments/environment.prod.*,src/app/image-pathes/auth-images.*,src/app/image-pathes/profile-icons.*,src/app/image-pathes/profile-images.*,src/app/image-pathes/single-news-images.*,src/app/image-pathes/sign-in-icons.*,src/app/component/about/about-routing.module.*,src/app/component/about/about.module.*,src/app/component/eco-news/eco-news-routing.module.*,src/app/component/eco-news/eco-news.module.*,src/app/component/map/map-routing.module.*,src/app/component/map/map.module.*,src/app/component/user/user-routing.module.*,src/app/component/user/user.module.*,src/app/app-routing.module.*,src/app/component/shared/shared.module.*,src/app/component/admin/admin-routing.module.*,src/app/component/admin/admin.module.*,src/app/app.module.*,src/app/component/auth/auth.module.*,src/app/component/core/core.module.*,src/app/component/home/home.module.*,src/app/component/layout/layout.module.*,src/app/model/weekDays.model.*,src/app/model/achievement/AchievementDto.*,src/app/model/advice/AdviceDto.*,src/app/model/filtering/filter-discount-dto.model.*,src/app/model/filtering/filter-distance-dto.model.*,src/app/model/filtering/filter-place-dto.model.*,src/app/model/habit-fact/HabitFactDto.*,src/app/model/habit/HabitStatisticLogDto.*,src/app/model/habit/HabitStatisticMapDto.*,src/app/model/habit/HabitStatisticsDto.*,src/app/model/habit/NewHabitDto.*,src/app/component/home/models/NewsDto.*,src/app/service/subscription/SubscriptionDto.*,src/app/model/user/userFilterDto.model.*,src/app/store/effects/ecoEvents.effects.*,src/app/ubs/ubs-admin/components/ubs-admin-certificate/ubs-admin-certificate.component.*,src/app/shared/interceptors/interceptor.service.*,src/app/store/reducers/ecoEvents.reducer.*,**/*.mock.ts,**/greencity.routing.module.*,**/*.model.ts
+            -Dsonar.test.inclusions=**/*.spec.ts
+            -Dsonar.javascript.lcov.reportPaths=coverage/GreenCityClient/lcov.info
 
       # - name: E2E Tests
       #   run: npx ng e2e --protractor-config=e2e/protractor-ci.conf.js
 
+      - name: Build Environment
+        env:
+          PROD_SECRET: ${{ secrets.ENV_PROD }}
+          STAGE_SECRET: ${{ secrets.ENV_STAGE }}
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/prod-branch" ]]; then
+            echo "${{ env.PROD_SECRET }}" > .env.prod
+            npx ts-node ./scripts/setenv.ts prod
+          else
+            echo "${{ env.STAGE_SECRET }}" > .env.stage
+            npx ts-node ./scripts/setenv.ts stage
+          fi
+
       - name: Build
         run: |
-          npx ng build --configuration=stage --base-href=/GreenCityClient/
-      #          npx ng build --prod --delete-output-path --base-href=/GreenCityClient/ --outputPath=dist_aot && rm -rf dist_aot
-      #          npx ng build --prod --base-href=/GreenCityClient/ --aot=false --build-optimizer=false
+          if [[ "${{ github.ref }}" == "refs/heads/prod-branch" ]]; then
+            npx ng build --configuration production --base-href=/GreenCityClient/
+          else
+            npx ng build --configuration=stage --base-href=/GreenCityClient/
+          fi
 
       - name: Set outputs
         run: echo "GITHUB_SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
@@ -151,4 +161,3 @@ jobs:
 #           BRANCH: gh-pages
 #           FOLDER: dist/GreenCityClient
 #           CLEAN: true
-
 
@@ -49,3 +49,13 @@ Thumbs.db
 
 # Logs
 *.log
+
+.env
+.env.stage
+.env.prod
+.env.copy
+
+src/environments/environment.copy.ts
+src/environments/environment.stage.ts
+src/environments/environment.ts
+src/environments/environment.prod.ts
@@ -11,4 +11,4 @@
 greencity-client-chart
 Dockerfile
 chart-test
-.gitignore
+.gitignore
@@ -2,6 +2,12 @@
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.2.1.
 
+## Build Environments
+
+Before building the project, run `npm run config` to generate `src/environments/environment.ts`.
+To generate a specific file, run `npm run config <key>` (for example: `npm run config stage`) to produce `environment.<key>.ts`.
+Prerequisite: ensure the corresponding `.env.<key>` is available locally or provided by CI (see `scripts/setenv.ts`).
+
 ## Development server
 
 Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
@@ -60,7 +66,6 @@ You should install Angular CLI 16.2.10 writting this in console: npm install -g
 
 3.  /src/
     This is where we keep our application source code.
-
     - /app/
       This folder contains templates, styles, images, angular components and anything else In angular project inside src folder. Any files outside of this folder are meant to support building your app.
 
 
@@ -124,7 +124,6 @@
           "options": {
             "polyfills": ["src/polyfills.ts", "zone.js/testing"],
             "tsConfig": "tsconfig.spec.json",
-            "sourceMap": false,
             "karmaConfig": "./karma.conf.js",
             "assets": ["src/favicon.ico", "src/assets", "src/manifest.webmanifest"],
             "styles": [
 
@@ -10,6 +10,7 @@ trigger:
 pr: none
 
 variables:
+  azureSub: GreenCity2022
   agentOS: ubuntu-latest
   docker_repo: skyere/greencity-front
   artifactName: drop
@@ -21,6 +22,20 @@ stages:
         pool:
           vmImage: $(agentOS)
         steps:
+          - script: |
+              mkdir -p src/environments
+              set -euo pipefail
+              test -d src/environments
+              chmod -R u+w -- src/environments
+            displayName: Ensure environment directory exists and has permissions
+
+          - task: AzureKeyVault@2
+            displayName: Retrieve secrets from Azure Key Vault
+            inputs:
+              azureSubscription: '$(azureSub)'
+              KeyVaultName: 'greencity-values'
+              SecretsFilter: 'ENV-PROD'
+
           - task: NodeTool@0
             displayName: Set up Node js
             inputs:
@@ -32,6 +47,20 @@ stages:
               command: 'install'
               workingDir: '.'
 
+          - script: |
+              set -euo pipefail
+              trap 'rm -f .env.prod' EXIT
+              umask 177
+
+              cat > .env.prod <<-EOF
+              $ENV_PROD
+              EOF
+
+              npx ts-node ./scripts/setenv.ts prod
+            displayName: Generate Environment File
+            env:
+              ENV_PROD: $(ENV-PROD)
+
           - task: Npm@1
             displayName: Build
             inputs:
 
@@ -10,6 +10,7 @@ trigger:
 pr: none
 
 variables:
+  azureSub: GreenCity2022
   agentOS: ubuntu-latest
   docker_repo: skyere/greencity-front
   artifactName: drop
@@ -21,6 +22,20 @@ stages:
         pool:
           vmImage: $(agentOS)
         steps:
+          - script: |
+              mkdir -p src/environments
+              set -euo pipefail
+              test -d src/environments
+              chmod -R u+w -- src/environments
+            displayName: Ensure environment directory exists and has permissions
+
+          - task: AzureKeyVault@2
+            displayName: Retrieve secrets from Azure Key Vault
+            inputs:
+              azureSubscription: '$(azureSub)'
+              KeyVaultName: 'greencity-app'
+              SecretsFilter: 'ENV-STAGE'
+
           - task: NodeTool@0
             displayName: Set up Node js
             inputs:
@@ -32,6 +47,20 @@ stages:
               command: 'install'
               workingDir: '.'
 
+          - script: |
+              set -euo pipefail
+              trap 'rm -f .env.stage' EXIT
+              umask 177
+
+              cat > .env.stage <<-EOF
+              $ENV_STAGE
+              EOF
+
+              npx ts-node ./scripts/setenv.ts stage
+            displayName: Generate Environment File
+            env:
+              ENV_STAGE: $(ENV-STAGE)
+
           - task: Npm@1
             displayName: Build
             inputs:
 
@@ -49,6 +49,7 @@
     "bootstrap": "^4.3.1",
     "chart.js": "^2.9.3",
     "chartjs-plugin-labels": "^1.1.0",
+    "dotenv": "^17.2.1",
     "google-libphonenumber": "^3.2.34",
     "google-oauth-gsi": "^4.0.1",
     "hammerjs": "^2.0.8",
@@ -100,6 +101,7 @@
     "eslint-config-prettier": "^10.1.5",
     "husky": "^4.3.8",
     "jasmine-core": "5.1.2",
+    "jasmine-marbles": "^0.9.2",
     "karma": "~6.4.3",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "^2.2.1",
@@ -122,7 +124,7 @@
   "husky": {
     "hooks": {
       "pre-commit": "npm run precommit",
-      "pre-push": "npm run lint && npm run stylelint && ng test --watch=false --progress=false --code-coverage=true --browsers=ChromeHeadless"
+      "pre-push": "npm run config && npm run lint && npm run stylelint && ng test --watch=false --progress=false --code-coverage=true --browsers=ChromeHeadless"
     }
   }
 }