diff --git a/db.json b/db.json index 9a60473..84931a1 100644 --- a/db.json +++ b/db.json @@ -1,47 +1,5 @@ { "list_products": [ - { - "id": "77390", - "product_name": "Anthurium: Pot Ø17cm petit modèle - Coloris variables", - "product_price": "19,99", - "product_instock": "disponible", - "product_discount_code": "", - "product_color": "Blanc", - "product_unitprice_ati": "19.99", - "product_unitprice_tf": "18.2", - "product_discount_tf": "0.00", - "product_discount_ati": "0.00", - "product_qty": 16, - "product_rating": 3, - "product_breadcrumb_label": "plantes fleuries", - "product_url_page": "https://www.truffaut.com/anthurium-pot-17cm-petit-modele-coloris-variables-77390.html", - "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0077000/77390_010.jpg", - "product_shipping_method": null, - "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0077000/77390_010.jpg", - "product_seller": "Truffaut", - "product_web_only": "oui" - }, - { - "id": "910762", - "product_name": "Anthurium elipticum 'Jungle Bush' pot déco foncé D24cm", - "product_price": "139,99", - "product_instock": "disponible", - "product_discount_code": "", - "product_color": "", - "product_unitprice_ati": "139.99", - "product_unitprice_tf": "127.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/anthurium-elipticum-jungle-bush-pot-deco-fonce-d24cm-910762.html", - "product_url_picture": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0910000/910762_001.jpg", - "product_shipping_method": null, - "product_image_source": "https://images.truffaut.com/media/catalog/product/cdn:///Articles/jpg/0910000/910762_001.jpg", - "product_seller": "market place", - "product_web_only": "non" - }, { "id": "801427", "product_name": "Strelitzia Nicolai : D.21-H.75", 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 caffef4..1799f8b 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 @@ -14,18 +14,6 @@ -<<<<<<< HEAD - - {{products.id}} - {{products.product_name}} - {{products.product_price}} - {{products.product_qty}} - {{products.product_instock}} - {{products.product_breadcrumb_label}} - {{products.product_rating}} - - -======= {{products.id}} {{products.name}} @@ -35,8 +23,7 @@ {{products.rating}} - ->>>>>>> main + 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 13f4024..8dce42f 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 @@ -1,8 +1,5 @@ import { Component, OnInit } from '@angular/core'; -<<<<<<< HEAD -======= import { Subject } from 'rxjs'; ->>>>>>> main import { Plant } from '../../models/plant'; import { AdminService } from '../../services/admin.service'; @@ -31,7 +28,7 @@ export class PageTableauComponent implements OnInit { // }) } - onClickDelete(id: number){ + onClickDelete(id: any){ console.log(id); this.adminService.onClickDelete(id).subscribe((resp) => { console.log("Suppression successful : ", resp);