diff --git a/src/components/marginals/Nav_Hero/Description.jsx b/src/components/marginals/Nav_Hero/Description.jsx index 578d8b4..7ba50a9 100644 --- a/src/components/marginals/Nav_Hero/Description.jsx +++ b/src/components/marginals/Nav_Hero/Description.jsx @@ -4,7 +4,8 @@ import { ButtonContainer, DescriptionContainer, DescriptionParagraph, - DescriptionTitle + DescriptionTitle, + PaymentButton } from './Description.styles' import { DescriptionContent } from '../../../config/index' import { ButtonWrapper } from './Description.styles' @@ -25,7 +26,13 @@ const Description = () => { {DescriptionContent.HeroButton} - {!userInfo.name && ( + {userInfo.name ? ( + + + Pay Now + + + ) : ( {DescriptionContent.RegisterButton} diff --git a/src/components/marginals/Nav_Hero/Description.styles.jsx b/src/components/marginals/Nav_Hero/Description.styles.jsx index c4addc2..a4ccda3 100644 --- a/src/components/marginals/Nav_Hero/Description.styles.jsx +++ b/src/components/marginals/Nav_Hero/Description.styles.jsx @@ -108,7 +108,33 @@ export const InnerSpan = styled.span` export const RegisterButton = styled.button` ${tw` px-2 - py-2 + py-2 + w-full + 0.4xsm:w-[140px] + rounded-[11.53px] + bg-orange-1 + text-brown-5 + font-semibold + text-1.5lg + md:text-2xl + border-brown-5 + border-2 + transition + duration-300 + ease-in-out + active:transform + active:translate-x-[3px] + active:translate-y-[3px] + active:shadow-none + shadow-[3px 3px 0px #1d1d1d ]`} +` + +export const PaymentButton = styled.button` + ${tw` + px-2 + py-2 + w-full + 0.4xsm:w-[140px] rounded-[11.53px] bg-orange-1 text-brown-5 diff --git a/src/components/marginals/Nav_Hero/Nav.jsx b/src/components/marginals/Nav_Hero/Nav.jsx index 4f4f3f1..0df566e 100644 --- a/src/components/marginals/Nav_Hero/Nav.jsx +++ b/src/components/marginals/Nav_Hero/Nav.jsx @@ -57,7 +57,6 @@ const Nav = () => { function onClick(id) { handleScroll(id) - console.log(id) handleToggle() } @@ -92,10 +91,6 @@ const Nav = () => { {userInfo.name ? ( - // - // Logout - // - setProfileOpen(true)}> @@ -115,16 +110,13 @@ const Nav = () => { {userInfo.name ? ( - // - // Logout - // ) : ( - + + Register + )} {navLinks.map((navLink) => ( diff --git a/src/components/marginals/Nav_Hero/ProfileMenu.jsx b/src/components/marginals/Nav_Hero/ProfileMenu.jsx index 3eda274..fe8f664 100644 --- a/src/components/marginals/Nav_Hero/ProfileMenu.jsx +++ b/src/components/marginals/Nav_Hero/ProfileMenu.jsx @@ -28,7 +28,6 @@ function ProfileMenu({ isProfileOpen, setProfileOpen }) { setUid(userInfo.uid) if (userDataInDb?.getUser) { setUser(userDataInDb.getUser) - // console.log(userDataInDb.getUser) } } }, [userInfo, userDataInDb, uid]) diff --git a/src/components/marginals/Nav_Hero/ProfileMenu.styles.jsx b/src/components/marginals/Nav_Hero/ProfileMenu.styles.jsx index 3639da2..bd194e8 100644 --- a/src/components/marginals/Nav_Hero/ProfileMenu.styles.jsx +++ b/src/components/marginals/Nav_Hero/ProfileMenu.styles.jsx @@ -89,10 +89,19 @@ export const ProfileDropDownItem = styled.div` export const NotRegistered = styled.div` ${tw` text-lg - text-brown-2 + bg-[#1D1D1D] + text-[#FFEEDA] + rounded-md + py-2 + px-4 font-Poppins font-[500] text-center + hover:bg-[#FFEEDA] + hover:text-[#1D1D1D] + active:scale-95 + duration-300 + ease-in-out `} ` @@ -126,3 +135,21 @@ export const LogoutButton = styled.button` active:scale-95 `} ` +export const PaymentButton = styled.button` + ${tw` + mt-5 + bg-orange-1 + text-[#FFEEDA] + rounded-md + py-2 + px-4 + cursor-pointer + font-[500] + font-Poppins + duration-300 + ease-in-out + hover:bg-[#FFEEDA] + hover:text-[#1D1D1D] + active:scale-95 + `} +` diff --git a/src/components/marginals/Nav_Hero/ProfileMenuDropDown.jsx b/src/components/marginals/Nav_Hero/ProfileMenuDropDown.jsx index 5d4a333..63bb14e 100644 --- a/src/components/marginals/Nav_Hero/ProfileMenuDropDown.jsx +++ b/src/components/marginals/Nav_Hero/ProfileMenuDropDown.jsx @@ -13,9 +13,12 @@ import { NotRegistered, ProfileDropDown, ProfileDropDownItem, - Value + Value, + PaymentButton } from './ProfileMenu.styles' +import { DescriptionContent } from '../../../config/index' + ProfileMenuDropDown.propTypes = { setProfileOpen: propTypes.func, user: propTypes.object @@ -47,6 +50,12 @@ function ProfileMenuDropDown({ setProfileOpen, user }) { {detail.value} ))} + + + {' '} + Pay Now + + Logout ) : ( diff --git a/src/components/marginals/footer/Footer.jsx b/src/components/marginals/footer/Footer.jsx index 68079c1..f13bdd3 100644 --- a/src/components/marginals/footer/Footer.jsx +++ b/src/components/marginals/footer/Footer.jsx @@ -1,7 +1,7 @@ import PropTypes from 'prop-types' -import { toast } from 'react-toastify' - +import { useState } from 'react' import footerData from '../../../config/content/footerData/Footer.js' +import Modal from '../../modal/Modal' // import React from "react"; import { AicheLogo1, @@ -39,29 +39,20 @@ RenderListItem.propTypes = { } export default function MyFooter() { + const [isModalOpen, setIsModalOpen] = useState(false) + const openModal = () => setIsModalOpen(true) + const closeModal = () => setIsModalOpen(false) function showLocation() { - toast( - -