From 939fd0ed3a3fd63f7f27b7ce282bacea0aa37873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t?= Date: Wed, 26 Apr 2023 19:09:09 +0700 Subject: [PATCH 1/5] update user detail UI --- .../components/users/user-detail/user-detail.component.html | 4 +++- .../components/users/user-detail/user-detail.component.scss | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/components/users/user-detail/user-detail.component.html b/src/app/components/users/user-detail/user-detail.component.html index 2656ae3..2c786e8 100644 --- a/src/app/components/users/user-detail/user-detail.component.html +++ b/src/app/components/users/user-detail/user-detail.component.html @@ -239,7 +239,7 @@ 'badge-warning': order.status === 'CONFIRMED', 'badge-info': order.status === 'SHIPPING', 'badge-success': order.status === 'COMPLETED', - 'badge-primary': order.status === 'CANCELED' + 'badge-primary': order.status === 'CANCELED' || order.status === 'REJECT_DELIVERY' }"> {{ order.status === "AWAITING" @@ -252,6 +252,8 @@ ? "Giao thành công" : order.status === "CANCELED" ? "Đã huỷ đơn" + : order.status === "REJECT_DELIVERY" + ? "Không nhận hàng" : "" }} diff --git a/src/app/components/users/user-detail/user-detail.component.scss b/src/app/components/users/user-detail/user-detail.component.scss index c8f52b1..62cabbc 100644 --- a/src/app/components/users/user-detail/user-detail.component.scss +++ b/src/app/components/users/user-detail/user-detail.component.scss @@ -1,3 +1,7 @@ .text-size { font-size: 16px; +} + +th, td { + text-align: center; } \ No newline at end of file From 730998690eb506f53e2ea829cdc4988820ca2418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t?= Date: Thu, 27 Apr 2023 10:38:33 +0700 Subject: [PATCH 2/5] update Login --- src/app/components/auth/login/login.component.html | 6 +++++- src/app/components/auth/login/login.component.scss | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app/components/auth/login/login.component.html b/src/app/components/auth/login/login.component.html index f82fad1..7210e2b 100644 --- a/src/app/components/auth/login/login.component.html +++ b/src/app/components/auth/login/login.component.html @@ -133,7 +133,7 @@
-
+
+ +
diff --git a/src/app/components/auth/login/login.component.scss b/src/app/components/auth/login/login.component.scss index ebe6719..3021644 100644 --- a/src/app/components/auth/login/login.component.scss +++ b/src/app/components/auth/login/login.component.scss @@ -35,5 +35,12 @@ color: #999a9b; } } + + .link-shipper { + + &:hover { + text-decoration: underline; + } + } } From ca0b4f39239cf12c76484f2c9ebb31fe6b310859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t?= Date: Thu, 27 Apr 2023 13:03:58 +0700 Subject: [PATCH 3/5] mlem dm Loi --- src/app/components/auth/signup/signup.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/auth/signup/signup.component.scss b/src/app/components/auth/signup/signup.component.scss index 1d09053..31b53bb 100644 --- a/src/app/components/auth/signup/signup.component.scss +++ b/src/app/components/auth/signup/signup.component.scss @@ -9,7 +9,7 @@ } .change-height { - height: 100vh; + height: 100%; } From e3f5fb79eccdef101841a99e2b738e84efe48008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t?= Date: Thu, 27 Apr 2023 13:24:51 +0700 Subject: [PATCH 4/5] alo --- .../email-verified/email-verified.component.html | 2 +- .../email-verified/email-verified.component.scss | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/app/components/auth/email-verified/email-verified.component.html b/src/app/components/auth/email-verified/email-verified.component.html index 4091dcf..c0a067c 100644 --- a/src/app/components/auth/email-verified/email-verified.component.html +++ b/src/app/components/auth/email-verified/email-verified.component.html @@ -8,7 +8,7 @@
-
diff --git a/src/app/components/auth/email-verified/email-verified.component.scss b/src/app/components/auth/email-verified/email-verified.component.scss index 5e95d04..593cf21 100644 --- a/src/app/components/auth/email-verified/email-verified.component.scss +++ b/src/app/components/auth/email-verified/email-verified.component.scss @@ -55,6 +55,20 @@ .forbidden-text { text-align: center; } + + .forbidden-btn { + display: flex; + flex-direction: column; + + .btn { + padding: 10px 12px; + } + + .return-btn { + margin-bottom: 10px; + width: 230px; + } + } } } } \ No newline at end of file From 7862d8416887e9a6240edb55d450aa523423fa44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20=C4=90=E1=BB=A9c=20=C4=90=E1=BA=A1t?= Date: Fri, 28 Apr 2023 02:05:22 +0700 Subject: [PATCH 5/5] update input type file and fix some problem --- .../auth/login/login.component.html | 2 +- .../category-detail.component.html | 2 +- .../category-detail.component.scss | 3 + .../physical/category/category.component.html | 2 +- .../edit-product/edit-product.component.html | 18 +- .../edit-product/edit-product.component.scss | 22 +- .../sales/orders/orders.component.html | 4 +- .../sales/orders/orders.component.scss | 2 + .../create-shipper.component.html | 3 +- .../create-shipper.component.scss | 20 + .../edit-shipper/edit-shipper.component.html | 5 +- .../edit-shipper/edit-shipper.component.scss | 20 + .../list-shipper/list-shipper.component.html | 4 +- .../create-user/create-user.component.html | 3 +- .../create-user/create-user.component.scss | 20 + .../users/edit-user/edit-user.component.html | 11 +- .../users/edit-user/edit-user.component.scss | 19 + .../list-slider/list-slider.component.html | 18 +- .../list-slider/list-slider.component.scss | 1542 +++++++++-------- .../create-vendors.component.html | 6 +- .../create-vendors.component.scss | 20 + .../edit-vendor/edit-vendor.component.html | 3 +- .../edit-vendor/edit-vendor.component.scss | 19 + 23 files changed, 973 insertions(+), 795 deletions(-) diff --git a/src/app/components/auth/login/login.component.html b/src/app/components/auth/login/login.component.html index 7210e2b..da79c70 100644 --- a/src/app/components/auth/login/login.component.html +++ b/src/app/components/auth/login/login.component.html @@ -133,7 +133,7 @@
-
+