Merged the dev branch

This commit is contained in:
Sumit Ghosh 2021-06-25 16:47:45 +05:30
commit 4b801a8667
5 changed files with 5555 additions and 4224 deletions

View File

@ -36,7 +36,6 @@
"optimization": true, "optimization": true,
"outputHashing": "all", "outputHashing": "all",
"sourceMap": false, "sourceMap": false,
"extractCss": true,
"namedChunks": false, "namedChunks": false,
"aot": true, "aot": true,
"extractLicenses": true, "extractLicenses": true,

File diff suppressed because it is too large Load Diff

View File

@ -28,15 +28,15 @@
}, },
"dependencies": { "dependencies": {
"@angular-devkit/schematics": "^11.0.4", "@angular-devkit/schematics": "^11.0.4",
"@angular/animations": "10.2.5", "@angular/animations": "11.2.14",
"@angular/common": "10.2.5", "@angular/common": "11.2.14",
"@angular/compiler": "10.2.5", "@angular/compiler": "11.2.14",
"@angular/core": "10.2.5", "@angular/core": "11.2.14",
"@angular/forms": "10.2.5", "@angular/forms": "11.2.14",
"@angular/platform-browser": "10.2.5", "@angular/platform-browser": "11.2.14",
"@angular/platform-browser-dynamic": "10.2.5", "@angular/platform-browser-dynamic": "11.2.14",
"@angular/platform-server": "10.2.5", "@angular/platform-server": "11.2.14",
"@angular/router": "10.2.5", "@angular/router": "11.2.14",
"@microsoft/signalr": "3.0.1", "@microsoft/signalr": "3.0.1",
"@ng-bootstrap/ng-bootstrap": "^8.0.0", "@ng-bootstrap/ng-bootstrap": "^8.0.0",
"@popperjs/core": "2.0.0", "@popperjs/core": "2.0.0",
@ -61,22 +61,22 @@
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.1002.3", "@angular-devkit/build-angular": "~0.1102.14",
"@angular/cli": "10.2.3", "@angular/cli": "11.2.14",
"@angular/compiler-cli": "10.2.5", "@angular/compiler-cli": "11.2.14",
"@angular/language-service": "10.2.5", "@angular/language-service": "11.2.14",
"@types/core-js": "2.5.0", "@types/core-js": "2.5.0",
"@types/hammerjs": "2.0.35", "@types/hammerjs": "2.0.35",
"@types/jasmine": "^3.5.10", "@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1", "@types/node": "^12.11.1",
"@types/protractor": "4.0.0", "@types/protractor": "4.0.0",
"@types/selenium-webdriver": "3.0.10", "@types/selenium-webdriver": "3.0.10",
"codelyzer": "^5.1.2", "codelyzer": "^6.0.0",
"eslint": "^6.8.0", "eslint": "^6.8.0",
"handlebars": "^4.7.7", "handlebars": "^4.7.7",
"jasmine-core": "~3.5.0", "jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0", "jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0", "karma": "~6.3.4",
"karma-chrome-launcher": "~3.1.0", "karma-chrome-launcher": "~3.1.0",
"karma-cli": "^2.0.0", "karma-cli": "^2.0.0",
"karma-jasmine": "~4.0.0", "karma-jasmine": "~4.0.0",

View File

@ -15,4 +15,4 @@ export const routes: Routes = [
{ path: 'order', component: OrdersNewComponent }, { path: 'order', component: OrdersNewComponent },
]; ];
export const routing = RouterModule.forRoot(routes); export const routing = RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' });

View File

@ -1,6 +1,6 @@
/* tslint:disable:no-unused-variable */ /* tslint:disable:no-unused-variable */
import { TestBed, async } from '@angular/core/testing'; import { TestBed, waitForAsync } from '@angular/core/testing';
import { PageNotFoundComponent } from './page-not-found.component'; import { PageNotFoundComponent } from './page-not-found.component';
describe('Component: PageNotFound', () => { describe('Component: PageNotFound', () => {