sandre/SkydiveLogs
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to Angular v19 and fixing #3

Merged
sandre merged 41 commits from fix/error-after-update-angular-19 into master 2026-01-20 10:56:35 +00:00
Conversation 0 Commits 41 Files Changed 117 +113 -56
9 changed files with 113 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4983a1d237 - Show all commits

39
Front/skydivelogs-app/package-lock.json generated
View File

@@ -19,8 +19,8 @@
"@angular/platform-browser": "^19.2.6", "@angular/platform-browser": "^19.2.6",
"@angular/platform-browser-dynamic": "^19.2.6", "@angular/platform-browser-dynamic": "^19.2.6",
"@angular/router": "^19.2.6", "@angular/router": "^19.2.6",
"@ngx-translate/core": "^15.0.0", "@ngx-translate/core": "^17.0.0",
"@ngx-translate/http-loader": "^8.0.0", "@ngx-translate/http-loader": "^17.0.0",
"chart.js": "^4.3.0", "chart.js": "^4.3.0",
"ng2-charts": "^8.0.0", "ng2-charts": "^8.0.0",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
@@ -3994,32 +3994,29 @@
} }
}, },
"node_modules/@ngx-translate/core": { "node_modules/@ngx-translate/core": {
"version": "15.0.0", "version": "17.0.0",
"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-15.0.0.tgz", "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-17.0.0.tgz",
"integrity": "sha512-Am5uiuR0bOOxyoercDnAA3rJVizo4RRqJHo8N3RqJ+XfzVP/I845yEnMADykOHvM6HkVm4SZSnJBOiz0Anx5BA==", "integrity": "sha512-Rft2D5ns2pq4orLZjEtx1uhNuEBerUdpFUG1IcqtGuipj6SavgB8SkxtNQALNDA+EVlvsNCCjC2ewZVtUeN6rg==",
"license": "SEE LICENSE IN LICENSE", "license": "MIT",
"engines": { "dependencies": {
"node": "^16.13.0 || >=18.10.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": ">=16.0.0", "@angular/common": ">=16",
"@angular/core": ">=16.0.0", "@angular/core": ">=16"
"rxjs": "^6.5.5 || ^7.4.0"
} }
}, },
"node_modules/@ngx-translate/http-loader": { "node_modules/@ngx-translate/http-loader": {
"version": "8.0.0", "version": "17.0.0",
"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-8.0.0.tgz", "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-17.0.0.tgz",
"integrity": "sha512-SFMsdUcmHF5OdZkL1CHEoSAwbP5EbAOPTLLboOCRRoOg21P4GJx+51jxGdJeGve6LSKLf4Pay7BkTwmE6vxYlg==", "integrity": "sha512-hgS8sa0ARjH9ll3PhkLTufeVXNI2DNR2uFKDhBgq13siUXzzVr/a31M6zgecrtwbA34iaBV01hsTMbMS8V7iIw==",
"license": "SEE LICENSE IN LICENSE", "license": "MIT",
"engines": { "dependencies": {
"node": "^16.13.0 || >=18.10.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": ">=16.0.0", "@angular/common": ">=16",
"@angular/core": ">=16.0.0", "@angular/core": ">=16"
"@ngx-translate/core": ">=15.0.0",
"rxjs": "^6.5.5 || ^7.4.0"
} }
}, },
"node_modules/@nodelib/fs.scandir": { "node_modules/@nodelib/fs.scandir": {

4
Front/skydivelogs-app/package.json
View File

@@ -22,8 +22,8 @@
"@angular/platform-browser": "^19.2.6", "@angular/platform-browser": "^19.2.6",
"@angular/platform-browser-dynamic": "^19.2.6", "@angular/platform-browser-dynamic": "^19.2.6",
"@angular/router": "^19.2.6", "@angular/router": "^19.2.6",
"@ngx-translate/core": "^15.0.0", "@ngx-translate/core": "^17.0.0",
"@ngx-translate/http-loader": "^8.0.0", "@ngx-translate/http-loader": "^17.0.0",
"chart.js": "^4.3.0", "chart.js": "^4.3.0",
"ng2-charts": "^8.0.0", "ng2-charts": "^8.0.0",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",

8
Front/skydivelogs-app/src/app/app.component.ts
View File

@@ -1,6 +1,5 @@
import { Component, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { Router, RouterOutlet } from "@angular/router"; import { Router, RouterOutlet } from "@angular/router";
import { TranslateModule, TranslateService } from "@ngx-translate/core";
import { CommonModule } from "@angular/common"; import { CommonModule } from "@angular/common";
import { MatToolbarModule } from "@angular/material/toolbar"; import { MatToolbarModule } from "@angular/material/toolbar";
import { MatIconModule } from "@angular/material/icon"; import { MatIconModule } from "@angular/material/icon";
@@ -17,6 +16,12 @@ import { ServiceComm } from "../services/service-comm.service";
import { ConfigurationHelper } from "../services/configuration-helper"; import { ConfigurationHelper } from "../services/configuration-helper";
import { ServiceCacheApi } from "../services/service-cache-api.service"; import { ServiceCacheApi } from "../services/service-cache-api.service";
import {
TranslateService,
TranslateModule,
TranslatePipe,
} from "@ngx-translate/core";
@Component({ @Component({
selector: "app-root", selector: "app-root",
templateUrl: "./app.component.html", templateUrl: "./app.component.html",
@@ -31,6 +36,7 @@ import { ServiceCacheApi } from "../services/service-cache-api.service";
MatListModule, MatListModule,
RouterOutlet, RouterOutlet,
TranslateModule, TranslateModule,
TranslatePipe,
], ],
}) })
export class AppComponent implements OnInit { export class AppComponent implements OnInit {

21
Front/skydivelogs-app/src/app/app.config.ts
View File

@@ -1,6 +1,5 @@
import { inject, provideAppInitializer } from "@angular/core"; import { inject, provideAppInitializer } from "@angular/core";
import { ApplicationConfig, provideZoneChangeDetection } from "@angular/core"; import { ApplicationConfig, provideZoneChangeDetection } from "@angular/core";
import { TranslateHttpLoader } from "@ngx-translate/http-loader";
import { provideRouter } from "@angular/router"; import { provideRouter } from "@angular/router";
import { DatePipe } from "@angular/common"; import { DatePipe } from "@angular/common";
import { import {
@@ -32,10 +31,16 @@ import { environment } from "../environments/environment";
import { routes } from "./app.routes"; import { routes } from "./app.routes";
import {
provideTranslateService,
provideTranslateLoader,
} from "@ngx-translate/core";
import { provideTranslateHttpLoader } from "@ngx-translate/http-loader";
// AOT compilation support // AOT compilation support
export function httpTranslateLoader(http: HttpClient) { // export function httpTranslateLoader(http: HttpClient) {
return new TranslateHttpLoader(http); // return new TranslateHttpLoader(http);
} // }
// Déclaration de la fonction d'initialisation de la configuration // Déclaration de la fonction d'initialisation de la configuration
export function initConfig(configService: ConfigurationHelper) { export function initConfig(configService: ConfigurationHelper) {
@@ -69,5 +74,13 @@ export const appConfig: ApplicationConfig = {
provideZoneChangeDetection({ eventCoalescing: true }), provideZoneChangeDetection({ eventCoalescing: true }),
provideRouter(routes), provideRouter(routes),
provideHttpClient(), provideHttpClient(),
provideTranslateService({
loader: provideTranslateHttpLoader({
prefix: "/assets/i18n/",
suffix: ".json",
}),
fallbackLang: "en",
lang: "en",
}),
], ],
}; };

20
Front/skydivelogs-app/src/app/create-user/create-user.component.html
View File

@@ -7,7 +7,7 @@
<p> <p>
<mat-form-field> <mat-form-field>
<mat-label>{{ "LoginCreateUser_Firstname" | translate }}</mat-label> <mat-label>{{ "LoginCreateUser_Firstname" | translate }}</mat-label>
<input <!-- <input
matInput matInput
type="text" type="text"
formControlName="firstname" formControlName="firstname"
@@ -19,13 +19,13 @@
</mat-error> </mat-error>
<mat-error *ngIf="formCtrls['firstname'].hasError('minlength')"> <mat-error *ngIf="formCtrls['firstname'].hasError('minlength')">
{{ "LoginCreateUser_FirstnamePattern" | translate }} {{ "LoginCreateUser_FirstnamePattern" | translate }}
</mat-error> </mat-error> -->
</mat-form-field> </mat-form-field>
</p> </p>
<p> <p>
<mat-form-field> <mat-form-field>
<mat-label>{{ "LoginCreateUser_Lastname" | translate }}</mat-label> <mat-label>{{ "LoginCreateUser_Lastname" | translate }}</mat-label>
<input <!-- <input
matInput matInput
type="text" type="text"
formControlName="lastname" formControlName="lastname"
@@ -37,13 +37,13 @@
</mat-error> </mat-error>
<mat-error *ngIf="formCtrls['lastname'].hasError('minlength')"> <mat-error *ngIf="formCtrls['lastname'].hasError('minlength')">
{{ "LoginCreateUser_LastnamePattern" | translate }} {{ "LoginCreateUser_LastnamePattern" | translate }}
</mat-error> </mat-error> -->
</mat-form-field> </mat-form-field>
</p> </p>
<p> <p>
<mat-form-field> <mat-form-field>
<mat-label>{{ "LoginCreateUser_Email" | translate }}</mat-label> <mat-label>{{ "LoginCreateUser_Email" | translate }}</mat-label>
<input <!-- <input
matInput matInput
type="email" type="email"
formControlName="email" formControlName="email"
@@ -55,13 +55,13 @@
</mat-error> </mat-error>
<mat-error *ngIf="formCtrls['email'].hasError('email')"> <mat-error *ngIf="formCtrls['email'].hasError('email')">
{{ "LoginCreateUser_EmailPattern" | translate }} {{ "LoginCreateUser_EmailPattern" | translate }}
</mat-error> </mat-error> -->
</mat-form-field> </mat-form-field>
</p> </p>
<p> <p>
<mat-form-field> <mat-form-field>
<mat-label>{{ "LoginCreateUser_Username" | translate }}</mat-label> <mat-label>{{ "LoginCreateUser_Username" | translate }}</mat-label>
<input <!-- <input
matInput matInput
type="text" type="text"
formControlName="username" formControlName="username"
@@ -73,13 +73,13 @@
</mat-error> </mat-error>
<mat-error *ngIf="formCtrls['username'].hasError('minlength')"> <mat-error *ngIf="formCtrls['username'].hasError('minlength')">
{{ "LoginCreateUser_UsernamePattern" | translate }} {{ "LoginCreateUser_UsernamePattern" | translate }}
</mat-error> </mat-error> -->
</mat-form-field> </mat-form-field>
</p> </p>
<p> <p>
<mat-form-field> <mat-form-field>
<mat-label>{{ "LoginCreateUser_Password" | translate }}</mat-label> <mat-label>{{ "LoginCreateUser_Password" | translate }}</mat-label>
<input <!-- <input
matInput matInput
type="password" type="password"
formControlName="password" formControlName="password"
@@ -91,7 +91,7 @@
</mat-error> </mat-error>
<mat-error *ngIf="formCtrls['password'].hasError('pattern')"> <mat-error *ngIf="formCtrls['password'].hasError('pattern')">
{{ "LoginCreateUser_PasswordPattern" | translate }} {{ "LoginCreateUser_PasswordPattern" | translate }}
</mat-error> </mat-error> -->
</mat-form-field> </mat-form-field>
</p> </p>

11
Front/skydivelogs-app/src/app/create-user/create-user.component.ts
View File

@@ -6,7 +6,11 @@ import {
ReactiveFormsModule, ReactiveFormsModule,
Validators, Validators,
} from "@angular/forms"; } from "@angular/forms";
import { TranslateModule, TranslateService } from "@ngx-translate/core"; import {
TranslateModule,
TranslatePipe,
TranslateService,
} from "@ngx-translate/core";
import { CommonModule } from "@angular/common"; import { CommonModule } from "@angular/common";
import { MatFormFieldModule } from "@angular/material/form-field"; import { MatFormFieldModule } from "@angular/material/form-field";
@@ -20,10 +24,11 @@ import { User } from "../../models/user";
templateUrl: "./create-user.component.html", templateUrl: "./create-user.component.html",
styleUrls: ["./create-user.component.css"], styleUrls: ["./create-user.component.css"],
imports: [ imports: [
TranslateModule,
CommonModule, CommonModule,
MatFormFieldModule, MatFormFieldModule,
ReactiveFormsModule, ReactiveFormsModule,
TranslateModule,
TranslatePipe,
], ],
}) })
export class CreateUserComponent implements OnInit { export class CreateUserComponent implements OnInit {
@@ -89,7 +94,7 @@ export class CreateUserComponent implements OnInit {
createUser.firstName = this.formCtrls["firstname"].value; createUser.firstName = this.formCtrls["firstname"].value;
createUser.lastName = this.formCtrls["lastname"].value; createUser.lastName = this.formCtrls["lastname"].value;
createUser.email = this.formCtrls["email"].value; createUser.email = this.formCtrls["email"].value;
createUser.language = this.translateService.currentLang; createUser.language = this.translateService.getCurrentLang();
this.authenticationService this.authenticationService
.create(createUser) .create(createUser)

5
Front/skydivelogs-app/src/app/login-user/login-user.component.ts
View File

@@ -7,7 +7,7 @@ import {
ReactiveFormsModule, ReactiveFormsModule,
Validators, Validators,
} from "@angular/forms"; } from "@angular/forms";
import { TranslateModule } from "@ngx-translate/core"; import { TranslateModule, TranslatePipe } from "@ngx-translate/core";
import { MatInput, MatInputModule } from "@angular/material/input"; import { MatInput, MatInputModule } from "@angular/material/input";
import { MatFormFieldModule } from "@angular/material/form-field"; import { MatFormFieldModule } from "@angular/material/form-field";
@@ -20,11 +20,12 @@ import { AuthenticationService } from "../../services/authentication.service";
templateUrl: "./login-user.component.html", templateUrl: "./login-user.component.html",
styleUrls: ["./login-user.component.css"], styleUrls: ["./login-user.component.css"],
imports: [ imports: [
TranslateModule,
CommonModule, CommonModule,
MatFormFieldModule, MatFormFieldModule,
ReactiveFormsModule, ReactiveFormsModule,
MatInputModule, MatInputModule,
TranslateModule,
TranslatePipe,
], ],
}) })
export class LoginUserComponent implements OnInit, AfterViewInit { export class LoginUserComponent implements OnInit, AfterViewInit {

50
Front/skydivelogs-app/src/app/login/login.component.html
View File

@@ -1,18 +1,50 @@
<div class="content"> <div class="content">
<mat-card style="max-width: 500px;" flex="50"> <mat-select
<mat-card-header style="align-items: center; justify-content: center; background-color: rgba(0,0,0,.03);"> (selectionChange)="switchLang($event)"
<mat-card-title>{{ 'Login_Title' | translate }}</mat-card-title> [(value)]="selectedLanguageFlag"
style="width: 60px; padding-left: 30px"
>
<mat-select-trigger>
<img
src="{{ 'assets/img/' + selectedLanguageFlag + '.svg' }}"
style="width: 30px"
/>
</mat-select-trigger>
<mat-option value="fr">
<img src="assets/img/fr.svg" style="width: 30px" />
</mat-option>
<mat-option value="en">
<img src="assets/img/en.svg" style="width: 30px" />
</mat-option>
</mat-select>
<app-create-user></app-create-user>
<mat-select (selectionChange)="switchLang($event)" [(value)]="selectedLanguageFlag" <!-- <mat-card style="max-width: 500px" flex="50">
style="width: 60px; padding-left: 30px;" > <mat-card-header
style="
align-items: center;
justify-content: center;
background-color: rgba(0, 0, 0, 0.03);
"
>
<mat-card-title>{{ "Login_Title" | translate }}</mat-card-title>
<mat-select
(selectionChange)="switchLang($event)"
[(value)]="selectedLanguageFlag"
style="width: 60px; padding-left: 30px"
>
<mat-select-trigger> <mat-select-trigger>
<img src="{{ 'assets/img/' + selectedLanguageFlag + '.svg' }}" style="width: 30px;"> <img
src="{{ 'assets/img/' + selectedLanguageFlag + '.svg' }}"
style="width: 30px"
/>
</mat-select-trigger> </mat-select-trigger>
<mat-option value="fr"> <mat-option value="fr">
<img src="assets/img/fr.svg" style="width: 30px;"> <img src="assets/img/fr.svg" style="width: 30px" />
</mat-option> </mat-option>
<mat-option value="en"> <mat-option value="en">
<img src="assets/img/en.svg" style="width: 30px;"> <img src="assets/img/en.svg" style="width: 30px" />
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-card-header> </mat-card-header>
@@ -27,5 +59,5 @@
</mat-tab> </mat-tab>
</mat-tab-group> </mat-tab-group>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card> -->
</div> </div>

9
Front/skydivelogs-app/src/app/login/login.component.ts
View File

@@ -1,5 +1,9 @@
import { Component, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { TranslateModule, TranslateService } from "@ngx-translate/core"; import {
TranslateModule,
TranslatePipe,
TranslateService,
} from "@ngx-translate/core";
import { CommonModule } from "@angular/common"; import { CommonModule } from "@angular/common";
import { MatSelectModule } from "@angular/material/select"; import { MatSelectModule } from "@angular/material/select";
import { MatOptionModule } from "@angular/material/core"; import { MatOptionModule } from "@angular/material/core";
@@ -22,14 +26,13 @@ import { CreateUserComponent } from "../create-user/create-user.component";
MatTabsModule, MatTabsModule,
LoginUserComponent, LoginUserComponent,
CreateUserComponent, CreateUserComponent,
TranslateModule,
], ],
}) })
export class LoginComponent implements OnInit { export class LoginComponent implements OnInit {
public selectedLanguageFlag: string; public selectedLanguageFlag: string;
constructor(private translate: TranslateService) { constructor(private translate: TranslateService) {
translate.addLangs(["en", "fr"]);
translate.setDefaultLang("en");
this.selectedLanguageFlag = "en"; this.selectedLanguageFlag = "en";
} }