From e906ed7127e9495686e7942ef84d7b2081bcd751 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?=
 <ducdat612001@gmail.com>
Date: Wed, 26 Apr 2023 15:22:16 +0700
Subject: [PATCH 1/2] update Ui

---
 .../shipper-detail.component.html             | 26 +++++++++----------
 .../components/header/header.component.html   | 24 ++++++++++-------
 .../components/header/header.component.scss   | 14 +++++++---
 src/app/shared/service/nav.service.ts         |  6 ++---
 4 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/src/app/components/shippers/shipper-detail/shipper-detail.component.html b/src/app/components/shippers/shipper-detail/shipper-detail.component.html
index d897b74..fa0a11b 100644
--- a/src/app/components/shippers/shipper-detail/shipper-detail.component.html
+++ b/src/app/components/shippers/shipper-detail/shipper-detail.component.html
@@ -12,7 +12,7 @@
                             <div class="add-product">
                                 <div class="row">
                                     <div class="col-xl-9 xl-50 col-sm-6 col-9">
-                                        <img src="{{ shipper.user.imageUrl }}" alt="" class="img-fluid image_zoom_1">
+                                        <img src="{{ shipper?.user?.imageUrl }}" alt="" class="img-fluid image_zoom_1">
                                     </div>
                                     <div class="col-xl-3 xl-50 col-sm-6 col-3">
                                         <!-- <ul class="file-upload-product">
@@ -36,7 +36,7 @@
                                         <label class="mb-0">Họ và tên:</label>
                                     </div>
                                     <div class="col-xl-8 col-sm-7">
-                                        <p class="mb-0 text-size text-dark">{{ shipper.user.fullName }}</p>
+                                        <p class="mb-0 text-size text-dark">{{ shipper?.user?.fullName }}</p>
                                     </div>
                                 </div>
                             </div>
@@ -48,7 +48,7 @@
                                         <label class="mb-0">Shipper của cửa hàng:</label>
                                     </div>
                                     <div class="col-xl-8 col-sm-7">
-                                        <p class="mb-0 text-size text-dark">{{ shipper.shop.name }}</p>
+                                        <p class="mb-0 text-size text-dark">{{ shipper?.shop?.name }}</p>
                                     </div>
                                 </div>
                             </div>
@@ -60,7 +60,7 @@
                                         <label class="mb-0">Ngày sinh:</label>
                                     </div>
                                     <div class="col-xl-8 col-sm-7">
-                                        <p class="mb-0 text-size text-dark">{{ shipper.user.dateOfBirth }}</p>
+                                        <p class="mb-0 text-size text-dark">{{ shipper?.user?.dateOfBirth }}</p>
                                     </div>
                                 </div>
                             </div>
@@ -72,7 +72,7 @@
                                         <label class="mb-0">CMND/CCCD:</label>
                                     </div>
                                     <div class="col-xl-8 col-sm-7">
-                                        <p class="mb-0 text-size text-dark">{{ shipper.user.identifiedCode }}</p>
+                                        <p class="mb-0 text-size text-dark">{{ shipper?.user?.identifiedCode }}</p>
                                     </div>
                                 </div>
                             </div>
@@ -84,7 +84,7 @@
                                         <label class="mb-0">Email:</label>
                                     </div>
                                     <div class="col-xl-8 col-sm-7">
-                                        <p class="mb-0 text-size text-dark">{{ shipper.user.email }}</p>
+                                        <p class="mb-0 text-size text-dark">{{ shipper?.user?.email }}</p>
                                     </div>
                                 </div>
                             </div>
@@ -96,7 +96,7 @@
                                         <label class="mb-0">Số điện thoại:</label>
                                     </div>
                                     <div class="col-xl-8 col-sm-7">
-                                        <p class="mb-0 text-size text-dark">{{ shipper.user.phoneNumber }}</p>
+                                        <p class="mb-0 text-size text-dark">{{ shipper?.user?.phoneNumber }}</p>
                                     </div>
                                 </div>
                             </div>
@@ -108,7 +108,7 @@
                                         <label class="mb-0">Tổng đơn hàng:</label>
                                     </div>
                                     <div class="col-xl-8 col-sm-7">
-                                        <p class="mb-0 text-size text-dark">{{ shipper.orders.length }}</p>
+                                        <p class="mb-0 text-size text-dark">{{ shipper?.orders?.length }}</p>
                                     </div>
                                 </div>
                             </div>
@@ -120,9 +120,9 @@
                                         <label class="mb-0">Trạng thái:</label>
                                     </div>
                                     <div class="col-xl-8 col-sm-7">
-                                        <i *ngIf="shipper.isActive == true" style="color: green; font-size: 20px;"
+                                        <i *ngIf="shipper?.isActive == true" style="color: green; font-size: 20px;"
                                             class="fa fa-power-off" aria-hidden="true"></i>
-                                        <i *ngIf="shipper.isActive == false" style="color: #FF6347; font-size: 20px;"
+                                        <i *ngIf="shipper?.isActive == false" style="color: #FF6347; font-size: 20px;"
                                             class="fa fa-power-off" aria-hidden="true"></i>
                                     </div>
                                 </div>
@@ -135,9 +135,9 @@
                                         <label class="mb-0">Đang giao hàng:</label>
                                     </div>
                                     <div class="col-xl-8 col-sm-7">
-                                        <i *ngIf="shipper.isShipping == false" style="color: #FF6347; font-size: 20px;"
+                                        <i *ngIf="shipper?.isShipping == false" style="color: #FF6347; font-size: 20px;"
                                             class="fa fa-motorcycle" aria-hidden="true"></i>
-                                        <i *ngIf="shipper.isShipping == true" style="color: green; font-size: 20px;"
+                                        <i *ngIf="shipper?.isShipping == true" style="color: green; font-size: 20px;"
                                             class="fa fa-motorcycle" aria-hidden="true"></i>
                                     </div>
                                 </div>
@@ -173,7 +173,7 @@
                                 </div>
                             </div>
                             <button type="submit" class="btn btn-primary"
-                                [routerLink]="['/shippers', 'edit', shipper.id]">Chỉnh sửa
+                                [routerLink]="['/shippers', 'edit', shipper?.id]">Chỉnh sửa
                                 thông tin</button>
                         </div>
                     </div>
diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html
index f7aa2b3..031f417 100644
--- a/src/app/shared/components/header/header.component.html
+++ b/src/app/shared/components/header/header.component.html
@@ -102,13 +102,17 @@
                         <div class="dotted-animation"><span class="animate-circle"></span><span
                                 class="main-circle"></span></div>
                     </div>
-                    <ul class="profile-dropdown onhover-show-div p-20 profile-dropdown-hover width-dropdown">
-                        <li *ngIf="isShop"><a [routerLink]="['/vendors','details', shopId]">
-                                <app-feather-icons [icon]="'user'"></app-feather-icons>Trang cá nhân
-                            </a></li>
-                        <li *ngIf="!isShop"><a [routerLink]="['/users', 'detail', loggedId]">
-                                <app-feather-icons [icon]="'user'"></app-feather-icons>Trang cá nhân
-                            </a></li>
+                    <ul class="profile-dropdown onhover-show-div py-2 px-3 profile-dropdown-hover width-dropdown">
+                        <li class="py-2" *ngIf="isShop">
+                            <a class="d-flex align-items-center " [routerLink]="['/vendors','details', shopId]">
+                                <i class="fa fa-user mr-2" aria-hidden="true"></i><span class="font-weight-bold text-dark text-dropdowm">Trang cá nhân</span>
+                            </a>
+                        </li>
+                        <li class="py-2" *ngIf="!isShop">
+                            <a class="d-flex align-items-center " [routerLink]="['/users', 'detail', loggedId]">
+                                <i class="fa fa-user mr-2" aria-hidden="true"></i><span class="font-weight-bold text-dark text-dropdowm">Trang cá nhân</span>
+                            </a>
+                        </li>
                         <!-- <li><a href="javascript:void(0)">
                                 <app-feather-icons [icon]="'mail'"></app-feather-icons>Inbox
                             </a>
@@ -122,9 +126,9 @@
                                 <app-feather-icons [icon]="'settings'"></app-feather-icons>Settings
                             </a>
                         </li> -->
-                        <li>
-                            <a (click)="logOut()">
-                                <app-feather-icons [icon]="'log-out'"></app-feather-icons>Đăng xuất
+                        <li class="py-2">
+                            <a class="d-flex align-items-center " (click)="logOut()">
+                                <i class="fa fa-sign-out mr-2" aria-hidden="true"></i><h6 class="font-weight-bold text-dark text-dropdowm">Đăng xuất</h6>
                             </a>
                         </li>
                     </ul>
diff --git a/src/app/shared/components/header/header.component.scss b/src/app/shared/components/header/header.component.scss
index 7492038..32008ff 100644
--- a/src/app/shared/components/header/header.component.scss
+++ b/src/app/shared/components/header/header.component.scss
@@ -1,7 +1,15 @@
 .width-dropdown {
-  width: 180px;
+  width: 190px;
   box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px;
   border-radius: 5px;
+
+  .fa {
+    font-size: 24px;
+  }
+
+  .text-dropdowm {
+    font-size: 16px;
+  }
 }
 
 
@@ -23,9 +31,9 @@
         .position-absolute {
             position: absolute;
             top: 66px;
-            right: 0px;
+            right: 12px;
             text-align: start;
-            z-index: 999999;
+            background: #fff;
           }
     }
 }
diff --git a/src/app/shared/service/nav.service.ts b/src/app/shared/service/nav.service.ts
index 7b5d8da..5934d7c 100644
--- a/src/app/shared/service/nav.service.ts
+++ b/src/app/shared/service/nav.service.ts
@@ -123,13 +123,13 @@ export class NavService {
             ]
         },
         {
-            title: 'Người bán hàng', icon: 'users', type: 'sub', active: false, children: [
+            title: 'Người bán hàng', icon: 'archive', type: 'sub', active: false, children: [
                 { path: '/vendors/list', title: 'Danh sách', type: 'link' },
                 { path: '/vendors/create', title: 'Tạo người bán', type: 'link' }
             ]
         },
         {
-            title: 'Shipper', icon: 'archive', type: 'sub', active: false, children: [
+            title: 'Shipper', icon: 'truck', type: 'sub', active: false, children: [
                 { path: '/shippers/list', title: 'Danh sách', type: 'link' },
                 { path: '/shippers/create', title: 'Tạo shipper', type: 'link' }
             ]
@@ -225,7 +225,7 @@ export class NavService {
         //     ]
         // },
         {
-            title: 'Shipper', icon: 'archive', type: 'sub', active: false, children: [
+            title: 'Shipper', icon: 'truck', type: 'sub', active: false, children: [
                 { path: '/shippers/list', title: 'Danh sách', type: 'link' },
                 { path: '/shippers/create', title: 'Tạo shipper', type: 'link' }
             ]

From 9283a1a9a4b6ccc6508e1362ecd964c529dd3aff 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?=
 <ducdat612001@gmail.com>
Date: Wed, 26 Apr 2023 16:43:04 +0700
Subject: [PATCH 2/2] mlem

---
 src/app/components/auth/signup/signup.component.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/components/auth/signup/signup.component.html b/src/app/components/auth/signup/signup.component.html
index dc15cec..579aa36 100644
--- a/src/app/components/auth/signup/signup.component.html
+++ b/src/app/components/auth/signup/signup.component.html
@@ -123,9 +123,7 @@
                         </div>
                       </div>
                     </div>
-
-                    <hr>
-
+                    
                     <!-- Address -->
                     <div class="form-group row">
                       <div class="col-xl-3 col-md-4">