Merge branch 'dev' into persistent-placeholder

Author: Nick Litwin

app/my-dashboard/header-dashboard/header-dashboard.controller.js

@@ -7,18 +7,12 @@
     '$stateParams',
     'NotificationService',
     'ProfileService',
-    'CONSTANTS',
-    'userIdentity',
-    '$q'
+    'userIdentity'
   ];
 
-  function HeaderDashboardController($stateParams, NotificationService, ProfileService, CONSTANTS, userIdentity, $q) {
+  function HeaderDashboardController($stateParams, NotificationService, ProfileService, userIdentity) {
     var vm = this;
-    vm.domain = CONSTANTS.domain;
-    vm.isCopilot = false;
     vm.loading = true;
-    vm.hasRatings = true;
-    vm.rankStats = [];
 
     if ($stateParams.notifyReset) {
       NotificationService.inform('Thanks. Your new password has been set.');
@@ -29,25 +23,13 @@
     function activate() {
       var handle = userIdentity.handle;
 
-      $q.all([
-        ProfileService.getUserStats(handle),
-        ProfileService.getUserFinancials(handle)
-      ]).then(function(data) {
-        var stats = data[0];
-        var financials = data[1];
-
+      ProfileService.getUserFinancials(handle)
+      .then(function(financials) {
         vm.moneyEarned = _.sum(_.pluck(financials, 'amount'));
-
-        if (stats.COPILOT != null) {
-          vm.numCopilotActiveContests = stats.COPILOT.activeContests;
-        } else {
-          vm.numCopilotActiveContests = 0;
-        }
-
         vm.loading = false;
+
       })
       .catch(function(err) {
-        vm.hasRatings = false;
         vm.loading = false;
       });
     }

app/my-dashboard/header-dashboard/header-dashboard.jade

@@ -2,13 +2,6 @@ header
   h1 My Dashboard
 
   .user-stats(id="metrics", ng-hide="vm.loading")
-    .copilot-challenges(ng-show="dashboard.isCopilot")
-      p.number(ng-bind='vm.numCopilotActiveContests')
-
-      p Copilot Challenges
-
-    .slash(ng-show="dashboard.isCopilot")
-
     .money-earned
       p.number(ng-bind="vm.moneyEarned | currency:'$':0")
 

app/my-dashboard/subtrack-stats/subtrack-stats.controller.js

@@ -35,7 +35,7 @@
 
     function compileSubtracks(trackRanks) {
       return _.reduce(trackRanks, function(result, subtracks, track) {
-        if (Array.isArray(subtracks) && subtracks.length && track !== 'COPILOT') {
+        if (Array.isArray(subtracks) && subtracks.length) {
           if (track === 'DEVELOP') {
             _.remove(subtracks, function(subtrackObj) {
               return subtrackObj.subTrack === 'COPILOT_POSTING';
@@ -56,6 +56,9 @@
         if (subtrack.track === 'DESIGN') {
           subtrack.stat = subtrack.wins;
           subtrack.statType = 'Wins';
+        } else if (subtrack.track === 'COPILOT') {
+          subtrack.stat = subtrack.activeContests;
+          subtrack.statType = 'Challenges';
         } else {
           subtrack.stat = subtrack.rating;
           subtrack.statType = 'Rating';

assets/css/my-dashboard/header-dashboard.scss

@@ -45,17 +45,7 @@
         margin-bottom: 0;
       }
 
-      .slash {
-        @include forward-slash(1px, 40px, 0, 2px, 30deg);
-        margin-right: 8px;
-        background-color: #D1D3D4;
-        @media only screen and (min-width: 600px) {
-          @include forward-slash(1px, 45px, 0, 2px, 30deg);
-          margin-right: 10px;
-        }
-      }
-
-      .money-earned, .copilot-challenges {
+      .money-earned {
         display: flex;
         flex-direction: column;
         text-align: right;
@@ -91,14 +81,6 @@
           padding-left: 10px;
         }
       }
-
-      .copilot-challenges {
-        margin-right: 10px;
-        padding-right: 15px;
-        @media only screen and (min-width: 600px) {
-          padding-right: 10px;
-        }
-      }
     }
   }
 }