develop #49

Manually merged
samuel-p merged 23 commits from develop into master 2020-11-27 22:09:29 +00:00
4 changed files with 20 additions and 19 deletions
Showing only changes of commit 494371a01d - Show all commits

View file

@ -15,17 +15,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~10.0.4",
"@angular/cdk": "^10.0.2",
"@angular/common": "~10.0.4",
"@angular/compiler": "~10.0.4",
"@angular/core": "~10.0.4",
"@angular/forms": "~10.0.4",
"@angular/animations": "~11.0.2",
"@angular/cdk": "^11.0.1",
"@angular/common": "~11.0.2",
"@angular/compiler": "~11.0.2",
"@angular/core": "~11.0.2",
"@angular/forms": "~11.0.2",
"@angular/material": "^10.0.2",
"@angular/platform-browser": "~10.0.4",
"@angular/platform-browser-dynamic": "~10.0.4",
"@angular/platform-server": "~10.0.4",
"@angular/router": "~10.0.4",
"@angular/platform-browser": "~11.0.2",
"@angular/platform-browser-dynamic": "~11.0.2",
"@angular/platform-server": "~11.0.2",
"@angular/router": "~11.0.2",
"@fortawesome/fontawesome-free": "^5.15.1",
"@nguniversal/express-engine": "^10.1.0",
"bootstrap": "^4.5.3",
@ -39,8 +39,8 @@
"devDependencies": {
"@angular-devkit/build-angular": "~0.1000.3",
"@angular/cli": "~10.0.3",
"@angular/compiler-cli": "~10.0.4",
"@angular/language-service": "~10.0.4",
"@angular/compiler-cli": "~11.0.2",
"@angular/language-service": "~11.0.2",
"@nguniversal/builders": "^10.1.0",
"@types/express": "^4.17.8",
"@types/node": "^14.0.23",
@ -57,6 +57,6 @@
"protractor": "~7.0.0",
"ts-node": "~8.10.2",
"tslint": "~6.1.0",
"typescript": "~3.9.7"
"typescript": "~4.0.5"
}
}

View file

@ -9,8 +9,9 @@ const routes: Routes = [{
@NgModule({
imports: [RouterModule.forRoot(routes, {
initialNavigation: 'enabled'
})],
initialNavigation: 'enabled',
relativeLinkResolution: 'legacy'
})],
exports: [RouterModule]
})
export class AppRoutingModule {

View file

@ -1,9 +1,9 @@
import { TestBed, async } from '@angular/core/testing';
import { TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule

View file

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { StatusComponent } from './status.component';
@ -6,7 +6,7 @@ describe('StatusComponent', () => {
let component: StatusComponent;
let fixture: ComponentFixture<StatusComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ StatusComponent ]
})