Merge branch 'dev' into release/v1.0.2

Author: Parth Shah

README.md

@@ -1,4 +1,6 @@
 # Topcoder-App
+
+Supply rocks!
 This repository houses any new topcoder pages or refactored Angular apps/pages from the tc-site repository.
 
 The technologies used are Jade, SCSS, Angular, and Gulp.

app/directives/distribution-graph/distribution-graph.directive.js

@@ -90,7 +90,6 @@
 
     function resize() {
       if (window.innerWidth < 900 && desktop) {
-        console.log('yo!')
         d3.select('.distribution-graph svg').remove();
         draw(mobileMeasurements, $scope.distribution);
         desktop = false;
@@ -151,7 +150,7 @@
 
 
       function logr(x) {
-        console.log(x); return x;
+        return x;
       }
       svg.append('line')
          .attr('x1', xScale2($scope.rating))
@@ -281,7 +280,7 @@
 
     function removeLeadingZeroes(ranges) {
       while(ranges[0].number == 0) {
-        ranges.shift(); 
+        ranges.shift();
       }
     }
 
@@ -304,7 +303,7 @@
       });
       return colors[0] && colors[0].darkerColor || 'black';
     }
-    
+
     // TODO: delete because this is probably unnecessary
     function ratingToRange(ranges, rating) {
       var ans =  ranges.filter(function(range) {

app/directives/external-account/external-account.directive.js

@@ -96,10 +96,6 @@
           });
 
           $scope.$watchCollection('externalLinks', function(newValue, oldValue) {
-            console.log("WATCH COLLECTION EXTERNAL LINKS: ");
-            console.log("New Value: ", newValue);
-            console.log("Old Value: ", oldValue);
-
             angular.forEach(newValue, function(link) {
               var provider = link.providerType;
 

app/directives/history-graph/history-graph.directive.js

@@ -228,11 +228,9 @@
            .attr('stroke-width', 3)
 
       function processRatingStripePoint(y) {
-        console.log('y:' + y)
         if (y < padding.top || isNaN(y)) {
           return padding.top;
         } else if (y > totalH - padding.bottom) {
-          console.log('y & ' + padding.bottom);
           return totalH - padding.bottom;
         } else {
           return y;
@@ -286,7 +284,7 @@
       });
       return colors[0] && colors[0].darkerColor || 'black';
     }
-    
+
   }
 
 })();

app/directives/ios-card/ios-card.directive.jade

@@ -7,17 +7,19 @@
     p {{challenge.subTrack | underscoreStrip}}
 
   .challenge-details
+
+    p.currentPhase {{challenge.userCurrentPhase}}
+    .challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime")
+      p.ends-in Ends In
+      p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
+      p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}
+      
     p.prize-money(ng-show="challenge.reviewType === 'PEER'") Peer Review Challenge
 
     p.prize-money(ng-hide="challenge.reviewType === 'PEER'") {{challenge.totalCheckpointPrize || 0 | currency:undefined:0}}
 
     p.technologies {{challenge.technologies}}
 
-    .challenge-calendar
-      p.starts-in Starts In
-      p.time-remaining 3
-      p.unit-of-time days
-
     //button.phase-action(ng-class="{'action-completed': challenge.currentPhaseActionCompleted}") Submit
 
     .challenge-links

app/directives/srm-tile/srm-tile.directive.jade

@@ -31,7 +31,7 @@
       p.points #[span {{srm.result.finalPoints }}] #[span Points]
       .ranks
         .division
-          p.rank #[{{srm.result.divisionPlacement}}]
+          p.rank {{srm.result.divisionPlacement}}
           p.label  #[span Division {{srm.result.division}}]
         .room
           p.rank #[span {{srm.result.roomPlacement}}]
@@ -62,14 +62,14 @@
         a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.id}}") {{srm.name}}
 
     .srm-details
-      p.ended-on Ended #[{{srm.endDate | timeDiff:"quantity"}} {{srm.endDate | timeDiff:'unit'}}] ago
+      p.ended-on Ended {{srm.endDate | timeDiff:"quantity"}} {{srm.endDate | timeDiff:'unit'}} ago
 
     .member-stats
       p.points #[span {{srm.result.finalPoints }}] Points
 
       .ranks
         .division
-          p.rank #[{{srm.result.divisionPlacement}}]
+          p.rank {{srm.result.divisionPlacement}}
           p.label #[span Div {{srm.result.division}}] #[span Placement]
         .room
           p.rank #[span {{srm.result.roomPlacement}}]

app/my-challenges/my-challenges.controller.js

@@ -34,6 +34,7 @@
     activate();
 
     function activate() {
+      vm.isError = false;
       vm.isCopilot = _.includes(userIdentity.roles, 'copilot');
 
       // watches page change counter to reload the data
@@ -77,9 +78,9 @@
         filter: "status=" + vm.statusFilter
       };
       vm.loading = true;
+
       return ChallengeService.getUserChallenges(handle, params)
       .then(function(challenges){
-        console.log(challenges.plain());
         if (challenges.length > 0) {
           vm.myChallenges = challenges;
           vm.userHasChallenges = true;
@@ -90,10 +91,10 @@
         }
       })
       .catch(function(err) {
-        $log.error(err);
-        vm.userHasChallenges = true;
+        vm.userHasChallenges = false;
+        vm.isError = true;
         vm.loading = false;
-        // TODO - handle error
+        $log.error(err);
       });
     }
   }

app/my-challenges/my-challenges.jade

@@ -1,16 +1,18 @@
 .my-challenges-container
   .my-challenges
-
     .nav
       .breadcrumbs
         .dashboard
           a(ui-sref="dashboard") Dashboard
+
         .my-challenges // My Challenges
 
     .section-loading(ng-show="vm.loading")
 
     section.noChallenges(ng-if="!vm.userHasChallenges && !vm.loading")
-      You have not participated in any challenges yet.
+      p(ng-hide="vm.isError") You have not participated in any challenges yet.
+
+      p(ng-show="vm.isError") There was an error fetching challenges. Please try again later.
 
     .content
       section.challenges(ng-show="vm.userHasChallenges && !vm.loading")
@@ -30,5 +32,3 @@
 
         .bottom
           tc-paginator(data="vm.myChallenges", page-params="vm.pageParams")
-
-    hr

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,15 +2,8 @@ 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")
 
-      p Won
+      p Earned
 

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

@@ -42,9 +42,6 @@
         var marathonMatches = challenges[0];
         var devDesignChallenges = challenges[1];
 
-        // console.log('MMs: ', marathonMatches.plain());
-        // console.log('dev design challenges: ', devDesignChallenges.plain());
-
         if (!marathonMatches.length && !devDesignChallenges.length) {
           vm.userHasChallenges = false;
           vm.loading = false;
@@ -53,6 +50,7 @@
           ChallengeService.processActiveDevDesignChallenges(devDesignChallenges);
           ChallengeService.processActiveMarathonMatches(marathonMatches);
           var userChallenges = marathonMatches.concat(devDesignChallenges);
+          // FIX when working on marathon matches:
           // sort by closest deadline? .sort(function)
           // limit to 8 .slice(0, 8);
 

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

@@ -83,6 +83,7 @@
         }
 
         vm.challenges = challenges;
+        ChallengeService.processActiveDevDesignChallenges(vm.challenges);
         vm.loading = false;
       })
       .catch(function(err) {

app/my-dashboard/srms/srms.jade

@@ -12,9 +12,13 @@ section(ng-hide="vm.loading")
       .flex-wrapper
         h2 Practice on past problems
 
-        a(href="https://arena.{{DOMAIN}}") Launch Arena
+        a(ng-href="https://community.{{DOMAIN}}/tc?module=ProblemArchive") Problem Archives
 
-        a(href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
+        a(ng-href="https://community.{{DOMAIN}}/wiki/display/tc/Algorithm+Problem+Set+Analysis") Match Editorials
+
+        a(ng-href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
 
 .srms-links(ng-hide="vm.loading")
   a(ui-sref="my-srms") View Past SRMs
+
+  a(ng-href="https://arena.{{DOMAIN}}") Launch Arena

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

@@ -19,29 +19,9 @@
 
       ProfileService.getUserStats(vm.handle)
       .then(function(stats) {
-        var subtrackRanks = [];
-
         var trackRanks = ProfileService.getRanks(stats);
-
-        angular.forEach(trackRanks, function(subtracks, track) {
-          if (Array.isArray(subtracks) && subtracks.length) {
-            subtrackRanks = subtrackRanks.concat(subtracks);
-          }
-        });
-
-        angular.forEach(subtrackRanks, function(subtrack) {
-          if (subtrack.track === 'COPILOT') {
-            subtrack.stat = subtrack.activeContests;
-            subtrack.statType = 'Active Contests';
-          } else if (subtrack.track === 'DESIGN') {
-            subtrack.stat = subtrack.wins;
-            subtrack.statType = 'Wins';
-          } else {
-            subtrack.stat = subtrack.rating;
-            subtrack.statType = 'Rating';
-          }
-        });
-        console.log('subtrackRanks: ', subtrackRanks);
+        var subtrackRanks = compileSubtracks(trackRanks);
+        processStats(subtrackRanks);
 
         vm.subtrackRanks = subtrackRanks;
         vm.hasRanks = !!vm.subtrackRanks.length;
@@ -52,5 +32,38 @@
         vm.loading = false;
       });
     }
+
+    function compileSubtracks(trackRanks) {
+      return _.reduce(trackRanks, function(result, subtracks, track) {
+        if (Array.isArray(subtracks) && subtracks.length) {
+          if (track === 'DEVELOP') {
+            _.remove(subtracks, function(subtrackObj) {
+              return subtrackObj.subTrack === 'COPILOT_POSTING';
+            });
+          }
+
+          return result.concat(subtracks);
+
+        } else {
+          return result;
+
+        }
+      }, []);
+    }
+
+    function processStats(subtrackRanks) {
+      angular.forEach(subtrackRanks, function(subtrack) {
+        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';
+        }
+      });
+    }
   }
 })();

app/profile/profile.controller.js

@@ -23,8 +23,7 @@
       'COPILOT': 'copilot'
     };
 
-    // spinnerssss
-    $log.debug()
+    $log.debug();
     vm.status = {
       'badges': CONSTANTS.STATE_LOADING,
       'stats': CONSTANTS.STATE_LOADING,
@@ -51,15 +50,13 @@
       vm.status.stats = CONSTANTS.STATE_ERROR;
     });
 
-    // skills
     vm.skillsPromise = ProfileService.getUserSkills(vm.userHandle).then(function(skills) {
       vm.skills = skills.skills;
       vm.status.skills = CONSTANTS.STATE_READY;
     }).catch(function(err) {
       vm.status.skills = CONSTANTS.STATE_ERROR;
     });
 
-    // externalLinks
     vm.externalLinksPromise = ExternalAccountService.getLinkedExternalLinksData(vm.userHandle).then(function(data) {
       vm.linkedExternalAccountsData = data.plain();
       console.log('EXT')