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

Made changes to preserve members subdomain #874

Merged
merged 2 commits into from
Aug 5, 2016
Merged

Made changes to preserve members subdomain #874

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
18f77e4
Made changes to preserve members subdomain
tladendo Aug 4, 2016
94fe90c
Fixed conditional check
tladendo Aug 5, 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
1 change: 1 addition & 0 deletions app/directives/ios-card/ios-card.directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import angular from 'angular'
},
controller: ['$scope', 'CONSTANTS', function($scope, CONSTANTS) {
$scope.DOMAIN = CONSTANTS.domain
$scope.SUBDOMAIN = location.href.search('//members') >= 0 ? 'members' : 'www'
}]
}
})
Expand Down
6 changes: 3 additions & 3 deletions app/directives/ios-card/ios-card.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@

header
.top
a.name(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}") #[span {{challenge.name}}]
a.name(ng-href="https://{{SUBDOMAIN}}.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}") #[span {{challenge.name}}]

p.subtrack-color {{challenge.subTrack | underscoreStrip}}

.challenge-links
.stats
a.registrants(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant")
a.registrants(ng-href="https://{{SUBDOMAIN}}.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant")
.registrants-icon

p {{challenge.numRegistrants}}

a.submissions(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#submissions")
a.submissions(ng-href="https://{{SUBDOMAIN}}.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#submissions")
.submissions-icon

p {{challenge.numSubmissions}}
Expand Down
9 changes: 5 additions & 4 deletions app/filters/challengeLinks.filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import _ from 'lodash'
} else {
data = {
domain: CONSTANTS.domain,
subdomain: location.href.search('//members') >= 0 ? 'members' : 'www',
track: challenge.track.toLowerCase(),
forumId: challenge.forumId,
id: challenge.id
Expand All @@ -61,13 +62,13 @@ import _ from 'lodash'
}
/*eslint no-fallthrough:0*/
case 'submissions':
return String.supplant('https://www.{domain}/challenge-details/{id}/?type={track}#submissions', data)
return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}#submissions', data)
case 'registrants':
return String.supplant('https://www.{domain}/challenge-details/{id}/?type={track}#viewRegistrant', data)
return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}#viewRegistrant', data)
case 'submit':// TODO use details link for submit, we can replace it with new submission page url
return String.supplant('https://www.{domain}/challenge-details/{id}/?type={track}', data)
return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data)
case 'detail':
return String.supplant('https://www.{domain}/challenge-details/{id}/?type={track}', data)
return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data)
}
}
}
Expand Down