Merge branch 'release/v1.0.7' into dev

Author: Parth Shah

.version

@@ -1 +1 @@
-v1.0.6
+v1.0.7

app/directives/profile-widget/profile-widget.directive.js

@@ -1,9 +1,9 @@
 (function() {
   'use strict';
 
-  angular.module('tcUIComponents').directive('profileWidget', ['CONSTANTS', '$filter', profileWidget]);
+  angular.module('tcUIComponents').directive('profileWidget', ['CONSTANTS', 'ProfileService', profileWidget]);
 
-  function profileWidget(CONSTANTS, $filter) {
+  function profileWidget(CONSTANTS, ProfileService) {
     return {
       restrict: 'E',
       templateUrl: 'directives/profile-widget/profile-widget.html',
@@ -16,9 +16,8 @@
       link: function(scope, elem, attrs) {
         scope.DOMAIN = CONSTANTS.domain;
         scope.ASSET_PREFIX = CONSTANTS.ASSET_PREFIX;
-        // get max rating or default to 0
-        var rating = _.get(scope.profile, 'maxRating.rating', 0);
-        scope.handleColor = $filter('ratingColor')(rating);
+
+        scope.handleColor = ProfileService.getUserHandleColor(scope.profile);
         scope.$watch('editProfileLink', function(newValue, oldValue, scope) {
           if (newValue) {
             scope.editProfileLink = newValue;

app/layout/header/header.controller.js

@@ -65,6 +65,7 @@
       vm.isAuth = TcAuthService.isAuthenticated();
       if (vm.isAuth) {
         vm.userHandle = UserService.getUserIdentity().handle;
+
         vm.userMenu = [
           { 'sref': 'dashboard', 'text': 'DASHBOARD', 'icon': '/images/nav/dashboard.svg' },
           { 'sref': 'profile.about', 'srefParams': { 'userHandle': vm.userHandle }, 'text': 'MY PROFILE', 'icon': '/images/nav/badge.svg' },
@@ -75,6 +76,7 @@
         ProfileService.getUserProfile(vm.userHandle)
         .then(function(data) {
           vm.profile = data;
+          vm.userHandleColor = ProfileService.getUserHandleColor(vm.profile);
         })
         .catch(function(err) {
           $log.error("Unable to get user data");

app/layout/header/header.jade

@@ -33,7 +33,7 @@
             span(ui-sref="profile.about({userHandle: vm.userHandle})")
               img(class="user-avatar", ng-src="{{vm.profile.photoURL}}")
 
-              span.username {{vm.userHandle}}
+              span.username(style="color:{{vm.userHandleColor}}") {{vm.userHandle}}
 
           a.btn-link.btn-edit-profile.show-small(ui-sref="settings.profile") EDIT
 

app/services/profile.service.js

@@ -3,9 +3,9 @@
 
   angular.module('tc.services').factory('ProfileService', ProfileService);
 
-  ProfileService.$inject = ['CONSTANTS', 'ApiService', 'UserService', '$q'];
+  ProfileService.$inject = ['CONSTANTS', 'ApiService', 'UserService', '$q', '$filter'];
 
-  function ProfileService(CONSTANTS, ApiService, UserService, $q) {
+  function ProfileService(CONSTANTS, ApiService, UserService, $q, $filter) {
 
     var restangular = ApiService.restangularV3;
 
@@ -29,8 +29,9 @@
       getTracks: getTracks,
       getSubTracks: getSubTracks,
       getDivisions: getDivisions,
-      // for profile - to be deprecated
-      getMockMemberProfile: getMockMemberProfile
+
+      getUserHandleColor: getUserHandleColor,
+
     };
     return service;
 
@@ -279,47 +280,12 @@
       };
     }
 
-    function getMockMemberProfile() {
-      if (!service.memberProfile) {
-        service.memberProfile = {
-          "links": [
-            {
-              "name": "Github",
-              "logo": "git-logo.png",
-              "properties": [
-                {
-                  "name": "Repos",
-                  "value": 20
-                },
-                {
-                  "name": "Followers",
-                  "value": 10
-                }
-              ]
-            },
-            {
-              "name": "Stack Overflow",
-              "logo": "stackoverflow-logo.png",
-              "properties": [
-                {
-                  "name": "Reputation",
-                  "value": 200
-                },
-                {
-                  "name": "Questions",
-                  "value": 102
-                },
-                {
-                  "name": "Answers",
-                  "value": 2001
-                }
-              ]
-            }
-          ]
-        };
-      }
-      return service.memberProfile;
+    function getUserHandleColor(profile) {
+      var rating = _.get(profile, 'maxRating.rating', 0);
+      return $filter('ratingColor')(rating);
     }
+
+
   }
 
 })();