Skip to content

Commit

Permalink
Global: Upgrade Angular from 14 to 17
Browse files Browse the repository at this point in the history
  • Loading branch information
ValentinFutterer committed Feb 20, 2024
1 parent e3def66 commit c7298b0
Show file tree
Hide file tree
Showing 63 changed files with 18,469 additions and 32,390 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@ src/themes/*
/reports

.angular


.nx/cache
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@

# Test coverage files
**/coverage/**

/.nx/cache
178 changes: 0 additions & 178 deletions angular.json

This file was deleted.

30 changes: 30 additions & 0 deletions apps/damap-frontend-e2e/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"name": "damap-frontend-e2e",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/damap-frontend-e2e/src",
"projectType": "application",
"targets": {
"e2e": {
"executor": "@nrwl/cypress:cypress",
"options": {
"cypressConfig": "apps/damap-frontend-e2e/cypress.config.ts",
"devServerTarget": "damap-frontend:serve:development",
"testingType": "e2e"
},
"configurations": {
"production": {
"devServerTarget": "damap-frontend:serve:production"
}
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/damap-frontend-e2e/**/*.{js,ts}"]
}
}
},
"tags": [],
"implicitDependencies": ["damap-frontend"]
}
56 changes: 37 additions & 19 deletions apps/damap-frontend/project.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,42 @@
{
"name": "damap-frontend",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"generators": {
"@schematics/angular:application": {
"strict": true
}
},
"sourceRoot": "apps/damap-frontend/src",
"prefix": "app",
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
"options": {
"assets": [
"apps/damap-frontend/src/favicon.ico",
"apps/damap-frontend/src/assets",
{
"glob": "**/*",
"input": "libs/damap/src/assets/",
"output": "./assets/damap-core/"
}
],
"styles": [
"apps/damap-frontend/src/styles.scss",
"libs/damap/src/assets/styles.scss"
],
"outputPath": "dist/apps/damap-frontend",
"index": "apps/damap-frontend/src/index.html",
"main": "apps/damap-frontend/src/main.ts",
"polyfills": "apps/damap-frontend/src/polyfills.ts",
"tsConfig": "apps/damap-frontend/tsconfig.app.json",
"assets": [
"apps/damap-frontend/src/favicon.ico",
"apps/damap-frontend/src/assets"
],
"styles": ["apps/damap-frontend/src/styles.scss"],
"scripts": []
"aot": true
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
Expand All @@ -41,9 +53,12 @@
{
"replace": "apps/damap-frontend/src/environments/environment.ts",
"with": "apps/damap-frontend/src/environments/environment.prod.ts"
},
{
"replace": "libs/damap/src/lib/constants.ts",
"with": "libs/damap/src/lib/constants.prod.ts"
}
],
"outputHashing": "all"
]
},
"development": {
"buildOptimizer": false,
Expand Down Expand Up @@ -79,6 +94,9 @@
},
"serve": {
"executor": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "damap-frontend:build"
},
"configurations": {
"production": {
"browserTarget": "damap-frontend:build:production"
Expand Down Expand Up @@ -106,17 +124,17 @@
"apps/damap-frontend/src/favicon.ico",
"apps/damap-frontend/src/assets"
],
"styles": ["apps/damap-frontend/src/styles.scss"],
"styles": [
"apps/damap-frontend/src/styles.scss",
"libs/damap/src/assets/styles.scss"
],
"scripts": []
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/damap-frontend/**/*.ts",
"apps/damap-frontend/**/*.html"
]
"lintFilePatterns": ["apps/damap-frontend/src/**/*.ts", "src/**/*.html"]
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions apps/damap-frontend/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { APP_INITIALIZER, NgModule } from '@angular/core';
import { AuthGuard, EnvBannerModule } from '@damap/core';
import { HttpClient, HttpClientModule } from '@angular/common/http';
import { HttpBackend, HttpClientModule } from "@angular/common/http";
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';

import { APP_ROUTES } from './app.routes';
Expand All @@ -20,16 +20,16 @@ import { RouterModule } from '@angular/router';
import { environment } from '../environments/environment';

// required for AOT compilation
export function HttpLoaderFactory(http: HttpClient): MultiTranslateHttpLoader {
export function HttpLoaderFactory(http: HttpBackend): MultiTranslateHttpLoader {
return new MultiTranslateHttpLoader(http, [
{ prefix: './assets/i18n/layout/', suffix: '.json' },
{ prefix: './assets/i18n/consent/', suffix: '.json' },
{ prefix: './assets/damap-core/i18n/dashboard/', suffix: '.json' },
{ prefix: './assets/damap-core/i18n/plans/', suffix: '.json' },
{ prefix: './assets/damap-core/i18n/http/', suffix: '.json' },
{ prefix: './assets/damap-core/i18n/gdpr/', suffix: '.json' },
{ prefix: './assets/damap-core/i18n/', suffix: '.json' },
{ prefix: './assets/i18n/', suffix: '.json' },
'/assets/i18n/layout/',
'/assets/i18n/consent/',
'/assets/damap-core/i18n/dashboard/',
'/assets/damap-core/i18n/plans/',
'/assets/damap-core/i18n/http/',
'/assets/damap-core/i18n/gdpr/',
'/assets/damap-core/i18n/',
'/assets/i18n/',
]);
}

Expand All @@ -55,7 +55,7 @@ export function HttpLoaderFactory(http: HttpClient): MultiTranslateHttpLoader {
loader: {
provide: TranslateLoader,
useFactory: HttpLoaderFactory,
deps: [HttpClient],
deps: [HttpBackend],
},
}),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ mat-nav-list {
}

.mm-navbars-top {
background: inherit;
border-color: inherit;
background-color: var(--main-color);
border-width: 0;
overflow: hidden;
Expand All @@ -46,6 +44,11 @@ mat-nav-list {
height: 50px;
}

.mm-navbar-button {
color: #fff;
height: 100%;
}

.info {
display: flex;
flex-direction: column;
Expand Down
Loading

0 comments on commit c7298b0

Please sign in to comment.