From e2a436bda3eb7d3a5d67657d92d737b81184f725 Mon Sep 17 00:00:00 2001 From: boragenel Date: Tue, 21 Jan 2025 11:53:14 +0300 Subject: [PATCH] Auto stash before merge of "main" and "origin/main" --- src/components/jam-header/index.tsx | 55 ++++++++++++++--- src/components/navbar/MobileNavbar.tsx | 3 +- src/components/navbar/PCNavbar.tsx | 8 ++- src/components/themes/index.tsx | 81 ++++++++++++++++++++++++++ src/helpers/jam.ts | 38 +++++++----- src/types/JamType.ts | 5 +- 6 files changed, 164 insertions(+), 26 deletions(-) create mode 100644 src/components/themes/index.tsx diff --git a/src/components/jam-header/index.tsx b/src/components/jam-header/index.tsx index 7c9007d..f7c4b33 100644 --- a/src/components/jam-header/index.tsx +++ b/src/components/jam-header/index.tsx @@ -1,15 +1,56 @@ +"use client" import { Calendar } from "lucide-react"; +import { useEffect, useState } from "react"; +import { getCurrentJam, ActiveJamResponse } from "../../helpers/jam" +import ThemeSuggestions from "../themes"; export default function JamHeader() { + + const [activeJamResponse, setActiveJam] = useState(null); + + useEffect(() => { + const fetchActiveJam = async () => { + const jamData = await getCurrentJam(); + setActiveJam(jamData); + }; + + fetchActiveJam(); + }, []); + + return ( -
-
- -

Down2Jam 1

-
-
-

April 4th - 7th

+
+ {/* Jam Header */} +
+
+ +

+ {activeJamResponse?.jam && activeJamResponse.phase ? ( + + {activeJamResponse?.jam.name} - {activeJamResponse.phase} Phase + + ) : ( + (No Active Jams) + )} +

+
+
+

April 4th - 7th

+
+ + {/* Conditional Link for Suggestion Phase */} + {activeJamResponse?.phase === "Suggestion" && ( + + )}
); } diff --git a/src/components/navbar/MobileNavbar.tsx b/src/components/navbar/MobileNavbar.tsx index 77ba108..149af5e 100644 --- a/src/components/navbar/MobileNavbar.tsx +++ b/src/components/navbar/MobileNavbar.tsx @@ -27,7 +27,8 @@ export default function MobileNavbar() { useEffect(() => { loadUser(); async function loadUser() { - const currentJam = await getCurrentJam(); + const currentJamResponse = await getCurrentJam(); + const currentJam = currentJamResponse?.jam; setJam(currentJam); if (!hasCookie("token")) { diff --git a/src/components/navbar/PCNavbar.tsx b/src/components/navbar/PCNavbar.tsx index 414903c..aef6e59 100644 --- a/src/components/navbar/PCNavbar.tsx +++ b/src/components/navbar/PCNavbar.tsx @@ -24,7 +24,7 @@ import NextImage from "next/image"; import { useEffect, useState } from "react"; import { usePathname } from "next/navigation"; import { getCookie, hasCookie } from "@/helpers/cookie"; -import { getCurrentJam, joinJam } from "@/helpers/jam"; +import { getCurrentJam, joinJam, ActiveJamResponse } from "@/helpers/jam"; import { JamType } from "@/types/JamType"; import { UserType } from "@/types/UserType"; import NavbarUser from "./PCNavbarUser"; @@ -57,7 +57,8 @@ export default function PCNavbar() { useEffect(() => { loadUser(); async function loadUser() { - const currentJam = await getCurrentJam(); + const jamResponse = await getCurrentJam(); + const currentJam = jamResponse?.jam; setJam(currentJam); if (!hasCookie("token")) { @@ -141,7 +142,8 @@ export default function PCNavbar() { icon={} name="Join jam" onPress={async () => { - const currentJam = await getCurrentJam(); + const currentJamResponse = await getCurrentJam(); + const currentJam = currentJamResponse?.jam; if (!currentJam) { toast.error("There is no jam to join"); diff --git a/src/components/themes/index.tsx b/src/components/themes/index.tsx new file mode 100644 index 0000000..5eaef1f --- /dev/null +++ b/src/components/themes/index.tsx @@ -0,0 +1,81 @@ +"use client"; + +import React, { useState } from "react"; + +export default function ThemeSuggestions() { + const [suggestion, setSuggestion] = useState(""); + const [loading, setLoading] = useState(false); + const [successMessage, setSuccessMessage] = useState(""); + const [errorMessage, setErrorMessage] = useState(""); + + const handleSubmit = async (e: React.FormEvent) => { + e.preventDefault(); + setLoading(true); + setSuccessMessage(""); + setErrorMessage(""); + + if (!suggestion.trim()) { + setErrorMessage("Suggestion cannot be empty."); + setLoading(false); + return; + } + + try { + const userId = localStorage.getItem("userId"); + const response = await fetch("http://localhost:3005/api/v1/themes/suggestion", { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${localStorage.getItem("accessToken")}`, + }, + credentials: "include", + body: JSON.stringify({ suggestionText: suggestion, userId }), + }); + + if (!response.ok) { + const errorData = await response.json(); + throw new Error(errorData.error || "Failed to submit suggestion."); + } + + setSuccessMessage("Suggestion added successfully!"); + setSuggestion(""); // Clear the input field + } catch (error: any) { + console.error("Error submitting suggestion:", error.message); + setErrorMessage(error.message || "An unexpected error occurred."); + } finally { + setLoading(false); + } + }; + + return ( +
+

+ Submit Your Theme Suggestion +

+
+ + {errorMessage && ( +

{errorMessage}

+ )} + {successMessage && ( +

{successMessage}

+ )} + +
+
+ ); +} \ No newline at end of file diff --git a/src/helpers/jam.ts b/src/helpers/jam.ts index c37746c..88515b5 100644 --- a/src/helpers/jam.ts +++ b/src/helpers/jam.ts @@ -2,6 +2,11 @@ import { JamType } from "@/types/JamType"; import { getCookie } from "./cookie"; import { toast } from "react-toastify"; +export interface ActiveJamResponse { + phase: string; + jam: JamType | null; // Jam will be null if no active jam is found +} + export async function getJams(): Promise { const response = await fetch( process.env.NEXT_PUBLIC_MODE === "PROD" @@ -12,24 +17,29 @@ export async function getJams(): Promise { return response.json(); } -export async function getCurrentJam(): Promise { - const jams = await getJams(); - const now = new Date(); +export async function getCurrentJam(): Promise { + + try { + const response = await fetch( + process.env.NEXT_PUBLIC_MODE === "PROD" + ? "https://d2jam.com/api/v1/jams" + : "http://localhost:3005/api/v1/jams/active" + ); - // Get only jams that happen in the future - const futureJams = jams.filter((jam) => new Date(jam.startTime) > now); + // Parse JSON response + const data = await response.json(); - // If theres no jams happening returns null - if (futureJams.length === 0) { - return null; - } + // Return the phase and jam details + return { + phase: data.phase, + jam: data.jam, + }; - // Sort future jams by startTime (earliest first) - futureJams.sort( - (a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime() - ); + } catch (error) { + console.error("Error fetching active jam:", error); + return null; + } - return futureJams[0]; } export async function joinJam(jamId: number) { diff --git a/src/types/JamType.ts b/src/types/JamType.ts index 524de5b..c20c43d 100644 --- a/src/types/JamType.ts +++ b/src/types/JamType.ts @@ -1,8 +1,11 @@ export interface JamType { id: number; name: string; - ratingHours: number; + suggestionHours:number; slaughterHours: number; + votingHours:number; + jammingHours:number; + ratingHours: number; startTime: Date; createdAt: Date; updatedAt: Date;