8c361942 by Administrator

Merge branch '32993_CHATBOT_PLUS_GPT4o_MINI' into 'master'

32993_CHATBOT_PLUS_GPT4o_MINI

See merge request !130
2 parents 604ed219 d1b31729
Pipeline #30502 for 8c361942 passed in 18 seconds
...@@ -193,7 +193,12 @@ function App() { ...@@ -193,7 +193,12 @@ function App() {
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>'))
195 } else { 195 } else {
196 replaceTags = (parsedData.replace(':',':<code>').replace('<?','&#60;?').replace('?>','?&#62;').replace(/\n/g, '<br>')) 196 replaceTags = (parsedData
197 .replace(':',':<code>')
198 .replace('<?','&#60;?')
199 .replace('?>','?&#62;')
200 .replace(/\n/g, '<br>')
201 )
197 } 202 }
198 203
199 for (let i = 0; i < replaceTags.length; i++) { 204 for (let i = 0; i < replaceTags.length; i++) {
......
...@@ -54,6 +54,7 @@ const ChatBox = ({chatLog, setChatInput, handleSubmit, chatInput, startedInterac ...@@ -54,6 +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 return ( 58 return (
58 <div className={`chat-message ${message.user === "gpt" && "chatgpt"}`}> 59 <div className={`chat-message ${message.user === "gpt" && "chatgpt"}`}>
59 <div className="chat-message-center" style={ message.user === "gpt" ? { background: "#ddf1f9"} : {}}> 60 <div className="chat-message-center" style={ message.user === "gpt" ? { background: "#ddf1f9"} : {}}>
...@@ -63,7 +64,7 @@ const ChatMessage = ({ message }) => { ...@@ -63,7 +64,7 @@ const ChatMessage = ({ message }) => {
63 {/* <div className="message"> 64 {/* <div className="message">
64 {message.message} 65 {message.message}
65 </div> */} 66 </div> */}
66 <div className="message" dangerouslySetInnerHTML={{ __html: message.message }} /> 67 <div className="message" dangerouslySetInnerHTML={{ __html: formattedMessage }} />
67 </div> 68 </div>
68 </div> 69 </div>
69 ) 70 )
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!