From f52a3ad3c4e026fcf78e35ab5657d66f7fdfc581 Mon Sep 17 00:00:00 2001 From: deveshsawant05 <146441689+deveshsawant05@users.noreply.github.com> Date: Sat, 17 Aug 2024 00:41:08 +0530 Subject: [PATCH] Jenil's changes (#105) Fixed things --- src/app/events/page.jsx | 116 +++++++++++++++++++++++++++++++++ src/components/ui/EventBox.jsx | 34 ++++++++++ src/lib/utils.ts | 2 +- 3 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 src/app/events/page.jsx create mode 100644 src/components/ui/EventBox.jsx diff --git a/src/app/events/page.jsx b/src/app/events/page.jsx new file mode 100644 index 0000000..c4e88ba --- /dev/null +++ b/src/app/events/page.jsx @@ -0,0 +1,116 @@ +"use client"; +import { useEffect, useState } from "react"; +import EventBox from "../../components/ui/EventBox"; +import { getPublicUrl } from "@/lib/utils" +function Page() { + const [events, setEvents] = useState([]); + const [nextPageEvents, setNextPageEvents] = useState([]); + const [pageCount, setPageCount] = useState(1); + const [hasMoreEvents, setHasMoreEvents] = useState(true); + const [columnCount, setColumnCount] = useState(3); + + const fetchEvents = async (page) => { + try { + const response = await fetch(`/api/v1/get/events?page=${page}`); + const data = await response.json(); + return data; + } catch (error) { + console.error("Error fetching events:", error); + return []; + } + }; + + const getMoreEvents = async () => { + setEvents((prevEvents) => [...prevEvents, ...nextPageEvents]); + setPageCount((prev) => prev + 1); + + const newEvents = await fetchEvents(pageCount + 2); + if (newEvents.length === 0) { + setHasMoreEvents(false); + } else { + setNextPageEvents(newEvents); + } + }; + + useEffect(() => { + const loadInitialEvents = async () => { + const firstPageEvents = await fetchEvents(pageCount); + const secondPageEvents = await fetchEvents(pageCount + 1); + + setEvents(firstPageEvents); + setNextPageEvents(secondPageEvents); + + if (secondPageEvents.length === 0) { + setHasMoreEvents(false); + } + }; + + + const handleResize = () => { + if (window.innerWidth < 768) { + setColumnCount(2); + } else { + setColumnCount(3); + } + }; + + window.addEventListener("resize", handleResize); + handleResize(); + loadInitialEvents(); + + return () => { + window.removeEventListener("resize", handleResize); + }; + }, []); + + const columns = Array.from({ length: columnCount }, () => []); + + events.forEach((event, index) => { + let posterUrl = getPublicUrl(`/events/${event.id}/poster`) + + columns[index % columnCount].push( + + ); + }); + + return ( +
+
+

Events Near

+
+ {columns.map((column, colIndex) => ( +
+ {column} +
+ ))} +
+ {hasMoreEvents && ( + + )} +
+
+ ); +} + +export default Page; diff --git a/src/components/ui/EventBox.jsx b/src/components/ui/EventBox.jsx new file mode 100644 index 0000000..34252ae --- /dev/null +++ b/src/components/ui/EventBox.jsx @@ -0,0 +1,34 @@ +import React from "react"; + +function EventBox({ time, category, caption, secondCat = false, hostLink , img }) { + return ( +
+
+

+ {time} +

+

+ {category} +

+ + {caption} + +
+ ); +} + +export default EventBox; \ No newline at end of file diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 0fae762..3ed0e51 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -7,5 +7,5 @@ export function cn(...inputs: ClassValue[]) { } export const getPublicUrl = (path: string) => { - return `https://${process.env.PROJECT_ID}.supabase.co/storage/v1/object/public/${process.env.BUCKET}${path}`; + return `https://${process.env.NEXT_PUBLIC_PROJECT_ID}.supabase.co/storage/v1/object/public/${process.env.NEXT_PUBLIC_BUCKET}${path}`; };