Skip to content

adding navigation bar changes - similar to apple #171

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

adding navigation bar changes - similar to apple #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79b5797
adding navigation bar changes - similar to apple
jlang61 Feb 25, 2025
60d37c9
adding lower case, editing home photo, making dark grey
jlang61 Feb 25, 2025
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 app/calendar/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const page = () => {
<div>
<div className="bg-gray-100">
<div className="text-center justify-center mx-4 lg:mx-16 pt-4">
<h1>Upcoming Events!</h1>
{/* <h1>Upcoming Events!</h1> */}
<div className="flex justify-center">
<Iframe
url="https://calendar.google.com/calendar/embed?src=7hptoesel85ltt2ndeg0dtptec%40group.calendar.google.com&ctz=America%2FLos_Angeles"
Expand Down
2 changes: 1 addition & 1 deletion app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default function RootLayout({
<html lang="en">
<body className={inter.className}>
{" "}
<Header title="UCSB TASA"></Header>
{/* <Header title="UCSB TASA"></Header> */}
<NavBar />
{children}
<SpeedInsights />
Expand Down
1 change: 1 addition & 0 deletions components/galleryYearSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const GalleryYearSection = ({
<Image
src={image.imageUrl}
alt={image.title}
fill
className="absolute inset-0 w-full h-full object-cover"
loading={p === "high" ? "eager" : "lazy"} // High priority images load eagerly
/>
Expand Down
4 changes: 2 additions & 2 deletions components/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ const Main = () => {
/>
<div className="absolute inset-0 flex items-center justify-center text-center text-white">
<div className="relative z-10">
<h1 className="text-4xl font-semibold mb-4 uppercase">
TAIWANESE AMERICAN STUDENT ASSOCIATION
<h1 className="text-4xl font-semibold mb-4 lowercase">
taiwanese american student association
</h1>
</div>
</div>
Expand Down
214 changes: 123 additions & 91 deletions components/navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,28 @@

import Image from "next/image";
import Link from "next/link";

import { AiOutlineClose, AiOutlineMenu, AiOutlineMail } from "react-icons/ai";
import { FaInstagram } from "react-icons/fa";
import { SiLinktree } from "react-icons/si";
import { useState, useEffect, useRef } from "react";
import {
AiOutlineMenu,
AiOutlineClose,
AiOutlineShoppingCart,
} from "react-icons/ai";
import navLinks from "@/data/navbar";
import moreNavLinks from "@/data/moreNavbar";

const NavBar = () => {
const [nav, setNav] = useState(true);
export default function NavBar() {
const [navOpen, setNavOpen] = useState(false);
const navRef = useRef<HTMLDivElement>(null);

// Handle clicking outside the menu to close it
useEffect(() => {
function handleClickOutside(event: MouseEvent) {
if (navRef.current && !navRef.current.contains(event.target as Node)) {
setNav(true);
setNavOpen(false);
}
}

if (!nav) {
if (navOpen) {
document.addEventListener("mousedown", handleClickOutside);
} else {
document.removeEventListener("mousedown", handleClickOutside);
Expand All @@ -29,101 +32,130 @@ const NavBar = () => {
return () => {
document.removeEventListener("mousedown", handleClickOutside);
};
}, [nav]);

const handleNav = () => {
setNav(!nav);
};
}, [navOpen]);

return (
<div className="w-full z-10 lg:pt-4 lg:pb-6 border-b border-black lg:px-8 dark:border-slate-300/10 h-[0px] p-0 m-0 lg:mx-0">
<div className="flex justify-center items-center w-full lg:h-full px-2 2xl:px-16 h-[0px] p-0 m-0">
<div className="h-6 overflow-y-hidden">
<ul className="hidden lg:flex">
{navLinks.map((link) => (
<li
key={link.href}
className="text-black ml-10 text-sm uppercase hover:border-pink hover:border-b-4"
>
<Link href={link.href}>{link.name}</Link>
<nav className="w-full h-14 bg-[#1F1F1F] text-white flex items-center justify-between px-6 md:px-8 sticky top-0 z-50">
{/* Left: Logo */}
<div className="flex items-center">
<Link href="/">
<Image
src="/logo.jpeg"
alt="TASA Logo"
width={40}
height={40}
className="cursor-pointer"
/>
</Link>
</div>

{/* Center: Desktop Navigation Links */}
<ul className="hidden lg:flex space-x-6 text-lg ml-auto mr-12">
{navLinks.map((link) => (
<li key={link.href}>
<Link href={link.href} className="hover:opacity-80 px-4">
{link.name}
</Link>
</li>
))}
<li className="relative group">
<span className="hover:opacity-80 px-4 rounded-lg cursor-pointer">
more
</span>
<ul className="absolute left-0 mt-2 w-32 bg-white text-black shadow-lg rounded-lg group-hover:rounded-lg opacity-0 group-hover:opacity-100 transition-all duration-300">
{moreNavLinks.map((link) => (
<li key={link.href}>
<Link
href={link.href}
className="block px-2 py-2 hover:bg-gray-200"
>
{link.name}
</Link>
</li>
))}
</ul>
<div
onClick={handleNav}
className="lg:hidden absolute top-0 left-0 mt-4 ml-8 sm:mt-8"
>
<AiOutlineMenu size={25} />
</div>
</div>
</li>
</ul>

{/* Right: Cart Icon */}
<div className="hidden lg:flex items-center space-x-4">
<Link href="/store">
<AiOutlineShoppingCart
className="cursor-pointer hover:opacity-80"
size={20}
/>
</Link>
</div>

{/* Mobile Menu Toggle */}
<div className="lg:hidden">
<button onClick={() => setNavOpen(true)}>
<AiOutlineMenu size={25} />
</button>
</div>

{/* Mobile Menu Drawer */}
<div
className={
!nav
? "lg:hidden fixed left-0 top-0 w-full h-[110vh] bg-black/70 z-50"
: ""
}
className={`fixed inset-0 bg-black/70 z-50 transition-opacity duration-300 ${
navOpen ? "opacity-100 visible" : "opacity-0 invisible"
}`}
>
<div
ref={navRef}
className={
!nav
? "fixed overflow-y-scroll left-0 top-0 w-[75%] sm:w-[60%] lg:w-[45%] h-[110vh] bg-[#ecf0f3] p-10 ease-in duration-500 z-50"
: "fixed overflow-y-scroll left-[-100%] top-0 w-[75%] sm:w-[60%] lg:w-[45%] h-[110vh] bg-[#ecf0f3] p-10 ease-in duration-500 z-50"
}
className={`fixed top-0 left-0 w-[75%] sm:w-[60%] md:w-[45%] h-full bg-gray-900 p-6 transition-transform duration-300 ${
navOpen ? "translate-x-0" : "-translate-x-full"
}`}
>
<div className="">
<div className="flex w-full justify-between items-center">
<Image
src="/logo.jpeg"
alt="/"
width={87}
height={87}
className="rounded-lg"
></Image>
<div
onClick={handleNav}
className="rounded-full shadow-lg shadow-gray-400 p-3 cursor-pointer"
>
<AiOutlineClose></AiOutlineClose>
</div>
</div>
<div className="py-4 flex flex-col">
<ul className="uppercase">
{navLinks.map((link) => (
<li key={link.href} className="py-4 text-md">
<Link href={link.href}>{link.name}</Link>
</li>
))}
</ul>
<div className="p-3">
<p className="uppercase tracking-widest text-[#5651e5]">
Socials!
</p>
<div className="flex items-center justify-between p-3 my-4 w-full sm:w-[80%]">
<Link href="https://www.instagram.com/tasa.ucsb/" target="_">
<div className="rounded-full shadow-lg shadow-gray-400 p-3 cursor-pointer hover:scale-105 ease-in duration-300">
<FaInstagram />
</div>
</Link>
<Link href="https://linktr.ee/tasaucsb" target="_">
<div className="rounded-full shadow-lg shadow-gray-400 p-3 cursor-pointer hover:scale-105 ease-in duration-300">
<SiLinktree />
</div>
</Link>
<Link href="mailto:[email protected]" target="_">
<div className="rounded-full shadow-lg shadow-gray-400 p-3 cursor-pointer hover:scale-105 ease-in duration-300">
<AiOutlineMail />
</div>
</Link>
</div>
</div>
</div>
{/* Close Button */}
<div className="flex justify-between items-center">
<Image
src="/logo.jpeg"
alt="Logo"
width={50}
height={50}
className="rounded-lg"
/>
<button onClick={() => setNavOpen(false)} className="p-2">
<AiOutlineClose size={25} />
</button>
</div>

{/* Mobile Nav Links */}
<ul className="mt-6 space-y-4 text-lg text-white">
{navLinks.map((link) => (
<li key={link.href}>
<Link
href={link.href}
className="block p-2"
onClick={() => setNavOpen(false)}
>
{link.name}
</Link>
</li>
))}
{moreNavLinks.map((link) => (
<li key={link.href}>
<Link
href={link.href}
className="block p-2"
onClick={() => setNavOpen(false)}
>
{link.name}
</Link>
</li>
))}
<li key="/store">
<Link
href="/store"
className="block p-2"
onClick={() => setNavOpen(false)}
>
store
</Link>
</li>
</ul>
</div>
</div>
</div>
</nav>
);
};

export default NavBar;
}
14 changes: 14 additions & 0 deletions data/moreNavbar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export const moreNavLinks = [
// { href: "/", name: "Home" },
// { href: "/programs", name: "programs" },
// { href: "/staff", name: "staff" },
// { href: "/calendar", name: "calendar" },
// { href: "/gallery", name: "gallery" },
// { href: "/family-trees", name: "family trees" },
{ href: "/contact", name: "contact" },
{ href: "/faq", name: "faq" },
// { href: "/store", name: "Store" },
];

export default moreNavLinks;

18 changes: 9 additions & 9 deletions data/navbar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
export const navLinks = [
{ href: "/", name: "Home" },
{ href: "/programs", name: "Programs" },
{ href: "/staff", name: "Staff" },
{ href: "/calendar", name: "Calendar" },
{ href: "/gallery", name: "Gallery" },
{ href: "/family-trees", name: "Family Trees" },
{ href: "/contact", name: "Contact" },
{ href: "/faq", name: "FAQ" },
{ href: "/store", name: "Store" },
// { href: "/", name: "Home" },
{ href: "/programs", name: "programs" },
{ href: "/staff", name: "staff" },
{ href: "/calendar", name: "calendar" },
{ href: "/gallery", name: "gallery" },
{ href: "/family-trees", name: "family trees" },
// { href: "/contact", name: "Contact" },
// { href: "/faq", name: "FAQ" },
// { href: "/store", name: "Store" },
];

export default navLinks;
2 changes: 1 addition & 1 deletion next-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
Binary file modified public/homepage/staff-24-25.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.