diff --git a/app/backend/ChatHistory.ts b/app/backend/ChatHistory.ts new file mode 100644 index 0000000..f050898 --- /dev/null +++ b/app/backend/ChatHistory.ts @@ -0,0 +1,27 @@ +type ChatMessage = { + name: string; + message: any; + timestamp: number; +}; + +let chatHistory: ChatMessage[] = []; + +function addMessage(name: string, message: any): void { + const newMessage: ChatMessage = { + name: name, + message: message, + timestamp: Date.now() + }; + chatHistory.push(newMessage); + console.log(`Added message from ${name}: ${message}`); +} + +function removeMessage(timestamp: number): void { + const index = chatHistory.findIndex((msg) => msg.timestamp === timestamp); + if (index > -1) { + chatHistory.splice(index, 1); + console.log(`Removed message with timestamp: ${timestamp}`); + } else { + console.log(`Message not found with timestamp: ${timestamp}`); + } +} diff --git a/app/backend/InputOutputHandler.tsx b/app/backend/InputOutputHandler.tsx index 33f7153..983a512 100644 --- a/app/backend/InputOutputHandler.tsx +++ b/app/backend/InputOutputHandler.tsx @@ -1,6 +1,6 @@ "use client" import React, { use, useEffect, useRef, useState } from "react"; -import ConversationFrontend from "../components/ConversationFrontend"; +import ConversationFrontend from '../components/ConversationFrontend'; import InputFrontend from "../components/InputFrontend"; import { sendToVoiceRecognition } from "./voice_backend" import axios from "axios"; @@ -55,6 +55,7 @@ const InputOutputBackend: React.FC = () => { }, [preferredCurrency, preferredLanguage, timeFormat, dateFormat, preferredMeasurement, timeZone]); + const conversationRef = useRef(null) const [copyClicked, setCopyClicked] = useState(false) const [accessToken, setAccessToken] = useState("") const postWorkerRef = useRef(null) @@ -269,6 +270,7 @@ const InputOutputBackend: React.FC = () => { return ( <> ( - ({ messages, onResendClick, onEditClick, onCopyClick, isClicked}, ref: ForwardedRef) => { - const endOfMessagesRef = useRef(null); - + ({ messages, onResendClick, onEditClick, onCopyClick, isClicked }, ref: ForwardedRef) => { + + const messagesEndRef = useRef(null) + + useEffect(() => { + messagesEndRef.current?.scrollIntoView() + }, [messages]) + return ( -
-
+
+
{messages.map((message, index) => { - let isUserMessage - if (message.role == "user") { - isUserMessage = message - } - if (index >= 1){ + if (index >= 1) { return (
+ className={message.role === "user" ? 'user-message' : 'ai-message'} + >

{message.content}

); } })} - - {/* Dummy div to mark the end of the conversation for auto-scrolling */} -
+
-

Copied!

+

Copied!

+
); diff --git a/app/styles/history.css b/app/styles/history.css index 8133955..14c8428 100644 --- a/app/styles/history.css +++ b/app/styles/history.css @@ -1,7 +1,7 @@ .history-background { grid-column: 1/2; grid-row: 1/2; - height: 40dvh; + height: 35dvh; overflow: hidden; background-color: var(--history-background-color); padding: 1em; @@ -40,6 +40,6 @@ .history-models{ position: relative; - height: 90dvh; + height: 86dvh; /* padding-bottom: 3dvh; */ } diff --git a/app/styles/output.css b/app/styles/output.css index 0f9ed42..179f174 100644 --- a/app/styles/output.css +++ b/app/styles/output.css @@ -4,6 +4,7 @@ grid-row: 1 / 4; background-color: var(--output-background-color); margin: 1em; + margin-bottom: 0; padding-bottom: 14dvh; display: flex; flex-direction: column; @@ -11,7 +12,7 @@ font-size: 1em; overflow-y: auto; width: calc(100% - 2em); /* Corrected calculation for width */ - height: 90dvh; + height: 86dvh; } #conversation { diff --git a/app/styles/responsive.css b/app/styles/responsive.css index 57ec871..ae65dfd 100644 --- a/app/styles/responsive.css +++ b/app/styles/responsive.css @@ -73,29 +73,31 @@ /* Input styles */ .input { grid-column: 1 / -1; - gap: 10px; + gap: 5px; padding: 0.5em; margin: 0 auto; align-items: center; - width: 90%; - bottom: 10dvh + bottom: 3dvh; + right: 2vw; + left: 2vw; + justify-content: flex-start; } .input input { font-size: 1em; /* Adjust font size */ - max-width: 65%; + max-width: 70%; margin-right: 0; border-color: var(--input-border-color); /* Use variable for input border */ color: var(--text-color); /* Use variable for text color */ } .input button { - height: 40px; /* Adjust button height */ - width: 40px; /* Adjust button width */ + height: 100%; /* Adjust button height */ + width: 15%; /* Adjust button width */ font-size: 1.2em; /* Adjust button font size */ - margin: auto; background-color: var(--input-button-color); /* Use variable for button color */ color: var(--user-message-text-color); /* Use variable for button text color */ + margin: 0; } .header-logo{