From a2bae7201dc7a854b22d93210d4b8698f690a697 Mon Sep 17 00:00:00 2001 From: Nathaniel Tampus Date: Fri, 7 Apr 2023 12:09:10 +0800 Subject: [PATCH] rename "get" util functions to "fetch" --- client/src/app/[code]/page.tsx | 6 +++--- client/src/app/archive/[id]/page.tsx | 6 +++--- client/src/components/home/JoinGame.tsx | 4 ++-- client/src/components/home/PublicGames/PublicGames.tsx | 4 ++-- client/src/lib/game.ts | 6 +++--- client/src/lib/user.ts | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/client/src/app/[code]/page.tsx b/client/src/app/[code]/page.tsx index a18a50e..636f051 100644 --- a/client/src/app/[code]/page.tsx +++ b/client/src/app/[code]/page.tsx @@ -1,9 +1,9 @@ import GameAuthWrapper from "@/components/game/GameAuthWrapper"; -import { getActiveGame } from "@/lib/game"; +import { fetchActiveGame } from "@/lib/game"; import { notFound } from "next/navigation"; export async function generateMetadata({ params }: { params: { code: string } }) { - const game = await getActiveGame(params.code); + const game = await fetchActiveGame(params.code); if (!game) { return { description: "Game not found", @@ -35,7 +35,7 @@ export async function generateMetadata({ params }: { params: { code: string } }) } export default async function Game({ params }: { params: { code: string } }) { - const game = await getActiveGame(params.code); + const game = await fetchActiveGame(params.code); if (!game) { notFound(); } diff --git a/client/src/app/archive/[id]/page.tsx b/client/src/app/archive/[id]/page.tsx index cce348e..a1c5dde 100644 --- a/client/src/app/archive/[id]/page.tsx +++ b/client/src/app/archive/[id]/page.tsx @@ -1,10 +1,10 @@ import ArchivedGame from "@/components/archive/ArchivedGame"; -import { getArchivedGame } from "@/lib/game"; +import { fetchArchivedGame } from "@/lib/game"; import type { Game } from "@chessu/types"; import { notFound } from "next/navigation"; export async function generateMetadata({ params }: { params: { id: number } }) { - const game = (await getArchivedGame({ id: params.id })) as Game | undefined; + const game = (await fetchArchivedGame({ id: params.id })) as Game | undefined; if (!game) { return { description: "Game not found", @@ -36,7 +36,7 @@ export async function generateMetadata({ params }: { params: { id: number } }) { } export default async function Archive({ params }: { params: { id: number } }) { - const game = (await getArchivedGame({ id: params.id })) as Game | undefined; + const game = (await fetchArchivedGame({ id: params.id })) as Game | undefined; if (!game) { notFound(); } diff --git a/client/src/components/home/JoinGame.tsx b/client/src/components/home/JoinGame.tsx index c8b2d33..ce9b6eb 100644 --- a/client/src/components/home/JoinGame.tsx +++ b/client/src/components/home/JoinGame.tsx @@ -3,7 +3,7 @@ import type { FormEvent } from "react"; import { useState, useContext } from "react"; import { SessionContext } from "@/context/session"; -import { getActiveGame } from "@/lib/game"; +import { fetchActiveGame } from "@/lib/game"; import { useRouter } from "next/navigation"; export default function JoinGame() { @@ -31,7 +31,7 @@ export default function JoinGame() { code = new URL(code).pathname.split("/")[1]; } - const game = await getActiveGame(code); + const game = await fetchActiveGame(code); if (game && game.code) { router.push(`/${game.code}`); diff --git a/client/src/components/home/PublicGames/PublicGames.tsx b/client/src/components/home/PublicGames/PublicGames.tsx index c85ea70..067b6bd 100644 --- a/client/src/components/home/PublicGames/PublicGames.tsx +++ b/client/src/components/home/PublicGames/PublicGames.tsx @@ -1,9 +1,9 @@ -import { getPublicGames } from "@/lib/game"; +import { fetchPublicGames } from "@/lib/game"; import JoinButton from "./JoinButton"; import RefreshButton from "./RefreshButton"; export default async function PublicGames() { - const games = await getPublicGames(); + const games = await fetchPublicGames(); return (
diff --git a/client/src/lib/game.ts b/client/src/lib/game.ts index 8d4e737..3c56126 100644 --- a/client/src/lib/game.ts +++ b/client/src/lib/game.ts @@ -22,7 +22,7 @@ export const createGame = async (side: string, unlisted: boolean) => { } }; -export const getActiveGame = async (code: string) => { +export const fetchActiveGame = async (code: string) => { try { const res = await fetch(`${API_URL}/v1/games/${code}`, { cache: "no-store" }); @@ -35,7 +35,7 @@ export const getActiveGame = async (code: string) => { } }; -export const getPublicGames = async () => { +export const fetchPublicGames = async () => { try { const res = await fetch(`${API_URL}/v1/games`, { cache: "no-store" }); @@ -48,7 +48,7 @@ export const getPublicGames = async () => { } }; -export const getArchivedGame = async ({ id, userid }: { id?: number; userid?: number }) => { +export const fetchArchivedGame = async ({ id, userid }: { id?: number; userid?: number }) => { let url = `${API_URL}/v1/games?`; if (id) { url += `id=${id}`; diff --git a/client/src/lib/user.ts b/client/src/lib/user.ts index 17487b8..02f0c4e 100644 --- a/client/src/lib/user.ts +++ b/client/src/lib/user.ts @@ -1,7 +1,7 @@ import { API_URL } from "@/config"; import type { User, Game } from "@chessu/types"; -export const getProfileData = async (name: string) => { +export const fetchProfileData = async (name: string) => { try { // TODO: handle caching more efficiently? const res = await fetch(`${API_URL}/v1/users/${name}`, {