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

Feature/tc ui kit integration #358

Merged
merged 13 commits into from
Oct 14, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/account/login/login.jade
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
p.problem-signin
a.forgot-password(ui-sref="resetPassword") Forgot your password?

button(type="submit", ng-disabled="vm.loginForm.$invalid", ng-class="{'enabled-button': vm.loginForm.$valid}") Log In
button.tc-btn.tc-btn-l(type="submit", ng-disabled="vm.loginForm.$invalid") Log In

section.social
p ------------ Or Log in With ------------
Expand All @@ -41,7 +41,7 @@
p Twitter

.join-topcoder
span Not a member yet?
p.redirect
a(ui-sref="register(vm.$stateParams)") Join now
span Not a member yet?

a.tc-btn.tc-btn-ghost-secondary.tc-btn-s(ui-sref="register(vm.$stateParams)") Join now

6 changes: 3 additions & 3 deletions app/account/register/register.jade
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
section.terms
p By clicking "Join," you agree to Topcoder's #[a(href="http://www.topcoder.com/community/how-it-works/terms/", target="_blank") Terms of Service] and #[a(href="http://www.topcoder.com/community/how-it-works/privacy-policy/", target="_blank") Privacy Policy]

button(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid", ng-class="{'enabled-button': vm.registerForm.$valid}") Join
button.tc-btn.tc-btn-l(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid") Join

section.social
p ------------ Or Register With ------------
Expand All @@ -114,5 +114,5 @@

.join-topcoder
span Already a member?
p.redirect
a(ui-sref="login(vm.$stateParams)") Log in

a.tc-btn.tc-btn-ghost-secondary.tc-btn-s(ui-sref="login(vm.$stateParams)") Log in
4 changes: 2 additions & 2 deletions app/directives/challenge-tile/challenge-tile.directive.jade
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.

.phase-action(ng-switch="challenge.userAction")
.submit(ng-switch-when="Submit") Submit
a.tc-btn.tc-btn-s.tc-btn-wide.submit(ng-switch-when="Submit") Submit

.submitted(ng-switch-when="Submitted") Submitted

Expand Down Expand Up @@ -105,7 +105,7 @@
p.ends-in(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.

.phase-action(ng-switch="challenge.userAction")
.submit(ng-switch-when="Submit") Submit
a.tc-btn.tc-btn-s.tc-btn-wide.submit(ng-switch-when="Submit") Submit

.submitted(ng-switch-when="Submitted") Submitted

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
.coders(ng-if="!displayCoders", style="background: {{rating | ratingColor}}")
.num {{rating}}
.label RATING
button.compare(ng-click="graphState.show = 'history'")
button.tc-btn.tc-btn-s.compare(ng-click="graphState.show = 'history'")
| BACK TO YOUR RATING

2 changes: 1 addition & 1 deletion app/directives/history-graph/history-graph.directive.jade
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
.history-info
.challenge(ng-if="historyRating") {{historyChallenge}}
.date(ng-if="historyRating") {{historyDate | date}}
button.compare(ng-click="graphState.show = 'distribution'") COMMUNITY RATINGS
button.tc-btn.tc-btn-s.compare(ng-click="graphState.show = 'distribution'") COMMUNITY RATINGS
4 changes: 2 additions & 2 deletions app/directives/ios-card/ios-card.directive.jade
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
p.ends-in Ends In
p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}

.stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.

p.prize-money(ng-show="challenge.reviewType === 'PEER'") Peer Review Challenge

p.prize-money(ng-hide="challenge.reviewType === 'PEER'") {{challenge.totalCheckpointPrize || 0 | currency:undefined:0}}
Expand Down
6 changes: 3 additions & 3 deletions app/directives/profile-widget/profile-widget.jade
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

p.description {{profile.description}}

button.edit(ng-show="editProfileLink", ui-sref="settings.profile") Edit Profile
a.tc-btn.tc-btn-s.edit(ng-show="editProfileLink", ui-sref="settings.profile") Edit Profile

.tracks-links
.tracks
Expand All @@ -27,7 +27,7 @@
hr

.links
a.forums.link(ng-href="http://forums.{{DOMAIN}}/?module=History&userID={{profileVm.profile.userId}}")
a.tc-btn.tc-btn-secondary.tc-btn-s.forums.link(ng-href="http://forums.{{DOMAIN}}/?module=History&userID={{profileVm.profile.userId}}")
| Forum Posts
button.badges.link(ng-click="profileVm.showBadges()")
button.tc-btn.tc-btn-secondary.tc-btn-s.badges.link(ng-click="profileVm.showBadges()")
| Badges
4 changes: 2 additions & 2 deletions app/directives/srm-tile/srm-tile.directive.jade
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
i.fa.fa-check-circle-o
p You are registered!
.unregistered(ng-hide="vm.registered")
button.srm-action Register
button.tc-btn.tc-btn-s.tc-btn-wide.srm-action Register

.past-srm(ng-show="srm.status === 'PAST'")
.challenge-track
Expand Down Expand Up @@ -54,7 +54,7 @@
i.fa.fa-check-circle-o
p You are registered!
.unregistered(ng-hide="vm.registered")
button.srm-action Register
button.tc-btn.tc-btn-s.tc-btn-wide.srm-action Register

.past-srm(ng-show="srm.status === 'PAST'")
.challenge-track
Expand Down
2 changes: 1 addition & 1 deletion app/my-dashboard/community-updates/community-updates.jade
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ header
.description(ng-bind-html="blog.description")

.blog-links(ng-hide="vm.loading")
a(ng-href="https://www.{{DOMAIN}}/blog/") View More
a.tc-btn.tc-btn-s.tc-btn-secondary(ng-href="https://www.{{DOMAIN}}/blog/") View More
8 changes: 4 additions & 4 deletions app/my-dashboard/my-challenges/my-challenges.jade
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ section.noChallenges(ng-if="!vm.userHasChallenges && !vm.loading")
p.info Compete in challenges to win money, test yourself against the world's best, and learn new skills

.info-links
a(ng-href="https://www.{{DOMAIN}}/challenges/?pageIndex=1") Find Challenges
a.tc-btn.tc-btn-l(ng-href="https://www.{{DOMAIN}}/challenges/?pageIndex=1") Find Challenges

a(href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
a.tc-btn.tc-btn-ghost.tc-btn-l(href="https://www.{{DOMAIN}}/community/getting-started/") Learn More

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

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

a(ui-sref="my-challenges({status: 'completed'})") View All Past Challenges
a.tc-btn.tc-btn-s.tc-btn-secondary(ui-sref="my-challenges({status: 'completed'})") View All Past Challenges
6 changes: 3 additions & 3 deletions app/my-dashboard/programs/programs.jade
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ section.ios(ng-hide="vm.loading")
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.

.info-links
a(ng-click="vm.registerUser()") Participate
a.tc-btn(ng-click="vm.registerUser()") Participate

a(ng-href="https://ios.{{DOMAIN}}", target="_blank") Learn More
a.tc-btn.tc-btn-ghost(ng-href="https://ios.{{DOMAIN}}", target="_blank") Learn More

.registered(ng-show="vm.registered")
.badge-and-challenges
Expand All @@ -28,6 +28,6 @@ section.ios(ng-hide="vm.loading")
.badge-timeline
img(src="/images/member-program/svg/Member-06.svg", alt="Development Challenge Icon")

a(href="http://ios.{{vm.domain}}", title="topcoder iOS Member Program") View Challenges
a.tc-btn.tc-btn-s.tc-btn-ghost.tc-btn-wide(href="http://ios.{{vm.domain}}", title="topcoder iOS Member Program") View Challenges

ios-card(ng-repeat="challenge in vm.challenges | orderBy:reviewType:true| orderBy:registrationEndDate:true", challenge="challenge", view="'tile'")
10 changes: 5 additions & 5 deletions app/my-dashboard/srms/srms.jade
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ section(ng-hide="vm.loading")
.flex-wrapper
h2 Practice on past problems

a(ng-href="https://community.{{DOMAIN}}/tc?module=ProblemArchive") Problem Archives
a.tc-btn.tc-btn-s.tc-btn-wide(ng-href="https://community.{{DOMAIN}}/tc?module=ProblemArchive") Problem Archives

a(ng-href="https://community.{{DOMAIN}}/wiki/display/tc/Algorithm+Problem+Set+Analysis") Match Editorials
a.tc-btn.tc-btn-s.tc-btn-wide(ng-href="https://community.{{DOMAIN}}/wiki/display/tc/Algorithm+Problem+Set+Analysis") Match Editorials

a(ng-href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
a.tc-btn.tc-btn-s.tc-btn-wide(ng-href="https://www.{{DOMAIN}}/community/getting-started/") Learn More

.srms-links(ng-hide="vm.loading")
a(ui-sref="my-srms") View Past SRMs
a.tc-btn.tc-btn-s.tc-btn-secondary(ui-sref="my-srms") View Past SRMs

a(ng-href="https://arena.{{DOMAIN}}") Launch Arena
a.tc-btn.tc-btn-s.tc-btn-secondary(ng-href="https://arena.{{DOMAIN}}") Launch Arena
10 changes: 5 additions & 5 deletions app/profile/about/about.jade
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
.skill(ng-repeat="skill in vm.skills")
skill-tile(skill="skill")

button.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW ALL
button.more(ng-if="vm.skills.length > 6", ng-click="vm.skills = vm.someSkills") VIEW LESS
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
button.tc-btn.tc-btn-secondary.tc-btn-l.more(ng-if="vm.skills.length > 6", ng-click="vm.skills = vm.someSkills") VIEW LESS

.empty-state(ng-show="!profileVm.skills || (profileVm.skills && profileVm.skills.length == 0)")
.action-text Tell everyone what you know
Expand All @@ -24,7 +24,7 @@

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

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

tc-section(ng-show="vm.displaySection.stats", state="profileVm.status.stats")

Expand All @@ -40,7 +40,7 @@
div
.text {{track | track}}
.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.
a.link-button(href="/challenges") FIND CHALLENGES
a.tc-btn.tc-btn-l.link-button(href="/challenges") FIND CHALLENGES

.track(
ng-repeat="track in profileVm.profile.tracks",
Expand Down Expand Up @@ -96,4 +96,4 @@

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

button.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS
button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS
10 changes: 5 additions & 5 deletions app/settings/account-info/account-info.jade
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
p(ng-class="{ 'has-symbol-or-number': (vm.newPasswordForm.password.$dirty && !vm.newPasswordForm.password.$error.hasSymbolOrNumber) }") At least one number or symbol

.button-container
button.button-l.save(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.newPasswordForm", ng-disabled="vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine", ng-class="{'disabled': vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine}") Change Password
button.tc-btn.tc-btn-secondary.tc-btn-l.save(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.newPasswordForm", ng-disabled="vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine", ng-class="{'disabled': vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine}") Change Password


div(ng-show="vm.isSocialRegistration")
Expand Down Expand Up @@ -82,13 +82,13 @@
.form-input-error(ng-show="vm.accountInfoForm.lastname.$invalid")
p(ng-show="vm.accountInfoForm.lastname.$error.required") This is a required field.


.settings-section.address
.section-info
h2 address
.description Required for payments and in case we need to mail you something. Will be kept private and not shared with anyone.

.section-fields
.section-fields
.form-label.address Address
input.form-field(
name="address", type="text",
Expand All @@ -98,7 +98,7 @@
ng-class="{'form-field-focused': hasFocus==true}"
)

.form-label Address 2
.form-label Address 2
span(style="text-transform: none;") &nbsp;(opt., suite, etc.)
input.form-field(
name="address2",
Expand Down Expand Up @@ -155,4 +155,4 @@


.button-container
button.button-l(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.accountInfoForm", ng-disabled="vm.accountInfoForm.$invalid", ng-class="{'enabled-button': vm.accountInfoForm.$valid}") Save
button.tc-btn.tc-btn-secondary.tc-btn-l(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.accountInfoForm", ng-disabled="vm.accountInfoForm.$invalid", ng-class="{'enabled-button': vm.accountInfoForm.$valid}") Save
2 changes: 1 addition & 1 deletion app/settings/edit-profile/edit-profile.jade
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
.section-fields
track-toggle(tracks="vm.tracks")

button(type="submit", tc-busy-button, tc-busy-when="vm.profileFormProcessing" ng-disabled="vm.editProfile.$invalid || vm.editProfile.$pristine", ng-class="{' ': vm.editProfile.$valid, 'disabled': vm.editProfile.$pristine || vm.editProfile.$invalid}") Save
button.tc-btn.tc-btn-secondary.tc-btn-l(type="submit", tc-busy-button, tc-busy-when="vm.profileFormProcessing" ng-disabled="vm.editProfile.$invalid || vm.editProfile.$pristine", ng-class="{' ': vm.editProfile.$valid, 'disabled': vm.editProfile.$pristine || vm.editProfile.$invalid}") Save

.settings-section.skills
.section-info
Expand Down
5 changes: 2 additions & 3 deletions app/skill-picker/skill-picker.jade
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
.icon
img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="/images/skills/id-design.svg")
.name {{tag.name}}


.skills-section(ng-show="vm.tracks.DEVELOP")
.track-title select development skills
Expand All @@ -48,8 +47,8 @@
.name {{tag.name}}


button.button-l(
type="button",
button.tc-btn.tc-btn-l.done-button(
type="button",
tc-busy-button, tc-busy-when="vm.saving",
ng-click="vm.submitSkills()",
ng-class="{'enabled-button': vm.tracks.design || vm.tracks.develop || vm.tracks.data_science}") Done
16 changes: 4 additions & 12 deletions assets/css/account/account.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';

.login-container, .register-container, .reset-password-container, .registered-successfully-container {
Expand Down Expand Up @@ -63,26 +64,17 @@
}

.tips {
left: 380px;
left: 380px;
}

.email-tips {
left: 380px;
left: 380px;
}

button {
@include ui-submit-button;
width: 180px;
border-radius: 4px;
align-self: center;

&.enabled-button {
@include ui-enabled-button;
}

&[disabled] {
@include ui-disabled-button;
}
text-transform: uppercase;
}

// Form stylings
Expand Down
1 change: 1 addition & 0 deletions assets/css/account/login.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';

.login-container {
Expand Down
22 changes: 3 additions & 19 deletions assets/css/account/register.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';

.register-container {
Expand Down Expand Up @@ -114,35 +115,18 @@
align-items: center;
}

.redirect {
border: 1px solid #D1D3D4;
background-color: white;
border-radius : 4px;
width: 66px;/* TODO as per design it should be 63px*/
height: 30px;
a {
margin-left: 10px;
display: flex;
align-items: center;
justify-content: center;
@include sofia-pro-light;
text-transform: uppercase;
font-size: 12px;
line-height: 14px;
text-transform: uppercase;
padding: 8px 12px;

a {
text-decoration: none;
@include sofia-pro-light;
}
}
}

@media (max-width: 767px) {

.register-container {

form {

.first-last-names {
display: flex;
flex-direction: column;
Expand Down
5 changes: 3 additions & 2 deletions assets/css/account/registered-successfully.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
@import 'topcoder-includes';
@import '../partials/combined';

.registered-successfully-container {
p.message {
p.message {
font-size: 20px;
line-height: 30px;
@include source-sans-light;
color: #3D3D3D;
padding: 62px 90px 154px 90px;
}
}
}
3 changes: 2 additions & 1 deletion assets/css/account/reset-password.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@import 'topcoder-includes';
@import '../partials/combined';

.reset-password-container {

form {
display: flex;
flex-flow: column wrap;
Expand Down
Loading