diff --git a/src/app/core/resolvers/product-resolver.service.ts b/src/app/core/resolvers/product-resolver.service.ts index bf3fe54..d981e63 100644 --- a/src/app/core/resolvers/product-resolver.service.ts +++ b/src/app/core/resolvers/product-resolver.service.ts @@ -8,5 +8,5 @@ import { ProductsService } from 'src/app/core/services'; export const productResolver: ResolveFn = ( route: ActivatedRouteSnapshot ) => { - return inject(ProductsService).get(route.params['slug']).pipe(take(1)); + return inject(ProductsService).getProductBySlug(route.params['slug']).pipe(take(1)); }; \ No newline at end of file diff --git a/src/app/core/resolvers/products-resolver.service.ts b/src/app/core/resolvers/products-resolver.service.ts index bf50a90..657c506 100644 --- a/src/app/core/resolvers/products-resolver.service.ts +++ b/src/app/core/resolvers/products-resolver.service.ts @@ -1,10 +1,12 @@ import { inject } from '@angular/core'; -import { ResolveFn } from '@angular/router'; +import { ActivatedRouteSnapshot, ResolveFn } from '@angular/router'; import { take } from 'rxjs/operators'; -import { Product } from 'src/app/core/models'; +import { ProductsPageData } from 'src/app/core/models'; import { ProductsService } from 'src/app/core/services'; -export const productsResolver: ResolveFn> = () => { - return inject(ProductsService).getAll().pipe(take(1)); +export const productsResolver: ResolveFn = ( + route: ActivatedRouteSnapshot +) => { + return inject(ProductsService).getAllByCategory(route.params['category']).pipe(take(1)); }; \ No newline at end of file diff --git a/src/app/core/services/articles.service.ts b/src/app/core/services/articles.service.ts index 1feb304..4209166 100755 --- a/src/app/core/services/articles.service.ts +++ b/src/app/core/services/articles.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { HttpParams } from '@angular/common/http'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; import { ApiService } from './api.service'; -import { Article, ArticleList, ArticleListConfig, ArticleListFilters, ArticlePageData } from '../models'; -import { map } from 'rxjs/operators'; +import { Article, ArticleList, ArticleListConfig, ArticleListFilters, ArticlePageData } from 'src/app/core/models'; @Injectable({ providedIn: 'root' }) export class ArticlesService { @@ -26,19 +26,28 @@ export class ArticlesService { } get(slug: string): Observable { - return this.apiService.get('/articles/' + slug)/*.pipe(map(data => { + /*return this.apiService.get('/articles/' + slug).pipe(map(data => { data.article.tagList = data.article.tagNameTagTagLists; delete data.article.tagNameTagTagLists; return data; }));*/ + return this.apiService.get(`/articles/${slug}`); } getAll(): Observable> { return this.apiService.get('/articles').pipe(map(data => data.articles)); } + + create(article: Article): Observable
{ + return this.apiService.post('/articles/', { article: article }).pipe(map(data => data.article)); + } - destroy(slug: string) { - return this.apiService.delete('/articles/' + slug); + update(article: Article): Observable
{ + return this.apiService.put(`/articles/${article.slug}`, { article: article }).pipe(map(data => data.article)); + } + + destroy(slug: string): Observable { + return this.apiService.delete(`/products/${slug}`).pipe(map(data => data.deleted)); } save(article: Article): Observable
{ diff --git a/src/app/core/services/products.service.ts b/src/app/core/services/products.service.ts index a107186..8ca2fc9 100644 --- a/src/app/core/services/products.service.ts +++ b/src/app/core/services/products.service.ts @@ -4,10 +4,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiService } from './api.service'; -import { - ProductList, ProductListConfig, ProductListFilters, - Product, ProductPageData -} from 'src/app/core/models'; +import { Product, ProductList, ProductListConfig, ProductListFilters, ProductPageData, ProductsPageData } from 'src/app/core/models'; @Injectable({ providedIn: 'root' }) export class ProductsService { @@ -17,34 +14,6 @@ export class ProductsService { query(config: ProductListConfig): Observable { // Convert any filters over to Angular's URLSearchParams - /* - const params: ProductListFilters = { - date: config.filters.date, - lieu: config.filters.lieu, - oaci: config.filters.oaci, - aeronef: config.filters.aeronef, - imat: config.filters.imat, - hauteur: config.filters.hauteur, - voile: config.filters.voile, - taille: config.filters.taille, - categorie: config.filters.categorie, - module: config.filters.module, - participants: config.filters.participants, - accessoires: config.filters.accessoires, - zone: config.filters.zone, - author: config.filters.author, - limit: config.filters.limit, - offset: config.filters.offset, - numeroRangeStart: config.filters.numeroRangeStart!, - numeroRangeEnd: config.filters.numeroRangeEnd!, - tailleRangeStart: config.filters.tailleRangeStart!, - tailleRangeEnd: config.filters.tailleRangeEnd!, - participantsRangeStart: config.filters.participantsRangeStart!, - participantsRangeEnd: config.filters.participantsRangeEnd!, - hauteurRangeStart: config.filters.hauteurRangeStart!, - hauteurRangeEnd: config.filters.hauteurRangeEnd! - }; - */ const params: ProductListFilters = {} as ProductListFilters; Object.assign(params, config.filters); return this.apiService @@ -56,16 +25,20 @@ export class ProductsService { ); } - get(slug: string): Observable { - return this.apiService.get(`/products/${slug}`); + get(slug: string): Observable { + return this.apiService.get(`/product/${slug}`); + } + + getProductBySlug(slug: string): Observable { + return this.apiService.get(`/product/${slug}`); } getAll(): Observable> { return this.apiService.get('/products').pipe(map(data => data.products)); } - getAllByCategorie(): Observable> { - return this.apiService.get('/products/allByCategorie').pipe(map(data => data.products)); + getAllByCategory(category: string): Observable { + return this.apiService.get(`/products/${category}`); //.pipe(map(data => data.products)); } create(product: Product): Observable {