Refactor profile controller name

Victor Costa
1 parent af7485cb
Showing 9 changed files with 80 additions and 84 deletions Show diff stats
src/app/index.route.js
src/app/main/main.controller.js
src/app/main/main.controller.spec.js
src/app/main/main.html
src/app/pages/profile/box.html
src/app/profile/profile.controller.js
src/app/profile/profile.controller.spec.js
src/app/profile/profile.html
src/app/views/profile/block.html
@@ -8,9 +8,9 @@
   function routeConfig($routeProvider) {
     $routeProvider
       .when('/:profile', {
-        templateUrl: 'app/main/main.html',
-        controller: 'MainController',
-        controllerAs: 'main'
+        templateUrl: 'app/profile/profile.html',
+        controller: 'ProfileController',
+        controllerAs: 'vm'
       })
       .when('/profile/:profile', {
         redirectTo: '/:profile'
@@ -1,27 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .controller('MainController', MainController);
-
-
-  /** @ngInject */
-  function MainController($timeout, noosfero, $log, $routeParams) {
-    var vm = this;
-    vm.boxes = [];
-    activate();
-
-    function activate() {
-      noosfero.communities().get({identifier: $routeParams.profile, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (profile) {
-        $log.log(profile);
-        vm.owner = profile.communities[0];
-      });
-    }
-
-    vm.boxesOrder = function(box) {
-      if(box.position==2) return 0;
-      return box.position;
-    }
-  }
-})();
@@ -1,38 +0,0 @@
-(function() {
-  'use strict';
-
-  describe('controllers', function(){
-    var vm;
-    var $timeout;
-    var toastr;
-
-    beforeEach(module('angular'));
-    beforeEach(inject(function(_$controller_, _$timeout_, _toastr_) {
-      spyOn(_toastr_, 'info').and.callThrough();
-
-      vm = _$controller_('MainController');
-      $timeout = _$timeout_;
-      toastr = _toastr_;
-    }));
-
-    it('should have a timestamp creation date', function() {
-      expect(vm.creationDate).toEqual(jasmine.any(Number));
-    });
-
-    it('should define animate class after delaying timeout ', function() {
-      $timeout.flush();
-      expect(vm.classAnimation).toEqual('rubberBand');
-    });
-
-    it('should show a Toastr info and stop animation when invoke showToastr()', function() {
-      vm.showToastr();
-      expect(toastr.info).toHaveBeenCalled();
-      expect(vm.classAnimation).toEqual('');
-    });
-
-    it('should define more than 5 awesome things', function() {
-      expect(angular.isArray(vm.awesomeThings)).toBeTruthy();
-      expect(vm.awesomeThings.length === 5).toBeTruthy();
-    });
-  });
-})();
@@ -1,11 +0,0 @@
-<div class="container">
-
-  <div>
-    <acme-navbar></acme-navbar>
-  </div>
-
-  <div class="row">
-    <ng-include ng-repeat="box in main.owner.boxes | orderBy: main.boxesOrder" src="'app/views/profile/box.html'"></ng-include>
-  </div>
-
-</div>
@@ -1,4 +0,0 @@
-<div class="col-sm-6 col-md-4" ng-repeat="box in main.boxes | orderBy: 'position'">
-  Box {{box.id}}->{{box.position}}
-  <ng-include ng-repeat="block in box.blocks | orderBy: 'position'" src="'app/views/profile/block.html'"></ng-include>
-</div>
@@ -0,0 +1,27 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .controller('ProfileController', ProfileController);
+
+
+  /** @ngInject */
+  function ProfileController($timeout, noosfero, $log, $routeParams) {
+    var vm = this;
+    vm.boxes = [];
+    activate();
+
+    function activate() {
+      noosfero.communities().get({identifier: $routeParams.profile, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (profile) {
+        $log.log(profile);
+        vm.owner = profile.communities[0];
+      });
+    }
+
+    vm.boxesOrder = function(box) {
+      if(box.position==2) return 0;
+      return box.position;
+    }
+  }
+})();
@@ -0,0 +1,38 @@
+(function() {
+  'use strict';
+
+  describe('controllers', function(){
+    var vm;
+    var $timeout;
+    var toastr;
+
+    beforeEach(module('angular'));
+    beforeEach(inject(function(_$controller_, _$timeout_, _toastr_) {
+      spyOn(_toastr_, 'info').and.callThrough();
+
+      vm = _$controller_('MainController');
+      $timeout = _$timeout_;
+      toastr = _toastr_;
+    }));
+
+    it('should have a timestamp creation date', function() {
+      expect(vm.creationDate).toEqual(jasmine.any(Number));
+    });
+
+    it('should define animate class after delaying timeout ', function() {
+      $timeout.flush();
+      expect(vm.classAnimation).toEqual('rubberBand');
+    });
+
+    it('should show a Toastr info and stop animation when invoke showToastr()', function() {
+      vm.showToastr();
+      expect(toastr.info).toHaveBeenCalled();
+      expect(vm.classAnimation).toEqual('');
+    });
+
+    it('should define more than 5 awesome things', function() {
+      expect(angular.isArray(vm.awesomeThings)).toBeTruthy();
+      expect(vm.awesomeThings.length === 5).toBeTruthy();
+    });
+  });
+})();
@@ -0,0 +1,11 @@
+<div class="container">
+
+  <div>
+    <acme-navbar></acme-navbar>
+  </div>
+
+  <div class="row">
+    <ng-include ng-repeat="box in vm.owner.boxes | orderBy: vm.boxesOrder" src="'app/views/profile/box.html'"></ng-include>
+  </div>
+
+</div>
@@ -3,6 +3,6 @@
     <h3 class="panel-title">{{block.title}}</h3>
   </div>
   <div class="panel-body">
-    <noosfero-block block="block" owner="main.owner"></noosfero-block>
+    <noosfero-block block="block" owner="vm.owner"></noosfero-block>
   </div>
 </div>
...	...	@@ -8,9 +8,9 @@
8	8	function routeConfig($routeProvider) {
9	9	$routeProvider
10	10	.when('/:profile', {
11		- templateUrl: 'app/main/main.html',
12		- controller: 'MainController',
13		- controllerAs: 'main'
	11	+ templateUrl: 'app/profile/profile.html',
	12	+ controller: 'ProfileController',
	13	+ controllerAs: 'vm'
14	14	})
15	15	.when('/profile/:profile', {
16	16	redirectTo: '/:profile'
...	...
...	...	@@ -1,27 +0,0 @@
1		-(function() {
2		- 'use strict';
3		-
4		- angular
5		- .module('angular')
6		- .controller('MainController', MainController);
7		-
8		-
9		- /** @ngInject */
10		- function MainController($timeout, noosfero, $log, $routeParams) {
11		- var vm = this;
12		- vm.boxes = [];
13		- activate();
14		-
15		- function activate() {
16		- noosfero.communities().get({identifier: $routeParams.profile, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (profile) {
17		- $log.log(profile);
18		- vm.owner = profile.communities[0];
19		- });
20		- }
21		-
22		- vm.boxesOrder = function(box) {
23		- if(box.position==2) return 0;
24		- return box.position;
25		- }
26		- }
27		-})();
...	...	@@ -1,38 +0,0 @@
1		-(function() {
2		- 'use strict';
3		-
4		- describe('controllers', function(){
5		- var vm;
6		- var $timeout;
7		- var toastr;
8		-
9		- beforeEach(module('angular'));
10		- beforeEach(inject(function(_$controller_, _$timeout_, _toastr_) {
11		- spyOn(_toastr_, 'info').and.callThrough();
12		-
13		- vm = _$controller_('MainController');
14		- $timeout = _$timeout_;
15		- toastr = _toastr_;
16		- }));
17		-
18		- it('should have a timestamp creation date', function() {
19		- expect(vm.creationDate).toEqual(jasmine.any(Number));
20		- });
21		-
22		- it('should define animate class after delaying timeout ', function() {
23		- $timeout.flush();
24		- expect(vm.classAnimation).toEqual('rubberBand');
25		- });
26		-
27		- it('should show a Toastr info and stop animation when invoke showToastr()', function() {
28		- vm.showToastr();
29		- expect(toastr.info).toHaveBeenCalled();
30		- expect(vm.classAnimation).toEqual('');
31		- });
32		-
33		- it('should define more than 5 awesome things', function() {
34		- expect(angular.isArray(vm.awesomeThings)).toBeTruthy();
35		- expect(vm.awesomeThings.length === 5).toBeTruthy();
36		- });
37		- });
38		-})();
...	...	@@ -1,11 +0,0 @@
1		-<div class="container">
2		-
3		- <div>
4		- <acme-navbar></acme-navbar>
5		- </div>
6		-
7		- <div class="row">
8		- <ng-include ng-repeat="box in main.owner.boxes \| orderBy: main.boxesOrder" src="'app/views/profile/box.html'"></ng-include>
9		- </div>
10		-
11		-</div>
...	...	@@ -1,4 +0,0 @@
1		-<div class="col-sm-6 col-md-4" ng-repeat="box in main.boxes \| orderBy: 'position'">
2		- Box {{box.id}}->{{box.position}}
3		- <ng-include ng-repeat="block in box.blocks \| orderBy: 'position'" src="'app/views/profile/block.html'"></ng-include>
4		-</div>
...	...	@@ -0,0 +1,27 @@
	1	+(function() {
	2	+ 'use strict';
	3	+
	4	+ angular
	5	+ .module('angular')
	6	+ .controller('ProfileController', ProfileController);
	7	+
	8	+
	9	+ /** @ngInject */
	10	+ function ProfileController($timeout, noosfero, $log, $routeParams) {
	11	+ var vm = this;
	12	+ vm.boxes = [];
	13	+ activate();
	14	+
	15	+ function activate() {
	16	+ noosfero.communities().get({identifier: $routeParams.profile, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (profile) {
	17	+ $log.log(profile);
	18	+ vm.owner = profile.communities[0];
	19	+ });
	20	+ }
	21	+
	22	+ vm.boxesOrder = function(box) {
	23	+ if(box.position==2) return 0;
	24	+ return box.position;
	25	+ }
	26	+ }
	27	+})();
...	...
...	...	@@ -0,0 +1,38 @@
	1	+(function() {
	2	+ 'use strict';
	3	+
	4	+ describe('controllers', function(){
	5	+ var vm;
	6	+ var $timeout;
	7	+ var toastr;
	8	+
	9	+ beforeEach(module('angular'));
	10	+ beforeEach(inject(function(_$controller_, _$timeout_, _toastr_) {
	11	+ spyOn(_toastr_, 'info').and.callThrough();
	12	+
	13	+ vm = _$controller_('MainController');
	14	+ $timeout = _$timeout_;
	15	+ toastr = _toastr_;
	16	+ }));
	17	+
	18	+ it('should have a timestamp creation date', function() {
	19	+ expect(vm.creationDate).toEqual(jasmine.any(Number));
	20	+ });
	21	+
	22	+ it('should define animate class after delaying timeout ', function() {
	23	+ $timeout.flush();
	24	+ expect(vm.classAnimation).toEqual('rubberBand');
	25	+ });
	26	+
	27	+ it('should show a Toastr info and stop animation when invoke showToastr()', function() {
	28	+ vm.showToastr();
	29	+ expect(toastr.info).toHaveBeenCalled();
	30	+ expect(vm.classAnimation).toEqual('');
	31	+ });
	32	+
	33	+ it('should define more than 5 awesome things', function() {
	34	+ expect(angular.isArray(vm.awesomeThings)).toBeTruthy();
	35	+ expect(vm.awesomeThings.length === 5).toBeTruthy();
	36	+ });
	37	+ });
	38	+})();
...	...
...	...	@@ -0,0 +1,11 @@
	1	+<div class="container">
	2	+
	3	+ <div>
	4	+ <acme-navbar></acme-navbar>
	5	+ </div>
	6	+
	7	+ <div class="row">
	8	+ <ng-include ng-repeat="box in vm.owner.boxes \| orderBy: vm.boxesOrder" src="'app/views/profile/box.html'"></ng-include>
	9	+ </div>
	10	+
	11	+</div>
...	...
...	...	@@ -3,6 +3,6 @@
3	3	<h3 class="panel-title">{{block.title}}</h3>
4	4	</div>
5	5	<div class="panel-body">
6		- <noosfero-block block="block" owner="main.owner"></noosfero-block>
	6	+ <noosfero-block block="block" owner="vm.owner"></noosfero-block>
7	7	</div>
8	8	</div>
...	...