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

Commit 09ba68c

Browse files
tladendotladendo
committed
Added copy, more styling
1 parent 0006bd3 commit 09ba68c

File tree

14 files changed

+70
-54
lines changed

14 files changed

+70
-54
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
.label RATING
1111

1212
button.compare(ng-click="graphState.show = 'history'")
13-
| COMPARE
13+
| BACK TO YOUR RATING

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
.history-info(ng-if="historyRating")
99
| Attained on {{historyDate}} in challenge "{{historyChallenge}}"
1010
.lower
11-
button.compare(ng-click="graphState.show = 'distribution'") COMPARE
11+
button.compare(ng-click="graphState.show = 'distribution'") COMMUNITY RATINGS

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| Member Since {{profile.startMonth}}
1010

1111
h3.location-challenges {{profile.homeCountryCode | isoCountry}}
12-
span.bar(ng-show="profile.homeCountryCode && numChallenges") |
12+
span.bar(ng-show="profile.homeCountryCode && numChallenges")  | 
1313
span(ng-show="numChallenges") {{numChallenges}} Challenges
1414

1515
p.description {{profile.quote}}
@@ -21,7 +21,7 @@
2121
.track(ng-repeat="track in (profile.tracks)")
2222
div(class="{{profileVm.imgMap[track]}}-icon")
2323
div
24-
.text {{track | track}}
24+
.text {{track | role}}
2525

2626
hr
2727

‎app/filters/role.filter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
var map = {
88
'DESIGN' : 'Designer',
99
'DEVELOP': 'Developer',
10-
'DATA_SCIENCE': 'Data Scientist'
10+
'DATA_SCIENCE': 'Data Scientist',
11+
'COPILOT': 'Copilot'
1112
};
1213
return function(tracks) {
1314
if (tracks) {

‎app/filters/track.filter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
'WIDGET_OR_MOBILE_SCREEN_DESIGN': 'Widget or Mobile Screen Design',
1919
'FRONT_END_FLASH': 'Front-End Flash',
2020
'APPLICATION_FRONT_END_DESIGN': 'Application Front-End Design',
21-
'DESIGN_FIRST_2_FINISH': 'Design First2Finish'
21+
'DESIGN_FIRST_2_FINISH': 'Design First2Finish',
22+
'DEVELOP': 'DEVELOPMENT'
2223
};
2324

2425
function capitalized(str) {

‎app/profile/about/about.jade

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,42 @@
44
.profile-about-container
55

66
tc-section(id="skills", ng-show="vm.displaySection.skills" state="profileVm.status.skills" class="skills")
7-
h3.activity Skills & Technologies
7+
h3.activity Skills
8+
89
.list(ng-show="profileVm.skills && profileVm.skills.length > 0")
910

1011
.skill(ng-repeat="skill in vm.skills")
1112
skill-tile(skill="skill")
1213

13-
button.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW MORE
14+
button.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW ALL
1415
button.more(ng-if="vm.skills.length > 6", ng-click="vm.skills = vm.someSkills") VIEW LESS
1516

1617
.empty-state(ng-show="!profileVm.skills || (profileVm.skills && profileVm.skills.length == 0)")
17-
.action-text show us your skills &amp; tools, we'd love that!
18+
.action-text Tell everyone what you know
1819

1920
.list
2021
.skill(ng-repeat="skill in vm.sampleSkills")
2122
skill-tile(skill="skill")
2223

23-
.description The more the better. Skills are important for all challenge organizers and
24-
| the community at large. So, go ahead and tell us more about you.
24+
.description You can add languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.
2525

26-
button.link-button(ui-sref="settings.profile") ADD YOUR SKILLS
26+
button.link-button(ui-sref="settings.profile") ADD SKILLS
2727

2828
tc-section(id="tcActivity", state="profileVm.status.stats")
2929

3030
.categories
3131

32-
h3.activity Topcoder Activity
32+
h3.activity Activity on Topcoder
3333

3434
.empty-state(ng-if="!profileVm.numProjects")
35-
.action-text SHOW US YOU'RE A NINJA!
35+
.action-text Start competing within the community
3636
.tracks
3737
.track(ng-repeat="track in ['DEVELOP', 'DESIGN', 'DATA_SCIENCE']")
3838
div(class="{{profileVm.imgMap[track]}}-icon")
3939
div
4040
.text {{track | track}}
41-
.description 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!
42-
button.link-button(ui-sref="settings.profile") CHALLENGE ME!
41+
.description Compete in challenges to win money, test yourself against the world's best, and learn new skills. Your performance rating will show up here.
42+
button.link-button(ui-sref="settings.profile") FIND CHALLENGES
4343

4444
.track(
4545
ng-repeat="track in profileVm.profile.tracks",
@@ -50,6 +50,7 @@
5050
img(ng-if="track == 'DATA_SCIENCE'", src="/images/ico-track-data-outline.svg")
5151
img(ng-if="track == 'DEVELOP'", src="/images/ico-track-develop-outline.svg")
5252
img(ng-if="track == 'DESIGN'", src="/images/ico-track-design-outline.svg")
53+
img(ng-if="track == 'COPILOT'", src="/images/ico-track-co_pilot-outline.svg")
5354
span {{track | track | uppercase}}
5455

5556
.subtrack(
@@ -84,14 +85,14 @@
8485
img.arrow(src="/images/ico-arrow-big-right.svg")
8586

8687
tc-section(id="externalLinks", ng-show="vm.displaySection.externalLinks" state="profileVm.status.externalLinks" class="external-links")
87-
h3.activity Links
88+
h3.activity Activity across the web
8889
external-links-data(ng-show="vm.hasLinks" linked-accounts-data="vm.linkedExternalAccountsData")
8990

9091
.empty-state(ng-hide="vm.hasLinks")
91-
.action-text you are connected, be proud of it
92+
.action-text Showcase your work from around the web
9293

9394
external-accounts.external-account-container(linked-accounts="[]" read-only="true")
9495

95-
.description Adding your links to your profile will allow you to build your reputation, and show the other members how you're connected.
96+
.description Show off your work and experience outside of Topcoder. Connect accounts from popular services and networks or add a link to any site.
9697

97-
button.link-button(ui-sref="settings.profile") ADD YOUR LINKS
98+
button.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS

‎app/profile/profile.controller.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
vm.imgMap = {
1919
'DEVELOP': 'develop',
2020
'DESIGN': 'design',
21-
'DATA_SCIENCE': 'data'
21+
'DATA_SCIENCE': 'data',
22+
'COPILOT': 'copilot'
2223
};
2324

2425
// spinnerssss
@@ -36,6 +37,9 @@
3637
vm.statsPromise = ProfileService.getUserStats(vm.userHandle).then(function(stats) {
3738
vm.stats = stats;
3839
vm.profile.tracks = vm.profile.tracks || ProfileService.getTracks(vm.stats) || [];
40+
if (stats.COPILOT && stats.COPILOT.contests) {
41+
vm.profile.tracks.push('COPILOT');
42+
}
3943
vm.numProjects = vm.stats.challenges;
4044
vm.numWins = vm.stats.wins;
4145
vm.categories = ProfileService.getRanks(vm.stats);
@@ -68,9 +72,9 @@
6872
vm.showEditProfileLink = TcAuthService.isAuthenticated() && UserService.getUserIdentity().handle.toLowerCase() === vm.userHandle.toLowerCase();
6973
vm.isUser = vm.showEditProfileLink;
7074
if (profile.createdAt) {
71-
profile.startMonth = moment(profile.createdAt).format('MMMM YYYY');
75+
profile.startMonth = moment(profile.createdAt).format('MMMM, YYYY');
7276
} else {
73-
profile.startMonth = moment().format('MMMM YYYY')// false;
77+
profile.startMonth = moment().format('MMMM, YYYY')// false;
7478
}
7579

7680
}

‎app/profile/subtrack/copilot/copilot.jade

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
.design(ng-if="vm.track == 'Co-Pilot'")
2-
ul.horizontal-stats
3-
li.stat
4-
.value {{vm.typeStats.contests}}
5-
.name CONTESTS
6-
7-
li.stat
8-
.value {{vm.typeStats.projects}}
9-
.name PROJECTS
10-
11-
li.stat
12-
.value {{vm.typeStats.fulfillment + '%'}}
13-
.name FULFILLMENT
14-
15-
hr
16-
17-
.stats
18-
.graphs
19-
img(src="/images/graph.png")
20-
1+
.copilot.design(ng-if="vm.track == 'COPILOT'")
2+
.top
3+
ul.horizontal-stats
4+
li.stat
5+
.value {{vm.typeStats.contests}}
6+
.name CONTESTS
7+
8+
li.stat
9+
.value {{vm.typeStats.projects}}
10+
.name PROJECTS
11+
12+
li.stat
13+
.value {{vm.typeStats.fulfillment + '%'}}
14+
.name FULFILLMENT
15+
16+
.top
2117
h2.detailed Detailed Stats
2218

2319
ul.vertical-stats
24-
li
20+
li.first
2521
.left Contests
2622
.right {{vm.typeStats.contests}}
2723

‎app/profile/subtrack/data/data.jade

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525
.tabs
2626
a.left(id="challenges", ng-click="vm.viewing = 'challenges'",
2727
ng-class="vm.viewing == 'challenges' ? 'selected' : ''"
28-
) Challenges
28+
)
29+
span(ng-show="vm.subTrack == 'SRM'") Past SRMs
30+
span(ng-show="vm.subTrack != 'SRM'") Challenges
2931

3032
a.right(id="stats", ng-click="vm.viewing = 'stats'",
3133
ng-class="vm.viewing == 'stats' ? 'selected' : ''"
32-
) Stats
34+
) Statistics
3335

3436
hr
3537

‎app/profile/subtrack/develop/develop.jade

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

3434
a.right(id="stats", ng-click="vm.viewing = 'stats'",
3535
ng-class="vm.viewing == 'stats' ? 'selected' : ''"
36-
) Stats
36+
) Statistics
3737

3838
hr
3939

‎app/services/profile.service.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,17 @@
129129
});
130130
}
131131
if (stats.COPILOT) {
132-
copilot = stats.COPILOT;
133-
copilot.track = 'Co-Pilot';
132+
copilot = [
133+
stats.COPILOT
134+
];
135+
stats.COPILOT.track = 'COPILOT';
136+
stats.COPILOT.subTrack = 'COPILOT';
134137
}
135138
var ans = {
136139
'DEVELOP': removeRankless(dev),
137140
'DESIGN': removeRankless(design),
138141
'DATA_SCIENCE': removeRankless(dataScience),
139-
'CO_PILOT': copilot
142+
'COPILOT': copilot
140143
};
141144

142145
function removeRankless(arr) {

‎assets/css/directives/profile-widget.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
line-height: 14px;
9191
margin-top: 11px;
9292
text-transform: uppercase;
93+
text-align: center;
9394
}
9495
}
9596
}

‎assets/css/profile/about.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,9 @@
159159

160160
.skills {
161161
.dimmed {
162-
position:absolute;
163-
width:50%; height:20%;
164-
margin-right: 20px;
165-
bottom: -0px;
162+
width:100%;
163+
margin-top: -70px;
164+
height:100px;
166165
background:rgba(0,0,0,0.6);
167166
opacity:1;
168167
transition: all 0.5s;

‎assets/css/profile/icons.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,11 @@
2323
height: 50px;
2424
width: 50px;
2525
}
26+
.copilot-icon {
27+
background-image:url('/images/ico-track-co_pilot-outline.svg');
28+
background-position:0 0;
29+
background-repeat:no-repeat;
30+
background-size: 50px;
31+
height: 50px;
32+
width: 50px;
33+
}

0 commit comments

Comments
 (0)