Skip to content

Commit 9a38b58

Browse files
author
Parth Shah
committed
Merge branch 'release/v1.0.2'
2 parents 6cc9ef7 + 838c00f commit 9a38b58

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+407
-312
lines changed

‎.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.0.1
1+
v1.0.2

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Topcoder-App
2+
3+
Supply rocks!
24
This repository houses any new topcoder pages or refactored Angular apps/pages from the tc-site repository.
35

46
The technologies used are Jade, SCSS, Angular, and Gulp.

‎app/account/register/register.controller.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
$log = $log.getInstance("RegisterController");
1010
$log.debug("-init");
1111
var vm = this;
12+
vm.registering = false;
1213
// prepares utm params, if available
1314
var utm = {
1415
source : $stateParams && $stateParams.utm_source ? $stateParams.utm_source : '',
@@ -39,6 +40,7 @@
3940
};
4041

4142
vm.register = function() {
43+
vm.registering = true;
4244
var userInfo = {
4345
handle: vm.username,
4446
firstName: vm.firstname,
@@ -78,12 +80,14 @@
7880
$log.debug('attempting to register user');
7981
TcAuthService.register(body)
8082
.then(function(data) {
83+
vm.registering = false;
8184
$log.debug('registered successfully');
8285

8386
// In the future, go to dashboard
8487
$state.go('registeredSuccessfully');
8588
})
8689
.catch(function(err) {
90+
vm.registering = false;
8791
$log.error('Error in registering new user: ', err);
8892
});
8993
};

‎app/account/register/register.jade

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@
8181

8282
p(ng-class="{ 'has-symbol-or-number': (vm.registerForm.password.$dirty && !vm.registerForm.password.$error.hasSymbolOrNumber) }") At least one number or symbol
8383

84-
button(type="submit", busy, busy-disabled="true", ng-disabled="vm.registerForm.$invalid", ng-class="{'enabled-button': vm.registerForm.$valid}") Join
85-
busy-message
86-
i.fa.fa-spinner(ng-bind="vm.busyMessage")
84+
button(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid", ng-class="{'enabled-button': vm.registerForm.$valid}") Join
8785

8886
section.terms
8987
p By clicking "Join," you agree to Topcoder's #[a(href="http://www.topcoder.com/community/how-it-works/terms/", target="_blank") Terms of Service] and #[a(href="http://www.topcoder.com/community/how-it-works/privacy-policy/", target="_blank") Privacy Policy]

‎app/account/register/registered-successfully.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
66
.arrow
77

8-
p.message Thanks for joining Topcoder.<br> We’ve sent you a confirmation link. Please check your email and click the link to activate your account. If you can't find the message, please email #[a(href="mailto:support@topcoder.com") support@topcoder.com].
8+
p.message Thanks for joining Topcoder.<br> We've sent you a confirmation link. Please check your email and click the link to activate your account. If you can't find the message, please email #[a(href="mailto:support@topcoder.com") support@topcoder.com].

‎app/directives/distribution-graph/distribution-graph.directive.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090

9191
function resize() {
9292
if (window.innerWidth < 900 && desktop) {
93-
console.log('yo!')
9493
d3.select('.distribution-graph svg').remove();
9594
draw(mobileMeasurements, $scope.distribution);
9695
desktop = false;
@@ -151,7 +150,7 @@
151150

152151

153152
function logr(x) {
154-
console.log(x); return x;
153+
return x;
155154
}
156155
svg.append('line')
157156
.attr('x1', xScale2($scope.rating))
@@ -281,7 +280,7 @@
281280

282281
function removeLeadingZeroes(ranges) {
283282
while(ranges[0].number == 0) {
284-
ranges.shift();
283+
ranges.shift();
285284
}
286285
}
287286

@@ -304,7 +303,7 @@
304303
});
305304
return colors[0] && colors[0].darkerColor || 'black';
306305
}
307-
306+
308307
// TODO: delete because this is probably unnecessary
309308
function ratingToRange(ranges, rating) {
310309
var ans = ranges.filter(function(range) {

‎app/directives/external-account/external-account.directive.jade

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
.ext-tile(ng-repeat="account in accountList | orderBy:'order'", ng-class="{'connected': account.linked, 'disabled': account.disabled}")
2-
.external-account-box(ng-click="!account.disabled && !readOnly && !account.linked && link(account.provider)", ng-class="{'read-only': readOnly}")
3-
i.fa(ng-class="account.className")
1+
.ext-tile(ng-repeat="account in accountList | orderBy:'order'", ng-click="!account.disabled && !readOnly && !account.linked && link(account.provider)", ng-class="{'connected': account.linked, 'disabled': account.disabled, 'read-only': readOnly}")
2+
.external-account-box(ng-class="account.colorClass")
3+
i.fa(ng-if="readOnly || account.linked", ng-class="account.className", style="color: {{account.colorClass | externalLinkColor}}")
4+
5+
i.fa(ng-if="!readOnly && account.disabled", ng-class="account.className")
46

57
.provider {{account.displayName}}
68

7-
.status(ng-if="account.linked") Connected
9+
.status.already-connected(ng-if="account.linked") Connected
10+
11+
.status.disconnect Disconnect
812

913
.status(ng-if="!account.linked && !account.disabled") Connect
1014

‎app/directives/external-account/external-account.directive.js

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
(function() {
22
'use strict';
33
var _supportedAccounts = [
4-
{ provider: "dribble", className: "fa-dribbble", displayName: "Dribble", disabled: true, order: 6},
5-
{ provider: "linkedin", className: "fa-linkedin", displayName: "LinkedIn", disabled: true, order: 5},
6-
{ provider: "stackoverflow", className: "fa-stack-overflow", displayName: "Stack Overflow", disabled: true, order: 3},
7-
{ provider: "behance", className: "fa-behance", displayName: "Behance", disabled: true, order: 2},
8-
// { provider: "google-oauth2", className: "fa-google-plus", displayName: "Google+", disabled: true, order: },
9-
{ provider: "github", className: "fa-github", displayName: "Github", disabled: false, order: 1},
10-
{ provider: "bitbucket", className: "fa-bitbucket", displayName: "Bitbucket", disabled: true, order: 7},
11-
{ provider: "twitter", className: "fa-twitter", displayName: "Twitter", disabled: true, order: 4},
12-
{ provider: "weblinks", className: "fa-globe", displayName: "Web Links", disabled: true, order: 8}
4+
{ provider: "dribble", className: "fa-dribbble", displayName: "Dribble", disabled: true, order: 6, colorClass: 'el-dribble'},
5+
{ provider: "linkedin", className: "fa-linkedin", displayName: "LinkedIn", disabled: true, order: 5, colorClass: 'el-linkedin'},
6+
{ provider: "stackoverflow", className: "fa-stack-overflow", displayName: "Stack Overflow", disabled: true, order: 3, colorClass: 'el-stackoverflow'},
7+
{ provider: "behance", className: "fa-behance", displayName: "Behance", disabled: true, order: 2, colorClass: 'el-behance'},
8+
// { provider: "google-oauth2", className: "fa-google-plus", displayName: "Google+", disabled: true, order: }, colorClass: 'el-dribble',
9+
{ provider: "github", className: "fa-github", displayName: "Github", disabled: false, order: 1, colorClass: 'el-github'},
10+
{ provider: "bitbucket", className: "fa-bitbucket", displayName: "Bitbucket", disabled: true, order: 7, colorClass: 'el-bitbucket'},
11+
{ provider: "twitter", className: "fa-twitter", displayName: "Twitter", disabled: true, order: 4, colorClass: 'el-twitter'},
12+
{ provider: "weblinks", className: "fa-globe", displayName: "Web Links", disabled: true, order: 8, colorClass: 'el-weblinks'}
1313
// TODO add more
1414
];
1515

@@ -96,10 +96,6 @@
9696
});
9797

9898
$scope.$watchCollection('externalLinks', function(newValue, oldValue) {
99-
console.log("WATCH COLLECTION EXTERNAL LINKS: ");
100-
console.log("New Value: ", newValue);
101-
console.log("Old Value: ", oldValue);
102-
10399
angular.forEach(newValue, function(link) {
104100
var provider = link.providerType;
105101

‎app/directives/history-graph/history-graph.directive.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,9 @@
228228
.attr('stroke-width', 3)
229229

230230
function processRatingStripePoint(y) {
231-
console.log('y:' + y)
232231
if (y < padding.top || isNaN(y)) {
233232
return padding.top;
234233
} else if (y > totalH - padding.bottom) {
235-
console.log('y & ' + padding.bottom);
236234
return totalH - padding.bottom;
237235
} else {
238236
return y;
@@ -286,7 +284,7 @@
286284
});
287285
return colors[0] && colors[0].darkerColor || 'black';
288286
}
289-
287+
290288
}
291289

292290
})();

‎app/directives/ios-card/ios-card.directive.jade

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77
p {{challenge.subTrack | underscoreStrip}}
88

99
.challenge-details
10+
11+
p.currentPhase {{challenge.userCurrentPhase}}
12+
.challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime")
13+
p.ends-in Ends In
14+
p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
15+
p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}
16+
1017
p.prize-money(ng-show="challenge.reviewType === 'PEER'") Peer Review Challenge
1118

1219
p.prize-money(ng-hide="challenge.reviewType === 'PEER'") {{challenge.totalCheckpointPrize || 0 | currency:undefined:0}}
1320

1421
p.technologies {{challenge.technologies}}
1522

16-
.challenge-calendar
17-
p.starts-in Starts In
18-
p.time-remaining 3
19-
p.unit-of-time days
20-
2123
//button.phase-action(ng-class="{'action-completed': challenge.currentPhaseActionCompleted}") Submit
2224
2325
.challenge-links

0 commit comments

Comments
 (0)