Skip to content

Commit a88b4fc

Browse files
authored
Merge pull request #3328 from rashmi73/issue_3303
Issue #3303 fix
2 parents 082a49f + d5eb611 commit a88b4fc

File tree

4 files changed

+12
-35
lines changed

4 files changed

+12
-35
lines changed

src/components/Footer/Footer.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ require('./Footer.scss')
1010
const Footer = () => {
1111
const currentYear = moment().format('YYYY')
1212
const otherNavigationItems = [
13-
{img: '', text: 'About', link: 'https://www.topcoder.com/about/', target: '_blank'},
14-
{img: '', text: 'Contact us', link: 'https://www.topcoder.com/contact/', target: '_blank'},
15-
{img: '', text: 'Privacy', link: 'https://www.topcoder.com/community/how-it-works/privacy-policy/', target: '_blank'},
16-
{img: '', text: 'Terms', link: 'https://connect.topcoder.com/terms', target: '_blank'}
13+
{img: '', text: 'About', link: 'https://www.topcoder.com/company/', target: '_blank'},
14+
{img: '', text: 'Contact us', link: 'https://www.topcoder.com/contact-us/', target: '_blank'},
15+
{img: '', text: 'Privacy', link: 'https://www.topcoder.com/privacy-policy/', target: '_blank'},
16+
{img: '', text: 'Terms', link: 'https://connect.topcoder.com/terms', target: '_blank'},
17+
{img: '', text: 'Our Process', link: 'https://www.topcoder.com/solutions/how-it-works/', target: '_blank'}
1718
]
1819
const isProjectDetails = /projects\/\d+/.test(window.location.pathname)
1920
const isCreateProject = window.location.pathname.startsWith(NEW_PROJECT_PATH)

src/components/FooterV2/FooterV2.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import './FooterV2.scss'
55
const FooterV2 = () => (
66
<div className="footer-v2">
77
<ul className="footer-links">
8-
<li><a href="https://www.topcoder.com/about/" target="_blank">About</a></li>
9-
<li><a href="https://www.topcoder.com/contact/" target="_blank">Contact us</a></li>
8+
<li><a href="https://www.topcoder.com/company/" target="_blank">About</a></li>
9+
<li><a href="https://www.topcoder.com/contact-us/" target="_blank">Contact us</a></li>
1010
<li><a href="https://www.topcoder.com/community/how-it-works/privacy-policy/" target="_blank">Privacy</a></li>
1111
<li><a href="https://connect.topcoder.com/terms" target="_blank">Terms</a></li>
12+
<li><a href="https://www.topcoder.com/solutions/how-it-works/" target="_blank">Our Process</a></li>
1213
</ul>
1314
<div className="footer-copyright">
1415
© Topcoder { moment().format('YYYY') }

src/components/TopBar/ProjectsToolBar.js

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { withRouter, Prompt } from 'react-router-dom'
77
import { connect } from 'react-redux'
88
import _ from 'lodash'
99
import SearchBar from 'appirio-tech-react-components/components/SearchBar/SearchBar'
10-
import MenuBar from 'appirio-tech-react-components/components/MenuBar/MenuBar'
1110
import NotificationsDropdown from '../NotificationsDropdown/NotificationsDropdownContainer'
1211
import NewProjectNavLink from './NewProjectNavLink'
1312
import MobileMenu from '../MobileMenu/MobileMenu'
@@ -151,34 +150,14 @@ class ProjectsToolBar extends Component {
151150

152151
const onLeaveMessage = this.onLeave() || ''
153152

154-
const primaryNavigationItems = [
155-
{
156-
text: 'My Projects',
157-
link: '/projects'
158-
},
159-
{
160-
text: 'Getting Started',
161-
link: 'https://www.topcoder.com/about-topcoder/connect/',
162-
target: '_blank',
163-
absolute: true
164-
},
165-
{
166-
text: 'Help',
167-
link: 'https://help.topcoder.com/hc/en-us/articles/225540188-Topcoder-Connect-FAQs',
168-
target: '_blank',
169-
absolute: true
170-
}
171-
]
172-
const menuBar = isLoggedIn && !isPowerUser && <MenuBar mobileBreakPoint={767} items={primaryNavigationItems} orientation="horizontal" forReactRouter />
173-
174153
return (
175154
<div className="ProjectsToolBar">
176155
<Prompt
177156
when={!!onLeaveMessage}
178157
message={onLeaveMessage}
179158
/>
180159
<div className="primary-toolbar">
181-
{ renderLogoSection(menuBar) }
160+
{ renderLogoSection() }
182161
{ isLoggedIn && !isPowerUser && <div className="projects-title-mobile">MY PROJECTS</div> }
183162
{
184163
isLoggedIn && !!isPowerUser &&

src/components/TopBar/TopBarContainer.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ class TopBarContainer extends React.Component {
8686
{ label: 'Account and security', link: '/settings/account' },
8787
{ label: 'Notification settings', link: '/settings/notifications' },
8888
],
89-
[
90-
{ label: 'Help', link: 'https://help.topcoder.com/hc/en-us', absolute: true, id: 0 }
91-
],
9289
[
9390
{ label: 'Log out', onClick: logoutClick, absolute: true, id: 0 }
9491
]
@@ -102,13 +99,12 @@ class TopBarContainer extends React.Component {
10299
{ label: 'My profile', link: '/settings/profile' },
103100
{ label: 'Account and security', link: '/settings/account' },
104101
{ label: 'Notification settings', link: '/settings/notifications' },
105-
{ label: 'Help', link: 'https://help.topcoder.com/hc/en-us', absolute: true },
106102
]
107103
}, {
108104
items: [
109-
{ label: 'About', link: 'https://www.topcoder.com/about/', absolute: true },
110-
{ label: 'Contact us', link: 'https://www.topcoder.com/contact/', absolute: true },
111-
{ label: 'Privacy', link: 'https://www.topcoder.com/community/how-it-works/privacy-policy/', absolute: true },
105+
{ label: 'About', link: 'https://www.topcoder.com/company/', absolute: true },
106+
{ label: 'Contact us', link: 'https://www.topcoder.com/contact-us/', absolute: true },
107+
{ label: 'Privacy', link: 'https://www.topcoder.com/privacy-policy/', absolute: true },
112108
{ label: 'Terms', link: 'https://connect.topcoder.com/terms', absolute: true },
113109
]
114110
}, {

0 commit comments

Comments
 (0)