Merge branch 'dev' of https://github.com/appirio-tech/topcoder-app into forms-refactor

# By Parth Shah (4) and others
# Via Parth Shah (8) and others
* 'dev' of https://github.com/appirio-tech/topcoder-app:
  SUP-2286, [Registration] Skill picker issue
  added some safeguards
  fixing skill icon
  reverted back based on review with community team
  Cutting member of month and moving copilots up
  Updated Arena to Competitive Programming
  Update communityData.service.js
  using rootscope to udpate page header directive & header controller on image / profile chnage
  enabling introjs and remove element selection as per anuj's request
  adding community home

Author: Victor George

app/community/community.controller.js

@@ -14,10 +14,10 @@
       'community': {
         parent: 'root',
         url: '/community/',
+        abstract: true,
         data: {
           authRequired: false,
-        },
-        controller: 'BaseCommunityController'
+        }
       },
       'community.members': {
         parent: 'root',

app/community/community.routes.js

@@ -23,9 +23,9 @@
               scope);
             element.attr('disabled', true).html('').append(busyMessageHtml);
           } else {
-            // remove the disabled attribute only if either element does not have ng-disabled set
+            // remove the disabled attribute only if either element does not have disabled set
             // or it evaluates to false
-            if (!attr.ngDisabled || !$parse(attr.ngDisabled)) {
+            if (!attrs.disabled) {
               element.removeAttr('disabled').html(scope.originalContent);
             }
           }

app/directives/busy-button/busy-button.directive.js

@@ -4,10 +4,10 @@
   p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
   p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
 
-  .thumbnail(ng-click="openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
-    img(ng-src="{{imageURL}}", fallback-src="/images/ico-picture.svg")
+  .thumbnail(ng-click="imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
+    img(ng-src="{{imageURL || '/images/ico-picture.svg'}}", fallback-src="/images/ico-picture.svg")
 
-    .thumbnail-gallery(ng-click="openLightbox()")
+    .thumbnail-gallery(ng-click="imageURL && openLightbox()")
       .gallery-icon
 
       .num-images 1 image

app/directives/challenge-user-place/design-challenge-user-place.directive.jade

@@ -13,12 +13,12 @@
         hideMoney: '=',
         defaultState: '@'
       },
-      controller: ['$scope', 'NotificationService', 'ProfileService', '$log', '$state', pageStateHeader],
+      controller: ['CONSTANTS', '$rootScope', '$scope', 'NotificationService', 'ProfileService', '$log', '$state', pageStateHeader],
       controllerAs: "vm"
     };
   });
 
-  function pageStateHeader($scope, NotificationService, ProfileService, $log, $state) {
+  function pageStateHeader(CONSTANTS, $rootScope, $scope, NotificationService, ProfileService, $log, $state) {
     var vm = this;
     vm.handle = $scope.handle;
     vm.profile = null;
@@ -31,12 +31,16 @@
     vm.backHandler = backHandler;
     activate();
 
+    // watch for profile update event in case handle/image are updated
+    $rootScope.$on(CONSTANTS.EVENT_PROFILE_UPDATED, function() {
+      activate();
+    });
+
     function activate() {
       vm.loading = true;
 
       // identifies the previous state
       if ($scope.$root.previousState && $scope.$root.previousState.name.length > 0) {
-        console.log($scope.$root.previousState);
         vm.previousState = $scope.$root.previousState;
         vm.previousStateName = vm.previousState.name;
       } else if ($scope.defaultState) {

app/directives/page-state-header/page-state-header.directive.js

@@ -175,7 +175,6 @@ html
     script(src="blocks/logger/logEnhancer.js")
     script(src="blocks/logger/logger.js")
     script(src="community/community.module.js")
-    script(src="community/community.controller.js")
     script(src="community/community.routes.js")
     script(src="community/members.controller.js")
     script(src="community/statistics.controller.js")

app/index.jade

@@ -32,6 +32,7 @@
       angular.forEach([
         CONSTANTS.EVENT_USER_LOGGED_IN,
         CONSTANTS.EVENT_USER_LOGGED_OUT,
+        CONSTANTS.EVENT_PROFILE_UPDATED
       ], function(event) {
         $rootScope.$on(event, function() {
           initHeaderProps(event);

app/layout/header/header.controller.js

@@ -71,17 +71,17 @@
       var deferred = $q.defer();
       var data = {
         "SRMWinners": [{
-          "avatar": "http://www.topcoder.com/i/m/tourist.jpeg",
-          "name": "tourist",
-          "date": "20151014T000000Z",
-          "country": "Belarus",
-          "contests": ["SRM 671 DIVISION 1 WINNER"]
+          "avatar": "https://s3.amazonaws.com/app.topcoder-dev.com/images/ico-user-default.7aa28736.svg",
+          "name": "xudyh",
+          "date": "20151020T000000Z",
+          "country": "China",
+          "contests": ["SRM 672 DIVISION 1 WINNER"]
         }, {
-          "avatar": "https://www.topcoder.com/i/m/thegunner2401.jpeg",
-          "name": "thegunner2401",
-          "date": "20151014T000000Z",
-          "country": "Viet Nam",
-          "contests": ["SRM 671 DIVISION 2 WINNER"]
+          "avatar": "https://s3.amazonaws.com/app.topcoder-dev.com/images/ico-user-default.7aa28736.svg",
+          "name": "jiangshibiao2",
+          "date": "20151020T000000Z",
+          "country": "China",
+          "contests": ["SRM 672 DIVISION 2 WINNER"]
         }],
         "MarathonWinner": [{
           "avatar": "http://www.topcoder.com/i/m/eldidou.jpeg",

app/services/communityData.service.js

@@ -81,17 +81,17 @@
               intro: 'Welcome to the new Topcoder Profile. To make this the premier place to showcase skills, we have reimagined this page and introduced several new features.'
             },
             {
-              element: '#skills',
+              // element: '#skills',
               intro: 'The quickest way to understand a member’s skills. It includes languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.',
               position: 'top'
             },
             {
-              element: '#tcActivity',
+              // element: '#tcActivity',
               intro: 'Topcoder activity, ratings and other statistics now live in this section. See the active sub-tracks and click on them for even more details and history.',
               position: 'top'
             },
             {
-              element: '#externalLinks',
+              // element: '#externalLinks',
               intro: 'Best of member’s presence on the web will be highlighted here. Show off your work and experience outside of Topcoder by connecting accounts or adding links.',
               position: 'top'
             }
@@ -103,12 +103,12 @@
               intro: 'Welcome to the new Sub-track details page. This page contains activity in this track and in-depth metrics in an easy-to-understand way.'
             },
             {
-              element: '#subtrack-stats',
+              // element: '#subtrack-stats',
               intro: 'Find the most important metrics here to understand performance in a glance. You can scroll below to see charts and more in-depth metrics to get a very granular understanding of the activity in this subtrack.',
               position: 'bottom'
             },
             {
-              element: '#challenges-tab',
+              // element: '#challenges-tab',
               intro: 'This sections contains all the completed challenges, in order of success.',
               position: 'top'
             }
@@ -121,32 +121,32 @@
             intro: 'Welcome to your new Topcoder Dashboard. We have revamped the dashboard to bring to fore the information that matters to you. Let us walk you through some of the new things to help you keep on top of your Topcoder activity.'
           },
           {
-            element: '#metrics',
+            // element: '#metrics',
             intro: 'Quickly glance your active challenges and money earned, and click on them to see more in detail.',
             position: 'bottom'
           },
           {
-            element: '#stats',
+            // element: '#stats',
             intro: 'Keep on top of how you are faring vs rest of the community with the rating here.',
             position: 'top'
           },
           {
-            element: '#challenges',
+            // element: '#challenges',
             intro: 'All your active challenges can be found here. See the phase, and activity on here, or click on them to go to the challenge details. You can view these in a grid or list view.',
             position: 'top'
           },
           {
-            element: '#viewAllChallenges',
+            // element: '#viewAllChallenges',
             intro: 'Want to see more of the challenges? Or look up a past one? Click on the buttons here to see all of your challenges.',
             position: 'top'
           },
           {
-            element: '#srms',
+            // element: '#srms',
             intro: 'Keep track of the SRMs being scheduled, and find easy links to past problems, editorial and the Arena.',
             position: 'top'
           },
           {
-            element: '#community',
+            // element: '#community',
             intro: 'Don’t miss out on the latest happenings in our community. Blogs, Events, Member Programs and more!',
             position: 'top'
           }

app/services/introduction.service.js

@@ -19,7 +19,7 @@
           { 'href':  "/challenges/design/active/?pageIndex=1", 'text': 'DESIGN CHALLENGES', 'icon': '/images/nav/track-design.svg' },
           { 'href':  "/challenges/develop/active/?pageIndex=1", 'text': 'DEVELOPMENT CHALLENGES', 'icon': '/images/nav/track-develop.svg' },
           { 'href':  "/challenges/data/active/?pageIndex=1", 'text': 'DATA SCIENCE CHALLENGES', 'icon': '/images/nav/track-data.svg' },
-          { 'href':  CONSTANTS.ARENA_URL, 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/track-cp.svg', 'target': '_blank' },
+          { 'href':  CONSTANTS.ARENA_URL, 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/track-cp.svg', 'target': '_blank' }
       ],
       'learn': [
           { 'href': '/getting-started/', 'text': 'GETTING STARTED', 'icon': '/images/nav/rocket.svg' },
@@ -29,6 +29,7 @@
           { 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/book-cp.svg' },
       ],
       'community': [
+          { 'sref': 'community', 'text': 'HOME', 'icon': '/images/nav/community.svg' },
           { 'sref': 'community.members', 'text': 'MEMBERS', 'icon': '/images/nav/members.svg' },
           { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': '/images/nav/programs.svg' },
           { 'href': CONSTANTS.FORUMS_APP_URL, 'text': 'FORUMS', 'icon': '/images/nav/forums.svg', 'target': '_blank' },

app/services/nav.service.js

@@ -3,9 +3,9 @@
 
   angular.module('tc.services').factory('ProfileService', ProfileService);
 
-  ProfileService.$inject = ['CONSTANTS', 'ApiService', 'UserService', '$q', '$filter'];
+  ProfileService.$inject = ['CONSTANTS', 'ApiService', 'UserService', '$q', '$filter', '$rootScope'];
 
-  function ProfileService(CONSTANTS, ApiService, UserService, $q, $filter) {
+  function ProfileService(CONSTANTS, ApiService, UserService, $q, $filter, $rootScope) {
 
     var restangular = ApiService.restangularV3;
 
@@ -42,7 +42,11 @@
     }
 
     function updateUserProfile(userData) {
-      return userData.save();
+      return userData.save().then(function(resp) {
+        // notify listeners of profile update event
+        $rootScope.$broadcast(CONSTANTS.EVENT_PROFILE_UPDATED);
+        return resp;
+      });
     }
 
     function getUserSkills(username) {

app/services/profile.service.js

@@ -4,9 +4,9 @@
   angular.module('tc.settings').controller('EditProfileController', EditProfileController);
 
 
-  EditProfileController.$inject = ['userData', 'userHandle', 'ProfileService', 'ExternalAccountService', '$log', 'ISO3166', 'ImageService', 'CONSTANTS', 'TagsService', 'toaster', '$scope'];
+  EditProfileController.$inject = ['$rootScope', 'userData', 'userHandle', 'ProfileService', 'ExternalAccountService', '$log', 'ISO3166', 'ImageService', 'CONSTANTS', 'TagsService', 'toaster', '$scope'];
 
-  function EditProfileController(userData, userHandle, ProfileService, ExternalAccountService, $log, ISO3166, ImageService, CONSTANTS, TagsService, toaster, $scope) {
+  function EditProfileController($rootScope, userData, userHandle, ProfileService, ExternalAccountService, $log, ISO3166, ImageService, CONSTANTS, TagsService, toaster, $scope) {
     $log = $log.getInstance("EditProfileCtrl");
     var vm = this;
     vm.toggleTrack    = toggleTrack;
@@ -112,6 +112,7 @@
       .then(ImageService.createFileRecord)
       .then(function(newPhotoURL) {
         vm.userData.photoURL = newPhotoURL;
+        $rootScope.$broadcast(CONSTANTS.EVENT_PROFILE_UPDATED);
       });
     }
 

app/settings/edit-profile/edit-profile.controller.js

@@ -30,8 +30,7 @@
       $rootScope.$on('$stateChangeSuccess', function(evt, toState, toParams, fromState, fromParams) {
         $document[0].body.scrollTop = $document[0].documentElement.scrollTop = 0;
 
-        vm.introOptions = {};
-        // vm.introOptions = IntroService.getCurrentPageOptions();
+        vm.introOptions = IntroService.getCurrentPageOptions();
 
         $timeout(function() {
           if (vm.introOptions) {