Merge pull request #2649 from ya3ya6/feature-new-nav

Fix Issue #2396

Author: luizrrodrigues

__tests__/shared/components/Header/__snapshots__/index.jsx.snap

@@ -3,6 +3,7 @@
 exports[`Default render 1`] = `
 <div>
   <TopNav
+    loggedIn={true}
     logo={
       <Logo
         height="20"
@@ -15,6 +16,39 @@ exports[`Default render 1`] = `
       Array [
         Object {
           "id": "community",
+          "secondaryMenuForGuest": Array [
+            Object {
+              "href": "https://www.topcoder-dev.com/about",
+              "title": "Overview",
+            },
+            Object {
+              "href": "https://www.topcoder-dev.com/how-it-works/faqs/",
+              "title": "How It Works",
+            },
+            Object {
+              "href": "/community/learn",
+              "title": "Tracks",
+            },
+            Object {
+              "href": "https://www.topcoder-dev.com/about/why-crowdsourcing/",
+              "title": "Why Join",
+            },
+          ],
+          "secondaryMenuForLoggedInUser": Array [
+            Object {
+              "href": "/my-dashboard",
+              "title": "Dashboard",
+            },
+            Object {
+              "href": "/members/willFilledByUserName",
+              "id": "myprofile",
+              "title": "My Profile",
+            },
+            Object {
+              "href": "https://community.topcoder-dev.com/PactsMemberServlet?module=PaymentHistory&full_list=false",
+              "title": "Payments",
+            },
+          ],
           "subMenu": Array [
             Object {
               "subMenu": Array [
@@ -90,6 +124,7 @@ exports[`Default render 1`] = `
     }
     onChangeLevel1Id={[Function]}
     openMore={true}
+    profileHandle="huanner"
     rightMenu={
       <LoginNav
         accountMenu={
@@ -98,14 +133,6 @@ exports[`Default render 1`] = `
               "href": "/settings/profile",
               "title": "Settings",
             },
-            Object {
-              "href": "https://community.topcoder-dev.com/PactsMemberServlet?module=PaymentHistory&full_list=false",
-              "title": "Payments",
-            },
-            Object {
-              "link": null,
-              "title": "All projects",
-            },
             Object {
               "separator": true,
             },

config/default.js

@@ -217,6 +217,39 @@ module.exports = {
     {
       id: 'community', // required for 'Switch to BUSINESS' to work
       title: 'COMMUNITY',
+      secondaryMenuForLoggedInUser: [
+        {
+          title: 'Dashboard',
+          href: '/my-dashboard',
+        },
+        {
+          id: 'myprofile',
+          title: 'My Profile',
+          href: '/members/willFilledByUserName',
+        },
+        {
+          title: 'Payments',
+          href: 'https://community.topcoder-dev.com/PactsMemberServlet?module=PaymentHistory&full_list=false',
+        },
+      ],
+      secondaryMenuForGuest: [
+        {
+          title: 'Overview',
+          href: 'https://www.topcoder-dev.com/about',
+        },
+        {
+          title: 'How It Works',
+          href: 'https://www.topcoder-dev.com/how-it-works/faqs/',
+        },
+        {
+          title: 'Tracks',
+          href: '/community/learn',
+        },
+        {
+          title: 'Why Join',
+          href: 'https://www.topcoder-dev.com/about/why-crowdsourcing/',
+        },
+      ],
       subMenu: [
         {
           title: 'Compete',
@@ -298,14 +331,6 @@ module.exports = {
       title: 'Settings',
       href: '/settings/profile',
     },
-    {
-      title: 'Payments',
-      href: 'https://community.topcoder-dev.com/PactsMemberServlet?module=PaymentHistory&full_list=false',
-    },
-    {
-      title: 'All projects',
-      link: null,
-    },
     { separator: true },
     {
       title: 'Help',

config/production.js

@@ -60,6 +60,39 @@ module.exports = {
     {
       id: 'community', // required for 'Switch to BUSINESS' to work
       title: 'COMMUNITY',
+      secondaryMenuForLoggedInUser: [
+        {
+          title: 'Dashboard',
+          href: '/my-dashboard',
+        },
+        {
+          id: 'myprofile',
+          title: 'My Profile',
+          href: '/members/willFilledByUserName',
+        },
+        {
+          title: 'Payments',
+          href: 'https://community.topcoder.com/PactsMemberServlet?module=PaymentHistory&full_list=false',
+        },
+      ],
+      secondaryMenuForGuest: [
+        {
+          title: 'Overview',
+          href: 'https://www.topcoder.com/about',
+        },
+        {
+          title: 'How It Works',
+          href: 'https://www.topcoder.com/how-it-works/faqs/',
+        },
+        {
+          title: 'Tracks',
+          href: '/community/learn',
+        },
+        {
+          title: 'Why Join',
+          href: 'https://www.topcoder.com/about/why-crowdsourcing/',
+        },
+      ],
       subMenu: [
         {
           title: 'Compete',
@@ -141,14 +174,6 @@ module.exports = {
       title: 'Settings',
       href: '/settings/profile',
     },
-    {
-      title: 'Payments',
-      href: 'https://community.topcoder.com/PactsMemberServlet?module=PaymentHistory&full_list=false',
-    },
-    {
-      title: 'All projects',
-      link: null,
-    },
     { separator: true },
     {
       title: 'Help',

src/shared/components/Header/index.jsx

@@ -74,6 +74,8 @@ const Header = ({ profile }) => {
           path={path}
           openMore={openMore}
           setOpenMore={handleChangeOpenMore}
+          loggedIn={!_.isEmpty(profile)}
+          profileHandle={profile ? profile.handle : ''}
         />
       </div>
     );