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")
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/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;
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs></defs>
+ <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+ <g id="skillpicker-iOS-disabled" stroke-width="2" stroke="#A3A3AE">
+ <g id="iOS-Developer" transform="translate(1.000000, 3.000000)">
+ <g id="Stroke-1696-+-Stroke-1699">
+ <path d="M4.00000007,22 L1.0003,22 C0.4473,22 0.0003,21.552 0.0003,21 L0.0003,1 C0.0003,0.448 0.4473,0 1.0003,0 L29.0003,0 C29.5523,0 30.0003,0.448 30.0003,1 L30.0003,21 C30.0003,21.552 29.5523,22 29.0003,22 L16.9999996,22" id="Stroke-1696"></path>
+ <path d="M26,10 L26,12" id="Stroke-1699"></path>
+ </g>
+ <g id="Stroke-1698-+-Stroke-1702" transform="translate(5.000000, 9.000000)">
+ <path d="M10,18 L1,18 C0.448,18 0,17.552 0,17 L0,1 C0,0.448 0.448,0 1,0 L10,0 C10.552,0 11,0.448 11,1 L11,17 C11,17.552 10.552,18 10,18 L10,18 Z" id="Stroke-1698"></path>
+ <path d="M5,15 L6,15" id="Stroke-1702"></path>
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs></defs>
+ <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+ <g id="skillpicker-iOS-enabled" stroke-width="2" stroke="#05C14F">
+ <g id="iOS-Developer" transform="translate(1.000000, 3.000000)">
+ <g id="Stroke-1696-+-Stroke-1699">
+ <path d="M4.00000007,22 L1.0003,22 C0.4473,22 0.0003,21.552 0.0003,21 L0.0003,1 C0.0003,0.448 0.4473,0 1.0003,0 L29.0003,0 C29.5523,0 30.0003,0.448 30.0003,1 L30.0003,21 C30.0003,21.552 29.5523,22 29.0003,22 L16.9999996,22" id="Stroke-1696"></path>
+ <path d="M26,10 L26,12" id="Stroke-1699"></path>
+ </g>
+ <g id="Stroke-1698-+-Stroke-1702" transform="translate(5.000000, 9.000000)">
+ <path d="M10,18 L1,18 C0.448,18 0,17.552 0,17 L0,1 C0,0.448 0.448,0 1,0 L10,0 C10.552,0 11,0.448 11,1 L11,17 C11,17.552 10.552,18 10,18 L10,18 Z" id="Stroke-1698"></path>
+ <path d="M5,15 L6,15" id="Stroke-1702"></path>
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file