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

Release dev to qa #70

Merged
merged 4 commits into from
May 29, 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
16 changes: 8 additions & 8 deletions app/challenges/challenges.jade
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ div(ng-controller="challenges as vm")
.ca SUBMISSIONS
.vl(ng-bind="challenge.numSubmissions")
.actns
a.btn.secondary.btnReg(ng-href="https://www.{{vm.domain}}/challenge-details/{{challenge.challengeId}}/?type=develop", target="_blank") View
a.btn.secondary.btnReg(ng-href="{{challenge.url}}", target="_blank") View

a.lnk(href='#view-challenges', du-smooth-scroll) View all challenges

Expand Down Expand Up @@ -85,12 +85,12 @@ div(ng-controller="challenges as vm")
li.liRw.col-xs-12(ng-repeat="challenge in vm.challenges")
.chrw.clearfix
figure.col1.imgWrap.pull-left
a(ng-href="https://www.{{vm.domain}}/challenge-details/{{challenge.challengeId}}/?type=develop")
a(ng-href="{{challenge.url}}")
img.challenge-image(ng-src="{{challenge.thumb}}", alt="challenge image")
.chge.col2.pull-left
.inner
h4.chTitle
a.ellipses(ng-href="https://www.{{vm.domain}}/challenge-details/{{challenge.challengeId}}/?type=develop") {{challenge.challengeName}}
a.ellipses(ng-href="{{challenge.url}}") {{challenge.challengeName}}
.rw.ellipses
span.lbl Technologies:&#32
span.val {{challenge.technologies}}
Expand All @@ -109,11 +109,11 @@ div(ng-controller="challenges as vm")
.regs.col4.pull-left
.inner
.reg
a(ng-href="https://www.{{vm.domain}}/challenge-details/{{challenge.challengeId}}/?type=develop#viewRegistrant") {{challenge.numRegistrants}}
a(ng-href="{{challenge.url}}#viewRegistrant") {{challenge.numRegistrants}}
.subs.col5.pull-left
.inner
.sub
a(ng-href="https://www.{{vm.domain}}/challenge-details/{{challenge.challengeId}}/?type=develop#viewRegistrant") {{challenge.numSubmissions}}
a(ng-href="{{challenge.url}}#viewRegistrant") {{challenge.numSubmissions}}

ul.challenges.row(ng-show="isGrid")
li.col-xs-12.col-sm-6.col-md-4.col-lg-3(ng-repeat="challenge in vm.challenges")
Expand All @@ -124,7 +124,7 @@ div(ng-controller="challenges as vm")

.challenge-details
h2.challenge-header.ellipses
a(ng-href="https://www.{{vm.domain}}/challenge-details/{{challenge.challengeId}}/?type=develop") {{challenge.challengeName}}
a(ng-href="{{challenge.url}}") {{challenge.challengeName}}

.challenge-data
p.ellipses #[span.challenge-field Technologies:] {{challenge.technologies}}
Expand All @@ -147,13 +147,13 @@ div(ng-controller="challenges as vm")
.stats-type REGISTRANTS

.stats-value
a(ng-href="https://www.{{vm.domain}}/challenge-details/{{challenge.challengeId}}/?type=develop#viewRegistrant") {{challenge.numRegistrants}}
a(ng-href="{{challenge.url}}#viewRegistrant") {{challenge.numRegistrants}}

.col-xs-6.challenge-submissions.challenge-stat
.stats-type SUBMISSIONS

.stats-value
a(ng-href="https://www.{{vm.domain}}/challenge-details/{{challenge.challengeId}}/?type=develop#viewRegistrant") {{challenge.numSubmissions}}
a(ng-href="{{challenge.url}}#viewRegistrant") {{challenge.numSubmissions}}

ul.section-actions
li(ng-show="vm.hasMore && !vm.loading") #[a(ng-click="vm.loadMore()") Load more...]
Expand Down
6 changes: 3 additions & 3 deletions app/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,20 @@ html

meta(itemprop='name', content='topcoder iOS Member Program')
meta(itemprop='description', content='iOS/SWIFT challenges on topcoder.com, brought to you by Apple and Appirio. Now is the time to compete!')
meta(itemprop='image', content='/content/images/logo-landing.png')
meta(itemprop='image', content='http://apple.topcoder.com/content/images/logo-landing.png')

meta(name='twitter:card', content='iOS/SWIFT challenges on topcoder.com, brought to you by Apple and Appirio. Now is the time to compete!')
meta(name='twitter:site', content='@topcoder')
meta(name='twitter:title', content='topcoder iOS Member Program')
meta(name='twitter:description', content='iOS/SWIFT challenges on topcoder.com, brought to you by Apple and Appirio. Now is the time to compete!')
meta(name='twitter:creator', content='@topcoder')
meta(name='twitter:image:src', content='/content/images/logo-landing.png')
meta(name='twitter:image:src', content='http://apple.topcoder.com/content/images/logo-landing.png')

meta(property='og:url', content='http://apple.topcoder.com')
meta(property='og:title', content='topcoder iOS Member Program')
meta(property='og:description', content='iOS/SWIFT challenges on topcoder.com, brought to you by Apple and Appirio. Now is the time to compete!')
meta(property='og:site_name', content='topcoder iOS Member Program')
meta(property='og:image', content='/content/images/logo-landing.png')
meta(property='og:image', content='http://apple.topcoder.com/content/images/logo-landing.png')

meta(http-equiv="X-UA-Compatible", content="IE=edge, chrome=1")

Expand Down
12 changes: 11 additions & 1 deletion app/services/helpers.service.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

Helpers = () ->
Helpers = (ENV) ->
formatArray: (data) ->
formatField = (key) ->
challenge[key] = challenge[key].join ', '
Expand All @@ -16,6 +16,15 @@ Helpers = () ->
if (!challenge.platforms)
challenge.platforms = 'iOS'

id = challenge.challengeId

if challenge.challengeType == 'Assembly Competition'
type = ''
else
type = '/?type=develop'

challenge.url = "https://www.#{ ENV.domain }/challenge-details/#{ id }#{ type }"

if challenge.reviewType and challenge.reviewType is 'PEER'
challenge.icon = 'peer'
challenge.thumb = 'content/images/peer-swift-challenge.png'
Expand All @@ -24,5 +33,6 @@ Helpers = () ->
challenge.thumb = 'content/images/swift-challenge-1.png'

angular.module('lime-topcoder').factory 'Helpers', [
'ENV'
Helpers
]