Merge branch 'dev' into feature/settings-styles

Author: tladendo

app/account/account.routes.js

@@ -29,7 +29,7 @@
       },
       'login': {
         parent: 'auth',
-        url: '/login/?next&code&state&status&userJWTToken',
+        url: '/login/?next&code&state&status&userJWTToken&utm_source&utm_medium&utm_campaign',
         params: { 'notifyReset': false },
         data: {
           title: 'Login'
@@ -51,7 +51,7 @@
       },
       'register': {
         parent: 'auth',
-        url: '/register/?next',
+        url: '/register/?next&utm_source&utm_medium&utm_campaign',
         data: {
           title: "Join"
         },

app/account/login/login.controller.js

@@ -22,6 +22,8 @@
       function(data) {
         // success
         $log.debug('logged in');
+        // setup login event for analytics tracking
+        Helpers.setupLoginEventMetrices(usernameOrEmail);
         return Helpers.redirectPostLogin($stateParams.next);
       })
      .catch(function(resp) {

app/account/register/register.controller.js

@@ -9,6 +9,12 @@
     $log = $log.getInstance("RegisterController");
     $log.debug("-init");
     var vm = this;
+    // prepares utm params, if available
+    var utm = {
+      source : $stateParams && $stateParams.utm_source ? $stateParams.utm_source : '',
+      medium : $stateParams && $stateParams.utm_medium ? $stateParams.utm_medium : '',
+      campaign : $stateParams && $stateParams.utm_campaign ? $stateParams.utm_campaign : ''
+    };
 
 
     // Set default for toggle password directive
@@ -40,9 +46,9 @@
         country: {
           code: vm.country
         },
-        utmSource: '',
-        utmMedium: '',
-        utmCampaign: ''
+        utmSource: utm.source,
+        utmMedium: utm.medium,
+        utmCampaign: utm.campaign
       };
 
       if (!vm.isSocialRegistration) {
@@ -64,7 +70,7 @@
       var body = {
         param: userInfo,
         options: {
-          afterActivationURL: CONSTANTS.MAIN_URL + '/skillpicker/'
+          afterActivationURL: $state.href('skillPicker', {}, {absolute: true})
         }
       }
 

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

@@ -1,48 +1,65 @@
 .challenge.tile-view(ng-show="view === 'tile'", ng-class="challenge.track")
-  .challenge-track
+  .active-challenge(ng-show="challenge.status === 'ACTIVE'")
+    .challenge-track
 
-  header
-    a(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}") {{challenge.name}}
+    header
+      a(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}") {{challenge.name}}
 
-    p {{challenge.subTrack | underscoreStrip}}
+      p.subtrack-color {{challenge.subTrack | underscoreStrip}}
 
-  .challenge-details
-    p.currentPhase {{challenge.userCurrentPhase}}
+    .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]}}
+      .challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime")
+        p.ends-in Ends In
+        p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
+        p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}
 
-    .stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
+      .stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
 
-    .phase-action(ng-switch="challenge.userAction")
-      .submit(ng-switch-when="Submit") Submit
+      .phase-action(ng-switch="challenge.userAction")
+        .submit(ng-switch-when="Submit") Submit
 
-      .submitted(ng-switch-when="Submitted") Submitted
+        .submitted(ng-switch-when="Submitted") Submitted
 
-      // Need styling and JS logic for this one
-      .registered(ng-switch-when="Registered") Registered
+        // Need styling and JS logic for this one
+        .registered(ng-switch-when="Registered") Registered
+
+      // Only show if not data science track
+      p.roles {{challenge.userDetails.roles | listRoles}}
+
+      .challenge-links
+        .stats
+          a.registrants(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant")
+            .registrants-icon
+
+            p {{challenge.numRegistrants}}
+
+          a.submissions(ng-hide="challenge.track === 'DATA SCIENCE'", ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant")
+            .submissions-icon
+
+            p {{challenge.numSubmissions}}
+
+        a.forum(ng-href="http://apps.{{DOMAIN}}/forums//?module=Category&categoryID={{challenge.forumId}}")
+          .forum-icon
 
-    // Only show if not data science track
-    p.roles {{challenge.userDetails.roles | listRoles}}
+          p Forum
 
-    .challenge-links
-      .stats
-        a.registrants(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant")
-          .registrants-icon
+  .completed-challenge(ng-show="challenge.status === 'COMPLETED'")
+    header
+      a(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}") {{challenge.name}}
 
-          p {{challenge.numRegistrants}}
+      p.date-completed {{challenge.submissionEndDate | date : 'MMMM yyyy'}}
 
-        a.submissions(ng-hide="challenge.track === 'DATA SCIENCE'", ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant")
-          .submissions-icon
+      .winner-ribbon(ng-show="challenge.wonFirst")
 
-          p {{challenge.numSubmissions}}
+    .challenge-details
+      p.place(ng-class="{ 'first-place': challenge.wonFirst }") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
 
-      a.forum(ng-href="http://apps.{{DOMAIN}}/forums//?module=Category&categoryID={{challenge.forumId}}")
-        .forum-icon
+      .challenge-score
+        p.score {{challenge.userDetails.submissionReviewScore/100 | percentage}}
 
-        p Forum
+        p Review Score
 
 .challenge.list-view(ng-show="view=='list'", ng-class="challenge.track")
   .challenge-track
@@ -52,7 +69,6 @@
 
     p.subtrack {{challenge.subTrack | underscoreStrip}}
 
-    // Only show if not data science track
     p.roles(ng-hide="challenge.track === 'DATA SCIENCE'") #[span Role:] {{challenge.userDetails.roles | listRoles}}
 
   .challenge-details

app/directives/tc-paginator/tc-paginator.jade

@@ -1,10 +1,10 @@
-p.pager
-  a.prev(ng-click="vm.prevPage()", ng-class="{disabled: !vm.prevPageAvailable}") Prev
-  span   |  
-  span.first(ng-bind="vm.pageParams.offset + 1")
-  span -
-  span.last(ng-bind="vm.pageParams.offset + vm.pageParams.count")
-  span   of  
-  span.total(ng-bind="vm.pageParams.totalCount")
-  span   |  
+.pager
+  a.prev(ng-click="vm.prevPage()", ng-class="{disabled: !vm.prevPageAvailable}") Previous
+  .status
+    span Showing  
+    span.first(ng-bind="vm.pageParams.offset + 1")
+    span -
+    span.last(ng-bind="vm.pageParams.offset + vm.pageParams.count")
+    span   of  
+    span.total(ng-bind="vm.pageParams.totalCount")
   a.next(ng-click="vm.nextPage()", ng-class="{disabled: !vm.nextPageAvailable}") Next

app/filters/ordinal.filter.js

@@ -4,7 +4,7 @@
   angular.module('topcoder').filter('ordinal', ordinal);
 
   function ordinal() {
-    return function(x) {
+    return function(x, onlySuffix) {
       x += '';
       var y = x.charAt(x.length - 1);
       var suffix;
@@ -21,6 +21,11 @@
         default:
           suffix = 'th';
       }
+
+      if (onlySuffix) {
+        return suffix;
+      }
+
       return x + suffix;
     };
   }

app/filters/rating-color.filter.js

@@ -14,35 +14,35 @@
       var colors = [
         // grey
         {
-          'color': '#7f7f7f',
+          'color': '#9D9FA0',
           'darkerColor': '#656565',
           'start': 0,
           'end': 899
         },
         // green
         {
-          'color': '#99cc09',
+          'color': '#69C329',
           'darkerColor': '#7aa307',
           'start': 900,
           'end': 1199
         },
         // blue
         {
-          'color': '#09affe',
+          'color': '#616BD5',
           'darkerColor': '#078ccb',
           'start': 1200,
           'end': 1499
         },
         // yellow
         {
-          'color': '#f39426',
+          'color': '#FCB816',
           'darkerColor': '#c2761e',
           'start': 1500,
           'end': 2199
         },
         // red
         {
-          'color': '#fe0866',
+          'color': '#EF3A3A',
           'darkerColor': '#cb0651',
           'start': 2200,
           'end': Infinity

app/index.jade

@@ -83,7 +83,9 @@ html
 
     toaster-container(toaster-options="{{main.globalToasterConfig}}")
 
-    .view-container(ui-view="container")
+    .fold-wrapper
+      .view-container(ui-view="container")
+      .fold-pusher
 
     div(ui-view="footer")
 
@@ -242,6 +244,27 @@ html
     // endinject
     // endbuild
 
+    // tracking code for Marketo
+    script(type='text/javascript').
+      document.write(unescape("%3Cscript src='//munchkin.marketo.net/munchkin.js' type='text/javascript'%3E%3C/script%3E"));
+    script.
+      Munchkin.init('921-UOU-112', {"wsInfo":"jFRS"}
+      );
+    // tracking code for Kissmetrics
+    script(type='text/javascript').
+      var _kmq = _kmq || [];
+      var _kmk = _kmk || 'aa23cd43c455ef33b6a0df3de81a79af9ea30f75';
+      function _kms(u){
+      setTimeout(function(){
+      var d = document, f = d.getElementsByTagName('script')[0],
+      s = d.createElement('script');
+      s.type = 'text/javascript'; s.async = true; s.src = u;
+      f.parentNode.insertBefore(s, f);
+      }, 1);
+      }
+      _kms('//i.kissmetrics.com/i.js');
+      _kms('//scripts.kissmetrics.com/' + _kmk + '.2.js');
+
     script(type="text/javascript").
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

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

@@ -3,9 +3,9 @@
 
   angular.module('tc.myChallenges').controller('MyChallengesController', MyChallengesController);
 
-  MyChallengesController.$inject = ['ChallengeService', 'UserService', '$q', '$log', 'CONSTANTS', 'Helpers', '$scope', 'userIdentity'];
+  MyChallengesController.$inject = ['ChallengeService', 'UserService', '$q', '$log', 'CONSTANTS', 'Helpers', '$scope', 'userIdentity', 'statusFilter'];
 
-  function MyChallengesController(ChallengeService, UserService, $q, $log, CONSTANTS, Helpers, $scope, userIdentity) {
+  function MyChallengesController(ChallengeService, UserService, $q, $log, CONSTANTS, Helpers, $scope, userIdentity, statusFilter) {
     var vm = this;
     vm.domain = CONSTANTS.domain;
     vm.loading = true;
@@ -15,7 +15,8 @@
     vm.viewPastChallenges = viewPastChallenges;
     vm.view = 'list';
     vm.changeView = changeView;
-    vm.statusFilter = 'active';
+    vm.statusFilter = statusFilter ? statusFilter : 'active';
+
     // paging params, these are updated by tc-pager
     vm.pageParams = {
       offset : 0,
@@ -27,8 +28,8 @@
     };
     vm.orderBy = 'submissionEndDate';
 
-    var userId = UserService.getUserIdentity().userId;
-    var handle = UserService.getUserIdentity().handle;
+    var userId = userIdentity.userId;
+    var handle = userIdentity.handle;
 
     activate();
 
@@ -39,7 +40,11 @@
       $scope.$watch('vm.pageParams.updated', function(updatedParams) {
         _getChallenges();
       });
-      viewActiveChallenges();
+      if (vm.statusFilter == 'completed') {
+        viewPastChallenges();
+      } else {
+        viewActiveChallenges();
+      } 
     }
 
     function changeView(view) {
@@ -70,9 +75,7 @@
         limit: vm.pageParams.limit,
         offset: vm.pageParams.offset,
         orderBy: vm.orderBy, // TODO verify if this is the correct sort order clause,
-        filter: {
-          status : vm.statusFilter
-        }
+        filter: "status=" + vm.statusFilter
       };
       vm.loading = true;
       return ChallengeService.getUserChallenges(handle, params)