diff --git a/public/hero/h1.png b/public/hero/h1.png new file mode 100644 index 0000000..84bd694 Binary files /dev/null and b/public/hero/h1.png differ diff --git a/public/hero/h2.png b/public/hero/h2.png new file mode 100644 index 0000000..4b77001 Binary files /dev/null and b/public/hero/h2.png differ diff --git a/public/hero/h3.png b/public/hero/h3.png new file mode 100644 index 0000000..b2c0010 Binary files /dev/null and b/public/hero/h3.png differ diff --git a/public/hero/h4.png b/public/hero/h4.png new file mode 100644 index 0000000..1e7dbc3 Binary files /dev/null and b/public/hero/h4.png differ diff --git a/public/hero/h5.png b/public/hero/h5.png new file mode 100644 index 0000000..7ea7853 Binary files /dev/null and b/public/hero/h5.png differ diff --git a/public/hero/lights.png b/public/hero/lights.png new file mode 100644 index 0000000..6f47c36 Binary files /dev/null and b/public/hero/lights.png differ diff --git a/public/hero/mobo.svg b/public/hero/mobo.svg new file mode 100644 index 0000000..50d5c4f --- /dev/null +++ b/public/hero/mobo.svg @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/landing/images/gbms.jpg b/public/landing/images/gbms.jpg new file mode 100644 index 0000000..6b9e5eb Binary files /dev/null and b/public/landing/images/gbms.jpg differ diff --git a/public/landing/images/gbms.png b/public/landing/images/gbms.png deleted file mode 100644 index 0f524ef..0000000 Binary files a/public/landing/images/gbms.png and /dev/null differ diff --git a/public/landing/images/pc-builds.jpg b/public/landing/images/pc-builds.jpg new file mode 100644 index 0000000..e7d85ef Binary files /dev/null and b/public/landing/images/pc-builds.jpg differ diff --git a/public/landing/images/pc-builds.png b/public/landing/images/pc-builds.png deleted file mode 100644 index 95c77b2..0000000 Binary files a/public/landing/images/pc-builds.png and /dev/null differ diff --git a/public/landing/images/socials.jpg b/public/landing/images/socials.jpg new file mode 100644 index 0000000..13eb5f1 Binary files /dev/null and b/public/landing/images/socials.jpg differ diff --git a/public/landing/images/socials.png b/public/landing/images/socials.png deleted file mode 100644 index 566db94..0000000 Binary files a/public/landing/images/socials.png and /dev/null differ diff --git a/public/landing/tube.png b/public/landing/tube.png new file mode 100644 index 0000000..a0eb4ab Binary files /dev/null and b/public/landing/tube.png differ diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx index f2c80e6..9b5d9f6 100644 --- a/src/app/about/page.tsx +++ b/src/app/about/page.tsx @@ -35,7 +35,7 @@ export default function AboutPage() {
-

+

About Us

diff --git a/src/app/globals.css b/src/app/globals.css index 89c8f74..1a67f4b 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -1,4 +1,5 @@ -@import url("https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&family=Michroma&family=Source+Sans+3:ital,wght@0,200..900;1,200..900&display=swap"); +@import url('https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@300..700&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap'); + @tailwind base; @tailwind components; @tailwind utilities; @@ -15,7 +16,7 @@ textarea { } body { - font-family: "Inter", sans-serif; + font-family: "Space Grotesk", serif !important; background-color: #ffffff; overflow-x: hidden; } @@ -73,4 +74,27 @@ body { .grad { background: linear-gradient(0deg, #4255f922, #080d14); filter: blur(20px); +} + + +/* monospace font - will update later */ + +.m { + font-family: "Space Mono", serif; +} + +/* fade background of hero */ + + +.hero-btn:hover { + /* Apply a full (all-around) shadow with #79C7FD */ + box-shadow: 0 0 20px 5px rgba(121, 199, 253, 0.7); +} + +.hero-fade { + background: linear-gradient(180deg,#080d1400 0%, #080d14 100%); +} + +.about-fade { + background: linear-gradient(0deg,#080d1400 0%, #080d14 100%); } \ No newline at end of file diff --git a/src/app/page.tsx b/src/app/page.tsx index 649ecea..13708ca 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,15 +1,18 @@ "use client"; import Footer from "@/components/Footer"; +import About from "@/components/landing/About"; +import Events from "@/components/landing/Events"; +import Faq from "@/components/landing/Faq"; import Hero from "@/components/landing/Hero"; -import Landing from "@/components/landing/Landing"; + const Website = () => { return ( -

- {/* Applied a noise bg to the page for added depth */} -
+
- + + +
); diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 6b08295..be4c7af 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -81,15 +81,15 @@ export default function Footer() { rights reserved.

-
-

+

+

Gator User Design{" "} {" "}

diff --git a/src/components/MemberCounts/SocialStats.tsx b/src/components/MemberCounts/SocialStats.tsx index a5a7d71..357ae0b 100644 --- a/src/components/MemberCounts/SocialStats.tsx +++ b/src/components/MemberCounts/SocialStats.tsx @@ -54,7 +54,7 @@ const StatCard: React.FC = ({

{label}

-

+

{isLoading ? "Loading..." : error diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx index ac8b863..1ab937f 100644 --- a/src/components/Navbar/Navbar.tsx +++ b/src/components/Navbar/Navbar.tsx @@ -17,7 +17,7 @@ export default function Nav() { if (isAdminRoute) { return ( <> -

{isMobileAdminNavOpen && (
-
- - - setIsMobileAdminNavOpen(false)}>Home - setIsMobileAdminNavOpen(false)}>Projects - setIsMobileAdminNavOpen(false)}>Events - setIsMobileAdminNavOpen(false)}>About +
+ + + setIsMobileAdminNavOpen(false)}> + Home + + setIsMobileAdminNavOpen(false)} + > + Projects + + setIsMobileAdminNavOpen(false)} + > + Events + + setIsMobileAdminNavOpen(false)} + > + About +
)} @@ -54,8 +79,8 @@ export default function Nav() { } return ( -