From ae7681fa42d70fdb40f37be9f24d27fc7525031e Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 03:57:20 -0700 Subject: [PATCH 01/43] =?UTF-8?q?=F0=9F=94=AB=20faq=20fonts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/FAQ.tsx | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/components/FAQ.tsx b/components/FAQ.tsx index 7fc5529..d656eef 100644 --- a/components/FAQ.tsx +++ b/components/FAQ.tsx @@ -1,6 +1,7 @@ import React, { useState } from 'react'; import { BiX } from 'react-icons/bi'; import ExternalLink from '@/components/ExternalLink'; +import { useTheme } from 'next-themes'; interface Props { /** Heading for accordion. */ @@ -12,6 +13,7 @@ interface Props { /** Accordion for a single FAQ. */ export function FaqAccordion({ question, answer }: Props) { const [open, setOpen] = useState(false); + const { theme } = useTheme(); return (
@@ -19,7 +21,7 @@ export function FaqAccordion({ question, answer }: Props) { className="flex py-3 items-center hover:text-highlight cursor-pointer" onClick={() => setOpen(!open)} > -

{question}

+

{question}

{typeof answer === 'string' ? ( -

{answer}

+

+ {answer} +

) : ( -
{answer}
+
+ {answer} +
)}
From 847bd5d401de11f7af5230d64978656dd221269e Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 04:01:36 -0700 Subject: [PATCH 02/43] =?UTF-8?q?=F0=9F=A5=8A=20forgot=20some=20undraggabl?= =?UTF-8?q?e=20assets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/FAQ.tsx | 10 +++++----- components/Footer.tsx | 4 +++- components/MLHBanner.tsx | 1 + components/ProfileWrapper.tsx | 1 + components/SupportCards.tsx | 3 ++- pages/sections/landing.tsx | 16 ++++++++++++++-- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/components/FAQ.tsx b/components/FAQ.tsx index d656eef..e7f70cb 100644 --- a/components/FAQ.tsx +++ b/components/FAQ.tsx @@ -47,7 +47,7 @@ export function FaqAccordion({ question, answer }: Props) {

) : (
@@ -131,14 +131,14 @@ const faq = [ { question: "My question isn't listed?", answer: ( -

+ <> Feel free to email us at{' '} {' '} - or ask Mika Shanela in-person if you have any more questions. -

+ /> +

or ask Mika Shanela in-person if you have any more questions.

+ ) } ]; diff --git a/components/Footer.tsx b/components/Footer.tsx index 5b7d522..eeea8d3 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -33,6 +33,7 @@ export default function Footer() { alt="footer" objectFit="contain" layout="responsive" + draggable={false} /> ) : ( )}
@@ -77,7 +79,7 @@ export default function Footer() { MLH Code Of Conduct

- Made with {theme === 'dark' ? '🤍' : '🖤'} by the Citrus Hack Team + Made with {theme === 'dark' ? '🤍' : '🖤'} by Team Citrus

diff --git a/components/MLHBanner.tsx b/components/MLHBanner.tsx index a1b8a40..75af36e 100644 --- a/components/MLHBanner.tsx +++ b/components/MLHBanner.tsx @@ -27,6 +27,7 @@ export function MLHBanner() { src="https://citrushack2023.s3.us-west-1.amazonaws.com/mlh-trust-badge-2023-white.svg" alt="Major League Hacking 2022 Hackathon Season" className="w-full" + draggable={false} /> ); diff --git a/components/ProfileWrapper.tsx b/components/ProfileWrapper.tsx index 14d674e..40e4e13 100644 --- a/components/ProfileWrapper.tsx +++ b/components/ProfileWrapper.tsx @@ -40,6 +40,7 @@ const ProfileWrapper = ({ name, position, link, image }) => { quality={100} className="rounded-full mt-5" alt="profile photo" + draggable={false} /> diff --git a/components/SupportCards.tsx b/components/SupportCards.tsx index bad301d..f8801ca 100644 --- a/components/SupportCards.tsx +++ b/components/SupportCards.tsx @@ -67,6 +67,7 @@ function SupportCardMobile({ back, button, link }: SupportCardMobileProps) { quality={1} className="rounded-md" alt="" + draggable={false} /> {/* */} - + {/* */} diff --git a/pages/sections/landing.tsx b/pages/sections/landing.tsx index b9af034..415fd83 100644 --- a/pages/sections/landing.tsx +++ b/pages/sections/landing.tsx @@ -324,6 +324,7 @@ export default function Landing() { alt="skyline" layout="responsive" objectFit="contain" + draggable={false} /> ) : ( Skyline Dark )} @@ -345,9 +347,19 @@ export default function Landing() {
{theme === 'light' ? ( - Globe + Globe ) : ( - Globe + Globe )}
From b91fe89777514acc2cf029932eb1c1559f30a57c Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 10:44:10 -0700 Subject: [PATCH 03/43] =?UTF-8?q?=F0=9F=94=ABmmariam=20complaint=20faq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/FAQ.tsx | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/components/FAQ.tsx b/components/FAQ.tsx index e7f70cb..6aeb65b 100644 --- a/components/FAQ.tsx +++ b/components/FAQ.tsx @@ -1,7 +1,6 @@ import React, { useState } from 'react'; import { BiX } from 'react-icons/bi'; import ExternalLink from '@/components/ExternalLink'; -import { useTheme } from 'next-themes'; interface Props { /** Heading for accordion. */ @@ -13,7 +12,6 @@ interface Props { /** Accordion for a single FAQ. */ export function FaqAccordion({ question, answer }: Props) { const [open, setOpen] = useState(false); - const { theme } = useTheme(); return (
@@ -38,21 +36,9 @@ export function FaqAccordion({ question, answer }: Props) { } > {typeof answer === 'string' ? ( -

- {answer} -

+

{answer}

) : ( -
- {answer} -
+
{answer}
)}
@@ -136,8 +122,8 @@ const faq = [ -

or ask Mika Shanela in-person if you have any more questions.

+ />{' '} + or ask Mika Shanela in-person if you have any more questions. ) } From f33b392d11acde73ae2f5f39aa0c369819516bcd Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 11:20:56 -0700 Subject: [PATCH 04/43] :lipstick: mika is so scary --- components/SponsorGrid.tsx | 16 ++++++++++++---- .../sponsors/cutie_sponsor_orange_dark.svg | 10 ++++++++++ .../sponsors/orange_sponsor_orange_dark.svg | 10 ++++++++++ .../sponsors/tangerine_sponsor_orange_dark.svg | 10 ++++++++++ 4 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 public/assets/sponsors/cutie_sponsor_orange_dark.svg create mode 100644 public/assets/sponsors/orange_sponsor_orange_dark.svg create mode 100644 public/assets/sponsors/tangerine_sponsor_orange_dark.svg diff --git a/components/SponsorGrid.tsx b/components/SponsorGrid.tsx index 445697c..ee8473f 100644 --- a/components/SponsorGrid.tsx +++ b/components/SponsorGrid.tsx @@ -11,6 +11,11 @@ import orange from '@/public/assets/sponsors/orange_sponsor_orange.svg'; import tangerine from '@/public/assets/sponsors/tangerine_sponsor_orange.svg'; import cutie from '@/public/assets/sponsors/cutie_sponsor_orange.svg'; +import orangeDark from '@/public/assets/sponsors/orange_sponsor_orange_dark.svg'; +import tangerineDark from '@/public/assets/sponsors/tangerine_sponsor_orange_dark.svg'; +import cutieDark from '@/public/assets/sponsors/cutie_sponsor_orange_dark.svg'; +import { useTheme } from 'next-themes'; + interface SponsorProps { /** Sponsor tier (e.g. 'cutie'). */ type: string; @@ -90,6 +95,7 @@ const tiers = [ flag: orangeFlag, wide: true, orange: orange, + orangeDark: orangeDark, sponsors: [ { image: '/assets/sponsors/aspb.png', @@ -120,6 +126,7 @@ const tiers = [ flag: tangerineFlag, wide: Boolean(true), orange: tangerine, + orangeDark: tangerineDark, sponsors: [ { image: '/assets/sponsors/blackstone.png', @@ -148,6 +155,7 @@ const tiers = [ flag: cutieFlag, wide: Boolean(true), orange: cutie, + orangeDark: cutieDark, sponsors: [ { image: '/assets/sponsors/redbull.png', @@ -240,7 +248,7 @@ const tiers = [ /** Grid of sponsors of all specified tiers. */ export function SponsorsGrid() { const [mounted, setMounted] = useState(false); - // const { theme } = useTheme(); + const { theme } = useTheme(); useEffect(() => setMounted(true), []); @@ -253,7 +261,7 @@ export function SponsorsGrid() { */} {tiers .filter(({ sponsors }) => sponsors.length > 0) // only map tiers with sponsors - .map(({ type, sponsors, wide, orange }) => ( + .map(({ type, sponsors, wide, orange, orangeDark }) => (
orange orange + + + + + + + + + diff --git a/public/assets/sponsors/orange_sponsor_orange_dark.svg b/public/assets/sponsors/orange_sponsor_orange_dark.svg new file mode 100644 index 0000000..fc3a0e3 --- /dev/null +++ b/public/assets/sponsors/orange_sponsor_orange_dark.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/public/assets/sponsors/tangerine_sponsor_orange_dark.svg b/public/assets/sponsors/tangerine_sponsor_orange_dark.svg new file mode 100644 index 0000000..eeff74f --- /dev/null +++ b/public/assets/sponsors/tangerine_sponsor_orange_dark.svg @@ -0,0 +1,10 @@ + + + + + + + + + + From 0a467f307e2a1c7b68b4a95df72d28d6ca471f01 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 11:27:54 -0700 Subject: [PATCH 05/43] :bricks: mariam is scarier --- components/Form/ApplicationForm/index.tsx | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/components/Form/ApplicationForm/index.tsx b/components/Form/ApplicationForm/index.tsx index 00cb399..7ea082c 100644 --- a/components/Form/ApplicationForm/index.tsx +++ b/components/Form/ApplicationForm/index.tsx @@ -43,14 +43,17 @@ export function ApplicationForm() { // used by auto accept "bot" (/api/auto-review) // determine if criteria to participate is met // auto accept if - // if undergrad && UCR + // if undergrad or highschool => auto accept + const containsHighSchool = school + .toLowerCase() + .includes('high school'.toLowerCase()); if ( - school == 'University of California, Riverside' && - (grade === '1st Year Undergraduate' || - grade === '2nd Year Undergraduate' || - grade === '3rd Year Undergraduate' || - grade === '4th Year Undergraduate' || - grade === '5th+ Year Undergraduate') + containsHighSchool || + grade === '1st Year Undergraduate' || + grade === '2nd Year Undergraduate' || + grade === '3rd Year Undergraduate' || + grade === '4th Year Undergraduate' || + grade === '5th+ Year Undergraduate' ) { criteria_met = true; } else { From ed2005d6a73c125ffae79af33755834c7d727bfb Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 11:32:05 -0700 Subject: [PATCH 06/43] :wheelchair: mariUms request pt99 --- components/Form/ApplicationForm/components.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Form/ApplicationForm/components.tsx b/components/Form/ApplicationForm/components.tsx index 77f76ed..668f9c2 100644 --- a/components/Form/ApplicationForm/components.tsx +++ b/components/Form/ApplicationForm/components.tsx @@ -124,7 +124,7 @@ export function Education({ register, errors, watch }: Props) { {school === 'University of California, Riverside' && ( Date: Sat, 1 Apr 2023 12:27:26 -0700 Subject: [PATCH 07/43] :lipstick: new color vars --- styles/globals.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/styles/globals.css b/styles/globals.css index 4958296..93b188c 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -25,6 +25,8 @@ body { --purple: #373a5e; --lightPurple: #5c6084; --hoverPrimary: #5c6084; + --goldHover: #FFC753; + --link: #71461f; --text: #373a5e; --clouds: url('/assets/clouds.svg'); --clouds2: url('/assets/clouds_birds.svg'); @@ -45,7 +47,9 @@ body { --darkbubble: #373a5e; --purple: #373a5e; --hoverPrimary: #5c6084; + --goldHover: #FFC753; --lightPurple: #5c6084; + --link: #71461f; --text: #373a5e; --clouds: url('/assets/clouds.svg'); --clouds2: url('/assets/clouds_birds.svg'); @@ -67,7 +71,9 @@ body { --darkbubble: #373a5e; --purple: #597daa; --lightPurple: #5c6084; - --hoverPrimary: #5c6084; + --hoverPrimary: #7495BE; + --goldHover: #FFC753; + --link: #ffac01; --text: #ffff; --clouds: url('/assets/clouds.svg'); --clouds2: url('/assets/clouds_birds.svg'); From ea9918a254539a2cd3a36148dfbba199a130c463 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 12:35:02 -0700 Subject: [PATCH 08/43] :lipstick: new color vars --- tailwind.config.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tailwind.config.js b/tailwind.config.js index d77ae40..43674e1 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -67,7 +67,9 @@ module.exports = { purple: 'var(--purple)', lightPurple: 'var(--lightPurple)', text: 'var(--text)', - hoverPrimary: 'var(--hoverPrimary)' + hoverPrimary: 'var(--hoverPrimary)', + goldHover: 'var(--goldHover)', + link: 'var(--link)' }, backgroundImage: { clouds: 'var(--clouds)', From 65eb9e25fdd5a9204c6c70946ea96a692ef4fe56 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 12:35:19 -0700 Subject: [PATCH 09/43] :lipstick: new link colors --- components/ExternalLink.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/ExternalLink.tsx b/components/ExternalLink.tsx index fcffc6f..4418964 100644 --- a/components/ExternalLink.tsx +++ b/components/ExternalLink.tsx @@ -9,7 +9,7 @@ interface Props { export default function ExternalLink({ name, link }: Props) { return ( - + {name} From 477e73dfd3a60e24a6f096c8d36d880ca94a2de1 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 12:35:38 -0700 Subject: [PATCH 10/43] :lipstick: update colors --- components/FAQ.tsx | 3 ++- components/UserBar/UserDropdown.tsx | 12 ++++++------ pages/sections/team.tsx | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/components/FAQ.tsx b/components/FAQ.tsx index 7fc5529..747bce4 100644 --- a/components/FAQ.tsx +++ b/components/FAQ.tsx @@ -123,7 +123,8 @@ const faq = [ name="citrushack@gmail.com" link="mailto:citrushack@gmail.com" />{' '} - or ask Mika Shanela in-person if you have any more questions. + or ask Mika Shanela in-person if you + have any more questions.

) } diff --git a/components/UserBar/UserDropdown.tsx b/components/UserBar/UserDropdown.tsx index 155cb29..ca99c91 100644 --- a/components/UserBar/UserDropdown.tsx +++ b/components/UserBar/UserDropdown.tsx @@ -77,7 +77,7 @@ export function UserDropdown() { setOpen(!open)} > {open ? ( @@ -94,7 +94,7 @@ export function UserDropdown() { >
- + Signed in as
{session.user.email} @@ -105,7 +105,7 @@ export function UserDropdown() { setOpen(!open)} > Apply Now! @@ -114,7 +114,7 @@ export function UserDropdown() { ) : ( <> - + Your Application Status signOut()} >
diff --git a/pages/sections/team.tsx b/pages/sections/team.tsx index fad6f1e..4537418 100644 --- a/pages/sections/team.tsx +++ b/pages/sections/team.tsx @@ -111,6 +111,7 @@ const staff = [ ]; const swe_committee = [ + 'Ukim Shanelo 🥊', 'Thomas Li', 'Bobby Lerias', 'Andre Amante', From 2e7d5ba34ba6980bdc624e8fd6ad4611637825c7 Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 13:59:27 -0700 Subject: [PATCH 11/43] added text link hover --- components/FAQ.tsx | 8 +++++-- components/Footer.tsx | 30 ++++++++++++++++++++----- pages/sections/team.tsx | 49 ++++++++++++++++++++++++++++++++++------- styles/globals.css | 8 +++---- tailwind.config.js | 15 +++++++------ 5 files changed, 83 insertions(+), 27 deletions(-) diff --git a/components/FAQ.tsx b/components/FAQ.tsx index 2542269..531c58b 100644 --- a/components/FAQ.tsx +++ b/components/FAQ.tsx @@ -123,8 +123,12 @@ const faq = [ name="citrushack@gmail.com" link="mailto:citrushack@gmail.com" />{' '} - or ask Mika Shanela in-person if you - have any more questions. + or ask{' '} + {' '} + in-person if you have any more questions. ) } diff --git a/components/Footer.tsx b/components/Footer.tsx index eeea8d3..a340dca 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -5,6 +5,8 @@ import bus_footer from '@/public/assets/bus_footer.svg'; import bus_footer_dark from '@/public/assets/bus_footer_dark.svg'; import { motion } from 'framer-motion'; import { FiMail, FiInstagram, FiLinkedin } from 'react-icons/fi'; +import { BsBalloonHeartFill } from 'react-icons/bs'; + export default function Footer() { const { theme } = useTheme(); @@ -52,7 +54,7 @@ export default function Footer() { } flex flex-col justify-center items-center w-full h-full`} >
diff --git a/pages/sections/team.tsx b/pages/sections/team.tsx index 4537418..c6e89ec 100644 --- a/pages/sections/team.tsx +++ b/pages/sections/team.tsx @@ -111,12 +111,26 @@ const staff = [ ]; const swe_committee = [ - 'Ukim Shanelo 🥊', - 'Thomas Li', - 'Bobby Lerias', - 'Andre Amante', - 'Raidah Fairooz', - 'Kirtana Venkat' + { + link: 'https://www.linkedin.com/in/thomasli9/', + name: 'Thomas Li' + }, + { + link: 'https://www.linkedin.com/in/robertlerias/', + name: 'Bobby Lerias' + }, + { + link: 'https://www.linkedin.com/in/andreamantee/', + name: 'Andre Amante' + }, + { + link: 'https://www.linkedin.com/in/raidah-fairooz-78b1a8146/', + name: 'Raidah Fairooz' + }, + { + link: '', + name: 'Kirtana Venkat' + } ]; const sponsorship_committee = [ @@ -409,10 +423,29 @@ const team = () => { > Software Engineers

- {swe_committee.map((member, index) => ( + {/* {swe_committee.map((link, name, index) => (

- {member} + {name}

+ ))} */} + {swe_committee.map(({ link, name }) => ( + +

+ {name} +

+ ))}
diff --git a/styles/globals.css b/styles/globals.css index 93b188c..65691f6 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -25,7 +25,7 @@ body { --purple: #373a5e; --lightPurple: #5c6084; --hoverPrimary: #5c6084; - --goldHover: #FFC753; + --goldHover: #ffc753; --link: #71461f; --text: #373a5e; --clouds: url('/assets/clouds.svg'); @@ -47,7 +47,7 @@ body { --darkbubble: #373a5e; --purple: #373a5e; --hoverPrimary: #5c6084; - --goldHover: #FFC753; + --goldHover: #ffc753; --lightPurple: #5c6084; --link: #71461f; --text: #373a5e; @@ -71,8 +71,8 @@ body { --darkbubble: #373a5e; --purple: #597daa; --lightPurple: #5c6084; - --hoverPrimary: #7495BE; - --goldHover: #FFC753; + --hoverPrimary: #7495be; + --goldHover: #ffc753; --link: #ffac01; --text: #ffff; --clouds: url('/assets/clouds.svg'); diff --git a/tailwind.config.js b/tailwind.config.js index 43674e1..2e6819d 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -19,9 +19,10 @@ const MyClass = plugin(function ({ addUtilities }) { // https://stackoverflow.com/a/53037637 PAIN border: 'double transparent', borderRadius: '9999px', - backgroundImage: 'linear-gradient(white, white), linear-gradient(to bottom right, #FBBC05 0%, #EA4335 33%, #34A853 80%, #4285F4 100%)', + backgroundImage: + 'linear-gradient(white, white), linear-gradient(to bottom right, #FBBC05 0%, #EA4335 33%, #34A853 80%, #4285F4 100%)', backgroundOrigin: 'border-box', - backgroundClip: 'padding-box, border-box', + backgroundClip: 'padding-box, border-box' } }); }); @@ -34,11 +35,11 @@ module.exports = { ], theme: { colors: { - 'green': '#2BAD21', - 'blue': '#00f', + green: '#2BAD21', + blue: '#00f' }, - linearBorderGradients: theme => ({ - colors: theme('colors'), + linearBorderGradients: (theme) => ({ + colors: theme('colors') }), borderWidth: { @@ -86,5 +87,5 @@ module.exports = { } } }, - plugins: [MyClass, require('tailwindcss-border-gradients')(),] + plugins: [MyClass, require('tailwindcss-border-gradients')()] }; From ea912f283e2b799655dcfbe89fa8c41bf411b2a0 Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 17:12:05 -0700 Subject: [PATCH 12/43] =?UTF-8?q?added=20sun=20=F0=9F=8C=9E=20and=20schedu?= =?UTF-8?q?le=20waves=20for=20tablet/mobile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index.tsx | 6 +- pages/sections/schedule.tsx | 80 +++++++++++++++---- public/assets/waves/scheduleWave2.svg | 9 +++ public/assets/waves/scheduleWave2Dark.svg | 9 +++ public/assets/waves/scheduleWave3.svg | 9 +++ public/assets/waves/scheduleWave3Dark.svg | 9 +++ public/assets/waves/sponsorBGDarkDesktop.svg | 32 +++++--- public/assets/waves/sponsorBGDarkMobile.svg | 11 ++- public/assets/waves/sponsorBGDarkTablet.svg | 10 +++ public/assets/waves/sponsorBGLightDesktop.svg | 30 ++++--- public/assets/waves/sponsorBGLightMobile.svg | 10 +++ public/assets/waves/sponsorBGLightTablet.svg | 10 +++ 12 files changed, 186 insertions(+), 39 deletions(-) create mode 100644 public/assets/waves/scheduleWave2.svg create mode 100644 public/assets/waves/scheduleWave2Dark.svg create mode 100644 public/assets/waves/scheduleWave3.svg create mode 100644 public/assets/waves/scheduleWave3Dark.svg diff --git a/pages/index.tsx b/pages/index.tsx index b161f27..0b00521 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -62,7 +62,7 @@ export default function Home() {
{theme === 'light' ? ( <> -
+
Wave Dark
-
+
Wave Dark
-
+
Wave Dark
{theme === 'light' ? ( - Wave Light + <> +
+ Wave Light +
+
+
+ Wave Light +
+
+ Wave Light +
+
+ ) : ( - Wave Dark + <> +
+ Wave Light +
+
+
+ Wave Light +
+
+ Wave Light +
+
+ )}
diff --git a/public/assets/waves/scheduleWave2.svg b/public/assets/waves/scheduleWave2.svg new file mode 100644 index 0000000..9c4b0e2 --- /dev/null +++ b/public/assets/waves/scheduleWave2.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/waves/scheduleWave2Dark.svg b/public/assets/waves/scheduleWave2Dark.svg new file mode 100644 index 0000000..2d9b772 --- /dev/null +++ b/public/assets/waves/scheduleWave2Dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/waves/scheduleWave3.svg b/public/assets/waves/scheduleWave3.svg new file mode 100644 index 0000000..bb2d3eb --- /dev/null +++ b/public/assets/waves/scheduleWave3.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/waves/scheduleWave3Dark.svg b/public/assets/waves/scheduleWave3Dark.svg new file mode 100644 index 0000000..18e70f0 --- /dev/null +++ b/public/assets/waves/scheduleWave3Dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/waves/sponsorBGDarkDesktop.svg b/public/assets/waves/sponsorBGDarkDesktop.svg index 6b0675b..5b86309 100644 --- a/public/assets/waves/sponsorBGDarkDesktop.svg +++ b/public/assets/waves/sponsorBGDarkDesktop.svg @@ -1,24 +1,30 @@ - - + + - + - - - + + + + + + + + + - + @@ -28,15 +34,15 @@ - + - + - + @@ -45,7 +51,7 @@ - + @@ -57,5 +63,9 @@ + + + + diff --git a/public/assets/waves/sponsorBGDarkMobile.svg b/public/assets/waves/sponsorBGDarkMobile.svg index 4c6b0dc..930e7b3 100644 --- a/public/assets/waves/sponsorBGDarkMobile.svg +++ b/public/assets/waves/sponsorBGDarkMobile.svg @@ -28,6 +28,12 @@ + + + + + + @@ -146,6 +152,9 @@ + + + + - diff --git a/public/assets/waves/sponsorBGDarkTablet.svg b/public/assets/waves/sponsorBGDarkTablet.svg index 24f71d3..da24b69 100644 --- a/public/assets/waves/sponsorBGDarkTablet.svg +++ b/public/assets/waves/sponsorBGDarkTablet.svg @@ -12,6 +12,12 @@ + + + + + + @@ -57,5 +63,9 @@ + + + + diff --git a/public/assets/waves/sponsorBGLightDesktop.svg b/public/assets/waves/sponsorBGLightDesktop.svg index 44c4c1e..9ea3d4d 100644 --- a/public/assets/waves/sponsorBGLightDesktop.svg +++ b/public/assets/waves/sponsorBGLightDesktop.svg @@ -1,21 +1,27 @@ - - + + - + - + + + + + + + - + - + @@ -25,15 +31,15 @@ - + - + - + @@ -42,7 +48,7 @@ - + @@ -50,5 +56,9 @@ + + + + diff --git a/public/assets/waves/sponsorBGLightMobile.svg b/public/assets/waves/sponsorBGLightMobile.svg index 3ea9441..5c5d854 100644 --- a/public/assets/waves/sponsorBGLightMobile.svg +++ b/public/assets/waves/sponsorBGLightMobile.svg @@ -28,6 +28,12 @@ + + + + + + @@ -147,5 +153,9 @@ + + + + diff --git a/public/assets/waves/sponsorBGLightTablet.svg b/public/assets/waves/sponsorBGLightTablet.svg index 1b53e5e..e4dec8e 100644 --- a/public/assets/waves/sponsorBGLightTablet.svg +++ b/public/assets/waves/sponsorBGLightTablet.svg @@ -9,6 +9,12 @@ + + + + + + @@ -50,5 +56,9 @@ + + + + From 6665cdf1096e81845e5263f4fd86f01a60188c61 Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 17:34:11 -0700 Subject: [PATCH 13/43] =?UTF-8?q?removed=20light=20from=20sun=20and=20moon?= =?UTF-8?q?=20in=20sponsors=20bg=20=F0=9F=8C=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/waves/sponsorBGDarkDesktop.svg | 7 +------ public/assets/waves/sponsorBGDarkMobile.svg | 7 +------ public/assets/waves/sponsorBGDarkTablet.svg | 7 +------ public/assets/waves/sponsorBGLightDesktop.svg | 7 +------ public/assets/waves/sponsorBGLightMobile.svg | 7 +------ public/assets/waves/sponsorBGLightTablet.svg | 7 +------ 6 files changed, 6 insertions(+), 36 deletions(-) diff --git a/public/assets/waves/sponsorBGDarkDesktop.svg b/public/assets/waves/sponsorBGDarkDesktop.svg index 5b86309..0374710 100644 --- a/public/assets/waves/sponsorBGDarkDesktop.svg +++ b/public/assets/waves/sponsorBGDarkDesktop.svg @@ -11,13 +11,12 @@ - - + @@ -63,9 +62,5 @@ - - - - diff --git a/public/assets/waves/sponsorBGDarkMobile.svg b/public/assets/waves/sponsorBGDarkMobile.svg index 930e7b3..87cf941 100644 --- a/public/assets/waves/sponsorBGDarkMobile.svg +++ b/public/assets/waves/sponsorBGDarkMobile.svg @@ -27,13 +27,12 @@ - - + @@ -152,9 +151,5 @@ - - - - diff --git a/public/assets/waves/sponsorBGDarkTablet.svg b/public/assets/waves/sponsorBGDarkTablet.svg index da24b69..d5bc851 100644 --- a/public/assets/waves/sponsorBGDarkTablet.svg +++ b/public/assets/waves/sponsorBGDarkTablet.svg @@ -11,13 +11,12 @@ - - + @@ -63,9 +62,5 @@ - - - - diff --git a/public/assets/waves/sponsorBGLightDesktop.svg b/public/assets/waves/sponsorBGLightDesktop.svg index 9ea3d4d..1a4445d 100644 --- a/public/assets/waves/sponsorBGLightDesktop.svg +++ b/public/assets/waves/sponsorBGLightDesktop.svg @@ -8,13 +8,12 @@ - - + @@ -56,9 +55,5 @@ - - - - diff --git a/public/assets/waves/sponsorBGLightMobile.svg b/public/assets/waves/sponsorBGLightMobile.svg index 5c5d854..5ab3ab0 100644 --- a/public/assets/waves/sponsorBGLightMobile.svg +++ b/public/assets/waves/sponsorBGLightMobile.svg @@ -27,12 +27,11 @@ - - + @@ -153,9 +152,5 @@ - - - - diff --git a/public/assets/waves/sponsorBGLightTablet.svg b/public/assets/waves/sponsorBGLightTablet.svg index e4dec8e..3cd9572 100644 --- a/public/assets/waves/sponsorBGLightTablet.svg +++ b/public/assets/waves/sponsorBGLightTablet.svg @@ -8,13 +8,12 @@ - - + @@ -56,9 +55,5 @@ - - - - From 93905f656f550b9e0ee5445db0cc8b1aaeabfe91 Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 17:46:55 -0700 Subject: [PATCH 14/43] =?UTF-8?q?=F0=9F=90=9B=20fix=20mobile=20svg=20for?= =?UTF-8?q?=20sponsor=20bg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/waves/sponsorBGDarkMobile.svg | 6 +++--- public/assets/waves/sponsorBGLightMobile.svg | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/assets/waves/sponsorBGDarkMobile.svg b/public/assets/waves/sponsorBGDarkMobile.svg index 87cf941..7d0cdf5 100644 --- a/public/assets/waves/sponsorBGDarkMobile.svg +++ b/public/assets/waves/sponsorBGDarkMobile.svg @@ -28,9 +28,9 @@ - - - + + + diff --git a/public/assets/waves/sponsorBGLightMobile.svg b/public/assets/waves/sponsorBGLightMobile.svg index 5ab3ab0..22f7026 100644 --- a/public/assets/waves/sponsorBGLightMobile.svg +++ b/public/assets/waves/sponsorBGLightMobile.svg @@ -28,11 +28,11 @@ - - - - + + + + From 711d53c48c14977fb78f4e07d6e8b3442ccc4d26 Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 18:31:19 -0700 Subject: [PATCH 15/43] updated committee section links --- pages/sections/team.tsx | 121 +++++++++++++++++++++++++++++++--------- 1 file changed, 95 insertions(+), 26 deletions(-) diff --git a/pages/sections/team.tsx b/pages/sections/team.tsx index c6e89ec..891c800 100644 --- a/pages/sections/team.tsx +++ b/pages/sections/team.tsx @@ -133,21 +133,67 @@ const swe_committee = [ } ]; -const sponsorship_committee = [ - 'Jasmita Yechuri', - 'Javier Herrera Jr.', - 'Freddy Song', - 'Joseph Hoang', - 'Javier Vargas', - 'Brian Uong', - 'Adreyan Distor', - 'Minnoli Nori', - 'Isabelle Celo', - 'Felix Maass', - 'Suhani Chaudhary' +const operations_committee = [ + { + link: '', + name: 'Ronit Bhushan' + }, + { + link: '', + name: 'Sneha Panda' + }, + { + link: '', + name: 'Ethan Quach' + } ]; -const operations_committee = ['Ronit Bhushan', 'Sneha Panda', 'Ethan Quach']; +const sponsorhip_committee = [ + { + link: '', + name: 'Jasmita Yechuri' + }, + { + link: '', + name: 'Javier Herrera Jr.' + }, + { + link: '', + name: 'Freddy Song' + }, + { + link: '', + name: 'Joseph Hoang' + }, + { + link: '', + name: 'Javier Vargas' + }, + { + link: '', + name: 'Brian Uong' + }, + { + link: '', + name: 'Adreyan Distor' + }, + { + link: '', + name: 'Minnoli Nori' + }, + { + link: '', + name: 'Isabelle Celo' + }, + { + link: '', + name: 'Felix Maass' + }, + { + link: 'https://www.linkedin.com/in/suhani-chaudhary-25a476244', + name: 'Suhani Chaudhary' + } +]; export const Assets = () => { const { theme } = useTheme(); @@ -395,10 +441,24 @@ const team = () => { > Operations

- {operations_committee.map((member, index) => ( -

- {member} -

+ {operations_committee.map(({ link, name }) => ( + +

+ {name} +

+ ))}
@@ -409,10 +469,24 @@ const team = () => { > Sponsorship

- {sponsorship_committee.map((member, index) => ( -

- {member} -

+ {sponsorhip_committee.map(({ link, name }) => ( + +

+ {name} +

+ ))}
@@ -423,11 +497,6 @@ const team = () => { > Software Engineers

- {/* {swe_committee.map((link, name, index) => ( -

- {name} -

- ))} */} {swe_committee.map(({ link, name }) => ( Date: Sat, 1 Apr 2023 19:42:17 -0700 Subject: [PATCH 16/43] :necktie: add awknoledge checkbox --- components/Form/ApplicationForm/components.tsx | 11 ++++++++++- components/Form/ApplicationForm/options.tsx | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/components/Form/ApplicationForm/components.tsx b/components/Form/ApplicationForm/components.tsx index 668f9c2..8dfc2d9 100644 --- a/components/Form/ApplicationForm/components.tsx +++ b/components/Form/ApplicationForm/components.tsx @@ -10,7 +10,8 @@ import { firstTimeHacker, foodPreference, shirtSize, - MLH + MLH, + awk } from './options'; interface Props { @@ -180,6 +181,14 @@ export const HackerApp = ({ register, errors, setFileUploaded }: Props) => ( errors={errors} /> + Date: Sat, 1 Apr 2023 19:46:48 -0700 Subject: [PATCH 17/43] :bug: fixed random floating assets that are random and just random --- pages/index.tsx | 2 +- pages/sections/faq.tsx | 2 +- pages/sections/team.tsx | 59 +++++++++++++++-------------------------- 3 files changed, 24 insertions(+), 39 deletions(-) diff --git a/pages/index.tsx b/pages/index.tsx index 0b00521..75bf063 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -135,7 +135,7 @@ export default function Home() {
-
+
{theme === 'light' ? ( { export default function Faq() { return ( -
+

FAQ

diff --git a/pages/sections/team.tsx b/pages/sections/team.tsx index 891c800..a3a2ea9 100644 --- a/pages/sections/team.tsx +++ b/pages/sections/team.tsx @@ -128,65 +128,65 @@ const swe_committee = [ name: 'Raidah Fairooz' }, { - link: '', + link: null, name: 'Kirtana Venkat' } ]; const operations_committee = [ { - link: '', + link: null, name: 'Ronit Bhushan' }, { - link: '', + link: null, name: 'Sneha Panda' }, { - link: '', + link: null, name: 'Ethan Quach' } ]; const sponsorhip_committee = [ { - link: '', + link: 'https://www.linkedin.com/in/jasmita-yechuri-0b7a871bb/', name: 'Jasmita Yechuri' }, { - link: '', + link: 'https://www.linkedin.com/in/javier-herrera-jr-832717264/', name: 'Javier Herrera Jr.' }, { - link: '', + link: null, name: 'Freddy Song' }, { - link: '', + link: null, name: 'Joseph Hoang' }, { - link: '', + link: null, name: 'Javier Vargas' }, { - link: '', + link: null, name: 'Brian Uong' }, { - link: '', + link: null, name: 'Adreyan Distor' }, { - link: '', + link: null, name: 'Minnoli Nori' }, { - link: '', + link: null, name: 'Isabelle Celo' }, { - link: '', + link: null, name: 'Felix Maass' }, { @@ -233,7 +233,7 @@ export const Assets = () => { repeat: Infinity, duration: 5 }} - className="absolute z-10 max-md:hidden right-10 top-52 w-20 xl:w-24" + className="absolute z-10 max-md:hidden right-10 top-52 w-20 xl:w-24 " > {theme === 'light' ? ( bird @@ -263,24 +263,9 @@ export const Assets = () => { repeat: Infinity, duration: 5 }} - className="absolute z-30 max-md:hidden left-0 lg:left-0 xl:left-32 -bottom-96 lg:-bottom-96 xl:-bottom-96 w-12 xl:w-24" + className="absolute max-md:hidden left-0 lg:left-0 xl:left-32 -bottom-48 lg:-bottom-56 xl:-bottom-64 w-12 xl:w-24 z-[1000]" > - cloud - - {/* cloud bottom right */} - - {theme === 'light' ? ( - cloud - ) : ( - cloud - )} + balloon {/* bird */} { star )} - {/* cloud top left */} + {/* bird top left */} {

{

{

Date: Sat, 1 Apr 2023 19:56:40 -0700 Subject: [PATCH 18/43] :lipstick: bye bye mikus work --- pages/index.tsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pages/index.tsx b/pages/index.tsx index b161f27..6ca724d 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -8,7 +8,6 @@ import Tracks from '@/pages/sections/tracks'; import Support from '@/pages/sections/support'; import Sponsors from '@/pages/sections/sponsors'; import Faq from '@/pages/sections/faq'; -import Schedule from '@/pages/sections/schedule'; import Team from '@/pages/sections/team'; import Footer from '@/components/Footer'; import FooterWaveLight from '@/public/assets/waves/footer_wave.svg'; @@ -47,12 +46,6 @@ export default function Home() { - - - From 4443749bf681190da8d00ad95fd3ef1a82b04099 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 20:09:28 -0700 Subject: [PATCH 19/43] :art: touchup + plan out QR code --- components/QRCode.tsx | 3 +-- pages/users/[id].tsx | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/QRCode.tsx b/components/QRCode.tsx index 7bfd5cb..671148b 100644 --- a/components/QRCode.tsx +++ b/components/QRCode.tsx @@ -7,9 +7,8 @@ import { useSession } from 'next-auth/react'; } export default function QR() { const { data: session } = useSession(); - // TODO: make base url env var return session ? ( - + ) : (

log in pls

); diff --git a/pages/users/[id].tsx b/pages/users/[id].tsx index 760b007..4a09c3d 100644 --- a/pages/users/[id].tsx +++ b/pages/users/[id].tsx @@ -125,7 +125,7 @@ export default function Info({ userData }) { { checkInInperson(); }} @@ -138,6 +138,7 @@ export default function Info({ userData }) { {name.first}, {name.last}

{email}

+ {/* TODO: only allow people who applied before `applied_after_limit` pick up tshirt; (display ingeligible to pickup tshirt or sum) */}
{pickedUpShirt ? (

picked up

@@ -147,7 +148,7 @@ export default function Info({ userData }) { { markTshirt(); }} @@ -185,7 +186,7 @@ export default function Info({ userData }) { { approveRejectUser(email, name.first, true, uid); }} @@ -195,7 +196,7 @@ export default function Info({ userData }) { { approveRejectUser(email, name.first, false, uid); }} From f6ba3f790520651859e597aaa74b94dc969a282d Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 20:18:15 -0700 Subject: [PATCH 20/43] i lost my changes abt changing poles and colors? --- components/Schedule.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/Schedule.tsx b/components/Schedule.tsx index 12c479f..7c27a2e 100644 --- a/components/Schedule.tsx +++ b/components/Schedule.tsx @@ -325,7 +325,7 @@ export const Mobile = () => {
-
+
flag
@@ -337,10 +337,10 @@ export const Mobile = () => { time={time} description={description} place={place} - color="border-gold" + color="border-[#D56774]" /> ))} - +
@@ -478,8 +478,8 @@ export const Desktop = () => { Date: Sat, 1 Apr 2023 20:25:58 -0700 Subject: [PATCH 21/43] :necktie: applied_after_limit set to 200 --- components/Form/ApplicationForm/index.tsx | 3 ++- pages/api/auth/[...nextauth].ts | 1 + pages/sections/landing.tsx | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/components/Form/ApplicationForm/index.tsx b/components/Form/ApplicationForm/index.tsx index 7ea082c..4dcd1fc 100644 --- a/components/Form/ApplicationForm/index.tsx +++ b/components/Form/ApplicationForm/index.tsx @@ -122,8 +122,9 @@ export function ApplicationForm() { } setClickedSubmitOnce(Boolean(true)); + // tshirts only available for 200 people // eslint-disable-next-line prefer-const - let applied_after_limit = data.numUsersInperson >= 350 ? true : false; + let applied_after_limit = data.numUsersInperson >= 200 ? true : false; // generate other user attributes // eslint-disable-next-line prefer-const diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts index b0d81b4..5982b29 100644 --- a/pages/api/auth/[...nextauth].ts +++ b/pages/api/auth/[...nextauth].ts @@ -38,6 +38,7 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) { session.user.participation = user.participation; session.user.InPersonCheckIn = user.InPersonCheckIn; session.user.pickedUpShirt = user.pickedUpShirt; + session.user.applied_after_limit = user.applied_after_limit; return session; } }, diff --git a/pages/sections/landing.tsx b/pages/sections/landing.tsx index b9af034..22006be 100644 --- a/pages/sections/landing.tsx +++ b/pages/sections/landing.tsx @@ -234,6 +234,13 @@ export default function Landing() {
April 29-30, 2023
+ {status == 'authenticated' && session.user.applied_after_limit && ( +

+ Based on the time of your application, we can no longer guarantee + a shirt due to our limited inventory. +

+ )} + {/*

In-person sign-ups will close today at 5:30 PM PST, as we are reaching maximum capacity

*/} From 2c045be8895f73e05cd73aa327dab6f06f777f69 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 20:27:49 -0700 Subject: [PATCH 22/43] :pencil2: immigrant issues --- components/Form/ApplicationForm/options.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Form/ApplicationForm/options.tsx b/components/Form/ApplicationForm/options.tsx index 5ceaf38..ddb9420 100644 --- a/components/Form/ApplicationForm/options.tsx +++ b/components/Form/ApplicationForm/options.tsx @@ -86,5 +86,5 @@ export const MLH = [ ]; export const awk = [ - ['I awknowledge that I will compete and participate In-Person.'] + ['I acknowledge that I will compete and participate In-Person.'] ]; From 0009955c4200b108282b51472c4560cf1d9e5d0d Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 20:32:11 -0700 Subject: [PATCH 23/43] added brownHover font --- components/Footer.tsx | 6 ++-- components/Schedule.tsx | 10 +++---- components/SponsorGrid.tsx | 2 +- pages/sections/tracks.tsx | 59 +++++++++++++++++++++++++++++++++++++- styles/globals.css | 3 ++ tailwind.config.js | 1 + 6 files changed, 72 insertions(+), 9 deletions(-) diff --git a/components/Footer.tsx b/components/Footer.tsx index a340dca..2a3414d 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -91,9 +91,11 @@ export default function Footer() { Made with {theme === 'light' ? ( - + + + ) : ( - + )} diff --git a/components/Schedule.tsx b/components/Schedule.tsx index 7c27a2e..b161b4d 100644 --- a/components/Schedule.tsx +++ b/components/Schedule.tsx @@ -290,14 +290,14 @@ export const EventMobile = ({ time, description, color, place }) => {

{time}

{place} @@ -309,7 +309,7 @@ export const EventMobile = ({ time, description, color, place }) => {

{description}

{time} @ {place} @@ -393,7 +393,7 @@ export const EventDesktop = ({

{leftTime} @ {leftPlace} @@ -413,7 +413,7 @@ export const EventDesktop = ({

{rightTime} @ {rightPlace} diff --git a/components/SponsorGrid.tsx b/components/SponsorGrid.tsx index ee8473f..8a689eb 100644 --- a/components/SponsorGrid.tsx +++ b/components/SponsorGrid.tsx @@ -138,7 +138,7 @@ const tiers = [ image: '/assets/sponsors/acm.webp', width: 1080, height: 1080, - link: 'https://acmucr.org/', + link: 'https://acm.cs.ucr.edu/', border: 'border-[#4185FC]' }, { diff --git a/pages/sections/tracks.tsx b/pages/sections/tracks.tsx index 7db8073..875f35a 100644 --- a/pages/sections/tracks.tsx +++ b/pages/sections/tracks.tsx @@ -1,6 +1,6 @@ import { motion } from 'framer-motion'; import Image from 'next/image'; -import React from 'react'; +import React, { useState } from 'react'; import NewFrontiers from '../../public/assets/newFrontiers.svg'; import globalCommunity from '../../public/assets/globalCommunity.svg'; import sustainability from '../../public/assets/sustainability.svg'; @@ -12,6 +12,63 @@ import balloon5k from '../../public/assets/balloon5k.svg'; import balloonRed from '../../public/assets/balloonRed.svg'; import { useTheme } from 'next-themes'; +const TracksWrapper = ({ name, position, link, image }) => { + const [isHover, setIsHover] = useState(false); + const { theme } = useTheme(); + return ( +

+ ); +}; + export const Assets = () => { const { theme } = useTheme(); diff --git a/styles/globals.css b/styles/globals.css index 65691f6..e2e7365 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -26,6 +26,7 @@ body { --lightPurple: #5c6084; --hoverPrimary: #5c6084; --goldHover: #ffc753; + --brownHover: #987a5e; --link: #71461f; --text: #373a5e; --clouds: url('/assets/clouds.svg'); @@ -48,6 +49,7 @@ body { --purple: #373a5e; --hoverPrimary: #5c6084; --goldHover: #ffc753; + --brownHover: #987a5e; --lightPurple: #5c6084; --link: #71461f; --text: #373a5e; @@ -73,6 +75,7 @@ body { --lightPurple: #5c6084; --hoverPrimary: #7495be; --goldHover: #ffc753; + --brownHover: #987a5e; --link: #ffac01; --text: #ffff; --clouds: url('/assets/clouds.svg'); diff --git a/tailwind.config.js b/tailwind.config.js index 2e6819d..b5a8c4f 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -70,6 +70,7 @@ module.exports = { text: 'var(--text)', hoverPrimary: 'var(--hoverPrimary)', goldHover: 'var(--goldHover)', + brownHover: 'var(--brownHover)', link: 'var(--link)' }, backgroundImage: { From c574616c84d5289c5b361b7755cc4becb9924204 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 20:33:45 -0700 Subject: [PATCH 24/43] :pencil2: mariam likes swag --- pages/sections/landing.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/sections/landing.tsx b/pages/sections/landing.tsx index 22006be..68b9ca9 100644 --- a/pages/sections/landing.tsx +++ b/pages/sections/landing.tsx @@ -235,9 +235,9 @@ export default function Landing() { April 29-30, 2023
{status == 'authenticated' && session.user.applied_after_limit && ( -

+

Based on the time of your application, we can no longer guarantee - a shirt due to our limited inventory. + swag due to our limited inventory.

)} From a94972c3e2753fa6ffeeac983c15e65289ec04b7 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 20:39:29 -0700 Subject: [PATCH 25/43] :coffin: remove TODOs --- components/Form/ApplicationForm/index.tsx | 1 - styles/globals.css | 1 - 2 files changed, 2 deletions(-) diff --git a/components/Form/ApplicationForm/index.tsx b/components/Form/ApplicationForm/index.tsx index 4dcd1fc..1defd6b 100644 --- a/components/Form/ApplicationForm/index.tsx +++ b/components/Form/ApplicationForm/index.tsx @@ -96,7 +96,6 @@ export function ApplicationForm() { }; const onSubmit = async ({ - // TODO: add ucr sid in db first_name, last_name, gender, diff --git a/styles/globals.css b/styles/globals.css index 93b188c..6c0e2f8 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -57,7 +57,6 @@ body { } [data-theme='dark'] { - /* TODO: NEED TO CHANGE COLORS FOR DARK MODE (it is currently same as light mode) */ --sky: #2c314f; --bubble: #b1e3ff; --darkgreen: #2f5525; From 5dcecc90e0432d7caadb8b74988e100c520437bf Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 21:03:13 -0700 Subject: [PATCH 26/43] :necktie: checkin stuff --- components/Form/CheckinForm/components.tsx | 58 ++++++++-------------- components/Form/CheckinForm/index.tsx | 10 ++-- components/Form/components.tsx | 4 +- components/UserBar/UserDropdown.tsx | 6 +-- pages/checkin.tsx | 4 +- pages/sections/landing.tsx | 12 ++--- 6 files changed, 41 insertions(+), 53 deletions(-) diff --git a/components/Form/CheckinForm/components.tsx b/components/Form/CheckinForm/components.tsx index f51d00a..7f9a3e7 100644 --- a/components/Form/CheckinForm/components.tsx +++ b/components/Form/CheckinForm/components.tsx @@ -22,43 +22,27 @@ export function Confirmation({ register, errors, watch }: Props) { return ( <> - {session.user.participation === 'In-Person' && ( - <> - - - )} - {inperson_confirmation === 'Yes' && ( - <> - - These photos will be posted on our Instagram and other social - media. If you have a problem with this, please contact us at{' '} - - . - - } - variable="photo_consent" - options={[ - 'Yes, I give you permission to take pictures that may include me.' - ]} - register={register} - errors={errors} - required - /> - - )} + + These photos will be posted on our Instagram and other social + media. If you have a problem with this, please contact us at{' '} + + . + + } + variable="photo_consent" + options={[ + 'Yes, I give you permission to take pictures that may include me.' + ]} + register={register} + errors={errors} + required + /> -

Check-In Form

-

- Fill out this form to confirm your participation for Cutie Hack 2022! +

+ Check-In Form +

+

+ Fill out this form to confirm your participation for Citrus Hack 2023!

triggerErrorNotification()} > {clickedSubmitOnce ? 'Submitting...' : 'Submit'} diff --git a/components/Form/components.tsx b/components/Form/components.tsx index 2e77e13..416b7cc 100644 --- a/components/Form/components.tsx +++ b/components/Form/components.tsx @@ -144,7 +144,7 @@ export const Radio = ({ }: RadioProps) => (
{label} - {subtext &&

{subtext}

} + {subtext &&

{subtext}

}
(
{label} - {subtext &&

{subtext}

} + {subtext &&

{subtext}

}
{options.map((option: string) => (
diff --git a/components/UserBar/UserDropdown.tsx b/components/UserBar/UserDropdown.tsx index ca99c91..8c2070d 100644 --- a/components/UserBar/UserDropdown.tsx +++ b/components/UserBar/UserDropdown.tsx @@ -137,8 +137,8 @@ export function UserDropdown() {
))} - {/* uncomment the day before */} - {status === 'authenticated' && + {/* TODO: uncomment the day before */} + {/* {status === 'authenticated' && session.user.uid && session.user.qualified === 'yeah' && (!session.user.checkedIn ? ( @@ -165,7 +165,7 @@ export function UserDropdown() {
Checked-In
- ))} + ))} */} {status === 'authenticated' && session.user.uid && session.user.qualified === 'yeah' && ( diff --git a/pages/checkin.tsx b/pages/checkin.tsx index ee4b4b9..939d48f 100644 --- a/pages/checkin.tsx +++ b/pages/checkin.tsx @@ -6,7 +6,9 @@ export default function CheckIn() { // TODO: change 'admin' to 'checkedIn' to open up form the day before diff --git a/pages/sections/landing.tsx b/pages/sections/landing.tsx index 68b9ca9..9b3b51f 100644 --- a/pages/sections/landing.tsx +++ b/pages/sections/landing.tsx @@ -288,22 +288,22 @@ export default function Landing() { )} */}
- {/* uncomment the day before */} - {status === 'authenticated' && + {/* TODO: uncomment the day before */} + {/* {status === 'authenticated' && session.user.uid && session.user.qualified === 'yeah' && !session.user.checkedIn && ( - )} + )} */} {status === 'authenticated' && session.user.uid && session.user.qualified === 'yeah' && ( <> - + )} From 3895681bcca5a6a999676c65e62dc92066db317b Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 21:34:03 -0700 Subject: [PATCH 27/43] :lipstick: redo group dashboards --- pages/group/dashboard.tsx | 54 +++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/pages/group/dashboard.tsx b/pages/group/dashboard.tsx index c8b75d9..fba0de2 100644 --- a/pages/group/dashboard.tsx +++ b/pages/group/dashboard.tsx @@ -117,13 +117,15 @@ export default function GroupDashboard() { return ( -
+
{status === 'authenticated' && (session.user.gid === '' ? ( <> -
-

Join a Group

-

Have a group to join? Just enter the invite code below.

+
+

Join a Group

+

+ Have a group to join? Just enter the invite code below. +

triggerErrorNotification()} > Join Group
-
-

Create a Group

-

+

+

Create a Group

+

Want to make your own group? Click the button below to create a group.

createGroup()} > {clickedCreateOnce ? 'Creating Group...' : 'Create Group'} @@ -165,8 +167,8 @@ export default function GroupDashboard() { ) : (
-

My Group

-

+

My Group

+

Join the{' '} {' '} to look for more teammates for important updates on the day of.

-

Note that groups can only contain a max total of 4 hackers.

-

Want others to join? Share the invite code below.

-

Invite Code

+

+ Note that groups can only contain a max total of 4 hackers. +

+

+ Want others to join? Share the invite code below. +

+

Invite Code

-

Members

+

Members

{(error || !data) && (cachedData ? ( -
    +
      {cachedData.members.map(({ name }) => (
    • - {name.first} {name.last} + + {name.first} {name.last} +
      • ))}
    @@ -209,10 +217,12 @@ export default function GroupDashboard() { 'Loading...' ))} {!error && data && !isValidating ? ( -
      +
        {data.members.map(({ name }) => (
      • - {name.first} {name.last} + + {name.first} {name.last} +
        • ))}
      @@ -226,7 +236,7 @@ export default function GroupDashboard() { setModalOpen(true)} > Leave Group @@ -236,7 +246,7 @@ export default function GroupDashboard() { Go Back to Homepage From cda424bf9a5cda9269d02cbee085d038aa19b4cc Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 21:34:26 -0700 Subject: [PATCH 28/43] :necktie: take out checkin in dropdown --- components/UserBar/UserDropdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/UserBar/UserDropdown.tsx b/components/UserBar/UserDropdown.tsx index 8c2070d..ab3a42a 100644 --- a/components/UserBar/UserDropdown.tsx +++ b/components/UserBar/UserDropdown.tsx @@ -137,7 +137,7 @@ export function UserDropdown() {
))} - {/* TODO: uncomment the day before */} + {/* TODO:uncomment the day before */} {/* {status === 'authenticated' && session.user.uid && session.user.qualified === 'yeah' && From 08c21790e39af0032810cbbb788f2ff2e5ff503a Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 21:34:38 -0700 Subject: [PATCH 29/43] :lipstick: minor style issue --- components/Form/components.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/Form/components.tsx b/components/Form/components.tsx index 416b7cc..d7d9c09 100644 --- a/components/Form/components.tsx +++ b/components/Form/components.tsx @@ -60,6 +60,7 @@ export const Input = ({ 'w-full rounded-lg focus:border-highlight focus:outline-none focus:ring-highlight file:px-4 file:py-1.5 file:rounded-full file:border-0 file:bg-highlight file:text-sm file:font-semibold file:cursor-pointer hover:cursor-pointer' + (type === 'date' ? 'py-1.5 ' : 'py-1 ') + (type === 'file' ? ' text-white ' : 'bg-secondary px-2 border-2 ') + + (type === 'text' ? ' text-text ' : '') + (errors[variable] ? 'border-red-500' : 'border-highlight') } onChange={onChange} From b979ab0bf79600c6c9db65a7cdbaeec1d2fe83b6 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 21:50:46 -0700 Subject: [PATCH 30/43] :lipstick: group leave colors --- pages/group/dashboard.tsx | 4 ++-- tailwind.config.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pages/group/dashboard.tsx b/pages/group/dashboard.tsx index fba0de2..1ba086f 100644 --- a/pages/group/dashboard.tsx +++ b/pages/group/dashboard.tsx @@ -263,7 +263,7 @@ export default function GroupDashboard() { leaveGroup()} > Confirm @@ -271,7 +271,7 @@ export default function GroupDashboard() { setModalOpen(false)} > Cancel diff --git a/tailwind.config.js b/tailwind.config.js index 43674e1..3fe5157 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -35,7 +35,6 @@ module.exports = { theme: { colors: { 'green': '#2BAD21', - 'blue': '#00f', }, linearBorderGradients: theme => ({ colors: theme('colors'), From 0fbcc8757c7ff93f48f1569e33d1241e78e37ba4 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 21:59:21 -0700 Subject: [PATCH 31/43] :bug: gradient library is buggin; bandaid fix --- components/SponsorGrid.tsx | 4 ++-- tailwind.config.js | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/components/SponsorGrid.tsx b/components/SponsorGrid.tsx index ee8473f..c9db00a 100644 --- a/components/SponsorGrid.tsx +++ b/components/SponsorGrid.tsx @@ -269,7 +269,7 @@ export function SponsorsGrid() { (wide ? 'col-span-2' : 'col-span-2 sm:col-span-1') } > - + - + ({ - colors: theme('colors'), - }), + // colors: { + // 'green': '#2BAD21', + // }, + // linearBorderGradients: { + // 'green': '#69c063', + // 'blue': '#00f', + // }, borderWidth: { 11: '11px' @@ -85,5 +86,6 @@ module.exports = { } } }, - plugins: [MyClass, require('tailwindcss-border-gradients')(),] + // plugins: [MyClass, require('tailwindcss-border-gradients')(),] + plugins: [MyClass] }; From 43c9ebe358ab2463336355cebd601df567c9ab9b Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 22:05:29 -0700 Subject: [PATCH 32/43] :lipstick: admin dashboard color ;( --- components/Admin/Row/User/components.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/Admin/Row/User/components.tsx b/components/Admin/Row/User/components.tsx index 888b229..5df76de 100644 --- a/components/Admin/Row/User/components.tsx +++ b/components/Admin/Row/User/components.tsx @@ -19,7 +19,7 @@ export function UserBox({
)}
- {user.email} + {user.email}
Date: Sat, 1 Apr 2023 22:11:47 -0700 Subject: [PATCH 33/43] :alien: add discord link --- pages/sections/landing.tsx | 2 +- pages/sections/live-landing.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/sections/landing.tsx b/pages/sections/landing.tsx index 9b3b51f..9136fb9 100644 --- a/pages/sections/landing.tsx +++ b/pages/sections/landing.tsx @@ -305,7 +305,7 @@ export default function Landing() { diff --git a/pages/sections/live-landing.tsx b/pages/sections/live-landing.tsx index bfe9a5a..3af7210 100644 --- a/pages/sections/live-landing.tsx +++ b/pages/sections/live-landing.tsx @@ -68,7 +68,7 @@ export default function Landing() { From 6c9a50f551f41e6de705a06a26fe635fece128c7 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 22:14:11 -0700 Subject: [PATCH 34/43] :lipstick: spamming honestly --- components/Nav.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/Nav.tsx b/components/Nav.tsx index 3b03c91..c63f499 100644 --- a/components/Nav.tsx +++ b/components/Nav.tsx @@ -109,7 +109,7 @@ export default function Nav() { duration={500} className="flex gap-2.5 items-center p-2 font-semibold text-lg truncate rounded-md hover:bg-hoverPrimary hover:text-white cursor-pointer text-white" > - {icon} + {icon} {title} @@ -129,7 +129,7 @@ export default function Nav() { duration={500} className="flex gap-2.5 items-center p-2 font-semibold text-lg truncate rounded-md hover:bg-hoverPrimary hover:text-white cursor-pointer text-white" > - {icon} + {icon} {title} @@ -144,10 +144,10 @@ export default function Nav() { className="flex gap-2.5 items-center p-2 font-semibold text-lg truncate rounded-md hover:bg-buttons hover:text-white cursor-pointer text-white" onClick={() => setNavOpen(false)} > - + - Home + Home @@ -192,7 +192,7 @@ export default function Nav() { className="flex gap-2.5 items-center p-2 font-semibold text-lg rounded-md hover:bg-buttons hover:text-white cursor-pointer text-white" onClick={() => setNavOpen(false)} > - {icon} + {icon} {title} ))} @@ -209,7 +209,7 @@ export default function Nav() { className="flex gap-2.5 items-center p-2 font-semibold text-lg rounded-md hover:bg-buttons hover:text-white cursor-pointer" onClick={() => setNavOpen(false)} > - {icon} + {icon} {title} ))} From 80810f22094cf0c6fbf00c2be6442a22507a8670 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 22:14:28 -0700 Subject: [PATCH 35/43] :lipstick: spamming whites --- components/Nav.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Nav.tsx b/components/Nav.tsx index c63f499..b727442 100644 --- a/components/Nav.tsx +++ b/components/Nav.tsx @@ -147,7 +147,7 @@ export default function Nav() { - Home + Home From 096d8edca8b942705a7af3e9df671ae2d14ed43f Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 22:24:13 -0700 Subject: [PATCH 36/43] fix vercel --- pages/sections/tracks.tsx | 57 --------------------------------------- 1 file changed, 57 deletions(-) diff --git a/pages/sections/tracks.tsx b/pages/sections/tracks.tsx index 875f35a..d1f186e 100644 --- a/pages/sections/tracks.tsx +++ b/pages/sections/tracks.tsx @@ -12,63 +12,6 @@ import balloon5k from '../../public/assets/balloon5k.svg'; import balloonRed from '../../public/assets/balloonRed.svg'; import { useTheme } from 'next-themes'; -const TracksWrapper = ({ name, position, link, image }) => { - const [isHover, setIsHover] = useState(false); - const { theme } = useTheme(); - return ( -
- -

{name}

-

- {position} -

- - setIsHover(true)} - onMouseLeave={() => setIsHover(false)} - > - - profile photo - - -
-

- {name} -

-

- {position} -

-
-
- ); -}; - export const Assets = () => { const { theme } = useTheme(); From 67d1782ca7c35394e20727b6c752ab69c7cc8daa Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 22:30:25 -0700 Subject: [PATCH 37/43] vercel --- pages/sections/tracks.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/sections/tracks.tsx b/pages/sections/tracks.tsx index d1f186e..7db8073 100644 --- a/pages/sections/tracks.tsx +++ b/pages/sections/tracks.tsx @@ -1,6 +1,6 @@ import { motion } from 'framer-motion'; import Image from 'next/image'; -import React, { useState } from 'react'; +import React from 'react'; import NewFrontiers from '../../public/assets/newFrontiers.svg'; import globalCommunity from '../../public/assets/globalCommunity.svg'; import sustainability from '../../public/assets/sustainability.svg'; From e913e8afd412df0eec48924ee9bfd14c252a4ac3 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sat, 1 Apr 2023 22:44:31 -0700 Subject: [PATCH 38/43] :bug: vercel --- components/Form/CheckinForm/components.tsx | 1 + components/UserBar/UserDropdown.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/components/Form/CheckinForm/components.tsx b/components/Form/CheckinForm/components.tsx index 7f9a3e7..d2445b8 100644 --- a/components/Form/CheckinForm/components.tsx +++ b/components/Form/CheckinForm/components.tsx @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ import { UseFormRegister, FieldValues, UseFormWatch } from 'react-hook-form'; import { useSession } from 'next-auth/react'; import { Group, Input, Select, Radio, Checkbox } from '../components'; diff --git a/components/UserBar/UserDropdown.tsx b/components/UserBar/UserDropdown.tsx index ab3a42a..33b0ba9 100644 --- a/components/UserBar/UserDropdown.tsx +++ b/components/UserBar/UserDropdown.tsx @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ /* eslint-disable react-hooks/exhaustive-deps */ import React, { useState, useEffect } from 'react'; import Link from 'next/link'; From 09e469d7bfed432e0ad981fb12ba241e5e34d018 Mon Sep 17 00:00:00 2001 From: msclal Date: Sat, 1 Apr 2023 23:32:50 -0700 Subject: [PATCH 39/43] fixed wave bug in support --- pages/sections/support.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/sections/support.tsx b/pages/sections/support.tsx index 9bb34a9..ab02df2 100644 --- a/pages/sections/support.tsx +++ b/pages/sections/support.tsx @@ -19,7 +19,7 @@ export default function Support() {

-
+

{ > Sponsorship

- {sponsorhip_committee.map(({ link, name }) => ( - -

+ link ? ( + +

+ {name} +

+ + ) : ( +

{name}

- - ))} + ) + )}

{ > Software Engineers

- {swe_committee.map(({ link, name }) => ( - -

+ link ? ( + +

+ {name} +

+ + ) : ( +

{name}

- - ))} + ) + )}
From 7428717117988bea2e0f57e48fa32dbb0ba6dce1 Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Sun, 2 Apr 2023 00:08:31 -0700 Subject: [PATCH 41/43] :lipstick: remove schedule in nav --- components/Nav.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/Nav.tsx b/components/Nav.tsx index b727442..91942b6 100644 --- a/components/Nav.tsx +++ b/components/Nav.tsx @@ -36,10 +36,6 @@ export default function Nav() { icon: , title: 'Tracks' }, - { - icon: , - title: 'Schedule' - }, { icon: , title: 'Support' From ea45bcbdbb3220e0eae5c2a36368ad0625ce9155 Mon Sep 17 00:00:00 2001 From: msclal Date: Sun, 2 Apr 2023 00:19:26 -0700 Subject: [PATCH 42/43] =?UTF-8?q?=F0=9F=A5=8AFIGMA'D=20the=20SPONSOR=20BG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/waves/sponsorBGDarkDesktop.svg | 70 +++--- public/assets/waves/sponsorBGDarkMobile.svg | 210 +++++++----------- public/assets/waves/sponsorBGDarkTablet.svg | 66 +++--- public/assets/waves/sponsorBGLightDesktop.svg | 74 +++--- public/assets/waves/sponsorBGLightMobile.svg | 181 +++++---------- public/assets/waves/sponsorBGLightTablet.svg | 67 +++--- 6 files changed, 262 insertions(+), 406 deletions(-) diff --git a/public/assets/waves/sponsorBGDarkDesktop.svg b/public/assets/waves/sponsorBGDarkDesktop.svg index 0374710..20cbb62 100644 --- a/public/assets/waves/sponsorBGDarkDesktop.svg +++ b/public/assets/waves/sponsorBGDarkDesktop.svg @@ -1,66 +1,60 @@ - - - - - + + + + + - - - - - + + + + + + - - - - - - + - - - - - - + - - + + - + - + - + - + - - - - - - - + + + - - - + + + + + + + + + + diff --git a/public/assets/waves/sponsorBGDarkMobile.svg b/public/assets/waves/sponsorBGDarkMobile.svg index 7d0cdf5..58a4677 100644 --- a/public/assets/waves/sponsorBGDarkMobile.svg +++ b/public/assets/waves/sponsorBGDarkMobile.svg @@ -1,155 +1,113 @@ - - - - - - - + + + + + + - - - - - - - + + + - - - - - - - + + + - - + + + + + - - - - - - - - + + + + + - - - - - - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + diff --git a/public/assets/waves/sponsorBGDarkTablet.svg b/public/assets/waves/sponsorBGDarkTablet.svg index d5bc851..1ab5540 100644 --- a/public/assets/waves/sponsorBGDarkTablet.svg +++ b/public/assets/waves/sponsorBGDarkTablet.svg @@ -1,66 +1,60 @@ - - - - - + + + + + - - - - - + + + - - - - - - + + + + - - - - - - + - - + + - + - + - + - + - + - - - - - - - + + + + + + + + + + diff --git a/public/assets/waves/sponsorBGLightDesktop.svg b/public/assets/waves/sponsorBGLightDesktop.svg index 1a4445d..d71cb01 100644 --- a/public/assets/waves/sponsorBGLightDesktop.svg +++ b/public/assets/waves/sponsorBGLightDesktop.svg @@ -1,59 +1,37 @@ - - - - - + + + + + + + + - - - - - - - - - + - - - - - - - - - - - - - - - - - + + - - + + - - - - - - - - - - - - + + + - - - + + + + + + + + + + diff --git a/public/assets/waves/sponsorBGLightMobile.svg b/public/assets/waves/sponsorBGLightMobile.svg index 22f7026..3eccafc 100644 --- a/public/assets/waves/sponsorBGLightMobile.svg +++ b/public/assets/waves/sponsorBGLightMobile.svg @@ -1,156 +1,87 @@ - - - - - - - + + + + + + - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + - - + + - - - - - - - - - - - - + + - - + + - - - + + + - - - + + + + - - - - - - - - - + + + - - + + - - - - - - + + - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - + - - + - - - - + + + + + + + + + + diff --git a/public/assets/waves/sponsorBGLightTablet.svg b/public/assets/waves/sponsorBGLightTablet.svg index 3cd9572..a205e75 100644 --- a/public/assets/waves/sponsorBGLightTablet.svg +++ b/public/assets/waves/sponsorBGLightTablet.svg @@ -1,59 +1,60 @@ - - - - - + + + + + - - + + + - - - - - - + + + + - - - - - - + - - + + - - + + - - + + - - - + + + - - + + - + - - + + + + + + + + + From 529be3ff798dc2e0f8a282f8065ba73e03ebf047 Mon Sep 17 00:00:00 2001 From: msclal Date: Sun, 2 Apr 2023 00:27:42 -0700 Subject: [PATCH 43/43] fix out of place balloon and cloud in team section --- pages/sections/team.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/sections/team.tsx b/pages/sections/team.tsx index cabc921..6cb563b 100644 --- a/pages/sections/team.tsx +++ b/pages/sections/team.tsx @@ -248,7 +248,7 @@ export const Assets = () => { repeat: Infinity, duration: 5 }} - className="absolute z-30 max-md:hidden left-0 md:left-10 bottom-10 md:-bottom-52 w-16 sm:w-24 xl:w-32" + className="absolute z-30 max-md:hidden left-0 md:left-10 bottom-10 md:-bottom-24 w-16 sm:w-24 xl:w-32" > {theme === 'light' ? ( @@ -263,7 +263,7 @@ export const Assets = () => { repeat: Infinity, duration: 5 }} - className="absolute max-md:hidden left-0 lg:left-0 xl:left-32 -bottom-48 lg:-bottom-56 xl:-bottom-64 w-12 xl:w-24 z-[1000]" + className="absolute max-md:hidden left-0 lg:left-0 xl:left-32 -bottom-48 md:-bottom-40 lg:-bottom-56 xl:-bottom-64 w-12 xl:w-24 z-[1000]" > @@ -274,7 +274,7 @@ export const Assets = () => { repeat: Infinity, duration: 3 }} - className="absolute z-40 right-6 -bottom-[150%] max-md:hidden xs:-bottom-[45%] sm:-bottom-[35%] md:-bottom-52 xl:bottom-0 w-10 xs:w-20 xl:w-32" + className="absolute z-40 right-6 -bottom-[150%] max-md:hidden xs:-bottom-[45%] sm:-bottom-[35%] md:-bottom-52 bg xl:bottom-0 w-10 xs:w-20 xl:w-32" > {theme === 'light' ? (