Merge branch 'dev' into feature/skill_picker_ibm_cognitive

Vikas Agarwal · Vikas Agarwal · commit e17184935aae · 2017-01-27T12:43:18.000+05:30
* dev: updated display name updated cognitive description test changing react-components version in package.json fix issue 947 Replace URL %20 to dash Fix #905 fixes #940 top menu login/join buttons fixed #904 added check for copilot Update CAB members on the Community Overview page Conflicts: app/settings/email/email.controller.js
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.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
@@ -70,7 +70,7 @@ import angular from 'angular'
         {
           id: 'TOPCODER_NL_IBM_COGNITIVE',
           name: 'Cognitive Community Newsletter',
-          desc: '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/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/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/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
`@@ -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
`@@ -70,7 +70,7 @@ import angular from 'angular'`
`70`	`70`	`{`
`71`	`71`	`id: 'TOPCODER_NL_IBM_COGNITIVE',`
`72`	`72`	`name: 'Cognitive Community Newsletter',`
`73`		`- desc: 'Cognitive Community Newsletter',`
	`73`	`+ desc: 'Never miss out on info about the Topcoder Cognitive Community',`
`74`	`74`	`enabled: false,`
`75`	`75`	`dirty: false`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -631,4 +631,16 @@`
`631`	`631`	`}`
`632`	`632`	`}`
`633`	`633`	`}`
	`634`	`+`
	`635`	`+ .members-of-month-container {`
	`636`	`+`
	`637`	`+ .user-tile {`
	`638`	`+ min-width: 150px;`
	`639`	`+ padding: 20px 0 0;`
	`640`	`+`
	`641`	`+ .user-name {`
	`642`	`+ font-size: 15px;`
	`643`	`+ }`
	`644`	`+ }`
	`645`	`+ }`
`634`	`646`	`}`