diff --git a/src/app/index.ts b/src/app/index.ts index e1f680f..1ac4033 100644 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -59,4 +59,4 @@ require("./profile/profile.controller.js"); // NoosferoApp.addController("ContentViewerController", ContentViewerController); -// NoosferoApp.addConfig(routeConfig); +NoosferoApp.addConfig(routeConfig); diff --git a/src/app/main/main.controller.ts b/src/app/main/main.controller.ts index f5d0261..cce5e2f 100644 --- a/src/app/main/main.controller.ts +++ b/src/app/main/main.controller.ts @@ -1,10 +1,10 @@ import {bundle, Component, StateConfig} from 'ng-forward'; @Component({ - selector: 'main2', - template: `test main2` + selector: 'main-content', + templateUrl: "app/main/main.html", }) -export class Main2 { +export class MainContent { } @@ -15,14 +15,13 @@ export class Main2 { @StateConfig([ { url: '/', - component: Main2, - // templateUrl: "app/main/main.html", + component: MainContent, name: 'main', - // resolve: { - // currentUser: function(AuthService) { - // return AuthService.loginFromCookie(); - // } - // } + resolve: { + currentUser: function(AuthService) { + return AuthService.loginFromCookie(); + } + } } ]) export class Main { -- libgit2 0.21.2