From 461b1301bacf5ed5032d39f5fdb5ee36a6d68171 Mon Sep 17 00:00:00 2001
From: Nahid Mahbub <nahidshahin@yahoo.com>
Date: Sat, 11 Jan 2020 10:01:38 +0600
Subject: [PATCH 1/2] change link of Topcoder Logo

---
 src/components/TopNav/MobileNav.js  | 5 +++--
 src/components/TopNav/PrimaryNav.js | 4 +++-
 src/components/TopNav/index.js      | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/TopNav/MobileNav.js b/src/components/TopNav/MobileNav.js
index 2583a0c..9e5b87c 100644
--- a/src/components/TopNav/MobileNav.js
+++ b/src/components/TopNav/MobileNav.js
@@ -4,7 +4,7 @@ import styles from './MobileNav.module.scss'
 import IconClose from '../../assets/images/icon-close.svg'
 import IconMenu from '../../assets/images/icon-menu.svg'
 
-const MobileNav = ({ showLeftMenu, onClickLeftMenu, logo, rightMenu }) => (
+const MobileNav = ({ loggedIn, showLeftMenu, onClickLeftMenu, logo, rightMenu }) => (
   <div className={styles.mobileNav}>
     <div className={styles.leftMenuContainer}>
       <button className={styles.menuBtn} onClick={onClickLeftMenu}>
@@ -15,7 +15,7 @@ const MobileNav = ({ showLeftMenu, onClickLeftMenu, logo, rightMenu }) => (
         )}
       </button>
     </div>
-    <a href='/'>
+    <a href={loggedIn ? '/my-dashboard' : '/'}>
       {logo}
     </a>
     {rightMenu && (
@@ -27,6 +27,7 @@ const MobileNav = ({ showLeftMenu, onClickLeftMenu, logo, rightMenu }) => (
 )
 
 MobileNav.propTypes = {
+  loggedIn: PropTypes.bool,
   showLeftMenu: PropTypes.bool,
   onClickLeftMenu: PropTypes.func,
   logo: PropTypes.node,
diff --git a/src/components/TopNav/PrimaryNav.js b/src/components/TopNav/PrimaryNav.js
index 5bf8bb5..c7ecc17 100644
--- a/src/components/TopNav/PrimaryNav.js
+++ b/src/components/TopNav/PrimaryNav.js
@@ -7,6 +7,7 @@ import IconArrowSmalldown from '../../assets/images/arrow-small-down.svg'
 import styles from './PrimaryNav.module.scss'
 
 const PrimaryNav = ({
+  loggedIn,
   collapsed,
   showLeftMenu,
   logo,
@@ -36,7 +37,7 @@ const PrimaryNav = ({
         <a
           className={cn(styles.tcLogo, collapsed && styles.tcLogoPush)}
           onClick={onClickLogo}
-          href='/'
+          href={loggedIn ? '/my-dashboard' : '/'}
         >
           {logo}
         </a>
@@ -119,6 +120,7 @@ const PrimaryNav = ({
 }
 
 PrimaryNav.propTypes = {
+  loggedIn: PropTypes.bool,
   collapsed: PropTypes.bool,
   showLeftMenu: PropTypes.bool,
   logo: PropTypes.node,
diff --git a/src/components/TopNav/index.js b/src/components/TopNav/index.js
index 3552369..c9604b5 100644
--- a/src/components/TopNav/index.js
+++ b/src/components/TopNav/index.js
@@ -433,6 +433,7 @@ const TopNav = ({
 
         {/* Primary navigation (level 1 and level 2 menu) */}
         <PrimaryNav
+          loggedIn={loggedIn}
           collapsed={collapsed}
           showLeftMenu={showLeftMenu}
           logo={logo}

From f7cf8b81d7c39c785b6adfcd7d9369f4705ac66a Mon Sep 17 00:00:00 2001
From: Nahid Mahbub <nahidshahin@yahoo.com>
Date: Thu, 16 Jan 2020 00:05:25 +0600
Subject: [PATCH 2/2] Addressed feedback: added config variable

---
 config/webpack/default.js           | 5 +++++
 config/webpack/development.js       | 5 ++++-
 config/webpack/production.js        | 5 ++++-
 src/components/TopNav/MobileNav.js  | 3 ++-
 src/components/TopNav/PrimaryNav.js | 3 ++-
 5 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 config/webpack/default.js

diff --git a/config/webpack/default.js b/config/webpack/default.js
new file mode 100644
index 0000000..ad20a75
--- /dev/null
+++ b/config/webpack/default.js
@@ -0,0 +1,5 @@
+module.exports = {
+    URL: {
+      DASH_BOARD: '/my-dashboard',
+    }
+};
diff --git a/config/webpack/development.js b/config/webpack/development.js
index c0b434b..a7a1f75 100644
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -1,5 +1,8 @@
 const configFactory = require('./lib-development')
 const path = require('path')
+const webpackMerge = require('webpack-merge')
+
+const defaultConfig = require('./default');
 
 const standardConfig = configFactory({
   context: path.resolve(__dirname, '../..'),
@@ -7,4 +10,4 @@ const standardConfig = configFactory({
   library: 'navigation-component'
 })
 
-module.exports = standardConfig
+module.exports = webpackMerge.smart(standardConfig, defaultConfig)
diff --git a/config/webpack/production.js b/config/webpack/production.js
index 03f1575..4878cb4 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -1,5 +1,8 @@
+const webpackMerge = require('webpack-merge') // eslint-disable-line import/no-extraneous-dependencies
+
 const configFactory = require('./lib-production')
 const path = require('path')
+const defaultConfig = require('./default')
 
 const standardConfig = configFactory({
   context: path.resolve(__dirname, '../..'),
@@ -7,4 +10,4 @@ const standardConfig = configFactory({
   library: 'navigation-component'
 })
 
-module.exports = standardConfig
+module.exports = webpackMerge.smart(standardConfig, defaultConfig)
diff --git a/src/components/TopNav/MobileNav.js b/src/components/TopNav/MobileNav.js
index 9e5b87c..fbc3316 100644
--- a/src/components/TopNav/MobileNav.js
+++ b/src/components/TopNav/MobileNav.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
 import styles from './MobileNav.module.scss'
 import IconClose from '../../assets/images/icon-close.svg'
 import IconMenu from '../../assets/images/icon-menu.svg'
+import { config } from 'topcoder-react-utils'
 
 const MobileNav = ({ loggedIn, showLeftMenu, onClickLeftMenu, logo, rightMenu }) => (
   <div className={styles.mobileNav}>
@@ -15,7 +16,7 @@ const MobileNav = ({ loggedIn, showLeftMenu, onClickLeftMenu, logo, rightMenu })
         )}
       </button>
     </div>
-    <a href={loggedIn ? '/my-dashboard' : '/'}>
+    <a href={loggedIn ? config.URL.DASH_BOARD : config.URL.BASE}>
       {logo}
     </a>
     {rightMenu && (
diff --git a/src/components/TopNav/PrimaryNav.js b/src/components/TopNav/PrimaryNav.js
index c7ecc17..761b608 100644
--- a/src/components/TopNav/PrimaryNav.js
+++ b/src/components/TopNav/PrimaryNav.js
@@ -5,6 +5,7 @@ import ResizeDetector from 'react-resize-detector'
 import ChosenArrow from '../ChosenArrow'
 import IconArrowSmalldown from '../../assets/images/arrow-small-down.svg'
 import styles from './PrimaryNav.module.scss'
+import { config } from 'topcoder-react-utils'
 
 const PrimaryNav = ({
   loggedIn,
@@ -37,7 +38,7 @@ const PrimaryNav = ({
         <a
           className={cn(styles.tcLogo, collapsed && styles.tcLogoPush)}
           onClick={onClickLogo}
-          href={loggedIn ? '/my-dashboard' : '/'}
+          href={loggedIn ? config.URL.DASH_BOARD : config.URL.BASE}
         >
           {logo}
         </a>