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

Commit 11e2cfc

Browse files
author
vikasrohit
committed
Merge pull request #386 from appirio-tech/feature/introjs-fixes-p1
Feature/introjs fixes p1
2 parents 35837c5 + 5b5cef8 commit 11e2cfc

File tree

2 files changed

+72
-67
lines changed

2 files changed

+72
-67
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading", ng-class="{ '
4545

4646
challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="vm.challengeView", ng-class="vm.challengeView + '-view'")
4747

48-
.my-challenges-links(id="viewAllChallenges", ng-if="vm.userHasChallenges && !vm.loading")
48+
.my-challenges-links(id="viewAllChallenges", ng-show="vm.userHasChallenges && !vm.loading")
4949
a.tc-btn.tc-btn-s.tc-btn-secondary(ui-sref="my-challenges({status: 'active'})") View All Active Challenges
5050

5151
a.tc-btn.tc-btn-s.tc-btn-secondary(ui-sref="my-challenges({status: 'completed'})") View All Past Challenges

‎app/profile/about/about.jade

Lines changed: 71 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -3,98 +3,103 @@
33

44
.profile-about-container
55

6-
tc-section(id="skills", ng-show="vm.displaySection.skills", state="profileVm.status.skills" class="skills")
6+
#skills
7+
tc-section(ng-show="vm.displaySection.skills", state="profileVm.status.skills")
78

8-
h3.activity Skills
9+
.skills
10+
h3.activity Skills
911

10-
.list(ng-show="profileVm.skills && profileVm.skills.length > 0")
12+
.list(ng-show="profileVm.skills && profileVm.skills.length > 0")
1113

12-
.skill(ng-repeat="skill in vm.skills")
13-
skill-tile(skill="skill")
14+
.skill(ng-repeat="skill in vm.skills")
15+
skill-tile(skill="skill")
1416

15-
button.tc-btn.tc-btn-secondary.tc-btn-l.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW ALL
16-
button.tc-btn.tc-btn-secondary.tc-btn-l.more(ng-if="vm.skills.length > 6", ng-click="vm.skills = vm.someSkills") VIEW LESS
17+
button.tc-btn.tc-btn-secondary.tc-btn-l.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW ALL
18+
button.tc-btn.tc-btn-secondary.tc-btn-l.more(ng-if="vm.skills.length > 6", ng-click="vm.skills = vm.someSkills") VIEW LESS
1719

18-
.empty-state(ng-show="!profileVm.skills || (profileVm.skills && profileVm.skills.length == 0)")
19-
.action-text Tell everyone what you know
20+
.empty-state(ng-show="!profileVm.skills || (profileVm.skills && profileVm.skills.length == 0)")
21+
.action-text Tell everyone what you know
2022

21-
.list
22-
.skill(ng-repeat="skill in vm.sampleSkills")
23-
skill-tile(skill="skill")
23+
.list
24+
.skill(ng-repeat="skill in vm.sampleSkills")
25+
skill-tile(skill="skill")
2426

25-
.description You can add languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.
27+
.description You can add languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.
2628

27-
button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") ADD SKILLS
29+
button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") ADD SKILLS
2830

29-
tc-section(ng-show="vm.displaySection.stats", state="profileVm.status.stats")
31+
#tcActivity
32+
tc-section(ng-show="vm.displaySection.stats", state="profileVm.status.stats")
3033

31-
.categories
34+
.categories
3235

33-
h3.activity(id="tcActivity") Activity on Topcoder
36+
h3.activity Activity on Topcoder
3437

35-
.empty-state(ng-if="!profileVm.numProjects")
36-
.action-text Start competing within the community
37-
.tracks
38-
.track.noclick(ng-repeat="track in ['DEVELOP', 'DESIGN', 'DATA_SCIENCE']")
39-
div(class="{{profileVm.imgMap[track]}}-icon")
40-
div
41-
.text {{track | track}}
42-
.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.
43-
a.tc-btn.tc-btn-l.link-button(href="/challenges") FIND CHALLENGES
38+
.empty-state(ng-if="!profileVm.numProjects")
39+
.action-text Start competing within the community
40+
.tracks
41+
.track.noclick(ng-repeat="track in ['DEVELOP', 'DESIGN', 'DATA_SCIENCE']")
42+
div(class="{{profileVm.imgMap[track]}}-icon")
43+
div
44+
.text {{track | track}}
45+
.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.
46+
a.tc-btn.tc-btn-l.link-button(href="/challenges") FIND CHALLENGES
4447

45-
.track(
46-
ng-repeat="track in profileVm.profile.tracks",
47-
ng-if="profileVm.categories[track].length > 0",
48-
id="{{track}}_TRACK"
49-
)
48+
.track(
49+
ng-repeat="track in profileVm.profile.tracks",
50+
ng-if="profileVm.categories[track].length > 0",
51+
id="{{track}}_TRACK"
52+
)
5053

51-
div(class="name")
52-
img(ng-if="track == 'DATA_SCIENCE'", src="/images/ico-track-data-outline.svg")
53-
img(ng-if="track == 'DEVELOP'", src="/images/ico-track-develop-outline.svg")
54-
img(ng-if="track == 'DESIGN'", src="/images/ico-track-design-outline.svg")
55-
img(ng-if="track == 'COPILOT'", src="/images/ico-track-co_pilot-outline.svg")
56-
span {{track | track | uppercase}}
54+
div(class="name")
55+
img(ng-if="track == 'DATA_SCIENCE'", src="/images/ico-track-data-outline.svg")
56+
img(ng-if="track == 'DEVELOP'", src="/images/ico-track-develop-outline.svg")
57+
img(ng-if="track == 'DESIGN'", src="/images/ico-track-design-outline.svg")
58+
img(ng-if="track == 'COPILOT'", src="/images/ico-track-co_pilot-outline.svg")
59+
span {{track | track | uppercase}}
5760

58-
a.subtrack(
59-
ng-repeat="subtrack in profileVm.categories[track]",
60-
ui-sref="profile.subtrack({track: subtrack.track, subTrack: subtrack.subTrack})",
61-
class="{{$index == 0 && 'first'}}"
62-
)
63-
.name {{subtrack.subTrack | track}}
61+
a.subtrack(
62+
ng-repeat="subtrack in profileVm.categories[track]",
63+
ui-sref="profile.subtrack({track: subtrack.track, subTrack: subtrack.subTrack})",
64+
class="{{$index == 0 && 'first'}}"
65+
)
66+
.name {{subtrack.subTrack | track}}
6467

65-
.ranking(ng-if="subtrack.rating")
66-
.number.rating(style="color: {{subtrack.rating | ratingColor}}")
67-
| {{subtrack.rating}}
68-
span.square(style="background-color: {{subtrack.rating | ratingColor}}")
68+
.ranking(ng-if="subtrack.rating")
69+
.number.rating(style="color: {{subtrack.rating | ratingColor}}")
70+
| {{subtrack.rating}}
71+
span.square(style="background-color: {{subtrack.rating | ratingColor}}")
6972

70-
.tag Rating
73+
.tag Rating
7174

72-
.ranking(ng-if="subtrack.rank && !subtrack.rating")
73-
.number {{subtrack.rank | ordinal}}
75+
.ranking(ng-if="subtrack.rank && !subtrack.rating")
76+
.number {{subtrack.rank | ordinal}}
7477

75-
.tag Ranking
78+
.tag Ranking
7679

77-
.ranking(ng-if="subtrack.wins && !subtrack.rank && !subtrack.rating")
78-
.number(style="color: #21B2F1") {{subtrack.wins}}
80+
.ranking(ng-if="subtrack.wins && !subtrack.rank && !subtrack.rating")
81+
.number(style="color: #21B2F1") {{subtrack.wins}}
7982

80-
.tag Wins
83+
.tag Wins
8184

82-
.ranking(ng-if="subtrack.fulfillment")
83-
.number {{subtrack.fulfillment + '%'}}
85+
.ranking(ng-if="subtrack.fulfillment")
86+
.number {{subtrack.fulfillment + '%'}}
8487

85-
.tag Fulfillment
88+
.tag Fulfillment
8689

87-
img.arrow(src="/images/ico-arrow-big-right.svg")
90+
img.arrow(src="/images/ico-arrow-big-right.svg")
8891

89-
tc-section(id="externalLinks", ng-show="vm.displaySection.externalLinks", state="profileVm.status.externalLinks" class="external-links")
90-
h3.activity Activity across the web
91-
external-links-data(ng-show="vm.hasLinks", external-links="vm.linkedExternalAccounts", linked-accounts-data="vm.linkedExternalAccountsData")
92+
#externalLinks
93+
tc-section(ng-show="vm.displaySection.externalLinks", state="profileVm.status.externalLinks")
94+
.external-links
95+
h3.activity Activity across the web
96+
external-links-data(ng-show="vm.hasLinks", external-links="vm.linkedExternalAccounts", linked-accounts-data="vm.linkedExternalAccountsData")
9297

93-
.empty-state(ng-hide="vm.hasLinks")
94-
.action-text Showcase your work from around the web
98+
.empty-state(ng-hide="vm.hasLinks")
99+
.action-text Showcase your work from around the web
95100

96-
external-accounts.external-account-container(linked-accounts="[]", links-data="{}", read-only="true")
101+
external-accounts.external-account-container(linked-accounts="[]", links-data="{}", read-only="true")
97102

98-
.description Show off your work and experience outside of Topcoder. Connect accounts from popular services and networks or add a link to any site.
103+
.description Show off your work and experience outside of Topcoder. Connect accounts from popular services and networks or add a link to any site.
99104

100-
button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS
105+
button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS

0 commit comments

Comments
 (0)