Release 1.2.0

.github/workflows/tests.yml

@@ -1,22 +1,53 @@
-name: Build and test
+name: Lint, build and test
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - main
+    - develop
+    - '*'
+  pull_request:
+    branches: [ develop ]
 
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
     steps:
       - name: Pull the source code to GitHub workspace
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Node environment
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '16'
           cache: 'yarn'
       - name: Install dependencies
         run: yarn install
+      - name: Run lint
+        if: ${{ success() }}
+        run: yarn run lint
       - name: Run build
         run: yarn run build
       - name: Run tests
         if: ${{ success() }}
-        run: yarn test
+        run: yarn run test
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Node environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: '16'
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install
+      - name: Test and coverage
+        run: yarn run test:coverage
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.prettierrc.json

@@ -1,8 +1,15 @@
 {
+  "arrowParens": "always",
+  "bracketSameLine": true,
+  "bracketSpacing": true,
+  "endOfLine": "lf",
+  "htmlWhitespaceSensitivity": "css",
+  "printWidth": 140,
+  "proseWrap": "preserve",
+  "semi": true,
+  "singleAttributePerLine": false,
   "singleQuote": true,
-  "trailingComma": "none",
-  "endOfLine": "auto",
   "tabWidth": 2,
-  "printWidth": 140,
-  "bracketSameLine": true
+  "trailingComma": "none",
+  "useTabs": false
 }

.vscode/extensions.json

@@ -0,0 +1,11 @@
+{
+  "recommendations": [
+    "angular.ng-template",
+    "esbenp.prettier-vscode",
+    "firsttris.vscode-jest-runner",
+    "dbaeumer.vscode-eslint",
+    "SonarSource.sonarlint-vscode",
+    "streetsidesoftware.code-spell-checker",
+    "streetsidesoftware.code-spell-checker-ukrainian"
+  ]
+}

.vscode/settings.json

@@ -1,4 +1,19 @@
-{
-  "editor.detectIndentation": false,
-  "editor.tabSize": 2,
+{
+  "editor.detectIndentation": false,
+  "editor.tabSize": 2,
+  "cSpell.language": "en,uk",
+  "typescript.tsdk": "node_modules\\typescript\\lib",
+  "sonarlint.connectedMode.project": {
+    "projectKey": "ita-social-projects-oos-frontend"
+  },
+  "cSpell.words": [
+    "catottg",
+    "Codeficator",
+    "Codeficators",
+    "edrpou",
+    "Ngxs",
+    "settelment",
+    "signalr",
+    "subrole"
+  ]
 }

angular.json

@@ -2,10 +2,7 @@
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "cli": {
     "analytics": false,
-    "schematicCollections": [
-      "@angular-eslint/schematics",
-      "@angular-eslint/schematics"
-    ]
+    "schematicCollections": ["@angular-eslint/schematics", "@angular-eslint/schematics"]
   },
   "version": 1,
   "newProjectRoot": "projects",
@@ -155,10 +152,7 @@
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": [
-              "src/**/*.ts",
-              "src/**/*.html"
-            ]
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
           }
         }
       }

cloudbuild.yaml

@@ -96,3 +96,5 @@ availableSecrets:
   secretManager:
   - versionName: $_GITHUB_DEPLOY
     env: 'SSH'
+options:
+  logging: CLOUD_LOGGING_ONLY

package.json

@@ -1,81 +1,89 @@
-{
-  "name": "out-of-school",
-  "version": "0.0.0",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
-    "build:prod": "ng build --configuration production",
-    "build:qa": "ng build --configuration qa",
-    "test": "jest",
-    "test:coverage": "jest --coverage",
-    "test-watch": "jest --watch",
-    "lint": "ng lint",
-    "e2e": "ng e2e"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular-slider/ngx-slider": "^2.0.4",
-    "@angular/animations": "^14.2.3",
-    "@angular/cdk": "^14.2.2",
-    "@angular/common": "^14.2.3",
-    "@angular/compiler": "^14.2.3",
-    "@angular/core": "^14.2.3",
-    "@angular/flex-layout": "^14.0.0-beta.40",
-    "@angular/forms": "^14.2.3",
-    "@angular/material": "^14.2.2",
-    "@angular/material-moment-adapter": "^14.2.2",
-    "@angular/platform-browser": "^14.2.3",
-    "@angular/platform-browser-dynamic": "^14.2.3",
-    "@angular/router": "^14.2.3",
-    "@asymmetrik/ngx-leaflet": "^14.0.1",
-    "@microsoft/signalr": "^6.0.9",
-    "@ngx-translate/core": "^14.0.0",
-    "@ngx-translate/http-loader": "^7.0.0",
-    "@ngxs/store": "^3.7.5",
-    "@types/leaflet": "1",
-    "angular-auth-oidc-client": "^14.1.5",
-    "angular-responsive-carousel": "^2.1.2",
-    "jwt-decode": "^3.1.2",
-    "leaflet": "^1.9.1",
-    "moment": "^2.29.4",
-    "ngx-image-cropper": "6.2.2",
-    "ngx-mat-timepicker": "^14.0.2",
-    "ngx-pagination": "^6.0.2",
-    "rxjs": "~7.5.7",
-    "tslib": "^2.4.0",
-    "zone.js": "~0.11.8"
-  },
-  "devDependencies": {
-    "@angular-builders/jest": "^14.0.1",
-    "@angular-devkit/build-angular": "^14.2.3",
-    "@angular-eslint/builder": "14.1.2",
-    "@angular-eslint/eslint-plugin": "14.1.2",
-    "@angular-eslint/eslint-plugin-template": "14.1.2",
-    "@angular-eslint/schematics": "14.1.2",
-    "@angular-eslint/template-parser": "14.1.2",
-    "@angular/cli": "^14.2.3",
-    "@angular/compiler-cli": "^14.2.3",
-    "@ngxs/devtools-plugin": "^3.7.5",
-    "@ngxs/logger-plugin": "^3.7.5",
-    "@types/jasmine": "~4.3.0",
-    "@types/jest": "^28.1.8",
-    "@types/node": "^18.7.22",
-    "@typescript-eslint/eslint-plugin": "5.37.0",
-    "@typescript-eslint/parser": "5.37.0",
-    "eslint": "^8.23.1",
-    "eslint-config-prettier": "^8.5.0",
-    "jest": "^28.1.3",
-    "jest-preset-angular": "^12.2.2",
-    "karma-coverage": "~2.2.0",
-    "prettier": "2.7.1",
-    "protractor": "~7.0.0",
-    "ts-jest": "^28.0.8",
-    "ts-node": "~10.9.1",
-    "typescript": "^4.8.3"
-  },
-  "main": "index.js",
-  "repository": "https://github.com/ita-social-projects/OoS-Frontend.git",
-  "author": " ",
-  "license": "MIT"
-}
+{
+  "name": "out-of-school",
+  "version": "0.0.0",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve",
+    "build": "ng build",
+    "build:prod": "ng build --configuration production",
+    "build:qa": "ng build --configuration qa",
+    "test": "jest",
+    "test:coverage": "jest --coverage",
+    "test-watch": "jest --watch",
+    "lint": "ng lint",
+    "lint:fix": "ng lint --fix & prettier --write .",
+    "e2e": "ng e2e"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular-slider/ngx-slider": "^2.0.4",
+    "@angular/animations": "^14.2.3",
+    "@angular/cdk": "^14.2.2",
+    "@angular/common": "^14.2.3",
+    "@angular/compiler": "^14.2.3",
+    "@angular/core": "^14.2.3",
+    "@angular/flex-layout": "^14.0.0-beta.40",
+    "@angular/forms": "^14.2.3",
+    "@angular/material": "^14.2.2",
+    "@angular/material-moment-adapter": "^14.2.2",
+    "@angular/platform-browser": "^14.2.3",
+    "@angular/platform-browser-dynamic": "^14.2.3",
+    "@angular/router": "^14.2.3",
+    "@asymmetrik/ngx-leaflet": "^14.0.1",
+    "@microsoft/signalr": "^6.0.9",
+    "@ngx-translate/core": "^14.0.0",
+    "@ngx-translate/http-loader": "^7.0.0",
+    "@ngxs/storage-plugin": "3.7.5",
+    "@ngxs/store": "^3.7.5",
+    "@types/leaflet": "1",
+    "angular-auth-oidc-client": "^14.1.5",
+    "angular-responsive-carousel": "^2.1.2",
+    "jwt-decode": "^3.1.2",
+    "leaflet": "^1.9.1",
+    "moment": "^2.29.4",
+    "ngx-image-cropper": "6.2.2",
+    "ngx-mat-timepicker": "^14.0.2",
+    "ngx-pagination": "^6.0.2",
+    "rxjs": "~7.5.7",
+    "tslib": "^2.4.0",
+    "zone.js": "~0.11.8"
+  },
+  "devDependencies": {
+    "@angular-builders/jest": "^14.0.1",
+    "@angular-devkit/build-angular": "^14.2.3",
+    "@angular-eslint/builder": "14.1.2",
+    "@angular-eslint/eslint-plugin": "14.1.2",
+    "@angular-eslint/eslint-plugin-template": "14.1.2",
+    "@angular-eslint/schematics": "14.1.2",
+    "@angular-eslint/template-parser": "14.1.2",
+    "@angular/cli": "^14.2.3",
+    "@angular/compiler-cli": "^14.2.3",
+    "@ngxs/devtools-plugin": "^3.7.5",
+    "@ngxs/logger-plugin": "^3.7.5",
+    "@types/jasmine": "~4.3.0",
+    "@types/jest": "^28.1.8",
+    "@types/node": "^18.7.22",
+    "@typescript-eslint/eslint-plugin": "5.37.0",
+    "@typescript-eslint/parser": "5.37.0",
+    "eslint": "^8.23.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-jsdoc": "^46.10.1",
+    "eslint-plugin-no-null": "^1.0.2",
+    "eslint-plugin-prettier": "^5.1.2",
+    "eslint-plugin-react": "^7.33.2",
+    "jest": "^28.1.3",
+    "jest-preset-angular": "^12.2.2",
+    "karma-coverage": "~2.2.0",
+    "prettier": "3.1.1",
+    "protractor": "~7.0.0",
+    "ts-jest": "^28.0.8",
+    "ts-node": "~10.9.1",
+    "typescript": "^4.8.3"
+  },
+  "main": "index.js",
+  "repository": "https://github.com/ita-social-projects/OoS-Frontend.git",
+  "author": " ",
+  "license": "MIT"
+}

sonar-project.properties

@@ -0,0 +1,6 @@
+sonar.projectKey=ita-social-projects-oos-frontend
+sonar.organization=ita-social-projects
+sonar.exclusions=**/*.spec.ts
+sonar.coverage.exclusions=**/*.spec.ts
+sonar.cpd.exclusions=**/*.spec.ts
+sonar.javascript.lcov.reportPaths=./coverage/lcov.info

src/.vscode/settings.json

@@ -1,8 +1,8 @@
 {
-    "launch": {
-        "configurations": [],
-        "compounds": [],
-        "editor.tabSize": 2,
-        "editor.detectIndentation": false
-    }
-}
+  "launch": {
+    "configurations": [],
+    "compounds": [],
+    "editor.tabSize": 2,
+    "editor.detectIndentation": false
+  }
+}

src/app/app-routing.module.ts

@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 
 const routes: Routes = [{ path: 'data', loadChildren: () => import('./shell/admin-tools/data/data.module').then((m) => m.DataModule) }];
 

src/app/app.component.html

@@ -1,6 +1,6 @@
 <mat-drawer-container>
   <div fxLayout="column">
-    <div class="content" [ngClass]="{ 'hide-content': (isAutorizationLoading$ | async) }">
+    <div class="content" [ngClass]="{ 'hide-content': (isAuthorizationLoading$ | async) }">
       <app-sidenav-menu [isMobileView]="isMobileView"></app-sidenav-menu>
       <app-sidenav-filters [isMobileView]="isMobileView"></app-sidenav-filters>
       <app-header></app-header>