nezumi/foodify-frontend
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/foodify-frontend.git synced 2026-09-22 13:38:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dat-dev'

Browse Source
This commit is contained in:
Nguyen Ha Khue
2023-05-04 19:16:23 +07:00
parent 970fd5e9ce ff2993de52
commit e092306418
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/components/account/account.component.html
+1 -1
View File
@@ -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>
src/app/components/auth/signup/signup.component.html
+1 -1
View File
@@ -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">
src/app/components/auth/signup/signup.component.scss
+1 -1
View File
@@ -9,7 +9,7 @@
}
.change-height {
height: 100%;
height: calc(100% - 1px);
}
src/app/components/shippers/list-shipper/list-shipper.component.html
+2 -2
View File
@@ -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>
src/app/components/users/list-user/list-user.component.html
+1 -1
View File
@@ -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>
src/app/components/utility/list-address/list-address.component.html
+1 -1
View File
@@ -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>
src/app/components/vendors/list-vendors/list-vendors.component.html
Vendored
+1 -1
View File
@@ -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>
src/app/constants/Validation.ts
+1 -1
View File
@@ -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,}/),
};
}
src/assets/scss/theme/_admin_style.scss
+1 -1
View File
@@ -361,7 +361,7 @@ ngb-datepicker {
// datatable
.vendor-list {
img {
margin-right: 20px;
// margin-right: 20px;
height: 40px;
width: 40px !important;
border-radius: 100%;