Release dev to qa

Gruntfile.js

@@ -59,7 +59,7 @@ module.exports = function(grunt) {
     cbURL: grunt.option('cb-url') || 'https://coderbits.com',
 
     blogRSSFeedURL: grunt.option('blog-rss-feed') || 'https://www.topcoder.com/feed/?post_type=blog',
-    photoLinkBaseURL: grunt.option('photo-link-base') || 'http://community.topcoder.com',
+    photoLinkBaseURL: grunt.option('photo-link-base') || 'https://www.topcoder.com',
 
     marketingMessageMyDashURL: grunt.option('marketing-message-my-dash-url') || 'https://banners-r-us.herokuapp.com/serve?size=650x150'
   };

src/conf/build-dev.sh

@@ -1 +1 @@
-grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=http://community.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=forums.topcoder-dev.com --swift-program-id=3445 --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1
+grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=https://www.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=forums.topcoder-dev.com --swift-program-id=3445 --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1

src/conf/build-qa.sh

@@ -1 +1 @@
-grunt --main-url=https://www.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=http://community.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=forums.topcoder-qa.com --swift-program-id=3445 --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1
+grunt --main-url=https://www.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=https://www.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=forums.topcoder-qa.com --swift-program-id=3445 --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1

src/conf/tc-nginx.conf

@@ -70,7 +70,7 @@ server {
     }
 
     location ~ ^/fonts/ {
-        add_header 'Access-Control-Allow-Origin' "$http_origin" always;
+        add_header 'Access-Control-Allow-Origin' "$http_origin";
         add_header 'Access-Control-Allow-Headers' "Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since" always;
         root $root_base/dist;
     }

src/css/base.css

@@ -215,6 +215,14 @@ sub, sup {
     margin-bottom: 5px;
 }
 
+.margin-left-1x {
+    margin-left: 5px;
+}
+
+.margin-right-1x {
+    margin-right: 5px;
+}
+
 .margin-vert-1x {
     margin-top: 5px;
     margin-bottom: 5px;

src/css/my-dashboard.css

@@ -223,12 +223,12 @@
 }
 
 .member-program-content .panel-body {
-    /*background: -webkit-linear-gradient(360deg, rgb(15, 16, 31), rgb(101,220,85), rgb(164, 13, 62));*/
     height: 377px;
-    /*margin-left: 50px;*/
     overflow: hidden;
-    background: url('../i/swift_background_hpattern.jpg') repeat-x center center;
-    color: #eeeeee;
+}
+
+.member-program-content img[rel="program-logo"] {
+  height: 80px;
 }
 
 .member-program-content .display-image {
@@ -241,8 +241,7 @@
 }
 
 .member-program-content .description {
-  /*float: left;
-  width: 50%;*/
+  text-align: justify;
 }
 
 .member-program-content .signup {
@@ -296,15 +295,18 @@
 }
 
 .member-program-content *[rel="badges"] *[rel="badge-status"] {
-  padding-left: 20px;
   margin-top: 5px;
 }
+.member-program-content *[rel="badges"] *[rel="badge-status"] *[rel="image"] {
+  width: 20px;
+  height: 20px;
+}
 
-.member-program-content *[rel="badges"] *[rel="badge-status"].pending {
+.member-program-content *[rel="badges"] *[rel="badge-status"].pending *[rel="image"] {
   background: url("../i/check-box.png") no-repeat 0 0px;
 }
 
-.member-program-content *[rel="badges"] *[rel="badge-status"].completed {
+.member-program-content *[rel="badges"] *[rel="badge-status"].completed *[rel="image"] {
   background: url("../i/check-box.png") no-repeat 0 -20px;
 }
 
@@ -360,8 +362,30 @@
   background: url("../i/ico-track-design.png") no-repeat center center;
 }
 
-.my-challenges th {
+.my-challenges table > thead > tr > th {
   text-align: center;
+  white-space: nowrap;
+  padding-left: 13px;
+  padding-right: 13px;
+}
+
+.my-challenges th .sort,
+.my-challenges th .sort-icon-place {
+  width: 100%;
+  height: 12px;
+
+}
+
+.my-challenges th[rel="sortable"] {
+  cursor: pointer;
+}
+
+.my-challenges th .sort.asc {
+  background: #f5f5f5 url("../i/sort-arrows.png") no-repeat center -94px;
+}
+
+.my-challenges th .sort.desc {
+  background: #f5f5f5 url("../i/sort-arrows.png") no-repeat center 6px;
 }
 
 .my-challenges table > tbody> tr > td {
@@ -376,6 +400,7 @@
 
 .my-challenges td[rel="challenge-name"] {
   text-align: left;
+  /*max-width: 320px;*/
 }
 
 .my-challenges td[rel="challenge-name"] > a {
@@ -403,6 +428,25 @@
   text-align: center;
 }
 
+.upcoming-srms-div th .sort,
+.upcoming-srms-div th .sort-icon-place {
+  width: 100%;
+  height: 12px;
+
+}
+
+.upcoming-srms-div th[rel="sortable"] {
+  cursor: pointer;
+}
+
+.upcoming-srms-div th .sort.asc {
+  background: #f5f5f5 url("../i/sort-arrows.png") no-repeat center -94px;
+}
+
+.upcoming-srms-div th .sort.desc {
+  background: #f5f5f5 url("../i/sort-arrows.png") no-repeat center 6px;
+}
+
 .upcoming-srms-div table > tbody> tr > td {
   padding-top: 20px;
   padding-bottom: 20px;

src/js/app/challenge-details/index.html

@@ -381,14 +381,14 @@ <h3>Challenge Links:</h3>
                       Scorecard</a></p>
 
                   <p ng-show="!CD.isDesign && CD.challenge.reviewScorecardId"><a
-                      href="http://software.topcoder.com/review/actions/ViewScorecard.do?method=viewScorecard&scid={{CD.challenge.reviewScorecardId}}">Review
+                      href="{{CD.reviewScorecardLink}}" target="_blank">Review
                       Scorecard</a></p>
                 </div>
 
               </div>
 
             </li>
-            <li ng-hide="CD.isDesign" class="slide">
+            <li ng-hide="CD.isDesign || CD.isPeerReviewed" class="slide">
 
               <div class="umltoolLinks slideBox">
                 <h3>Get the UML Tool:</h3>

src/js/app/challenge-details/js/controllers/challenge-details-controller.js

@@ -237,6 +237,7 @@
 
     // Global variable available from ng-page-challenge-details.php
     challengeName = challenge.challengeName;
+    var reviewScorecardId = challenge.reviewScorecardId;
     vm.isDesign = (challengeType === 'design');
     vm.allowDownloads = challenge.currentPhaseName === 'Registration' || challenge.currentPhaseName === 'Submission';
 
@@ -363,9 +364,11 @@
     if (vm.challenge.reviewType == 'PEER') {
       vm.reviewStyle = 'Peer Review';
       vm.reviewStyleTooltip = 'Your peers performs a thorough review based on scorecards.';
+      vm.reviewScorecardLink = '/reviews/index.html#/scorecard/' + reviewScorecardId;
     } else {
       vm.reviewStyle = 'Community Review Board';
       vm.reviewStyleTooltip = 'Community Review Board performs a thorough review based on scorecards.';
+      vm.reviewScorecardLink = 'http://software.topcoder.com/review/actions/ViewScorecard.do?method=viewScorecard&scid=' + reviewScorecardId;
     }
 
     vm.hasCheckpoints = vm.numCheckpointSubmissions > 0;

src/js/app/challenge-details/partials/ng-content-challenge-topsection.tpl.html

@@ -5,7 +5,7 @@
     <div rel="action" ng-bind="CD.phaseProgram.nextStepAction" class="margin-top-2x"></div>
   </div>
   <div rel="badge">
-    <h5 rel="title" class="center-align-text">Recognition Award</h5>
+    <h5 rel="title" class="center-align-text">Peer Review Award</h5>
   	<img ng-src="{{CD.phaseProgram.nextBadgeImg}}" alt="{{CD.phaseProgram.nextBadgeTitle}}" />
   </div>
   <div class="clear"></div>

src/js/app/my-dashboard/index.html

@@ -40,15 +40,15 @@
   <div class="my-dashboard-container container-fluid" >
     <div class="clearfix visible-md-block visible-lg-block"></div>
     <div class="row">
-      <div class="col-xs-12 col-sm-9 col-sm-push-3">
+      <div class="col-xs-12 col-sm-8 col-sm-push-4 col-md-9 col-md-push-3">
         <!--<div class="my-dashboard-widget marketing-message" ng-include="vm.getTemplateURL('marketing-message.html')">
         </div>-->
         <div class="my-dashboard-widget my-challenges" ng-include="vm.getTemplateURL('my-challenges.html')">
         </div>
         <div class="my-dashboard-widget srm-gadget" ng-include="vm.getTemplateURL('upcaming-srms.html')">
         </div>
       </div>
-      <div class="col-xs-12 col-sm-3 col-sm-pull-9">
+      <div class="col-xs-12 col-sm-4 col-sm-pull-8 col-md-3 col-md-pull-9">
         <div class="my-dashboard-widget member-program" ng-include="vm.getTemplateURL('member-program.html')">
         </div>
         <div class="my-dashboard-widget helpful-links" ng-include="vm.getTemplateURL('helpful-links.html')">

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

@@ -1,6 +1,7 @@
 /**
  * Copyright (C) 2014 TopCoder Inc., All Rights Reserved.
  * @author mdesiderio
+ * @author vikas.agarwal@appirio.com
  * @version 1.0
  *
  * Controller for the my challenges widget
@@ -30,8 +31,12 @@
   function MyChallengesCtrl($scope, AuthService, ChallengeService) {
     var vm = this;
     vm.loading = true;
+    vm.myChallenges = [];
+    vm.visibleChallenges = [];
     vm.pageIndex = 1;
     vm.pageSize = 5;
+    vm.sortColumn = 'submissionEndDate';
+    vm.sortOrder = 'asc';
     vm.totalPages = 1;
     vm.totalRecords = vm.totalPages * vm.pageSize;
     vm.firstRecordIndex = (vm.pageIndex - 1) * vm.pageSize + 1;
@@ -42,49 +47,115 @@
     vm.changePage = changePage;
     vm.isCurrentPage = isCurrentPage;
     vm.getCurrentPageClass = getCurrentPageClass;
+    vm.sort = sort;
 
     // activate controller
     if (AuthService.isLoggedIn === true) {
-      activate();
+      getChallenges();
     } else {
       return false;
     }
 
-    function activate() {
+    /**
+     * getChallenges Fetches user's active challenges from the API
+     *
+     * @return {Object} promise of API call
+     */
+    function getChallenges() {
       initPaging();
-      var searchRequest = {pageIndex: vm.pageIndex, pageSize: vm.pageSize};
+      var searchRequest = {
+        pageIndex: vm.pageIndex,
+        pageSize: vm.pageSize,
+        sortColumn: vm.sortColumn,
+        sortOrder: vm.sortOrder
+      };
       // show loading icon
       vm.loading = true;
+      // remove following if block when API supports paging
+      if (vm.pageIndex > 1) {
+        processChallengesResponse(vm.myChallenges);
+        vm.loading = false;
+        return;
+      }
       // Fetch my active
       return ChallengeService.getMyActiveChallenges(searchRequest)
         .then(function(data) {
-          if (data.pagination) {
-            vm.totalPages = Math.ceil(data.pagination.total / vm.pageSize);
-            vm.totalRecords = data.pagination.total;
-            vm.firstRecordIndex = (vm.pageIndex - 1) * vm.pageSize + 1;
-            vm.lastRecordIndex = vm.pageIndex * vm.pageSize;
-            vm.lastRecordIndex = vm.lastRecordIndex > vm.totalRecords ? vm.totalRecords : vm.lastRecordIndex;
-          }
-          vm.myChallenges = data;
+          processChallengesResponse(data);
           // stop loading icon
           vm.loading = false;
 
       });
     }
 
+    function processChallengesResponse(data) {
+      if (data.pagination) {
+        vm.totalPages = Math.ceil(data.pagination.total / vm.pageSize);
+        vm.totalRecords = data.pagination.total;
+        vm.firstRecordIndex = (vm.pageIndex - 1) * vm.pageSize + 1;
+        vm.lastRecordIndex = vm.pageIndex * vm.pageSize;
+        vm.lastRecordIndex = vm.lastRecordIndex > vm.totalRecords ? vm.totalRecords : vm.lastRecordIndex;
+      }
+      vm.myChallenges = data;
+      // uncomment following line when API supports paging
+      // vm.visibleChallenges = data;
+      // remove following line when API supports paging
+      vm.visibleChallenges = data.slice(vm.firstRecordIndex - 1, vm.lastRecordIndex);
+    }
+
+    /**
+     * changePage changes page in the result set
+     *
+     * @param {JSON} pageLink page link object
+     *
+     * @return {Object} promise of API call with updated pageIndex
+     */
     function changePage(pageLink) {
       vm.pageIndex = pageLink.val;
-      activate();
+      getChallenges();
     }
 
+    /**
+     * isCurrentPage checks if the give page link is the current page
+     *
+     * @param {JSON} pageLink page link object
+     *
+     * @return {Boolean} true if the given page is the current page, false otherwise
+     */
     function isCurrentPage (pageLink) {
       return pageLink.val === vm.pageIndex;
     }
 
+    /**
+     * getCurrentPageClass Identifies the css class to be used for the given page link
+     *
+     * @param {JSON} pageLink page link object
+     *
+     * @return {String}
+     */
     function getCurrentPageClass(pageLink) {
       return isCurrentPage(pageLink) ? 'current-page' : '';
     }
 
+    /**
+     * sort sorts the results based on the given column
+     *
+     * @param {String} column page link object
+     *
+     * @return {Object} promise of API call with updated sort params
+     */
+    function sort(column) {
+      if (vm.sortColumn === column) {
+        vm.sortOrder = vm.sortOrder === 'desc' ? 'asc' : 'desc';
+      } else {
+        vm.sortOrder = 'desc';
+      }
+      vm.sortColumn = column;
+      activate();
+    }
+
+    /**
+     * initPaging Initializes the paging
+     */
     function initPaging() {
       vm.pageLinks = [
         {text: "Prev", val: vm.pageIndex - 1},