From be9e510a94e8082338d0c97238bab5ca3e5373a3 Mon Sep 17 00:00:00 2001 From: HarmandI Date: Tue, 22 Mar 2022 11:47:05 +0100 Subject: [PATCH 1/7] erreur --- .../formulaire/formulaire.component.html | 2 +- .../formulaire/formulaire.component.ts | 15 +++++++++------ .../page-ajouter/page-ajouter.component.html | 2 +- .../page-ajouter/page-ajouter.component.ts | 19 ++++++++++--------- .../modules/admin/services/admin.service.ts | 2 +- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/app/modules/admin/components/formulaire/formulaire.component.html b/src/app/modules/admin/components/formulaire/formulaire.component.html index e8d5b46..3bdb12d 100644 --- a/src/app/modules/admin/components/formulaire/formulaire.component.html +++ b/src/app/modules/admin/components/formulaire/formulaire.component.html @@ -1,5 +1,5 @@
-
+
(); constructor(private fb : FormBuilder, private adminService: AdminService) { } @@ -28,10 +29,12 @@ export class FormulaireComponent implements OnInit { }); } - - - addPlant(){} - - updatePlant(){} + public onSubmit(): void { + this.submitted.emit(this.plantForm.value); + } +} + +function newEventEmitter() { + throw new Error('Function not implemented.'); } diff --git a/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.html b/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.html index 2521453..650250d 100644 --- a/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.html +++ b/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.html @@ -1,2 +1,2 @@

Ajouter une plante

- + diff --git a/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.ts b/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.ts index bda58f2..63662d3 100644 --- a/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.ts +++ b/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.ts @@ -21,6 +21,7 @@ import { AdminService } from '../../services/admin.service'; export class PageAjouterComponent implements OnInit { public plantForm: FormGroup; public isAdd: boolean = false; + public newplant = new Plant(); constructor(private fb: FormBuilder, private router: Router, private adminService: AdminService) { @@ -32,7 +33,7 @@ export class PageAjouterComponent implements OnInit { } - public onSubmit(): void { + public onSubmitted(submittedPlant: Plant): void { const nameValue = this.plantForm.value['nameFC']; const priceValue = this.plantForm.value['priceFc']; const quantityValue = this.plantForm.value['quantityFc']; @@ -43,18 +44,18 @@ export class PageAjouterComponent implements OnInit { const idValue = this.plantForm.value['']; const plant : Plant = { - name: nameValue, - price: priceValue, - quantity: quantityValue, - inStock: [inStockValue], - category: [categoryValue], - urlPicture: 'https//picsum.photos/id/18/200/300', - rating: ratingValue, + product_name: nameValue, + product_price: priceValue, + product_qty: quantityValue, + product_instock: [inStockValue], + product_breadcrumb_label: [categoryValue], + product_url_picture: 'https//picsum.photos/id/18/200/300', + product_rating: ratingValue, id: idValue, }; console.log("coco",plant); - this.adminService.addPlant(plant)?.subscribe((resp)=>{ + this.adminService.addPlant(submittedPlant)?.subscribe((resp)=>{ }) this.router.navigate(['admin']); } diff --git a/src/app/modules/admin/services/admin.service.ts b/src/app/modules/admin/services/admin.service.ts index aa94aa9..9b34b5b 100644 --- a/src/app/modules/admin/services/admin.service.ts +++ b/src/app/modules/admin/services/admin.service.ts @@ -38,7 +38,7 @@ export class AdminService { } addPlant(plant: Plant): Observable | void { - return this.httpClient.post(`${this.apiUrl}`, plant); + return this.httpClient.post(`${this.apiUrl}/list_products`, plant); } onClickDelete(id: number): Observable { return this.httpClient.delete(`${this.apiUrl}/list_products/${id}`).pipe( From 983533e4e1ef544f7d55e8e00f887055c88bd1b9 Mon Sep 17 00:00:00 2001 From: Vincent Ramiere Date: Tue, 22 Mar 2022 12:11:34 +0100 Subject: [PATCH 2/7] Merge branch 'main' into feature/supprimer --- db.json | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/db.json b/db.json index 84931a1..bf4b4d4 100644 --- a/db.json +++ b/db.json @@ -1,26 +1,5 @@ { "list_products": [ - { - "id": "801427", - "product_name": "Strelitzia Nicolai : D.21-H.75", - "product_price": "59,99", - "product_instock": "disponible", - "product_discount_code": "", - "product_color": "Blanc", - "product_unitprice_ati": "59.99", - "product_unitprice_tf": "54.5", - "product_discount_tf": "0.00", - "product_discount_ati": "0.00", - "product_qty": 0, - "product_rating": 3, - "product_breadcrumb_label": "plantes fleuries", - "product_url_page": "https://www.truffaut.com/strelitzia-nicolai-d-21-h-75-801427.html", - "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0801000/801427_001.jpg", - "product_shipping_method": null, - "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0801000/801427_001.jpg", - "product_seller": "market place", - "product_web_only": "non" - }, { "id": "910744", "product_name": "Spathiphyllum 'Sweet Lauretta' Pot déco foncé D24cm", From 33c431921dc5681f32cbb48cd23f7ffb00194eb3 Mon Sep 17 00:00:00 2001 From: Sana EL HIRI Date: Tue, 22 Mar 2022 12:36:25 +0100 Subject: [PATCH 3/7] css --- .../formulaire/formulaire.component.scss | 8 +-- .../page-ajouter/page-ajouter.component.scss | 2 + .../page-modifier.component.scss | 2 + .../page-tableau/page-tableau.component.html | 63 ++++++++++--------- .../page-tableau/page-tableau.component.scss | 19 ++++++ 5 files changed, 61 insertions(+), 33 deletions(-) diff --git a/src/app/modules/admin/components/formulaire/formulaire.component.scss b/src/app/modules/admin/components/formulaire/formulaire.component.scss index 1b527e6..8e0c566 100644 --- a/src/app/modules/admin/components/formulaire/formulaire.component.scss +++ b/src/app/modules/admin/components/formulaire/formulaire.component.scss @@ -13,8 +13,8 @@ margin-right: auto; border: solid 1px; border-radius: 10px; - background-color: #64c982; - border-color: #64c982; + background-color: #306340; + border-color: #306340; } .form-plant .checkbox { @@ -70,6 +70,6 @@ .btn-outline-success { margin-top: 10px; background-color: #ffff; - color: #64c982 !important; - border-color: #64c982 !important; + color: #306340 !important; + border-color: #306340 !important; } diff --git a/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.scss b/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.scss index 8a0fa8b..c15ebd4 100644 --- a/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.scss +++ b/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.scss @@ -1,4 +1,6 @@ h1{ + display: flex; + justify-content: center; color: rgba(0, 0, 0, 0.658); font-size: 28px; margin-top: 20px; diff --git a/src/app/modules/admin/pages/page-modifier/page-modifier.component.scss b/src/app/modules/admin/pages/page-modifier/page-modifier.component.scss index 8a0fa8b..c15ebd4 100644 --- a/src/app/modules/admin/pages/page-modifier/page-modifier.component.scss +++ b/src/app/modules/admin/pages/page-modifier/page-modifier.component.scss @@ -1,4 +1,6 @@ h1{ + display: flex; + justify-content: center; color: rgba(0, 0, 0, 0.658); font-size: 28px; margin-top: 20px; diff --git a/src/app/modules/admin/pages/page-tableau/page-tableau.component.html b/src/app/modules/admin/pages/page-tableau/page-tableau.component.html index c32cab0..a35ccd4 100644 --- a/src/app/modules/admin/pages/page-tableau/page-tableau.component.html +++ b/src/app/modules/admin/pages/page-tableau/page-tableau.component.html @@ -1,30 +1,35 @@ - - - - - - - - - - - - +
+
+ +
+
IdNomPrixQuantitéEn stockCatégorieNoteModifierSupprimer
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
IdNomPrixQuantitéEn stockCatégorieNoteModifierSupprimer
{{products.id}}{{products.name}}{{products.price}}{{products.quantity}}{{products.inStock}}{{products.category}}{{products.rating}}
+
- - - - - {{products.id}} - {{products.name}} - {{products.price}} - {{products.quantity}} - {{products.inStock}} - {{products.category}} - {{products.rating}} - - - - - - diff --git a/src/app/modules/admin/pages/page-tableau/page-tableau.component.scss b/src/app/modules/admin/pages/page-tableau/page-tableau.component.scss index e69de29..179e015 100644 --- a/src/app/modules/admin/pages/page-tableau/page-tableau.component.scss +++ b/src/app/modules/admin/pages/page-tableau/page-tableau.component.scss @@ -0,0 +1,19 @@ +#container{ + display: flex; + justify-content: center; + margin-top: 5rem; +} +table{ + width: 75%; + margin-left: 2rem; +} +button{ + background-color: #306340; + color: #f3f7f4 !important; + border-color: #306340 !important; +} +#button{ + width: 10%; +} + + From 200221dc5cbeef34427a06aa95b9539b90e6369e Mon Sep 17 00:00:00 2001 From: Vincent Ramiere Date: Tue, 22 Mar 2022 12:49:35 +0100 Subject: [PATCH 4/7] lien admin dans navbar --- src/app/components/nav-bar/nav-bar.component.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/components/nav-bar/nav-bar.component.html b/src/app/components/nav-bar/nav-bar.component.html index cb45e67..b908ee9 100644 --- a/src/app/components/nav-bar/nav-bar.component.html +++ b/src/app/components/nav-bar/nav-bar.component.html @@ -1,12 +1,12 @@
From 4aced57191ed8c476bcf7437a7273d2e9aa5db76 Mon Sep 17 00:00:00 2001 From: HarmandI Date: Tue, 22 Mar 2022 12:54:31 +0100 Subject: [PATCH 6/7] der des der? --- db.json | 65 +++++++++++++------ .../page-ajouter/page-ajouter.component.ts | 3 +- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/db.json b/db.json index 3de8066..3dee62e 100644 --- a/db.json +++ b/db.json @@ -1,5 +1,26 @@ { "list_products": [ + { + "id": "801427", + "product_name": "Strelitzia Nicolai : D.21-H.75", + "product_price": "59,99", + "product_instock": "disponible", + "product_discount_code": "", + "product_color": "Blanc", + "product_unitprice_ati": "59.99", + "product_unitprice_tf": "54.5", + "product_discount_tf": "0.00", + "product_discount_ati": "0.00", + "product_qty": 0, + "product_rating": 3, + "product_breadcrumb_label": "plantes fleuries", + "product_url_page": "https://www.truffaut.com/strelitzia-nicolai-d-21-h-75-801427.html", + "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0801000/801427_001.jpg", + "product_shipping_method": null, + "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0801000/801427_001.jpg", + "product_seller": "market place", + "product_web_only": "non" + }, { "id": "910744", "product_name": "Spathiphyllum 'Sweet Lauretta' Pot déco foncé D24cm", @@ -420,27 +441,6 @@ "product_seller": "Truffaut", "product_web_only": "oui" }, - { - "id": "871522", - "product_name": "Amaryllis rouge pot kraft Ø14 cm", - "product_price": "8,50", - "product_instock": "disponible", - "product_discount_code": "", - "product_color": "", - "product_unitprice_ati": "8.50", - "product_unitprice_tf": "7.7", - "product_discount_tf": "0.00", - "product_discount_ati": "0.00", - "product_qty": 25, - "product_rating": 3, - "product_breadcrumb_label": "plantes fleuries", - "product_url_page": "https://www.truffaut.com/amaryllis-rouge-pot-kraft-14-cm-871522.html", - "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0871000/871522_003.jpg", - "product_shipping_method": null, - "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0871000/871522_003.jpg", - "product_seller": "Truffaut", - "product_web_only": "oui" - }, { "id": "308624", "product_name": "Amaryllis : 2 boutons pot Ø13cm", @@ -5986,6 +5986,29 @@ "product_seller": "market place", "product_web_only": "non", "id": "Fcq4EWk" + }, + { + "product_name": "Très Joli cactus", + "product_price": "35", + "product_qty": 1, + "product_rating": 2, + "product_breadcrumb_label": "cactus et plantes grasses", + "product_instock": [ + "disponible" + ], + "product_url_picture": "https//picsum.photos/id/18/200/300", + "product_discount_code": "", + "product_color": "", + "product_unitprice_ati": "", + "product_unitprice_tf": "", + "product_discount_tf": "", + "product_discount_ati": "", + "product_url_page": "", + "product_shipping_method": null, + "product_image_source": "", + "product_seller": "market place", + "product_web_only": "non", + "id": "mO_eBN3" } ], "users": [ diff --git a/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.ts b/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.ts index 7156692..d577db0 100644 --- a/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.ts +++ b/src/app/modules/admin/pages/page-ajouter/page-ajouter.component.ts @@ -60,7 +60,8 @@ export class PageAjouterComponent implements OnInit { }; this.adminService.addPlant(plante)?.subscribe((resp)=>{ + this.router.navigate(['admin']); }) - this.router.navigate(['admin']); + } } From adfd1db2ff17b21354e0b826a931700f82af245e Mon Sep 17 00:00:00 2001 From: Sana EL HIRI Date: Tue, 22 Mar 2022 14:54:07 +0100 Subject: [PATCH 7/7] correction jeremy --- db.json | 233 +++++++++--------- src/app/modules/admin/models/plant.ts | 4 +- .../page-tableau/page-tableau.component.ts | 3 +- .../modules/admin/services/admin.service.ts | 3 +- 4 files changed, 119 insertions(+), 124 deletions(-) diff --git a/db.json b/db.json index 3dee62e..50a4dee 100644 --- a/db.json +++ b/db.json @@ -1,107 +1,104 @@ { "list_products": [ - { - "id": "801427", - "product_name": "Strelitzia Nicolai : D.21-H.75", - "product_price": "59,99", - "product_instock": "disponible", - "product_discount_code": "", - "product_color": "Blanc", - "product_unitprice_ati": "59.99", - "product_unitprice_tf": "54.5", - "product_discount_tf": "0.00", - "product_discount_ati": "0.00", - "product_qty": 0, - "product_rating": 3, - "product_breadcrumb_label": "plantes fleuries", - "product_url_page": "https://www.truffaut.com/strelitzia-nicolai-d-21-h-75-801427.html", - "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0801000/801427_001.jpg", - "product_shipping_method": null, - "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0801000/801427_001.jpg", - "product_seller": "market place", - "product_web_only": "non" - }, { "id": "910744", - "product_name": "Spathiphyllum 'Sweet Lauretta' Pot déco foncé D24cm", - "product_price": "84,99", - "product_instock": "disponible", + "product_name": "bibi", + "product_price": "5", + "product_qty": 5, + "product_rating": 5, + "product_breadcrumb_label": "plantes fleuries", + "product_instock": [ + [ + [ + [ + "disponible" + ] + ] + ] + ], + "product_url_picture": "https//picsum.photos/id/18/200/300", "product_discount_code": "", "product_color": "", - "product_unitprice_ati": "84.99", - "product_unitprice_tf": "77.3", - "product_discount_tf": "0.00", - "product_discount_ati": "0.00", - "product_qty": 0, - "product_rating": 3, - "product_breadcrumb_label": "plantes fleuries", - "product_url_page": "https://www.truffaut.com/spathiphyllum-sweet-lauretta-pot-deco-fonce-d24cm-910744.html", - "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0910000/910744_001.jpg", + "product_unitprice_ati": "", + "product_unitprice_tf": "", + "product_discount_tf": "", + "product_discount_ati": "", + "product_url_page": "", "product_shipping_method": null, - "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0910000/910744_001.jpg", + "product_image_source": "", "product_seller": "market place", "product_web_only": "non" }, { "id": "910743", - "product_name": "Spathiphyllum 'Sweet Lauretta' Pot déco clair D24cm", - "product_price": "84,99", - "product_instock": "disponible", + "product_name": "Baba", + "product_price": "5", + "product_qty": 5, + "product_rating": 5, + "product_breadcrumb_label": "plantes fleuries", + "product_instock": [ + [ + "disponible" + ] + ], + "product_url_picture": "https//picsum.photos/id/18/200/300", "product_discount_code": "", "product_color": "", - "product_unitprice_ati": "84.99", - "product_unitprice_tf": "77.3", - "product_discount_tf": "0.00", - "product_discount_ati": "0.00", - "product_qty": 0, - "product_rating": 3, - "product_breadcrumb_label": "plantes fleuries", - "product_url_page": "https://www.truffaut.com/spathiphyllum-sweet-lauretta-pot-deco-clair-d24cm-910743.html", - "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0910000/910743_001.jpg", + "product_unitprice_ati": "", + "product_unitprice_tf": "", + "product_discount_tf": "", + "product_discount_ati": "", + "product_url_page": "", "product_shipping_method": null, - "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0910000/910743_001.jpg", + "product_image_source": "", "product_seller": "market place", "product_web_only": "non" }, { "id": "63158", - "product_name": "Spathiphyllum: d.14cm, pot grand modèle", - "product_price": "7,95", - "product_instock": "disponible", + "product_name": "boubou", + "product_price": "5", + "product_qty": 5, + "product_rating": 5, + "product_breadcrumb_label": "cactus et plantes grasses", + "product_instock": [ + "partiellement disponible" + ], + "product_url_picture": "https//picsum.photos/id/18/200/300", "product_discount_code": "", - "product_color": "Blanc", - "product_unitprice_ati": "7.95", - "product_unitprice_tf": "7.2", - "product_discount_tf": "0.00", - "product_discount_ati": "0.00", - "product_qty": 1, - "product_rating": 3, - "product_breadcrumb_label": "plantes fleuries", - "product_url_page": "https://www.truffaut.com/spathiphyllum-d-14cm-pot-grand-modele-63158.html", - "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0063000/63158_005.jpg", + "product_color": "", + "product_unitprice_ati": "", + "product_unitprice_tf": "", + "product_discount_tf": "", + "product_discount_ati": "", + "product_url_page": "", "product_shipping_method": null, - "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0063000/63158_005.jpg", - "product_seller": "Truffaut", - "product_web_only": "oui" + "product_image_source": "", + "product_seller": "market place", + "product_web_only": "non" }, { "id": "910674", "product_name": "Spathiphyllum 'Sweet Lauretta' pot D24cm", "product_price": "69,99", - "product_instock": "disponible", + "product_qty": 3, + "product_rating": 4, + "product_breadcrumb_label": "plantes fleuries", + "product_instock": [ + [ + "disponible" + ] + ], + "product_url_picture": "https//picsum.photos/id/18/200/300", "product_discount_code": "", "product_color": "", - "product_unitprice_ati": "69.99", - "product_unitprice_tf": "63.6", - "product_discount_tf": "0.00", - "product_discount_ati": "0.00", - "product_qty": 0, - "product_rating": 3, - "product_breadcrumb_label": "plantes fleuries", - "product_url_page": "https://www.truffaut.com/spathiphyllum-sweet-lauretta-pot-d24cm-910674.html", - "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0910000/910674_001.jpg", + "product_unitprice_ati": "", + "product_unitprice_tf": "", + "product_discount_tf": "", + "product_discount_ati": "", + "product_url_page": "", "product_shipping_method": null, - "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0910000/910674_001.jpg", + "product_image_source": "", "product_seller": "market place", "product_web_only": "non" }, @@ -109,20 +106,22 @@ "id": "801429", "product_name": "Strelitzia Nicolai Cache-pot Anthracite: D.21-H.75", "product_price": "64,99", - "product_instock": "disponible", - "product_discount_code": "", - "product_color": "Blanc", - "product_unitprice_ati": "64.99", - "product_unitprice_tf": "59.1", - "product_discount_tf": "0.00", - "product_discount_ati": "0.00", - "product_qty": 0, - "product_rating": 3, + "product_qty": 5, + "product_rating": 4.5, "product_breadcrumb_label": "plantes fleuries", - "product_url_page": "https://www.truffaut.com/strelitzia-nicolai-cache-pot-gris-d-21-h-75-801429.html", - "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0801000/801429_001.jpg", + "product_instock": [ + "disponible" + ], + "product_url_picture": "https//picsum.photos/id/18/200/300", + "product_discount_code": "", + "product_color": "", + "product_unitprice_ati": "", + "product_unitprice_tf": "", + "product_discount_tf": "", + "product_discount_ati": "", + "product_url_page": "", "product_shipping_method": null, - "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0801000/801429_001.jpg", + "product_image_source": "", "product_seller": "market place", "product_web_only": "non" }, @@ -441,6 +440,27 @@ "product_seller": "Truffaut", "product_web_only": "oui" }, + { + "id": "871522", + "product_name": "Amaryllis rouge pot kraft Ø14 cm", + "product_price": "8,50", + "product_instock": "disponible", + "product_discount_code": "", + "product_color": "", + "product_unitprice_ati": "8.50", + "product_unitprice_tf": "7.7", + "product_discount_tf": "0.00", + "product_discount_ati": "0.00", + "product_qty": 25, + "product_rating": 3, + "product_breadcrumb_label": "plantes fleuries", + "product_url_page": "https://www.truffaut.com/amaryllis-rouge-pot-kraft-14-cm-871522.html", + "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0871000/871522_003.jpg", + "product_shipping_method": null, + "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0871000/871522_003.jpg", + "product_seller": "Truffaut", + "product_web_only": "oui" + }, { "id": "308624", "product_name": "Amaryllis : 2 boutons pot Ø13cm", @@ -5965,13 +5985,16 @@ "product_web_only": "oui" }, { - "product_name": "Belle plante", - "product_price": "35", - "product_qty": 1, - "product_rating": 3, - "product_breadcrumb_label": "orchides", + "id": "JbdahUA", + "product_name": "bibi", + "product_price": "8", + "product_qty": 5, + "product_rating": 5, + "product_breadcrumb_label": "plantes fleuries", "product_instock": [ - "non disponible" + [ + "non disponible" + ] ], "product_url_picture": "https//picsum.photos/id/18/200/300", "product_discount_code": "", @@ -5984,31 +6007,7 @@ "product_shipping_method": null, "product_image_source": "", "product_seller": "market place", - "product_web_only": "non", - "id": "Fcq4EWk" - }, - { - "product_name": "Très Joli cactus", - "product_price": "35", - "product_qty": 1, - "product_rating": 2, - "product_breadcrumb_label": "cactus et plantes grasses", - "product_instock": [ - "disponible" - ], - "product_url_picture": "https//picsum.photos/id/18/200/300", - "product_discount_code": "", - "product_color": "", - "product_unitprice_ati": "", - "product_unitprice_tf": "", - "product_discount_tf": "", - "product_discount_ati": "", - "product_url_page": "", - "product_shipping_method": null, - "product_image_source": "", - "product_seller": "market place", - "product_web_only": "non", - "id": "mO_eBN3" + "product_web_only": "non" } ], "users": [ diff --git a/src/app/modules/admin/models/plant.ts b/src/app/modules/admin/models/plant.ts index 337fc91..b9de4aa 100644 --- a/src/app/modules/admin/models/plant.ts +++ b/src/app/modules/admin/models/plant.ts @@ -1,5 +1,3 @@ -import { Category } from "./category"; - export class Plant { constructor( public name: string='', @@ -9,6 +7,6 @@ export class Plant { public category:string[]=['plantes fleuries','orchides','cactus et plantes grasses','bonsas','plantes vertes','palmier dintrieur'], public urlPicture: string = "https//picsum.photos/id/18/200/300", public rating: number = 0, - public id?: string + public id: string = '' ){} } diff --git a/src/app/modules/admin/pages/page-tableau/page-tableau.component.ts b/src/app/modules/admin/pages/page-tableau/page-tableau.component.ts index 8dce42f..e20838a 100644 --- a/src/app/modules/admin/pages/page-tableau/page-tableau.component.ts +++ b/src/app/modules/admin/pages/page-tableau/page-tableau.component.ts @@ -28,8 +28,7 @@ export class PageTableauComponent implements OnInit { // }) } - onClickDelete(id: any){ - console.log(id); + onClickDelete(id: string){ this.adminService.onClickDelete(id).subscribe((resp) => { console.log("Suppression successful : ", resp); }); diff --git a/src/app/modules/admin/services/admin.service.ts b/src/app/modules/admin/services/admin.service.ts index 3f9d8d5..fbe82c1 100644 --- a/src/app/modules/admin/services/admin.service.ts +++ b/src/app/modules/admin/services/admin.service.ts @@ -31,7 +31,6 @@ export class AdminService { public refreshCollection(): void { // On se sert de notre flux de donnée type observable froid this.collection$.subscribe((listPlant: Plant[]) => { - this.plantCollection = [...listPlant]; // Utiliser un observable chaud (subject) pour nexter nos données recues de notre observable froid this.subCollection$.next(listPlant); }) @@ -40,7 +39,7 @@ export class AdminService { addPlant(plant: Plant): Observable | void { return this.httpClient.post(`${this.apiUrl}/list_products`, plant); } - onClickDelete(id: number): Observable { + onClickDelete(id: string): Observable { return this.httpClient.delete(`${this.apiUrl}/list_products/${id}`).pipe( tap(() => this.refreshCollection()) );