From 983533e4e1ef544f7d55e8e00f887055c88bd1b9 Mon Sep 17 00:00:00 2001 From: Vincent Ramiere Date: Tue, 22 Mar 2022 12:11:34 +0100 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 @@