Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Codecrew
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
30
Merge Requests
2
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit be8b1fee
authored
Apr 01, 2018
by
Aino Leppänen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Old moya module to info
1 parent
86220215
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
36 deletions
code/moya-angular/src/app/app-routing.module.ts
code/moya-angular/src/app/pages/admin/admin-routing.module.ts
code/moya-angular/src/app/pages/info/info-routing.module.ts
code/moya-angular/src/app/pages/info/info.module.ts
code/moya-angular/src/app/app-routing.module.ts
View file @
be8b1fe
...
@@ -4,28 +4,6 @@ import { Routes, RouterModule } from '@angular/router';
...
@@ -4,28 +4,6 @@ import { Routes, RouterModule } from '@angular/router';
import
{
LoginComponent
}
from
'./pages/login/login.component'
;
import
{
LoginComponent
}
from
'./pages/login/login.component'
;
import
{
InfoComponent
}
from
'./pages/info/info.component'
;
import
{
InfoComponent
}
from
'./pages/info/info.component'
;
/* const appRoutes: Routes = [
{
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
APP_ROUTES
:
Routes
=
[
const
APP_ROUTES
:
Routes
=
[
{
path
:
'info'
,
loadChildren
:
'app/pages/info/info.module#InfoModule'
},
{
path
:
'info'
,
loadChildren
:
'app/pages/info/info.module#InfoModule'
},
{
path
:
'admin'
,
loadChildren
:
'app/pages/admin/admin.module#AdminModule'
},
{
path
:
'admin'
,
loadChildren
:
'app/pages/admin/admin.module#AdminModule'
},
...
@@ -38,17 +16,11 @@ const APP_ROUTES: Routes = [
...
@@ -38,17 +16,11 @@ const APP_ROUTES: Routes = [
@
NgModule
({
@
NgModule
({
imports
:
[
imports
:
[
RouterModule
.
forRoot
(
RouterModule
.
forRoot
(
APP_ROUTES
,
APP_ROUTES
/* {
enableTracing: true, // <-- debugging purposes only
} */
)
)
],
],
exports
:
[
exports
:
[
RouterModule
RouterModule
],
providers
:
[
]
]
})
})
export
class
AppRoutingModule
{
}
export
class
AppRoutingModule
{
}
code/moya-angular/src/app/pages/admin/admin-routing.module.ts
View file @
be8b1fe
...
@@ -15,8 +15,3 @@ const routes: Routes = [
...
@@ -15,8 +15,3 @@ const routes: Routes = [
exports
:
[
RouterModule
]
exports
:
[
RouterModule
]
})
})
export
class
AdminRoutingModule
{
}
export
class
AdminRoutingModule
{
}
/* {path: '', component: AdminMenuComponent, outlet: 'left-menu'},
{path: '', pathMatch: 'full', component: AdminComponent},
{path: 'old', component: OldMoyaComponent}, */
code/moya-angular/src/app/pages/info/info-routing.module.ts
View file @
be8b1fe
...
@@ -7,8 +7,8 @@ import { InfoComponent } from './info.component';
...
@@ -7,8 +7,8 @@ import { InfoComponent } from './info.component';
const
routes
:
Routes
=
[
const
routes
:
Routes
=
[
{
path
:
''
,
component
:
InfoMenuComponent
,
outlet
:
'left-menu'
},
{
path
:
''
,
component
:
InfoMenuComponent
,
outlet
:
'left-menu'
},
/*
{ path: '', pathMatch: 'full', component: OldMoyaComponent },
{
path
:
''
,
pathMatch
:
'full'
,
component
:
OldMoyaComponent
},
{ path: 'old', component: OldMoyaComponent },
*/
{
path
:
'old'
,
component
:
OldMoyaComponent
},
{
path
:
'viplist'
,
component
:
ViplistComponent
}
{
path
:
'viplist'
,
component
:
ViplistComponent
}
];
];
...
...
code/moya-angular/src/app/pages/info/info.module.ts
View file @
be8b1fe
import
{
OldMoyaModule
}
from
'./../old-moya/old-moya.module'
;
import
{
ViplistComponent
}
from
'./../../viplist/viplist.component'
;
import
{
ViplistComponent
}
from
'./../../viplist/viplist.component'
;
import
{
NgModule
}
from
'@angular/core'
;
import
{
NgModule
}
from
'@angular/core'
;
import
{
CommonModule
}
from
'@angular/common'
;
import
{
CommonModule
}
from
'@angular/common'
;
...
@@ -11,6 +12,7 @@ import { LeftMenuModule } from '../../menu/left-menu/left-menu.module';
...
@@ -11,6 +12,7 @@ import { LeftMenuModule } from '../../menu/left-menu/left-menu.module';
CommonModule
,
CommonModule
,
InfoRoutingModule
,
InfoRoutingModule
,
LeftMenuModule
,
LeftMenuModule
,
OldMoyaModule
],
],
declarations
:
[
InfoComponent
,
InfoMenuComponent
,
ViplistComponent
]
declarations
:
[
InfoComponent
,
InfoMenuComponent
,
ViplistComponent
]
})
})
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment