Fix Issue #104 : change link of Topcoder Logo

config/webpack/default.js

@@ -0,0 +1,5 @@
+module.exports = {
+    URL: {
+      DASH_BOARD: '/my-dashboard',
+    }
+};

config/webpack/development.js

@@ -1,10 +1,13 @@
 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, '../..'),
   entry: './src',
   library: 'navigation-component'
 })
 
-module.exports = standardConfig
+module.exports = webpackMerge.smart(standardConfig, defaultConfig)

config/webpack/production.js

@@ -1,10 +1,13 @@
+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, '../..'),
   entry: './src',
   library: 'navigation-component'
 })
 
-module.exports = standardConfig
+module.exports = webpackMerge.smart(standardConfig, defaultConfig)

src/components/TopNav/MobileNav.js

@@ -3,8 +3,9 @@ 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 = ({ 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 +16,7 @@ const MobileNav = ({ showLeftMenu, onClickLeftMenu, logo, rightMenu }) => (
         )}
       </button>
     </div>
-    <a href='/'>
+    <a href={loggedIn ? config.URL.DASH_BOARD : config.URL.BASE}>
       {logo}
     </a>
     {rightMenu && (
@@ -27,6 +28,7 @@ const MobileNav = ({ showLeftMenu, onClickLeftMenu, logo, rightMenu }) => (
 )
 
 MobileNav.propTypes = {
+  loggedIn: PropTypes.bool,
   showLeftMenu: PropTypes.bool,
   onClickLeftMenu: PropTypes.func,
   logo: PropTypes.node,

src/components/TopNav/PrimaryNav.js

@@ -5,8 +5,10 @@ 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,
   collapsed,
   showLeftMenu,
   logo,
@@ -36,7 +38,7 @@ const PrimaryNav = ({
         <a
           className={cn(styles.tcLogo, collapsed && styles.tcLogoPush)}
           onClick={onClickLogo}
-          href='/'
+          href={loggedIn ? config.URL.DASH_BOARD : config.URL.BASE}
         >
           {logo}
         </a>
@@ -119,6 +121,7 @@ const PrimaryNav = ({
 }
 
 PrimaryNav.propTypes = {
+  loggedIn: PropTypes.bool,
   collapsed: PropTypes.bool,
   showLeftMenu: PropTypes.bool,
   logo: PropTypes.node,

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}