Skip to content

Codecrew / Moya

Go to a project
Commit 8fb70c94 by Aino Leppänen
Options

Ng cli conflict fix

1 parent def08d69
Inline Side-by-side
Showing with 43 additions and 34 deletions
code/moya-angular/src/app/app-routing.module.ts
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { Routes } from '@angular/router';
import { InfoComponent } from './pages/info/info.component';
/* const appRoutes: Routes = [
{
path: 'user',
children: [
{path: '', component: UserMenuComponent, outlet: 'left-menu'},
{path: '', pathMatch: 'full', component: UserComponent},
{path: 'old', component: OldMoyaComponent},
]
},
{
path: 'info',
children: [
{path: '', component: InfoMenuComponent, outlet: 'left-menu'},
{path: '', pathMatch: 'full', component: OldMoyaComponent},
{path: 'old', component: OldMoyaComponent},
{path: 'viplist', component: ViplistComponent},
]
},
{
path: 'admin',
children: [
{path: '', component: AdminMenuComponent, outlet: 'left-menu'},
{path: '', pathMatch: 'full', component: AdminComponent},
{path: 'old', component: OldMoyaComponent},
]
},
{path: 'old', pathMatch: 'prefix', component: OldMoyaComponent},
]; */
const appRoutes: Routes = [
{ path: '', pathMatch: 'full', redirectTo: 'login' },
{ path: 'info', loadChildren: 'app/pages/info/info.module#InfoModule' },
{ path: 'admin', loadChildren: 'app/pages/info/info.module#InfoModule' },
{ path: 'user', loadChildren: 'app/pages/info/info.module#InfoModule' },
{ path: 'login', loadChildren: 'app/pages/info/info.module#InfoModule' },
];
@NgModule({ @NgModule({
imports: [ imports: [
......
code/moya-angular/src/app/app.module.ts
...@@ -25,41 +25,12 @@ import {CommonModule} from "@angular/common"; ...@@ -25,41 +25,12 @@ import {CommonModule} from "@angular/common";
import {CacheService} from "./shared/services/cache.service"; import {CacheService} from "./shared/services/cache.service";
import {MoyaRestModule} from "./moya-rest"; import {MoyaRestModule} from "./moya-rest";
import {SafePipe} from "./shared/pipes/safe.pipe"; import {SafePipe} from "./shared/pipes/safe.pipe";
import { AppRoutingModule } from './app-routing.module';
const appRoutes: Routes = [
{
path: 'user',
children: [
{path: '', component: UserMenuComponent, outlet: 'left-menu'},
{path: '', pathMatch: 'full', component: UserComponent},
{path: 'old', component: OldMoyaComponent},
]
},
{
path: 'info',
children: [
{path: '', component: InfoMenuComponent, outlet: 'left-menu'},
{path: '', pathMatch: 'full', component: OldMoyaComponent},
{path: 'old', component: OldMoyaComponent},
{path: 'viplist', component: ViplistComponent},
]
},
{
path: 'admin',
children: [
{path: '', component: AdminMenuComponent, outlet: 'left-menu'},
{path: '', pathMatch: 'full', component: AdminComponent},
{path: 'old', component: OldMoyaComponent},
]
},
{path: 'old', pathMatch: 'prefix', component: OldMoyaComponent},
];
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
RouterModule,
ViplistComponent, ViplistComponent,
OldMoyaComponent, OldMoyaComponent,
TestComponent, TestComponent,
...@@ -75,14 +46,13 @@ const appRoutes: Routes = [ ...@@ -75,14 +46,13 @@ const appRoutes: Routes = [
], ],
imports: [ imports: [
AppRoutingModule,
CommonModule, CommonModule,
BrowserModule, BrowserModule,
FormsModule, FormsModule,
HttpClientModule, HttpClientModule,
AlertModule.forRoot(), AlertModule.forRoot(),
MoyaRestModule, MoyaRestModule
//MoyaRestModule.forRoot(),
RouterModule.forRoot(appRoutes)
], ],
providers: [CacheService], providers: [CacheService],
bootstrap: [AppComponent] bootstrap: [AppComponent]
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!