ing
This commit is contained in:
parent
7e49148732
commit
0508d64fca
|
@ -3,8 +3,8 @@ import { Routes, RouterModule } from '@angular/router';
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
{ path: '', loadChildren: './pages/pages.module#PagesModule' },
|
{ path: '', loadChildren: './pages/pages.module#PagesModule' },
|
||||||
{ path: 'auth', loadChildren: './pages/auth/auth.module#AuthModule' },
|
{ path: 'auth', loadChildren: './pages/auth/auth-page.module#AuthPageModule' },
|
||||||
{ path: 'errors', loadChildren: './pages/errors/errors.module#ErrorsModule' },
|
{ path: 'errors', loadChildren: './pages/errors/errors-page.module#ErrorsPageModule' },
|
||||||
{ path: '**', redirectTo: 'errors/404' }
|
{ path: '**', redirectTo: 'errors/404' }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
17
src/app/packages/member/components/modify/modify.module.ts
Normal file
17
src/app/packages/member/components/modify/modify.module.ts
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { ModifyComponent } from './modify.component';
|
||||||
|
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
ModifyComponent,
|
||||||
|
],
|
||||||
|
exports: [
|
||||||
|
ModifyComponent
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class ModifyModule { }
|
|
@ -0,0 +1,17 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { ResetPasswordComponent } from './reset-password.component';
|
||||||
|
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
ResetPasswordComponent,
|
||||||
|
],
|
||||||
|
exports: [
|
||||||
|
ResetPasswordComponent
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class ResetPasswordModule { }
|
17
src/app/packages/member/components/signin/signin.module.ts
Normal file
17
src/app/packages/member/components/signin/signin.module.ts
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { SigninComponent } from './signin.component';
|
||||||
|
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
SigninComponent,
|
||||||
|
],
|
||||||
|
exports: [
|
||||||
|
SigninComponent
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class SigninModule { }
|
17
src/app/packages/member/components/signup/signup.module.ts
Normal file
17
src/app/packages/member/components/signup/signup.module.ts
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { SignupComponent } from './signup.component';
|
||||||
|
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
SignupComponent,
|
||||||
|
],
|
||||||
|
exports: [
|
||||||
|
SignupComponent
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class SignupModule { }
|
|
@ -1,26 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
|
|
||||||
import { SigninComponent } from './components/signin/signin.component';
|
|
||||||
import { SignupComponent } from './components/signup/signup.component';
|
|
||||||
import { ModifyComponent } from './components/modify/modify.component';
|
|
||||||
import { ResetPasswordComponent } from './components/reset-password/reset-password.component';
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule
|
|
||||||
],
|
|
||||||
declarations: [
|
|
||||||
SigninComponent,
|
|
||||||
SignupComponent,
|
|
||||||
ModifyComponent,
|
|
||||||
ResetPasswordComponent,
|
|
||||||
],
|
|
||||||
exports: [
|
|
||||||
SigninComponent,
|
|
||||||
SignupComponent,
|
|
||||||
ModifyComponent,
|
|
||||||
ResetPasswordComponent,
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class MemberModule { }
|
|
22
src/app/pages/auth/auth-page-routing.module.ts
Normal file
22
src/app/pages/auth/auth-page-routing.module.ts
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
import { AuthPageComponent } from './auth-page.component';
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: AuthPageComponent,
|
||||||
|
children: [
|
||||||
|
{ path: '', redirectTo: 'signin' },
|
||||||
|
{ path: 'signin', loadChildren: './signin/signin-page.module#SigninPageModule' },
|
||||||
|
{ path: 'signup', loadChildren: './signup/signup-page.module#SignupPageModule' },
|
||||||
|
{ path: 'reset-password', loadChildren: './reset-password/reset-password-page.module#ResetPasswordPageModule' },
|
||||||
|
]
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forChild(routes)],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
export class AuthPageRoutingModule { }
|
|
@ -1,20 +1,20 @@
|
||||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import { SigninComponent } from './signin.component';
|
import { AuthPageComponent } from './auth-page.component';
|
||||||
|
|
||||||
describe('SigninComponent', () => {
|
describe('AuthPageComponent', () => {
|
||||||
let component: SigninComponent;
|
let component: AuthPageComponent;
|
||||||
let fixture: ComponentFixture<SigninComponent>;
|
let fixture: ComponentFixture<AuthPageComponent>;
|
||||||
|
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
declarations: [ SigninComponent ]
|
declarations: [ AuthPageComponent ]
|
||||||
})
|
})
|
||||||
.compileComponents();
|
.compileComponents();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(SigninComponent);
|
fixture = TestBed.createComponent(AuthPageComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
|
@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'of-pages-auth',
|
selector: 'of-pages-auth',
|
||||||
templateUrl: './auth.component.html',
|
templateUrl: './auth-page.component.html',
|
||||||
styleUrls: ['./auth.component.scss']
|
styleUrls: ['./auth-page.component.scss']
|
||||||
})
|
})
|
||||||
export class AuthComponent implements OnInit {
|
export class AuthPageComponent implements OnInit {
|
||||||
|
|
||||||
constructor() { }
|
constructor() { }
|
||||||
|
|
15
src/app/pages/auth/auth-page.module.ts
Normal file
15
src/app/pages/auth/auth-page.module.ts
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { AuthPageComponent } from './auth-page.component';
|
||||||
|
import { AuthPageRoutingModule } from './auth-page-routing.module';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
AuthPageRoutingModule,
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
AuthPageComponent,
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class AuthPageModule { }
|
|
@ -1,25 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { Routes, RouterModule } from '@angular/router';
|
|
||||||
import { AuthComponent } from './auth.component';
|
|
||||||
import { SigninComponent } from './signin/signin.component';
|
|
||||||
import { SignupComponent } from './signup/signup.component';
|
|
||||||
import { ResetPasswordComponent } from './reset-password/reset-password.component';
|
|
||||||
|
|
||||||
const routes: Routes = [
|
|
||||||
{
|
|
||||||
path: '',
|
|
||||||
component: AuthComponent,
|
|
||||||
children: [
|
|
||||||
{ path: '', redirectTo: 'signin' },
|
|
||||||
{ path: 'signin', component: SigninComponent },
|
|
||||||
{ path: 'signup', component: SignupComponent },
|
|
||||||
{ path: 'reset-password', component: ResetPasswordComponent },
|
|
||||||
]
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [RouterModule.forChild(routes)],
|
|
||||||
exports: [RouterModule]
|
|
||||||
})
|
|
||||||
export class AuthRoutingModule { }
|
|
|
@ -1,24 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { AuthComponent } from './auth.component';
|
|
||||||
import { AuthRoutingModule } from './auth-routing.module';
|
|
||||||
import { SigninComponent } from './signin/signin.component';
|
|
||||||
import { SignupComponent } from './signup/signup.component';
|
|
||||||
import { ResetPasswordComponent } from './reset-password/reset-password.component';
|
|
||||||
import { MemberModule } from 'app/packages/member/member.module';
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
AuthRoutingModule,
|
|
||||||
MemberModule
|
|
||||||
],
|
|
||||||
declarations: [
|
|
||||||
AuthComponent,
|
|
||||||
SigninComponent,
|
|
||||||
SignupComponent,
|
|
||||||
ResetPasswordComponent,
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class AuthModule { }
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
import { ResetPasswordPageComponent } from './reset-password-page.component';
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: ResetPasswordPageComponent,
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forChild(routes)],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
export class ResetPasswordPageRoutingModule { }
|
|
@ -1,20 +1,20 @@
|
||||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import { ResetPasswordComponent } from './reset-password.component';
|
import { ResetPasswordPageComponent } from './reset-password-page.component';
|
||||||
|
|
||||||
describe('ResetPasswordComponent', () => {
|
describe('ResetPasswordPageComponent', () => {
|
||||||
let component: ResetPasswordComponent;
|
let component: ResetPasswordPageComponent;
|
||||||
let fixture: ComponentFixture<ResetPasswordComponent>;
|
let fixture: ComponentFixture<ResetPasswordPageComponent>;
|
||||||
|
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
declarations: [ ResetPasswordComponent ]
|
declarations: [ ResetPasswordPageComponent ]
|
||||||
})
|
})
|
||||||
.compileComponents();
|
.compileComponents();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(ResetPasswordComponent);
|
fixture = TestBed.createComponent(ResetPasswordPageComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
|
@ -0,0 +1,15 @@
|
||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'of-pages-auth-reset-password',
|
||||||
|
templateUrl: './reset-password-page.component.html',
|
||||||
|
styleUrls: ['./reset-password-page.component.scss']
|
||||||
|
})
|
||||||
|
export class ResetPasswordPageComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor() { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,17 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { ResetPasswordPageRoutingModule } from './reset-password-page-routing.module';
|
||||||
|
import { ResetPasswordPageComponent } from './reset-password-page.component';
|
||||||
|
import { ResetPasswordModule } from 'app/packages/member/components/reset-password/reset-password.module';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
ResetPasswordPageRoutingModule,
|
||||||
|
ResetPasswordModule
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
ResetPasswordPageComponent,
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class ResetPasswordPageModule { }
|
|
@ -1,15 +0,0 @@
|
||||||
import { Component, OnInit } from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'of-pages-auth-reset-password',
|
|
||||||
templateUrl: './reset-password.component.html',
|
|
||||||
styleUrls: ['./reset-password.component.scss']
|
|
||||||
})
|
|
||||||
export class ResetPasswordComponent implements OnInit {
|
|
||||||
|
|
||||||
constructor() { }
|
|
||||||
|
|
||||||
ngOnInit() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
16
src/app/pages/auth/signin/signin-page-routing.module.ts
Normal file
16
src/app/pages/auth/signin/signin-page-routing.module.ts
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
import { SigninPageComponent } from './signin-page.component';
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: SigninPageComponent,
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forChild(routes)],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
export class SigninPageRoutingModule { }
|
25
src/app/pages/auth/signin/signin-page.component.spec.ts
Normal file
25
src/app/pages/auth/signin/signin-page.component.spec.ts
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { SigninPageComponent } from './signin-page.component';
|
||||||
|
|
||||||
|
describe('SigninPageComponent', () => {
|
||||||
|
let component: SigninPageComponent;
|
||||||
|
let fixture: ComponentFixture<SigninPageComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ SigninPageComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(SigninPageComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
|
@ -6,10 +6,10 @@ import { ErrorStateMatcher } from '@angular/material/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'of-pages-auth-signin',
|
selector: 'of-pages-auth-signin',
|
||||||
templateUrl: './signin.component.html',
|
templateUrl: './signin-page.component.html',
|
||||||
styleUrls: ['./signin.component.scss'],
|
styleUrls: ['./signin-page.component.scss'],
|
||||||
})
|
})
|
||||||
export class SigninComponent implements OnInit {
|
export class SigninPageComponent implements OnInit {
|
||||||
|
|
||||||
signInForm: FormGroup;
|
signInForm: FormGroup;
|
||||||
returnURL: string;
|
returnURL: string;
|
17
src/app/pages/auth/signin/signin-page.module.ts
Normal file
17
src/app/pages/auth/signin/signin-page.module.ts
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { SigninPageRoutingModule } from './signin-page-routing.module';
|
||||||
|
import { SigninPageComponent } from './signin-page.component';
|
||||||
|
import { SigninModule } from 'app/packages/member/components/signin/signin.module';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
SigninPageRoutingModule,
|
||||||
|
SigninModule
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
SigninPageComponent,
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class SigninPageModule { }
|
16
src/app/pages/auth/signup/signup-page-routing.module.ts
Normal file
16
src/app/pages/auth/signup/signup-page-routing.module.ts
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
import { SignupPageComponent } from './signup-page.component';
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: SignupPageComponent,
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forChild(routes)],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
export class SignupPageRoutingModule { }
|
25
src/app/pages/auth/signup/signup-page.component.spec.ts
Normal file
25
src/app/pages/auth/signup/signup-page.component.spec.ts
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { SignupPageComponent } from './signup-page.component';
|
||||||
|
|
||||||
|
describe('SignupPageComponent', () => {
|
||||||
|
let component: SignupPageComponent;
|
||||||
|
let fixture: ComponentFixture<SignupPageComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ SignupPageComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(SignupPageComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
|
@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'of-pages-auth-signup',
|
selector: 'of-pages-auth-signup',
|
||||||
templateUrl: './signup.component.html',
|
templateUrl: './signup-page.component.html',
|
||||||
styleUrls: ['./signup.component.scss']
|
styleUrls: ['./signup-page.component.scss']
|
||||||
})
|
})
|
||||||
export class SignupComponent implements OnInit {
|
export class SignupPageComponent implements OnInit {
|
||||||
|
|
||||||
constructor() { }
|
constructor() { }
|
||||||
|
|
17
src/app/pages/auth/signup/signup-page.module.ts
Normal file
17
src/app/pages/auth/signup/signup-page.module.ts
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { SignupPageRoutingModule } from './signup-page-routing.module';
|
||||||
|
import { SignupPageComponent } from './signup-page.component';
|
||||||
|
import { SignupModule } from 'app/packages/member/components/signup/signup.module';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
SignupPageRoutingModule,
|
||||||
|
SignupModule
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
SignupPageComponent,
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class SignupPageModule { }
|
|
@ -1,11 +1,11 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { Routes, RouterModule } from '@angular/router';
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
import { HomeComponent } from './home.component';
|
import { E404PageComponent } from './e404-page.component';
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
{
|
{
|
||||||
path: '',
|
path: '',
|
||||||
component: HomeComponent,
|
component: E404PageComponent,
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -13,4 +13,4 @@ const routes: Routes = [
|
||||||
imports: [RouterModule.forChild(routes)],
|
imports: [RouterModule.forChild(routes)],
|
||||||
exports: [RouterModule]
|
exports: [RouterModule]
|
||||||
})
|
})
|
||||||
export class HomeRoutingModule { }
|
export class E404PageRoutingModule { }
|
|
@ -1,20 +1,20 @@
|
||||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import { E404Component } from './e404.component';
|
import { E404PageComponent } from './e404-page.component';
|
||||||
|
|
||||||
describe('E404Component', () => {
|
describe('E404PageComponent', () => {
|
||||||
let component: E404Component;
|
let component: E404PageComponent;
|
||||||
let fixture: ComponentFixture<E404Component>;
|
let fixture: ComponentFixture<E404PageComponent>;
|
||||||
|
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
declarations: [ E404Component ]
|
declarations: [ E404PageComponent ]
|
||||||
})
|
})
|
||||||
.compileComponents();
|
.compileComponents();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(E404Component);
|
fixture = TestBed.createComponent(E404PageComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
|
@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'of-pages-errors-e404',
|
selector: 'of-pages-errors-e404',
|
||||||
templateUrl: './e404.component.html',
|
templateUrl: './e404-page.component.html',
|
||||||
styleUrls: ['./e404.component.scss']
|
styleUrls: ['./e404-page.component.scss']
|
||||||
})
|
})
|
||||||
export class E404Component implements OnInit {
|
export class E404PageComponent implements OnInit {
|
||||||
|
|
||||||
constructor() { }
|
constructor() { }
|
||||||
|
|
14
src/app/pages/errors/e404/e404-page.module.ts
Normal file
14
src/app/pages/errors/e404/e404-page.module.ts
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
|
||||||
|
import { E404PageComponent } from './e404-page.component';
|
||||||
|
import { E404PageRoutingModule } from './e404-page-routing.module';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
E404PageRoutingModule
|
||||||
|
],
|
||||||
|
declarations: [E404PageComponent]
|
||||||
|
})
|
||||||
|
export class E404PageModule { }
|
16
src/app/pages/errors/e500/e500-page-routing.module.ts
Normal file
16
src/app/pages/errors/e500/e500-page-routing.module.ts
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
import { E500PageComponent } from './e500-page.component';
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: E500PageComponent,
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forChild(routes)],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
export class E500PageRoutingModule { }
|
|
@ -1,20 +1,20 @@
|
||||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import { AuthComponent } from './auth.component';
|
import { E500PageComponent } from './e500-page.component';
|
||||||
|
|
||||||
describe('AuthComponent', () => {
|
describe('E500PageComponent', () => {
|
||||||
let component: AuthComponent;
|
let component: E500PageComponent;
|
||||||
let fixture: ComponentFixture<AuthComponent>;
|
let fixture: ComponentFixture<E500PageComponent>;
|
||||||
|
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
declarations: [ AuthComponent ]
|
declarations: [ E500PageComponent ]
|
||||||
})
|
})
|
||||||
.compileComponents();
|
.compileComponents();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(AuthComponent);
|
fixture = TestBed.createComponent(E500PageComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
|
@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'of-pages-errors-e500',
|
selector: 'of-pages-errors-e500',
|
||||||
templateUrl: './e500.component.html',
|
templateUrl: './e500-page.component.html',
|
||||||
styleUrls: ['./e500.component.scss']
|
styleUrls: ['./e500-page.component.scss']
|
||||||
})
|
})
|
||||||
export class E500Component implements OnInit {
|
export class E500PageComponent implements OnInit {
|
||||||
|
|
||||||
constructor() { }
|
constructor() { }
|
||||||
|
|
14
src/app/pages/errors/e500/e500-page.module.ts
Normal file
14
src/app/pages/errors/e500/e500-page.module.ts
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
|
||||||
|
import { E500PageComponent } from './e500-page.component';
|
||||||
|
import { E500PageRoutingModule } from './e500-page-routing.module';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
E500PageRoutingModule
|
||||||
|
],
|
||||||
|
declarations: [E500PageComponent]
|
||||||
|
})
|
||||||
|
export class E500PageModule { }
|
|
@ -1,25 +0,0 @@
|
||||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
|
||||||
|
|
||||||
import { E500Component } from './e500.component';
|
|
||||||
|
|
||||||
describe('E500Component', () => {
|
|
||||||
let component: E500Component;
|
|
||||||
let fixture: ComponentFixture<E500Component>;
|
|
||||||
|
|
||||||
beforeEach(async(() => {
|
|
||||||
TestBed.configureTestingModule({
|
|
||||||
declarations: [ E500Component ]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
}));
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
fixture = TestBed.createComponent(E500Component);
|
|
||||||
component = fixture.componentInstance;
|
|
||||||
fixture.detectChanges();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create', () => {
|
|
||||||
expect(component).toBeTruthy();
|
|
||||||
});
|
|
||||||
});
|
|
20
src/app/pages/errors/errors-page-routing.module.ts
Normal file
20
src/app/pages/errors/errors-page-routing.module.ts
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
import { ErrorsPageComponent } from './errors-page.component';
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: ErrorsPageComponent,
|
||||||
|
children: [
|
||||||
|
{ path: '404', loadChildren: './e404/e404-page.module#E404PageModule' },
|
||||||
|
{ path: '500', loadChildren: './e500/e500-page.module#E500PageModule' },
|
||||||
|
]
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forChild(routes)],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
export class ErrorsPageRoutingModule { }
|
25
src/app/pages/errors/errors-page.component.spec.ts
Normal file
25
src/app/pages/errors/errors-page.component.spec.ts
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ErrorsPageComponent } from './errors-page.component';
|
||||||
|
|
||||||
|
describe('ErrorsPageComponent', () => {
|
||||||
|
let component: ErrorsPageComponent;
|
||||||
|
let fixture: ComponentFixture<ErrorsPageComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ ErrorsPageComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(ErrorsPageComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
15
src/app/pages/errors/errors-page.component.ts
Normal file
15
src/app/pages/errors/errors-page.component.ts
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'of-pages-errors',
|
||||||
|
templateUrl: './errors-page.component.html',
|
||||||
|
styleUrls: ['./errors-page.component.scss']
|
||||||
|
})
|
||||||
|
export class ErrorsPageComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor() { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
14
src/app/pages/errors/errors-page.module.ts
Normal file
14
src/app/pages/errors/errors-page.module.ts
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
|
||||||
|
import { ErrorsPageComponent } from './errors-page.component';
|
||||||
|
import { ErrorsPageRoutingModule } from './errors-page-routing.module';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
ErrorsPageRoutingModule
|
||||||
|
],
|
||||||
|
declarations: [ErrorsPageComponent]
|
||||||
|
})
|
||||||
|
export class ErrorsPageModule { }
|
|
@ -1,22 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { Routes, RouterModule } from '@angular/router';
|
|
||||||
import { ErrorsComponent } from './errors.component';
|
|
||||||
import { E404Component } from './e404/e404.component';
|
|
||||||
import { E500Component } from './e500/e500.component';
|
|
||||||
|
|
||||||
const routes: Routes = [
|
|
||||||
{
|
|
||||||
path: '',
|
|
||||||
component: ErrorsComponent,
|
|
||||||
children: [
|
|
||||||
{ path: '404', component: E404Component },
|
|
||||||
{ path: '500', component: E500Component },
|
|
||||||
]
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [RouterModule.forChild(routes)],
|
|
||||||
exports: [RouterModule]
|
|
||||||
})
|
|
||||||
export class ErrorsRoutingModule { }
|
|
|
@ -1,25 +0,0 @@
|
||||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
|
||||||
|
|
||||||
import { ErrorsComponent } from './errors.component';
|
|
||||||
|
|
||||||
describe('ErrorsComponent', () => {
|
|
||||||
let component: ErrorsComponent;
|
|
||||||
let fixture: ComponentFixture<ErrorsComponent>;
|
|
||||||
|
|
||||||
beforeEach(async(() => {
|
|
||||||
TestBed.configureTestingModule({
|
|
||||||
declarations: [ ErrorsComponent ]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
}));
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
fixture = TestBed.createComponent(ErrorsComponent);
|
|
||||||
component = fixture.componentInstance;
|
|
||||||
fixture.detectChanges();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create', () => {
|
|
||||||
expect(component).toBeTruthy();
|
|
||||||
});
|
|
||||||
});
|
|
|
@ -1,15 +0,0 @@
|
||||||
import { Component, OnInit } from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'of-pages-errors',
|
|
||||||
templateUrl: './errors.component.html',
|
|
||||||
styleUrls: ['./errors.component.scss']
|
|
||||||
})
|
|
||||||
export class ErrorsComponent implements OnInit {
|
|
||||||
|
|
||||||
constructor() { }
|
|
||||||
|
|
||||||
ngOnInit() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,16 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
|
|
||||||
import { ErrorsComponent } from './errors.component';
|
|
||||||
import { ErrorsRoutingModule } from './errors-routing.module';
|
|
||||||
import { E500Component } from './e500/e500.component';
|
|
||||||
import { E404Component } from './e404/e404.component';
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
ErrorsRoutingModule
|
|
||||||
],
|
|
||||||
declarations: [ErrorsComponent, E500Component, E404Component]
|
|
||||||
})
|
|
||||||
export class ErrorsModule { }
|
|
16
src/app/pages/home/home-page-routing.module.ts
Normal file
16
src/app/pages/home/home-page-routing.module.ts
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
import { HomePageComponent } from './home-page.component';
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: HomePageComponent,
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forChild(routes)],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
export class HomePageRoutingModule { }
|
|
@ -1,20 +1,20 @@
|
||||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import { SignupComponent } from './signup.component';
|
import { HomePageComponent } from './home-page.component';
|
||||||
|
|
||||||
describe('SignupComponent', () => {
|
describe('HomePageComponent', () => {
|
||||||
let component: SignupComponent;
|
let component: HomePageComponent;
|
||||||
let fixture: ComponentFixture<SignupComponent>;
|
let fixture: ComponentFixture<HomePageComponent>;
|
||||||
|
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
declarations: [ SignupComponent ]
|
declarations: [ HomePageComponent ]
|
||||||
})
|
})
|
||||||
.compileComponents();
|
.compileComponents();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(SignupComponent);
|
fixture = TestBed.createComponent(HomePageComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
|
@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'of-pages-home',
|
selector: 'of-pages-home',
|
||||||
templateUrl: './home.component.html',
|
templateUrl: './home-page.component.html',
|
||||||
styleUrls: ['./home.component.scss']
|
styleUrls: ['./home-page.component.scss']
|
||||||
})
|
})
|
||||||
export class HomeComponent implements OnInit {
|
export class HomePageComponent implements OnInit {
|
||||||
|
|
||||||
constructor() { }
|
constructor() { }
|
||||||
|
|
13
src/app/pages/home/home-page.module.ts
Normal file
13
src/app/pages/home/home-page.module.ts
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { HomePageComponent } from './home-page.component';
|
||||||
|
import { HomePageRoutingModule } from './home-page-routing.module';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
HomePageRoutingModule,
|
||||||
|
],
|
||||||
|
declarations: [HomePageComponent]
|
||||||
|
})
|
||||||
|
export class HomePageModule { }
|
|
@ -1,25 +0,0 @@
|
||||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
|
||||||
|
|
||||||
import { HomeComponent } from './home.component';
|
|
||||||
|
|
||||||
describe('HomeComponent', () => {
|
|
||||||
let component: HomeComponent;
|
|
||||||
let fixture: ComponentFixture<HomeComponent>;
|
|
||||||
|
|
||||||
beforeEach(async(() => {
|
|
||||||
TestBed.configureTestingModule({
|
|
||||||
declarations: [ HomeComponent ]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
}));
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
fixture = TestBed.createComponent(HomeComponent);
|
|
||||||
component = fixture.componentInstance;
|
|
||||||
fixture.detectChanges();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create', () => {
|
|
||||||
expect(component).toBeTruthy();
|
|
||||||
});
|
|
||||||
});
|
|
|
@ -1,13 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { HomeComponent } from './home.component';
|
|
||||||
import { HomeRoutingModule } from './home-routing.module';
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
HomeRoutingModule,
|
|
||||||
],
|
|
||||||
declarations: [HomeComponent]
|
|
||||||
})
|
|
||||||
export class HomeModule { }
|
|
|
@ -8,7 +8,7 @@ const routes: Routes = [
|
||||||
component: PagesComponent,
|
component: PagesComponent,
|
||||||
children: [
|
children: [
|
||||||
{ path: '', redirectTo: 'home' },
|
{ path: '', redirectTo: 'home' },
|
||||||
{ path: 'home', loadChildren: './home/home.module#HomeModule' },
|
{ path: 'home', loadChildren: './home/home-page.module#HomePageModule' },
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in New Issue
Block a user