Commit 2da0f8038f2584b57b53eb9454c71b01ab053821
1 parent
c75bf148
Exists in
master
and in
35 other branches
Clean main component
Showing
3 changed files
with
30 additions
and
30 deletions
Show diff stats
src/app/index.ts
| ... | ... | @@ -4,7 +4,7 @@ import {noosferoModuleConfig} from "./index.config"; |
| 4 | 4 | import {noosferoAngularRunBlock} from "./index.run"; |
| 5 | 5 | import {routeConfig} from "./index.route"; |
| 6 | 6 | import {ContentViewerController} from "./content-viewer/content-viewer.controller"; |
| 7 | -import {Main} from "./main/main.controller"; | |
| 7 | +import {Main} from "./main/main.component"; | |
| 8 | 8 | import {bootstrap, bundle} from 'ng-forward'; |
| 9 | 9 | |
| 10 | 10 | declare var moment: any; | ... | ... |
| ... | ... | @@ -0,0 +1,29 @@ |
| 1 | +import {bundle, Component, StateConfig} from 'ng-forward'; | |
| 2 | + | |
| 3 | +@Component({ | |
| 4 | + selector: 'main-content', | |
| 5 | + templateUrl: "app/main/main.html", | |
| 6 | +}) | |
| 7 | +export class MainContent { | |
| 8 | + | |
| 9 | +} | |
| 10 | + | |
| 11 | +@Component({ | |
| 12 | + selector: 'main', | |
| 13 | + template: '<div ng-view></div>' | |
| 14 | +}) | |
| 15 | +@StateConfig([ | |
| 16 | + { | |
| 17 | + url: '/', | |
| 18 | + component: MainContent, | |
| 19 | + name: 'main', | |
| 20 | + resolve: { | |
| 21 | + currentUser: function(AuthService) { | |
| 22 | + return AuthService.loginFromCookie(); | |
| 23 | + } | |
| 24 | + } | |
| 25 | + } | |
| 26 | +]) | |
| 27 | +export class Main { | |
| 28 | + | |
| 29 | +} | ... | ... |
src/app/main/main.controller.ts
| ... | ... | @@ -1,29 +0,0 @@ |
| 1 | -import {bundle, Component, StateConfig} from 'ng-forward'; | |
| 2 | - | |
| 3 | -@Component({ | |
| 4 | - selector: 'main-content', | |
| 5 | - templateUrl: "app/main/main.html", | |
| 6 | -}) | |
| 7 | -export class MainContent { | |
| 8 | - | |
| 9 | -} | |
| 10 | - | |
| 11 | -@Component({ | |
| 12 | - selector: 'main', | |
| 13 | - template: `aaaa <ui-view></ui-view>` | |
| 14 | -}) | |
| 15 | -@StateConfig([ | |
| 16 | - { | |
| 17 | - url: '/', | |
| 18 | - component: MainContent, | |
| 19 | - name: 'main', | |
| 20 | - resolve: { | |
| 21 | - currentUser: function(AuthService) { | |
| 22 | - return AuthService.loginFromCookie(); | |
| 23 | - } | |
| 24 | - } | |
| 25 | - } | |
| 26 | -]) | |
| 27 | -export class Main { | |
| 28 | - | |
| 29 | -} |