Skip to content

Commit 1fef29b

Browse files
ajeftsajefts
authored
Merge pull request topcoder-archive#894 from appirio-tech/dev
Predix skill picker and tco16 banner tweaks
2 parents e4e8a91 + adb0e31 commit 1fef29b

File tree

8 files changed

+49
-4
lines changed

8 files changed

+49
-4
lines changed

‎app/my-dashboard/my-dashboard.jade

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
.challenges(id="challenges", ui-view="my-challenges")
77

8+
.tco
9+
tc-banner(theme="black", banner-name="tco16")
10+
811
.tco.tco17
912
.tc-banner-placeholder.predix
1013
.subtitle Ready for the future? The Industrial Internet is here
@@ -20,9 +23,6 @@
2023
.description Earn your way to the USA!
2124
a(href="http://tco17.topcoder.com/").cta.tc-btn-white.tc-btn-radius Learn More
2225

23-
.tco
24-
tc-banner(theme="black", banner-name="tco16")
25-
2626
.srms(id="srms", ui-view="srms", ng-show="dashboard.showSRMs")
2727

2828
.programs(id="community", ui-view="programs")

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import _ from 'lodash'
1212
var vm = this
1313
vm.ASSET_PREFIX = CONSTANTS.ASSET_PREFIX
1414
vm.IOS_PROGRAM_ID = CONSTANTS.SWIFT_PROGRAM_ID
15+
vm.PREDIX_PROGRAM_ID = CONSTANTS.PREDIX_PROGRAM_ID
1516
vm.submitSkills = submitSkills
1617
vm.featuredSkills = featuredSkills
1718
vm.userId = userProfile.userId
@@ -63,7 +64,9 @@ import _ from 'lodash'
6364
*/
6465
function initCommunities() {
6566
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}
6668
_addWatchToCommunity(vm.communities['ios'])
69+
_addWatchToCommunity(vm.communities['predix'])
6770
}
6871

6972
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@
1212
.community__icon(ng-class="{'community__icon--disabled': !community.status}")
1313
img(ng-if="communityKey == 'ios' && community.status", src=require("../../assets/images/ico-ios-community.svg"))
1414
img(ng-if="communityKey == 'ios' && !community.status", src=require("../../assets/images/ico-ios-community-grey.svg"))
15+
img(ng-if="communityKey == 'predix' && community.status", src=require("../../assets/images/ico-predix-community.svg"))
16+
img(ng-if="communityKey == 'predix' && !community.status", src=require("../../assets/images/ico-predix-community-grey.svg"))
1517

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

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ describe('Skill Picker Controller', function() {
100100

101101
it('should be created successfully', function() {
102102
expect(vm).to.exist
103-
expect(vm.showCommunity).to.exist.to.false
103+
// showCommunity should be true as now we have two communities
104+
expect(vm.showCommunity).to.exist.to.true
104105
})
105106

106107
it('should have empty tracks object ', function() {

‎app/topcoder.constants.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ angular.module('CONSTANTS', []).constant('CONSTANTS', {
2828

2929
'NEW_CHALLENGES_URL' : 'https://www.topcoder.com/challenges/develop/upcoming/',
3030
'SWIFT_PROGRAM_ID' : 3445,
31+
'PREDIX_PROGRAM_ID' : process.env.PREDIX_PROGRAM_ID || 3448,
3132
'UPCOMING_SRMS_URL' : 'https://www.topcoder.com/challenges/data/upcoming/',
3233
'EVENT_USER_LOGGED_IN' : 'user_logged_in',
3334
'EVENT_USER_LOGGED_OUT' : 'user_logged_out',

‎assets/css/directives/tc-banner.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ $tco-color-dark: #ea690b;
111111

112112
// black
113113
.tc-banner-placeholder.black {
114+
margin-bottom: 10px;
114115
background-color: #222222;
115116
.title {
116117
@include sofia-pro-bold;

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

Lines changed: 18 additions & 0 deletions
Loading

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

Lines changed: 18 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy