Add search publication page and fix category access
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
import { ApplicationConfig } from '@angular/core';
|
import { ApplicationConfig } from '@angular/core';
|
||||||
import { provideRouter } from '@angular/router';
|
import { provideRouter, withRouterConfig } from '@angular/router';
|
||||||
|
|
||||||
import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
|
import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
|
||||||
import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
|
import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
|
||||||
@@ -8,7 +8,13 @@ import { JwtInterceptor } from './core/interceptor/jwt.interceptor';
|
|||||||
|
|
||||||
export const appConfig: ApplicationConfig = {
|
export const appConfig: ApplicationConfig = {
|
||||||
providers: [
|
providers: [
|
||||||
provideRouter(routes),
|
provideRouter(
|
||||||
|
routes,
|
||||||
|
withRouterConfig({
|
||||||
|
paramsInheritanceStrategy: 'always',
|
||||||
|
onSameUrlNavigation: 'reload'
|
||||||
|
})
|
||||||
|
),
|
||||||
provideAnimationsAsync(),
|
provideAnimationsAsync(),
|
||||||
provideHttpClient(withInterceptorsFromDi()),
|
provideHttpClient(withInterceptorsFromDi()),
|
||||||
{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
|
{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
|
||||||
|
|||||||
@@ -21,6 +21,10 @@ export const routes: Routes = [
|
|||||||
path: 'publications/:publicationId/edit',
|
path: 'publications/:publicationId/edit',
|
||||||
loadComponent: () => import('./pages/publication-edition/publication-edition.component').then(module => module.PublicationEditionComponent)
|
loadComponent: () => import('./pages/publication-edition/publication-edition.component').then(module => module.PublicationEditionComponent)
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'publications',
|
||||||
|
loadComponent: () => import('./pages/search-publications/search-publications.component').then(module => module.SearchPublicationsComponent)
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '**',
|
path: '**',
|
||||||
loadComponent: () => import('./pages/home/home.component').then(module => module.HomeComponent)
|
loadComponent: () => import('./pages/home/home.component').then(module => module.HomeComponent)
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
@for(publication of publications$ | async; track publication) {
|
||||||
|
<a [routerLink]="['/publications/' + publication.id]" class="publication">
|
||||||
|
<img src="/pictures/{{ publication.illustrationId }}"/>
|
||||||
|
<div class="body">
|
||||||
|
<h1>{{publication.title}}</h1>
|
||||||
|
<h2>{{publication.description}}</h2>
|
||||||
|
</div>
|
||||||
|
<div class="footer">
|
||||||
|
<img src="/pictures/{{ publication.author.image }}" [matTooltip]="publication.author.name"/>
|
||||||
|
Publication posted by {{publication.author.name}}
|
||||||
|
<span class="publication-date">
|
||||||
|
({{ publication.creationDate | date: 'short' : 'fr-Fr' }})
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
$cardBorderRadius: .5em;
|
||||||
|
|
||||||
|
:host {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 2em;
|
||||||
|
max-width: 50em;
|
||||||
|
width: 90%;
|
||||||
|
margin: auto;
|
||||||
|
|
||||||
|
.publication {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
border-radius: $cardBorderRadius;
|
||||||
|
box-shadow: 0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12);
|
||||||
|
transition: box-shadow .2s ease-in-out;
|
||||||
|
text-decoration: none;
|
||||||
|
color: black;
|
||||||
|
background-color: #ffffff;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
box-shadow: 0 4px 8px 0 rgba(0,0,0,.24),0 4px 14px 0 rgba(0,0,0,.16);
|
||||||
|
}
|
||||||
|
|
||||||
|
img {
|
||||||
|
object-fit: cover;
|
||||||
|
height: 15em;
|
||||||
|
border-radius: $cardBorderRadius $cardBorderRadius 0 0;
|
||||||
|
transition: height .2s ease-in-out;
|
||||||
|
|
||||||
|
@media screen and (min-width: 450px) {
|
||||||
|
height: 20em;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (min-width: 600px) {
|
||||||
|
height: 25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (min-width: 750px) {
|
||||||
|
height: 32em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.body {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding: 1.5em 2em;
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
font-size: 1.8em;
|
||||||
|
margin-bottom: .5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
h2 {
|
||||||
|
font-size: 1em;
|
||||||
|
line-height: 1.4em;
|
||||||
|
margin: 0;
|
||||||
|
color: #747373;
|
||||||
|
font-weight: 400;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
background-color: #f0f0f0;
|
||||||
|
border-radius: 0 0 $cardBorderRadius $cardBorderRadius;
|
||||||
|
padding: 1em 2em;
|
||||||
|
gap: 1em;
|
||||||
|
color: #6c757d;
|
||||||
|
|
||||||
|
img {
|
||||||
|
$imageSize: 4em;
|
||||||
|
border-radius: 10em;
|
||||||
|
width: $imageSize;
|
||||||
|
height: $imageSize;
|
||||||
|
object-fit: cover;
|
||||||
|
}
|
||||||
|
|
||||||
|
.publication-date {
|
||||||
|
font-style: italic;
|
||||||
|
color: #bdbdbd;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import { Component, Input } from "@angular/core";
|
||||||
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
|
import { Observable } from "rxjs";
|
||||||
|
import { CommonModule } from "@angular/common";
|
||||||
|
import { RouterModule } from "@angular/router";
|
||||||
|
import { MatTooltipModule } from "@angular/material/tooltip";
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-publication-list',
|
||||||
|
standalone: true,
|
||||||
|
templateUrl: './publication-list.component.html',
|
||||||
|
styleUrl: './publication-list.component.scss',
|
||||||
|
imports: [CommonModule, RouterModule, MatTooltipModule]
|
||||||
|
})
|
||||||
|
export class PublicationListComponent {
|
||||||
|
@Input()
|
||||||
|
publications$!: Observable<Publication[]>;
|
||||||
|
}
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="sub-category-container {{category.isOpenned ? 'displayed' : ''}}">
|
<div class="sub-category-container {{category.isOpenned ? 'displayed' : ''}}">
|
||||||
@for(subCategory of category.subCategories; track subCategory) {
|
@for(subCategory of category.subCategories; track subCategory) {
|
||||||
<a [routerLink]="['/categories/' + subCategory.id]" class="sub-category">
|
<a [routerLink]="['/publications']" [queryParams]="{'category-id': subCategory.id}" (click)="categoryClicked.emit()" class="sub-category">
|
||||||
{{subCategory.name}}
|
{{subCategory.name}}
|
||||||
</a>
|
</a>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { CommonModule } from "@angular/common";
|
import { CommonModule } from "@angular/common";
|
||||||
import { Component, inject, OnInit } from "@angular/core";
|
import { Component, EventEmitter, inject, OnInit, Output } from "@angular/core";
|
||||||
import { MatIconModule } from "@angular/material/icon";
|
import { MatIconModule } from "@angular/material/icon";
|
||||||
import { DisplayableCategory, SideMenuService } from "../side-menu.service";
|
import { DisplayableCategory, SideMenuService } from "../side-menu.service";
|
||||||
import { Observable } from "rxjs";
|
import { Observable } from "rxjs";
|
||||||
@@ -14,6 +14,8 @@ import { RouterModule } from "@angular/router";
|
|||||||
})
|
})
|
||||||
export class CategoriesMenuComponent implements OnInit {
|
export class CategoriesMenuComponent implements OnInit {
|
||||||
private sideMenuService = inject(SideMenuService);
|
private sideMenuService = inject(SideMenuService);
|
||||||
|
@Output()
|
||||||
|
categoryClicked = new EventEmitter<void>();
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.sideMenuService.loadCategories();
|
this.sideMenuService.loadCategories();
|
||||||
|
|||||||
@@ -9,6 +9,6 @@
|
|||||||
</button>
|
</button>
|
||||||
</h1>
|
</h1>
|
||||||
<h2>Catégories</h2>
|
<h2>Catégories</h2>
|
||||||
<app-categories-menu></app-categories-menu>
|
<app-categories-menu (categoryClicked)="close()"></app-categories-menu>
|
||||||
</div>
|
</div>
|
||||||
<div class="overlay {{ isOpenned ? 'displayed' : ''}}" (click)="close()"></div>
|
<div class="overlay {{ isOpenned ? 'displayed' : ''}}" (click)="close()"></div>
|
||||||
|
|||||||
@@ -1,94 +1,6 @@
|
|||||||
$cardBorderRadius: .5em;
|
|
||||||
|
|
||||||
:host {
|
:host {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
.publication-container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 2em;
|
|
||||||
max-width: 50em;
|
|
||||||
width: 90%;
|
|
||||||
margin: auto;
|
|
||||||
|
|
||||||
.publication {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
border-radius: $cardBorderRadius;
|
|
||||||
box-shadow: 0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12);
|
|
||||||
transition: box-shadow .2s ease-in-out;
|
|
||||||
text-decoration: none;
|
|
||||||
color: black;
|
|
||||||
background-color: #ffffff;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
box-shadow: 0 4px 8px 0 rgba(0,0,0,.24),0 4px 14px 0 rgba(0,0,0,.16);
|
|
||||||
}
|
|
||||||
|
|
||||||
img {
|
|
||||||
object-fit: cover;
|
|
||||||
height: 15em;
|
|
||||||
border-radius: $cardBorderRadius $cardBorderRadius 0 0;
|
|
||||||
transition: height .2s ease-in-out;
|
|
||||||
|
|
||||||
@media screen and (min-width: 450px) {
|
|
||||||
height: 20em;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (min-width: 600px) {
|
|
||||||
height: 25em;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (min-width: 750px) {
|
|
||||||
height: 32em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.body {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
padding: 1.5em 2em;
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 1.8em;
|
|
||||||
margin-bottom: .5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
font-size: 1em;
|
|
||||||
line-height: 1.4em;
|
|
||||||
margin: 0;
|
|
||||||
color: #747373;
|
|
||||||
font-weight: 400;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.footer {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
align-items: center;
|
|
||||||
background-color: #f0f0f0;
|
|
||||||
border-radius: 0 0 $cardBorderRadius $cardBorderRadius;
|
|
||||||
padding: 1em 2em;
|
|
||||||
gap: 1em;
|
|
||||||
color: #6c757d;
|
|
||||||
|
|
||||||
img {
|
|
||||||
$imageSize: 4em;
|
|
||||||
border-radius: 10em;
|
|
||||||
width: $imageSize;
|
|
||||||
height: $imageSize;
|
|
||||||
object-fit: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
.publication-date {
|
|
||||||
font-style: italic;
|
|
||||||
color: #bdbdbd;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<h1>Search results</h1>
|
||||||
|
@if((isLoading$ | async) === true) {
|
||||||
|
<h2>Search in progress...</h2>
|
||||||
|
<mat-spinner></mat-spinner>
|
||||||
|
} @else if((isLoaded$ | async) === true) {
|
||||||
|
@if((publications$ | async)?.length) {
|
||||||
|
<app-publication-list [publications$]="publications$"></app-publication-list>
|
||||||
|
} @else {
|
||||||
|
No any result.
|
||||||
|
}
|
||||||
|
} @else {
|
||||||
|
No any result.
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
:host {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
import { CommonModule } from "@angular/common";
|
||||||
|
import { Component, inject, OnDestroy, OnInit } from "@angular/core";
|
||||||
|
import { MatProgressSpinner } from "@angular/material/progress-spinner";
|
||||||
|
import { ActivatedRoute } from "@angular/router";
|
||||||
|
import { Observable, Subscription } from "rxjs";
|
||||||
|
import { PublicationListComponent } from "../../components/publication-list/publication-list.component";
|
||||||
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
|
import { SearchPublicationsService } from "./search-publications.service";
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-search-publications',
|
||||||
|
templateUrl: './search-publications.component.html',
|
||||||
|
styleUrl: './search-publications.component.scss',
|
||||||
|
standalone: true,
|
||||||
|
imports: [CommonModule, MatProgressSpinner, PublicationListComponent],
|
||||||
|
providers: [SearchPublicationsService]
|
||||||
|
})
|
||||||
|
export class SearchPublicationsComponent implements OnInit, OnDestroy {
|
||||||
|
private searchPublicationsService = inject(SearchPublicationsService);
|
||||||
|
private activatedRoute = inject(ActivatedRoute);
|
||||||
|
private queryParamsSubscription?: Subscription;
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.queryParamsSubscription = this.activatedRoute.queryParamMap
|
||||||
|
.subscribe(params => {
|
||||||
|
const categoryId = params.get('category-id');
|
||||||
|
if (categoryId) {
|
||||||
|
this.searchPublicationsService.loadPublications(`category_id=${categoryId}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this.queryParamsSubscription?.unsubscribe();
|
||||||
|
}
|
||||||
|
|
||||||
|
get publications$(): Observable<Publication[]> {
|
||||||
|
return this.searchPublicationsService.publications$;
|
||||||
|
}
|
||||||
|
|
||||||
|
get isLoading$(): Observable<boolean> {
|
||||||
|
return this.searchPublicationsService.isLoading$;
|
||||||
|
}
|
||||||
|
|
||||||
|
get isLoaded$(): Observable<boolean> {
|
||||||
|
return this.searchPublicationsService.isLoaded$;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import { inject, Injectable } from "@angular/core";
|
||||||
|
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
||||||
|
import { BehaviorSubject, Observable } from "rxjs";
|
||||||
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
|
import { MatSnackBar } from "@angular/material/snack-bar";
|
||||||
|
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class SearchPublicationsService {
|
||||||
|
private publicationRestService = inject(PublicationRestService);
|
||||||
|
private publicationsSubject = new BehaviorSubject<Publication[]>([]);
|
||||||
|
private isLoadingSubject = new BehaviorSubject<boolean>(false);
|
||||||
|
private isLoadedSubject = new BehaviorSubject<boolean>(false);
|
||||||
|
private snackBar = inject(MatSnackBar);
|
||||||
|
|
||||||
|
get publications$(): Observable<Publication[]> {
|
||||||
|
return this.publicationsSubject.asObservable();
|
||||||
|
}
|
||||||
|
|
||||||
|
get isLoading$(): Observable<boolean> {
|
||||||
|
return this.isLoadingSubject.asObservable();
|
||||||
|
}
|
||||||
|
|
||||||
|
get isLoaded$(): Observable<boolean> {
|
||||||
|
return this.isLoadedSubject.asObservable();
|
||||||
|
}
|
||||||
|
|
||||||
|
loadPublications(searchCriteria: string): void {
|
||||||
|
this.isLoadingSubject.next(true);
|
||||||
|
this.isLoadedSubject.next(false);
|
||||||
|
this.publicationsSubject.next([]);
|
||||||
|
|
||||||
|
this.publicationRestService.search(searchCriteria)
|
||||||
|
.then(publications => {
|
||||||
|
this.publicationsSubject.next(publications);
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
if (error.status !== 404) {
|
||||||
|
const errorMessage = 'An error occured while retrieving publications.';
|
||||||
|
console.error(errorMessage, error);
|
||||||
|
this.snackBar.open(errorMessage, 'Close', { duration: 5000 });
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
this.isLoadingSubject.next(false);
|
||||||
|
this.isLoadedSubject.next(true);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user