Merge branch '32993_CHATBOT_PLUS_GPT4o_MINI' into 'master'
32993_CHATBOT_PLUS_GPT4o_MINI See merge request !131
Showing
2 changed files
with
4 additions
and
2 deletions
| ... | @@ -191,13 +191,15 @@ function App() { | ... | @@ -191,13 +191,15 @@ function App() { |
| 191 | const regex = new RegExp(`\\b(${programmingKeywords.join('|')})\\b`, 'gi'); | 191 | const regex = new RegExp(`\\b(${programmingKeywords.join('|')})\\b`, 'gi'); |
| 192 | const matches = parsedData.match(regex); | 192 | const matches = parsedData.match(regex); |
| 193 | if (!matches) { | 193 | if (!matches) { |
| 194 | var replaceTags = (parsedData.replace(/(?:\r\n|\r|\n)/g, '<br>')) | 194 | var replaceTags = (parsedData.replace(/(?:\r\n|\r|\n)/g, '<br>')).replace(/\*\*(.*?)\*\*/g, '$1').replace(/###\s(.+)/g, '$1'); |
| 195 | } else { | 195 | } else { |
| 196 | replaceTags = (parsedData | 196 | replaceTags = (parsedData |
| 197 | .replace(':',':<code>') | 197 | .replace(':',':<code>') |
| 198 | .replace('<?','<?') | 198 | .replace('<?','<?') |
| 199 | .replace('?>','?>') | 199 | .replace('?>','?>') |
| 200 | .replace(/\n/g, '<br>') | 200 | .replace(/\n/g, '<br>') |
| 201 | .replace(/\*\*(.*?)\*\*/g, '$1') | ||
| 202 | .replace(/###\s(.+)/g, '$1') | ||
| 201 | ) | 203 | ) |
| 202 | } | 204 | } |
| 203 | 205 | ... | ... |
| ... | @@ -54,7 +54,7 @@ const ChatBox = ({chatLog, setChatInput, handleSubmit, chatInput, startedInterac | ... | @@ -54,7 +54,7 @@ const ChatBox = ({chatLog, setChatInput, handleSubmit, chatInput, startedInterac |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | const ChatMessage = ({ message }) => { | 56 | const ChatMessage = ({ message }) => { |
| 57 | const formattedMessage = message.message.replace(/\*\*(.*?)\*\*/g, '<b>$1</b>').replace(/###\s(.+)/g, '<b>$1</b>'); | 57 | const formattedMessage = message.message.replace(/\*\*(.*?)\*\*/g, '$1').replace(/###\s(.+)/g, '$1'); |
| 58 | return ( | 58 | return ( |
| 59 | <div className={`chat-message ${message.user === "gpt" && "chatgpt"}`}> | 59 | <div className={`chat-message ${message.user === "gpt" && "chatgpt"}`}> |
| 60 | <div className="chat-message-center" style={ message.user === "gpt" ? { background: "#ddf1f9"} : {}}> | 60 | <div className="chat-message-center" style={ message.user === "gpt" ? { background: "#ddf1f9"} : {}}> | ... | ... |
-
Please register or sign in to post a comment