From e9f078b98e22f24ecad48e2c383ffff4ca05c169 Mon Sep 17 00:00:00 2001 From: Nick Doan Date: Thu, 18 Apr 2024 22:56:25 -0400 Subject: [PATCH] Update Senior View (#168) * Allow color update for assignment * Use initials * Update border * Fix css space * Add color consistency * Remove log * Fix merge conflicts (#169) * Fix merge conflicts * Restore space * fix text color for inputs/text areas --------- Co-authored-by: wkim10 --------- Co-authored-by: wkim10 --- src/components/DisplayChapterInfo.tsx | 2 +- src/components/Navbar.tsx | 10 ++- src/components/NewChapterForm.tsx | 70 ++++++++++--------- src/components/PathNav.tsx | 4 +- src/components/Sidebar.tsx | 25 +++++-- src/components/TabButtons.tsx | 2 +- src/components/TileGrid/UserTile.tsx | 29 +++----- src/components/container/HeaderContainer.tsx | 2 +- src/components/selector/Dropdown.tsx | 32 ++++++--- .../index.tsx => selector/assignment.tsx} | 8 ++- src/components/selector/index.tsx | 1 + src/components/senior/DisplaySenior.tsx | 11 ++- src/components/user/DisplayUserSeniors.tsx | 3 +- src/styles/globals.css | 6 ++ src/utils/index.tsx | 9 +++ 15 files changed, 135 insertions(+), 79 deletions(-) rename src/components/{senior/assignment/index.tsx => selector/assignment.tsx} (86%) diff --git a/src/components/DisplayChapterInfo.tsx b/src/components/DisplayChapterInfo.tsx index 4b94caa1..01aa4c14 100644 --- a/src/components/DisplayChapterInfo.tsx +++ b/src/components/DisplayChapterInfo.tsx @@ -107,7 +107,7 @@ const DisplayChapterInfo = ({ ].map((value) => (
{value}
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 8ce36b3b..fc20d302 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -6,6 +6,7 @@ import Link from "next/link"; import { useAuth } from "@hooks"; import logoicon from "../../public/landing/newlegacy-logo.svg"; import Image from "next/image"; +import { usePathname } from "next/navigation"; const NAV_ITEMS = [ { @@ -27,6 +28,7 @@ const Navbar = () => { const handleMenuClick: React.MouseEventHandler = () => { setDropdownVisible((visible) => !visible); }; + const path = usePathname(); const { status, onSignIn } = useAuth(); useEffect(() => { @@ -91,14 +93,18 @@ const Navbar = () => { href={href} onClick={() => setDropdownVisible(false)} > -
+
{name}
))} diff --git a/src/components/NewChapterForm.tsx b/src/components/NewChapterForm.tsx index b8edffd6..1eb54433 100644 --- a/src/components/NewChapterForm.tsx +++ b/src/components/NewChapterForm.tsx @@ -55,14 +55,14 @@ const NewChapterForm = () => { return (
-
+
-
First Name
+
First Name
{ className="text-sunset-orange" size="xs" /> -

{message}

+

{message}

)} />
-
Last Name
+
Last Name
{ className="text-sunset-orange" size="xs" /> -

{message}

+

{message}

)} />
-
University Email
+
University Email
{ className="text-sunset-orange" size="xs" /> -

{message}

+

{message}

)} />
-
Phone Number
+
Phone Number
{ className="text-sunset-orange" size="xs" /> -

{message}

+

{message}

)} />
-
College / University
+
College / University
{ className="text-sunset-orange" size="xs" /> -

{message}

+

{message}

)} />
-
College / University Address
+
College / University Address
{ className="text-sunset-orange" size="xs" /> -

{message}

+

{message}

)} /> @@ -187,13 +187,13 @@ const NewChapterForm = () => {
-
+
Do you have any experience in student leadership / club organization / storytelling?