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 2583a0c..fbc3316 100644 --- a/src/components/TopNav/MobileNav.js +++ b/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 }) => (
- + {logo} {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, diff --git a/src/components/TopNav/PrimaryNav.js b/src/components/TopNav/PrimaryNav.js index 5bf8bb5..761b608 100644 --- a/src/components/TopNav/PrimaryNav.js +++ b/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 = ({ {logo} @@ -119,6 +121,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) */}