diff --git a/app/backend/InputOutputHandler.tsx b/app/backend/InputOutputHandler.tsx index b4a59b7..646e924 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"; @@ -52,7 +52,6 @@ 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) @@ -267,7 +266,6 @@ const InputOutputBackend: React.FC = () => { return ( <> ( - ({ messages, onResendClick, onEditClick, onCopyClick, isClicked }, ref: ForwardedRef) => { - - const messagesEndRef = useRef(null) - - useEffect(() => { - messagesEndRef.current?.scrollIntoView() - },[messages]) - + ({ messages, onResendClick, onEditClick, onCopyClick, isClicked}, ref: ForwardedRef) => { + const endOfMessagesRef = useRef(null); + return ( -
-
+
+
{messages.map((message, index) => { + let isUserMessage + if (message.role == "user") { + isUserMessage = message + } if (index >= 1){ return (

{message.content}

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