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

Commit 674e4d9

Browse files
author
vikasrohit
committed
SUP-1595, Dashboard: My Challenge page needs to be styled
-- Updated layout for tc-paginator -- Added page Breadcrumb -- Added pager in footer -- fixed grid view to contain 4 tiles -- updated style for active past filter -- updated style for grid/list view selector
1 parent b83bb7c commit 674e4d9

File tree

5 files changed

+250
-104
lines changed

5 files changed

+250
-104
lines changed
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
p.pager
2-
a.prev(ng-click="vm.prevPage()", ng-class="{disabled: !vm.prevPageAvailable}") Prev
3-
span   |  
4-
span.first(ng-bind="vm.pageParams.offset + 1")
5-
span -
6-
span.last(ng-bind="vm.pageParams.offset + vm.pageParams.count")
7-
span   of  
8-
span.total(ng-bind="vm.pageParams.totalCount")
9-
span   |  
1+
.pager
2+
a.prev(ng-click="vm.prevPage()", ng-class="{disabled: !vm.prevPageAvailable}") Previous
3+
.status
4+
span Showing  
5+
span.first(ng-bind="vm.pageParams.offset + 1")
6+
span -
7+
span.last(ng-bind="vm.pageParams.offset + vm.pageParams.count")
8+
span   of  
9+
span.total(ng-bind="vm.pageParams.totalCount")
1010
a.next(ng-click="vm.nextPage()", ng-class="{disabled: !vm.nextPageAvailable}") Next

app/my-challenges/my-challenges.controller.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@
7070
limit: vm.pageParams.limit,
7171
offset: vm.pageParams.offset,
7272
orderBy: vm.orderBy, // TODO verify if this is the correct sort order clause,
73-
filter: {
74-
status : vm.statusFilter
75-
}
73+
filter: "status=" + vm.statusFilter
7674
};
7775
vm.loading = true;
7876
return ChallengeService.getUserChallenges(handle, params)

app/my-challenges/my-challenges.jade

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,35 @@
11
.my-challenges-container
22
.my-challenges
3-
header
4-
h1.section-title My Challenges
53

6-
p.viewDashboard
7-
a(ui-sref="dashboard") View Dashboard
8-
9-
p.noChallenges(ng-hide="vm.userHasChallenges") You have not participated in any challenges yet.
10-
11-
p.viewOptions
12-
a(ng-click="vm.changeView('list')", ng-class="{disabled: vm.view == 'list'}") List
13-
14-
span   |  
15-
16-
a(ng-click="vm.changeView('tile')", ng-class="{disabled: vm.view == 'tile'}") Tile
17-
18-
p.filters
19-
a(ng-click="vm.viewActiveChallenges()", ng-class="{disabled: vm.statusFilter == 'active'}") Active
20-
span   |  
21-
a(ng-click="vm.viewPastChallenges()", ng-class="{disabled: vm.statusFilter == 'completed'}") Past
4+
.nav
5+
.breadcrumbs
6+
.dashboard
7+
a(ui-sref="dashboard") Dashboard
8+
.my-challenges // My Challenges
229

2310
.section-loading(ng-show="vm.loading")
2411

25-
section.challenges(ng-show="vm.userHasChallenges && !vm.loading")
26-
tc-paginator(data="vm.myChallenges", page-params="vm.pageParams")
12+
section.noChallenges(ng-if="!vm.userHasChallenges && !vm.loading")
13+
You have not participated in any challenges yet.
14+
15+
.content
16+
section.challenges(ng-show="vm.userHasChallenges && !vm.loading")
17+
.top
18+
.filters
19+
a(ng-click="vm.viewActiveChallenges()", ng-class="{disabled: vm.statusFilter == 'active'}") Active
20+
span   |  
21+
a(ng-click="vm.viewPastChallenges()", ng-class="{disabled: vm.statusFilter == 'completed'}") Past
2722

28-
.data(ng-class="vm.view + '-view'")
29-
challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="vm.view", ng-class="vm.view + '-view'")
23+
.challenge-view-toggle
24+
button.tile(ng-click="vm.changeView('tile')", ng-class="{ disabled: vm.view === 'tile' }") Grid
3025

31-
.section-links
32-
.link
33-
a(href="https://www.{{vm.domain}}/challenges/?pageIndex=1") Find New Challenges
26+
button.list(ng-click="vm.changeView('list')", ng-class="{ disabled: vm.view === 'list' }") List
3427

35-
.link(ng-show="vm.isCopilot")
36-
a(href="https://www.{{vm.domain}}/direct") Launch Topcoder Direct
28+
.data(ng-class="vm.view + '-view'")
29+
challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="vm.view", ng-class="vm.view + '-view'")
3730

38-
.link(ng-hide="vm.userHasChallenges")
39-
a(href="https://community.{{vm.domain}}/", target="_blank") View Help Library
31+
.bottom
32+
tc-paginator(data="vm.myChallenges", page-params="vm.pageParams")
4033

4134
hr
4235

assets/css/directives/tc-paginator.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
.tc-paginator {
55
display: flex;
66
flex-flow: row wrap;
7-
justify-content: flex-end;
7+
justify-content: space-between;
88
margin-right: 10px;
99
margin-bottom: 10px;
1010

@@ -16,5 +16,12 @@
1616
color: $dark-gray;
1717
cursor: default;
1818
}
19+
20+
&.prev {
21+
text-transform: uppercase;
22+
}
23+
&.next {
24+
text-transform: uppercase;
25+
}
1926
}
2027
}

0 commit comments

Comments
 (0)