Merge branch 'dev' into listings-contest

birdofpreyru · birdofpreyru · commit ca7b7e6a9325 · 2017-02-20T04:09:42.000+01:00
diff --git a/README.md b/README.md
@@ -20,6 +20,18 @@ 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`
+
+## Running against Production backend
+To run this App against the production backend, you should configure your system in a way that a call to `local.topcoder.com` redirects to `localhost:3000` where the App is running. Then you just `npm run start-prod`, go to `local.topcoder.com` and use your credentials for the production web site (and, sure, be careful with what you are doing, it all will go through the production TopCoder API).
+
+To make the mentioned configuration on Ubuntu 16.04 you:
+- Add `127.0.0.1 local.topcoder.com` to your `/etc/hosts`
+- `$ sudo apt install libcap2-bin`
+- `$ which node` to figure out your `path/to/node`
+- `$ sudo setcap cap_net_bind_service=+ep /path/to/node`
+- Now run the App.
+
+*Disclaimer: I have no idea, what setcap does here, and how safe it is, but it does the job. Feel free to add your comments / modify this section, if you know more about it. Also, if you know how to make such configuration on other OS, please add it here.*
  
 ## Test Users
 - general member user accounts:  
diff --git a/app/directives/challenge-tile/challenge-tile.jade b/app/directives/challenge-tile/challenge-tile.jade
@@ -21,6 +21,8 @@
 
         .phase-action(ng-show="challenge.userAction", ng-switch="challenge.userAction")
           a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'submit'}}") Submit
+          a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'viewScorecards'}}") View Scorecards
+          a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals
 
           .submitted(ng-switch-when="Submitted") Submitted
 
@@ -97,6 +99,8 @@
 
       .phase-action(ng-switch="challenge.userAction")
         a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'submit'}}") Submit
+        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'viewScorecards'}}") View Scorecards
+        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals
 
         .submitted(ng-switch-when="Submitted") Submitted
 
diff --git a/app/filters/challengeLinks.filter.js b/app/filters/challengeLinks.filter.js
@@ -69,6 +69,10 @@ import _ from 'lodash'
           return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data)
         case 'detail':
           return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data)
+        case 'viewScorecards':
+          return String.supplant('https://software.{domain}/review/actions/ViewProjectDetails?pid={id}', data)
+        case 'completeAppeals':
+          return String.supplant('https://software.{domain}/review/actions/EarlyAppeals?pid={id}', data)
         }
       }
     }
diff --git a/app/listings/listings.controller.js b/app/listings/listings.controller.js
@@ -1,4 +1,6 @@
+import _ from 'lodash'
 import angular from 'angular'
+import { loadUser } from '../services/userv3.service.js'
 
 (function () {
   'use strict'
@@ -9,21 +11,96 @@ import angular from 'angular'
     'TcAuthService', 'UserService', 'UserStatsService', 'ProfileService', 'ChallengeService', 'ExternalAccountService',
     'ngDialog', '$anchorScroll'
   ]
-
-  function ListingsCtrl($location, $scope, CONSTANTS, logger, $q, TcAuthService, UserService, UserStatsService, ProfileService, ChallengeService, ExternalAccountService, ngDialog, $anchorScroll) {
+  
+  function ListingsCtrl($location, $scope, CONSTANTS, logger, $q, TcAuthService,
+  UserService, UserStatsService,ProfileService, ChallengeService, ExternalAccountService, ngDialog, $anchorScroll) {
+    var vm = this
+    var handle
+    vm.neverParticipated = false
+    vm.loading = true
+    vm.userHasChallenges = true
+    vm.challengeView = 'tile'
 
     activate()
 
-    $scope.listingProps = {
-      filterFromUrl: $location.hash(),
-      onSaveFilterToUrl: function(filter) {
-        $location.hash(filter)
-      }
-    }
-
     function activate() {
+      $scope.myChallenges = []
+      $scope.reactProps = { isAuth: false, myChallenges: [] }
       logger.debug('Calling ListingsController activate()')
+      vm.myChallenges = []
+      loadUser().then(function(token) {
+        handle = UserService.getUserIdentity().handle
+
+        // update auth flag and get challenges
+        if(TcAuthService.isAuthenticated()) {
+          getChallenges(handle)
+        }
+      }, function(error) {
+        // do nothing, just show non logged in state of navigation bar
+      })
+    }
+
+    function getChallenges(handle) {
+      var marathonMatchParams = {
+        limit: 8,
+        filter: 'status=active'
+      }
+
+      var challengeParams = {
+        limit: 8,
+        orderBy: 'submissionEndDate',
+        filter: 'status=active'
+      }
+
+      $q.all([
+        ChallengeService.getUserMarathonMatches(handle, marathonMatchParams),
+        ChallengeService.getUserChallenges(handle, challengeParams)
+      ]).then(function(challenges){
+        var marathonMatches = challenges[0]
+        var devDesignChallenges = challenges[1]
+
+        if (!marathonMatches.length && !devDesignChallenges.length) {
+          vm.userHasChallenges = false
+          _checkForParticipation().then(function() {
+            vm.loading = false
+          })
+        } else {
+          ChallengeService.processActiveDevDesignChallenges(devDesignChallenges)
+          ChallengeService.processActiveMarathonMatches(marathonMatches)
+          var userChallenges = marathonMatches.concat(devDesignChallenges)
+
+          userChallenges = _.sortBy(userChallenges, function(n) {
+            return n.registrationEndDate
+          })
+          vm.myChallenges = userChallenges.reverse().slice(0, 8)
+
+          // update myChallenges
+          $scope.reactProps = {
+            config: CONSTANTS,
+            filterFromUrl: $location.hash(),
+            isAuth: true,
+            myChallenges: vm.myChallenges,
+            onSaveFilterToUrl: function(filter) {
+              $location.hash(filter)
+            }
+          }
+
+          vm.userHasChallenges = true
+          vm.loading = false
+        }
+      })
+      .catch(function(err) {
+        logger.error('Error getting challenges and marathon matches', err)
+
+        vm.userHasChallenges = true
+        vm.loading = false
+      })
+    }
 
+    function _checkForParticipation() {
+      return ChallengeService.checkChallengeParticipation(handle, function(participated) {
+        vm.neverParticipated = !participated
+      })
     }
   }
 
diff --git a/app/listings/listings.jade b/app/listings/listings.jade
@@ -1 +1,12 @@
-react-component(name="ChallengeFiltersExample" props="listingProps")
+react-component(name="ChallengeFiltersExample" props="reactProps" watch-depth="reference")
+
+script.
+  (function() {
+    var s = document.createElement("script");
+    s.type = "text/javascript";
+    s.async = true;
+    s.src = '//api.usersnap.com/load/'+
+            '3e7c8f0c-6cf6-41b6-9f2c-e8e4e60dfc59.js';
+    var x = document.getElementsByTagName('script')[0];
+    x.parentNode.insertBefore(s, x);
+  })();
diff --git a/app/listings/listings.module.js b/app/listings/listings.module.js
diff --git a/app/listings/listings.routes.js b/app/listings/listings.routes.js
diff --git a/app/my-dashboard/my-dashboard.jade b/app/my-dashboard/my-dashboard.jade
@@ -6,25 +6,22 @@
   .challenges(id="challenges", ui-view="my-challenges")
 
   .tco.tco17
-    .tc-banner-placeholder.predix
-      .subtitle Ready for the future? The Industrial Internet is here
-      .description Get hands-on with the Predix platform and the Industrial Internet 
-      a(href="http://predix.topcoder.com/").cta.tc-btn-white.tc-btn-radius Learn More
+    .tc-banner-placeholder.cognitive
+      .container
+        .img
+        .description Learn about Cognitive technologies and get hands on experience as a member of the Topcoder Cognitive Community.
+        a(href="https://cognitive.topcoder.com").cta.tc-btn-white.tc-btn-radius Learn More
 
-  //- .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")
     
   .srms(id="srms", ui-view="srms", ng-show="dashboard.showSRMs")
 
   .programs(id="community", ui-view="programs")
 
   .community-updates(ui-view="community-updates")
+
diff --git a/app/services/blog.service.js b/app/services/blog.service.js
@@ -19,7 +19,8 @@ import X2JS from 'xml2js'
 
       // fetch blog rss feed
       $http.get(CONSTANTS.BLOG_LOCATION)
-        .then(function(data) {
+        .then(function(response) {
+          var data = response.data
           // parse the blog rss feed using x2js
           var parseString = X2JS.parseString
           parseString(data.trim(), function (err, res) {
diff --git a/app/services/challenge.service.js b/app/services/challenge.service.js
@@ -105,6 +105,9 @@ import moment from 'moment'
             }
           })
         }
+        if (challenge.userCurrentPhase === 'Appeals') {
+          challenge.userAction = 'Appeal'
+        }
 
         if (challenge.userCurrentPhaseEndTime) {
           var fullTime = challenge.userCurrentPhaseEndTime
diff --git a/app/services/jwtInterceptor.service.js b/app/services/jwtInterceptor.service.js
@@ -38,7 +38,7 @@ import { isTokenExpired, getFreshToken } from 'tc-accounts'
 
     function getToken(config) {
       // skip token for .html
-      if (config.url.indexOf('.html') > -1)
+      if (config.url.indexOf('.html') > -1 || config.url === CONSTANTS.BLOG_LOCATION)
         return null
 
       var haveItAddItEndpoints = [
diff --git a/assets/css/directives/badge-tooltip.scss b/assets/css/directives/badge-tooltip.scss
@@ -438,7 +438,7 @@
   background-position: 0px -672px;
 }
 .Predix-Community {
-  background-position: -50px -672px;
+  background-position: -47px -672px;
 }
 .iOS-Community {
   background-position: -95px -672px;
diff --git a/assets/css/directives/challenge-tile.scss b/assets/css/directives/challenge-tile.scss
@@ -111,6 +111,7 @@ challenge-tile .challenge.tile-view {
     flex-direction: column;
     align-items: center;
     justify-content: center;
+    padding: 12px 0;
     flex: 2;
   }
 
@@ -245,8 +246,8 @@ challenge-tile .challenge.tile-view {
         min-height: 55px;
 
         .submit {
-          margin-bottom: 25px;
-          display: inline-block;
+          margin: 12px;
+          display: block;
         }
 
         .submitted {
@@ -280,6 +281,12 @@ challenge-tile .challenge.tile-view {
   }
 
 
+  @media only screen and (max-width: 768px) {
+    .active-challenge {
+      height: auto;
+      margin: auto;
+    }
+  }
   .completed-challenge {
     height: 390px;
     display: flex;
@@ -498,7 +505,8 @@ challenge-tile .challenge.list-view {
 
     .phase-action {
       .submit {
-        display: inline-block;
+        display: block;
+        margin: 6px 0;
       }
 
       .submitted {
diff --git a/assets/css/directives/tc-banner.scss b/assets/css/directives/tc-banner.scss
@@ -239,4 +239,57 @@ $tco-color-dark: #ea690b;
     margin-left: -250px;
 }
 
+.tc-banner-placeholder.cognitive {
+  background-image: url(../../images/cognitive-home-hero.jpg);
+  background-size: cover;
+  height: 352px;
+  background-position: center 100%;
+  background-repeat: no-repeat;
+  background-color: #222222;
+  z-index: 1;
+  flex-direction: row;
+
+  .container {
+    width: 50%;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    margin-left: 37px;
+    height: 95%;
+    justify-content: space-between;
+
+    .img {
+      background-image: url(../../images/cognitive-home-hero-title.png);
+      background-size: 100%;
+      background-repeat: no-repeat;
+      background-position: center 100%;
+      height: 57px;
+      width: 75%;
+    }
+
+    .description {
+      color: $white;
+      margin: 0 30px 0 0;
+      font-size: 24px;
+      line-height: 29px;
+      text-align: left;
+      font-weight: 300;
+    }
+
+    .cta {
+      margin-top: 20px;
+    }
+
+    .tc-btn-white {
+      background-color: white;
+      color: #0096FF;
+      padding: 10px 20px;
+    }
+
+    .tc-btn-radius {
+      border-radius: 26px;
+    }
+  }
+}
+
 
diff --git a/assets/css/my-dashboard/my-challenges.scss b/assets/css/my-dashboard/my-challenges.scss
@@ -131,7 +131,10 @@
     }
 
     .challenges {
-      @include horizontal-scroll;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      margin-left: 0;
 
       &.tile-view, &.list-view {
         @media only screen and (min-width: 768px) {
@@ -168,7 +171,6 @@
         margin-bottom: 15px;
         @media only screen and (max-width: 767px) {
           display: inline-block;
-          margin-left: 15px;
 
           &:first-child {
             margin-left: 0;
diff --git a/assets/images/cognitive-home-hero-title.png b/assets/images/cognitive-home-hero-title.png
diff --git a/assets/images/cognitive-home-hero.jpg b/assets/images/cognitive-home-hero.jpg
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "scripts": {
     "build": "webpack --bail --progress --build --tc",
     "start": "webpack-dev-server --history-api-fallback --host 0.0.0.0 --dev --tc --inline --progress --port 3000",
+    "start-prod": "webpack-dev-server --history-api-fallback --host local.topcoder.com --prod --tc --inline --progress --port 80",
     "lint": "eslint .",
     "test": "karma start --tc --test"
   },
@@ -56,7 +57,7 @@
     "appirio-styles": "0.x.x",
     "appirio-tech-ng-iso-constants": "^1.0.6",
     "appirio-tech-ng-ui-components": "^2.1.2",
-    "appirio-tech-react-components": "appirio-tech/react-components.git#challenge-listings",
+    "appirio-tech-react-components": "birdofpreyru/react-components.git#dev",
     "auth0-angular": "^4.1.0",
     "auth0-js": "^6.8.0",
     "d3": "^3.5.14",

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,10 @@ import _ from 'lodash'`
`69`	`69`	`return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data)`
`70`	`70`	`case 'detail':`
`71`	`71`	`return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data)`
	`72`	`+ case 'viewScorecards':`
	`73`	`+ return String.supplant('https://software.{domain}/review/actions/ViewProjectDetails?pid={id}', data)`
	`74`	`+ case 'completeAppeals':`
	`75`	`+ return String.supplant('https://software.{domain}/review/actions/EarlyAppeals?pid={id}', data)`
`72`	`76`	`}`
`73`	`77`	`}`
`74`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,9 @@ import moment from 'moment'`
`105`	`105`	`}`
`106`	`106`	`})`
`107`	`107`	`}`
	`108`	`+ if (challenge.userCurrentPhase === 'Appeals') {`
	`109`	`+ challenge.userAction = 'Appeal'`
	`110`	`+ }`
`108`	`111`
`109`	`112`	`if (challenge.userCurrentPhaseEndTime) {`
`110`	`113`	`var fullTime = challenge.userCurrentPhaseEndTime`