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

Feature/sup 2839 invite only challenge card #723

Merged
merged 2 commits into from
Feb 9, 2016
Merged

Feature/sup 2839 invite only challenge card #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c1ff04
SUP-2839, Profile: # of wins in summary does not match winning challe…
Feb 9, 2016
4ada18f
SUP-3012, [Profile] Implement "private challenge" card
Feb 9, 2016
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
4 changes: 2 additions & 2 deletions app/directives/challenge-tile/challenge-tile.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@
.challenge-details(ng-switch-when="DEVELOP")
dev-challenge-user-place(challenge="challenge", view="view", ng-hide="challenge.isPrivate")
.invite-only-banner(ng-show="challenge.isPrivate")
img(src=require("../../../assets/images/ico-invite-only-prj.svg"))
img(ng-src=require("../../../assets/images/ico-invite-only-prj.svg"))
span INVITE-ONLY CHALLENGE

.challenge-details(ng-switch-when="DESIGN")
design-challenge-user-place(challenge="challenge", view="view", ng-hide="challenge.isPrivate")
.invite-only-banner(ng-show="challenge.isPrivate")
img(src=require("../../../assets/images/ico-invite-only-prj.svg"))
img(ng-src=require("../../../assets/images/ico-invite-only-prj.svg"))
span INVITE-ONLY CHALLENGE

// Only show if not data science track
Expand Down
8 changes: 4 additions & 4 deletions app/directives/challenge-user-place/design-challenge-user-place.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

.thumbnail(ng-click="!challenge.isPrivate && imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
img(ng-show="challenge.submissionViewable && imageURL", ng-src="{{imageURL}}")
img(ng-show="challenge.submissionViewable && !imageURL", ng-src="../../../assets/images/card-bg-no-image.svg")
img(ng-show="challenge.submissionViewable && !imageURL", ng-src=require("../../../assets/images/card-bg-no-image.svg"))
.private-challenge-banner(ng-show="!challenge.submissionViewable")
img(src=require("../../../assets/images/ico-private-prj.svg"))
img(ng-src=require("../../../assets/images/ico-private-prj.svg"))
span PRIVATE CHALLENGE

.thumbnail-gallery(ng-show="numImages", ng-click="!challenge.isPrivate && imageURL && openLightbox()")
Expand All @@ -31,9 +31,9 @@

.thumbnail(ng-click="!challenge.isPrivate && imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
img(ng-show="challenge.submissionViewable && imageURL", ng-src="{{imageURL}}")
img(ng-show="challenge.submissionViewable && !imageURL", ng-src="../../../assets/images/card-bg-no-image.svg")
img(ng-show="challenge.submissionViewable && !imageURL", ng-src=require("../../../assets/images/card-bg-no-image.svg"))
.private-challenge-banner(ng-show="!challenge.submissionViewable")
img(src=require("../../../assets/images/ico-private-prj.svg"))
img(ng-src=require("../../../assets/images/ico-private-prj.svg"))

.thumbnail-gallery(ng-show="numImages", ng-click="!challenge.isPrivate && imageURL && openLightbox()")
.gallery-icon
Expand Down
2 changes: 0 additions & 2 deletions app/services/challenge.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,6 @@ import moment from 'moment'
if (!challenge.userHasSubmitterRole) {
challenge.userStatus = 'COMPLETED'
}
// FIXME, replace with field from response
challenge.submissionViewable = !challenge.isPrivate
}
})
}
Expand Down