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

Commit 308efda

Browse files
thabofletcherthabofletcher
committed
Merge branch 'dev' into sup-1349-new-nav
2 parents 9e558d7 + a258837 commit 308efda

File tree

69 files changed

+1545
-511
lines changed

Some content is hidden

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

69 files changed

+1545
-511
lines changed

‎app/account/account.routes.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
parent: 'root',
1414
abstract: true,
1515
data: {
16-
UIRefresh: true,
1716
authRequired: false
1817
},
1918
onEnter: ['$state', '$stateParams', 'TcAuthService', function($state, $stateParams, TcAuthService) {

‎app/account/login/login.controller.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@
9494
switch (resp.status) {
9595
case "ACCOUNT_INACTIVE":
9696
window.location.href = "https://www." + CONSTANTS.domain + "/account-inactive/";
97+
case "USER_NOT_REGISTERED":
9798
default:
99+
vm.socialLoginError = 401;
98100
break;
99101
}
100102
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
top: 20,
6464
left: 50,
6565
bottom: 100,
66-
right: 50
66+
right: 5
6767
}
6868
};
6969

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
h: 400,
6262
padding: {
6363
top: 20,
64-
right: 30,
64+
right: 5,
6565
bottom: 100,
66-
left: 30
66+
left: 50
6767
}
6868
};
6969

‎app/directives/profile-widget/profile-widget.directive.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
scope: {
1111
profile: '=profile',
1212
editProfileLink: '=editProfileLink',
13-
numChallenges: '=numChallenges'
13+
numChallenges: '=numChallenges',
14+
profileVm: '=profileVm'
1415
},
1516
link: function(scope, elem, attrs) {
1617
scope.DOMAIN = CONSTANTS.domain;

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

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,29 @@
22
a(ui-sref="profile.about({userHandle: profile.handle})")
33
img.profile-circle(fallback-src="/images/avatarPlaceholder.png", ng-src="{{profile.photoURL}}")
44

5-
h1.handle {{profile.handle}}
5+
.info
6+
h1.handle {{profile.handle}}
67

7-
h3.tenure(ng-if="profile.startMonth")
8-
| Member Since {{profile.startMonth}}
8+
h3.tenure(ng-if="profile.startMonth")
9+
| Member Since {{profile.startMonth}}
910

10-
h3.location-challenges {{profile.homeCountryCode | isoCountry}} | {{numChallenges}} Challenges
11+
h3.location-challenges {{profile.homeCountryCode | isoCountry}} | {{numChallenges}} Challenges
1112

12-
p.description {{profile.description}}
13+
p.description {{profile.quote}}
1314

14-
a(ng-show="editProfileLink", ui-sref="settings.profile") Edit Profile
15+
a(ng-show="editProfileLink", ui-sref="settings.profile") Edit Profile
16+
17+
.tracks-links
18+
.tracks
19+
.track(ng-repeat="track in (profile.tracks)")
20+
div(class="{{profileVm.imgMap[track]}}-icon")
21+
div
22+
.text {{track | track}}
23+
24+
hr
25+
26+
.links
27+
a.forums.link(href="http://forums.{{DOMAIN}}/?module=History&userID={{profileVm.profile.userId}}")
28+
| Forum Posts
29+
a.badges.link(ng-click="profileVm.showBadges()")
30+
| Badges

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

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

3-
i.colored(ng-show="icon", ng-class="icon")
4-
i.default(ng-hide="icon") {}
3+
.skill-icon
4+
i.colored(ng-show="icon", ng-class="icon")
5+
img.default(ng-hide="icon", src="/images/ico-code-c.svg")
56
.name {{skill.tagName}} [{{skill.score}}]
67
spam(ng-if="skill.hidden") Hidden
78

‎app/index.jade

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ html
3333
link(rel="stylesheet", href="assets/css/settings/edit-profile.css")
3434
link(rel="stylesheet", href="assets/css/settings/account-info.css")
3535
link(rel="stylesheet", href="assets/css/profile/subtrack.css")
36+
link(rel="stylesheet", href="assets/css/profile/icons.css")
3637
link(rel="stylesheet", href="assets/css/profile/header.css")
3738
link(rel="stylesheet", href="assets/css/profile/badges.css")
3839
link(rel="stylesheet", href="assets/css/profile/about.css")
@@ -42,6 +43,7 @@ html
4243
link(rel="stylesheet", href="assets/css/peer-review/edit.css")
4344
link(rel="stylesheet", href="assets/css/peer-review/completed.css")
4445
link(rel="stylesheet", href="assets/css/my-srms/my-srms.css")
46+
link(rel="stylesheet", href="assets/css/my-dashboard/subtrack-stats.css")
4547
link(rel="stylesheet", href="assets/css/my-dashboard/srms.css")
4648
link(rel="stylesheet", href="assets/css/my-dashboard/programs.css")
4749
link(rel="stylesheet", href="assets/css/my-dashboard/my-dashboard.css")
@@ -56,6 +58,7 @@ html
5658
link(rel="stylesheet", href="assets/css/directives/tc-section.css")
5759
link(rel="stylesheet", href="assets/css/directives/tc-paginator.css")
5860
link(rel="stylesheet", href="assets/css/directives/srm-tile.css")
61+
link(rel="stylesheet", href="assets/css/directives/skill-tile.css")
5962
link(rel="stylesheet", href="assets/css/directives/profile-widget.css")
6063
link(rel="stylesheet", href="assets/css/directives/history-graph.css")
6164
link(rel="stylesheet", href="assets/css/directives/external-link-data.css")
@@ -70,18 +73,16 @@ html
7073
//- endinject
7174
// endbuild
7275
73-
body(ng-app="topcoder", ng-controller="TopcoderController as main", ng-class="{'ui-refresh': $state.current.data.UIRefresh, 'menu-visible': main.menuVisible}", ng-strict-di)
76+
body(ng-app="topcoder", ng-controller="TopcoderController as main", ng-class="{'menu-visible': main.menuVisible}", ng-strict-di)
7477

75-
//- include ./layout/header/header.jade
7678
#header(ui-view="header")
7779

7880
notifications-bar.notifications(closeIcon="fa fa-times-circle")
81+
7982
toaster-container(toaster-options="{{main.globalToasterConfig}}")
8083

81-
.view-container
82-
div(ui-view="container")
84+
.view-container(ui-view="container")
8385

84-
//- include ./layout/footer/footer.jade
8586
div(ui-view="footer")
8687

8788
// build:js /js/vendor.js
@@ -91,7 +92,7 @@ html
9192
script(src='../bower_components/angucomplete-alt/angucomplete-alt.js')
9293
script(src='../bower_components/angular-cookies/angular-cookies.js')
9394
script(src='../bower_components/angular-dropdowns/dist/angular-dropdowns.js')
94-
script(src='../bower_components/angular-filter/dist/angular-filter.js')
95+
script(src='../bower_components/angular-filter/dist/angular-filter.min.js')
9596
script(src='../bower_components/angular-img-fallback/angular.dcb-img-fallback.js')
9697
script(src='../bower_components/angular-jwt/dist/angular-jwt.js')
9798
script(src='../bower_components/angular-sanitize/angular-sanitize.js')
@@ -116,7 +117,7 @@ html
116117
script(src="/scripts/moment-timezone-with-data-2010-2020.js")
117118
//- endinject
118119
// endbuild
119-
120+
120121
// build:js /js/app.js
121122
//- inject:js
122123
script(src="account/account.module.js")
@@ -173,6 +174,7 @@ html
173174
script(src="my-dashboard/my-dashboard.routes.js")
174175
script(src="my-dashboard/programs/programs.controller.js")
175176
script(src="my-dashboard/srms/srms.controller.js")
177+
script(src="my-dashboard/subtrack-stats/subtrack-stats.controller.js")
176178
script(src="my-srms/my-srms.controller.js")
177179
script(src="my-srms/my-srms.module.js")
178180
script(src="my-srms/my-srms.routes.js")

‎app/my-dashboard/community-updates/community-updates.controller.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@
88
// Access and parses the blog RSS feed
99
function CommunityUpdatesController(BlogService, $log) {
1010
var vm = this;
11+
vm.loading = true;
1112

1213
activate();
1314

1415
function activate() {
1516
BlogService.getBlogFeed()
1617
.then(function(data) {
18+
vm.loading = false;
1719
vm.blogPosts = data;
1820
})
1921
.catch(function(err) {
22+
vm.loading = false;
2023
$log.debug(err);
2124
});
2225
}

‎app/my-dashboard/community-updates/community-updates.jade

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
hr
2-
31
header
42
h1.section-title Community Updates
53

6-
section
7-
.posts
8-
.post(ng-repeat='blog in vm.blogPosts | orderBy : pubDate | limitTo : 4')
9-
.blog-link
10-
a(ng-href='{{blog.link}}', target='_blank') {{blog.title}}
11-
12-
.description(ng-bind-html="blog.description")
4+
.section-loading(ng-show="vm.loading")
135

14-
.section-links
15-
.link
16-
a(ng-href="https://www.{{DOMAIN}}/blog/") View Topcoder Blog
6+
.posts(ng-hide="vm.loading")
7+
.post(ng-repeat='blog in vm.blogPosts | orderBy : pubDate | limitTo : 4')
8+
.blog-link
9+
a(ng-href='{{blog.link}}', target='_blank') {{blog.title}}
1710

18-
.link
19-
a(ng-href="https://community.{{DOMAIN}}/") Go to Community
11+
.description(ng-bind-html="blog.description")

‎app/my-dashboard/header-dashboard/header-dashboard.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
ProfileService.getUserStats(handle)
3939
.then(function(stats) {
40-
if (!_.isUndefined(stats.COPILOT)) {
40+
if (stats.COPILOT != null) {
4141
vm.numCopilotActiveContests = stats.COPILOT.activeContests;
4242
} else {
4343
vm.numCopilotActiveContests = 0;

‎app/my-dashboard/header-dashboard/header-dashboard.jade

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,15 @@ header
22
h1 Dashboard
33

44
.user-stats
5-
.money-earned
6-
p(ng-bind='vm.moneyEarned || 0 | currency:undefined:0')
7-
8-
p WON IN PRIZES
9-
105
.copilot-challenges(ng-show="dashboard.isCopilot")
11-
p(ng-bind='vm.numCopilotActiveContests')
12-
13-
p Co-Pilot #[span Challenges]
6+
p.number(ng-bind='vm.numCopilotActiveContests')
147

15-
hr
8+
p Active Challenges
169

17-
.loading(ng-show="vm.loading")
18-
.section-loading
10+
.slash(ng-show="dashboard.isCopilot")
1911

20-
hr
21-
22-
.ratings(ng-if="vm.showRanks && vm.hasRatings && !vm.loading")
23-
h1.section-title My Ranks
24-
25-
.tracks
26-
.track(ng-repeat="r in vm.rankStats | orderBy: ['track', 'rank']", ui-sref="profile.develop({userHandle: vm.profile.handle, track: r.track, subTrack: r.subTrack})")
27-
p(ng-bind="r.rank")
12+
.money-earned
13+
p.number(ng-bind='vm.moneyEarned || 0 | currency:undefined:0')
2814

29-
p {{r.track}}:
30-
p {{r.subTrack}}
15+
p Won in prizes
3116

32-
hr

‎app/my-dashboard/my-challenges/my-challenges.jade

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,39 @@
1-
header
2-
h1.section-title My Challenges
1+
header(ng-hide="vm.loading")
2+
h1.section-title(ng-bind="vm.userHasChallenges ? 'Active Challenges' : 'Challenges'")
33

4-
p.noChallenges(ng-hide="vm.userHasChallenges") You have not participated in any challenges yet.
4+
.section-loading(ng-show="vm.loading")
55

6-
p.viewChallenges(ng-show="vm.userHasChallenges")
7-
a(ui-sref="my-challenges") View All My Challenges
6+
section.noChallenges(ng-if="!vm.userHasChallenges && !vm.loading")
7+
h3 Prove your skills!
88

9-
.section-loading(ng-show="vm.loading")
9+
.tracks
10+
.track
11+
.develop-icon-outline
12+
p Development
1013

11-
section.challenges(ng-if="vm.userHasChallenges && !vm.loading")
12-
challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="'tile'", ng-class="'tile-view'")
14+
.track
15+
.design-icon-outline
16+
p Design
1317

14-
.section-links
15-
.link
16-
a(href="https://www.{{vm.domain}}/challenges/?pageIndex=1") Find New Challenges
18+
.track
19+
.data-science-icon-outline
20+
p Data Science
21+
22+
.track
23+
.copilot-icon-outline
24+
p Co-Pilot
1725

18-
.link(ng-show="dashboard.isCopilot")
19-
a(href="https://www.{{vm.domain}}/direct") Launch Topcoder Direct
26+
p.info Hey, whatever your like might be—Design, Development, or Data Science—we have it! Explore the Challenges section and show us what you’re made of!
2027

21-
.link(ng-hide="vm.userHasChallenges")
22-
a(href="https://community.{{vm.domain}}/", target="_blank") View Help Library
28+
a(ng-href="https://www.{{DOMAIN}}/challenges/") View Challenges
2329

24-
.spotlightChallenges(ng-hide="vm.userHasChallenges")
25-
challenge-tile.spotlight(ng-repeat="spotlight in vm.spotlightChallenges", spotlight, challenge="spotlight", domain="vm.domain", view="'tile'")
30+
section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading")
31+
.challenges
32+
challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="'tile'", ng-class="'tile-view'")
2633

27-
hr
34+
.section-links(ng-if="vm.userHasChallenges && !vm.loading")
35+
.link
36+
a(ui-sref="my-challenges") View All
37+
38+
.link
39+
a(ui-sref="my-challenges") Past Challenges

‎app/my-dashboard/my-dashboard.jade

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
.header-dashboard(ui-view="header-dashboard")
2+
13
.my-dashboard-container
2-
.header-dashboard(ui-view="header-dashboard")
4+
//- .subtrack-stats(ui-view="subtrack-stats")
35
46
.my-challenges(ui-view="my-challenges")
57

‎app/my-dashboard/my-dashboard.routes.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
controller: 'HeaderDashboardController',
3737
controllerAs: 'vm'
3838
},
39+
'subtrack-stats': {
40+
templateUrl: "my-dashboard/subtrack-stats/subtrack-stats.html",
41+
controller: 'SubtrackStatsController',
42+
controllerAs: 'vm'
43+
},
3944
'my-challenges': {
4045
templateUrl: "my-dashboard/my-challenges/my-challenges.html",
4146
controller: 'MyChallengesWidgetController',

‎app/my-dashboard/programs/programs.controller.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
activate();
2424

2525
function activate() {
26-
2726
MemberCertService.getMemberRegistration(userId, CONSTANTS.SWIFT_PROGRAM_ID)
2827
.then(function(res) {
29-
if (res === undefined || res === null) {
28+
if (res == null) {
3029
vm.registered = false;
3130
vm.loading = false;
3231
} else {

‎app/my-dashboard/programs/programs.jade

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
hr
2-
31
.section-loading(ng-show="vm.loading")
42

53
section.ios(ng-hide="vm.loading")
6-
h1.section-title iOS: Show Your Skills
4+
.unregistered(ng-hide="vm.registered")
5+
img(src="/images/learn-and-improve.png", srcset="/images/learn-and-improve2x.png 2x")
76

8-
.unregistered(ng-hide="vm.registered || vm.loading")
97
.join-program
10-
.logo
11-
i.fa.fa-apple.fa-3x
8+
h3 #[span iOS]: Show Your Skills
9+
10+
h4 Take the first steps to stand out in the Community
11+
12+
p Experienced and proven iOS developers are in high-demand. Prove your skills by earning these iOS topcoder badges and gain exclusive access to iOS challenges and prize accelerators, special previews into content and releases, and special community-related events and info.
1213

13-
p iOS Dev Community
14+
a View all the Details
1415

15-
.call-to-action(ng-click="vm.registerUser()")
16-
p Join Us
16+
//- .call-to-action(ng-click="vm.registerUser()")
17+
//- p Join Us
1718
18-
.registered(ng-show="vm.registered && !vm.loading")
19+
.registered(ng-show="vm.registered")
20+
h1.section-title #[span iOS]: Show Your Skills
1921

2022
.registered-badge
2123
i.fa.fa-apple.fa-3x

0 commit comments

Comments
 (0)