From 6ae4acf8e04185f4fc2a2da9299d9a78816978f4 Mon Sep 17 00:00:00 2001 From: csong202 Date: Sat, 25 Nov 2023 17:38:21 -0500 Subject: [PATCH 1/4] update logos, styling, and colour scheme --- public/assets/hackthehill-logo.svg | 36 ++++++++++++++++++- public/assets/home.svg | 10 +++++- public/assets/maps.svg | 6 +++- public/assets/resources.svg | 5 ++- public/assets/schedule.svg | 14 +++++++- src/components/Error.tsx | 2 +- src/components/FormPage.tsx | 4 +-- src/components/Loading.tsx | 2 +- src/components/Navigation.tsx | 38 ++++++++++++++------ src/components/PhysicalScanner.tsx | 2 +- src/pages/confirm/index.tsx | 22 ++++++------ src/pages/follow/index.tsx | 6 ++-- src/pages/hackers/hacker.tsx | 48 ++++++++++++++------------ src/pages/hackers/index.tsx | 22 +++++------- src/pages/index.tsx | 7 ++-- src/pages/maps/index.tsx | 7 ++-- src/pages/qr/index.tsx | 14 +++++--- src/pages/resources/index.tsx | 2 +- src/pages/schedule/event.tsx | 17 +++++---- src/pages/schedule/index.tsx | 22 ++++++------ src/pages/sponsorship/gmail-drafts.tsx | 36 +++++++++---------- src/pages/unsubscribe/index.tsx | 4 +-- src/pages/walk-in/index.tsx | 16 ++++----- tailwind.config.cjs | 28 +++++++-------- 24 files changed, 224 insertions(+), 146 deletions(-) diff --git a/public/assets/hackthehill-logo.svg b/public/assets/hackthehill-logo.svg index 52ebea67..2cc4c64d 100644 --- a/public/assets/hackthehill-logo.svg +++ b/public/assets/hackthehill-logo.svg @@ -1 +1,35 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/home.svg b/public/assets/home.svg index 24303b1f..b87d918c 100644 --- a/public/assets/home.svg +++ b/public/assets/home.svg @@ -1 +1,9 @@ - + + + + + + + + + diff --git a/public/assets/maps.svg b/public/assets/maps.svg index 0ffe7e8d..1a5bad6c 100644 --- a/public/assets/maps.svg +++ b/public/assets/maps.svg @@ -1 +1,5 @@ - + + + + + diff --git a/public/assets/resources.svg b/public/assets/resources.svg index d844d096..32adee86 100644 --- a/public/assets/resources.svg +++ b/public/assets/resources.svg @@ -1 +1,4 @@ - + + + + diff --git a/public/assets/schedule.svg b/public/assets/schedule.svg index 25c4b795..c38f0401 100644 --- a/public/assets/schedule.svg +++ b/public/assets/schedule.svg @@ -1 +1,13 @@ - + + + + + + + + + + + + + diff --git a/src/components/Error.tsx b/src/components/Error.tsx index c2b09b5c..3909aff3 100644 --- a/src/components/Error.tsx +++ b/src/components/Error.tsx @@ -18,7 +18,7 @@ const Error = ({ message }: ErrorProps) => { diff --git a/src/components/FormPage.tsx b/src/components/FormPage.tsx index 09b10b1e..1bdc5d25 100644 --- a/src/components/FormPage.tsx +++ b/src/components/FormPage.tsx @@ -36,7 +36,7 @@ const FormPage = ({ children, onSubmit, error, invalid, loading, path, user, tit return ( <> -
+
-

+

Hack the Hill

diff --git a/src/components/Loading.tsx b/src/components/Loading.tsx index 1fc4ba45..923bec5e 100644 --- a/src/components/Loading.tsx +++ b/src/components/Loading.tsx @@ -6,7 +6,7 @@ const Loading = () => { return (
{ <> {bottom ? : t("home")} @@ -33,7 +37,9 @@ const Links = ({ bottom }: LinkProps) => { {bottom ? : t("qr")} @@ -41,7 +47,11 @@ const Links = ({ bottom }: LinkProps) => { )} {bottom ? ( @@ -51,13 +61,21 @@ const Links = ({ bottom }: LinkProps) => { {bottom ? : t("maps")} {bottom ? ( @@ -73,7 +91,7 @@ const Links = ({ bottom }: LinkProps) => { className={ bottom ? "" - : "mx-4 flex items-center font-coolvetica text-2xl text-dark hover:text-light" + : "mx-4 flex items-center font-coolvetica text-2xl text-dark-primary-color hover:text-light-color" } > {bottom ? ( @@ -99,8 +117,8 @@ const Navbar = ({ integrated }: NavbarProps) => { return (
-
+

{name}

{start.toLocaleDateString(dateLocale, { @@ -115,7 +118,7 @@ const Event: NextPage = () => { href={link} target="_blank" rel="noreferrer" - className="flex whitespace-nowrap rounded-lg border border-dark bg-background1 px-8 py-2 font-coolvetica text-dark transition-colors hover:bg-background3" + className="flex whitespace-nowrap rounded-lg border border-dark-color bg-light-primary-color px-8 py-2 font-coolvetica text-dark-color transition-colors hover:bg-dark-secondary-color" > {linkText} @@ -137,7 +140,7 @@ const Event: NextPage = () => { href={tiktok} target="_blank" rel="noreferrer" - className="flex w-fit flex-row items-center justify-center gap-2 rounded-lg bg-white p-3 font-coolvetica text-dark" + className="flex w-fit flex-row items-center justify-center gap-2 rounded-lg bg-white p-3 font-coolvetica text-dark-color" > diff --git a/src/pages/schedule/index.tsx b/src/pages/schedule/index.tsx index 220943e7..2b124f1e 100644 --- a/src/pages/schedule/index.tsx +++ b/src/pages/schedule/index.tsx @@ -32,13 +32,13 @@ const Schedule: NextPage = () => { if (query.isLoading || query.data == null) { return ( - + ); } else if (query.isError) { return ( - +

@@ -53,15 +53,15 @@ const Schedule: NextPage = () => { const eventColor = (eventType: string) => { switch (eventType) { case EventType.WORKSHOP: - return "bg-accent1 text-dark"; + return "bg-dark-primary-color text-light-color"; case EventType.CAREER_FAIR: - return "bg-accent3 text-white"; + return "bg-light-primary-color text-light-color"; case EventType.FOOD: - return "bg-accent2 text-dark"; + return "bg-light-tertiary-color text-light-color"; case EventType.SOCIAL: - return "bg-accent4 text-white"; + return "bg-medium-primary-color text-light-color"; default: - return "bg-accent1 text-dark"; + return "bg-dark-primary-color text-light-color"; } }; @@ -112,13 +112,13 @@ const Schedule: NextPage = () => { }, [] as Event[][]); return ( - + void router.push(`/schedule?tab=${tab}`)} />
{events.map((event, i) => (
-
+
{event[0]?.start.toLocaleDateString(dateLocale, { month: "short", day: "numeric", @@ -166,7 +166,7 @@ type TabsProps = { const Tabs = ({ tab, setTab }: TabsProps) => { return ( -
+
{Object.keys(EventType) .sort(a => (a === EventType.ALL ? -1 : 0)) @@ -202,7 +202,7 @@ const Tab = ({ type, active, onClick }: TabProps) => { return (
{ }, [templateID, organizerFullName, companyName, companyRepName, customTemplate, customizeTemplate]); return ( - + role === Role.ORGANIZER}> -

{t("title")}

+

{t("title")}

-
-