From f9d4a1f2eb516cc5ad9790ec016727cb3e4b828f 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: Mon, 1 May 2023 16:47:23 +0700
Subject: [PATCH 1/2] update validation in signup component

---
 src/app/components/auth/signup/signup.component.html | 2 +-
 src/app/constants/Validation.ts                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/auth/signup/signup.component.html b/src/app/components/auth/signup/signup.component.html
index 64b23f5..b5b591c 100644
--- a/src/app/components/auth/signup/signup.component.html
+++ b/src/app/components/auth/signup/signup.component.html
@@ -134,7 +134,7 @@
                       </div>
                       <div class="col-xl-8 col-md-7">
                         <input style="font-family: Metrophobic;" formControlName="identifiedCode" class="form-control"
-                          type="number" placeholder="CMND/CCCD" />
+                          type="tel" placeholder="CMND/CCCD" />
                         <div
                           *ngIf="userIdentifiedCode?.invalid && (userIdentifiedCode?.dirty || userIdentifiedCode?.touched)"
                           class="alert alert-danger mt-1">
diff --git a/src/app/constants/Validation.ts b/src/app/constants/Validation.ts
index b89a5f4..f1f2460 100644
--- a/src/app/constants/Validation.ts
+++ b/src/app/constants/Validation.ts
@@ -1,7 +1,7 @@
 export class Validation {
   static Regex = {
     Phone: new RegExp(/^(((\+|)84)|0)([1-9]{1})([0-9]{8})\b/),
-    IdentifiedCode: new RegExp(/^(\d{9}|\d{12})$/),
+    IdentifiedCode: new RegExp(/^0\d{8}$|^0\d{11}$|^\d{9}$|^\d{12}$/),
     Password: new RegExp(/(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@$!%*#?&^_-]).{8,}/),
   };
 }

From ff2993de526e4e1cc74e0de7e195c5726f6b4760 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: Thu, 4 May 2023 15:36:01 +0700
Subject: [PATCH 2/2] update UI

---
 src/app/components/account/account.component.html             | 2 +-
 src/app/components/auth/signup/signup.component.scss          | 2 +-
 .../shippers/list-shipper/list-shipper.component.html         | 4 ++--
 src/app/components/users/list-user/list-user.component.html   | 2 +-
 .../utility/list-address/list-address.component.html          | 2 +-
 .../vendors/list-vendors/list-vendors.component.html          | 2 +-
 src/assets/scss/theme/_admin_style.scss                       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/components/account/account.component.html b/src/app/components/account/account.component.html
index c65e0c9..3cc7faa 100644
--- a/src/app/components/account/account.component.html
+++ b/src/app/components/account/account.component.html
@@ -14,7 +14,7 @@
                     <table class="table table-striped">
                         <thead>
                             <tr>
-                                <th scope="col">#</th>
+                                <th scope="col">STT</th>
                                 <th scope="col">Ảnh đại diện</th>
                                 <th scope="col"><a (click)="onSort('fullName')">Họ và tên</a></th>
                                 <th scope="col"><a (click)="onSort('email')">Email</a></th>
diff --git a/src/app/components/auth/signup/signup.component.scss b/src/app/components/auth/signup/signup.component.scss
index 31b53bb..7ccbe14 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: 100%;
+  height: calc(100% - 1px);
 }
 
 
diff --git a/src/app/components/shippers/list-shipper/list-shipper.component.html b/src/app/components/shippers/list-shipper/list-shipper.component.html
index cb616d6..02a2f54 100644
--- a/src/app/components/shippers/list-shipper/list-shipper.component.html
+++ b/src/app/components/shippers/list-shipper/list-shipper.component.html
@@ -37,7 +37,7 @@
                             <table class="table table-striped">
                                 <thead>
                                     <tr>
-                                        <th scope="col">#</th>
+                                        <th scope="col">STT</th>
                                         <th scope="col">Ảnh</th>
                                         <th scope="col">Họ và tên</th>
                                         <th scope="col">Shop</th>
@@ -50,7 +50,7 @@
                                     <tr *ngFor="let shipper of shippers; let i = index">
                                         <th scope="row">{{ i + 1 }}</th>
                                         <td>
-                                            <img [src]="shipper.user.imageUrl" class="imgTable" style="width: 20px">
+                                            <img [src]="shipper.user.imageUrl" class="imgTable mr-0" style="width: 20px">
                                         </td>
                                         <td>{{ shipper.user.fullName }}</td>
                                         <td>{{ shipper.shop.name }}</td>
diff --git a/src/app/components/users/list-user/list-user.component.html b/src/app/components/users/list-user/list-user.component.html
index d5558d2..a33772e 100644
--- a/src/app/components/users/list-user/list-user.component.html
+++ b/src/app/components/users/list-user/list-user.component.html
@@ -14,7 +14,7 @@
                     <table class="table table-striped">
                         <thead>
                             <tr>
-                                <th scope="col">#</th>
+                                <th scope="col">STT</th>
                                 <th scope="col">Ảnh đại diện</th>
                                 <th scope="col"><a style="cursor: pointer;" (click)="onSort('fullName')">Họ và tên</a>
                                 </th>
diff --git a/src/app/components/utility/list-address/list-address.component.html b/src/app/components/utility/list-address/list-address.component.html
index 4905ab9..32ca8cf 100644
--- a/src/app/components/utility/list-address/list-address.component.html
+++ b/src/app/components/utility/list-address/list-address.component.html
@@ -16,7 +16,7 @@
                             <table class="table table-striped">
                                 <thead>
                                     <tr>
-                                        <th scope="col">#</th>
+                                        <th scope="col">STT</th>
                                         <th scope="col">Địa chỉ cụ thể</th>
                                         <th scope="col">Quận</th>
                                         <th scope="col">Phường</th>
diff --git a/src/app/components/vendors/list-vendors/list-vendors.component.html b/src/app/components/vendors/list-vendors/list-vendors.component.html
index cdcaf11..82cc921 100644
--- a/src/app/components/vendors/list-vendors/list-vendors.component.html
+++ b/src/app/components/vendors/list-vendors/list-vendors.component.html
@@ -21,7 +21,7 @@
                     <table class="table table-striped">
                         <thead>
                             <tr>
-                                <th scope="col">#</th>
+                                <th scope="col">STT</th>
                                 <th scope="col">Ảnh cửa hàng</th>
                                 <th scope="col">Tên cửa hàng</th>
                                 <th scope="col">Mô tả</th>
diff --git a/src/assets/scss/theme/_admin_style.scss b/src/assets/scss/theme/_admin_style.scss
index d3175e2..96abf8a 100644
--- a/src/assets/scss/theme/_admin_style.scss
+++ b/src/assets/scss/theme/_admin_style.scss
@@ -360,7 +360,7 @@ ngb-datepicker {
 // datatable
 .vendor-list {
   img {
-    margin-right: 20px;
+    // margin-right: 20px;
     height: 40px;
     width: 40px !important;
     border-radius: 100%;