Merge pull request #961 from appirio-tech/dev

ajefts · web-flow · commit 198f9c5923b1 · 2017-01-27T09:18:55.000-05:00
Cognitive updates, some bash results, some listings
diff --git a/app/layout/header/header.jade b/app/layout/header/header.jade
@@ -11,12 +11,16 @@
       button.btn-close-menu(type="button", ng-if="main.menuVisible", ng-click="main.menuVisible = false")
 
       // User link (profile or join)
-      a(ui-sref="profile.about({userHandle: vm.userHandle})", ng-switch="vm.isAuth" class="user-link" data-ng-if="!main.menuVisible")
-        img(ng-switch-when="true", ng-if="vm.profile.photoURL && vm.profile.photoURL.length", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
+      div.user-link(data-ng-if="!main.menuVisible")
+        a(ui-sref="profile.about({userHandle: vm.userHandle})", ng-if="vm.isAuth")
+          img(ng-if="vm.profile.photoURL && vm.profile.photoURL.length", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
 
-        img(ng-switch-when="true", ng-if="!vm.profile.photoURL || !vm.profile.photoURL.length", class="user-avatar", ng-src=require("../../../assets/images/ico-user-default.svg"))
+          img(ng-if="!vm.profile.photoURL || !vm.profile.photoURL.length", class="user-avatar", ng-src=require("../../../assets/images/ico-user-default.svg"))
+
+        a.tc-btn.tc-btn-s.btn-link(ui-sref="register", ng-if="!vm.isAuth") JOIN
+
+        a.tc-btn.tc-btn-s.tc-btn-ghost.btn-link(ui-sref="login", ng-if="!vm.isAuth") LOG IN
 
-        span(ng-switch-when="false" class="tc-btn tc-btn-s") JOIN
 
     ul.main-menu
       li.menu-item.search-wrapper
diff --git a/app/profile/badges/badges.controller.js b/app/profile/badges/badges.controller.js
@@ -655,6 +655,12 @@ import moment from 'moment-timezone'
         name: 'Crowd for Good',
         groupClass: 'Crowd-for-Good',
         active: false
+      },
+      {
+        id: 1008,
+        name: 'Predix Coder',
+        groupClass: 'Predix-Coder',
+        active: false
       }
     ]
   }
diff --git a/app/profile/badges/badges.jade b/app/profile/badges/badges.jade
@@ -1,5 +1,6 @@
+.ngdialog-close.close-outside
+
 header.head
-  .ngdialog-close
   .breadcrumbs
     .handle
       img.profile-circle(fallback-src=require("../../../assets/images/avatarPlaceholder.png"), ng-src="{{vm.profile.photoURL}}")
@@ -12,6 +13,7 @@ header.head
       span.title BADGES
 
 aside.badges
+  .ngdialog-close
   .content
     .badgeGroups
       .groupBadge(ng-repeat='ag in vm.achievementGroups', ng-class='ag.groupClass', ng-show='ag.specificAchievements[0].active')
diff --git a/app/profile/profile.controller.js b/app/profile/profile.controller.js
@@ -44,7 +44,7 @@ import moment from 'moment'
           vm.stats = stats
           vm.profile.tracks = vm.profile.tracks || []
           vm.tracks = ProfileService.getTracks(stats) || vm.profile.tracks
-          if (stats.COPILOT && stats.COPILOT.contests && vm.profile.tracks.indexOf('COPILOT') == -1) {
+          if (vm.profile.badges.copilot || (stats.COPILOT && stats.COPILOT.contests && vm.profile.tracks.indexOf('COPILOT') == -1)) {
             vm.profile.tracks.push('COPILOT')
           }
           // flag to indicate if the member has acitivity on topcoder to be shown
diff --git a/app/services/communityData.service.js b/app/services/communityData.service.js
@@ -21,32 +21,38 @@ import angular from 'angular'
       var data = {
         'memberLeaderboard': [
           {
-            'avatar': '//www.topcoder.com/i/m/callmekatootie.jpeg',
-            'name': 'callmekatootie',
+            'avatar': '//www.topcoder.com/i/m/Sky_.jpeg',
+            'name': 'Sky_',
             'contestType': 'Development',
             'description': '',
             'class': 'develop'
           }, {
-            'avatar': '//www.topcoder.com/i/m/besabestin.jpeg',
-            'name': 'besabestin',
+            'avatar': '//topcoder-prod-media.s3.amazonaws.com/member/profile/birdofpreyru-1474623113239.jpeg',
+            'name': 'birdofpreyru',
             'contestType': 'Development',
             'description': '',
             'class': 'develop'
           }, {
-            'avatar': '//www.topcoder.com/i/m/chekspir.jpeg',
-            'name': 'chekspir',
+            'avatar': '//topcoder-prod-media.s3.amazonaws.com/member/profile/thomaskranitsas-1478960109561.jpeg',
+            'name': 'thomaskranitsas',
+            'contestType': 'Development',
+            'description': '',
+            'class': 'develop'
+          }, {
+            'avatar': '//topcoder-prod-media.s3.amazonaws.com/member/profile/Ravijune-1471983063227.jpeg',
+            'name': 'Ravijune',
             'contestType': 'Design',
             'description': '',
             'class': 'design'
           }, {
-            'avatar': '//www.topcoder.com/i/m/DaraK.png',
-            'name': 'darak',
+            'avatar': '//www.topcoder.com/i/m/f0rc0d3r.jpeg',
+            'name': 'f0rc0d3r',
             'contestType': 'Design',
             'description': '',
             'class': 'design'
           }, {
-            'avatar': '//topcoder-prod-media.s3.amazonaws.com/member/profile/scott_wu-1480977860221.jpeg',
-            'name': 'scott_wu',
+            'avatar': '//www.topcoder.com/i/m/ltaravilse.jpeg',
+            'name': 'ltaravilse',
             'contestType': 'Data Science',
             'description': '',
             'class': 'data-science'
diff --git a/app/services/nav.service.js b/app/services/nav.service.js
@@ -26,7 +26,7 @@ import angular from 'angular'
           { 'href': '/community/design/', 'text': 'DESIGN', 'icon': require('../../assets/images/nav/book-design.svg') },
           { 'href': '/community/development/', 'text': 'DEVELOPMENT', 'icon': require('../../assets/images/nav/book-develop.svg') },
           { 'href': '/community/data-science/', 'text': 'DATA SCIENCE', 'icon': require('../../assets/images/nav/book-data.svg') },
-          { 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': require('../../assets/images/nav/book-cp.svg') }
+          { 'href': '/community/competitive-programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': require('../../assets/images/nav/book-cp.svg') }
       ],
       'community': [
           { 'sref': 'community.members', 'text': 'OVERVIEW', 'icon': require('../../assets/images/nav/members.svg') },
diff --git a/app/settings/email/email.controller.js b/app/settings/email/email.controller.js
@@ -66,6 +66,13 @@ import angular from 'angular'
           desc: 'Design and development on GE’s platform for the Industrial Internet of Things',
           enabled: false,
           dirty: false
+        },
+        {
+          id: 'TOPCODER_NL_IBM_COGNITIVE',
+          name: 'Cognitive Community Newsletter',
+          desc: 'Never miss out on info about the Topcoder Cognitive Community',
+          enabled: false,
+          dirty: false
         }
       ]
 
diff --git a/app/sitemap/sitemap.jade b/app/sitemap/sitemap.jade
@@ -27,7 +27,7 @@
         li 
           a(href="/community/data-science") Data Science
         li 
-          a(href="/community/competitive programming") Competitive Programming
+          a(href="/community/competitive-programming") Competitive Programming
               
     section.sitemap-nav
       h2.sitemap-header Community
diff --git a/app/skill-picker/skill-picker.controller.js b/app/skill-picker/skill-picker.controller.js
@@ -13,6 +13,7 @@ import _ from 'lodash'
     vm.ASSET_PREFIX = CONSTANTS.ASSET_PREFIX
     vm.IOS_PROGRAM_ID = CONSTANTS.SWIFT_PROGRAM_ID
     vm.PREDIX_PROGRAM_ID = CONSTANTS.PREDIX_PROGRAM_ID
+    vm.IBM_COGNITIVE_PROGRAM_ID = CONSTANTS.IBM_COGNITIVE_PROGRAM_ID
     vm.submitSkills = submitSkills
     vm.featuredSkills = featuredSkills
     vm.userId = userProfile.userId
@@ -63,10 +64,30 @@ import _ from 'lodash'
      * Initializes the communities to show in the communities section.
      */
     function initCommunities() {
-      vm.communities['ios'] = { displayName: 'iOS', programId: vm.IOS_PROGRAM_ID, status: false, dirty: false, display: true}
-      vm.communities['predix'] = { displayName: 'Predix', programId: vm.PREDIX_PROGRAM_ID, status: false, dirty: false, display: true}
+      vm.communities['ios'] = {
+        displayName: 'iOS',
+        programId: vm.IOS_PROGRAM_ID,
+        status: false,
+        dirty: false,
+        display: true
+      }
+      vm.communities['predix'] = {
+        displayName: 'Predix',
+        programId: vm.PREDIX_PROGRAM_ID,
+        status: false,
+        dirty: false,
+        display: true
+      }
+      vm.communities['ibm_cognitive'] = {
+        displayName: 'Cognitive',
+        programId: vm.IBM_COGNITIVE_PROGRAM_ID,
+        status: false,
+        dirty: false,
+        display: true
+      }
       _addWatchToCommunity(vm.communities['ios'])
       _addWatchToCommunity(vm.communities['predix'])
+      _addWatchToCommunity(vm.communities['ibm_cognitive'])
     }
 
     /**
diff --git a/app/skill-picker/skill-picker.jade b/app/skill-picker/skill-picker.jade
@@ -14,12 +14,15 @@
             img(ng-if="communityKey == 'ios' && !community.status", src=require("../../assets/images/ico-ios-community-grey.svg"))
             img(ng-if="communityKey == 'predix' && community.status", src=require("../../assets/images/ico-predix-community.svg"))
             img(ng-if="communityKey == 'predix' && !community.status", src=require("../../assets/images/ico-predix-community-grey.svg"))
+            img(ng-if="communityKey == 'ibm_cognitive' && community.status", src=require("../../assets/images/ico-ibm_cognitive-community.svg"))
+            img(ng-if="communityKey == 'ibm_cognitive' && !community.status", src=require("../../assets/images/ico-ibm_cognitive-community-grey.svg"))
 
           .community__text
             span.community__title(class="{{!community.status && 'disabled'}}") {{community.displayName}}
             .community__description
               span(ng-if="communityKey == 'ios'") Mobile app design and development for iOS, with Swift emphasis
               span(ng-if="communityKey == 'predix'") Design and development on GE’s platform for the Industrial Internet of Things
+              span(ng-if="communityKey == 'ibm_cognitive'") Cognitive Community
 
         onoff-switch(model="community.status", unique-id="'community-' + communityKey")
 
diff --git a/app/topcoder.constants.js b/app/topcoder.constants.js
@@ -29,6 +29,7 @@ angular.module('CONSTANTS', []).constant('CONSTANTS', {
   'NEW_CHALLENGES_URL'     : 'https://www.topcoder.com/challenges/develop/upcoming/',
   'SWIFT_PROGRAM_ID'       : 3445,
   'PREDIX_PROGRAM_ID'      : process.env.PREDIX_PROGRAM_ID || 3448,
+  'IBM_COGNITIVE_PROGRAM_ID'      : process.env.IBM_COGNITIVE_PROGRAM_ID || 3449,
   'UPCOMING_SRMS_URL'      : 'https://www.topcoder.com/challenges/data/upcoming/',
   'EVENT_USER_LOGGED_IN'   : 'user_logged_in',
   'EVENT_USER_LOGGED_OUT'  : 'user_logged_out',
diff --git a/assets/css/community/members.scss b/assets/css/community/members.scss
@@ -631,4 +631,16 @@
       }
     }
   }
+
+  .members-of-month-container {
+
+    .user-tile {
+      min-width: 150px;
+      padding: 20px 0 0;
+
+      .user-name {
+        font-size: 15px;
+      }
+    }
+  }
 }
diff --git a/assets/css/directives/badge-tooltip.scss b/assets/css/directives/badge-tooltip.scss
@@ -437,6 +437,9 @@
 .Crowd-for-Good {
   background-position: 0px -672px;
 }
+.Predix-Coder {
+  background-position: -50px -672px;
+}
 .Wireframe {
     width: 31px;
     background-position: 0px -1009px !important;
diff --git a/assets/css/layout/footer.scss b/assets/css/layout/footer.scss
@@ -41,7 +41,7 @@
 	}
 	.bottom-footer .menu-item {
 		display: none;
-		margin-top: 30px;
+		margin-top: 10px;
 	}
 
 	.menu-visible .bottom-footer .menu-item {
@@ -76,7 +76,7 @@
 
   .bottom-footer nav {
     position: absolute;
-    top: 997px;
+    top: 1047px;
     left: 0;
     width: 100%;
     padding: 20px;
diff --git a/assets/css/layout/header.scss b/assets/css/layout/header.scss
@@ -88,6 +88,10 @@
   right: 10px;
   top: 0;
   text-decoration: none;
+
+  a + a {
+    margin-left: 12px;
+  }
 }
 
 .btn-link {
diff --git a/assets/css/profile/badges.scss b/assets/css/profile/badges.scss
@@ -4,14 +4,14 @@
   padding: 0;
   .ngdialog-content {
     padding: 30px;
-    background: white;
-    opacity: 0.95;
+    background: rgba(255,255,255,0.85);
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
+    border-radius: 0;
 
     header.head {
       @include sofia-pro-extra-light;
@@ -32,7 +32,6 @@
         margin-bottom: -5px;
         margin-right: 13px;
       }
-
     }
 
     .badges {
@@ -44,6 +43,7 @@
       display: flex;
       flex-direction: column;
       justify-content: center;
+      position: relative;
 
       .content {
         overflow: auto;
@@ -58,7 +58,25 @@
           justify-content: center;
         }
       }
+      .ngdialog-close {
+        display: block;
+      }      
+    }
+    
+    .ngdialog-close {
+      display: none;
+    }
+    
+    .ngdialog-close.close-outside {
+      display: block;
+      height: 100%;
+      width: 100%;
+      cursor: default;
     }
+    
+    .ngdialog-close.close-outside:before {
+      display: none;
+    }    
   }
 }
 
diff --git a/assets/images/badge.grid.large.png b/assets/images/badge.grid.large.png
diff --git a/assets/images/ico-ibm_cognitive-community-grey.svg b/assets/images/ico-ibm_cognitive-community-grey.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="skillpicker-iOS-disabled" stroke-width="2" stroke="#A3A3AE">
+            <g id="iOS-Developer" transform="translate(1.000000, 3.000000)">
+                <g id="Stroke-1696-+-Stroke-1699">
+                    <path d="M4.00000007,22 L1.0003,22 C0.4473,22 0.0003,21.552 0.0003,21 L0.0003,1 C0.0003,0.448 0.4473,0 1.0003,0 L29.0003,0 C29.5523,0 30.0003,0.448 30.0003,1 L30.0003,21 C30.0003,21.552 29.5523,22 29.0003,22 L16.9999996,22" id="Stroke-1696"></path>
+                    <path d="M26,10 L26,12" id="Stroke-1699"></path>
+                </g>
+                <g id="Stroke-1698-+-Stroke-1702" transform="translate(5.000000, 9.000000)">
+                    <path d="M10,18 L1,18 C0.448,18 0,17.552 0,17 L0,1 C0,0.448 0.448,0 1,0 L10,0 C10.552,0 11,0.448 11,1 L11,17 C11,17.552 10.552,18 10,18 L10,18 Z" id="Stroke-1698"></path>
+                    <path d="M5,15 L6,15" id="Stroke-1702"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/assets/images/ico-ibm_cognitive-community.svg b/assets/images/ico-ibm_cognitive-community.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="skillpicker-iOS-enabled" stroke-width="2" stroke="#05C14F">
+            <g id="iOS-Developer" transform="translate(1.000000, 3.000000)">
+                <g id="Stroke-1696-+-Stroke-1699">
+                    <path d="M4.00000007,22 L1.0003,22 C0.4473,22 0.0003,21.552 0.0003,21 L0.0003,1 C0.0003,0.448 0.4473,0 1.0003,0 L29.0003,0 C29.5523,0 30.0003,0.448 30.0003,1 L30.0003,21 C30.0003,21.552 29.5523,22 29.0003,22 L16.9999996,22" id="Stroke-1696"></path>
+                    <path d="M26,10 L26,12" id="Stroke-1699"></path>
+                </g>
+                <g id="Stroke-1698-+-Stroke-1702" transform="translate(5.000000, 9.000000)">
+                    <path d="M10,18 L1,18 C0.448,18 0,17.552 0,17 L0,1 C0,0.448 0.448,0 1,0 L10,0 C10.552,0 11,0.448 11,1 L11,17 C11,17.552 10.552,18 10,18 L10,18 Z" id="Stroke-1698"></path>
+                    <path d="M5,15 L6,15" id="Stroke-1702"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     "appirio-styles": "0.x.x",
     "appirio-tech-ng-iso-constants": "^1.0.6",
     "appirio-tech-ng-ui-components": "^2.1.2",
-    "appirio-tech-react-components": "appirio-tech/react-components.git#challenge-listings",
+    "appirio-tech-react-components": "appirio-tech/react-components.git#cl-styles-1",
     "auth0-angular": "^4.1.0",
     "auth0-js": "^6.8.0",
     "d3": "^3.5.14",

Original file line number	Diff line number	Diff line change
`@@ -655,6 +655,12 @@ import moment from 'moment-timezone'`
`655`	`655`	`name: 'Crowd for Good',`
`656`	`656`	`groupClass: 'Crowd-for-Good',`
`657`	`657`	`active: false`
	`658`	`+ },`
	`659`	`+ {`
	`660`	`+ id: 1008,`
	`661`	`+ name: 'Predix Coder',`
	`662`	`+ groupClass: 'Predix-Coder',`
	`663`	`+ active: false`
`658`	`664`	`}`
`659`	`665`	`]`
`660`	`666`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ import moment from 'moment'`
`44`	`44`	`vm.stats = stats`
`45`	`45`	`vm.profile.tracks = vm.profile.tracks \|\| []`
`46`	`46`	`vm.tracks = ProfileService.getTracks(stats) \|\| vm.profile.tracks`
`47`		`- if (stats.COPILOT && stats.COPILOT.contests && vm.profile.tracks.indexOf('COPILOT') == -1) {`
	`47`	`+ if (vm.profile.badges.copilot \|\| (stats.COPILOT && stats.COPILOT.contests && vm.profile.tracks.indexOf('COPILOT') == -1)) {`
`48`	`48`	`vm.profile.tracks.push('COPILOT')`
`49`	`49`	`}`
`50`	`50`	`// flag to indicate if the member has acitivity on topcoder to be shown`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,13 @@ import angular from 'angular'`
`66`	`66`	`desc: 'Design and development on GE’s platform for the Industrial Internet of Things',`
`67`	`67`	`enabled: false,`
`68`	`68`	`dirty: false`
	`69`	`+ },`
	`70`	`+ {`
	`71`	`+ id: 'TOPCODER_NL_IBM_COGNITIVE',`
	`72`	`+ name: 'Cognitive Community Newsletter',`
	`73`	`+ desc: 'Never miss out on info about the Topcoder Cognitive Community',`
	`74`	`+ enabled: false,`
	`75`	`+ dirty: false`
`69`	`76`	`}`
`70`	`77`	`]`
`71`	`78`