Merge pull request #878 from appirio-tech/qa-integration

Promoting to Prod (Members Subdomain and TCO17)

README.md

@@ -20,7 +20,14 @@ In order to test a logged in user, you must make an entry in your `/etc/hosts` f
 - To create the build: `npm run build`
 - To run code linting: `npm run lint`
 - To run the tests: `npm test`
-
+
+## Test Users
+- general member user accounts:  
+  - ksmith/Topcoder123$
+  - dan_developer/dantopcoder123
+- Create your own:
+  - You may register your own account at https://local.topcoder-dev.com/register
+
 ## Recommended Developer Tools
 
 Syntax highlighting for ES6 and React JSX

app/directives/challenge-links/challenge-links.directive.js

@@ -12,6 +12,11 @@ import angular from 'angular'
       scope: {
         challenge: '=',
         view: '='
+      },
+      link: function(scope, element, attrs) {
+        element.on('click', function() {
+          window.location.href = $(this).attr('href')
+        })
       }
     }
   })

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

app/my-dashboard/my-dashboard.jade

@@ -7,6 +7,12 @@
 
   //- .ttl
   //-   tc-banner(theme="black", banner-name="ttl")
+  .tco.tco17
+    .tc-banner-placeholder.black.bg-image
+      .title 2017 Topcoder Open
+      .subtitle The Ultimate Programming & Design tournament
+      .description Earn your way to the USA!
+      a(href="http://tco17.topcoder.com/").cta.tc-btn-white.tc-btn-radius Learn More
 
   .tco
     tc-banner(theme="black", banner-name="tco16")

app/services/nav.service.js

@@ -30,7 +30,7 @@ import angular from 'angular'
       ],
       'community': [
           { 'sref': 'community.members', 'text': 'OVERVIEW', 'icon': require('../../assets/images/nav/members.svg') },
-          { 'href': CONSTANTS.TCO16_URL, 'text': 'TCO16', 'icon': require('../../assets/images/nav/ico-tco16.svg'), 'target': '_blank' },
+          { 'href': CONSTANTS.TCO_HOME_URL, 'text': 'TCO', 'icon': require('../../assets/images/nav/tco-generic.svg'), 'target': '_blank' },
           { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': require('../../assets/images/nav/programs.svg') },
           { 'href': CONSTANTS.FORUMS_APP_URL, 'text': 'FORUMS', 'icon': require('../../assets/images/nav/forums.svg') },
           { 'sref': 'community.statistics', 'text': 'STATISTICS', 'icon': require('../../assets/images/nav/statistics.svg') },

app/topcoder.constants.js

@@ -20,6 +20,8 @@ angular.module('CONSTANTS', []).constant('CONSTANTS', {
   'PHOTO_LINK_LOCATION'     : process.env.PHOTO_LINK_LOCATION,
   'SWIFT_PROGRAM_URL'       : process.env.SWIFT_PROGRAM_URL,
   'TCO16_URL'               : process.env.TCO16_URL,
+  'TCO17_URL'               : process.env.TCO17_URL,
+  'TCO_HOME_URL'            : process.env.TCO_HOME_URL,
   'ACCOUNTS_APP_URL'        : process.env.ACCOUNTS_APP_URL,
   'FILE_PICKER_API_KEY'     : process.env.FILE_PICKER_API_KEY,
   'FILE_PICKER_SUBMISSION_CONTAINER_NAME': process.env.FILE_PICKER_SUBMISSION_CONTAINER_NAME,

assets/css/directives/tc-banner.scss

@@ -3,6 +3,10 @@
 $tco-color: #F47A20;
 $tco-color-dark: #ea690b;
 
+.tco17 {
+  margin-bottom: 10px;
+}
+
 .tc-banner-placeholder {
   display: flex;
   flex-direction: column;
@@ -113,6 +117,11 @@ $tco-color-dark: #ea690b;
     color: $white;
   }
 
+  .subtitle {
+    @extend .title;
+    @include sofia-pro-regular;
+  }
+
   .description {
     color: $white;
   }
@@ -124,4 +133,41 @@ $tco-color-dark: #ea690b;
       }
     }
   }
+
+  .tc-btn-white {
+    background-color: white;
+    color: #0096FF;
+    padding: 10px 20px;
+    margin-top: 5px;
+  }
+
+  .tc-btn-radius {
+    border-radius: 26px;
+  }
+}
+.tc-banner-placeholder.bg-image {
+  background-image: url(../../images/home-hero.jpg);
+  background-size: 100%;
+  height: 352px;
+  background-position: center 40%;
+  background-repeat: no-repeat;
+
+  padding-top: 50px;
+  padding-right: 350px;
+
+  .title {
+    font-size: 36px;
+    margin-bottom: 5px;
+    margin-top: 10px;
+  }
+
+  .subtitle {
+    margin-top: 20px;
+    width: 450px;
+  }
+
+  .cta {
+    margin-top: 20px;
+  }
 }
+

assets/css/my-dashboard/my-dashboard.scss

@@ -34,6 +34,7 @@
     }
   }
 
+
   .challenges, .srms, .programs, .tco, .ttl, .community-updates {
     padding-top: 0px;
   }