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

Predix skill picker and tco16 banner tweaks #894

Merged
merged 5 commits into from
Nov 15, 2016
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
6 changes: 3 additions & 3 deletions app/my-dashboard/my-dashboard.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions app/skill-picker/skill-picker.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'])
}

/**
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 @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion app/skill-picker/skill-picker.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 1 addition & 0 deletions app/topcoder.constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions assets/css/directives/tc-banner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ $tco-color-dark: #ea690b;

// black
.tc-banner-placeholder.black {
margin-bottom: 10px;
background-color: #222222;
.title {
@include sofia-pro-bold;
Expand Down
18 changes: 18 additions & 0 deletions assets/images/ico-predix-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-predix-community.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.