Migrate boxes

Victor Costa
1 parent 0e9faadc
Showing 7 changed files with 21 additions and 33 deletions Show diff stats
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/index.ts
src/app/main/main.component.ts
src/app/profile/profile.html
@@ -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>
@@ -49,7 +49,6 @@ require(&quot;./components/noosfero-blocks/main-block/main-block.component.js&quot;);
 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");
 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";
 @Component({
     selector: 'main-content',
@@ -16,7 +15,7 @@ export class MainContent {
 @Component({
     selector: 'main',
     template: '<div ng-view></div>',
-    directives: [NoosferoArticleBlog, ArticleDirective]
+    directives: [NoosferoArticleBlog, ArticleDirective, Boxes]
 })
 @StateConfig([
     {
 <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>
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	<h3 class="panel-title">{{block.title}}</h3>	4	<h3 class="panel-title">{{block.title}}</h3>
5	</div>	5	</div>
6	<div class="panel-body">	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	</div>	8	</div>
9	</div>	9	</div>
10	</div>	10	</div>
	@@ -1,26 +0,0 @@	@@ -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 @@		@@ -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	<div class="profile-container">	1	<div class="profile-container">
2	<div class="row">	2	<div class="row">
3	- <noosfero-boxes boxes="vm.boxes" owner="vm.profile"></noosfero-boxes>	3	+ <noosfero-boxes [boxes]="vm.boxes" [owner]="vm.profile"></noosfero-boxes>
4	</div>	4	</div>
5	</div>	5	</div>