Skip to content

Issue 3303 fix #3328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxceem merged 6 commits into from
Sep 24, 2019
Merged

Issue 3303 fix #3328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9002431
Merge pull request #5 from appirio-tech/cf19
rashmi73 Sep 19, 2019
1e82f3a
Merge pull request #6 from appirio-tech/cf19
rashmi73 Sep 21, 2019
bd5baf3
Merge pull request #7 from appirio-tech/cf19
rashmi73 Sep 22, 2019
cde6979
Merge pull request #8 from appirio-tech/cf19
rashmi73 Sep 22, 2019
6722b40
issue 3303 fix
rashmi73 Sep 22, 2019
d5eb611
issue 3303 patch
rashmi73 Sep 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/components/Footer/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ require('./Footer.scss')
const Footer = () => {
const currentYear = moment().format('YYYY')
const otherNavigationItems = [
{img: '', text: 'About', link: 'https://www.topcoder.com/about/', target: '_blank'},
{img: '', text: 'Contact us', link: 'https://www.topcoder.com/contact/', target: '_blank'},
{img: '', text: 'Privacy', link: 'https://www.topcoder.com/community/how-it-works/privacy-policy/', target: '_blank'},
{img: '', text: 'Terms', link: 'https://connect.topcoder.com/terms', target: '_blank'}
{img: '', text: 'About', link: 'https://www.topcoder.com/company/', target: '_blank'},
{img: '', text: 'Contact us', link: 'https://www.topcoder.com/contact-us/', target: '_blank'},
{img: '', text: 'Privacy', link: 'https://www.topcoder.com/privacy-policy/', target: '_blank'},
{img: '', text: 'Terms', link: 'https://connect.topcoder.com/terms', target: '_blank'},
{img: '', text: 'Our Process', link: 'https://www.topcoder.com/solutions/how-it-works/', target: '_blank'}
]
const isProjectDetails = /projects\/\d+/.test(window.location.pathname)
const isCreateProject = window.location.pathname.startsWith(NEW_PROJECT_PATH)
Expand Down
5 changes: 3 additions & 2 deletions src/components/FooterV2/FooterV2.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import './FooterV2.scss'
const FooterV2 = () => (
<div className="footer-v2">
<ul className="footer-links">
<li><a href="https://www.topcoder.com/about/" target="_blank">About</a></li>
<li><a href="https://www.topcoder.com/contact/" target="_blank">Contact us</a></li>
<li><a href="https://www.topcoder.com/company/" target="_blank">About</a></li>
<li><a href="https://www.topcoder.com/contact-us/" target="_blank">Contact us</a></li>
<li><a href="https://www.topcoder.com/community/how-it-works/privacy-policy/" target="_blank">Privacy</a></li>
<li><a href="https://connect.topcoder.com/terms" target="_blank">Terms</a></li>
<li><a href="https://www.topcoder.com/solutions/how-it-works/" target="_blank">Our Process</a></li>
</ul>
<div className="footer-copyright">
© Topcoder { moment().format('YYYY') }
Expand Down
23 changes: 1 addition & 22 deletions src/components/TopBar/ProjectsToolBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { withRouter, Prompt } from 'react-router-dom'
import { connect } from 'react-redux'
import _ from 'lodash'
import SearchBar from 'appirio-tech-react-components/components/SearchBar/SearchBar'
import MenuBar from 'appirio-tech-react-components/components/MenuBar/MenuBar'
import NotificationsDropdown from '../NotificationsDropdown/NotificationsDropdownContainer'
import NewProjectNavLink from './NewProjectNavLink'
import MobileMenu from '../MobileMenu/MobileMenu'
Expand Down Expand Up @@ -151,34 +150,14 @@ class ProjectsToolBar extends Component {

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

const primaryNavigationItems = [
{
text: 'My Projects',
link: '/projects'
},
{
text: 'Getting Started',
link: 'https://www.topcoder.com/about-topcoder/connect/',
target: '_blank',
absolute: true
},
{
text: 'Help',
link: 'https://help.topcoder.com/hc/en-us/articles/225540188-Topcoder-Connect-FAQs',
target: '_blank',
absolute: true
}
]
const menuBar = isLoggedIn && !isPowerUser && <MenuBar mobileBreakPoint={767} items={primaryNavigationItems} orientation="horizontal" forReactRouter />

return (
<div className="ProjectsToolBar">
<Prompt
when={!!onLeaveMessage}
message={onLeaveMessage}
/>
<div className="primary-toolbar">
{ renderLogoSection(menuBar) }
{ renderLogoSection() }
{ isLoggedIn && !isPowerUser && <div className="projects-title-mobile">MY PROJECTS</div> }
{
isLoggedIn && !!isPowerUser &&
Expand Down
10 changes: 3 additions & 7 deletions src/components/TopBar/TopBarContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ class TopBarContainer extends React.Component {
{ label: 'Account and security', link: '/settings/account' },
{ label: 'Notification settings', link: '/settings/notifications' },
],
[
{ label: 'Help', link: 'https://help.topcoder.com/hc/en-us', absolute: true, id: 0 }
],
[
{ label: 'Log out', onClick: logoutClick, absolute: true, id: 0 }
]
Expand All @@ -102,13 +99,12 @@ class TopBarContainer extends React.Component {
{ label: 'My profile', link: '/settings/profile' },
{ label: 'Account and security', link: '/settings/account' },
{ label: 'Notification settings', link: '/settings/notifications' },
{ label: 'Help', link: 'https://help.topcoder.com/hc/en-us', absolute: true },
]
}, {
items: [
{ label: 'About', link: 'https://www.topcoder.com/about/', absolute: true },
{ label: 'Contact us', link: 'https://www.topcoder.com/contact/', absolute: true },
{ label: 'Privacy', link: 'https://www.topcoder.com/community/how-it-works/privacy-policy/', absolute: true },
{ label: 'About', link: 'https://www.topcoder.com/company/', absolute: true },
{ label: 'Contact us', link: 'https://www.topcoder.com/contact-us/', absolute: true },
{ label: 'Privacy', link: 'https://www.topcoder.com/privacy-policy/', absolute: true },
{ label: 'Terms', link: 'https://connect.topcoder.com/terms', absolute: true },
]
}, {
Expand Down