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

Asana Task#251570416879588, Add IBM Cognitive opt-in to Skill Picker upon account activation and preferences page #941

Merged
merged 1 commit into from
Jan 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/settings/email/email.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: 'IBM Cognitive Community Newsletter',
desc: 'IBM Cognitive Community Newsletter',
enabled: false,
dirty: false
}
]

Expand Down
25 changes: 23 additions & 2 deletions app/skill-picker/skill-picker.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: 'IBM 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'])
}

/**
Expand Down
3 changes: 3 additions & 0 deletions app/skill-picker/skill-picker.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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'") IBM Cognitive Community

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

Expand Down
1 change: 1 addition & 0 deletions app/topcoder.constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
18 changes: 18 additions & 0 deletions assets/images/ico-ibm_cognitive-community-grey.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions assets/images/ico-ibm_cognitive-community.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.