Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/favoris #44

Merged
merged 1 commit into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ import { ToastModule } from 'primeng/toast';
httpInterceptor: {
allowedList: [
// Tous les post, put, delete et patch sont protégés par le token
{
uri: `${environment.urlAPI}/favoris`,
httpMethod: HttpMethod.Get,
},
{
uri: `${environment.urlAPI}/chats/favoris`,
httpMethod: HttpMethod.Get,
},
{
uri: `${environment.urlAPI}/*`,
httpMethod: HttpMethod.Post,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<app-loader *ngIf="!isLoaded"></app-loader>

<div *ngIf="chats && isLoaded"
<div *ngIf="isLoaded && chats && chats.length > 0"
class="px-4 py-16 mx-auto sm:max-w-xl md:max-w-full lg:max-w-screen-xl md:px-24 lg:px-8 lg:py-20">

<div class="grid gap-8 lg:grid-cols-3 sm:max-w-sm sm:mx-auto lg:max-w-full">
Expand All @@ -21,10 +21,15 @@
aria-label="Association" title="L'association">{{chat.association.nom}}</a>
<span class="text-gray-600"> - {{formatDate(chat.createdAt)}}</span>
</p>
<fa-icon *ngIf="auth.isAuthenticated$ | async" [icon]="chat.favoris.length > 0 ? faHeart : fasHeart" aria-label="Favori"
title="Favori" class="mr-2 fa-xl"
[ngClass]="{'text-red-500': chat.favoris.length > 0, 'cursor-pointer': true}"
(click)="toggleFavori(chat)"></fa-icon>
<fa-icon *ngIf="auth.isAuthenticated$ | async"
[icon]="chat.isFavori ? faHeart : fasHeart"
aria-label="Favori"
title="Favori"
class="mr-2 fa-xl"
[ngClass]="{'text-red-500': chat.isFavori, 'cursor-pointer': true}"
(click)="toggleFavori(chat)">
</fa-icon>

<div [routerLink]="'/animaux/' + chat.id" aria-label="Animaux" title="Découvrir plus"
class="inline-block mb-3 text-2xl font-bold leading-5 transition-colors duration-200 hover:text-deep-purple-accent-700">
<a [routerLink]="'/animaux/' + chat.id" class="inline-block">{{chat.nom}}</a>
Expand All @@ -40,4 +45,13 @@
</div>

</div>
</div>
</div>


<div *ngIf="isLoaded && (!chats || chats.length == 0)" class="text-center mt-12" >
<h2 class="text-4xl font-semibold leading-normal mb-2 text-blueGray-700 mb-2">
Pas de chat pour le moment :/
</h2>
</div>


73 changes: 55 additions & 18 deletions src/app/components/animaux/animaux-list/animaux-list.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, Inject } from '@angular/core';
import { Component, Inject, Input } from '@angular/core';
import { faMars, faVenus, faHeart } from '@fortawesome/free-solid-svg-icons';
import { faHeart as fasHeart } from '@fortawesome/free-regular-svg-icons';

Expand All @@ -17,6 +17,7 @@ import { Subscription } from 'rxjs';
providers: [DatePipe],
})
export class AnimauxListComponent {
@Input() profileContext: boolean = false;
isLoaded: boolean = false;
faMars = faMars;
faVenus = faVenus;
Expand All @@ -35,33 +36,32 @@ export class AnimauxListComponent {
) {}

chats: Chat[] = [];
isFav = false;
favoris: Favori[] = [];
private subscriptions = new Subscription();


ngOnInit() {
this.getCats();
if (this.profileContext) {
this.getCatByFavoris();
} else {
this.getFavs();
this.getCats();
}
}

toggleFavori(chat: Chat) {
const isChatInFavoris = chat.favoris.length > 0;

if (isChatInFavoris) {
// Si le chat est déjà dans la liste des favoris, retire-le
const favoriToRemove = chat.favoris[0];
chat.favoris = [];

this.appService.removeFavori(favoriToRemove.id!).subscribe((favori) => {
console.log('Favori retiré:', favori);
if (chat.isFavori) {
// Si le chat est déjà un favori, retirez-le des favoris
this.appService.removeFavoriByCat(chat.id).subscribe(() => {
chat.isFavori = false;
console.log('Favori retiré');
this.toastr.info('Chat retiré des favoris', 'Favori');
});
} else {
// Sinon, ajoute-le aux favoris
const newFavori: Favori = {
chatId: chat.id,
};
this.appService.createFavori(newFavori).subscribe((favori) => {
chat.favoris.push(favori);
// Sinon, ajoutez-le aux favoris
this.appService.createFavori({ chatId: chat.id }).subscribe(() => {
chat.isFavori = true;
console.log('Favori ajouté');
this.toastr.info('Chat ajouté aux favoris', 'Favori');
});
}
Expand All @@ -84,6 +84,43 @@ export class AnimauxListComponent {
this.subscriptions.add(catSubscription);
}

getCatByFavoris() {
const favCatSubscription = this.appService.getCatByFavoris().subscribe({
next: (chats) => {
this.chats = chats;
this.isLoaded = true;
this.chats.forEach(chat => chat.isFavori = true);
},
error: (error) => {
const errorText = 'Erreur lors de la récupération des chats favoris';
console.error(errorText, error);
this.toastr.error(errorText, 'Erreur');
},
complete: () => console.log('Chats favoris chargés')
});

this.subscriptions.add(favCatSubscription);
}

getFavs() {
const favSubscription = this.appService.getFavorisByUser().subscribe({
next: (favoriIds: number[]) => {
this.chats.forEach(chat => {
chat.isFavori = favoriIds.includes(chat.id);
});
},
error: (error) => {
const errorText = 'Erreur lors de la récupération des favoris';
console.error(errorText, error);
this.toastr.error(errorText, 'Erreur');
},
complete: () => console.log('Completion handler')
});
this.subscriptions.add(favSubscription);
}



ngOnDestroy() {
this.subscriptions.unsubscribe();
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/profil/profil.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ <h3 class="text-4xl font-semibold leading-normal mb-2 text-blueGray-700 mb-2">{{
<div class="mt-10 py-10 border-t border-blueGray-200 text-center">
<div class="flex flex-wrap justify-center">
<div>
<h2 class="text-left">Mes favoris:</h2>
<h2 class="text-center">Mes favoris:</h2>
<div>
<app-animaux-list></app-animaux-list>
<app-animaux-list [profileContext]="true"></app-animaux-list>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/interfaces/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export interface Chat {
favoris: Favori[];
photos: Photo[];
videos: Video[];
isFav: boolean;
isFavori?: boolean;
}

export interface Photo {
Expand Down
18 changes: 17 additions & 1 deletion src/app/services/app.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ export class AppService {
);
}

getCatByFavoris(): Observable<Chat[]> {
return this.http.get(this.api + '/chats/favoris').pipe(
map((res: any) => res),
share(),
take(1)
);
}

getByIdCat(id: number): Observable<Chat> {
return this.http.get(this.api + '/chats/' + id).pipe(
map((res: any) => res),
Expand All @@ -58,7 +66,15 @@ export class AppService {
);
}

removeFavori(id: number): Observable<Favori> {
getFavorisByUser(): Observable<number[]> {
return this.http.get(this.api + '/favoris').pipe(
map((res: any) => res),
share(),
take(1)
);
}

removeFavoriByCat(id: number): Observable<Favori> {
return this.http.delete(this.api + '/favoris/' + id).pipe(
map((res: any) => res),
share(),
Expand Down
Loading