diff --git a/src/app/app.module.ts b/src/app/app.module.ts index bd29bf1..c7b7af9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,13 +10,11 @@ import { DashboardModule } from './components/dashboard/dashboard.module'; import { SharedModule } from './shared/shared.module'; import { ProductsModule } from './components/products/products.module'; import { SalesModule } from './components/sales/sales.module'; -import { CouponsModule } from './components/coupons/coupons.module'; import { MenusModule } from './components/menus/menus.module'; import { VendorsModule } from './components/vendors/vendors.module'; import { UsersModule } from './components/users/users.module'; import { AccountModule } from './components/account/account.module'; import { SettingModule } from './components/setting/setting.module'; -import { ReportsModule } from './components/reports/reports.module'; import { AuthModule } from './components/auth/auth.module'; import { HTTP_INTERCEPTORS, HttpClientModule } from "@angular/common/http"; import { ModalModule } from "ngx-bootstrap/modal"; @@ -37,13 +35,11 @@ import { AuthInterceptor } from "./shared/inceptor/auth-interceptor"; DashboardModule, AccountModule, SettingModule, - ReportsModule, AuthModule, SharedModule, ProductsModule, SalesModule, VendorsModule, - CouponsModule, MenusModule, UsersModule, AgGridModule, diff --git a/src/app/components/account/account.component.scss b/src/app/components/account/account.component.scss index e69de29..6c3b91c 100644 --- a/src/app/components/account/account.component.scss +++ b/src/app/components/account/account.component.scss @@ -0,0 +1,19 @@ +:host { + ::ng-deep { + .pagination { + &>li { + &.page-item { + &.active { + &>a { + &.page-link { + &>span { + display: none; + } + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/src/app/components/coupons/coupons-routing.module.ts b/src/app/components/coupons/coupons-routing.module.ts deleted file mode 100644 index 0c74cbe..0000000 --- a/src/app/components/coupons/coupons-routing.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { ListCouponComponent } from './list-coupon/list-coupon.component'; -import { CreateCouponComponent } from './create-coupon/create-coupon.component'; - -const routes: Routes = [ - { - path: '', - children: [ - { - path: 'list-coupons', - component: ListCouponComponent, - data: { - title: "List Coupons", - breadcrumb: "List Coupons" - } - }, - { - path: 'create-coupons', - component: CreateCouponComponent, - data: { - title: "Create Coupon", - breadcrumb: "Create Coupons" - } - } - ] - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class CouponsRoutingModule { } diff --git a/src/app/components/coupons/coupons.module.ts b/src/app/components/coupons/coupons.module.ts deleted file mode 100644 index 4baae10..0000000 --- a/src/app/components/coupons/coupons.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { CouponsRoutingModule } from './coupons-routing.module'; -import { ListCouponComponent } from './list-coupon/list-coupon.component'; -import { CreateCouponComponent } from './create-coupon/create-coupon.component'; -import { SharedModule } from 'src/app/shared/shared.module'; - -@NgModule({ - declarations: [ListCouponComponent, CreateCouponComponent], - imports: [ - CommonModule, - CouponsRoutingModule, - NgbModule, - ReactiveFormsModule, - SharedModule, - FormsModule - ] -}) -export class CouponsModule { } diff --git a/src/app/components/coupons/create-coupon/create-coupon.component.html b/src/app/components/coupons/create-coupon/create-coupon.component.html deleted file mode 100644 index 933c1c3..0000000 --- a/src/app/components/coupons/create-coupon/create-coupon.component.html +++ /dev/null @@ -1,184 +0,0 @@ - -
-
-
-
Discount Coupon Details
-
-
-
    -
  • - General - -
    -

    General

    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    Please Provide a Valid Coupon Code.
    -
    -
    -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -     -
    • -
  • - Restriction - -
    -

    Restriction

    -
    -
    -
    -
    -
    Please Provide a Product Name.
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -     -
    • -
  • - Usage - -
    -

    Usage Limits

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -     -
    • -
-
-
- -
-
-
-
- \ No newline at end of file diff --git a/src/app/components/coupons/create-coupon/create-coupon.component.scss b/src/app/components/coupons/create-coupon/create-coupon.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/components/coupons/create-coupon/create-coupon.component.ts b/src/app/components/coupons/create-coupon/create-coupon.component.ts deleted file mode 100644 index e162c1b..0000000 --- a/src/app/components/coupons/create-coupon/create-coupon.component.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; -import { NgbDateStruct, NgbDate, NgbCalendar, NgbDatepickerConfig } from '@ng-bootstrap/ng-bootstrap'; - -@Component({ - selector: 'app-create-coupon', - templateUrl: './create-coupon.component.html', - styleUrls: ['./create-coupon.component.scss'] -}) -export class CreateCouponComponent implements OnInit { - public generalForm: UntypedFormGroup; - public restrictionForm: UntypedFormGroup; - public usageForm: UntypedFormGroup; - public model: NgbDateStruct; - public date: { year: number, month: number }; - public modelFooter: NgbDateStruct; - public active = 1; - - constructor(private formBuilder: UntypedFormBuilder, private calendar: NgbCalendar) { - this.createGeneralForm(); - this.createRestrictionForm(); - this.createUsageForm(); - } - - selectToday() { - this.model = this.calendar.getToday(); - } - - createGeneralForm() { - this.generalForm = this.formBuilder.group({ - name: [''], - code: [''], - start_date: [''], - end_date: [''], - free_shipping: [''], - quantity: [''], - discount_type: [''], - status: [''], - }); - } - - createRestrictionForm() { - this.restrictionForm = this.formBuilder.group({ - products: [''], - category: [''], - min: [''], - max: [''] - }) - } - - createUsageForm() { - this.usageForm = this.formBuilder.group({ - limit: [''], - customer: [''] - }) - } - ngOnInit() { - - } - -} diff --git a/src/app/components/coupons/list-coupon/list-coupon.component.html b/src/app/components/coupons/list-coupon/list-coupon.component.html deleted file mode 100644 index bdd30ce..0000000 --- a/src/app/components/coupons/list-coupon/list-coupon.component.html +++ /dev/null @@ -1,48 +0,0 @@ - -
-
-
-
-
-
Products Category
-
-
-
- -
- - - - - - - - - - - - - - - - - - -
TitleCodeDiscoountStatus
- - {{ item.title }} - - {{item.code}} - {{item.discount}}
-
- - -
-
-
-
-
-
-
- \ No newline at end of file diff --git a/src/app/components/coupons/list-coupon/list-coupon.component.scss b/src/app/components/coupons/list-coupon/list-coupon.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/components/coupons/list-coupon/list-coupon.component.ts b/src/app/components/coupons/list-coupon/list-coupon.component.ts deleted file mode 100644 index bbe1a6b..0000000 --- a/src/app/components/coupons/list-coupon/list-coupon.component.ts +++ /dev/null @@ -1,51 +0,0 @@ -import {DecimalPipe} from '@angular/common'; -import {Component, OnInit, QueryList, ViewChildren} from '@angular/core'; -import {Observable} from 'rxjs'; -import {NgbdSortableHeader, SortEvent} from 'src/app/shared/directives/NgbdSortableHeader'; -import {TableService} from 'src/app/shared/service/table.service'; -import {LISTCOUPLEDB, ListCouponsDB} from 'src/app/shared/tables/list-coupon'; - -@Component({ - selector: 'app-list-coupon', - templateUrl: './list-coupon.component.html', - styleUrls: ['./list-coupon.component.scss'], - providers: [TableService, DecimalPipe] -}) -export class ListCouponComponent implements OnInit { - - public selected = []; - - public tableItem$: Observable; - public searchText; - total$: Observable; - - constructor(public service: TableService) { - this.tableItem$ = service.tableItem$; - this.total$ = service.total$; - this.service.setUserData(LISTCOUPLEDB); - } - - @ViewChildren(NgbdSortableHeader) headers: QueryList; - - onSort({column, direction}: SortEvent) { - // resetting other headers - this.headers.forEach((header) => { - if (header.sortable !== column) { - header.direction = ''; - } - }); - - this.service.sortColumn = column; - this.service.sortDirection = direction; - - } - - onSelect({selected}) { - this.selected.splice(0, this.selected.length); - this.selected.push(...selected); - } - - ngOnInit() { - } - -} diff --git a/src/app/components/dashboard/dashboard.component.scss b/src/app/components/dashboard/dashboard.component.scss index 0541f1a..d601449 100644 --- a/src/app/components/dashboard/dashboard.component.scss +++ b/src/app/components/dashboard/dashboard.component.scss @@ -1,3 +1,25 @@ -th, td { +th, +td { text-align: center; +} + + +:host { + ::ng-deep { + .pagination { + &>li { + &.page-item { + &.active { + &>a { + &.page-link { + &>span { + display: none; + } + } + } + } + } + } + } + } } \ No newline at end of file diff --git a/src/app/components/products/physical/product-list/product-list.component.scss b/src/app/components/products/physical/product-list/product-list.component.scss index c9ae295..0361766 100644 --- a/src/app/components/products/physical/product-list/product-list.component.scss +++ b/src/app/components/products/physical/product-list/product-list.component.scss @@ -86,7 +86,7 @@ width: 60px; height: 60px; } - + .discount-text { position: absolute; top: 18px; @@ -103,3 +103,22 @@ } } +:host { + ::ng-deep { + .pagination { + &>li { + &.page-item { + &.active { + &>a { + &.page-link { + &>span { + display: none; + } + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/src/app/components/reports/reports-routing.module.ts b/src/app/components/reports/reports-routing.module.ts deleted file mode 100644 index b833e94..0000000 --- a/src/app/components/reports/reports-routing.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { ReportsComponent } from './reports.component'; - - -const routes: Routes = [ - { - path: '', - component: ReportsComponent, - data: { - title: "Reports", - breadcrumb: "Reports" - } - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class ReportsRoutingModule { } diff --git a/src/app/components/reports/reports.component.html b/src/app/components/reports/reports.component.html deleted file mode 100644 index 8cb2cd2..0000000 --- a/src/app/components/reports/reports.component.html +++ /dev/null @@ -1,110 +0,0 @@ - -
-
-
-
-
-
Sales Summary
-
-
- -
-
-
-
-
-
-

75%

-
Employees Satisfied
-
-
-
- -
-
-
-
-
-
-
-
Transfer Report
-
-
-
-
- - - - - - - - - - - - - - - - - - - -
NameTransaction IdDateTotalActions
- {{item.name}} - - {{item.id}} - {{item.date}}{{item.total}} -   - -
-
- - -
-
-
-
-
-
-
-
-
-
Expenses
-
-
-
- -
-
-
-
-
-
-
-
Sales / Purchase
-
-
-
- -
-
-
-
-
-
-
-
Sales / Purchase Return
-
-
- -
-
-
-
-
- \ No newline at end of file diff --git a/src/app/components/reports/reports.component.scss b/src/app/components/reports/reports.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/components/reports/reports.component.ts b/src/app/components/reports/reports.component.ts deleted file mode 100644 index 3de6433..0000000 --- a/src/app/components/reports/reports.component.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { Component, OnInit, QueryList, ViewChildren } from '@angular/core'; -import * as chartData from '../../shared/data/chart'; -import { ReportDB, REPORTDB } from 'src/app/shared/tables/report'; -import { Observable } from 'rxjs'; -import { TableService } from 'src/app/shared/service/table.service'; -import { NgbdSortableHeader, SortEvent } from 'src/app/shared/directives/NgbdSortableHeader'; -import { DecimalPipe } from '@angular/common'; - -@Component({ - selector: 'app-reports', - templateUrl: './reports.component.html', - styleUrls: ['./reports.component.scss'], - providers: [TableService, DecimalPipe] -}) -export class ReportsComponent implements OnInit { - - // lineChart - public salesChartData = chartData.salesChartData; - public salesChartLabels = chartData.salesChartLabels; - public salesChartOptions = chartData.salesChartOptions; - public salesChartColors = chartData.salesChartColors; - public salesChartLegend = chartData.salesChartLegend; - public salesChartType = chartData.salesChartType; - - public areaChart1 = chartData.areaChart1; - public columnChart1 = chartData.columnChart1; - public lineChart = chartData.lineChart; - - public chart5 = chartData.chart6 - - public tableItem$: Observable; - public searchText; - total$: Observable; - - constructor(public service: TableService) { - this.tableItem$ = service.tableItem$; - this.total$ = service.total$; - this.service.setUserData(REPORTDB) - } - - @ViewChildren(NgbdSortableHeader) headers: QueryList; - - onSort({ column, direction }: SortEvent) { - // resetting other headers - this.headers.forEach((header) => { - if (header.sortable !== column) { - header.direction = ''; - } - }); - - this.service.sortColumn = column; - this.service.sortDirection = direction; - - } - - - ngOnInit() { - } - -} diff --git a/src/app/components/reports/reports.module.ts b/src/app/components/reports/reports.module.ts deleted file mode 100644 index 8ade306..0000000 --- a/src/app/components/reports/reports.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { ReportsRoutingModule } from './reports-routing.module'; -import { ReportsComponent } from './reports.component'; -import { NgChartsModule } from 'ng2-charts'; -import { Ng2GoogleChartsModule } from 'ng2-google-charts'; -import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { ChartistModule } from 'ng-chartist' -import { SharedModule } from 'src/app/shared/shared.module'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; - -@NgModule({ - declarations: [ReportsComponent], - imports: [ - CommonModule, - NgChartsModule, - Ng2GoogleChartsModule, - NgxChartsModule, - ChartistModule, - ReportsRoutingModule, - SharedModule, - NgbModule - ] -}) -export class ReportsModule { } diff --git a/src/app/components/sales/orders/orders.component.scss b/src/app/components/sales/orders/orders.component.scss index 1a36893..f401908 100644 --- a/src/app/components/sales/orders/orders.component.scss +++ b/src/app/components/sales/orders/orders.component.scss @@ -1,8 +1,10 @@ -th, td { +th, +td { text-align: center; } .modal-change-status { + // width: 1000px; .modal-confirm-text { text-align: center; @@ -35,12 +37,14 @@ th, td { } .modal-confirm-delete { + // width: 1000px; .modal-confirm-text { text-align: center; padding: 20px 8px; font-weight: 600; } + .modal-btn-option { width: 100%; display: flex; @@ -56,4 +60,25 @@ th, td { .modal-confirm-text { font-weight: 600; +} + + +:host { + ::ng-deep { + .pagination { + &>li { + &.page-item { + &.active { + &>a { + &.page-link { + &>span { + display: none; + } + } + } + } + } + } + } + } } \ No newline at end of file diff --git a/src/app/components/sales/scam-orders/scam-orders.component.scss b/src/app/components/sales/scam-orders/scam-orders.component.scss index 8b1c6b2..f401908 100644 --- a/src/app/components/sales/scam-orders/scam-orders.component.scss +++ b/src/app/components/sales/scam-orders/scam-orders.component.scss @@ -60,4 +60,25 @@ td { .modal-confirm-text { font-weight: 600; +} + + +:host { + ::ng-deep { + .pagination { + &>li { + &.page-item { + &.active { + &>a { + &.page-link { + &>span { + display: none; + } + } + } + } + } + } + } + } } \ No newline at end of file diff --git a/src/app/components/shippers/list-shipper/list-shipper.component.scss b/src/app/components/shippers/list-shipper/list-shipper.component.scss index a807f9e..7ff8c09 100644 --- a/src/app/components/shippers/list-shipper/list-shipper.component.scss +++ b/src/app/components/shippers/list-shipper/list-shipper.component.scss @@ -1,10 +1,12 @@ .modal-confirm-delete { + // width: 1000px; .modal-confirm-text { text-align: center; padding: 20px 8px; font-weight: 600; } + .modal-btn-option { width: 100%; display: flex; @@ -22,6 +24,28 @@ font-weight: 600; } -th, td { +th, +td { text-align: center; +} + + +:host { + ::ng-deep { + .pagination { + &>li { + &.page-item { + &.active { + &>a { + &.page-link { + &>span { + display: none; + } + } + } + } + } + } + } + } } \ No newline at end of file diff --git a/src/app/components/users/list-user/list-user.component.scss b/src/app/components/users/list-user/list-user.component.scss index e69de29..6c3b91c 100644 --- a/src/app/components/users/list-user/list-user.component.scss +++ b/src/app/components/users/list-user/list-user.component.scss @@ -0,0 +1,19 @@ +:host { + ::ng-deep { + .pagination { + &>li { + &.page-item { + &.active { + &>a { + &.page-link { + &>span { + display: none; + } + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/src/app/components/utility/list-address/list-address.component.scss b/src/app/components/utility/list-address/list-address.component.scss index a55218f..d601449 100644 --- a/src/app/components/utility/list-address/list-address.component.scss +++ b/src/app/components/utility/list-address/list-address.component.scss @@ -1,4 +1,25 @@ th, td { text-align: center; +} + + +:host { + ::ng-deep { + .pagination { + &>li { + &.page-item { + &.active { + &>a { + &.page-link { + &>span { + display: none; + } + } + } + } + } + } + } + } } \ No newline at end of file diff --git a/src/app/components/vendors/list-vendors/list-vendors.component.scss b/src/app/components/vendors/list-vendors/list-vendors.component.scss index 0e89b5b..a724a1e 100644 --- a/src/app/components/vendors/list-vendors/list-vendors.component.scss +++ b/src/app/components/vendors/list-vendors/list-vendors.component.scss @@ -1,7 +1,29 @@ -th, td { +th, +td { text-align: center; } .text-size { font-size: 12px; +} + + +:host { + ::ng-deep { + .pagination { + &>li { + &.page-item { + &.active { + &>a { + &.page-link { + &>span { + display: none; + } + } + } + } + } + } + } + } } \ No newline at end of file diff --git a/src/app/shared/routes/content-routes.ts b/src/app/shared/routes/content-routes.ts index cf7305c..165c63c 100644 --- a/src/app/shared/routes/content-routes.ts +++ b/src/app/shared/routes/content-routes.ts @@ -26,13 +26,6 @@ export const content: Routes = [ breadcrumb: "Đơn hàng" } }, - { - path: 'coupons', - loadChildren: () => import('../../components/coupons/coupons.module').then(m => m.CouponsModule), - data: { - breadcrumb: "Coupons" - } - }, // { // path: 'pages', // loadChildren: () => import('../../components/pages/pages.module').then(m => m.PagesModule), @@ -72,10 +65,6 @@ export const content: Routes = [ // breadcrumb: "Localization" // } // }, - { - path: 'reports', - loadChildren: () => import('../../components/reports/reports.module').then(m => m.ReportsModule), - }, { path: 'settings', loadChildren: () => import('../../components/setting/setting.module').then(m => m.SettingModule), diff --git a/src/assets/scss/theme/_admin_style.scss b/src/assets/scss/theme/_admin_style.scss index d3175e2..5a94dd3 100644 --- a/src/assets/scss/theme/_admin_style.scss +++ b/src/assets/scss/theme/_admin_style.scss @@ -1,5 +1,6 @@ $btn-padding : 0.5rem 1.5rem; + /**===================== Admin CSS Start ==========================**/ diff --git a/src/styles.scss b/src/styles.scss index 90d4ee0..e69de29 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1 +0,0 @@ -/* You can add global styles to this file, and also import other style files */