Merge pull request #874 from appirio-tech/tom-membersub-fix-links

Made changes to preserve members subdomain

Author: tladendo

app/directives/ios-card/ios-card.directive.js

@@ -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'
       }]
     }
   })

app/directives/ios-card/ios-card.jade

@@ -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}}

app/filters/challengeLinks.filter.js

@@ -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
@@ -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)
         }
       }
     }