fix conflict

@@ -10,8 +10,8 @@ Create an .env file in the root directory of your application.
 Duplicate the env-template and rename to .env
 Duplicate the env-template and rename to .env
 In the .env file, define the environment variables you want to use in your application. ex.
 In the .env file, define the environment variables you want to use in your application. ex.
 
 
-`API_KEY="sk-xxxxxxxx"`
-`API_ORG="org-xxxxxxx"`
+`OPENAI_API_KEY="sk-xxxxxxxx"`
+`OPENAI_API_ORG="org-xxxxxxx"`
 
 
 ## Run server
 ## Run server
 
 

@@ -104,7 +104,7 @@
   padding:12px;
   padding:12px;
   padding-left: 24px;
   padding-left: 24px;
   padding-right: 24px;
   padding-right: 24px;
-  
+
 }
 }
 .avatar {
 .avatar {
   background:white;
   background:white;
@@ -114,7 +114,7 @@
   display:flex;
   display:flex;
   align-items:center;
   align-items:center;
   justify-content:center;
   justify-content:center;
-  padding:5px;
+  padding:15px;
   font-size:14px;
   font-size:14px;
   color:#444654;
   color:#444654;
 }
 }

@@ -47,8 +47,8 @@ function App() {
     const userInputRegex = new RegExp(`\\b(${userInput.join('|')})\\b`, 'gi');
     const userInputRegex = new RegExp(`\\b(${userInput.join('|')})\\b`, 'gi');
     const inputMatches = chatInput.match(userInputRegex);
     const inputMatches = chatInput.match(userInputRegex);
 
 
-    const userPunctuation = ['.', '?', '!', ':', ';', ','];
-    const userPunctuationRegex = new RegExp(`${userPunctuation.join('')}$`, 'gi');
+    const userPunctuation = ['\.', '?', '!', ':', ';', ','];
+    const userPunctuationRegex = new RegExp(`[${userPunctuation.join('')}]$`);
     const punctuationMatches = chatInput.match(userPunctuationRegex);
     const punctuationMatches = chatInput.match(userPunctuationRegex);
 
 
     // console.log(punctuationMatches)
     // console.log(punctuationMatches)
@@ -84,20 +84,14 @@ function App() {
       });
       });
       const data = await response.json();
       const data = await response.json();
       const parsedData = data.message.trim();
       const parsedData = data.message.trim();
-      // console.log(parsedData)
       const programmingKeywords = ['code', 'application', 'controller', 'rails' , 'PHP', 'java', 'javascript', 'script', 'console', 'python', 'programming', 'table'];
       const programmingKeywords = ['code', 'application', 'controller', 'rails' , 'PHP', 'java', 'javascript', 'script', 'console', 'python', 'programming', 'table'];
 
 
       const regex = new RegExp(`\\b(${programmingKeywords.join('|')})\\b`, 'gi');
       const regex = new RegExp(`\\b(${programmingKeywords.join('|')})\\b`, 'gi');
-      // console.log(regex)
       const matches = parsedData.match(regex);
       const matches = parsedData.match(regex);
-      // console.log(matches);
       if (!matches) {
       if (!matches) {
         var replaceTags = (parsedData.replace(/(?:\r\n|\r|\n)/g, '<br>').replace(/\./g, '. '))
         var replaceTags = (parsedData.replace(/(?:\r\n|\r|\n)/g, '<br>').replace(/\./g, '. '))
-        // console.log("not programming!")
       } else {
       } else {
           replaceTags = (parsedData.replace(':',':<code>').replace('<?','&#60;?').replace('?>','?&#62;').replace(/\n/g, '<br>'))
           replaceTags = (parsedData.replace(':',':<code>').replace('<?','&#60;?').replace('?>','?&#62;').replace(/\n/g, '<br>'))
-        // console.log("programming!")
-        //.replace('<?','&#60;' + '?').replace('?>','?'+'&#62;')
       }
       }
       setChatLog([...chatLogNew, { user: "gpt", message: `${replaceTags}`} ])
       setChatLog([...chatLogNew, { user: "gpt", message: `${replaceTags}`} ])
 
 
@@ -106,7 +100,6 @@ function App() {
     } catch (error) {
     } catch (error) {
       const errorMsg = "We apologize for any inconvenience caused due to the delay in the response time. Please try again.";
       const errorMsg = "We apologize for any inconvenience caused due to the delay in the response time. Please try again.";
       setChatLog([...chatLogNew, { user: "gpt", message: `<div class="errormsg"><span>i</span><div class="msg">${errorMsg}</div></div>`} ])
       setChatLog([...chatLogNew, { user: "gpt", message: `<div class="errormsg"><span>i</span><div class="msg">${errorMsg}</div></div>`} ])
-      // res.status(500).send(error || 'Something went wrong');
     }
     }
   }
   }