atridad/pollo
1
0
Fork 0
Code Activity Actions

Fixed room 404 issues

Browse source
This commit is contained in:
Atridad Lahiji 2023-09-27 12:46:15 -06:00 • committed by atridadl
parent 0579022489
commit 12f928aa93
No known key found for this signature in database
2 changed files with 87 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/(client)/room/[id]/VoteUI.tsx
View file

@ -1,10 +1,18 @@
"use client"; "use client";
import { EventTypes } from "@/_utils/types";
import Image from "next/image"; import Image from "next/image";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { EventTypes } from "@/_utils/types";
import LoadingIndicator from "@/_components/LoadingIndicator";
import type { PresenceItem, RoomResponse, VoteResponse } from "@/_utils/types";
import { useUser } from "@clerk/nextjs";
import { useChannel, usePresence } from "ably/react";
import { isAdmin, isVIP, jsonToCsv } from "app/_utils/helpers";
import { env } from "env.mjs";
import { useParams } from "next/navigation"; import { useParams } from "next/navigation";
import { FaShieldAlt } from "react-icons/fa";
import { GiStarFormation } from "react-icons/gi";
import { import {
IoCheckmarkCircleOutline, IoCheckmarkCircleOutline,
IoCopyOutline, IoCopyOutline,
@ -15,15 +23,7 @@ import {
IoReloadOutline, IoReloadOutline,
IoSaveOutline, IoSaveOutline,
} from "react-icons/io5"; } from "react-icons/io5";
import { GiStarFormation } from "react-icons/gi";
import { FaShieldAlt } from "react-icons/fa";
import { RiVipCrownFill } from "react-icons/ri"; import { RiVipCrownFill } from "react-icons/ri";
import { env } from "env.mjs";
import { isAdmin, isVIP, jsonToCsv } from "app/_utils/helpers";
import type { PresenceItem, RoomResponse, VoteResponse } from "@/_utils/types";
import LoadingIndicator from "@/_components/LoadingIndicator";
import { useUser } from "@clerk/nextjs";
import { useChannel, usePresence } from "ably/react";
import NoRoomUI from "./NoRoomUI"; import NoRoomUI from "./NoRoomUI";
const VoteUI = () => { const VoteUI = () => {
@ -40,12 +40,15 @@ const VoteUI = () => {
const [votesFromDb, setVotesFromDb] = useState<VoteResponse>(undefined); const [votesFromDb, setVotesFromDb] = useState<VoteResponse>(undefined);
const getRoomHandler = async () => { const getRoomHandler = async () => {
const dbRoomResponse = await fetch(`/api/internal/room/${roomId}`, { fetch(`/api/internal/room/${roomId}`, {
cache: "no-cache", cache: "no-cache",
method: "GET", method: "GET",
}); }).then(async (response) => {
const dbRoom = (await dbRoomResponse.json()) as RoomResponse; const dbRoom = (await response.json()) as RoomResponse;
setRoomFromDb(dbRoom); setRoomFromDb(dbRoom);
}).catch(() => {
setRoomFromDb(null);
});
}; };
const getVotesHandler = async () => { const getVotesHandler = async () => {
@ -310,8 +313,7 @@ const VoteUI = () => {
return ( return (
<button <button
key={ index } key={ index }
className={`join-item ${ className={ `join-item ${getVoteForCurrentUser()?.value === scaleItem
getVoteForCurrentUser()?.value === scaleItem
? "btn btn-active btn-primary" ? "btn btn-active btn-primary"
: "btn" : "btn"
}` } }` }

19
app/api/internal/room/[roomId]/route.ts
View file

@ -1,13 +1,13 @@
import { type NextRequest, NextResponse } from "next/server"; import { NextResponse, type NextRequest } from "next/server";
import { db } from "@/_lib/db";
import { logs, rooms, votes } from "@/_lib/schema";
import { eq } from "drizzle-orm";
import { publishToChannel } from "@/_lib/ably"; import { publishToChannel } from "@/_lib/ably";
import { EventTypes } from "@/_utils/types"; import { db } from "@/_lib/db";
import { invalidateCache } from "@/_lib/redis"; import { invalidateCache } from "@/_lib/redis";
import { createId } from "@paralleldrive/cuid2"; import { logs, rooms, votes } from "@/_lib/schema";
import { EventTypes } from "@/_utils/types";
import { getAuth } from "@clerk/nextjs/server"; import { getAuth } from "@clerk/nextjs/server";
import { createId } from "@paralleldrive/cuid2";
import { eq } from "drizzle-orm";
export const runtime = "edge"; export const runtime = "edge";
export const preferredRegion = ["pdx1"]; export const preferredRegion = ["pdx1"];
@ -30,10 +30,17 @@ export async function GET(
}, },
}); });
if (roomFromDb) {
return NextResponse.json(roomFromDb, { return NextResponse.json(roomFromDb, {
status: 200, status: 200,
statusText: "SUCCESS", statusText: "SUCCESS",
}); });
} else {
return new NextResponse("ROOM NOT FOUND", {
status: 404,
statusText: "ROOM NOT FOUND",
});
}
} }
export async function DELETE( export async function DELETE(