Skip to content
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.

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

Added team roster page and updated navbar #130

Merged
merged 1 commit into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion app/(pre-dashboard)/(landing)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { Suspense, useEffect } from 'react';
import Sponsors from './sections/Sponsors';
import About from './sections/About';
import FAQ from './sections/FAQ/FAQ';
import Team from './sections/Team';
import GenericSection from './sections/GenericSection';
import { getSponsors } from '@/app/lib/data';
import React from 'react';
Expand Down Expand Up @@ -37,7 +38,10 @@ export default async function Page() {
<GenericSection title="FAQ" color="from-dark_blue_figma">
<FAQ />
</GenericSection>
<div className="from-dark_blue_figma bg-gradient-to-b to-[#1B1F23]">
<GenericSection title="Meet The Team">
<Team />
</GenericSection>
<div className="bg-gradient-to-b from-dark_blue_figma to-[#1B1F23]">
<Image
src="/landing/kittywizards.svg"
alt="bottom image"
Expand Down
27 changes: 17 additions & 10 deletions app/(pre-dashboard)/(landing)/sections/Hero/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ function MenuItem(props: { sectionName: string }) {
<Menu.Item>
{({ active }) => (
<button
className={`${active ? 'bg-f23-lightGreen text-white' : 'text-gray-900'
}
className={`${
active ? 'bg-f23-lightGreen text-white' : 'text-gray-900'
}
group flex w-full items-center rounded-md px-2 py-2 text-lg`}
onClick={() => scrollToSectionName(sectionName)}
>
Expand All @@ -41,8 +42,9 @@ function OtherPageMenuItem(props: { sectionName: string }) {
<Menu.Item>
{({ active }) => (
<button
className={`${active ? 'bg-f23-lightGreen text-white' : 'text-gray-900'
}
className={`${
active ? 'bg-f23-lightGreen text-white' : 'text-gray-900'
}
group flex w-full items-center rounded-md px-2 py-2 text-lg`}
onClick={() => {
history.push('/contact');
Expand All @@ -59,10 +61,11 @@ function CollapsedMenu() {
const pathname = usePathname();
return (
<div
className={clsx("bg-f23-mediumGreen absolute right-28 top-4 z-40 rounded-md text-right md:hidden",
className={clsx(
'bg-f23-mediumGreen absolute right-28 top-4 z-40 rounded-md text-right md:hidden',
{
"hidden": pathname !== '/'
}
hidden: pathname !== '/',
},
)}
>
<Menu as="div" className="relative inline-block text-left">
Expand All @@ -86,6 +89,7 @@ function CollapsedMenu() {
<MenuItem sectionName="About" />
<MenuItem sectionName="Schedule" />
<MenuItem sectionName="FAQ" />
<MenuItem sectionName="Team" />
{/* <MenuItem sectionName="Sponsors" /> */}
{<OtherPageMenuItem sectionName="Contact" />}
</div>
Expand All @@ -104,10 +108,13 @@ function Navbar() {
const pathname = usePathname();
const router = useRouter();
const isHomePage = pathname === '/';
const sections = ['Home', 'About', 'Schedule', 'FAQ'];
const sections = ['Home', 'About', 'Schedule', 'FAQ', 'Team'];

return (
<div className={`z-40 flex w-full justify-end md:fixed ${bizUdg.className}`} id="navbar">
<div
className={`z-40 flex w-full justify-end md:fixed ${bizUdg.className}`}
id="navbar"
>
<div
className="absolute left-4 top-0 z-50 w-24"
onClick={() => {
Expand Down Expand Up @@ -147,7 +154,7 @@ function Navbar() {
{sections.map((section) => {
return (
<button
className="glow-center mr-5 font-medium uppercase hover:drop-shadow-blueGlow transition-shadow"
className="glow-center mr-5 font-medium uppercase transition-shadow hover:drop-shadow-blueGlow"
onClick={() => scrollToSectionName(section)}
key={section}
>
Expand Down
7 changes: 7 additions & 0 deletions app/(pre-dashboard)/(landing)/sections/Team.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react';

const Team = () => {
return <div>Hello</div>;
};

export default Team;
Loading