Merge branch 'main' into feat/use-sse-instead-of-ws

Author: aster-void

server/src/router/users.ts

@@ -7,6 +7,7 @@ import {
 } from "common/zod/schemas";
 import { Hono } from "hono";
 import { z } from "zod";
+import { prisma } from "../database/client";
 import {
   getPendingRequestsFromUser,
   getPendingRequestsToUser,
@@ -51,9 +52,17 @@ const router = new Hono()
   // ユーザーの存在を確認するためのエンドポイント。だれでもアクセス可能
   .get("/exists/:guid", param({ guid: z.string() }), async (c) => {
     const guid = c.req.valid("param").guid;
-    const ok = await core.userExists(guid as GUID);
-    c.status(ok.code);
-    return c.json({});
+    const user = await prisma.user.findFirst({
+      where: {
+        guid: guid,
+      },
+      select: { guid: true, name: true },
+    });
+    if (!user) {
+      return c.json({ message: "User not found" }, 404);
+    }
+
+    return c.json(200);
   })
 
   // 特定のユーザーとマッチしたユーザーを取得

web/app/chat/layout.tsx

@@ -1,19 +1,18 @@
 import BottomBar from "~/components/BottomBar";
 import Header from "~/components/Header";
 import { NavigateByAuthState } from "~/components/common/NavigateByAuthState";
+import { ModalProvider } from "~/components/common/modal/ModalProvider";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <>
-      <Header title="チャット" />
-      <NavigateByAuthState type="toLoginForUnauthenticated">
-        <div className="h-full overflow-y-auto pt-12 pb-12">{children}</div>
-      </NavigateByAuthState>
-      <BottomBar activeTab="3_chat" />
+      <ModalProvider>
+        <Header title="チャット" />
+        <NavigateByAuthState type="toLoginForUnauthenticated">
+          <div className="h-full overflow-y-auto pt-12 pb-12">{children}</div>
+        </NavigateByAuthState>
+        <BottomBar activeTab="3_chat" />
+      </ModalProvider>
     </>
   );
 }

web/app/friends/layout.tsx

@@ -1,19 +1,18 @@
 import BottomBar from "~/components/BottomBar";
 import Header from "~/components/Header";
 import { NavigateByAuthState } from "~/components/common/NavigateByAuthState";
+import { ModalProvider } from "~/components/common/modal/ModalProvider";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <>
-      <Header title="フレンド" />
-      <NavigateByAuthState type="toLoginForUnauthenticated">
-        <div className="h-full overflow-y-auto pt-12 pb-12">{children}</div>
-      </NavigateByAuthState>
-      <BottomBar activeTab="1_friends" />
+      <ModalProvider>
+        <Header title="フレンド" />
+        <NavigateByAuthState type="toLoginForUnauthenticated">
+          <div className="h-full overflow-y-auto pt-12 pb-12">{children}</div>
+        </NavigateByAuthState>
+        <BottomBar activeTab="1_friends" />
+      </ModalProvider>
     </>
   );
 }

web/app/home/page.tsx

@@ -77,13 +77,13 @@ export default function Home() {
     [recommended, controls, backCardControls],
   );
 
-  if (recommended == null) {
+  if (data === undefined) {
     return <FullScreenCircularProgress />;
   }
   if (currentUser == null) {
     return <FullScreenCircularProgress />;
   }
-  if (displayedUser == null) {
+  if (recommended.size() === 0) {
     return <NoMoreUser />;
   }
   if (error) throw error;
@@ -173,4 +173,7 @@ class Queue<T> {
   pop(): T | undefined {
     return this.store.shift();
   }
+  size(): number {
+    return this.store.length;
+  }
 }

web/app/layout.tsx

@@ -11,8 +11,6 @@ import "@fontsource/roboto/700.css";
 import BanLandscape from "~/components/BanLandscape";
 import SSEProvider from "~/components/SSEProvider";
 import { AlertProvider } from "~/components/common/alert/AlertProvider";
-import { ModalProvider } from "~/components/common/modal/ModalProvider";
-import AuthProvider from "~/firebase/auth/AuthProvider";
 
 const theme = createTheme({
   palette: {
@@ -46,15 +44,13 @@ export default function RootLayout({
             anchorOrigin={{ horizontal: "right", vertical: "top" }}
           >
             <React.StrictMode>
-              <AuthProvider>
-                <CssBaseline />
-                <AlertProvider>
-                  <ModalProvider>
-                    <BanLandscape />
-                    <SSEProvider>{children}</SSEProvider>
-                  </ModalProvider>
-                </AlertProvider>
-              </AuthProvider>
+              <CssBaseline />
+              <AlertProvider>
+                {/* <ModalProvider> */}
+                <BanLandscape />
+                <SSEProvider>{children}</SSEProvider>
+                {/* </ModalProvider> */}
+              </AlertProvider>
             </React.StrictMode>
           </SnackbarProvider>
         </ThemeProvider>

web/app/search/layout.tsx

@@ -1,19 +1,18 @@
 import BottomBar from "~/components/BottomBar";
 import Header from "~/components/Header";
 import { NavigateByAuthState } from "~/components/common/NavigateByAuthState";
+import { ModalProvider } from "~/components/common/modal/ModalProvider";
 
-export default function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <>
-      <Header title="検索" />
-      <NavigateByAuthState type="toLoginForUnauthenticated">
-        <div className="h-full overflow-y-auto pt-12 pb-12">{children}</div>
-      </NavigateByAuthState>
-      <BottomBar activeTab="2_search" />
+      <ModalProvider>
+        <Header title="検索" />
+        <NavigateByAuthState type="toLoginForUnauthenticated">
+          <div className="h-full overflow-y-auto pt-12 pb-12">{children}</div>
+        </NavigateByAuthState>
+        <BottomBar activeTab="2_search" />
+      </ModalProvider>
     </>
   );
 }

web/components/common/modal/ModalProvider.tsx

@@ -1,3 +1,4 @@
+"use client";
 import type { UserWithCoursesAndSubjects } from "common/types";
 import { type ReactNode, createContext, useContext, useState } from "react";
 import { useAboutMe } from "~/api/user";