Merge branch 'master' of https://gitlab.baytech.ph/baytech/chatgpt.ai-pro.org in…

…to 26797_chatgpt_format3

@@ -42,9 +42,32 @@ function App() {
 
 
   async function handleSubmit(e){
   async function handleSubmit(e){
     e.preventDefault();
     e.preventDefault();
-    let chatLogNew = [...chatLog, { user: "me", message: `${chatInput}`} ]
+    // console.log(chatInput)
+    const userInput = ['what', 'why', 'when', 'where' , 'which', 'did', 'do', 'how', 'can', 'are', 'who', 'hey'];
+    const userInputRegex = new RegExp(`\\b(${userInput.join('|')})\\b`, 'gi');
+    const inputMatches = chatInput.match(userInputRegex);
+
+    const userPunctuation = ['.', '?', '!', ':', ';', ','];
+    const userPunctuationRegex = new RegExp(`${userPunctuation.join('')}$`, 'gi');
+    const punctuationMatches = chatInput.match(userPunctuationRegex);
+
+    // console.log(punctuationMatches)
+    var userModifiedInput = chatInput
+
+    if (!punctuationMatches) {
+      if (!inputMatches) {
+        userModifiedInput = chatInput + ".";
+        // console.log("not a question!")
+      } else {
+        userModifiedInput = chatInput + "?";
+        // console.log("its a question!")
+      }
+    }
+
+    let chatLogNew = [...chatLog, { user: "me", message: `${userModifiedInput}`} ]
     setChatInput("");
     setChatInput("");
     setChatLog(chatLogNew)
     setChatLog(chatLogNew)
+
     // fetch response to the api combining the chat log array of messages and seinding it as a message to localhost:3000 as a post
     // fetch response to the api combining the chat log array of messages and seinding it as a message to localhost:3000 as a post
     const messages = chatLogNew.map((message) => message.message).join("\n")
     const messages = chatLogNew.map((message) => message.message).join("\n")
 
 

-import OpenAISVGLogo from './OpenAISVGLogo'
+// import OpenAISVGLogo from './OpenAISVGLogo'
 
 
 // Primary Chat Window
 // Primary Chat Window
 const ChatBox = ({chatLog, setChatInput, handleSubmit, chatInput}) =>
 const ChatBox = ({chatLog, setChatInput, handleSubmit, chatInput}) =>
@@ -26,7 +26,7 @@ const ChatMessage = ({ message }) => {
     <div className={`chat-message ${message.user === "gpt" && "chatgpt"}`}>
     <div className={`chat-message ${message.user === "gpt" && "chatgpt"}`}>
     <div className="chat-message-center">
     <div className="chat-message-center">
       <div className={`avatar ${message.user === "gpt" && "chatgpt"}`}>
       <div className={`avatar ${message.user === "gpt" && "chatgpt"}`}>
-        {message.user === "gpt" ? <img className="ai-logo" src="../assets/images/bot.png" width="30px"/> : <img className="ai-logo" src="../assets/images/user.svg" />}
+        {message.user === "gpt" ? <img className="ai-logo" alt="Ai-pro bot" src="../assets/images/bot.png" width="30px"/> : <img className="ai-logo" alt="Ai-pro user" src="../assets/images/user.svg" />}
       </div>
       </div>
       {/* <div className="message">
       {/* <div className="message">
         {message.message}
         {message.message}

 const SideMenu = ({ clearChat, currentModel, setCurrentModel, models, setTemperature, temperature }) =>
 const SideMenu = ({ clearChat, currentModel, setCurrentModel, models, setTemperature, temperature }) =>
 <aside className="sidemenu">
 <aside className="sidemenu">
   <div className="ai-logo-container">
   <div className="ai-logo-container">
-    <img className="ai-logo" src="../assets/images/AIPRO-WHITE.png" height="50px"/>
+    <img className="ai-logo" alt="Ai-pro logo" src="../assets/images/AIPRO-WHITE.png" height="50px"/>
   </div>
   </div>
       <div className="side-menu-button" onClick={clearChat}>
       <div className="side-menu-button" onClick={clearChat}>
         <span>+</span>
         <span>+</span>

@@ -35,6 +35,7 @@ span.info {
   color: #101827 !important;
   color: #101827 !important;
   font-size: 16px !important;
   font-size: 16px !important;
   box-shadow: 0px 7px 6px -6px black !important;
   box-shadow: 0px 7px 6px -6px black !important;
+  height: 45px;
 }
 }
 
 
 .chat-message.chatgpt {
 .chat-message.chatgpt {