Merge branch 'dev' into feature/quick-fixes-pre-first-ga-release

* dev:
  lower cased
  Added image count and 'x'
  Renamed the page header to Overview
  platform stats in members page

Conflicts:
	app/community/members.jade

Author: vikasrohit

app/community/members.controller.js

@@ -3,9 +3,9 @@
 
   angular.module('tc.community').controller('MembersController', MembersController);
 
-  MembersController.$inject = ['CommunityDataService', 'CONSTANTS'];
+  MembersController.$inject = ['CommunityDataService', 'StatisticsService', 'CONSTANTS'];
 
-  function MembersController(CommunityDataService, CONSTANTS) {
+  function MembersController(CommunityDataService, StatisticsService, CONSTANTS) {
     var ctrl = this;
     ctrl.notSearch = true;
     ctrl.showing = 'list';
@@ -26,6 +26,10 @@
         ctrl.notSearch = true;
       }
     };
+
+    StatisticsService.getPlatformStats().then(function(data) {
+      ctrl.platformStats = data;
+    })
   }
 
 })();

app/community/members.jade

@@ -10,6 +10,19 @@
         input(type="submit" name="search-btn" value="").search-ico
 
     .default-show-container(ng-show="ctrl.notSearch")
+      .platform-stats-container
+        .stat
+          p.statVal {{ctrl.platformStats.memberCount | number : 0}}
+          p.statLabel ACTIVE MEMBER
+        .stat
+          p.statVal {{ctrl.platformStats.activeMembersCount | number : 0}}
+          p.statLabel COMPETING TODAY
+        .stat
+          p.statVal {{ctrl.platformStats.prizePurse | currency:undefined:0}}
+          p.statLabel AVAILABLE PRIZE
+        .stat
+          p.statVal {{ctrl.platformStats.activeContestsCount | number : 0}}
+          p.statLabel ACTIVE CHALLENGES
       .members-of-month-container
         h2 Members of the Month
           small {{ctrl.currentMonth}}

app/directives/challenge-user-place/challenge-user-place.directive.js

@@ -43,7 +43,11 @@
         activate();
 
         function activate() {
+          $scope.numImages = 0;
           if (!$scope.challenge.isPrivate && $scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) {
+            $scope.numImages = $scope.challenge.userDetails.submissions.filter(function(submission) {
+              return submission && submission.submissionImage;
+            }).length;
             $scope.selectedIndex = 0;
             $scope.challenge.thumbnailId = $scope.challenge.userDetails.submissions[0].id;
             $scope.imageURL = $scope.challenge.userDetails.submissions[0].submissionImage && $scope.challenge.userDetails.submissions[0].submissionImage.full;

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

@@ -8,6 +8,11 @@
     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")
 
+    .thumbnail-gallery(ng-show="numImages", ng-click="!challenge.isPrivate && imageURL && openLightbox()")
+      .gallery-icon
+
+      .num-images {{numImages}} IMAGES
+
 .list-view(ng-show="view === 'list'")
   .place-date
     p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
@@ -22,3 +27,8 @@
   .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/ico-picture.svg")
     img(ng-show="challenge.isPrivate", src="/images/card-bg-private-project.svg")
+
+    .thumbnail-gallery(ng-show="numImages", ng-click="!challenge.isPrivate && imageURL && openLightbox()")
+      .gallery-icon
+
+      .num-images {{numImages}} IMAGES

app/filters/challengeLinks.filter.js

@@ -23,18 +23,18 @@
       } else {
         var data = {
           domain: CONSTANTS.domain,
-          track: challenge.track,
+          track: challenge.track.toLowerCase(),
           forumId: challenge.forumId,
           id: challenge.id
         };
         switch (type) {
           case 'forums':
             switch (challenge.track) {
-              case 'DEVELOP':
+              case 'develop':
                 return String.supplant('https://apps.{domain}/forums/?module=Category&categoryID={forumId}', data);
-              case 'DATA':
+              case 'data':
                 return String.supplant('https://apps.{domain}/forums/?module=Category&categoryID={forumId}', data);
-              case 'DESIGN':
+              case 'design':
                 return String.supplant('https://apps.{domain}/forums/?module=ThreadList&forumId={forumId}', data);
             }
 

app/services/statistics.service.js

@@ -10,12 +10,20 @@
     var service = {
       getDevTop: getDevTop,
       getDesignTop: getDesignTop,
-      getDataTop: getDataTop
+      getDataTop: getDataTop,
+      getPlatformStats: getPlatformStats
     };
     return service;
 
     ///////////////
 
+
+    function getPlatformStats() {
+      return ApiService.restangularV2.all('platform')
+        .withHttpConfig({skipAuthorization: true})
+        .customGET('statistics');
+    }
+
     function getDevTop(size) {
       var url = CONSTANTS.API_URL_V2 + '/users/tops/develop?pageSize=' + size;
       return ApiService.restangularV2.all('users')

assets/css/community/members.scss

@@ -37,6 +37,30 @@
       }
     }
   }
+  .platform-stats-container {
+    background: $white;
+    padding: 10px;
+    margin-bottom: 6px;
+    height: 70px;
+    font-family: "Sofia Pro",Arial,Helvetica,sans-serif;
+    .stat {
+      float: left;
+      width: 25% ;
+      text-align: center;
+    }
+    .statVal {
+      color: #3d3d3d;
+      font-size: 32px;
+      margin-bottom: 7px;
+      position: relative;
+    }
+
+    .statLabel {
+      color: #a3a3ae;
+      font-size: 12px;
+      font-weight: 400;
+    }
+  }
   .search-container {
     @include module-full-width;
     background: $white;

assets/css/directives/design-lightbox.scss

@@ -67,7 +67,12 @@
   justify-content: center;
   z-index: 10000;
   .ngdialog-content {
-    .ngdialog-close { display: none; }
+    .ngdialog-close { 
+      position: absolute;
+      top: 5px;
+      right: 15px;
+      font-size: 30px;
+    }
     opacity: .95;
     height: 742px;
     width: 768px;