diff --git a/src/app/components/noosfero-articles/article/article.directive.ts b/src/app/components/noosfero-articles/article/article.directive.ts index 67fed95..4c8f498 100644 --- a/src/app/components/noosfero-articles/article/article.directive.ts +++ b/src/app/components/noosfero-articles/article/article.directive.ts @@ -1,4 +1,4 @@ -import { Input, Inject, Component, Directive } from 'ng-forward'; +import { bundle, Input, Inject, Component, Directive } from 'ng-forward'; @Component({ selector: 'noosfero-default-article', @@ -40,6 +40,6 @@ export class ArticleDirective { //TODO } } - - } + +bundle('noosferoApp', ArticleDirective).publish(); diff --git a/src/app/index.route.ts b/src/app/index.route.ts index cdfc37d..a4db2e7 100644 --- a/src/app/index.route.ts +++ b/src/app/index.route.ts @@ -3,7 +3,7 @@ /** @ngInject */ export function routeConfig($stateProvider, $urlRouterProvider) { $stateProvider - .state("main", { + /*.state("main", { url: "/", templateUrl: "app/main/main.html", controller: "MainController", @@ -13,7 +13,7 @@ export function routeConfig($stateProvider, $urlRouterProvider) { return AuthService.loginFromCookie(); } } - }) + })*/ .state("main.profile.cms", { url: "^/myprofile/:profile/cms", views: { diff --git a/src/app/index.ts b/src/app/index.ts index 2738e59..c090dd1 100644 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -1,50 +1,54 @@ +import 'reflect-metadata'; import {NoosferoApp} from "./index.module"; import {noosferoModuleConfig} from "./index.config"; import {noosferoAngularRunBlock} from "./index.run"; import {routeConfig} from "./index.route"; import {ContentViewerController} from "./content-viewer/content-viewer.controller"; +import {Main} from "./main/main.controller"; +import {bootstrap} from 'ng-forward'; declare var moment: any; -NoosferoApp.init(); - -NoosferoApp.addConstants("moment", moment); -NoosferoApp.addConstants("AUTH_EVENTS", { - loginSuccess: "auth-login-success", - loginFailed: "auth-login-failed", - logoutSuccess: "auth-logout-success" -}); - - -NoosferoApp.addConfig(noosferoModuleConfig); - -NoosferoApp.run(noosferoAngularRunBlock); - -require("./main/main.controller.js"); -require("./cms/cms.controller.js"); -require("./components/auth/auth.controller.js"); -require("./components/auth/auth.service.js"); -require("./components/navbar/navbar.directive.js"); -require("./components/noosfero-activities/activities.component.js"); -require("./components/noosfero-activities/activity/activity.component.js"); -//require("./components/noosfero-articles/article/article.directive.js"); -require("./components/noosfero-articles/blog/blog.component.js"); -require("./components/noosfero-blocks/block.directive.js"); -require("./components/noosfero-blocks/link-list/link-list.component.js"); -require("./components/noosfero-blocks/main-block/main-block.component.js"); -require("./components/noosfero-blocks/members-block/members-block.component.js"); -require("./components/noosfero-blocks/profile-image/profile-image.component.js"); -require("./components/noosfero-blocks/recent-documents/recent-documents.component.js"); -require("./components/noosfero-boxes/boxes.component.js"); -require("./components/noosfero/noosfero-template.filter.js"); -require("./components/noosfero/noosfero.service.js"); -require("./components/noosfero/profile-image/profile-image.component.js"); -require("./content-viewer/content-viewer-actions.controller.js"); -// require("./content-viewer/content-viewer.controller.js"); -require("./profile-info/profile-info.controller.js"); -require("./profile/profile-home.controller.js"); -require("./profile/profile.controller.js"); - -NoosferoApp.addController("ContentViewerController", ContentViewerController); - -NoosferoApp.addConfig(routeConfig); +// NoosferoApp.init(); +// +// NoosferoApp.addConstants("moment", moment); +// NoosferoApp.addConstants("AUTH_EVENTS", { +// loginSuccess: "auth-login-success", +// loginFailed: "auth-login-failed", +// logoutSuccess: "auth-logout-success" +// }); +// +// +// NoosferoApp.addConfig(noosferoModuleConfig); +// +// NoosferoApp.run(noosferoAngularRunBlock); + +// // require("./main/main.controller.js"); +// require("./cms/cms.controller.js"); +// require("./components/auth/auth.controller.js"); +// require("./components/auth/auth.service.js"); +// require("./components/navbar/navbar.directive.js"); +// require("./components/noosfero-activities/activities.component.js"); +// require("./components/noosfero-activities/activity/activity.component.js"); +// require("./components/noosfero-articles/blog/blog.component.js"); +// require("./components/noosfero-blocks/block.directive.js"); +// require("./components/noosfero-blocks/link-list/link-list.component.js"); +// require("./components/noosfero-blocks/main-block/main-block.component.js"); +// require("./components/noosfero-blocks/members-block/members-block.component.js"); +// require("./components/noosfero-blocks/profile-image/profile-image.component.js"); +// require("./components/noosfero-blocks/recent-documents/recent-documents.component.js"); +// require("./components/noosfero-boxes/boxes.component.js"); +// require("./components/noosfero/noosfero-template.filter.js"); +// require("./components/noosfero/noosfero.service.js"); +// require("./components/noosfero/profile-image/profile-image.component.js"); +// require("./content-viewer/content-viewer-actions.controller.js"); +// // require("./content-viewer/content-viewer.controller.js"); +// require("./profile-info/profile-info.controller.js"); +// require("./profile/profile-home.controller.js"); +// require("./profile/profile.controller.js"); + +// NoosferoApp.addController("ContentViewerController", ContentViewerController); + +// NoosferoApp.addConfig(routeConfig); + +bootstrap(Main, ['ui.router']); diff --git a/src/app/main/main.controller.js b/src/app/main/main.controller.js deleted file mode 100644 index 082027b..0000000 --- a/src/app/main/main.controller.js +++ /dev/null @@ -1,13 +0,0 @@ -(function() { - 'use strict'; - - angular - .module('noosferoApp') - .controller('MainController', MainController); - - - /** @ngInject */ - function MainController() { - - } -})(); diff --git a/src/app/main/main.controller.ts b/src/app/main/main.controller.ts new file mode 100644 index 0000000..7ad0574 --- /dev/null +++ b/src/app/main/main.controller.ts @@ -0,0 +1,30 @@ +import {Component, StateConfig} from 'ng-forward'; + +@Component({ + selector: 'main', + template: `aaaa
` +}) +@StateConfig([ + { + url: '/', + component: Main2, + // templateUrl: "app/main/main.html", + name: 'main2', + // resolve: { + // currentUser: function(AuthService) { + // return AuthService.loginFromCookie(); + // } + // } + } +]) +export class Main { + +} + +@Component({ + selector: 'Main2', + template: `test main2` +}) +export class Main2 { + +} diff --git a/src/app/main/main.html b/src/app/main/main.html index 6a7ff04..03fc215 100644 --- a/src/app/main/main.html +++ b/src/app/main/main.html @@ -1,2 +1,3 @@You are using an outdated browser. Please upgrade your browser to improve your experience.
- + -- libgit2 0.21.2