Skip to content

Commit 7c9bfc3

Browse files
author
vikasrohit
committed
Merge branch 'release/v1.0.2'
2 parents 9a38b58 + 26ebaad commit 7c9bfc3

File tree

24 files changed

+160
-239
lines changed

24 files changed

+160
-239
lines changed

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Topcoder-App
22

3-
Supply rocks!
43
This repository houses any new topcoder pages or refactored Angular apps/pages from the tc-site repository.
54

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

‎app/account/register/register.jade

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
p.form-error(ng-show="vm.errMsg") {{vm.errMsg}}
1414

1515
.first-last-names
16-
input(right-placeholder, focused-placeholder="First", ng-model="vm.firstname", maxlength="64", name="firstname", placeholder="First Name", type="text", required)
16+
input-sticky-placeholder(sticky-placeholder="First", ng-model="vm.firstname")
17+
input(ng-model="vm.firstname", maxlength="64", name="firstname", placeholder="First Name", type="text", required)
1718

18-
input(right-placeholder, focused-placeholder="Last", ng-model="vm.lastname", maxlength="64", name="lastname", placeholder="Last Name", type="text", required)
19+
input-sticky-placeholder(sticky-placeholder="Last", ng-model="vm.lastname")
20+
input(ng-model="vm.lastname", maxlength="64", name="lastname", placeholder="Last Name", type="text", required)
1921

2022
.country-dropdown
2123
angucomplete-alt(
@@ -36,7 +38,8 @@
3638
p.form-error(ng-show="vm.registerForm.country.$error.required") Please choose a country from the list.
3739

3840
.validation-bar(ng-class="{ 'error-bar': (vm.registerForm.username.$error.usernameIsFree || vm.registerForm.username.$error.minlength || vm.registerForm.username.$error.maxlength), 'success-bar': (vm.registerForm.username.$valid && !vm.registerForm.username.$error.usernameIsFree) }")
39-
input(right-placeholder, focused-placeholder="Username", ng-model="vm.username", ng-model-options="{ debounce: {'default': 500} }", ng-focus="vm.usernameTips = true", ng-blur="vm.usernameTips = false", ng-minlength="2", ng-maxlength="15", name="username", placeholder="Username", type="text", username-is-free, required)
41+
input-sticky-placeholder(sticky-placeholder="Username", ng-model="vm.username")
42+
input(ng-model="vm.username", ng-model-options="{ debounce: {'default': 500} }", ng-focus="vm.usernameTips = true", ng-blur="vm.usernameTips = false", ng-minlength="2", ng-maxlength="15", name="username", placeholder="Username", type="text", username-is-free, required)
4043

4144
.tips.username-tips(ng-show="vm.usernameTips")
4245
h3 Username Tips:
@@ -53,7 +56,8 @@
5356
p.form-error(ng-show="vm.registerForm.username.$dirty && (vm.registerForm.username.$error.minlength || vm.registerForm.username.$error.maxlength)") That username is not the correct length or format.
5457

5558
.validation-bar(ng-class="{ 'error-bar': (vm.registerForm.email.$dirty && vm.registerForm.email.$invalid), 'success-bar': (vm.registerForm.email.$valid) }")
56-
input(right-placeholder, focused-placeholder="Email", ng-model="vm.email", ng-model-options="{ debounce: {'default': 500} }", ng-focus="vm.emailTips = true", ng-blur="vm.emailTips = false", name="email", placeholder="Enter Your Email", type="email", valid-email, email-is-available, required)
59+
input-sticky-placeholder(sticky-placeholder="Email", ng-model="vm.email")
60+
input(ng-model="vm.email", ng-model-options="{ debounce: {'default': 500} }", ng-focus="vm.emailTips = true", ng-blur="vm.emailTips = false", name="email", placeholder="Enter Your Email", type="email", valid-email, email-is-available, required)
5761

5862
.tips.email-tips(ng-show="vm.emailTips")
5963
h3 Email Tips:

‎app/account/reset-password/reset-password.jade

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
p.email-label Please enter your email address, and we'll send you a link to reset your password
1212

1313
.validation-bar(ng-class="{ 'error-bar': (vm.generateTokenForm.email.$dirty && vm.generateTokenForm.email.$invalid), 'success-bar': (vm.generateTokenForm.email.$valid) }")
14-
input(right-placeholder, focused-placeholder="Email", ng-model="vm.email", ng-focus="vm.emailTips = true", ng-blur="vm.emailTips = false", name="email", placeholder="EMAIL ADDRESS", type="email", valid-email, required)
14+
input-sticky-placeholder(sticky-placeholder="Email", ng-model="vm.email")
15+
input(ng-model="vm.email", ng-focus="vm.emailTips = true", ng-blur="vm.emailTips = false", name="email", placeholder="EMAIL ADDRESS", type="email", valid-email, required)
1516

1617
.tips.email-tips(ng-show="vm.emailTips")
1718
h3 Email Tips:

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
function historyGraph() {
77
return {
88
restrict: 'E',
9-
templateUrl: function(elem, attrs) {
10-
return 'directives/history-graph/history-graph.directive.html';
11-
},
9+
templateUrl: 'directives/history-graph/history-graph.directive.html',
1210
scope: {
1311
promise: '=',
1412
rating: '=',

‎app/directives/input-sticky-placeholder/input-sticky-placeholder.directive.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
(function() {
2+
'use strict';
3+
4+
angular.module('tcUIComponents').directive('inputStickyPlaceholder', inputStickyPlaceholder);
5+
6+
/*
7+
* ******
8+
* Make sure to add padding-right to the input element
9+
* so that the text entered does not overlap with the
10+
* sticky-placeholder
11+
* ******
12+
*
13+
* Example:
14+
* input-sticky-placeholder(sticky-placeholder="First", ng-model="vm.firstname")
15+
* input(ng-model="vm.firstname", ...)
16+
*
17+
*/
18+
19+
function inputStickyPlaceholder() {
20+
return {
21+
restrict: 'E',
22+
transclude: true,
23+
replace: true,
24+
templateUrl: 'directives/input-sticky-placeholder/input-sticky-placeholder.html',
25+
link: function(scope, element, attrs) {
26+
var span = angular.element(element[0].children[1]);
27+
var input = angular.element(element[0].children[0].children[0]);
28+
span.text('');
29+
30+
scope.$watch(function() {
31+
return input.val();
32+
}, function(newValue, oldValue) {
33+
span.text('');
34+
35+
if (newValue && newValue.length) {
36+
span.text(attrs.stickyPlaceholder);
37+
}
38+
});
39+
}
40+
};
41+
}
42+
})();

‎app/directives/input-sticky-placeholder/input-sticky-placeholder.jade

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.input-sticky-placeholder-container
2+
div(ng-transclude)
3+
4+
span.placeholder-text

‎app/directives/right-placeholder.directive.js

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎app/directives/srm-tile/srm-tile.directive.jade

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.challenge-track
44

55
header
6-
a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.id}}") {{srm.name}}
6+
a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
77

88
.srm-details
99
p.starts-in Starts in #[span {{srm.startDate | timeDiff:"quantity"}} {{srm.startDate | timeDiff:'unit'}}]
@@ -24,7 +24,7 @@
2424
.challenge-track
2525

2626
header
27-
a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.id}}") {{srm.name}}
27+
a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
2828
.ended-on #[span {{srm.startDate | localTime:"MMM DD, YYYY" }}]
2929

3030
.member-stats
@@ -43,7 +43,7 @@
4343
.challenge-track
4444
header
4545
.srm-name
46-
a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.id}}") {{srm.name}}
46+
a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
4747

4848
.srm-details
4949
p.starts-in Starts in #[span {{srm.startDate | timeDiff:"quantity"}} {{srm.startDate | timeDiff:'unit'}}]
@@ -59,7 +59,7 @@
5959
.challenge-track
6060
header
6161
.srm-name
62-
a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.id}}") {{srm.name}}
62+
a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
6363

6464
.srm-details
6565
p.ended-on Ended {{srm.endDate | timeDiff:"quantity"}} {{srm.endDate | timeDiff:'unit'}} ago

‎app/index.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ html
6363
link(rel="stylesheet", href="assets/css/directives/skill-tile.css")
6464
link(rel="stylesheet", href="assets/css/directives/profile-widget.css")
6565
link(rel="stylesheet", href="assets/css/directives/ios-card.css")
66+
link(rel="stylesheet", href="assets/css/directives/input-sticky-placeholder.css")
6667
link(rel="stylesheet", href="assets/css/directives/history-graph.css")
6768
link(rel="stylesheet", href="assets/css/directives/external-link-data.css")
6869
link(rel="stylesheet", href="assets/css/directives/external-account.css")
@@ -153,10 +154,10 @@ html
153154
script(src="directives/focus-on.directive.js")
154155
script(src="directives/header/header-menu-item.directive.js")
155156
script(src="directives/history-graph/history-graph.directive.js")
157+
script(src="directives/input-sticky-placeholder/input-sticky-placeholder.directive.js")
156158
script(src="directives/ios-card/ios-card.directive.js")
157159
script(src="directives/on-file-change.directive.js")
158160
script(src="directives/profile-widget/profile-widget.directive.js")
159-
script(src="directives/right-placeholder.directive.js")
160161
script(src="directives/skill-tile/skill-tile.directive.js")
161162
script(src="directives/slideable.directive.js")
162163
script(src="directives/srm-tile/srm-tile.directive.js")
@@ -235,7 +236,6 @@ html
235236
script(src="settings/preferences/preferences.controller.js")
236237
script(src="settings/settings.controller.js")
237238
script(src="settings/settings.routes.js")
238-
script(src="settings/update-password/update-password.controller.js")
239239
script(src="skill-picker/skill-picker.module.js")
240240
script(src="skill-picker/skill-picker.controller.js")
241241
script(src="skill-picker/skill-picker.routes.js")

‎app/profile/about/about.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
div
4141
.text {{track | track}}
4242
.description Compete in challenges to win money, test yourself against the world's best, and learn new skills. Your performance rating will show up here.
43-
button.link-button(ui-sref="settings.profile") FIND CHALLENGES
43+
a.link-button(href="/challenges") FIND CHALLENGES
4444

4545
.track(
4646
ng-repeat="track in profileVm.profile.tracks",

0 commit comments

Comments
 (0)