Merge branch 'ngforward' of softwarepublico.gov.br:noosfero-themes/angular-theme into ngforward

ABNER SILVA DE OLIVEIRA
2 parents 8edc8a6f aa9af3a8
Showing 21 changed files with 178 additions and 192 deletions Show diff stats
.gitignore
package.json
src/app/cms/cms.component.ts
src/app/cms/cms.controller.js
src/app/components/noosfero-blocks/block.component.ts
src/app/components/noosfero-blocks/block.directive.js
src/app/components/noosfero-boxes/box.html
src/app/components/noosfero-boxes/boxes.component.js
src/app/components/noosfero-boxes/boxes.component.ts
src/app/components/noosfero-boxes/boxes.html
src/app/content-viewer/content-viewer-actions.component.ts
src/app/content-viewer/content-viewer-actions.controller.js
src/app/content-viewer/content-viewer.component.ts
src/app/index.route.ts
src/app/index.ts
src/app/main/main.component.ts
src/app/profile/profile-home.component.ts
src/app/profile/profile-home.controller.js
src/app/profile/profile.component.ts
src/app/profile/profile.html
@@ -6,4 +6,6 @@ coverage/
 .tmp/
 dist/
 src/noosfero.js*
+src/commons.js
+src/noosfero-specs.js
 typings
@@ -21,6 +21,7 @@
     "eslint-plugin-angular": "~0.12.0",
     "estraverse": "~4.1.0",
     "expose-loader": "^0.7.1",
+    "glob": "^7.0.0",
     "gulp": "~3.9.0",
     "gulp-angular-filesort": "~1.1.1",
     "gulp-angular-templatecache": "~1.8.0",
@@ -0,0 +1,36 @@
+import {StateConfig, Component, Inject} from 'ng-forward';
+
+@Component({
+    selector: 'cms',
+    templateUrl: "app/cms/cms.html"
+})
+@Inject("noosfero", "$stateParams", "$httpParamSerializer", "$state", "SweetAlert")
+export class Cms {
+
+    article: any = {};
+    profile: any;
+
+    constructor(private noosfero, private $stateParams, private $httpParamSerializer, private $state, private SweetAlert) {
+
+    }
+
+    save() {
+        this.noosfero.currentProfile.then((profile) => {
+            return this.noosfero.profiles.one(profile.id).customPOST(
+                { article: this.article },
+                'articles',
+                {},
+                { 'Content-Type': 'application/json' }
+            )
+        }).then((response) => {
+            this.$state.transitionTo('main.profile.page', { page: response.data.article.path, profile: response.data.article.profile.identifier });
+            this.SweetAlert.swal({
+                title: "Good job!",
+                text: "Article saved!",
+                type: "success",
+                timer: 1000
+            });
+        });
+    }
+
+}
@@ -1,35 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('noosferoApp')
-    .controller('CmsController', CmsController);
-
-
-  /** @ngInject */
-  function CmsController(noosfero, $stateParams, $httpParamSerializer, $state, SweetAlert) {
-    var vm = this;
-    vm.article = {};
-    vm.profile = null;
-
-    vm.save = function() {
-      noosfero.currentProfile.then(function(profile) {
-        return noosfero.profiles.one(profile.id).customPOST(
-          {article: vm.article},
-          'articles',
-          {},
-          {'Content-Type':'application/json'}
-        )
-      }).then(function(response) {
-        $state.transitionTo('main.profile.page', {page: response.data.article.path, profile: response.data.article.profile.identifier});
-        SweetAlert.swal({
-          title: "Good job!",
-          text: "Article saved!",
-          type: "success",
-          timer: 1000
-        });
-      });
-    }
-    
-  }
-})();
@@ -0,0 +1,20 @@
+import { Input, Inject, Component } from 'ng-forward';
+
+@Component({
+    selector: 'noosfero-block',
+    template: '<div></div>'
+})
+@Inject("$element", "$scope", "$injector", "$compile")
+export class Block {
+
+    @Input() block: any;
+    @Input() owner: any;
+
+    ngOnInit() {
+        let blockName = this.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+        this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' block="ctrl.block" owner="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));
+    }
+
+    constructor(private $element: any, private $scope: ng.IScope, private $injector: ng.auto.IInjectorService, private $compile: ng.ICompileService) {
+    }
+}
@@ -1,24 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('noosferoApp')
-    .directive('noosferoBlock', noosferoBlock);
-
-  /** @ngInject */
-  function noosferoBlock($compile) {
-    var directive = {
-      restrict: 'E',
-      scope: {
-          block: '<',
-          owner: '<'
-      },
-      link: function(scope, element) {
-        var blockName = scope.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-        element.replaceWith($compile('<noosfero-'+blockName+' block="block" owner="owner"></noosfero-'+blockName+'>')(scope));
-      }
-    };
-    return directive;
-  }
-
-})();
@@ -4,7 +4,7 @@
       <h3 class="panel-title">{{block.title}}</h3>
     </div>
     <div class="panel-body">
-      <noosfero-block block="block" owner="$ctrl.owner"></noosfero-block>
+      <noosfero-block [block]="block" [owner]="ctrl.owner"></noosfero-block>
     </div>
   </div>
 </div>
@@ -1,26 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('noosferoApp')
-    .component('noosferoBoxes', {
-      restrict: 'E',
-      bindings: {
-          boxes: '<',
-          owner: '<'
-      },
-      templateUrl: 'app/components/noosfero-boxes/boxes.html',
-      controller: BoxesController
-    });
-
-  /** @ngInject */
-  function BoxesController() {
-    var vm = this;
-
-    vm.boxesOrder = function(box) {
-      if(box.position==2) return 0;
-      return box.position;
-    }
-  }
-
-})();
@@ -0,0 +1,16 @@
+import { Input, Inject, Component } from 'ng-forward';
+
+@Component({
+    selector: "noosfero-boxes",
+    templateUrl: "app/components/noosfero-boxes/boxes.html"
+})
+export class Boxes {
+
+    @Input() boxes: any
+    @Input() owner: any
+
+    boxesOrder(box) {
+        if (box.position == 2) return 0;
+        return box.position;
+    }
+}
-<ng-include ng-repeat="box in $ctrl.boxes | orderBy: $ctrl.boxesOrder" src="'app/components/noosfero-boxes/box.html'"></ng-include>
+<ng-include ng-repeat="box in ctrl.boxes | orderBy: ctrl.boxesOrder" src="'app/components/noosfero-boxes/box.html'"></ng-include>
@@ -0,0 +1,18 @@
+import {Component, Inject} from "ng-forward";
+
+@Component({
+    selector: "content-viewer-actions",
+    templateUrl: "app/content-viewer/navbar-actions.html",
+})
+@Inject("noosfero")
+export class ContentViewerActions {
+
+    article: any;
+    profile: any;
+
+    constructor(noosfero) {
+        noosfero.currentProfile.then((profile) => {
+            this.profile = profile;
+        });
+    }
+}
@@ -1,22 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('noosferoApp')
-    .controller('ContentViewerActionsController', ContentViewerActionsController);
-
-
-  /** @ngInject */
-  function ContentViewerActionsController(noosfero) {
-    var vm = this;
-    vm.article = null;
-    vm.profile = null;
-    activate();
-
-    function activate() {
-      noosfero.currentProfile.then(function(profile) {
-        vm.profile = profile;
-      });
-    }
-  }
-})();
-
 import * as noosfero from "../models/interfaces";
  
 import {ArticleDirective, ArticleView} from "../components/noosfero-articles/article/article.directive";
-import {Input, Component, StateConfig} from "ng-forward";
+import {Input, Component, StateConfig, Inject} from "ng-forward";
  
 import {NoosferoArticleBlog} from "./../components/noosfero-articles/blog/blog.component";
  
 @Component({
     selector: "content-viewer",
     templateUrl: "app/content-viewer/page.html",
-    providers: [
-        "noosferoService", "$log", "$stateParams"
-    ],
     directives: [NoosferoArticleBlog, ArticleView, ArticleDirective]
 })
+@Inject("noosfero", "$log", "$stateParams")
 export class ContentViewer {
  
     @Input()
@@ -3,42 +3,8 @@
 /** @ngInject */
 export function routeConfig($stateProvider, $urlRouterProvider) {
     $stateProvider
-        .state("main.profile.cms", {
-            url: "^/myprofile/:profile/cms",
-            views: {
-                "mainBlockContent": {
-                    templateUrl: "app/cms/cms.html",
-                    controller: "CmsController",
-                    controllerAs: "vm"
-                }
-            }
-        })
         .state("main.profile.settings", {
             url: "^/myprofile/:profile"
-        })
-        .state("main.profile.home", {
-            url: "",
-            views: {
-                "mainBlockContent": {
-                    controller: "ProfileHomeController",
-                    controllerAs: "vm"
-                }
-            }
-        })
-        .state("main.profile.page", {
-            url: "/{page:any}",
-            views: {
-                "mainBlockContent": {
-                    templateUrl: "app/content-viewer/page.html",
-                    controller: "ContentViewerController",
-                    controllerAs: "vm"
-                },
-                "actions@main": {
-                    templateUrl: "app/content-viewer/navbar-actions.html",
-                    controller: "ContentViewerActionsController",
-                    controllerAs: "vm"
-                }
-            }
         });
  
     $urlRouterProvider.otherwise("/");
@@ -7,15 +7,18 @@ import {noosferoAngularRunBlock} from &quot;./index.run&quot;;
 import {routeConfig} from "./index.route";
  
 import {ContentViewer as noosferoContentViewer} from "./content-viewer/content-viewer.component";
+import {ContentViewerActions as noosferoContentViewerActions} from "./content-viewer/content-viewer-actions.component";
 import {Profile as noosferoProfile} from "./profile/profile.component";
 import {ProfileInfo as noosferoProfileInfo} from "./profile-info/profile-info.component";
+import {ProfileHome as noosferoProfileHome} from "./profile/profile-home.component";
+import {Cms as noosferoCms} from "./cms/cms.component";
  
 import {Main} from "./main/main.component";
 import {bootstrap, bundle} from "ng-forward";
  
  
  
-declare var moment: any; 
+declare var moment: any;
  
 let noosferoApp: any = bundle("noosferoApp", Main, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch",
     "ngSanitize", "ngMessages", "ngAria", "restangular",
@@ -35,32 +38,25 @@ NoosferoApp.addConstants(&quot;AUTH_EVENTS&quot;, {
 NoosferoApp.addConfig(noosferoModuleConfig);
 NoosferoApp.run(noosferoAngularRunBlock);
  
-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/profile-home.controller.js");
  
 NoosferoApp.addController("ContentViewerController", noosferoContentViewer);
+NoosferoApp.addController("ContentViewerActionsController", noosferoContentViewerActions);
 NoosferoApp.addController("ProfileController", noosferoProfile);
+NoosferoApp.addController("ProfileHomeController", noosferoProfileHome);
 NoosferoApp.addController("ProfileInfoController", noosferoProfileInfo);
+NoosferoApp.addController("CmsController", noosferoCms);
  
 NoosferoApp.addConfig(routeConfig);
 import {bundle, Component, StateConfig} from "ng-forward";
 import {NoosferoArticleBlog} from "./../components/noosfero-articles/blog/blog.component.ts";
-
 import {ArticleDirective} from "../components/noosfero-articles/article/article.directive.ts";
-
 import {Profile} from "../profile/profile.component";
+import {Boxes} from "../components/noosfero-boxes/boxes.component";
+import {Block} from "../components/noosfero-blocks/block.component";
  
 @Component({
     selector: 'main-content',
@@ -16,7 +16,7 @@ export class MainContent {
 @Component({
     selector: 'main',
     template: '<div ng-view></div>',
-    directives: [NoosferoArticleBlog, ArticleDirective]
+    directives: [NoosferoArticleBlog, ArticleDirective, Boxes, Block]
 })
 @StateConfig([
     {
@@ -0,0 +1,24 @@
+import {StateConfig, Component, Inject} from 'ng-forward';
+
+@Component({
+    selector: 'profile-home',
+    template: "<div></div>"
+})
+@Inject("noosfero", "$log", "$stateParams", "$scope", "$state")
+export class ProfileHome {
+
+    profile: any;
+
+    constructor(noosfero, $log, $stateParams, $scope, $state) {
+        noosfero.currentProfile.then((profile) => {
+            this.profile = profile;
+            return noosfero.profile(this.profile.id).customGET('home_page', { fields: 'path' });
+        }).then((response) => {
+            if (response.data.article) {
+                $state.transitionTo('main.profile.page', { page: response.data.article.path, profile: this.profile.identifier }, { location: false });
+            } else {
+                $state.transitionTo('main.profile.info', { profile: this.profile.identifier }, { location: false });
+            }
+        });
+    }
+}
@@ -1,27 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('noosferoApp')
-    .controller('ProfileHomeController', ProfileHomeController);
-
-
-  /** @ngInject */
-  function ProfileHomeController(noosfero, $log, $stateParams, $scope, $state) {
-    var vm = this;
-    activate();
-
-    function activate() {
-      noosfero.currentProfile.then(function(profile) {
-        vm.profile = profile;
-        return noosfero.profile(vm.profile.id).customGET('home_page', {fields: 'path'});
-      }).then(function(response) {
-        if(response.data.article) {
-          $state.transitionTo('main.profile.page', {page: response.data.article.path, profile: vm.profile.identifier}, {location: false});
-        } else {
-          $state.transitionTo('main.profile.info', {profile: vm.profile.identifier}, {location: false});
-        }
-      });
-    }
-  }
-})();
 import {StateConfig, Component, Inject} from 'ng-forward';
 import {ProfileInfo} from '../profile-info/profile-info.component'
+import {ProfileHome} from '../profile/profile-home.component'
+import {Cms} from '../cms/cms.component'
+import {ContentViewer} from "../content-viewer/content-viewer.component";
  
 @Component({
     selector: 'profile',
@@ -7,9 +10,9 @@ import {ProfileInfo} from &#39;../profile-info/profile-info.component&#39;
 })
 @StateConfig([
     {
+        name: 'main.profile.info',
         url: "^/profile/:profile",
         component: ProfileInfo,
-        name: 'main.profile.info',
         views: {
             "mainBlockContent": {
                 templateUrl: "app/profile-info/profile-info.html",
@@ -17,6 +20,46 @@ import {ProfileInfo} from &#39;../profile-info/profile-info.component&#39;
                 controllerAs: "vm"
             }
         }
+    },
+    {
+        name: 'main.profile.cms',
+        url: "^/myprofile/:profile/cms",
+        component: Cms,
+        views: {
+            "mainBlockContent": {
+                templateUrl: "app/cms/cms.html",
+                controller: "CmsController",
+                controllerAs: "vm"
+            }
+        }
+    },
+    {
+        name: 'main.profile.home',
+        url: "",
+        component: ProfileHome,
+        views: {
+            "mainBlockContent": {
+                controller: "ProfileHomeController",
+                controllerAs: "vm"
+            }
+        }
+    },
+    {
+        name: 'main.profile.page',
+        url: "/{page:any}",
+        component: ContentViewer,
+        views: {
+            "mainBlockContent": {
+                templateUrl: "app/content-viewer/page.html",
+                controller: "ContentViewerController",
+                controllerAs: "vm"
+            },
+            "actions@main": {
+                templateUrl: "app/content-viewer/navbar-actions.html",
+                controller: "ContentViewerActionsController",
+                controllerAs: "vm"
+            }
+        }
     }
 ])
 @Inject("noosfero", "$log", "$stateParams")
 <div class="profile-container">
   <div class="row">
-    <noosfero-boxes boxes="vm.boxes" owner="vm.profile"></noosfero-boxes>
+    <noosfero-boxes [boxes]="vm.boxes" [owner]="vm.profile"></noosfero-boxes>
   </div>
 </div>
@@ -35,7 +35,8 @@
  
  
  
-   <script src="noosfero.js"></script> 
+    <script src="commons.js"></script>
+    <script src="noosfero.js"></script>
     <!-- inject:partials -->
     <!-- angular templates will be automatically converted in js and inserted here -->
     <!-- endinject -->
...	...	@@ -6,4 +6,6 @@ coverage/
6	6	.tmp/
7	7	dist/
8	8	src/noosfero.js*
	9	+src/commons.js
	10	+src/noosfero-specs.js
9	11	typings
...	...
...	...	@@ -21,6 +21,7 @@
21	21	"eslint-plugin-angular": "~0.12.0",
22	22	"estraverse": "~4.1.0",
23	23	"expose-loader": "^0.7.1",
	24	+ "glob": "^7.0.0",
24	25	"gulp": "~3.9.0",
25	26	"gulp-angular-filesort": "~1.1.1",
26	27	"gulp-angular-templatecache": "~1.8.0",
...	...
...	...	@@ -0,0 +1,36 @@
	1	+import {StateConfig, Component, Inject} from 'ng-forward';
	2	+
	3	+@Component({
	4	+ selector: 'cms',
	5	+ templateUrl: "app/cms/cms.html"
	6	+})
	7	+@Inject("noosfero", "$stateParams", "$httpParamSerializer", "$state", "SweetAlert")
	8	+export class Cms {
	9	+
	10	+ article: any = {};
	11	+ profile: any;
	12	+
	13	+ constructor(private noosfero, private $stateParams, private $httpParamSerializer, private $state, private SweetAlert) {
	14	+
	15	+ }
	16	+
	17	+ save() {
	18	+ this.noosfero.currentProfile.then((profile) => {
	19	+ return this.noosfero.profiles.one(profile.id).customPOST(
	20	+ { article: this.article },
	21	+ 'articles',
	22	+ {},
	23	+ { 'Content-Type': 'application/json' }
	24	+ )
	25	+ }).then((response) => {
	26	+ this.$state.transitionTo('main.profile.page', { page: response.data.article.path, profile: response.data.article.profile.identifier });
	27	+ this.SweetAlert.swal({
	28	+ title: "Good job!",
	29	+ text: "Article saved!",
	30	+ type: "success",
	31	+ timer: 1000
	32	+ });
	33	+ });
	34	+ }
	35	+
	36	+}
...	...
...	...	@@ -1,35 +0,0 @@
1		-(function() {
2		- 'use strict';
3		-
4		- angular
5		- .module('noosferoApp')
6		- .controller('CmsController', CmsController);
7		-
8		-
9		- /** @ngInject */
10		- function CmsController(noosfero, $stateParams, $httpParamSerializer, $state, SweetAlert) {
11		- var vm = this;
12		- vm.article = {};
13		- vm.profile = null;
14		-
15		- vm.save = function() {
16		- noosfero.currentProfile.then(function(profile) {
17		- return noosfero.profiles.one(profile.id).customPOST(
18		- {article: vm.article},
19		- 'articles',
20		- {},
21		- {'Content-Type':'application/json'}
22		- )
23		- }).then(function(response) {
24		- $state.transitionTo('main.profile.page', {page: response.data.article.path, profile: response.data.article.profile.identifier});
25		- SweetAlert.swal({
26		- title: "Good job!",
27		- text: "Article saved!",
28		- type: "success",
29		- timer: 1000
30		- });
31		- });
32		- }
33		-
34		- }
35		-})();
...	...	@@ -0,0 +1,20 @@
	1	+import { Input, Inject, Component } from 'ng-forward';
	2	+
	3	+@Component({
	4	+ selector: 'noosfero-block',
	5	+ template: '<div></div>'
	6	+})
	7	+@Inject("$element", "$scope", "$injector", "$compile")
	8	+export class Block {
	9	+
	10	+ @Input() block: any;
	11	+ @Input() owner: any;
	12	+
	13	+ ngOnInit() {
	14	+ let blockName = this.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
	15	+ this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' block="ctrl.block" owner="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));
	16	+ }
	17	+
	18	+ constructor(private $element: any, private $scope: ng.IScope, private $injector: ng.auto.IInjectorService, private $compile: ng.ICompileService) {
	19	+ }
	20	+}
...	...
...	...	@@ -1,24 +0,0 @@
1		-(function() {
2		- 'use strict';
3		-
4		- angular
5		- .module('noosferoApp')
6		- .directive('noosferoBlock', noosferoBlock);
7		-
8		- /** @ngInject */
9		- function noosferoBlock($compile) {
10		- var directive = {
11		- restrict: 'E',
12		- scope: {
13		- block: '<',
14		- owner: '<'
15		- },
16		- link: function(scope, element) {
17		- var blockName = scope.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
18		- element.replaceWith($compile('<noosfero-'+blockName+' block="block" owner="owner"></noosfero-'+blockName+'>')(scope));
19		- }
20		- };
21		- return directive;
22		- }
23		-
24		-})();
...	...	@@ -4,7 +4,7 @@
4	4	<h3 class="panel-title">{{block.title}}</h3>
5	5	</div>
6	6	<div class="panel-body">
7		- <noosfero-block block="block" owner="$ctrl.owner"></noosfero-block>
	7	+ <noosfero-block [block]="block" [owner]="ctrl.owner"></noosfero-block>
8	8	</div>
9	9	</div>
10	10	</div>
...	...
...	...	@@ -1,26 +0,0 @@
1		-(function() {
2		- 'use strict';
3		-
4		- angular
5		- .module('noosferoApp')
6		- .component('noosferoBoxes', {
7		- restrict: 'E',
8		- bindings: {
9		- boxes: '<',
10		- owner: '<'
11		- },
12		- templateUrl: 'app/components/noosfero-boxes/boxes.html',
13		- controller: BoxesController
14		- });
15		-
16		- /** @ngInject */
17		- function BoxesController() {
18		- var vm = this;
19		-
20		- vm.boxesOrder = function(box) {
21		- if(box.position==2) return 0;
22		- return box.position;
23		- }
24		- }
25		-
26		-})();
...	...	@@ -0,0 +1,16 @@
	1	+import { Input, Inject, Component } from 'ng-forward';
	2	+
	3	+@Component({
	4	+ selector: "noosfero-boxes",
	5	+ templateUrl: "app/components/noosfero-boxes/boxes.html"
	6	+})
	7	+export class Boxes {
	8	+
	9	+ @Input() boxes: any
	10	+ @Input() owner: any
	11	+
	12	+ boxesOrder(box) {
	13	+ if (box.position == 2) return 0;
	14	+ return box.position;
	15	+ }
	16	+}
...	...
1		-<ng-include ng-repeat="box in $ctrl.boxes \| orderBy: $ctrl.boxesOrder" src="'app/components/noosfero-boxes/box.html'"></ng-include>
	1	+<ng-include ng-repeat="box in ctrl.boxes \| orderBy: ctrl.boxesOrder" src="'app/components/noosfero-boxes/box.html'"></ng-include>
...	...