Download as
Browse Code »

Commit d3a3844adb884db5b057957d0743dd387a5cb3cb

Authored by Victor Costa
1 parent e7877dd6
Exists in master and in 1 other branch dev-fixes

Migrating main controller

Showing 7 changed files with 84 additions and 62 deletions   Show diff stats
src/app/components/noosfero-articles/article/article.directive.ts
  Diff comments   View file @d3a3844
1 -import { Input, Inject, Component, Directive } from 'ng-forward'; 1 +import { bundle, Input, Inject, Component, Directive } from 'ng-forward';
2 2
3 @Component({ 3 @Component({
4 selector: 'noosfero-default-article', 4 selector: 'noosfero-default-article',
@@ -40,6 +40,6 @@ export class ArticleDirective { @@ -40,6 +40,6 @@ export class ArticleDirective {
40 //TODO 40 //TODO
41 } 41 }
42 } 42 }
43 -  
44 -  
45 } 43 }
  44 +
  45 +bundle('noosferoApp', ArticleDirective).publish();
src/app/index.route.ts
  Diff comments   View file @d3a3844
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 /** @ngInject */ 3 /** @ngInject */
4 export function routeConfig($stateProvider, $urlRouterProvider) { 4 export function routeConfig($stateProvider, $urlRouterProvider) {
5 $stateProvider 5 $stateProvider
6 - .state("main", { 6 + /*.state("main", {
7 url: "/", 7 url: "/",
8 templateUrl: "app/main/main.html", 8 templateUrl: "app/main/main.html",
9 controller: "MainController", 9 controller: "MainController",
@@ -13,7 +13,7 @@ export function routeConfig($stateProvider, $urlRouterProvider) { @@ -13,7 +13,7 @@ export function routeConfig($stateProvider, $urlRouterProvider) {
13 return AuthService.loginFromCookie(); 13 return AuthService.loginFromCookie();
14 } 14 }
15 } 15 }
16 - }) 16 + })*/
17 .state("main.profile.cms", { 17 .state("main.profile.cms", {
18 url: "^/myprofile/:profile/cms", 18 url: "^/myprofile/:profile/cms",
19 views: { 19 views: {
src/app/index.ts
  Diff comments   View file @d3a3844
  1 +import 'reflect-metadata';
1 import {NoosferoApp} from "./index.module"; 2 import {NoosferoApp} from "./index.module";
2 import {noosferoModuleConfig} from "./index.config"; 3 import {noosferoModuleConfig} from "./index.config";
3 import {noosferoAngularRunBlock} from "./index.run"; 4 import {noosferoAngularRunBlock} from "./index.run";
4 import {routeConfig} from "./index.route"; 5 import {routeConfig} from "./index.route";
5 import {ContentViewerController} from "./content-viewer/content-viewer.controller"; 6 import {ContentViewerController} from "./content-viewer/content-viewer.controller";
  7 +import {Main} from "./main/main.controller";
  8 +import {bootstrap} from 'ng-forward';
6 9
7 declare var moment: any; 10 declare var moment: any;
8 11
9 -NoosferoApp.init();  
10 -  
11 -NoosferoApp.addConstants("moment", moment);  
12 -NoosferoApp.addConstants("AUTH_EVENTS", {  
13 - loginSuccess: "auth-login-success",  
14 - loginFailed: "auth-login-failed",  
15 - logoutSuccess: "auth-logout-success"  
16 -});  
17 -  
18 -  
19 -NoosferoApp.addConfig(noosferoModuleConfig);  
20 -  
21 -NoosferoApp.run(noosferoAngularRunBlock);  
22 -  
23 -require("./main/main.controller.js");  
24 -require("./cms/cms.controller.js");  
25 -require("./components/auth/auth.controller.js");  
26 -require("./components/auth/auth.service.js");  
27 -require("./components/navbar/navbar.directive.js");  
28 -require("./components/noosfero-activities/activities.component.js");  
29 -require("./components/noosfero-activities/activity/activity.component.js");  
30 -//require("./components/noosfero-articles/article/article.directive.js");  
31 -require("./components/noosfero-articles/blog/blog.component.js");  
32 -require("./components/noosfero-blocks/block.directive.js");  
33 -require("./components/noosfero-blocks/link-list/link-list.component.js");  
34 -require("./components/noosfero-blocks/main-block/main-block.component.js");  
35 -require("./components/noosfero-blocks/members-block/members-block.component.js");  
36 -require("./components/noosfero-blocks/profile-image/profile-image.component.js");  
37 -require("./components/noosfero-blocks/recent-documents/recent-documents.component.js");  
38 -require("./components/noosfero-boxes/boxes.component.js");  
39 -require("./components/noosfero/noosfero-template.filter.js");  
40 -require("./components/noosfero/noosfero.service.js");  
41 -require("./components/noosfero/profile-image/profile-image.component.js");  
42 -require("./content-viewer/content-viewer-actions.controller.js");  
43 -// require("./content-viewer/content-viewer.controller.js");  
44 -require("./profile-info/profile-info.controller.js");  
45 -require("./profile/profile-home.controller.js");  
46 -require("./profile/profile.controller.js");  
47 -  
48 -NoosferoApp.addController("ContentViewerController", ContentViewerController);  
49 -  
50 -NoosferoApp.addConfig(routeConfig); 12 +// NoosferoApp.init();
  13 +//
  14 +// NoosferoApp.addConstants("moment", moment);
  15 +// NoosferoApp.addConstants("AUTH_EVENTS", {
  16 +// loginSuccess: "auth-login-success",
  17 +// loginFailed: "auth-login-failed",
  18 +// logoutSuccess: "auth-logout-success"
  19 +// });
  20 +//
  21 +//
  22 +// NoosferoApp.addConfig(noosferoModuleConfig);
  23 +//
  24 +// NoosferoApp.run(noosferoAngularRunBlock);
  25 +
  26 +// // require("./main/main.controller.js");
  27 +// require("./cms/cms.controller.js");
  28 +// require("./components/auth/auth.controller.js");
  29 +// require("./components/auth/auth.service.js");
  30 +// require("./components/navbar/navbar.directive.js");
  31 +// require("./components/noosfero-activities/activities.component.js");
  32 +// require("./components/noosfero-activities/activity/activity.component.js");
  33 +// require("./components/noosfero-articles/blog/blog.component.js");
  34 +// require("./components/noosfero-blocks/block.directive.js");
  35 +// require("./components/noosfero-blocks/link-list/link-list.component.js");
  36 +// require("./components/noosfero-blocks/main-block/main-block.component.js");
  37 +// require("./components/noosfero-blocks/members-block/members-block.component.js");
  38 +// require("./components/noosfero-blocks/profile-image/profile-image.component.js");
  39 +// require("./components/noosfero-blocks/recent-documents/recent-documents.component.js");
  40 +// require("./components/noosfero-boxes/boxes.component.js");
  41 +// require("./components/noosfero/noosfero-template.filter.js");
  42 +// require("./components/noosfero/noosfero.service.js");
  43 +// require("./components/noosfero/profile-image/profile-image.component.js");
  44 +// require("./content-viewer/content-viewer-actions.controller.js");
  45 +// // require("./content-viewer/content-viewer.controller.js");
  46 +// require("./profile-info/profile-info.controller.js");
  47 +// require("./profile/profile-home.controller.js");
  48 +// require("./profile/profile.controller.js");
  49 +
  50 +// NoosferoApp.addController("ContentViewerController", ContentViewerController);
  51 +
  52 +// NoosferoApp.addConfig(routeConfig);
  53 +
  54 +bootstrap(Main, ['ui.router']);
src/app/main/main.controller.js
View file @e7877dd
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1 -(function() {  
2 - 'use strict';  
3 -  
4 - angular  
5 - .module('noosferoApp')  
6 - .controller('MainController', MainController);  
7 -  
8 -  
9 - /** @ngInject */  
10 - function MainController() {  
11 -  
12 - }  
13 -})();  
src/app/main/main.controller.ts 0 → 100644
  Diff comments   View file @d3a3844
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +import {Component, StateConfig} from 'ng-forward';
  2 +
  3 +@Component({
  4 + selector: 'main',
  5 + template: `aaaa <div ui-view></div>`
  6 +})
  7 +@StateConfig([
  8 + {
  9 + url: '/',
  10 + component: Main2,
  11 + // templateUrl: "app/main/main.html",
  12 + name: 'main2',
  13 + // resolve: {
  14 + // currentUser: function(AuthService) {
  15 + // return AuthService.loginFromCookie();
  16 + // }
  17 + // }
  18 + }
  19 +])
  20 +export class Main {
  21 +
  22 +}
  23 +
  24 +@Component({
  25 + selector: 'Main2',
  26 + template: `test main2`
  27 +})
  28 +export class Main2 {
  29 +
  30 +}
src/app/main/main.html
  Diff comments   View file @d3a3844
1 <acme-navbar></acme-navbar> 1 <acme-navbar></acme-navbar>
2 <div ui-view="content"></div> 2 <div ui-view="content"></div>
  3 +asdas dasd asdas d
src/index.html
  Diff comments   View file @d3a3844
1 <!doctype html> 1 <!doctype html>
2 -<html ng-app="noosferoApp"> 2 +<html>
3 <head> 3 <head>
4 <base href="/"> 4 <base href="/">
5 <meta charset="utf-8"> 5 <meta charset="utf-8">
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> 25 <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
26 <![endif]--> 26 <![endif]-->
27 27
28 - <div ui-view></div> 28 + <main></main>
29 29
30 <!-- build:js(src) scripts/vendor.js --> 30 <!-- build:js(src) scripts/vendor.js -->
31 <!-- bower:js --> 31 <!-- bower:js -->