Migrate profile controller

Victor Costa
1 parent 2da0f803
Showing 6 changed files with 41 additions and 57 deletions Show diff stats
src/app/index.route.ts
src/app/index.ts
src/app/main/main.component.ts
src/app/profile/profile.component.ts
src/app/profile/profile.controller.js
src/app/profile/profile.html
@@ -3,17 +3,6 @@
 /** @ngInject */
 export function routeConfig($stateProvider, $urlRouterProvider) {
     $stateProvider
-        /*.state("main", {
-            url: "/",
-            templateUrl: "app/main/main.html",
-            controller: "MainController",
-            controllerAs: "vm",
-            resolve: {
-                currentUser: function(AuthService) {
-                    return AuthService.loginFromCookie();
-                }
-            }
-        })*/
         .state("main.profile.cms", {
             url: "^/myprofile/:profile/cms",
             views: {
@@ -27,17 +16,6 @@ export function routeConfig($stateProvider, $urlRouterProvider) {
         .state("main.profile.settings", {
             url: "^/myprofile/:profile"
         })
-        .state("main.profile", {
-            url: "^/:profile",
-            abstract: true,
-            views: {
-                "content": {
-                    templateUrl: "app/profile/profile.html",
-                    controller: "ProfileController",
-                    controllerAs: "vm"
-                }
-            }
-        })
         .state("main.profile.home", {
             url: "",
             views: {
@@ -24,16 +24,9 @@ NoosferoApp.addConstants(&quot;AUTH_EVENTS&quot;, {
     logoutSuccess: "auth-logout-success"
 });
-
 NoosferoApp.addConfig(noosferoModuleConfig);
-
 NoosferoApp.run(noosferoAngularRunBlock);
-noosferoApp.run(() => {
-    console.log("RUN!");
-});
-
-// require("./main/main.controller.js");
 require("./cms/cms.controller.js");
 require("./components/auth/auth.controller.js");
 require("./components/auth/auth.service.js");
@@ -55,7 +48,6 @@ require(&quot;./content-viewer/content-viewer-actions.controller.js&quot;);
 // 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);
-import {bundle, Component, StateConfig} from 'ng-forward';
+import {Component, StateConfig} from 'ng-forward';
+import {Profile} from '../profile/profile.component';
 @Component({
     selector: 'main-content',
     templateUrl: "app/main/main.html",
 })
 export class MainContent {
+    constructor() {
+        console.log("MAIN");
+    }
 }
@@ -22,6 +26,17 @@ export class MainContent {
                 return AuthService.loginFromCookie();
             }
         }
+    },
+    {
+        url: "^/:profile",
+        // abstract: true,
+        component: Profile,
+        name: 'main.profile',
+        views: {
+            "content": {
+                templateUrl: "app/profile/profile.html",
+            }
+        }
     }
 ])
 export class Main {
@@ -0,0 +1,24 @@
+import {Component, Inject} from 'ng-forward';
+
+@Component({
+    selector: 'profile',
+    templateUrl: "app/profile/profile.html"
+})
+
+@Inject("noosfero", "$log", "$stateParams")
+export class Profile {
+
+    boxes: any
+    profile: any
+
+    constructor(noosfero, $log, $stateParams) {
+        console.log("PROFILE");
+        noosfero.profiles.one().get({ identifier: $stateParams.profile }).then((response) => {
+            this.profile = response.data[0];
+            noosfero.setCurrentProfile(this.profile);
+            return noosfero.boxes(this.profile.id).one().get();
+        }).then((response) => {
+            this.boxes = response.data.boxes;
+        });
+    }
+}
@@ -1,25 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('noosferoApp')
-    .controller('ProfileController', ProfileController);
-
-
-  /** @ngInject */
-  function ProfileController(noosfero, $log, $stateParams) {
-    var vm = this;
-    vm.boxes = [];
-    activate();
-
-    function activate() {
-      noosfero.profiles.one().get({identifier: $stateParams.profile}).then(function(response) {
-        vm.profile = response.data[0];
-        noosfero.setCurrentProfile(vm.profile);
-        return noosfero.boxes(vm.profile.id).one().get();
-      }).then(function(response) {
-        vm.boxes = response.data.boxes;
-      });
-    }
-  }
-})();
 <div class="profile-container">
   <div class="row">
-    <noosfero-boxes boxes="vm.boxes" owner="vm.profile"></noosfero-boxes>
+    <noosfero-boxes boxes="ctrl.boxes" owner="ctrl.profile"></noosfero-boxes>
   </div>
 </div>
	@@ -3,17 +3,6 @@		@@ -3,17 +3,6 @@
3	/** @ngInject */	3	/** @ngInject */
4	export function routeConfig($stateProvider, $urlRouterProvider) {	4	export function routeConfig($stateProvider, $urlRouterProvider) {
5	$stateProvider	5	$stateProvider
6	- /*.state("main", {
7	- url: "/",
8	- templateUrl: "app/main/main.html",
9	- controller: "MainController",
10	- controllerAs: "vm",
11	- resolve: {
12	- currentUser: function(AuthService) {
13	- return AuthService.loginFromCookie();
14	- }
15	- }
16	- })*/
17	.state("main.profile.cms", {	6	.state("main.profile.cms", {
18	url: "^/myprofile/:profile/cms",	7	url: "^/myprofile/:profile/cms",
19	views: {	8	views: {
	@@ -27,17 +16,6 @@ export function routeConfig($stateProvider, $urlRouterProvider) {		@@ -27,17 +16,6 @@ export function routeConfig($stateProvider, $urlRouterProvider) {
27	.state("main.profile.settings", {	16	.state("main.profile.settings", {
28	url: "^/myprofile/:profile"	17	url: "^/myprofile/:profile"
29	})	18	})
30	- .state("main.profile", {
31	- url: "^/:profile",
32	- abstract: true,
33	- views: {
34	- "content": {
35	- templateUrl: "app/profile/profile.html",
36	- controller: "ProfileController",
37	- controllerAs: "vm"
38	- }
39	- }
40	- })
41	.state("main.profile.home", {	19	.state("main.profile.home", {
42	url: "",	20	url: "",
43	views: {	21	views: {
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+import {Component, Inject} from 'ng-forward';
	2	+
	3	+@Component({
	4	+ selector: 'profile',
	5	+ templateUrl: "app/profile/profile.html"
	6	+})
	7	+
	8	+@Inject("noosfero", "$log", "$stateParams")
	9	+export class Profile {
	10	+
	11	+ boxes: any
	12	+ profile: any
	13	+
	14	+ constructor(noosfero, $log, $stateParams) {
	15	+ console.log("PROFILE");
	16	+ noosfero.profiles.one().get({ identifier: $stateParams.profile }).then((response) => {
	17	+ this.profile = response.data[0];
	18	+ noosfero.setCurrentProfile(this.profile);
	19	+ return noosfero.boxes(this.profile.id).one().get();
	20	+ }).then((response) => {
	21	+ this.boxes = response.data.boxes;
	22	+ });
	23	+ }
	24	+}
	@@ -1,25 +0,0 @@	@@ -1,25 +0,0 @@
1	-(function() {
2	- 'use strict';
3	-
4	- angular
5	- .module('noosferoApp')
6	- .controller('ProfileController', ProfileController);
7	-
8	-
9	- /** @ngInject */
10	- function ProfileController(noosfero, $log, $stateParams) {
11	- var vm = this;
12	- vm.boxes = [];
13	- activate();
14	-
15	- function activate() {
16	- noosfero.profiles.one().get({identifier: $stateParams.profile}).then(function(response) {
17	- vm.profile = response.data[0];
18	- noosfero.setCurrentProfile(vm.profile);
19	- return noosfero.boxes(vm.profile.id).one().get();
20	- }).then(function(response) {
21	- vm.boxes = response.data.boxes;
22	- });
23	- }
24	- }
25	-})();
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="ctrl.boxes" owner="ctrl.profile"></noosfero-boxes>
4	</div>	4	</div>
5	</div>	5	</div>