Merge pull request #1160 from appirio-tech/dev

New listing nav changes

Author: ajefts

app/listings/listings.routes.js

@@ -27,7 +27,7 @@ import angular from 'angular'
     var states = {
       'listings': {
         parent: 'root',
-        url: '/listings/',
+        url: '/challenges/',
         resolve: {
           userHandle: ['$stateParams', function($stateParams) {
             return $stateParams.userHandle

app/services/nav.service.js

@@ -16,10 +16,10 @@ import angular from 'angular'
 
     service.menuLinks = {
       'compete': [
-          { 'href':  '/listings/', 'text': 'ALL CHALLENGES', 'icon': require('../../assets/images/nav/rocket.svg') },
-          { 'href':  '/challenges/design/active/?pageIndex=1', 'text': 'DESIGN CHALLENGES', 'icon': require('../../assets/images/nav/track-design.svg') },
-          { 'href':  '/challenges/develop/active/?pageIndex=1', 'text': 'DEVELOPMENT CHALLENGES', 'icon': require('../../assets/images/nav/track-develop.svg') },
-          { 'href':  '/challenges/data/active/?pageIndex=1', 'text': 'DATA SCIENCE CHALLENGES', 'icon': require('../../assets/images/nav/track-data.svg') },
+          { 'href':  '/challenges/', 'text': 'ALL CHALLENGES', 'icon': require('../../assets/images/nav/rocket.svg') },
+          { 'href':  '/challenges/#&tracks=design&mode=6&name=All%20Challenges', 'text': 'DESIGN CHALLENGES', 'icon': require('../../assets/images/nav/track-design.svg') },
+          { 'href':  '/challenges/#&tracks=develop&mode=6&name=All%20Challenges', 'text': 'DEVELOPMENT CHALLENGES', 'icon': require('../../assets/images/nav/track-develop.svg') },
+          { 'href':  '/challenges/#&tracks=datasci&mode=6&name=All%20Challenges', 'text': 'DATA SCIENCE CHALLENGES', 'icon': require('../../assets/images/nav/track-data.svg') },
           { 'href':  CONSTANTS.ARENA_URL, 'text': 'COMPETITIVE PROGRAMMING', 'icon': require('../../assets/images/nav/track-cp.svg'), 'target': '_blank' }
       ],
       'learn': [

app/sitemap/sitemap.jade

@@ -7,11 +7,11 @@
 
       ul
         li 
-          a(href="/challenges/design/active") Design Challenges
+          a(href="/challenges/#&tracks=develop&mode=6&name=All%20Challenges") Design Challenges
         li  
-          a(href="/challenges/develop/active") Development Challenges
+          a(href="/challenges/#&tracks=design&mode=6&name=All%20Challenges") Development Challenges
         li 
-          a(href="/challenges/data/active") Data Science Challenges
+          a(href="/challenges/#&tracks=datasci&mode=6&name=All%20Challenges") Data Science Challenges
         li 
           a(href="//arena.topcoder.com/") Single Round Matches