Skip to content

Commit e9dc59a

Browse files
Merge pull request #125 from gets0ul/issue_104
Fix for Issue #104 - Logo Link
2 parents 4323bb0 + 47c8337 commit e9dc59a

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/components/TopNav/MobileNav.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import IconMenu from '../../assets/images/icon-menu.svg'
66
import IconMagnifyingGlass from '../../assets/images/magnifying_glass.svg'
77
import { config } from 'topcoder-react-utils'
88

9-
const MobileNav = ({ showLeftMenu, onClickLeftMenu, logo, rightMenu }) => (<div>
9+
const MobileNav = ({ showLeftMenu, onClickLeftMenu, logo, onClickLogo, rightMenu }) => (<div>
1010
<div className={styles.mobileNav}>
1111
<div className={styles.leftMenuContainer}>
1212
<button className={styles.menuBtn} onClick={onClickLeftMenu}>
@@ -17,7 +17,9 @@ const MobileNav = ({ showLeftMenu, onClickLeftMenu, logo, rightMenu }) => (<div>
1717
)}
1818
</button>
1919
</div>
20-
<a href='/'>
20+
<a
21+
onClick={(e) => onClickLogo(e)}
22+
href='/'>
2123
{logo}
2224
</a>
2325
{rightMenu && (
@@ -49,6 +51,7 @@ MobileNav.propTypes = {
4951
showLeftMenu: PropTypes.bool,
5052
onClickLeftMenu: PropTypes.func,
5153
logo: PropTypes.node,
54+
onClickLogo: PropTypes.func,
5255
rightMenu: PropTypes.node
5356
}
5457

src/components/TopNav/PrimaryNav.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const PrimaryNav = ({
4545
<div className={styles.primaryNav} ref={createSetRef('primaryNav')}>
4646
<a
4747
className={cn(styles.tcLogo, collapsed && styles.tcLogoPush)}
48-
onClick={onClickLogo}
48+
onClick={(e) => onClickLogo(e)}
4949
href='/'
5050
>
5151
{logo}

src/components/TopNav/index.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React, { useState, useMemo, useEffect, useLayoutEffect, useCallback } fro
22
import PropTypes from 'prop-types'
33
import cn from 'classnames'
44
import _ from 'lodash'
5+
import { config } from 'topcoder-react-utils'
56

67
import styles from './index.module.scss'
78

@@ -179,8 +180,9 @@ const TopNav = ({
179180
}, 0)
180181
}
181182

182-
const handleClickLogo = () => {
183-
183+
const handleClickLogo = (e) => {
184+
e.preventDefault()
185+
window.location = loggedIn ? config.URL.HOME : config.URL.BASE
184186
}
185187

186188
const expandMenu = (menuId, menu2Id) => {
@@ -484,6 +486,7 @@ const TopNav = ({
484486
<MobileNav
485487
showLeftMenu={showLeftMenu}
486488
logo={logo}
489+
onClickLogo={handleClickLogo}
487490
rightMenu={rightMenu}
488491
onClickLeftMenu={handleClickLeftMenu}
489492
/>

0 commit comments

Comments
 (0)