Skip to content

UI Improvements and Bug Fixes #34

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

Open
CynthiaWahome wants to merge 6 commits into
base: main
Choose a base branch
from
Open

UI Improvements and Bug Fixes #34

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
d169e71
[fix]:fix a typo
CynthiaWahome Oct 5, 2024
fee25bc
[feat]:Add dynamic year to footer
CynthiaWahome Oct 5, 2024
fe580e0
[fix]: Add navigation to home on logo and brand name click in Navbar
CynthiaWahome Oct 5, 2024
3929add
[style]: update text color to white in Offers component
CynthiaWahome Oct 5, 2024
124a3e8
[style]: Adjust 'Check Now' button to 'Latest Collection' button
CynthiaWahome Oct 5, 2024
0c8f1c2
Merge branch 'main' into v1
CynthiaWahome Oct 13, 2024
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
2 changes: 1 addition & 1 deletion src/components/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const Footer = () => {
<div className='flex flex-col items-center gap-6 w-full mb-8 text-[#1a1a1a] text-base md:text-lg'>
<div className="w-[90%] md:w-[80%] h-[3px] bg-[#57697b99] mt-6"></div>
<hr className='w-[90%] md:w-[80%] border-none rounded-[10px] h-[3px] text-[#000000cc]' />
<p className='text-center'>Copyright @ 2024 - All Right Reserved</p>
<p className='text-center'>© {new Date().getFullYear()} - All Rights Reserved</p>
</div>
</div>
);
Expand Down
116 changes: 0 additions & 116 deletions src/components/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,122 +21,6 @@ const Navbar = () => {
setIsMenuOpen(false);
};

return (
<div className="navbar fixed top-0 left-0 w-full flex justify-between items-center p-4 shadow-md bg-white z-50">
<div className="flex items-center gap-2">
<img className="w-10" src={logo} alt="Logo" />
<p className="text- text-lg md:text-2xl font-semibold">
Shopper's Stop
</p>
</div>

<img
className="block md:hidden w-8 cursor-pointer"
src={ham}
onClick={toggleMenu}
alt="Menu"
/>

{isMenuOpen && (
<div
className="fixed inset-0 bg-black bg-opacity-50 z-50"
onClick={closeMenu}
>
<ul
ref={menuRef}
className="absolute top-0 left-0 right-0 bg-white p-4 flex flex-col gap-4 text-lg font-medium text-[#626262] z-50"
onClick={(e) => e.stopPropagation()}
>
<li
onClick={() => {
setMenu("shop");
closeMenu();
}}
>
<Link to="/">Shop</Link>
{menu === "shop" && (
<hr className="w-4/5 h-1 rounded-sm bg-[#FF4141]" />
)}
</li>
<li
onClick={() => {
setMenu("men");
closeMenu();
}}
>
<Link to="/men">Men</Link>
{menu === "men" && (
<hr className="w-4/5 h-1 rounded-sm bg-[#FF4141]" />
)}
</li>
<li
onClick={() => {
setMenu("kids");
closeMenu();
}}
>
<Link to="/kids">Kids</Link>
{menu === "kids" && (
<hr className="w-4/5 h-1 rounded-sm bg-[#FF4141]" />
)}
</li>
<li
onClick={() => {
setMenu("women");
closeMenu();
}}
>
<Link to="/women">Women</Link>
{menu === "women" && (
<hr className="w-4/5 h-1 rounded-sm bg-[#FF4141]" />
)}
</li>
<li>
<Link to="/login">
<button className="w-full rounded-[8px] bg-[#399bfd] py-[8px] text- font-medium">
Login
</button>
</Link>
</li>
</ul>
</div>
)}

<div className="hidden md:flex items-center gap-6">
<div className="flex gap-6">
<DarkModeToggle/>
<Link to="/">
<button
onClick={() => setMenu("shop")}
className={`text- ${menu === "shop" ? "font-bold" : ""} hover:bg-black hover:text-white`}
>
Shop
</button>
</Link>
<Link to="/men">
<button
onClick={() => setMenu("men")}
className={`text- ${menu === "men" ? "font-bold" : ""}hover:bg-black hover:text-white`}
>
Men
</button>
</Link>
<Link to="/kids">
<button
onClick={() => setMenu("kids")}
className={`text- ${menu === "kids" ? "font-bold" : ""}hover:bg-black hover:text-white`}
>
Kids
</button>
</Link>
<Link to="/women">
<button
onClick={() => setMenu("women")}
className={`text- ${menu === "women" ? "font-bold" : ""}hover:bg-black hover:text-white`}
>
Women
</button>
</Link>
</div>
<Link to="/login">
<button className="px-4 py-2 bg-transparent text- font-semibold rounded-lg border border-gray-400 hover:bg-black hover:text-white transition duration-300 ease-in-out">
Expand Down
8 changes: 4 additions & 4 deletions src/components/Offers.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ const Offers = () => {
return (
<div className='offers w-full h-auto flex flex-col md:flex-row mt-12 mx-0 mb-36 bg-gradient-to-r from-[#5A585A] to-[#090947] p-5 md:p-20'>
<div className='offer-left flex flex-1 flex-col justify-center'>
<h1 className='text-[#171717] text-5xl md:text-[80px] font-bold'>Exclusive</h1>
<h1 className='text-[#171717] text-xl md:text-[22px] font-bold'>Offers for you</h1>
<p className='text-base'>ONLY ON BEST SELLER PRODUCTS</p>
<button className='w-[282px] h-[70px] rounded-full bg-[#ff4141] text-white text-xl mt-6 cursor-pointer'>
<h1 className='text-[#ffffff] text-5xl md:text-[80px] font-bold'>Exclusive</h1>
<h1 className='text-[#ffffff] text-xl md:text-[22px] font-bold'>Offers for you</h1>
<p className='text-[#ffffff]'>ONLY ON BEST SELLER PRODUCTS</p>
<button className='flex justify-center items-center gap-[15px] w-[300px] h-[70px] rounded-full text-white border-black bg-[#D2042D] hover:bg-black mt-[30px] text-[18px] font-large'>
Check Now
</button>
</div>
Expand Down