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

Commit 446ce57

Browse files
thabofletcherthabofletcher
committed
Merge pull request #123 from appirio-tech/release
Release
2 parents e07bf05 + 8363355 commit 446ce57

File tree

10 files changed

+20
-21
lines changed

10 files changed

+20
-21
lines changed

‎Gruntfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ module.exports = function(grunt) {
4949
helpAppURL: grunt.option('help-app-url') || 'help.topcoder.com',
5050
forumsAppURL: grunt.option('forums-app-url') || 'forums.topcoder.com',
5151
swiftProgramId: grunt.option('swift-program-id') || 3445,
52-
swiftProgramURL: grunt.option('swift-program-url') || 'http://apple.topcoder.com',
52+
swiftProgramURL: grunt.option('swift-program-url') || 'http://ios.topcoder.com',
5353

5454
// only used on wp setup
5555
useGz: grunt.option('use-gz') || false,

‎src/conf/build-dev.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=https://www.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=forums.topcoder-dev.com --swift-program-id=3445 --swift-program-url=http://apple.topcoder-dev.com --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1
1+
grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=https://www.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=forums.topcoder-dev.com --swift-program-id=3445 --swift-program-url=http://ios.topcoder-dev.com --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1

‎src/conf/build-qa.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
grunt --main-url=https://www.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=https://www.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=forums.topcoder-qa.com --swift-program-id=3445 --swift-program-url=http://apple.topcoder-qa.com --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1
1+
grunt --main-url=https://www.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=https://www.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=forums.topcoder-qa.com --swift-program-id=3445 --swift-program-url=http://ios.topcoder-qa.com --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1

‎src/header.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<a href="" class="coder"></a>
106106
<p class="country"></p>
107107
<a href="" class="link myProfileLink">My Profile</a>
108-
<a href="@@community/tc?module=MyHome" class="link">My TopCoder </a>
108+
<a href="/my-dashboard" class="link">My TopCoder </a>
109109
<a href="@@community/tc?module=MyHome" class="link">Account Settings </a>
110110
<a href="javascript:;" class="actionLogout">Log Out</a>
111111
</div>
@@ -217,7 +217,7 @@ <h1 class="logo">
217217
<div class="action">
218218
<a class="profileLink" href="">My
219219
Profile</a>
220-
<a href="@@community/tc?module=MyHome">My TopCoder </a>
220+
<a href="/my-dashboard">My TopCoder </a>
221221
<a href="@@community/tc?module=MyHome" class="linkAlt">Account Settings</a>
222222
</div>
223223
</div>

‎src/js/app/challenge-details/js/controllers/challenge-details-controller.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -474,47 +474,47 @@
474474
nextStepTitle: "What's Next?",
475475
nextStepDescription: "Hold tight. This challenge will be starting soon.",
476476
nextStepAction: "",
477-
nextBadgeImg: "/mf/i/member-program/peer-badge-big.png",
477+
nextBadgeImg: "/mf/i/member-program/svg/Show-Your-Skills-06.svg",
478478
nextBadgeTitle: "Next badge"
479479
};
480480
} else if (status === 'active' && phase === 'registration') {
481481
return {
482482
nextStepTitle: "What's Next?",
483483
nextStepDescription: "Register to participate by clicking the Register button. Then when you're ready, click Submit to upload your submission. Keep an eye on the time limit!",
484484
nextStepAction: "",
485-
nextBadgeImg: "/mf/i/member-program/peer-badge-big.png",
485+
nextBadgeImg: "/mf/i/member-program/svg/Show-Your-Skills-06.svg",
486486
nextBadgeTitle: "Step One"
487487
};
488488
} else if (status === 'active' && phase === 'submission') {
489489
return {
490490
nextStepTitle: "What's Next?",
491491
nextStepDescription: "Submit to upload your submission. Keep an eye on the time limit!",
492492
nextStepAction: "",
493-
nextBadgeImg: "/mf/i/member-program/peer-badge-big.png",
493+
nextBadgeImg: "/mf/i/member-program/svg/Show-Your-Skills-06.svg",
494494
nextBadgeTitle: "Getting Ready"
495495
};
496496
} else if (status === 'active' && phase === 'review') {
497497
return {
498498
nextStepTitle: "What's Next?",
499499
nextStepDescription: "If you got your submission uploaded in time, then it's time to review your peers.",
500500
nextStepAction: "Click Review to start",
501-
nextBadgeImg: "/mf/i/member-program/peer-badge-big.png",
501+
nextBadgeImg: "/mf/i/member-program/svg/Show-Your-Skills-06.svg",
502502
nextBadgeTitle: "Break the Finish"
503503
};
504504
} else if (status === 'completed' || status.indexOf('cancelled') != -1) {
505505
return {
506506
nextStepTitle: "What's Next?",
507507
nextStepDescription: "This challenge has completed.",
508508
nextStepAction: "",
509-
nextBadgeImg: "/mf/i/member-program/peer-badge-big.png",
509+
nextBadgeImg: "/mf/i/member-program/svg/Show-Your-Skills-06.svg",
510510
nextBadgeTitle: "Break the Finish"
511511
};
512512
} else { // for default show only badge
513513
return {
514514
nextStepTitle: "",
515515
nextStepDescription: "",
516516
nextStepAction: "",
517-
nextBadgeImg: "/mf/i/member-program/peer-badge-big.png",
517+
nextBadgeImg: "/mf/i/member-program/svg/Show-Your-Skills-06.svg",
518518
nextBadgeTitle: "Next badge"
519519
};
520520
}

‎src/js/app/challenge-details/js/services/challenge-details-services.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
if (challenge.event.shortDescription == 'tc015') {
162162
challenge.event.url = 'http://tco15.topcoder.com/';
163163
} else if (challenge.event.shortDescription == 'swiftprogram') {
164-
challenge.event.url = 'http://apple.topcoder.com';
164+
challenge.event.url = 'http://ios.topcoder.com';
165165
} else {
166166
challenge.event.url = tcconfig.communityURL + '/' + challenge.event.shortDescription;
167167
}

‎src/js/app/my-dashboard/js/controllers/member-program-controller.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
vm.badges = [
3838
{ id : 'participant', enabled : true, completed: true, name: 'Participant'},
3939
{ id : 'education', enabled : false, completed: false, name: 'Education'},
40-
{ id : 'peer', enabled : true, completed: false, name: 'Peer'},
40+
{ id : 'peer', enabled : true, completed: false, name: 'Skills'},
4141
{ id : 'challenge', enabled : false, completed: false, name: 'Challenge'},
4242
{ id : 'high-performer', enabled : false, completed: false, name: 'High Performer'}
4343
]

‎src/js/app/my-dashboard/partials/member-program.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
</div>
1010
<div rel="unregistered-view" ng-show="!vm.loading && !vm.registration">
1111
<div class="center-align-text margin-top-3x">
12-
<img rel="program-logo" src="/mf/i/member-program/peer-badge-big.png" />
12+
<img rel="program-logo" src="/mf/i/member-program/svg/Show-Your-Skills-06.svg" />
1313
</div>
1414
<div class="description">
15-
<p>Apple’s latest and greatest programming language for iOS8 that will enable you to become a rockstar mobile developer and achieve fortune & glory untold.</p>
15+
<p>Ready to go iOS? Appirio is working with Apple to build the largest iOS Developer Community in the world and we want you to lead the way!</p>
1616

17-
18-
<p>We'll get you from a beginner to an expert and provide certifications to prove you are a great developer! Sign up now and check out the first mission</p>
17+
<p>We will get you started and show you the way from beginner to expert. Join us today and start your first mission and earn the Swift/iOS Ready! badge!</p>
1918
</div>
2019
<div class="signup">
2120
<!-- used style as workaround to override display property -->

‎wp/wp-content/themes/tcs-responsive/header-referral.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<a href="" class="coder"></a>
3030
<p class="country"></p>
3131
<a href="" class="link myProfileLink">My Profile</a>
32-
<a href="//community.topcoder.com/tc?module=MyHome" class="link">My TopCoder </a>
32+
<a href="/my-dashboard" class="link">My TopCoder </a>
3333
<a href="//community.topcoder.com/tc?module=MyHome" class="link">Account Settings </a>
3434
<a href="javascript:;" class="actionLogout">Log Out</a>
3535
</div>
@@ -100,7 +100,7 @@
100100
<div class="action">
101101
<a class="profileLink" href="">My
102102
Profile</a>
103-
<a href="//community.topcoder.com/tc?module=MyHome">My TopCoder </a>
103+
<a href="/my-dashboard">My TopCoder </a>
104104
<a href="//community.topcoder.com/tc?module=MyHome" class="linkAlt">Account Settings</a>
105105
</div>
106106
</div>

‎wp/wp-content/themes/tcs-responsive/header.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<a href="" class="coder"></a>
3030
<p class="country"></p>
3131
<a href="" class="link myProfileLink">My Profile</a>
32-
<a href="//community.topcoder.com/tc?module=MyHome" class="link">My TopCoder </a>
32+
<a href="/my-dashboard" class="link">My TopCoder </a>
3333
<a href="//community.topcoder.com/tc?module=MyHome" class="link">Account Settings </a>
3434
<a href="javascript:;" class="actionLogout">Log Out</a>
3535
</div>
@@ -120,7 +120,7 @@
120120
<div class="action">
121121
<a class="profileLink" href="">My
122122
Profile</a>
123-
<a href="//community.topcoder.com/tc?module=MyHome">My TopCoder </a>
123+
<a href="/my-dashboard">My TopCoder </a>
124124
<a href="//community.topcoder.com/tc?module=MyHome" class="linkAlt">Account Settings</a>
125125
</div>
126126
</div>

0 commit comments

Comments
 (0)