diff options
| author | 杨宇千 <crupest@outlook.com> | 2019-04-13 15:47:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-13 15:47:40 +0800 |
| commit | 56c51bdf844ce1e3642dcdc4099187e7e57008c7 (patch) | |
| tree | 1aa37565aad734b604eb94ed3a62db2308f4b30d /Timeline/ClientApp/src/app/user/user-dialog | |
| parent | 19cae15eba2bcede41b818e1b8ab7fd5ac92eb05 (diff) | |
| parent | 108ea333534445a8c76d4db632ebf21abf426c71 (diff) | |
| download | timeline-56c51bdf844ce1e3642dcdc4099187e7e57008c7.tar.gz timeline-56c51bdf844ce1e3642dcdc4099187e7e57008c7.tar.bz2 timeline-56c51bdf844ce1e3642dcdc4099187e7e57008c7.zip | |
Merge pull request #20 from crupest/separate
Separate front end and back end.
Diffstat (limited to 'Timeline/ClientApp/src/app/user/user-dialog')
4 files changed, 0 insertions, 68 deletions
diff --git a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.css b/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.css deleted file mode 100644 index e69de29b..00000000 --- a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.css +++ /dev/null diff --git a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.html b/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.html deleted file mode 100644 index e8dbb003..00000000 --- a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.html +++ /dev/null @@ -1 +0,0 @@ -<router-outlet name="user"></router-outlet> diff --git a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.spec.ts b/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.spec.ts deleted file mode 100644 index 47860eee..00000000 --- a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.spec.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { Component } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { Router, Event } from '@angular/router'; - -import { Observable } from 'rxjs'; - -import { UserDialogComponent } from './user-dialog.component'; - -@Component({ - /* tslint:disable-next-line:component-selector*/ - selector: 'router-outlet', - template: '' -}) -class RouterOutletStubComponent { } - - -describe('UserDialogComponent', () => { - let component: UserDialogComponent; - let fixture: ComponentFixture<UserDialogComponent>; - - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [UserDialogComponent, RouterOutletStubComponent], - providers: [{ // for the workaround - provide: Router, useValue: { - events: new Observable<Event>() - } - }] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(UserDialogComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts b/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts deleted file mode 100644 index 2887f0a6..00000000 --- a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { RouterOutlet, Router, ActivationStart } from '@angular/router'; - -@Component({ - selector: 'app-user-dialog', - templateUrl: './user-dialog.component.html', - styleUrls: ['./user-dialog.component.css'] -}) -export class UserDialogComponent implements OnInit { - - constructor(private router: Router) { } - - @ViewChild(RouterOutlet) outlet!: RouterOutlet; - - ngOnInit() { - // this is a workaround for a bug. see https://github.com/angular/angular/issues/20694 - const subscription = this.router.events.subscribe(e => { - if (e instanceof ActivationStart && e.snapshot.outlet === 'user') { - this.outlet.deactivate(); - subscription.unsubscribe(); - } - }); - } -} |
