Revert "Merge pull request #71 from ut-code/auth"

This reverts commit b74201a, reversing
changes made to d8ce0f4.

Author: na-trium-144

.gitignore

@@ -42,5 +42,3 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
-
-/app/generated/prisma

README.md

@@ -7,31 +7,11 @@ https://my-code.utcode.net
 npm ci
 ```
 
-ルートディレクトリに .env.local という名前のファイルを作成し、以下の内容を記述
+ルートディレクトリに .env.local という名前のファイルを作成し、Gemini APIキーを設定してください
 ```dotenv
-API_KEY=GeminiAPIキー
-BETTER_AUTH_URL=http://localhost:3000
+API_KEY="XXXXXXXX"
 ```
 
-prismaの開発環境を起動
-(.env にDATABASE_URLが自動的に追加される)
-```bash
-npx prisma dev
-```
-別ターミナルで
-```bash
-npx prisma db push
-```
-
-### 本番環境の場合
-
-上記の環境変数以外に、
-* BETTER_AUTH_SECRET に任意の文字列
-* DATABASE_URL に本番用のPostgreSQLデータベースURL
-* GOOGLE_CLIENT_IDとGOOGLE_CLIENT_SECRETにGoogle OAuthのクライアントIDとシークレット https://www.better-auth.com/docs/authentication/google
-* GITHUB_CLIENT_IDとGITHUB_CLIENT_SECRETにGitHub OAuthのクライアントIDとシークレット https://www.better-auth.com/docs/authentication/github
-
-
 ## 開発環境
 
 ```bash

app/[docs_id]/chatForm.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { useState, FormEvent, useEffect } from "react";
+import { askAI } from "@/app/actions/chatActions";
 import useSWR from "swr";
 import {
   getQuestionExample,
@@ -9,8 +10,7 @@ import {
 import { getLanguageName } from "../pagesList";
 import { DynamicMarkdownSection } from "./pageContent";
 import { useEmbedContext } from "../terminal/embedContext";
-import { useChatHistoryContext } from "./chatHistory";
-import { askAI } from "@/actions/chatActions";
+import { ChatMessage, useChatHistoryContext } from "./chatHistory";
 
 interface ChatFormProps {
   docs_id: string;
@@ -71,6 +71,8 @@ export function ChatForm({
     setIsLoading(true);
     setErrorMessage(null); // Clear previous error message
 
+    const userMessage: ChatMessage = { sender: "user", text: inputValue };
+
     let userQuestion = inputValue;
     if (!userQuestion && exampleData) {
       // 質問が空欄なら、質問例を使用
@@ -81,19 +83,19 @@ export function ChatForm({
 
     const result = await askAI({
       userQuestion,
-      docsId: docs_id,
       documentContent,
       sectionContent,
       replOutputs,
       files,
       execResults,
     });
 
-    if (result.error !== null) {
+    if (result.error) {
       setErrorMessage(result.error);
       console.log(result.error);
     } else {
-      addChat(result.chat);
+      const aiMessage: ChatMessage = { sender: "ai", text: result.response };
+      const chatId = addChat(result.targetSectionId, [userMessage, aiMessage]);
       // TODO: chatIdが指す対象の回答にフォーカス
       setInputValue("");
       close();

app/[docs_id]/chatHistory.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import { ChatWithMessages } from "@/lib/chatHistory";
 import {
   createContext,
   ReactNode,
@@ -9,10 +8,15 @@ import {
   useState,
 } from "react";
 
+export interface ChatMessage {
+  sender: "user" | "ai" | "error";
+  text: string;
+}
+
 export interface IChatHistoryContext {
-  chatHistories: ChatWithMessages[];
-  addChat: (chat: ChatWithMessages) => void;
-  // updateChat: (sectionId: string, chatId: string, message: ChatMessage) => void;
+  chatHistories: Record<string, Record<string, ChatMessage[]>>;
+  addChat: (sectionId: string, messages: ChatMessage[]) => string;
+  updateChat: (sectionId: string, chatId: string, message: ChatMessage) => void;
 }
 const ChatHistoryContext = createContext<IChatHistoryContext | null>(null);
 export function useChatHistoryContext() {
@@ -25,26 +29,65 @@ export function useChatHistoryContext() {
   return context;
 }
 
-export function ChatHistoryProvider({
-  children,
-  initialChatHistories,
-}: {
-  children: ReactNode;
-  initialChatHistories: ChatWithMessages[];
-}) {
-  const [chatHistories, setChatHistories] =
-    useState<ChatWithMessages[]>(initialChatHistories);
+export function ChatHistoryProvider({ children }: { children: ReactNode }) {
+  const [chatHistories, setChatHistories] = useState<
+    Record<string, Record<string, ChatMessage[]>>
+  >({});
   useEffect(() => {
-    setChatHistories(initialChatHistories);
-  }, [initialChatHistories]);
+    // Load chat histories from localStorage on mount
+    const chatHistories: Record<string, Record<string, ChatMessage[]>> = {};
+    for (let i = 0; i < localStorage.length; i++) {
+      const key = localStorage.key(i);
+      if (key && key.startsWith("chat/") && key.split("/").length === 3) {
+        const savedHistory = localStorage.getItem(key);
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const [_, sectionId, chatId] = key.split("/");
+        if (savedHistory) {
+          if (!chatHistories[sectionId]) {
+            chatHistories[sectionId] = {};
+          }
+          chatHistories[sectionId][chatId] = JSON.parse(savedHistory);
+        }
+      }
+    }
+    setChatHistories(chatHistories);
+  }, []);
 
-  const addChat = (chat: ChatWithMessages) => {
-    // サーバー側で追加された新しいchatをクライアント側にも反映する
-    setChatHistories([...chatHistories, chat]);
+  const addChat = (sectionId: string, messages: ChatMessage[]): string => {
+    const chatId = Date.now().toString();
+    const newChatHistories = { ...chatHistories };
+    if (!newChatHistories[sectionId]) {
+      newChatHistories[sectionId] = {};
+    }
+    newChatHistories[sectionId][chatId] = messages;
+    setChatHistories(newChatHistories);
+    localStorage.setItem(
+      `chat/${sectionId}/${chatId}`,
+      JSON.stringify(messages)
+    );
+    return chatId;
+  };
+  const updateChat = (
+    sectionId: string,
+    chatId: string,
+    message: ChatMessage
+  ) => {
+    const newChatHistories = { ...chatHistories };
+    if (newChatHistories[sectionId] && newChatHistories[sectionId][chatId]) {
+      newChatHistories[sectionId][chatId] = [
+        ...newChatHistories[sectionId][chatId],
+        message,
+      ];
+      setChatHistories(newChatHistories);
+      localStorage.setItem(
+        `chat/${sectionId}/${chatId}`,
+        JSON.stringify(newChatHistories[sectionId][chatId])
+      );
+    }
   };
 
   return (
-    <ChatHistoryContext.Provider value={{ chatHistories, addChat }}>
+    <ChatHistoryContext.Provider value={{ chatHistories, addChat, updateChat }}>
       {children}
     </ChatHistoryContext.Provider>
   );

app/[docs_id]/page.tsx

@@ -6,7 +6,6 @@ import { MarkdownSection, splitMarkdown } from "./splitMarkdown";
 import pyodideLock from "pyodide/pyodide-lock.json";
 import { PageContent } from "./pageContent";
 import { ChatHistoryProvider } from "./chatHistory";
-import { getChat } from "@/lib/chatHistory";
 
 export default async function Page({
   params,
@@ -45,10 +44,8 @@ export default async function Page({
 
   const splitMdContent: MarkdownSection[] = splitMarkdown(mdContent);
 
-  const initialChatHistories = await getChat(docs_id);
-
   return (
-    <ChatHistoryProvider initialChatHistories={initialChatHistories}>
+    <ChatHistoryProvider>
       <PageContent
         documentContent={mdContent}
         splitMdContent={splitMdContent}

app/[docs_id]/pageContent.tsx

@@ -94,8 +94,8 @@ export function PageContent(props: PageContentProps) {
           </div>
           <div key={`${index}-chat`}>
             {/* 右側に表示するチャット履歴欄 */}
-            {chatHistories.filter((c) => c.sectionId === section.sectionId).map(
-              ({chatId, messages}) => (
+            {Object.entries(chatHistories[section.sectionId] ?? {}).map(
+              ([chatId, messages]) => (
                 <div
                   key={chatId}
                   className="max-w-xs mb-2 p-2 text-sm border border-base-content/10 rounded-sm shadow-sm bg-base-100"
@@ -104,20 +104,20 @@ export function PageContent(props: PageContentProps) {
                     {messages.map((msg, index) => (
                       <div
                         key={index}
-                        className={`chat ${msg.role === "user" ? "chat-end" : "chat-start"}`}
+                        className={`chat ${msg.sender === "user" ? "chat-end" : "chat-start"}`}
                       >
                         <div
                           className={clsx(
                             "chat-bubble p-1!",
-                            msg.role === "user" &&
+                            msg.sender === "user" &&
                               "bg-primary text-primary-content",
-                            msg.role === "ai" &&
+                            msg.sender === "ai" &&
                               "bg-secondary-content dark:bg-neutral text-black dark:text-white",
-                            msg.role === "error" && "chat-bubble-error"
+                            msg.sender === "error" && "chat-bubble-error"
                           )}
                           style={{ maxWidth: "100%", wordBreak: "break-word" }}
                         >
-                          <StyledMarkdown content={msg.content} />
+                          <StyledMarkdown content={msg.text} />
                         </div>
                       </div>
                     ))}