diff --git a/package-lock.json b/package-lock.json index 395786c..7f06eab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,6 +25,7 @@ "react-firebase-hooks": "^5.1.1", "react-hot-toast": "^2.4.1", "react-icons": "^5.3.0", + "react-use-measure": "^2.1.7", "recharts": "^2.15.1", "tailwind-merge": "^2.5.2", "tailwindcss-animate": "^1.0.7" @@ -75,9 +76,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz", - "integrity": "sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz", + "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -2227,9 +2228,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -4840,9 +4841,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", "funding": [ { "type": "github", @@ -5859,6 +5860,21 @@ "react-dom": ">=16.6.0" } }, + "node_modules/react-use-measure": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/react-use-measure/-/react-use-measure-2.1.7.tgz", + "integrity": "sha512-KrvcAo13I/60HpwGO5jpW7E9DfusKyLPLvuHlUyP5zqnmAPhNc6qTRjUQrdTADl0lpPpDVU2/Gg51UlOGHXbdg==", + "license": "MIT", + "peerDependencies": { + "react": ">=16.13", + "react-dom": ">=16.13" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } + } + }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", diff --git a/package.json b/package.json index 0b84e8d..acd1aad 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "react-firebase-hooks": "^5.1.1", "react-hot-toast": "^2.4.1", "react-icons": "^5.3.0", + "react-use-measure": "^2.1.7", "recharts": "^2.15.1", "tailwind-merge": "^2.5.2", "tailwindcss-animate": "^1.0.7" diff --git a/public/hero/h1.png b/public/hero/h1.png deleted file mode 100644 index 84bd694..0000000 Binary files a/public/hero/h1.png and /dev/null differ diff --git a/public/hero/h2.png b/public/hero/h2.png deleted file mode 100644 index 4b77001..0000000 Binary files a/public/hero/h2.png and /dev/null differ diff --git a/public/hero/h3.png b/public/hero/h3.png deleted file mode 100644 index b2c0010..0000000 Binary files a/public/hero/h3.png and /dev/null differ diff --git a/public/hero/h4.png b/public/hero/h4.png deleted file mode 100644 index 1e7dbc3..0000000 Binary files a/public/hero/h4.png and /dev/null differ diff --git a/public/hero/h5.png b/public/hero/h5.png deleted file mode 100644 index 7ea7853..0000000 Binary files a/public/hero/h5.png and /dev/null differ diff --git a/public/hero/hero-background.png b/public/hero/hero-background.png new file mode 100644 index 0000000..5124c1a Binary files /dev/null and b/public/hero/hero-background.png differ diff --git a/public/hero/hero1.png b/public/hero/hero1.png new file mode 100644 index 0000000..c0c0907 Binary files /dev/null and b/public/hero/hero1.png differ diff --git a/public/hero/hero2.png b/public/hero/hero2.png new file mode 100644 index 0000000..1f68ae7 Binary files /dev/null and b/public/hero/hero2.png differ diff --git a/public/hero/hero3.png b/public/hero/hero3.png new file mode 100644 index 0000000..854bf14 Binary files /dev/null and b/public/hero/hero3.png differ diff --git a/public/hero/hero4.png b/public/hero/hero4.png new file mode 100644 index 0000000..f42f1ab Binary files /dev/null and b/public/hero/hero4.png differ diff --git a/public/hero/hero5.png b/public/hero/hero5.png new file mode 100644 index 0000000..16140ac Binary files /dev/null and b/public/hero/hero5.png differ diff --git a/public/hero/hero6.png b/public/hero/hero6.png new file mode 100644 index 0000000..fdf5e02 Binary files /dev/null and b/public/hero/hero6.png differ diff --git a/public/hero/hero7.png b/public/hero/hero7.png new file mode 100644 index 0000000..4836633 Binary files /dev/null and b/public/hero/hero7.png differ diff --git a/public/hero/hero8.png b/public/hero/hero8.png new file mode 100644 index 0000000..6a175f2 Binary files /dev/null and b/public/hero/hero8.png differ diff --git a/public/hero/hero9.png b/public/hero/hero9.png new file mode 100644 index 0000000..7f513f9 Binary files /dev/null and b/public/hero/hero9.png differ diff --git a/public/hero/lights.png b/public/hero/lights.png deleted file mode 100644 index 6f47c36..0000000 Binary files a/public/hero/lights.png and /dev/null differ diff --git a/public/hero/mobo.svg b/public/hero/mobo.svg deleted file mode 100644 index 50d5c4f..0000000 --- a/public/hero/mobo.svg +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/images/login-bg.svg b/public/images/login-bg.svg deleted file mode 100644 index 2801d1d..0000000 --- a/public/images/login-bg.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/landing/background.svg b/public/landing/background.svg deleted file mode 100644 index bb3bd14..0000000 --- a/public/landing/background.svg +++ /dev/null @@ -1,48 +0,0 @@ - - {/* Base black background */} - - - {/* Gradient overlay for radial left */} - - - {/* Gradient overlay for radial left */} - - - {/* Gradient overlay for bottomright */} - - - {/* Gradient overlay for radial left */} - - - {/* White polygon */} - {isDesktop && ( - - )} - - - - {/* Radial cold gradient */} - - - - - - {/* Radial warm gradient */} - - - - - - {/* bottom right gradient */} - - - - - - {/* bottom left Radial warm gradient */} - - - - - - \ No newline at end of file diff --git a/public/landing/card-icons/events.png b/public/landing/card-icons/events.png new file mode 100644 index 0000000..51c5475 Binary files /dev/null and b/public/landing/card-icons/events.png differ diff --git a/public/landing/card-icons/money.png b/public/landing/card-icons/money.png new file mode 100644 index 0000000..ef9630d Binary files /dev/null and b/public/landing/card-icons/money.png differ diff --git a/public/landing/card-icons/officer.png b/public/landing/card-icons/officer.png new file mode 100644 index 0000000..d731609 Binary files /dev/null and b/public/landing/card-icons/officer.png differ diff --git a/public/landing/card-icons/pc-parts.png b/public/landing/card-icons/pc-parts.png new file mode 100644 index 0000000..10ebc60 Binary files /dev/null and b/public/landing/card-icons/pc-parts.png differ diff --git a/public/landing/card-icons/social.png b/public/landing/card-icons/social.png new file mode 100644 index 0000000..eb7855c Binary files /dev/null and b/public/landing/card-icons/social.png differ diff --git a/public/landing/cards/blue.png b/public/landing/cards/blue.png new file mode 100644 index 0000000..43b7b50 Binary files /dev/null and b/public/landing/cards/blue.png differ diff --git a/public/landing/cards/green.png b/public/landing/cards/green.png new file mode 100644 index 0000000..545e89b Binary files /dev/null and b/public/landing/cards/green.png differ diff --git a/public/landing/cards/orange.png b/public/landing/cards/orange.png new file mode 100644 index 0000000..61c4c63 Binary files /dev/null and b/public/landing/cards/orange.png differ diff --git a/public/landing/cards/purple.png b/public/landing/cards/purple.png new file mode 100644 index 0000000..a06be3f Binary files /dev/null and b/public/landing/cards/purple.png differ diff --git a/public/landing/cards/red.png b/public/landing/cards/red.png new file mode 100644 index 0000000..dee2204 Binary files /dev/null and b/public/landing/cards/red.png differ diff --git a/public/landing/discord-app.png b/public/landing/discord-app.png new file mode 100644 index 0000000..7de6f90 Binary files /dev/null and b/public/landing/discord-app.png differ diff --git a/public/landing/discord-pc-bg.png b/public/landing/discord-pc-bg.png new file mode 100644 index 0000000..7b64bb5 Binary files /dev/null and b/public/landing/discord-pc-bg.png differ diff --git a/public/landing/logos/meta.png b/public/landing/logos/meta.png index 72ffa9f..4a3795a 100644 Binary files a/public/landing/logos/meta.png and b/public/landing/logos/meta.png differ diff --git a/public/landing/logos/microsoft.png b/public/landing/logos/microsoft.png index aa2d5d2..3657f7f 100644 Binary files a/public/landing/logos/microsoft.png and b/public/landing/logos/microsoft.png differ diff --git a/public/landing/logos/nvidia.png b/public/landing/logos/nvidia.png index 53b8abc..7192745 100644 Binary files a/public/landing/logos/nvidia.png and b/public/landing/logos/nvidia.png differ diff --git a/public/landing/logos/roblox.png b/public/landing/logos/roblox.png index d30e6a5..dbbbbc9 100644 Binary files a/public/landing/logos/roblox.png and b/public/landing/logos/roblox.png differ diff --git a/public/landing/logos/samsung.png b/public/landing/logos/samsung.png index 806accf..2c67408 100644 Binary files a/public/landing/logos/samsung.png and b/public/landing/logos/samsung.png differ diff --git a/public/landing/logos/ukg.png b/public/landing/logos/ukg.png index b3bf920..f380097 100644 Binary files a/public/landing/logos/ukg.png and b/public/landing/logos/ukg.png differ diff --git a/public/landing/mainBackground.jpg b/public/landing/mainBackground.jpg deleted file mode 100644 index 26492e7..0000000 Binary files a/public/landing/mainBackground.jpg and /dev/null differ diff --git a/public/landing/tube.png b/public/landing/tube.png deleted file mode 100644 index a0eb4ab..0000000 Binary files a/public/landing/tube.png and /dev/null differ diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx index 29056ca..d02db44 100644 --- a/src/app/dashboard/page.tsx +++ b/src/app/dashboard/page.tsx @@ -21,7 +21,7 @@ export default function Dashboard() { className="flex flex-col items-center gap-4 rounded-md border border-gray-200 bg-[#fafafa] p-4 transition-all hover:bg-gray-200 sm:gap-6 sm:p-6" >

Events

- +

@@ -33,7 +33,7 @@ export default function Dashboard() { className="flex flex-col items-center gap-4 rounded-md border border-gray-200 bg-[#fafafa] p-4 transition-all hover:bg-gray-200 sm:gap-6 sm:p-6" >

Projects

- +

@@ -45,7 +45,7 @@ export default function Dashboard() { className="flex flex-col items-center gap-4 rounded-md border border-gray-200 bg-[#fafafa] p-4 transition-all hover:bg-gray-200 sm:gap-6 sm:p-6" >

Inventory

- +

@@ -57,7 +57,7 @@ export default function Dashboard() { className="flex flex-col items-center gap-4 rounded-md border border-gray-200 bg-[#fafafa] p-4 transition-all hover:bg-gray-200 sm:gap-6 sm:p-6" >

Analytics

- +

diff --git a/src/app/events/page.tsx b/src/app/events/page.tsx index e743475..66540a7 100644 --- a/src/app/events/page.tsx +++ b/src/app/events/page.tsx @@ -1,19 +1,74 @@ "use client"; -import Calendar from "@/components/events/Calendar"; -import MonthlyEvents from "@/components/events/MonthlyEvents"; +import Calendar from "@/components/events/CalendarMonthView/Calendar"; +import FiveDayCalendar from "@/components/events/CalendarWeekView/WeekViewCalendar"; +import MonthlyEvents from "@/components/events/CalendarListView/MonthlyEvents"; +import { FaRegCalendarAlt, FaList } from "react-icons/fa"; import Footer from "@/components/Footer"; +import { Clock, Calendar as CalendarIcon, List } from "lucide-react"; +import { useState } from "react"; export default function Events() { + const [calendarView, setCalendarView] = useState<"month" | "day" | "list">( + "month", + ); + return ( <>

-
-
- - +
+

Events

+

+ Discover everything you need to know about upcoming{" "} + club events and{" "} + exclusive opportunities. +

+

Views:

+ + {/* buttons to change view */} +
+ + + +
+ {/* end buttons */} + + {/* Views */} + {calendarView === "day" && } + {calendarView === "month" && } + {calendarView === "list" && } +
-