Fixing types

cuappdev · Dec 29, 2024 · 6fdea4b · 6fdea4b
1 parent c7498c2
commit 6fdea4b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/src/app/components/InitialChatPage.tsx b/src/app/components/InitialChatPage.tsx
@@ -41,22 +41,25 @@ export default function InitialChatPage() {
   };
 
   return (
-    <div className="flex h-svh flex-row gap-0">
-      <ChatMenuNavbar />
-
-      <div className="flex w-full flex-col">
-        <ChatHeader />
-        <div className="m-auto mt-10 flex w-4/5 flex-grow flex-col gap-3">
-          <span className="text-7xl font-semibold">{`Hello, ${firstName}`}</span>
-          <span className="text-3xl font-semibold text-primaryColor">
-            How can I help you today?
-          </span>
-        </div>
+    <>
+      <div className="flex h-svh flex-row gap-0">
+        <ChatMenuNavbar />
+
+        <div className="flex w-full flex-col">
+          <ChatHeader />
+          <div className="m-auto mt-10 flex w-4/5 flex-grow flex-col gap-3">
+            <span className="text-7xl font-semibold">{`Hello, ${firstName}`}</span>
+            <span className="text-3xl font-semibold text-primaryColor">
+              How can I help you today?
+            </span>
+          </div>
 
-        <div className="mb-5">
-          <InputField onSubmit={handleInitialSendMessage} messageStreaming={false} />
+          <div className="mb-5">
+            <InputField onSubmit={handleInitialSendMessage} messageStreaming={false} />
+          </div>
         </div>
       </div>
-    </div>
+      <Toast />
+    </>
   );
 }
diff --git a/src/app/components/chat/ChatMenuNavbar.tsx b/src/app/components/chat/ChatMenuNavbar.tsx
@@ -1,6 +1,6 @@
 import { useAuth } from '@/contexts/AuthContext';
 import { useState, useEffect, useRef } from 'react';
-import { Chats } from '@/types/chat';
+import { Chat } from '@prisma/client';
 import { useRouter } from 'next/navigation';
 import Image from 'next/image';
 import Spinner from '../Spinner';
@@ -16,7 +16,7 @@ export default function ChatMenuNavbar() {
   const [isNavbarOpen, setIsNavbarOpen] = useState(!(window.innerWidth < 768));
   const [isEmbedModalOpen, setIsEmbedModalOpen] = useState(false);
   const [isModelModalOpen, setIsModelModalOpen] = useState(false);
-  const [chatHistory, setChatHistory] = useState<Chats>({ chats: [] });
+  const [chatHistory, setChatHistory] = useState<Chat[]>([]);
   const [loadingHistory, setLoadingHistory] = useState(true);
   const router = useRouter();
   const menuRef = useRef<HTMLDivElement>(null);
@@ -155,7 +155,7 @@ export default function ChatMenuNavbar() {
               </div>
             ) : (
               <div className="no-scrollbar mt-5 flex-1 flex-col justify-start overflow-y-auto">
-                {chatHistory.chats.map((chat, index) => (
+                {chatHistory.map((chat, index) => (
                   <ChatHistoryEntry key={index} chat={chat} />
                 ))}
               </div>