diff --git a/overlord/.editorconfig b/overlord/.editorconfig index 6e87a003..e89330a6 100644 --- a/overlord/.editorconfig +++ b/overlord/.editorconfig @@ -1,4 +1,4 @@ -# Editor configuration, see http://editorconfig.org +# Editor configuration, see https://editorconfig.org root = true [*] diff --git a/overlord/angular.json b/overlord/angular.json index 0474a345..a2f9ae36 100644 --- a/overlord/angular.json +++ b/overlord/angular.json @@ -23,9 +23,7 @@ "src/assets" ], "styles": [ - { - "input": "node_modules/@angular/material/prebuilt-themes/indigo-pink.css" - }, + "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.css" ], "scripts": [] @@ -46,7 +44,14 @@ "aot": true, "extractLicenses": true, "vendorChunk": false, - "buildOptimizer": true + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "5mb" + } + ] } } }, @@ -76,10 +81,8 @@ "tsConfig": "src/tsconfig.spec.json", "karmaConfig": "src/karma.conf.js", "styles": [ - { - "input": "node_modules/@angular/material/prebuilt-themes/indigo-pink.css" - }, - "styles.css" + "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", + "src/styles.css" ], "scripts": [], "assets": [ @@ -105,12 +108,18 @@ "overlord-e2e": { "root": "e2e/", "projectType": "application", + "prefix": "", "architect": { "e2e": { "builder": "@angular-devkit/build-angular:protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", "devServerTarget": "overlord:serve" + }, + "configurations": { + "production": { + "devServerTarget": "overlord:serve:production" + } } }, "lint": { diff --git a/overlord/package.json b/overlord/package.json index 3f4a0b02..566b6018 100644 --- a/overlord/package.json +++ b/overlord/package.json @@ -11,47 +11,49 @@ }, "private": true, "dependencies": { - "@angular/animations": "^6.1.0", - "@angular/cdk": "^6.4.1", - "@angular/common": "^6.1.0", - "@angular/compiler": "^6.1.0", - "@angular/core": "^6.1.0", - "@angular/flex-layout": "^6.0.0-beta.17", - "@angular/forms": "^6.1.0", - "@angular/http": "^6.1.0", - "@angular/material": "^6.4.1", - "@angular/material-moment-adapter": "^6.4.1", - "@angular/platform-browser": "^6.1.0", - "@angular/platform-browser-dynamic": "^6.1.0", - "@angular/router": "^6.1.0", - "@ngx-loading-bar/http-client": "^2.1.2", - "@ngx-loading-bar/router": "^2.1.2", + "@angular/animations": "^7.1.0", + "@angular/cdk": "^7.1.0", + "@angular/common": "^7.1.0", + "@angular/compiler": "^7.1.0", + "@angular/core": "^7.1.0", + "@angular/flex-layout": "^7.0.0-beta.19", + "@angular/forms": "^7.1.0", + "@angular/http": "^7.1.0", + "@angular/material": "^7.1.0", + "@angular/material-moment-adapter": "^7.1.0", + "@angular/platform-browser": "^7.1.0", + "@angular/platform-browser-dynamic": "^7.1.0", + "@angular/router": "^7.1.0", + "@ngx-loading-bar/http-client": "^3.0.0", + "@ngx-loading-bar/router": "^3.0.0", "core-js": "^2.5.7", + "hammerjs": "^2.0.8", "mathjs": "^5.0.4", "moment": "^2.22.2", "rxjs": "^6.2.2", + "rxjs-tslint": "^0.1.5", "zone.js": "^0.8.26" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.7.1", - "@angular/cli": "^6.1.1", - "@angular/compiler-cli": "^6.1.0", - "@angular/language-service": "^6.1.0", - "@types/jasmine": "^2.8.8", + "@angular-devkit/build-angular": "~0.10.0", + "@angular/cli": "^7.0.6", + "@angular/compiler-cli": "^7.1.0", + "@angular/language-service": "^7.1.0", + "@types/jasmine": "^3.3.0", "@types/jasminewd2": "^2.0.3", "@types/node": "^10.5.4", "codelyzer": "^4.4.2", "jasmine-core": "^3.1.0", "jasmine-spec-reporter": "^4.2.1", - "karma": "^2.0.5", + "karma": "^3.1.1", "karma-chrome-launcher": "^2.2.0", "karma-coverage-istanbul-reporter": "^2.0.1", - "karma-jasmine": "^1.1.2", + "karma-jasmine": "^2.0.1", "karma-jasmine-html-reporter": "^1.2.0", "protractor": "^5.4.0", "standard-version": "^4.4.0", "ts-node": "^7.0.0", "tslint": "^5.11.0", - "typescript": "^2.9.2" + "typescript": "^3.1.6" } } diff --git a/overlord/src/app/account/account.module.ts b/overlord/src/app/account/account.module.ts index 3403229d..bb7b2008 100644 --- a/overlord/src/app/account/account.module.ts +++ b/overlord/src/app/account/account.module.ts @@ -19,13 +19,12 @@ import { } from '@angular/material'; import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; @NgModule({ imports: [ CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatTableModule, MatPaginatorModule, diff --git a/overlord/src/app/app.module.ts b/overlord/src/app/app.module.ts index e46ffe4e..60a2088c 100644 --- a/overlord/src/app/app.module.ts +++ b/overlord/src/app/app.module.ts @@ -65,6 +65,7 @@ import {SettingsModule} from './settings/settings.module'; import {AttendanceModule} from './attendance/attendance.module'; import {EmployeeAttendanceModule} from './employee-attendance/employee-attendance.module'; import {RawMaterialCostModule} from './raw-material-cost/raw-material-cost.module'; +import {FlexLayoutModule} from "@angular/flex-layout"; registerLocaleData(enIN); @@ -79,6 +80,7 @@ registerLocaleData(enIN); imports: [ BrowserModule, BrowserAnimationsModule, + FlexLayoutModule.withConfig({useColumnBasisZero: true}), HttpClientModule, LayoutModule, MatButtonModule, diff --git a/overlord/src/app/attendance/attendance.module.ts b/overlord/src/app/attendance/attendance.module.ts index e6fc8b9b..4f33f082 100644 --- a/overlord/src/app/attendance/attendance.module.ts +++ b/overlord/src/app/attendance/attendance.module.ts @@ -28,7 +28,7 @@ import {AttendanceRoutingModule} from './attendance-routing.module'; import {AttendanceComponent} from './attendance.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -47,7 +47,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/balance-sheet/balance-sheet.module.ts b/overlord/src/app/balance-sheet/balance-sheet.module.ts index 5a9f167c..488b03a8 100644 --- a/overlord/src/app/balance-sheet/balance-sheet.module.ts +++ b/overlord/src/app/balance-sheet/balance-sheet.module.ts @@ -21,7 +21,7 @@ import {CdkTableModule} from '@angular/cdk/table'; import {BalanceSheetRoutingModule} from './balance-sheet-routing.module'; import {BalanceSheetComponent} from './balance-sheet.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; import {ReactiveFormsModule} from '@angular/forms'; export const MY_FORMATS = { @@ -40,7 +40,6 @@ export const MY_FORMATS = { imports: [ CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatButtonModule, MatCardModule, diff --git a/overlord/src/app/cash-flow/cash-flow.module.ts b/overlord/src/app/cash-flow/cash-flow.module.ts index d2a29779..1e8cb387 100644 --- a/overlord/src/app/cash-flow/cash-flow.module.ts +++ b/overlord/src/app/cash-flow/cash-flow.module.ts @@ -21,7 +21,7 @@ import {CdkTableModule} from '@angular/cdk/table'; import {CashFlowRoutingModule} from './cash-flow-routing.module'; import {CashFlowComponent} from './cash-flow.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; import {ReactiveFormsModule} from '@angular/forms'; export const MY_FORMATS = { @@ -40,7 +40,6 @@ export const MY_FORMATS = { imports: [ CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatButtonModule, MatCardModule, diff --git a/overlord/src/app/client/client.module.ts b/overlord/src/app/client/client.module.ts index 780a259f..64f45262 100644 --- a/overlord/src/app/client/client.module.ts +++ b/overlord/src/app/client/client.module.ts @@ -17,14 +17,13 @@ import { } from '@angular/material'; import {CdkTableModule} from '@angular/cdk/table'; import {SharedModule} from '../shared/shared.module'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; import {ReactiveFormsModule} from '@angular/forms'; @NgModule({ imports: [ CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatButtonModule, MatCardModule, diff --git a/overlord/src/app/closing-stock/closing-stock.module.ts b/overlord/src/app/closing-stock/closing-stock.module.ts index 0194b79e..9ced52d7 100644 --- a/overlord/src/app/closing-stock/closing-stock.module.ts +++ b/overlord/src/app/closing-stock/closing-stock.module.ts @@ -22,7 +22,7 @@ import {ClosingStockRoutingModule} from './closing-stock-routing.module'; import {ClosingStockComponent} from './closing-stock.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; import {ReactiveFormsModule} from '@angular/forms'; export const MY_FORMATS = { @@ -42,7 +42,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatButtonModule, MatCardModule, diff --git a/overlord/src/app/cost-centre/cost-centre.module.ts b/overlord/src/app/cost-centre/cost-centre.module.ts index 25091f4f..466bd2e9 100644 --- a/overlord/src/app/cost-centre/cost-centre.module.ts +++ b/overlord/src/app/cost-centre/cost-centre.module.ts @@ -16,13 +16,12 @@ import { } from '@angular/material'; import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; @NgModule({ imports: [ CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatButtonModule, MatCardModule, diff --git a/overlord/src/app/daybook/daybook.module.ts b/overlord/src/app/daybook/daybook.module.ts index 1c63cd2c..0bfbf5a3 100644 --- a/overlord/src/app/daybook/daybook.module.ts +++ b/overlord/src/app/daybook/daybook.module.ts @@ -25,7 +25,7 @@ import {DaybookRoutingModule} from './daybook-routing.module'; import {DaybookComponent} from './daybook.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -44,7 +44,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/employee-attendance/employee-attendance.module.ts b/overlord/src/app/employee-attendance/employee-attendance.module.ts index fe9b566a..6ffbf20a 100644 --- a/overlord/src/app/employee-attendance/employee-attendance.module.ts +++ b/overlord/src/app/employee-attendance/employee-attendance.module.ts @@ -28,7 +28,7 @@ import {EmployeeAttendanceRoutingModule} from './employee-attendance-routing.mod import {EmployeeAttendanceComponent} from './employee-attendance.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -47,7 +47,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/employee-benefits/employee-benefits.module.ts b/overlord/src/app/employee-benefits/employee-benefits.module.ts index dcb8960c..521e0d24 100644 --- a/overlord/src/app/employee-benefits/employee-benefits.module.ts +++ b/overlord/src/app/employee-benefits/employee-benefits.module.ts @@ -20,7 +20,7 @@ import { import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; import {SharedModule} from '../shared/shared.module'; import {EmployeeBenefitsRoutingModule} from './employee-benefits-routing.module'; import {EmployeeBenefitsComponent} from './employee-benefits.component'; @@ -42,7 +42,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/employee-functions/employee-functions.module.ts b/overlord/src/app/employee-functions/employee-functions.module.ts index 56d0ef14..6bb90ba2 100644 --- a/overlord/src/app/employee-functions/employee-functions.module.ts +++ b/overlord/src/app/employee-functions/employee-functions.module.ts @@ -21,7 +21,7 @@ import { import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; import {SharedModule} from '../shared/shared.module'; import {EmployeeFunctionsComponent} from './employee-functions.component'; import {EmployeeFunctionsRoutingModule} from './employee-functions-routing.module'; @@ -31,7 +31,6 @@ import {EmployeeFunctionsRoutingModule} from './employee-functions-routing.modul A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/employee/employee.module.ts b/overlord/src/app/employee/employee.module.ts index 0c33bff6..15b9b95e 100644 --- a/overlord/src/app/employee/employee.module.ts +++ b/overlord/src/app/employee/employee.module.ts @@ -21,13 +21,12 @@ import { } from '@angular/material'; import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; @NgModule({ imports: [ CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatTableModule, MatPaginatorModule, diff --git a/overlord/src/app/group/group.module.ts b/overlord/src/app/group/group.module.ts index 390ca572..f84defdb 100644 --- a/overlord/src/app/group/group.module.ts +++ b/overlord/src/app/group/group.module.ts @@ -19,13 +19,12 @@ import { import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; import {SharedModule} from '../shared/shared.module'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; @NgModule({ imports: [ CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatButtonModule, MatCardModule, diff --git a/overlord/src/app/incentive/incentive.module.ts b/overlord/src/app/incentive/incentive.module.ts index df8e561a..87296162 100644 --- a/overlord/src/app/incentive/incentive.module.ts +++ b/overlord/src/app/incentive/incentive.module.ts @@ -27,7 +27,7 @@ import {IncentiveRoutingModule} from './incentive-routing.module'; import {IncentiveComponent} from './incentive.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -46,7 +46,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/issue/issue.module.ts b/overlord/src/app/issue/issue.module.ts index 88405556..689dadd7 100644 --- a/overlord/src/app/issue/issue.module.ts +++ b/overlord/src/app/issue/issue.module.ts @@ -28,7 +28,7 @@ import {IssueComponent} from './issue.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; import {IssueDialogComponent} from './issue-dialog.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -47,7 +47,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/journal/journal.module.ts b/overlord/src/app/journal/journal.module.ts index abd85c50..4952e067 100644 --- a/overlord/src/app/journal/journal.module.ts +++ b/overlord/src/app/journal/journal.module.ts @@ -28,7 +28,7 @@ import {JournalComponent} from './journal.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; import {JournalDialogComponent} from './journal-dialog.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -47,7 +47,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/ledger/ledger.module.ts b/overlord/src/app/ledger/ledger.module.ts index 12a2ac75..c7ef0bb3 100644 --- a/overlord/src/app/ledger/ledger.module.ts +++ b/overlord/src/app/ledger/ledger.module.ts @@ -25,7 +25,7 @@ import {LedgerRoutingModule} from './ledger-routing.module'; import {LedgerComponent} from './ledger.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -44,7 +44,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/net-transactions/net-transactions.module.ts b/overlord/src/app/net-transactions/net-transactions.module.ts index 54a4e9d4..e395739a 100644 --- a/overlord/src/app/net-transactions/net-transactions.module.ts +++ b/overlord/src/app/net-transactions/net-transactions.module.ts @@ -25,7 +25,7 @@ import {NetTransactionsRoutingModule} from './net-transactions-routing.module'; import {NetTransactionsComponent} from './net-transactions.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -44,7 +44,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/payment/payment.module.ts b/overlord/src/app/payment/payment.module.ts index be3182a9..3dd597cf 100644 --- a/overlord/src/app/payment/payment.module.ts +++ b/overlord/src/app/payment/payment.module.ts @@ -28,7 +28,7 @@ import {PaymentComponent} from './payment.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; import {PaymentDialogComponent} from './payment-dialog.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -47,7 +47,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/product-group/product-group.module.ts b/overlord/src/app/product-group/product-group.module.ts index 94503e7a..384f3b6d 100644 --- a/overlord/src/app/product-group/product-group.module.ts +++ b/overlord/src/app/product-group/product-group.module.ts @@ -15,14 +15,13 @@ import { MatTableModule } from '@angular/material'; import {CdkTableModule} from '@angular/cdk/table'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; import {ReactiveFormsModule} from '@angular/forms'; @NgModule({ imports: [ CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatTableModule, MatPaginatorModule, diff --git a/overlord/src/app/product-ledger/product-ledger.module.ts b/overlord/src/app/product-ledger/product-ledger.module.ts index b2952bea..6e409828 100644 --- a/overlord/src/app/product-ledger/product-ledger.module.ts +++ b/overlord/src/app/product-ledger/product-ledger.module.ts @@ -25,7 +25,7 @@ import {ProductLedgerRoutingModule} from './product-ledger-routing.module'; import {ProductLedgerComponent} from './product-ledger.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -44,7 +44,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/product/product.module.ts b/overlord/src/app/product/product.module.ts index 9a7396f9..25712f6b 100644 --- a/overlord/src/app/product/product.module.ts +++ b/overlord/src/app/product/product.module.ts @@ -19,13 +19,12 @@ import { } from '@angular/material'; import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; @NgModule({ imports: [ CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatTableModule, MatPaginatorModule, diff --git a/overlord/src/app/profit-loss/profit-loss.module.ts b/overlord/src/app/profit-loss/profit-loss.module.ts index 510b8ba7..c771f8b4 100644 --- a/overlord/src/app/profit-loss/profit-loss.module.ts +++ b/overlord/src/app/profit-loss/profit-loss.module.ts @@ -25,7 +25,7 @@ import {ProfitLossRoutingModule} from './profit-loss-routing.module'; import {ProfitLossComponent} from './profit-loss.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -44,7 +44,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/purchase-entries/purchase-entries.module.ts b/overlord/src/app/purchase-entries/purchase-entries.module.ts index e89d015c..6245010c 100644 --- a/overlord/src/app/purchase-entries/purchase-entries.module.ts +++ b/overlord/src/app/purchase-entries/purchase-entries.module.ts @@ -25,7 +25,7 @@ import {PurchaseEntriesRoutingModule} from './purchase-entries-routing.module'; import {PurchaseEntriesComponent} from './purchase-entries.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -44,7 +44,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/purchase-return/purchase-return.module.ts b/overlord/src/app/purchase-return/purchase-return.module.ts index 342db9c2..06938f7b 100644 --- a/overlord/src/app/purchase-return/purchase-return.module.ts +++ b/overlord/src/app/purchase-return/purchase-return.module.ts @@ -28,7 +28,7 @@ import {PurchaseReturnComponent} from './purchase-return.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; import {PurchaseReturnDialogComponent} from './purchase-return-dialog.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -47,7 +47,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/purchase/purchase.module.ts b/overlord/src/app/purchase/purchase.module.ts index 002cbfc5..07dd69bc 100644 --- a/overlord/src/app/purchase/purchase.module.ts +++ b/overlord/src/app/purchase/purchase.module.ts @@ -28,7 +28,7 @@ import {PurchaseComponent} from './purchase.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; import {PurchaseDialogComponent} from './purchase-dialog.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -47,7 +47,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/purchases/purchases.module.ts b/overlord/src/app/purchases/purchases.module.ts index 1250bf68..94c64f1e 100644 --- a/overlord/src/app/purchases/purchases.module.ts +++ b/overlord/src/app/purchases/purchases.module.ts @@ -25,7 +25,7 @@ import {PurchasesRoutingModule} from './purchases-routing.module'; import {PurchasesComponent} from './purchases.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -44,7 +44,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.module.ts b/overlord/src/app/raw-material-cost/raw-material-cost.module.ts index b4913f26..0c3015b0 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost.module.ts +++ b/overlord/src/app/raw-material-cost/raw-material-cost.module.ts @@ -25,7 +25,7 @@ import {RawMaterialCostRoutingModule} from './raw-material-cost-routing.module'; import {RawMaterialCostComponent} from './raw-material-cost.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -44,7 +44,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/receipt/receipt.module.ts b/overlord/src/app/receipt/receipt.module.ts index 49ae1842..974560a6 100644 --- a/overlord/src/app/receipt/receipt.module.ts +++ b/overlord/src/app/receipt/receipt.module.ts @@ -28,7 +28,7 @@ import {ReceiptComponent} from './receipt.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; import {ReceiptDialogComponent} from './receipt-dialog.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -47,7 +47,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/settings/settings.module.ts b/overlord/src/app/settings/settings.module.ts index 013a5cc3..47f5af30 100644 --- a/overlord/src/app/settings/settings.module.ts +++ b/overlord/src/app/settings/settings.module.ts @@ -21,7 +21,7 @@ import { import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; import {SharedModule} from '../shared/shared.module'; import {SettingsComponent} from './settings.component'; import {SettingsRoutingModule} from './settings-routing.module'; @@ -31,7 +31,6 @@ import {SettingsRoutingModule} from './settings-routing.module'; A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/stock-movement/stock-movement.module.ts b/overlord/src/app/stock-movement/stock-movement.module.ts index 801b440c..aeaf87e8 100644 --- a/overlord/src/app/stock-movement/stock-movement.module.ts +++ b/overlord/src/app/stock-movement/stock-movement.module.ts @@ -25,7 +25,7 @@ import {StockMovementRoutingModule} from './stock-movement-routing.module'; import {StockMovementComponent} from './stock-movement.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; export const MY_FORMATS = { parse: { @@ -44,7 +44,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatAutocompleteModule, MatButtonModule, diff --git a/overlord/src/app/trial-balance/trial-balance.module.ts b/overlord/src/app/trial-balance/trial-balance.module.ts index a1510a47..c69dbe1c 100644 --- a/overlord/src/app/trial-balance/trial-balance.module.ts +++ b/overlord/src/app/trial-balance/trial-balance.module.ts @@ -22,7 +22,7 @@ import {TrialBalanceRoutingModule} from './trial-balance-routing.module'; import {TrialBalanceComponent} from './trial-balance.component'; import {MomentDateAdapter} from '@angular/material-moment-adapter'; import {A11yModule} from '@angular/cdk/a11y'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; import {ReactiveFormsModule} from '@angular/forms'; export const MY_FORMATS = { @@ -42,7 +42,6 @@ export const MY_FORMATS = { A11yModule, CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatButtonModule, MatCardModule, diff --git a/overlord/src/app/user/user.module.ts b/overlord/src/app/user/user.module.ts index 7fe11a60..5e395b22 100644 --- a/overlord/src/app/user/user.module.ts +++ b/overlord/src/app/user/user.module.ts @@ -19,13 +19,12 @@ import { import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; import {SharedModule} from '../shared/shared.module'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@angular/flex-layout'; @NgModule({ imports: [ CommonModule, CdkTableModule, - FlexModule, FlexLayoutModule, MatButtonModule, MatCardModule, diff --git a/overlord/src/browserslist b/overlord/src/browserslist index 8e09ab49..37371cb0 100644 --- a/overlord/src/browserslist +++ b/overlord/src/browserslist @@ -1,9 +1,11 @@ # This file is currently used by autoprefixer to adjust CSS to support the below specified browsers # For additional information regarding the format and rule options, please see: # https://github.com/browserslist/browserslist#queries -# For IE 9-11 support, please uncomment the last line of the file and adjust as needed +# +# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed + > 0.5% last 2 versions Firefox ESR not dead -# IE 9-11 \ No newline at end of file +not IE 9-11 \ No newline at end of file diff --git a/overlord/src/environments/environment.ts b/overlord/src/environments/environment.ts index 012182ef..7b4f817a 100644 --- a/overlord/src/environments/environment.ts +++ b/overlord/src/environments/environment.ts @@ -1,5 +1,5 @@ // This file can be replaced during build by using the `fileReplacements` array. -// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`. +// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`. // The list of file replacements can be found in `angular.json`. export const environment = { @@ -7,9 +7,10 @@ export const environment = { }; /* - * In development mode, to ignore zone related error stack frames such as - * `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can - * import the following file, but please comment it out in production mode - * because it will have performance impact when throw error + * For easier debugging in development mode, you can import the following file + * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`. + * + * This import should be commented out in production mode because it will have a negative impact + * on performance if an error is thrown. */ // import 'zone.js/dist/zone-error'; // Included with Angular CLI. diff --git a/overlord/src/main.ts b/overlord/src/main.ts index 91ec6da5..3b2b7d07 100644 --- a/overlord/src/main.ts +++ b/overlord/src/main.ts @@ -1,3 +1,4 @@ +import 'hammerjs'; import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; @@ -9,4 +10,4 @@ if (environment.production) { } platformBrowserDynamic().bootstrapModule(AppModule) - .catch(err => console.log(err)); + .catch(err => console.error(err)); diff --git a/overlord/src/polyfills.ts b/overlord/src/polyfills.ts index d310405a..20fe40f8 100644 --- a/overlord/src/polyfills.ts +++ b/overlord/src/polyfills.ts @@ -43,7 +43,7 @@ /** Evergreen browsers require these. **/ // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove. -import 'core-js/es7/reflect'; + /** diff --git a/overlord/src/styles.css b/overlord/src/styles.css index d53753af..7e7239a2 100644 --- a/overlord/src/styles.css +++ b/overlord/src/styles.css @@ -1,3 +1,4 @@ /* You can add global styles to this file, and also import other style files */ -body { margin: 0; } +html, body { height: 100%; } +body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; } diff --git a/overlord/src/tsconfig.app.json b/overlord/src/tsconfig.app.json index cfc3f9d8..638c23c7 100644 --- a/overlord/src/tsconfig.app.json +++ b/overlord/src/tsconfig.app.json @@ -2,11 +2,10 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../../brewman/static", - "module": "es2015", "types": [] }, "exclude": [ - "src/test.ts", + "test.ts", "**/*.spec.ts" ] } diff --git a/overlord/src/tsconfig.spec.json b/overlord/src/tsconfig.spec.json index 8f7cedec..de773363 100644 --- a/overlord/src/tsconfig.spec.json +++ b/overlord/src/tsconfig.spec.json @@ -2,7 +2,6 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/spec", - "module": "commonjs", "types": [ "jasmine", "node" diff --git a/overlord/tsconfig.json b/overlord/tsconfig.json index 4b2a5bec..edc39871 100644 --- a/overlord/tsconfig.json +++ b/overlord/tsconfig.json @@ -5,6 +5,7 @@ "outDir": "../brewman/static", "sourceMap": true, "declaration": false, + "module": "es2015", "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, @@ -13,7 +14,7 @@ "node_modules/@types" ], "lib": [ - "es2017", + "es2018", "dom" ] } diff --git a/overlord/tslint.json b/overlord/tslint.json index 3ea984c7..6ddb6b29 100644 --- a/overlord/tslint.json +++ b/overlord/tslint.json @@ -65,6 +65,7 @@ ], "no-misused-new": true, "no-non-null-assertion": true, + "no-redundant-jsdoc": true, "no-shadowed-variable": true, "no-string-literal": false, "no-string-throw": true,