From 60d8e5d58847a65eb5e5522851dc831c3a79027b Mon Sep 17 00:00:00 2001 From: MathieuCarteron Date: Wed, 10 Jun 2026 11:59:04 +0200 Subject: [PATCH] =?UTF-8?q?Parameters=20termin=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/core/auth/auth.service.ts | 2 +- src/app/models/user.model.ts | 2 +- ...parameters-coordinates-form.component.html | 4 +-- .../parameters-coordinates-form.component.ts | 34 ++++++------------- .../parameters-profile.component.ts | 4 +-- 5 files changed, 16 insertions(+), 30 deletions(-) diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index ff61058..6cb3fed 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -45,7 +45,7 @@ export class AuthService { localStorage.setItem(this.TOKEN_KEY, response.token); const user: LoggedUser = { - id: response.id, + id: String(response.id), username: response.username, email: response.email, tel: response.tel, diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts index 56cf548..7884dbb 100644 --- a/src/app/models/user.model.ts +++ b/src/app/models/user.model.ts @@ -1,5 +1,5 @@ export interface LoggedUser { - id: number; + id: string; username: string; email: string | null; tel: string | null; diff --git a/src/app/pages/parameters/parameters-coordinates-form/parameters-coordinates-form.component.html b/src/app/pages/parameters/parameters-coordinates-form/parameters-coordinates-form.component.html index 555a351..a480dee 100644 --- a/src/app/pages/parameters/parameters-coordinates-form/parameters-coordinates-form.component.html +++ b/src/app/pages/parameters/parameters-coordinates-form/parameters-coordinates-form.component.html @@ -10,7 +10,7 @@ -
+ Valider diff --git a/src/app/pages/parameters/parameters-coordinates-form/parameters-coordinates-form.component.ts b/src/app/pages/parameters/parameters-coordinates-form/parameters-coordinates-form.component.ts index 73402cf..3109fe9 100644 --- a/src/app/pages/parameters/parameters-coordinates-form/parameters-coordinates-form.component.ts +++ b/src/app/pages/parameters/parameters-coordinates-form/parameters-coordinates-form.component.ts @@ -14,22 +14,11 @@ import { import {FormControl, FormGroup, ReactiveFormsModule, Validators} from "@angular/forms"; import {firstValueFrom} from "rxjs"; import {KnotsDTOUserUpdateUserContactDto, UsersService} from "../../../services/api"; +import {AuthService} from "../../../core/auth/auth.service"; @Component({ selector: 'app-parameters-coordinates-form', - imports: [ - IonHeader, - IonToolbar, - IonTitle, - IonButtons, - IonButton, - IonIcon, - IonContent, - ReactiveFormsModule, - IonItem, - IonInput, - IonNote - ], + imports: [IonHeader, IonToolbar, IonTitle, IonButtons, IonButton, IonIcon, IonContent, ReactiveFormsModule, IonItem, IonInput, IonNote], templateUrl: './parameters-coordinates-form.component.html', styleUrl: './parameters-coordinates-form.component.css' }) @@ -37,7 +26,7 @@ export class ParametersCoordinatesFormComponent { @Output() close = new EventEmitter(); private userService = inject(UsersService); - //private authService = inject(AuthService); + private authService = inject(AuthService); loading = signal(false); @@ -50,15 +39,13 @@ export class ParametersCoordinatesFormComponent { addIcons({ closeOutline }); } - - ngOnInit() { - //const user = this.userService.currentUser(); + const user = this.authService.currentUser(); - //this.coordinatesForm.patchValue({ - //email: user?.email ?? null, - //tel: user?.tel ?? null, - //}); + this.coordinatesForm.patchValue({ + email: user?.email ?? null, + tel: user?.tel ?? null, + }); } get email() { return this.coordinatesForm.get('email')!; } @@ -68,7 +55,8 @@ export class ParametersCoordinatesFormComponent { if (this.coordinatesForm.invalid) return; this.loading.set(true); - //const user = this.authService.currentUser(); + const user = this.authService.currentUser(); + if (!user) return; const userValue: KnotsDTOUserUpdateUserContactDto = { email: this.coordinatesForm.value.email, @@ -76,7 +64,7 @@ export class ParametersCoordinatesFormComponent { }; try { - //await firstValueFrom(this.userService.patchUserContactEndpoint(user.id, userValue)); + await firstValueFrom(this.userService.patchUserContactEndpoint(Number(user.id), userValue)); this.coordinatesForm.reset(); this.close.emit(); } catch (e) { diff --git a/src/app/pages/parameters/parameters-profile/parameters-profile.component.ts b/src/app/pages/parameters/parameters-profile/parameters-profile.component.ts index f1aeb22..ba5bfa5 100644 --- a/src/app/pages/parameters/parameters-profile/parameters-profile.component.ts +++ b/src/app/pages/parameters/parameters-profile/parameters-profile.component.ts @@ -33,7 +33,6 @@ export class ParametersProfileComponent { this.bio.set(user?.description ?? null); } - // --- Username --- toggleEditUsername() { if (this.editingUsername()) { @@ -74,7 +73,7 @@ export class ParametersProfileComponent { this.loading.set(false); } - // --- Bio --- + toggleEditBio() { if (this.editingBio()) { @@ -98,7 +97,6 @@ export class ParametersProfileComponent { this.loading.set(false); } - // --- Photo --- triggerFileInput() { document.getElementById('photoInput')?.click();