diff --git a/src/app/components/challenge-card/challenge-card.component.html b/src/app/components/challenge-card/challenge-card.component.html index b795c64..521e72d 100644 --- a/src/app/components/challenge-card/challenge-card.component.html +++ b/src/app/components/challenge-card/challenge-card.component.html @@ -23,7 +23,7 @@ fill="clear" class="m-0 p-0 min-h-0 text-[11px] font-black bg-black text-white rounded-3xl" style="--padding-top: 4px; --padding-bottom: 4px;" - (touchstart)="setOpen(true)"> + (click)="setOpen(true)"> {{ action() }} @@ -36,7 +36,7 @@ Défi Quotidien - + @@ -62,7 +62,7 @@ - Soumettre ma preuve + Soumettre ma preuve diff --git a/src/app/components/friend-request/friend-request.component.html b/src/app/components/friend-request/friend-request.component.html index b2f2314..24165b7 100644 --- a/src/app/components/friend-request/friend-request.component.html +++ b/src/app/components/friend-request/friend-request.component.html @@ -9,11 +9,11 @@ src="https://ionicframework.com/docs/img/demos/avatar.svg"/> {{ request.username }} - + - + @@ -24,11 +24,11 @@ src="https://ionicframework.com/docs/img/demos/avatar.svg"/> {{ request.username }} - + - + diff --git a/src/app/components/friends/friends-list.component.html b/src/app/components/friends/friends-list.component.html index 221402d..4f1724c 100644 --- a/src/app/components/friends/friends-list.component.html +++ b/src/app/components/friends/friends-list.component.html @@ -9,10 +9,10 @@ src="https://ionicframework.com/docs/img/demos/avatar.svg"/> {{ friend.username }} + (click)="setOpen(true, friend.friendId)">{{ friend.username }} {{ friend.score }} pts - + @@ -23,10 +23,10 @@ src="https://ionicframework.com/docs/img/demos/avatar.svg"/> {{ friend.username }} + (click)="setOpen(true, friend.friendId)">{{ friend.username }} {{ friend.score }} pts - + @@ -48,7 +48,7 @@ Profil - + diff --git a/src/app/components/search-friend/search-friend.component.html b/src/app/components/search-friend/search-friend.component.html index cda0137..691dea8 100644 --- a/src/app/components/search-friend/search-friend.component.html +++ b/src/app/components/search-friend/search-friend.component.html @@ -23,7 +23,7 @@ {{ result.getUserStatsDto.score }} pts - + @@ -37,7 +37,7 @@ {{ result.getUserStatsDto.score }} pts - + diff --git a/src/app/components/settings-options/settings-options.component.html b/src/app/components/settings-options/settings-options.component.html index b8b938b..77c4762 100644 --- a/src/app/components/settings-options/settings-options.component.html +++ b/src/app/components/settings-options/settings-options.component.html @@ -2,35 +2,37 @@ @for (n of options; track n) { @if (n == options.length) { - + Se déconnecter } @else { - - @switch (n) { - @case (1) { + @switch (n) { + @case (1) { + Ma galerie - } - @case (2) { - Modifier le pseudo + + } + @case (2) { + + Modifier mes informations - } - @case (3) { - Modifier l'email + + } + @case (3) { + + Modifier mon mot de passe - } - @case (4) { - Modifier le mot de passe - - } - @case (5) { + + } + @case (4) { + Changer de désignation - } + } - + } } } diff --git a/src/app/components/settings-options/settings-options.component.ts b/src/app/components/settings-options/settings-options.component.ts index 36d4262..658b7c0 100644 --- a/src/app/components/settings-options/settings-options.component.ts +++ b/src/app/components/settings-options/settings-options.component.ts @@ -1,7 +1,8 @@ -import {Component} from '@angular/core'; -import {IonicModule} from "@ionic/angular"; +import {Component, inject} from '@angular/core'; +import {IonicModule, LoadingController, NavController} from "@ionic/angular"; import {logOutOutline, chevronForwardOutline} from "ionicons/icons"; import {addIcons} from "ionicons"; +import {AuthManageService} from "../../services/auth-manage"; addIcons({ 'logout': logOutOutline, @@ -17,6 +18,22 @@ addIcons({ ] }) export class SettingsOptionsComponent { + private authManageService = inject(AuthManageService); + private loadCtrl = inject(LoadingController); + private navCtrl = inject(NavController); - options = [1, 2, 3, 4, 5, 6]; + options = [1, 2, 3, 4, 5]; + + async logOut(){ + const loading = await this.loadCtrl.create({ + message: 'Déconnexion en cours...', + spinner: 'lines-sharp-small' + }); + await loading.present(); + + this.authManageService.logout(); + await this.navCtrl.navigateRoot('/'); + + await loading.dismiss(); + } } diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index a970db3..63ed2e7 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -3,7 +3,7 @@ + (click)="setOpen(true)"> @@ -39,7 +39,7 @@ - + Profil diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html index a8a58a7..3f9df7b 100644 --- a/src/app/pages/login/login.component.html +++ b/src/app/pages/login/login.component.html @@ -9,7 +9,7 @@ @if (authState()) { - + Se connecter @@ -22,7 +22,7 @@ } - + Créer un compte \ No newline at end of file
Se déconnecter
Ma galerie
Modifier le pseudo
Modifier mes informations
Modifier l'email
Modifier mon mot de passe
Modifier le mot de passe
Changer de désignation
Se connecter
Créer un compte