From 6722b40c39ca8cfec7ca6c17a7546c6b4e99a380 Mon Sep 17 00:00:00 2001 From: rashmi73 Date: Mon, 23 Sep 2019 01:50:05 +0530 Subject: [PATCH 1/2] issue 3303 fix --- src/components/Footer/Footer.jsx | 6 +++--- src/components/TopBar/ProjectsToolBar.js | 10 ++-------- src/components/TopBar/TopBarContainer.js | 6 +++--- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx index 35b7d6eb4..fdc83c38a 100644 --- a/src/components/Footer/Footer.jsx +++ b/src/components/Footer/Footer.jsx @@ -10,9 +10,9 @@ 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: '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'} ] const isProjectDetails = /projects\/\d+/.test(window.location.pathname) diff --git a/src/components/TopBar/ProjectsToolBar.js b/src/components/TopBar/ProjectsToolBar.js index dd16a5585..cbce395ae 100644 --- a/src/components/TopBar/ProjectsToolBar.js +++ b/src/components/TopBar/ProjectsToolBar.js @@ -157,14 +157,8 @@ class ProjectsToolBar extends Component { 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', + text: 'Our Process', + link: 'https://www.topcoder.com/solutions/how-it-works/', target: '_blank', absolute: true } diff --git a/src/components/TopBar/TopBarContainer.js b/src/components/TopBar/TopBarContainer.js index 9165500d6..8185b85a4 100644 --- a/src/components/TopBar/TopBarContainer.js +++ b/src/components/TopBar/TopBarContainer.js @@ -106,9 +106,9 @@ class TopBarContainer extends React.Component { ] }, { 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 }, ] }, { From d5eb61108b6095f7601257ad36680e7f3ce5ed1b Mon Sep 17 00:00:00 2001 From: rashmi73 Date: Tue, 24 Sep 2019 18:59:24 +0530 Subject: [PATCH 2/2] issue 3303 patch --- src/components/Footer/Footer.jsx | 3 ++- src/components/FooterV2/FooterV2.jsx | 5 +++-- src/components/TopBar/ProjectsToolBar.js | 17 +---------------- src/components/TopBar/TopBarContainer.js | 4 ---- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx index fdc83c38a..2d463657b 100644 --- a/src/components/Footer/Footer.jsx +++ b/src/components/Footer/Footer.jsx @@ -13,7 +13,8 @@ const Footer = () => { {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: '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) diff --git a/src/components/FooterV2/FooterV2.jsx b/src/components/FooterV2/FooterV2.jsx index 0c2078f47..da84989d8 100644 --- a/src/components/FooterV2/FooterV2.jsx +++ b/src/components/FooterV2/FooterV2.jsx @@ -5,10 +5,11 @@ import './FooterV2.scss' const FooterV2 = () => (
© Topcoder { moment().format('YYYY') } diff --git a/src/components/TopBar/ProjectsToolBar.js b/src/components/TopBar/ProjectsToolBar.js index cbce395ae..909e578b2 100644 --- a/src/components/TopBar/ProjectsToolBar.js +++ b/src/components/TopBar/ProjectsToolBar.js @@ -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' @@ -151,20 +150,6 @@ class ProjectsToolBar extends Component { const onLeaveMessage = this.onLeave() || '' - const primaryNavigationItems = [ - { - text: 'My Projects', - link: '/projects' - }, - { - text: 'Our Process', - link: 'https://www.topcoder.com/solutions/how-it-works/', - target: '_blank', - absolute: true - } - ] - const menuBar = isLoggedIn && !isPowerUser && - return (
- { renderLogoSection(menuBar) } + { renderLogoSection() } { isLoggedIn && !isPowerUser &&
MY PROJECTS
} { isLoggedIn && !!isPowerUser && diff --git a/src/components/TopBar/TopBarContainer.js b/src/components/TopBar/TopBarContainer.js index 8185b85a4..b3ad647ee 100644 --- a/src/components/TopBar/TopBarContainer.js +++ b/src/components/TopBar/TopBarContainer.js @@ -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 } ] @@ -102,7 +99,6 @@ 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: [