diff --git a/app/skill-picker/skill-picker.controller.js b/app/skill-picker/skill-picker.controller.js index 75b0668d0..4cfb9713c 100644 --- a/app/skill-picker/skill-picker.controller.js +++ b/app/skill-picker/skill-picker.controller.js @@ -12,6 +12,7 @@ import _ from 'lodash' var vm = this vm.ASSET_PREFIX = CONSTANTS.ASSET_PREFIX vm.IOS_PROGRAM_ID = CONSTANTS.SWIFT_PROGRAM_ID + vm.PREDIX_PROGRAM_ID = CONSTANTS.PREDIX_PROGRAM_ID vm.submitSkills = submitSkills vm.featuredSkills = featuredSkills vm.userId = userProfile.userId @@ -63,7 +64,9 @@ import _ from 'lodash' */ 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} _addWatchToCommunity(vm.communities['ios']) + _addWatchToCommunity(vm.communities['predix']) } /** diff --git a/app/skill-picker/skill-picker.jade b/app/skill-picker/skill-picker.jade index 7bfb78248..0a41b53f7 100644 --- a/app/skill-picker/skill-picker.jade +++ b/app/skill-picker/skill-picker.jade @@ -12,11 +12,14 @@ .community__icon(ng-class="{'community__icon--disabled': !community.status}") img(ng-if="communityKey == 'ios' && community.status", src=require("../../assets/images/ico-ios-community.svg")) 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")) .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 onoff-switch(model="community.status", unique-id="'community-' + communityKey") diff --git a/app/skill-picker/skill-picker.spec.js b/app/skill-picker/skill-picker.spec.js index 096dbeb35..8b35d1b35 100644 --- a/app/skill-picker/skill-picker.spec.js +++ b/app/skill-picker/skill-picker.spec.js @@ -100,7 +100,8 @@ describe('Skill Picker Controller', function() { it('should be created successfully', function() { expect(vm).to.exist - expect(vm.showCommunity).to.exist.to.false + // showCommunity should be true as now we have two communities + expect(vm.showCommunity).to.exist.to.true }) it('should have empty tracks object ', function() { diff --git a/app/topcoder.constants.js b/app/topcoder.constants.js index 43094cba2..36acca7d4 100644 --- a/app/topcoder.constants.js +++ b/app/topcoder.constants.js @@ -28,6 +28,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, '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/images/ico-predix-community-grey.svg b/assets/images/ico-predix-community-grey.svg new file mode 100755 index 000000000..7dfad082d --- /dev/null +++ b/assets/images/ico-predix-community-grey.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/images/ico-predix-community.svg b/assets/images/ico-predix-community.svg new file mode 100755 index 000000000..3fa0795ca --- /dev/null +++ b/assets/images/ico-predix-community.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file