今天做了好多工作啊

src/app/(features)/memorize/FolderSelector.tsx

@@ -1,15 +1,15 @@
 "use client";
 
 import Container from "@/components/cards/Container";
-import { folder } from "../../../../generated/prisma/client";
-import { Folder } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Center } from "@/components/Center";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
+import { Folder } from "../../../../generated/prisma/browser";
+import { Folder as Fd } from "lucide-react";
 
 interface FolderSelectorProps {
-  folders: (folder & { total_pairs: number })[];
+  folders: (Folder & { total: number })[];
 }
 
 const FolderSelector: React.FC<FolderSelectorProps> = ({ folders }) => {
@@ -41,13 +41,13 @@ const FolderSelector: React.FC<FolderSelectorProps> = ({ folders }) => {
                     }
                     className="flex flex-row justify-center items-center group p-2 gap-2 hover:cursor-pointer hover:bg-gray-50"
                   >
-                    <Folder />
+                    <Fd />
                     <div className="flex-1 flex gap-2">
                       <span className="group-hover:text-blue-500">
                         {t("folderInfo", {
                           id: folder.id,
                           name: folder.name,
-                          count: folder.total_pairs,
+                          count: folder.total,
                         })}
                       </span>
                     </div>

src/app/(features)/memorize/Memorize.tsx

@@ -1,8 +1,5 @@
 "use client";
 
-import { Center } from "@/components/Center";
-import { text_pair } from "../../../../generated/prisma/browser";
-import Container from "@/components/cards/Container";
 import { useEffect, useState } from "react";
 import LightButton from "@/components/buttons/LightButton";
 import { useAudioPlayer } from "@/hooks/useAudioPlayer";
@@ -11,13 +8,14 @@ import { VOICES } from "@/config/locales";
 import { useTranslations } from "next-intl";
 import localFont from "next/font/local";
 import { isNonNegativeInteger } from "@/lib/utils";
+import { Pair } from "../../../../generated/prisma/browser";
 
 const myFont = localFont({
   src: "../../../../public/fonts/NotoNaskhArabic-VariableFont_wght.ttf",
 });
 
 interface MemorizeProps {
-  textPairs: text_pair[];
+  textPairs: Pair[];
 }
 
 const Memorize: React.FC<MemorizeProps> = ({ textPairs }) => {
@@ -29,7 +27,7 @@ const Memorize: React.FC<MemorizeProps> = ({ textPairs }) => {
   const [show, setShow] = useState<"question" | "answer">("question");
   const { load, play } = useAudioPlayer();
 
-  const [disorderedTextPairs, setDisorderedTextPairs] = useState<text_pair[]>(
+  const [disorderedTextPairs, setDisorderedTextPairs] = useState<Pair[]>(
     [],
   );
 
@@ -66,7 +64,7 @@ const Memorize: React.FC<MemorizeProps> = ({ textPairs }) => {
               {index + 1}
               {"/" + getTextPairs().length}
             </div>
-            <div className="h-[40dvh] px-16">
+            <div className={`h-[40dvh] md:px-16 px-4 ${myFont.className}`}>
               {(() => {
                 const createText = (text: string) => {
                   return (

src/app/(features)/memorize/page.tsx

@@ -1,24 +1,24 @@
 "use server";
 
 import { redirect } from "next/navigation";
-import { getServerSession } from "next-auth";
 import { getTranslations } from "next-intl/server";
 import {
-  getFoldersWithTotalPairsByOwner,
-  getOwnerByFolderId,
+  getFoldersWithTotalPairsByUserId,
+  getUserIdByFolderId,
 } from "@/lib/actions/services/folderService";
 import { isNonNegativeInteger } from "@/lib/utils";
 import FolderSelector from "./FolderSelector";
 import Memorize from "./Memorize";
-import { getTextPairsByFolderId } from "@/lib/actions/services/textPairService";
+import { getPairsByFolderId } from "@/lib/actions/services/pairService";
+import { auth } from "@/auth";
 
 export default async function MemorizePage({
   searchParams,
 }: {
   searchParams: Promise<{ folder_id?: string }>;
 }) {
-  const session = await getServerSession();
-  const username = session?.user?.name;
+  const session = await auth();
+  const userId = session?.user?.id;
   const t = await getTranslations("memorize.page");
 
   const tParam = (await searchParams).folder_id;
@@ -28,23 +28,26 @@ export default async function MemorizePage({
       : null
     : null;
 
-  if (!username)
+  if (!userId) {
     redirect(
       `/login?redirect=/memorize${folder_id ? `?folder_id=${folder_id}` : ""}`,
     );
+  }
+
+  const uid = Number(userId);
 
   if (!folder_id) {
     return (
       <FolderSelector
-        folders={await getFoldersWithTotalPairsByOwner(username)}
+        folders={await getFoldersWithTotalPairsByUserId(uid)}
       />
     );
   }
 
-  const owner = await getOwnerByFolderId(folder_id);
-  if (owner !== username) {
+  const owner = await getUserIdByFolderId(folder_id);
+  if (owner !== uid) {
     return <p>{t("unauthorized")}</p>;
   }
 
-  return <Memorize textPairs={await getTextPairsByFolderId(folder_id)} />;
+  return <Memorize textPairs={await getPairsByFolderId(folder_id)} />;
 }