Merge branch 'main' into main

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}`);
+    }
+}

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<HTMLDivElement>(null)
   const [copyClicked, setCopyClicked] = useState(false)
   const [accessToken, setAccessToken] = useState("")
   const postWorkerRef = useRef<Worker | null>(null)
@@ -269,6 +270,7 @@ const InputOutputBackend: React.FC = () => {
   return (
     <>
       <ConversationFrontend
+        ref={conversationRef}
         messages={messages}
         onResendClick={handleResendClick}
         onEditClick={handleEditClick}

app/components/ConversationFrontend.tsx

@@ -14,32 +14,31 @@ interface ConversationProps {
 }
 
 const ConversationFrontend = React.forwardRef<HTMLDivElement, ConversationProps>(
-  ({ messages, onResendClick, onEditClick, onCopyClick, isClicked}, ref: ForwardedRef<HTMLDivElement>) => {
+  ({ messages, onResendClick, onEditClick, onCopyClick, isClicked }, ref: ForwardedRef<HTMLDivElement>) => {
-    const endOfMessagesRef = useRef<HTMLDivElement>(null);
+
+    const messagesEndRef = useRef<HTMLDivElement | null>(null)
+
+    useEffect(() => {
+      messagesEndRef.current?.scrollIntoView()
+    }, [messages])
 
     return (
-      <div className="output">
+      <div className="output" ref={ref}>
-        <div className="conversation resize" id="conversation" ref={ref}>
+        <div className="conversation resize" id="conversation">
           {messages.map((message, index) => {
-            let isUserMessage
+            if (index >= 1) {
-            if (message.role == "user") {
-              isUserMessage = message
-            }
-            if (index >= 1){
 
               return (
                 <div
                   key={index}
-                  className={isUserMessage ? 'user-message' : 'ai-message'}
+                  className={message.role === "user" ? 'user-message' : 'ai-message'}
-                  >
+                >
                   <p> {message.content}</p>
                 </div>
               );
             }
           })}
 
-          {/* Dummy div to mark the end of the conversation for auto-scrolling */}
-          <div ref={endOfMessagesRef} />
           <div className="button-container">
             <button type="button" onClick={onResendClick}>
               <img src="/img/resend.svg" alt="resend" />
@@ -50,8 +49,9 @@ const ConversationFrontend = React.forwardRef<HTMLDivElement, ConversationProps>
             <button type="button" onClick={onCopyClick}>
               <img src="/img/copy.svg" alt="copy" />
             </button>
-            <p id="copiedText" style={{opacity:isClicked?"1":"0", transition:"all 0.3s ease-in-out"}}>Copied!</p>
+            <p id="copiedText" style={{ opacity: isClicked ? "1" : "0", transition: "all 0.3s ease-in-out" }}>Copied!</p>
           </div>
+          <div ref={messagesEndRef} />
         </div>
       </div>
     );

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; */
 }

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 {

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: 3dvh;
-    bottom: 10dvh
+    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 */
+    height: 100%; /* Adjust button height */
-    width: 40px; /* Adjust button width */
+    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{