From f08e0a60e4d69e306ad20dfc5e23acc21a9819f5 Mon Sep 17 00:00:00 2001 From: Ryan Le <31494954+lryanle@users.noreply.github.com> Date: Tue, 19 Sep 2023 18:32:50 -0500 Subject: [PATCH 01/23] added red bg --- public/images/red-pattern-bg.png | Bin 0 -> 268 bytes src/app/page.tsx | 9 ++++++--- src/app/schedule/page.tsx | 26 +++++++++++++++----------- tailwind.config.js | 3 +++ 4 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 public/images/red-pattern-bg.png diff --git a/public/images/red-pattern-bg.png b/public/images/red-pattern-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..bc940d90bc4376656fc403b49c59795f283540b1 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtZeb8+WSBKa0w~B> z9OUlAu&xSycku>fcXw`0)3qL%t2i9pN1e%~LIn^NVlP0UgWW M>FVdQ&MBb@091lw=Kufz literal 0 HcmV?d00001 diff --git a/src/app/page.tsx b/src/app/page.tsx index 87ac765..d78ef28 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -144,7 +144,6 @@ export default async function Landing() { return ( <> - -
+

@@ -194,7 +193,11 @@ export default async function Landing() {

- +
-
-

+ return ( +
+
+

Schedule - +

- +
-
-
- ) -} \ No newline at end of file +

+
+ ) +} diff --git a/tailwind.config.js b/tailwind.config.js index 61087ec..12a49a5 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -13,6 +13,9 @@ module.exports = { './src/**/*.{js,ts,jsx,tsx,mdx}',], theme: { extend: { + backgroundImage: { + 'hackuta-pattern-red': "url('/images/red-pattern-bg.png')", + }, boxShadow: { hackuta: shadow, }, From 9a224f8376353907de76d7e8c93ed07f77a43c66 Mon Sep 17 00:00:00 2001 From: Ryan Le <31494954+lryanle@users.noreply.github.com> Date: Tue, 19 Sep 2023 18:39:13 -0500 Subject: [PATCH 02/23] sticky navbar --- src/components/MarqueeHeader.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/MarqueeHeader.tsx b/src/components/MarqueeHeader.tsx index 8a98676..dd8e79b 100644 --- a/src/components/MarqueeHeader.tsx +++ b/src/components/MarqueeHeader.tsx @@ -27,7 +27,10 @@ export const MarqueeHeader = ({ showBadge, ...props }: MarqueeHeaderProps) => { } return ( -
+
Date: Tue, 19 Sep 2023 19:54:48 -0500 Subject: [PATCH 03/23] Updated navbar micro interactions and hamburger --- src/components/MarqueeHeader.tsx | 99 +++++++++++++++++++++++++++----- 1 file changed, 86 insertions(+), 13 deletions(-) diff --git a/src/components/MarqueeHeader.tsx b/src/components/MarqueeHeader.tsx index dd8e79b..abf63c1 100644 --- a/src/components/MarqueeHeader.tsx +++ b/src/components/MarqueeHeader.tsx @@ -3,7 +3,7 @@ import { Menu } from 'iconoir-react' import Link from 'next/link' import { usePathname } from 'next/navigation' -import { ReactFragment, useState } from 'react' +import { SVGProps, useEffect, useState } from 'react' import { twMerge } from 'tailwind-merge' import { hasPermission } from '@/lib/auth/shared' @@ -13,6 +13,30 @@ export type MarqueeHeaderProps = { showBadge?: boolean } +export type LogoProps = SVGProps +const Logo = (props: LogoProps) => { + return ( + + HackUTA + + + + ) +} + export const MarqueeHeader = ({ showBadge, ...props }: MarqueeHeaderProps) => { const pathname = usePathname() if (showBadge === undefined) { @@ -21,6 +45,15 @@ export const MarqueeHeader = ({ showBadge, ...props }: MarqueeHeaderProps) => { const { user, perms } = useEnhancedSession() const [menuOpen, setMenuOpen] = useState(false) + const [showMenu, setShowMenu] = useState(false) + + useEffect(() => { + if (window.innerWidth < 880) { + setShowMenu(true) + } else { + setShowMenu(false) + } + }, []) const toggleMenu = () => { setMenuOpen(!menuOpen) @@ -40,27 +73,62 @@ export const MarqueeHeader = ({ showBadge, ...props }: MarqueeHeaderProps) => { )} > {/* Hamburger Menu Icon */} - + {showMenu && ( + + )}
- + { +
+ + HackUTA 2023 +
+ } + + {/* Arlington's One and Only Hackathon - The Greatest Show Around + The Greatest Show Around */} + + {!showMenu && ( +
    + Home + {hasPermission(perms, { administration: {} }) && ( + Admin + )} + {!user?.application && ( + Apply + )} + {user?.application && ( + Dashboard + )} + FAQ + Schedule + + {user ? 'Sign Out' : 'Sign In'} + +
+ )}
{/* Optional: Displaying the menu list */} - {menuOpen && ( + {showMenu && menuOpen && (