Merge branch 'dev' into SUP-3006-upload-complete

Author: Nick Litwin

app/community/members.controller.js

@@ -10,7 +10,7 @@
     ctrl.notSearch = true;
     ctrl.showing = 'list';
     ctrl.domain = CONSTANTS.domain;
-    ctrl.currentMonth = 'November 2015';
+    ctrl.currentMonth = 'December 2015';
     ctrl.memberLeaderboard = [];
     ctrl.copilots = [];
     CommunityDataService.getMembersData()

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

@@ -7,30 +7,30 @@
       p.subtrack-color {{challenge.subTrack | underscoreStrip}}
 
       challenge-links(challenge="challenge", view="'tile'")
+    .challenge-card__bottom.challenge-card__bottom--active
+      .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-show="challenge.userAction", ng-switch="challenge.userAction")
+          a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'detail'}}") Submit
 
-      .phase-action(ng-switch="challenge.userAction")
-        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'detail'}}") Submit
+          .submitted(ng-switch-when="Submitted") Submitted
 
-        .submitted(ng-switch-when="Submitted") Submitted
+          // TODO: Need styling and JS logic for this one
+          .registered(ng-switch-when="Registered") Registered
 
-        // TODO: Need styling and JS logic for this one
-        .registered(ng-switch-when="Registered") Registered
-
-    // Only show if not data science track
-    p.roles 
-      span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
-        span Role:  
-        span {{challenge.userDetails.roles | listRoles}}
+      // Only show if not data science track
+      p.roles 
+        span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
+          span Role:  
+          span {{challenge.userDetails.roles | listRoles}}
 
   .completed-challenge(
     ng-show="challenge.status === 'COMPLETED' || challenge.status === 'PAST'",
@@ -45,25 +45,26 @@
 
       .winner-ribbon(ng-show="challenge.wonFirst")
 
-    .challenge-details(ng-switch-when="DATA_SCIENCE", ng-switch="challenge.subTrack", ng-class="challenge.track")
+    .challenge-card__bottom.challenge-card__bottom--completed
+      .challenge-details(ng-switch-when="DATA_SCIENCE", ng-switch="challenge.subTrack", ng-class="challenge.track")
 
-      div
-        .marathon-score
-          p.score {{challenge.pointTotal || 0 }}
+        div
+          .marathon-score
+            p.score {{challenge.pointTotal || 0 }}
 
-          p Total Points
+            p Total Points
 
-    .challenge-details(ng-switch-when="DEVELOP")
-      dev-challenge-user-place(challenge="challenge", view="view")
+      .challenge-details(ng-switch-when="DEVELOP")
+        dev-challenge-user-place(challenge="challenge", view="view")
 
-    .challenge-details(ng-switch-when="DESIGN")
-      design-challenge-user-place(challenge="challenge", view="view")
+      .challenge-details(ng-switch-when="DESIGN")
+        design-challenge-user-place(challenge="challenge", view="view")
 
-    // Only show if not data science track
-    p.roles
-      span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
-        span Role:  
-        span {{challenge.userDetails.roles | listRoles}}
+      // Only show if not data science track
+      p.roles
+        span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
+          span Role:  
+          span {{challenge.userDetails.roles | listRoles}}
 
 .challenge.list-view(ng-show="view=='list'", ng-class="challenge.track")
   .active-challenge(ng-show="challenge.status === 'ACTIVE'")

app/directives/challenge-user-place/design-challenge-user-place.directive.jade

@@ -4,7 +4,7 @@
   p.place.passed(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
   p.place.completed(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
 
-  .thumbnail(ng-click="!challenge.isPrivate && imageURL && openLightbox()", ng-hide="challenge.userStatus !== 'PASSED_REVIEW'")
+  .thumbnail(ng-click="!challenge.isPrivate && imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
     img(ng-show="!challenge.isPrivate", ng-src="{{imageURL || '/images/card-bg-no-image.svg'}}", fallback-src="/images/card-bg-no-image.svg")
     img(ng-show="challenge.isPrivate", src="/images/card-bg-private-project.svg")
 

app/directives/tc-form-fonts/tc-form-fonts.spec.js

@@ -6,8 +6,9 @@ describe('Topcoder Form Fonts Directive', function() {
     bard.appModule('topcoder');
     bard.inject(this, '$compile', '$rootScope');
     scope = $rootScope.$new();
+    scope.formFonts = [];
 
-    var form = angular.element('<form><tc-form-fonts /></form>');
+    var form = angular.element('<form><tc-form-fonts form-fonts="formFonts" /></form>');
     element = form.find('tc-form-fonts');
     var formElement = $compile(form)(scope);
     scope.$digest();
@@ -23,7 +24,7 @@ describe('Topcoder Form Fonts Directive', function() {
 
   describe('is initialized with', function() {
     it('empty font data', function() {
-      defaultFormFont = isolateScope.formFonts[0];
+      var defaultFormFont = isolateScope.formFonts[0];
 
       expect(defaultFormFont.id).to.equal(0);
       expect(defaultFormFont.source).to.equal('');

app/directives/tc-form-stockart/tc-form-stockart.spec.js

@@ -6,8 +6,9 @@ describe('Topcoder Form Stockart Directive', function() {
     bard.appModule('topcoder');
     bard.inject(this, '$compile', '$rootScope');
     scope = $rootScope.$new();
+    scope.stockarts = [];
 
-    var form = angular.element('<form><tc-form-stockart /></form>');
+    var form = angular.element('<form><tc-form-stockart form-stockarts="stockarts" /></form>');
     element = form.find('tc-form-stockart');
     var formElement = $compile(form)(scope);
     scope.$digest();

app/services/communityData.service.js

@@ -19,28 +19,28 @@
       var data = {
         "memberLeaderboard": [
         {
-          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/abedavera.jpg",
-          "name": "abedavera",
+          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/nexttopdesigns_dec2015.png",
+          "name": "nexttopdesigns",
           "contestType": "Design",
-          "description": "TCO15 Design Champion!",
+          "description": "Ten wins earning over $10K in design challenges",
           "class": "design"
         }, {
-          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/bonton.jpg",
-          "name": "bonton",
+          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/seriyvolk83_dec2015.png",
+          "name": "seriyvolk83",
           "contestType": "Development",
-          "description": "Won $4200 with 4 wins in development challenges",
+          "description": "Six wins earning over $4K in development challenges",
           "class": "develop"
         }, {
-          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/maksay.jpg",
-          "name": "maksay",
+          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/sadhwaniyash6_dec2015.png",
+          "name": "sadhwaniyash6",
           "contestType": "Data Science",
-          "description": "Only participant to see a ratings increase in all four rounds in Sept.",
+          "description": "Rating increase of 627 pts in Oct SRMs vaulting into Div 1.",
           "class": "data-science"
         }, {
-          "avatar": "https://www.topcoder.com/wp-content/uploads/2015/05/herlansyahs.jpg",
-          "name": "herlansyahs",
+          "avatar": "https://www.topcoder.com/wp-content/uploads/2015/05/alyad_dec2015.png",
+          "name": "Alyad",
           "contestType": "Design Rookie",
-          "description": "Won first and second placements within his first two months of becoming a member!",
+          "description": "Won 2 challenges within 6 weeks of becoming a member!",
           "class": "design"
         }],
         "copilots": [{

assets/css/directives/challenge-tile.scss

@@ -37,17 +37,26 @@ challenge-tile .challenge.tile-view {
     }
   }
 
+  .challenge-card__bottom {
+    width: 268px;/* 2px adjustment for 2 1px borders */
+    flex: 2;
+    display: flex;
+    flex-direction: column;
+  }
+
   // challenge details section
   .challenge-details {
     display: flex;
     flex-direction: column;
     align-items: center;
+    justify-content: center;
+    flex: 2;
   }
 
   // roles bar is common for both active and completed
   .roles {
     width: 100%;
-    border-radius: 4px;
+    border-radius: 0px 0px 4px 4px;
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
@@ -71,7 +80,7 @@ challenge-tile .challenge.tile-view {
   }
 
   .active-challenge {
-    height: 350px;
+    height: 390px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
@@ -84,7 +93,6 @@ challenge-tile .challenge.tile-view {
 
     .challenge-details {
       .currentPhase {
-        margin-top: 40px;
         margin-bottom: 20px;
         @include font-with-weight('Sofia Pro', 300);
         font-size: 18px;
@@ -99,7 +107,6 @@ challenge-tile .challenge.tile-view {
         align-items: center;
         width: 75px;
         height: 63px;
-        margin-bottom: 20px;
         background-image: url(/images/ico-calendar.svg);
 
         > p {
@@ -179,7 +186,7 @@ challenge-tile .challenge.tile-view {
 
 
   .completed-challenge {
-    height: 350px;
+    height: 390px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
@@ -222,6 +229,27 @@ challenge-tile .challenge.tile-view {
         justify-content: center;
       }
 
+      design-challenge-user-place {
+        display: flex;
+        flex-direction: column;
+        flex: 2;
+
+        .tile-view {
+          flex: 2;
+          justify-content: flex-end;
+        }
+      }
+
+      dev-challenge-user-place {
+        display: flex;
+        flex-direction: column;
+        flex: 2;
+
+        .tile-view {
+          flex: 2;
+        }
+      }
+
       .marathon-score {
         display: flex;
         flex-direction: column;

assets/css/my-challenges/my-challenges.scss

@@ -176,7 +176,7 @@
 
         challenge-tile {
           &.tile-view {
-            margin-bottom: 20px;
+            margin-bottom: 13px;
             @media only screen and (max-width: 767px) {
               display: inline-block;
               margin-left: 15px;

bower.json

@@ -39,7 +39,7 @@
     "angular-ui-router": "~0.2.15",
     "angular-xml": "~2.1.1",
     "angularjs-toaster": "~0.4.15",
-    "appirio-tech-ng-iso-constants": "[email protected]:appirio-tech/ng-iso-constants#~1.0.5",
+    "appirio-tech-ng-iso-constants": "[email protected]:appirio-tech/ng-iso-constants#~1.0.6",
     "appirio-tech-ng-ui-components": "appirio-tech/ng-ui-components#bower-wiredep-fix",
     "d3": "~3.5.6",
     "fontawesome": "~4.3.0",