Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 198f9c5

Browse files
ajeftsajefts
authored
Merge pull request #961 from appirio-tech/dev
Cognitive updates, some bash results, some listings
2 parents f56de54 + 273d967 commit 198f9c5

20 files changed

+149
-26
lines changed

‎app/layout/header/header.jade

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111
button.btn-close-menu(type="button", ng-if="main.menuVisible", ng-click="main.menuVisible = false")
1212

1313
// User link (profile or join)
14-
a(ui-sref="profile.about({userHandle: vm.userHandle})", ng-switch="vm.isAuth" class="user-link" data-ng-if="!main.menuVisible")
15-
img(ng-switch-when="true", ng-if="vm.profile.photoURL && vm.profile.photoURL.length", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
14+
div.user-link(data-ng-if="!main.menuVisible")
15+
a(ui-sref="profile.about({userHandle: vm.userHandle})", ng-if="vm.isAuth")
16+
img(ng-if="vm.profile.photoURL && vm.profile.photoURL.length", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
1617

17-
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"))
18+
img(ng-if="!vm.profile.photoURL || !vm.profile.photoURL.length", class="user-avatar", ng-src=require("../../../assets/images/ico-user-default.svg"))
19+
20+
a.tc-btn.tc-btn-s.btn-link(ui-sref="register", ng-if="!vm.isAuth") JOIN
21+
22+
a.tc-btn.tc-btn-s.tc-btn-ghost.btn-link(ui-sref="login", ng-if="!vm.isAuth") LOG IN
1823

19-
span(ng-switch-when="false" class="tc-btn tc-btn-s") JOIN
2024

2125
ul.main-menu
2226
li.menu-item.search-wrapper

‎app/profile/badges/badges.controller.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,12 @@ import moment from 'moment-timezone'
655655
name: 'Crowd for Good',
656656
groupClass: 'Crowd-for-Good',
657657
active: false
658+
},
659+
{
660+
id: 1008,
661+
name: 'Predix Coder',
662+
groupClass: 'Predix-Coder',
663+
active: false
658664
}
659665
]
660666
}

‎app/profile/badges/badges.jade

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
.ngdialog-close.close-outside
2+
13
header.head
2-
.ngdialog-close
34
.breadcrumbs
45
.handle
56
img.profile-circle(fallback-src=require("../../../assets/images/avatarPlaceholder.png"), ng-src="{{vm.profile.photoURL}}")
@@ -12,6 +13,7 @@ header.head
1213
span.title BADGES
1314

1415
aside.badges
16+
.ngdialog-close
1517
.content
1618
.badgeGroups
1719
.groupBadge(ng-repeat='ag in vm.achievementGroups', ng-class='ag.groupClass', ng-show='ag.specificAchievements[0].active')

‎app/profile/profile.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import moment from 'moment'
4444
vm.stats = stats
4545
vm.profile.tracks = vm.profile.tracks || []
4646
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)) {
4848
vm.profile.tracks.push('COPILOT')
4949
}
5050
// flag to indicate if the member has acitivity on topcoder to be shown

‎app/services/communityData.service.js

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,38 @@ import angular from 'angular'
2121
var data = {
2222
'memberLeaderboard': [
2323
{
24-
'avatar': '//www.topcoder.com/i/m/callmekatootie.jpeg',
25-
'name': 'callmekatootie',
24+
'avatar': '//www.topcoder.com/i/m/Sky_.jpeg',
25+
'name': 'Sky_',
2626
'contestType': 'Development',
2727
'description': '',
2828
'class': 'develop'
2929
}, {
30-
'avatar': '//www.topcoder.com/i/m/besabestin.jpeg',
31-
'name': 'besabestin',
30+
'avatar': '//topcoder-prod-media.s3.amazonaws.com/member/profile/birdofpreyru-1474623113239.jpeg',
31+
'name': 'birdofpreyru',
3232
'contestType': 'Development',
3333
'description': '',
3434
'class': 'develop'
3535
}, {
36-
'avatar': '//www.topcoder.com/i/m/chekspir.jpeg',
37-
'name': 'chekspir',
36+
'avatar': '//topcoder-prod-media.s3.amazonaws.com/member/profile/thomaskranitsas-1478960109561.jpeg',
37+
'name': 'thomaskranitsas',
38+
'contestType': 'Development',
39+
'description': '',
40+
'class': 'develop'
41+
}, {
42+
'avatar': '//topcoder-prod-media.s3.amazonaws.com/member/profile/Ravijune-1471983063227.jpeg',
43+
'name': 'Ravijune',
3844
'contestType': 'Design',
3945
'description': '',
4046
'class': 'design'
4147
}, {
42-
'avatar': '//www.topcoder.com/i/m/DaraK.png',
43-
'name': 'darak',
48+
'avatar': '//www.topcoder.com/i/m/f0rc0d3r.jpeg',
49+
'name': 'f0rc0d3r',
4450
'contestType': 'Design',
4551
'description': '',
4652
'class': 'design'
4753
}, {
48-
'avatar': '//topcoder-prod-media.s3.amazonaws.com/member/profile/scott_wu-1480977860221.jpeg',
49-
'name': 'scott_wu',
54+
'avatar': '//www.topcoder.com/i/m/ltaravilse.jpeg',
55+
'name': 'ltaravilse',
5056
'contestType': 'Data Science',
5157
'description': '',
5258
'class': 'data-science'

‎app/services/nav.service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import angular from 'angular'
2626
{ 'href': '/community/design/', 'text': 'DESIGN', 'icon': require('../../assets/images/nav/book-design.svg') },
2727
{ 'href': '/community/development/', 'text': 'DEVELOPMENT', 'icon': require('../../assets/images/nav/book-develop.svg') },
2828
{ 'href': '/community/data-science/', 'text': 'DATA SCIENCE', 'icon': require('../../assets/images/nav/book-data.svg') },
29-
{ 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': require('../../assets/images/nav/book-cp.svg') }
29+
{ 'href': '/community/competitive-programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': require('../../assets/images/nav/book-cp.svg') }
3030
],
3131
'community': [
3232
{ 'sref': 'community.members', 'text': 'OVERVIEW', 'icon': require('../../assets/images/nav/members.svg') },

‎app/settings/email/email.controller.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ import angular from 'angular'
6666
desc: 'Design and development on GE’s platform for the Industrial Internet of Things',
6767
enabled: false,
6868
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
6976
}
7077
]
7178

‎app/sitemap/sitemap.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
li
2828
a(href="/community/data-science") Data Science
2929
li
30-
a(href="/community/competitive programming") Competitive Programming
30+
a(href="/community/competitive-programming") Competitive Programming
3131

3232
section.sitemap-nav
3333
h2.sitemap-header Community

‎app/skill-picker/skill-picker.controller.js

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import _ from 'lodash'
1313
vm.ASSET_PREFIX = CONSTANTS.ASSET_PREFIX
1414
vm.IOS_PROGRAM_ID = CONSTANTS.SWIFT_PROGRAM_ID
1515
vm.PREDIX_PROGRAM_ID = CONSTANTS.PREDIX_PROGRAM_ID
16+
vm.IBM_COGNITIVE_PROGRAM_ID = CONSTANTS.IBM_COGNITIVE_PROGRAM_ID
1617
vm.submitSkills = submitSkills
1718
vm.featuredSkills = featuredSkills
1819
vm.userId = userProfile.userId
@@ -63,10 +64,30 @@ import _ from 'lodash'
6364
* Initializes the communities to show in the communities section.
6465
*/
6566
function initCommunities() {
66-
vm.communities['ios'] = { displayName: 'iOS', programId: vm.IOS_PROGRAM_ID, status: false, dirty: false, display: true}
67-
vm.communities['predix'] = { displayName: 'Predix', programId: vm.PREDIX_PROGRAM_ID, status: false, dirty: false, display: true}
67+
vm.communities['ios'] = {
68+
displayName: 'iOS',
69+
programId: vm.IOS_PROGRAM_ID,
70+
status: false,
71+
dirty: false,
72+
display: true
73+
}
74+
vm.communities['predix'] = {
75+
displayName: 'Predix',
76+
programId: vm.PREDIX_PROGRAM_ID,
77+
status: false,
78+
dirty: false,
79+
display: true
80+
}
81+
vm.communities['ibm_cognitive'] = {
82+
displayName: 'Cognitive',
83+
programId: vm.IBM_COGNITIVE_PROGRAM_ID,
84+
status: false,
85+
dirty: false,
86+
display: true
87+
}
6888
_addWatchToCommunity(vm.communities['ios'])
6989
_addWatchToCommunity(vm.communities['predix'])
90+
_addWatchToCommunity(vm.communities['ibm_cognitive'])
7091
}
7192

7293
/**

‎app/skill-picker/skill-picker.jade

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
img(ng-if="communityKey == 'ios' && !community.status", src=require("../../assets/images/ico-ios-community-grey.svg"))
1515
img(ng-if="communityKey == 'predix' && community.status", src=require("../../assets/images/ico-predix-community.svg"))
1616
img(ng-if="communityKey == 'predix' && !community.status", src=require("../../assets/images/ico-predix-community-grey.svg"))
17+
img(ng-if="communityKey == 'ibm_cognitive' && community.status", src=require("../../assets/images/ico-ibm_cognitive-community.svg"))
18+
img(ng-if="communityKey == 'ibm_cognitive' && !community.status", src=require("../../assets/images/ico-ibm_cognitive-community-grey.svg"))
1719

1820
.community__text
1921
span.community__title(class="{{!community.status && 'disabled'}}") {{community.displayName}}
2022
.community__description
2123
span(ng-if="communityKey == 'ios'") Mobile app design and development for iOS, with Swift emphasis
2224
span(ng-if="communityKey == 'predix'") Design and development on GE’s platform for the Industrial Internet of Things
25+
span(ng-if="communityKey == 'ibm_cognitive'") Cognitive Community
2326

2427
onoff-switch(model="community.status", unique-id="'community-' + communityKey")
2528

‎app/topcoder.constants.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ angular.module('CONSTANTS', []).constant('CONSTANTS', {
2929
'NEW_CHALLENGES_URL' : 'https://www.topcoder.com/challenges/develop/upcoming/',
3030
'SWIFT_PROGRAM_ID' : 3445,
3131
'PREDIX_PROGRAM_ID' : process.env.PREDIX_PROGRAM_ID || 3448,
32+
'IBM_COGNITIVE_PROGRAM_ID' : process.env.IBM_COGNITIVE_PROGRAM_ID || 3449,
3233
'UPCOMING_SRMS_URL' : 'https://www.topcoder.com/challenges/data/upcoming/',
3334
'EVENT_USER_LOGGED_IN' : 'user_logged_in',
3435
'EVENT_USER_LOGGED_OUT' : 'user_logged_out',

‎assets/css/community/members.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,4 +631,16 @@
631631
}
632632
}
633633
}
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+
}
634646
}

‎assets/css/directives/badge-tooltip.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,9 @@
437437
.Crowd-for-Good {
438438
background-position: 0px -672px;
439439
}
440+
.Predix-Coder {
441+
background-position: -50px -672px;
442+
}
440443
.Wireframe {
441444
width: 31px;
442445
background-position: 0px -1009px !important;

‎assets/css/layout/footer.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
}
4242
.bottom-footer .menu-item {
4343
display: none;
44-
margin-top: 30px;
44+
margin-top: 10px;
4545
}
4646

4747
.menu-visible .bottom-footer .menu-item {
@@ -76,7 +76,7 @@
7676

7777
.bottom-footer nav {
7878
position: absolute;
79-
top: 997px;
79+
top: 1047px;
8080
left: 0;
8181
width: 100%;
8282
padding: 20px;

‎assets/css/layout/header.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@
8888
right: 10px;
8989
top: 0;
9090
text-decoration: none;
91+
92+
a + a {
93+
margin-left: 12px;
94+
}
9195
}
9296

9397
.btn-link {

‎assets/css/profile/badges.scss

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
padding: 0;
55
.ngdialog-content {
66
padding: 30px;
7-
background: white;
8-
opacity: 0.95;
7+
background: rgba(255,255,255,0.85);
98
width: 100%;
109
height: 100%;
1110
display: flex;
1211
flex-direction: column;
1312
justify-content: center;
1413
align-items: center;
14+
border-radius: 0;
1515

1616
header.head {
1717
@include sofia-pro-extra-light;
@@ -32,7 +32,6 @@
3232
margin-bottom: -5px;
3333
margin-right: 13px;
3434
}
35-
3635
}
3736

3837
.badges {
@@ -44,6 +43,7 @@
4443
display: flex;
4544
flex-direction: column;
4645
justify-content: center;
46+
position: relative;
4747

4848
.content {
4949
overflow: auto;
@@ -58,7 +58,25 @@
5858
justify-content: center;
5959
}
6060
}
61+
.ngdialog-close {
62+
display: block;
63+
}
64+
}
65+
66+
.ngdialog-close {
67+
display: none;
68+
}
69+
70+
.ngdialog-close.close-outside {
71+
display: block;
72+
height: 100%;
73+
width: 100%;
74+
cursor: default;
6175
}
76+
77+
.ngdialog-close.close-outside:before {
78+
display: none;
79+
}
6280
}
6381
}
6482

‎assets/images/badge.grid.large.png

100755100644
4.62 KB
Loading

‎assets/images/ico-ibm_cognitive-community-grey.svg

Lines changed: 18 additions & 0 deletions
Loading

‎assets/images/ico-ibm_cognitive-community.svg

Lines changed: 18 additions & 0 deletions
Loading

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"appirio-styles": "0.x.x",
5757
"appirio-tech-ng-iso-constants": "^1.0.6",
5858
"appirio-tech-ng-ui-components": "^2.1.2",
59-
"appirio-tech-react-components": "appirio-tech/react-components.git#challenge-listings",
59+
"appirio-tech-react-components": "appirio-tech/react-components.git#cl-styles-1",
6060
"auth0-angular": "^4.1.0",
6161
"auth0-js": "^6.8.0",
6262
"d3": "^3.5.14",

0 commit comments

Comments
 (0)