From 4298d931d35b691be74f74709499d18ddce88ce7 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 15 Nov 2016 15:42:25 +0530 Subject: [PATCH 1/4] Asana task#207155413864497, Add Predix opt-in to Skill Picker upon account activation -- Added predix community option in skill picker. Reused the IOS community images for now. Need to replace those with appropriate ones. --- app/skill-picker/skill-picker.controller.js | 3 +++ app/skill-picker/skill-picker.jade | 3 +++ app/topcoder.constants.js | 1 + assets/images/ico-predix-community-grey.svg | 18 ++++++++++++++++++ assets/images/ico-predix-community.svg | 18 ++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100755 assets/images/ico-predix-community-grey.svg create mode 100755 assets/images/ico-predix-community.svg 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/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 From 8a7a2b76ffc4699398c6ff35dbd84826388da871 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 15 Nov 2016 15:53:32 +0530 Subject: [PATCH 2/4] Fixed unit tests --- app/skill-picker/skill-picker.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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() { From 2938e511259609ad6a2dd5e444606c9b8a161461 Mon Sep 17 00:00:00 2001 From: ajefts Date: Tue, 15 Nov 2016 09:42:31 -0500 Subject: [PATCH 3/4] bumping tco16 banner to the top for TCO16 week --- app/my-dashboard/my-dashboard.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/my-dashboard/my-dashboard.jade b/app/my-dashboard/my-dashboard.jade index 52a339f95..0df99ecd9 100644 --- a/app/my-dashboard/my-dashboard.jade +++ b/app/my-dashboard/my-dashboard.jade @@ -5,6 +5,9 @@ .challenges(id="challenges", ui-view="my-challenges") + .tco + tc-banner(theme="black", banner-name="tco16") + .tco.tco17 .tc-banner-placeholder.predix .subtitle Ready for the future? The Industrial Internet is here @@ -20,9 +23,6 @@ .description Earn your way to the USA! a(href="http://tco17.topcoder.com/").cta.tc-btn-white.tc-btn-radius Learn More - .tco - tc-banner(theme="black", banner-name="tco16") - .srms(id="srms", ui-view="srms", ng-show="dashboard.showSRMs") .programs(id="community", ui-view="programs") From adb0e311087ccc6c56e313518ffc93a69c1c46b1 Mon Sep 17 00:00:00 2001 From: TonyJ Date: Tue, 15 Nov 2016 10:00:59 -0500 Subject: [PATCH 4/4] adding proper bottom margin for banners --- assets/css/directives/tc-banner.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/directives/tc-banner.scss b/assets/css/directives/tc-banner.scss index c46217e3b..980a64622 100644 --- a/assets/css/directives/tc-banner.scss +++ b/assets/css/directives/tc-banner.scss @@ -111,6 +111,7 @@ $tco-color-dark: #ea690b; // black .tc-banner-placeholder.black { + margin-bottom: 10px; background-color: #222222; .title { @include sofia-pro-bold;