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

Commit a4797d6

Browse files
author
Parth Shah
committed
more external account fixes
1 parent e53af1c commit a4797d6

File tree

18 files changed

+125
-210
lines changed

18 files changed

+125
-210
lines changed

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
div.ext-tile(ng-repeat="account in accountList")
2-
a(ng-click="!readOnly && !account.linked && link(account.provider)", ng-class="{'linked': account.linked, 'read-only': readOnly}")
3-
.external-account-icon-box(ng-class="{'linked': account.linked}")
4-
i.fa(ng-class="account.className")
5-
.name {{account.displayName}}
1+
.ext-tile(ng-repeat="account in accountList | orderBy:'order'")
2+
.outer-box(ng-class="{'connected': account.linked, 'disabled': account.disabled}")
3+
a(ng-click="!account.disabled && !readOnly && !account.linked && link(account.provider)", ng-class="{'read-only': readOnly}")
4+
.external-account-icon-box(ng-class="{'connected': account.linked}")
5+
i.fa(ng-class="account.className")
6+
.name {{account.displayName}}
7+
.status.connected(ng-if="account.linked") connected
8+
.status(ng-if="!account.linked && !account.disabled") connect
9+
.status(ng-if="account.disabled") coming soon

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
(function() {
22
'use strict';
33
var _supportedAccounts = [
4-
// { provider: "dribble", className: "fa-dribbble", displayName: "Dribble"},
5-
// { provider: "linkedin", className: "fa-linkedin", displayName: "LinkedIn"},
6-
// { provider: "stackoverflow", className: "fa-stack-overflow", displayName: "StackOverflow"},
7-
// { provider: "behance", className: "fa-behance", displayName: "Behance"},
8-
// { provider: "google-oauth2", className: "fa-google-plus", displayName: "Google+"},
9-
{ provider: "github", className: "fa-github", displayName: "Github"},
10-
// { provider: "bitbucket", className: "fa-bitbucket", displayName: "Bitbucket"},
11-
// { provider: "twitter", className: "fa-twitter", displayName: "Twitter"},
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}
1213
// TODO add more
1314
];
1415

‎app/directives/profile-widget/profile-widget.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.profile-widget-directive
22
a(ui-sref="profile.about({userHandle: profile.handle})")
3-
img.profile-circle(fallback-src="{{ASSET_PREFIX}}/images/avatarPlaceholder.png", ng-src="{{profile.photoURL}}")
3+
img.profile-circle(fallback-src="/images/avatarPlaceholder.png", ng-src="{{profile.photoURL}}")
44

55
.info
66
h1.handle {{profile.handle}}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
a(ng-click="enableHide && toggle()")
22

33
.skill-icon(ng-switch="skill.category")
4-
img(ng-switch-when="DEVELOP", ng-src="{{ASSET_PREFIX}}/images/skills/id-{{skill.tagId}}.svg", fallback-src="{{ASSET_PREFIX}}/images/skills/id-develop.svg")
5-
img(ng-switch-when="DESIGN", ng-src="{{ASSET_PREFIX}}/images/skills/id-{{skill.tagId}}.svg", fallback-src="{{ASSET_PREFIX}}/images/skills/id-design.svg")
6-
img(ng-switch-when="DATA_SCIENCE", ng-src="{{ASSET_PREFIX}}/images/skills/id-{{skill.tagId}}.svg", fallback-src="{{ASSET_PREFIX}}/images/skills/id-data.svg")
4+
img(ng-switch-when="DEVELOP", ng-src="{{ASSET_PREFIX}}images/skills/id-{{skill.tagId}}.svg", fallback-src="/images/skills/id-develop.svg")
5+
img(ng-switch-when="DESIGN", ng-src="{{ASSET_PREFIX}}images/skills/id-{{skill.tagId}}.svg", fallback-src="/images/skills/id-design.svg")
6+
img(ng-switch-when="DATA_SCIENCE", ng-src="{{ASSET_PREFIX}}images/skills/id-{{skill.tagId}}.svg", fallback-src="/images/skills/id-data.svg")
77
.name {{skill.tagName}}
88
span.hidden(ng-if="skill.hidden") (Hidden)
99

‎app/layout/header/account-header.jade

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
header.topcoder-header
22
.container
3-
a(id="topcoder-logo", ng-href="/", title="topcoder")
4-
img(ng-src="{{vm.constants.ASSET_PREFIX}}/images/logo.png", alt="Topcoder Logo")

‎app/profile/subtrack/subtrack.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
.nav
44
a(ui-sref="profile.about({userHandle: profileVm.profile.handle})")
5-
img.arrow(ng-src="{{vm.ASSET_PREFIX}}/images/ico-arrow-big-left.svg")
5+
img.arrow(ng-src="/images/ico-arrow-big-left.svg")
66

77
.breadcrumbs
88
.handle
9-
img.profile-circle(fallback-src="{{vm.ASSET_PREFIX}}/images/avatarPlaceholder.png", ng-src="{{profileVm.profile.photoURL}}")
9+
img.profile-circle(fallback-src="/images/avatarPlaceholder.png", ng-src="{{profileVm.profile.photoURL}}")
1010
a(ui-sref="profile.about({userHandle: profileVm.profile.handle})")
1111
| {{vm.userHandle}}
1212
| /

‎app/sample/sample.home.jade

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11

2-
br
3-
br
2+
div(style="text-align: center; background-color: white; margin:100px;")
3+
img(style="width: 400px;", ng-src="/images/keepcalm.png")
44

5-
h1 Ugly landing page
6-
7-
p This page will be replaced by "dashboard", until then...
8-
9-
hr
10-
11-
12-
div(ng-show="vm.loggedIn") User Information:
13-
pre {{vm.user|json}}
14-
15-
div(ng-hide="vm.loggedIn")
16-
a(ui-sref="login") Login
17-
18-
br
5+
p(style="text-decoration: none;") ... while you wait -
6+
a(href="https://www.youtube.com/watch?v=LU8DDYz68kM") click me

‎app/sample/sample.routes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
var states = {
1212
sample: {
1313
parent: 'root',
14-
url: '/sample/',
14+
url: '/its-coming/',
1515
templateUrl: 'sample/sample.home.html',
1616
controller: 'SampleController',
1717
controllerAs: 'vm',
1818
data: {
1919
authRequired: false,
20-
title: 'Temp Home'
20+
title: 'It\'s Coming'
2121
}
2222
}
2323
};

‎app/services/externalAccounts.service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
function linkExternalAccount(provider, callbackUrl) {
5050
return $q(function(resolve, reject) {
5151
// supported backends
52-
var backends = ['facebook', 'google-oauth2', 'bitbucket', 'github'];
52+
var backends = ['facebook', 'google-oauth2', 'bitbucket', 'github', 'linkedin'];
5353
if (backends.indexOf(provider) > -1) {
5454
auth0.signin({
5555
popup: true,

‎app/services/helpers.service.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,14 @@
6363
handle = profile.nickname;
6464
email = profile.email;
6565
socialProviderId = 4;
66+
} else if (socialProvider === 'bitbucket') {
67+
firstName = profile.first_name;
68+
lastName = profile.last_name;
69+
handle = profile.username;
70+
email = profile.email;
71+
socialProviderId = 4;
6672
}
73+
6774
var socialUserId = profile.user_id.substring(profile.user_id.indexOf('|') + 1);
6875
return {
6976
socialUserId: socialUserId,

‎app/settings/edit-profile/edit-profile.controller.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
vm.onFileChange = onFileChange;
1515
vm.updateProfile = updateProfile;
1616
vm.linkedExternalAccounts = [];
17+
vm.linkedExternalAccountsData = {};
1718
vm.skills = false;
1819
vm.addSkill = addSkill;
1920
vm.tags = [];
@@ -28,14 +29,13 @@
2829

2930
processData(userData);
3031
vm.userData = userData;
32+
ExternalAccountService.getLinkedExternalAccounts(userData.userId).then(function(data) {
33+
vm.linkedExternalAccounts = data;
34+
})
3135

3236
ExternalAccountService.getLinkedExternalLinksData(userHandle).then(function(data) {
33-
vm.linkedExternalAccounts = data.plain();
34-
vm.hasLinks = _.any(_.valuesIn(_.omit(vm.linkedExternalAccounts, ['userId', 'updatedAt','createdAt','createdBy','updatedBy','handle'])));
35-
36-
console.log('ext');
37-
console.log(vm.hasLinks);
38-
console.log(vm.linkedExternalAccounts)
37+
vm.linkedExternalAccountsData = data.plain();
38+
vm.hasLinks = _.any(_.valuesIn(_.omit(vm.linkedExternalAccountsData, ['userId', 'updatedAt','createdAt','createdBy','updatedBy','handle'])));
3939
})
4040
.catch(function(err) {
4141
$log.error(JSON.stringify(err));

‎app/settings/edit-profile/edit-profile.jade

Lines changed: 5 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
.image
1313
.form-label your profile image
1414
.edit-image
15-
img.profile-circle(fallback-src="{{vm.ASSET_PREFIX}}/images/avatarPlaceholder.png", ng-src="{{vm.userData.photoURL}}")
15+
img.profile-circle(fallback-src="/images/avatarPlaceholder.png", ng-src="{{vm.userData.photoURL}}")
1616

1717
input(type="file", name="image", on-file-change)
1818

@@ -85,128 +85,9 @@
8585
.section-fields
8686
.field-label Link your accounts
8787
.external-links
88-
external-accounts.external-account-container(linked-accounts="vm.linkedExternalAccounts", read-only="false")
89-
90-
.field-label your accounts
88+
external-accounts(linked-accounts="vm.linkedExternalAccounts.length", read-only="false")
89+
90+
.field-label(ng-show="vm.linkedExternalAccountsData") your accounts
9191

9292
.existing-links
93-
external-links-data(ng-show="vm.hasLinks" linked-accounts-data="vm.linkedExternalAccounts")
94-
95-
96-
97-
//- h1.tab-title Profile
98-
99-
//- form(name="vm.editProfile", ng-submit="vm.editProfile.$valid && vm.updateProfile()", autocomplete="off")
100-
//- // Stops Chrome from autofilling and autocompleting (along with autocomplete="off" on the form)
101-
//- input(autocomplete="false", name="hidden", type="text", style="display:none;")
102-
103-
//- .fields
104-
//- .field-section.edit-image
105-
//- img.profile-circle(fallback-src="/images/avatarPlaceholder.png", ng-src="{{vm.userData.photoURL}}")
106-
107-
//- .upload-image
108-
//- p Edit Image
109-
110-
//- input(type="file", name="image", on-file-change)
111-
112-
//- .field-section
113-
//- h4.field-title Location
114-
115-
//- .country-dropdown
116-
//- angucomplete-alt(
117-
//- id="countryId",
118-
//- input-name="location",
119-
//- placeholder="Country",
120-
//- pause="100",
121-
//- selected-object="vm.updateCountry",
122-
//- local-data="vm.countries",
123-
//- initial-value="vm.countryObj",
124-
//- search-fields="name",
125-
//- title-field="name",
126-
//- match-class="angucomplete-highlight",
127-
//- minlength="1"
128-
//- )
129-
130-
//- .form-errors
131-
//- p.form-error(ng-show="vm.editProfile.location.$error.required") Please choose a country from the list.
132-
133-
//- .field-section.description
134-
//- h4.field-title About Me
135-
136-
//- input(name="description", type="text", value="{{vm.userData.description}}", ng-model="vm.userData.description", maxlength="144")
137-
138-
//- span {{vm.userData.description.length || 0}}/144
139-
140-
//- .field-section.my-tracks
141-
//- h4.field-title My Tracks
142-
143-
//- h6.field-subtitle These are the main categories that help us select the best challenges for you
144-
145-
//- .select-tracks
146-
//- .track-section
147-
//- .track-checkbox
148-
//- input(type="checkbox", id="checkbox-design", ng-checked="vm.tracks.design")
149-
150-
//- label(for="checkbox-design")
151-
//- span(ng-class="{ 'checked-track': vm.tracks.design }", ng-click="vm.toggleTrack('design')")
152-
153-
//- .track-info
154-
//- h4 Design
155-
156-
//- p Find challenges about Brand, Logo, Web UI, Mobile UI, UX. You know and use tools like Photoshop, Illustrator, Sketch, OmniGraffle.
157-
158-
//- .track-section
159-
//- .track-checkbox
160-
//- input(type="checkbox", id="checkbox-develop", ng-checked="vm.tracks.develop")
161-
162-
//- label(for="checkbox-develop")
163-
//- span(ng-class="{ 'checked-track': vm.tracks.develop }", ng-click="vm.toggleTrack('develop')")
164-
165-
//- .track-info
166-
//- h4 Development
167-
168-
//- p Find challenges about coding and development. You know languages like PHP, Python, Ruby, Objective-C, C#, MySQL, JavaScript, Java.
169-
170-
//- .track-section
171-
//- .track-checkbox
172-
//- input(type="checkbox", id="checkbox-datascience", ng-checked="vm.tracks.data_science")
173-
174-
//- label(for="checkbox-datascience")
175-
//- span(ng-class="{ 'checked-track': vm.tracks.data_science }", ng-click="vm.toggleTrack('data_science')")
176-
177-
//- .track-info
178-
//- h4 Data Science
179-
180-
//- p Find challenges about data and algorithms. You know data sets, algorithms, DB structures, statistics, data analysis.
181-
182-
//- button(type="submit", ng-disabled="vm.editProfile.$invalid", ng-class="{'enabled-button': vm.editProfile.$valid}") Save
183-
184-
//- .field-section.edit-skills
185-
//- h4.field-title My Skills
186-
//- h5 This skills are shown on the
187-
188-
//- angucomplete-alt(
189-
//- id="tagId",
190-
//- input-name="skill-input",
191-
//- placeholder='Type skill name here and press "Enter" to add it',
192-
//- pause="100",
193-
//- selected-object="vm.addSkill",
194-
//- local-data="vm.tags",
195-
//- search-fields="name",
196-
//- title-field="name",
197-
//- clear-selected=true,
198-
//- match-class="angucomplete-highlight",
199-
//- minlength="1"
200-
//- )
201-
202-
//- .skills
203-
//- .skill(ng-repeat="skill in vm.skills | orderBy:'-score'")
204-
//- skill-tile(skill="skill" enable-hide="true")
205-
206-
//- .clearfix
207-
208-
//- .field-section
209-
//- h4.field-title Links to Work
210-
//- p Add links to your existing work
211-
212-
//- external-accounts.external-account-container(linked-accounts="vm.linkedExternalAccounts")
93+
external-links-data(ng-show="vm.hasLinks" linked-accounts-data="vm.linkedExternalAccountsData")

‎app/skill-picker/skill-picker.jade

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
ng-class="{'selected-skill': vm.mySkills.indexOf(tag.id.toString()) > -1}")
2222
a(ng-click="vm.toggleSkill(tag.id.toString())")
2323
.icon
24-
img(ng-src="{{vm.ASSET_PREFIX}}/images/skills/id-{{tag.id}}.svg", fallback-src="{{vm.ASSET_PREFIX}}/images/skills/id-design.svg")
24+
img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="/images/skills/id-design.svg")
2525
.name {{tag.name}}
2626

2727

@@ -33,7 +33,7 @@
3333
ng-class="{'selected-skill': vm.mySkills.indexOf(tag.id.toString()) > -1}")
3434
a(ng-click="vm.toggleSkill(tag.id.toString())")
3535
.icon
36-
img(ng-src="{{vm.ASSET_PREFIX}}/images/skills/id-{{tag.id}}.svg", fallback-src="{{vm.ASSET_PREFIX}}/images/skills/id-develop.svg")
36+
img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="/images/skills/id-develop.svg")
3737
.name {{tag.name}}
3838

3939
.skills-section(ng-show="vm.tracks.DATA_SCIENCE")
@@ -44,7 +44,7 @@
4444
ng-class="{'selected-skill': vm.mySkills.indexOf(tag.id.toString()) > -1}")
4545
a(ng-click="vm.toggleSkill(tag.id.toString())")
4646
.icon
47-
img(ng-src="{{vm.ASSET_PREFIX}}/images/skills/id-{{tag.id}}.svg", fallback-src="{{vm.ASSET_PREFIX}}/images/skills/id-data.svg")
47+
img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="/images/skills/id-data.svg")
4848
.name {{tag.name}}
4949

5050

‎app/topcoder.routes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
url: '/',
6666
// template: 'This is the home page',
6767
controller: ['$state', function($state) {
68-
$state.go('dashboard')
68+
$state.go('sample')
6969
}]
7070
}
7171
};

0 commit comments

Comments
 (0)