Download as
Browse Code »

Commit 4b131cec4c59abefe42fa419f70a38d645e5443d

Authored by Victor Costa
1 parent af7485cb
Exists in master and in 38 other branches activities_block, angular2, btn-new-post, cleaning-the-house, cosmetic_changes_people_and_communities_block, coverage, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, helpers-evolution, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, production, profile-article-resolvers, profile-blocks-sass, profile-view, profile_description_block_component, profile_page_improvements, profile_search, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, typescript, updated_signup_page, users_profile_page

Refactor profile controller name

Showing 9 changed files with 80 additions and 84 deletions   Show diff stats
src/app/index.route.js
  Diff comments   View file @4b131ce
... ... @@ -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'
... ...
src/app/main/main.controller.js
View file @af7485c
... ... @@ -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   -})();
src/app/main/main.controller.spec.js
View file @af7485c
... ... @@ -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   -})();
src/app/main/main.html
View file @af7485c
... ... @@ -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>
src/app/pages/profile/box.html
View file @af7485c
... ... @@ -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>
src/app/profile/profile.controller.js 0 → 100644
  Diff comments   View file @4b131ce
... ... @@ -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 +})();
... ...
src/app/profile/profile.controller.spec.js 0 → 100644
  Diff comments   View file @4b131ce
... ... @@ -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 +})();
... ...
src/app/profile/profile.html 0 → 100644
  Diff comments   View file @4b131ce
... ... @@ -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>
... ...
src/app/views/profile/block.html
  Diff comments   View file @4b131ce
... ... @@ -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>
... ...