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

Commit 4a39026

Browse files
author
Nick Litwin
committed
Implement mobile and desktop views for copy updates and ios participate button
1 parent 2f2cc4d commit 4a39026

File tree

9 files changed

+95
-76
lines changed

9 files changed

+95
-76
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ header
99
a(ng-href='{{blog.link}}', target='_blank') {{blog.title}}
1010

1111
.description(ng-bind-html="blog.description")
12+
13+
.blog-links(ng-hide="vm.loading")
14+
a(ng-href="https://www.{{DOMAIN}}/blog/") View More

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

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

4-
.challenge-view-toggle
4+
.challenge-view-toggle(ng-show="vm.userHasChallenges")
55
button.tile(ng-click="vm.toggleView('tile')", ng-class="{ disabled: vm.challengeView === 'tile' }") Grid
66

77
button.list(ng-click="vm.toggleView('list')", ng-class="{ disabled: vm.challengeView === 'list' }") List
@@ -30,9 +30,10 @@ section.noChallenges(ng-if="!vm.userHasChallenges && !vm.loading")
3030

3131
p.info Compete in challenges to win money, test yourself against the world's best, and learn new skills
3232

33-
a(ng-href="https://www.{{DOMAIN}}/challenges/") Find Challenges
33+
.info-links
34+
a(ng-href="https://www.{{DOMAIN}}/challenges/?pageIndex=1") Find Challenges
3435

35-
a(href="") Learn More
36+
a(href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
3637

3738
section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading", ng-class="{ 'list-view-active': vm.challengeView === 'list' }")
3839
.section-titles(ng-show="vm.challengeView === 'list'")
@@ -45,6 +46,6 @@ section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading", ng-class="{ '
4546
challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="vm.challengeView", ng-class="vm.challengeView + '-view'")
4647

4748
.my-challenges-links(ng-if="vm.userHasChallenges && !vm.loading")
48-
a(ui-sref="my-challenges({status: 'active'})") View All Active Challenges
49+
a(ui-sref="my-challenges({status: 'active'})") View All Active Challenges
4950

50-
a(ui-sref="my-challenges({status: 'completed'})") View All Past Challenges
51+
a(ui-sref="my-challenges({status: 'completed'})") View All Past Challenges

app/my-dashboard/programs/programs.jade

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ section.ios(ng-hide="vm.loading")
1414

1515
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.
1616

17-
a View all the Details
17+
.info-links
18+
a(ng-click="vm.registerUser()") Participate
1819

19-
//- .call-to-action(ng-click="vm.registerUser()")
20-
//- p Join Us
20+
a(ng-href="ios.{{DOMAIN}}") Learn More
2121

2222
.registered(ng-show="vm.registered")
2323
.badge-and-challenges
@@ -31,6 +31,3 @@ section.ios(ng-hide="vm.loading")
3131
a(href="http://ios.{{vm.domain}}", title="topcoder iOS Member Program") View Challenges
3232

3333
ios-card(ng-repeat="challenge in vm.challenges | orderBy:reviewType:true| orderBy:registrationEndDate:true", challenge="challenge", view="'tile'")
34-
35-
.ios-links(ng-hide="vm.loading")
36-
p Want to get better at Swift? Learn about the FREE Topcoder #[a(ng-href="https://swift.{{DOMAIN}}/") Swift Course 101]

app/my-dashboard/srms/srms.jade

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ section(ng-hide="vm.loading")
1212
.flex-wrapper
1313
h2 Practice on past problems
1414

15-
a(href="https://community.{{DOMAIN}}/tc?module=ProblemArchive") Problem Archives
15+
a(href="https://arena.{{DOMAIN}}") Launch Arena
1616

17-
a(href="https://community.{{DOMAIN}}/wiki/display/tc/Algorithm+Problem+Set+Analysis") Match Editorials
18-
19-
a(ui-sref="my-srms") View Past SRMs
17+
a(href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
2018

2119
.srms-links(ng-hide="vm.loading")
22-
p Want to compete right now? Try your skills in the #[a(ng-href="https://arena.{{DOMAIN}}/") Topcoder ARENA]!
20+
a(ui-sref="my-srms") View Past SRMs

app/services/notification.service.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
$rootScope.$on(CONSTANTS.EVENT_USER_LOGGED_OUT, function() {
1818
showing = false;
19-
getNotifications();
19+
// Not using notifications for anything at the moment
20+
// getNotifications();
2021
});
2122

2223
function getNotifications() {

assets/css/my-dashboard/community-updates.scss

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,9 @@
1010

1111
header {
1212
margin-top: 6px;
13-
margin-bottom: -6px;
1413
padding-top: 30px;
1514
padding-bottom: 24px;
1615
background-color: $white;
17-
@media only screen and (min-width: 570px) {
18-
margin-bottom: 0;
19-
}
2016
@media only screen and (min-width: 1132px) {
2117
margin-top: 0;
2218
padding-top: 0;
@@ -25,8 +21,7 @@
2521
}
2622

2723
.posts {
28-
padding-left: 10px;
29-
padding-right: 10px;
24+
padding: 0 10px 6px;
3025
@media only screen and (min-width: 570px) {
3126
display: flex;
3227
flex-flow: row wrap;
@@ -111,4 +106,13 @@
111106
}
112107
}
113108
}
109+
110+
.blog-links {
111+
@include module-links;
112+
113+
a {
114+
@include button-m;
115+
@include button-secondary;
116+
}
117+
}
114118
}

assets/css/my-dashboard/my-challenges.scss

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
position: absolute;
1717
bottom: 0;
1818
right: 55px;
19+
@media only screen and (max-width: 767px) {
20+
display: none;
21+
}
1922

2023
button {
2124
margin-right: 17px;
@@ -68,6 +71,9 @@
6871
margin-bottom: 20px;
6972
@include sofia-pro-extra-light;
7073
font-size: 18px;
74+
line-height: 24px;
75+
text-align: center;
76+
7177
text-transform: uppercase;
7278
@media only screen and (min-width: 900px) {
7379
font-size: 28px;
@@ -132,15 +138,31 @@
132138
}
133139
}
134140

135-
a {
136-
margin-top: 20px;
137-
margin-bottom: 40px;
138-
@include button-l;
139-
text-decoration: none;
140-
@media only screen and (min-width: 900px) {
141-
@include button-xl;
142-
margin-top: 30px;
143-
margin-bottom: 90px;
141+
.info-links {
142+
text-align: center;
143+
144+
a {
145+
display: block;
146+
margin: 30px auto;
147+
@include button-l;
148+
text-decoration: none;
149+
@media only screen and (min-width: 768px) {
150+
display: inline-block;
151+
margin-top: 20px;
152+
margin-bottom: 40px;
153+
}
154+
@media only screen and (min-width: 900px) {
155+
@include button-xl;
156+
margin-top: 30px;
157+
margin-bottom: 90px;
158+
}
159+
160+
&:last-child {
161+
@include button-ghost;
162+
@media only screen and (min-width: 768px) {
163+
margin-left: 30px;
164+
}
165+
}
144166
}
145167
}
146168
}
@@ -263,13 +285,21 @@
263285

264286
.my-challenges-links {
265287
@include module-links;
288+
@media only screen and (max-width: 767px) {
289+
flex-direction: column;
290+
padding: 15px 0;
291+
}
266292

267293
a {
268294
@include button-m;
269295
@include button-secondary;
270296

271297
&:not(:first-child) {
272298
margin-left: 10px;
299+
@media only screen and (max-width: 767px) {
300+
margin-top: 10px;
301+
margin-left: 0;
302+
}
273303
}
274304
}
275305
}

assets/css/my-dashboard/programs.scss

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,26 @@
9797
}
9898
}
9999

100-
a {
101-
display: block;
102-
margin-top: 30px;
103-
font-size: 13px;
104-
color: $primary-color;
105-
text-decoration: none;
106-
text-transform: uppercase;
107-
@media only screen and (min-width: 1000px) {
108-
font-size: 16px;
100+
.info-links {
101+
a {
102+
@include button-m;
103+
display: inline-block;
104+
margin-top: 30px;
105+
font-size: 13px;
106+
color: $white;
107+
text-decoration: none;
108+
text-transform: uppercase;
109+
@media only screen and (min-width: 1000px) {
110+
font-size: 16px;
111+
}
112+
113+
&:last-child {
114+
@include button-ghost;
115+
margin-left: 30px;
116+
}
109117
}
110118
}
119+
111120
}
112121

113122
.registered {
@@ -202,24 +211,4 @@
202211
}
203212
}
204213
}
205-
206-
.ios-links {
207-
@include module-links;
208-
209-
p {
210-
@include source-sans-regular;
211-
font-size: 14px;
212-
line-height: 20px;
213-
color: $gray-darkest;
214-
@media only screen and (min-width: 900px) {
215-
font-size: 16px;
216-
}
217-
218-
a {
219-
color: $primary-color;
220-
cursor: pointer;
221-
text-decoration: none;
222-
}
223-
}
224-
}
225214
}

assets/css/my-dashboard/srms.scss

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494

9595
h2 {
9696
margin-top: 60px;
97-
margin-bottom: 30px;
97+
margin-bottom: 55px;
9898
@include sofia-pro-light;
9999
font-size: 24px;
100100
text-align: center;
@@ -106,8 +106,11 @@
106106
a {
107107
margin-bottom: 21px;
108108
@include button-m-wide;
109-
@include button-ghost;
110109
text-decoration: none;
110+
111+
&:last-child {
112+
@include button-ghost;
113+
}
111114
}
112115
}
113116
}
@@ -116,19 +119,12 @@
116119
.srms-links {
117120
@include module-links;
118121

119-
p {
120-
@include source-sans-regular;
121-
font-size: 14px;
122-
line-height: 20px;
123-
color: $gray-darkest;
124-
@media only screen and (min-width: 900px) {
125-
font-size: 16px;
126-
}
122+
a {
123+
@include button-m;
124+
@include button-secondary;
127125

128-
a {
129-
color: $primary-color;
130-
cursor: pointer;
131-
text-decoration: none;
126+
&:not(:first-child) {
127+
margin-left: 10px;
132128
}
133129
}
134130
}

0 commit comments

Comments
 (0)