Skip to content

Commit 6e6c1a9

Browse files
author
vikasrohit
committed
Merge branch 'release/v1.0.3'
Production Release
2 parents 9a38b58 + 35fa55e commit 6e6c1a9

Some content is hidden

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

41 files changed

+320
-341
lines changed

‎.version

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

‎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.controller.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535
var countryCode = _.get(angucompleteCountryObj, 'originalObject.code', undefined);
3636

3737
var isValidCountry = _.isUndefined(countryCode) ? false : true;
38-
vm.country = countryCode;
3938
vm.registerForm.country.$setValidity('required', isValidCountry);
39+
if (isValidCountry) {
40+
vm.country = angucompleteCountryObj.originalObject;
41+
}
4042
};
4143

4244
vm.register = function() {
@@ -47,7 +49,9 @@
4749
lastName: vm.lastname,
4850
email: vm.email,
4951
country: {
50-
code: vm.country
52+
code: Helpers.npad(vm.country.code, 3),
53+
isoAlpha3Code: vm.country.alpha3,
54+
isoAlpha2Code: vm.country.alpha2
5155
},
5256
utmSource: utm.source,
5357
utmMedium: utm.medium,

‎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/external-account/external-account.directive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
var _supportedAccounts = [
44
{ provider: "dribble", className: "fa-dribbble", displayName: "Dribble", disabled: true, order: 6, colorClass: 'el-dribble'},
55
{ 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'},
6+
{ provider: "stackoverflow", className: "fa-stack-overflow", displayName: "Stack Overflow", disabled: false, order: 3, colorClass: 'el-stackoverflow'},
77
{ provider: "behance", className: "fa-behance", displayName: "Behance", disabled: true, order: 2, colorClass: 'el-behance'},
88
// { provider: "google-oauth2", className: "fa-google-plus", displayName: "Google+", disabled: true, order: }, colorClass: 'el-dribble',
99
{ provider: "github", className: "fa-github", displayName: "Github", disabled: false, order: 1, colorClass: 'el-github'},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
.key repositories
2323

2424
div(ng-switch-when="stackoverflow")
25-
.handle {{account.data.handle}}
25+
.handle {{account.data.name}}
2626

2727
.pending(ng-show="account.data.status === 'PENDING'")
2828
p Loading data. This will take a few minutes.

‎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

0 commit comments

Comments
 (0)