From 40d10a8ddad69ebc18b8aaeb79717d6fbc85d68d Mon Sep 17 00:00:00 2001 From: maksimvasilevskiy <97239271+maksimvasilevskiy@users.noreply.github.com> Date: Fri, 24 Mar 2023 21:06:16 +0300 Subject: [PATCH 1/2] fix: add page links --- src/components/Footer/constants.js | 28 ++++++++++++++++------------ src/components/Header/Header.js | 15 +++++++++------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/components/Footer/constants.js b/src/components/Footer/constants.js index 680de83..63ebc55 100644 --- a/src/components/Footer/constants.js +++ b/src/components/Footer/constants.js @@ -44,9 +44,10 @@ export const NAV_ITEMS = [ { label: 'Resources', children: [ - /*{ - title: 'Blog' - },*/ + { + title: 'Blog', + href: ROUTES.BLOG + }, { title: 'Contact Sales', href: ROUTES.CONTACT_US @@ -56,9 +57,10 @@ export const NAV_ITEMS = [ { label: 'Partners', children: [ - /*{ - title: 'Become a Partner' - },*/ + { + title: 'Become a Partner', + href: ROUTES.BECOME_PARTNER + }, { title: 'Integrations', href: ROUTES.ACCOUNTING_INTEGRATION @@ -79,16 +81,18 @@ export const NAV_ITEMS = [ title: 'Careers', href: ROUTES.CAREERS }, - /*{ - title: 'Press' - }, { - title: 'Partners' + title: 'Press', + href: ROUTES.PRESS }, + /*{ + title: 'Partners' + },*/ { - title: 'Loyalty' + title: 'Loyalty', + href: ROUTES.LOYALTY }, - { + /*{ title: 'Legal' }*/ ] diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js index 2c495a2..b8202ab 100644 --- a/src/components/Header/Header.js +++ b/src/components/Header/Header.js @@ -71,18 +71,18 @@ const NAV_ITEMS = [ ], }, }, - /* { + { label: 'Solutions', - href: '#' + href: ROUTES.SOLUTIONS, }, { label: 'Pricing', - href: '#' + href: ROUTES.PRICING, }, - { + /*{ label: 'Resources', - href: '#' - }, */ + href: ROUTES.RESOURCES, + },*/ { label: "Customer Support", href: ROUTES.CUSTOMER_SUPPORT, @@ -236,6 +236,9 @@ const DesktopNav = ({ isLightHeader }) => ( fontWeight={500} fontSize="16px" lineHeight="140%" + _hover={{ + color: "#8A7BF0", + }} > {title} From 551c7e3bae675f2355c210abb4481503461587f4 Mon Sep 17 00:00:00 2001 From: maksimvasilevskiy <97239271+maksimvasilevskiy@users.noreply.github.com> Date: Fri, 24 Mar 2023 21:23:38 +0300 Subject: [PATCH 2/2] fix: search params fixed --- src/components/Forms/ContactUsForm.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Forms/ContactUsForm.jsx b/src/components/Forms/ContactUsForm.jsx index c5eced2..c261e4a 100644 --- a/src/components/Forms/ContactUsForm.jsx +++ b/src/components/Forms/ContactUsForm.jsx @@ -14,7 +14,6 @@ import { Image, Textarea, } from "@chakra-ui/core"; -import { useSearchParams } from "react-router-dom"; import { CongratulationsModal } from "../Modals"; import { FONTS, INPUT_STYLES } from "../../theme"; import { DEPARTMENT, DEPARTMENT_OPTIONS } from "../../constants/constants"; @@ -23,7 +22,7 @@ import popoverBlack from "../../images/popover-black.svg"; export const ContactUsForm = () => { const [isCongratulationsModalOpen, setIsCongratulationsModalOpen] = useState(false); const [dropdownOption, setDropdownOption] = useState({}); - const [searchParams] = useSearchParams(); + const searchParams = new URLSearchParams(window.location.search); useEffect(() => { const queryValue = searchParams.get("department");