From a2f2b8fabc030ce91cc5f336eefc6cebbda6e3a2 Mon Sep 17 00:00:00 2001 From: ManishMadan2882 Date: Fri, 26 Jan 2024 02:33:50 +0530 Subject: [PATCH 1/4] make responsive msg bubble --- .../src/conversation/ConversationBubble.tsx | 75 ++++++++----------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/frontend/src/conversation/ConversationBubble.tsx b/frontend/src/conversation/ConversationBubble.tsx index ff970da..e4add34 100644 --- a/frontend/src/conversation/ConversationBubble.tsx +++ b/frontend/src/conversation/ConversationBubble.tsx @@ -13,7 +13,6 @@ import copy from 'copy-to-clipboard'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; import { vscDarkPlus } from 'react-syntax-highlighter/dist/cjs/styles/prism'; import DocsGPT3 from '../assets/cute_docsgpt3.svg'; - const DisableSourceFE = import.meta.env.VITE_DISABLE_SOURCE_FE || false; const ConversationBubble = forwardRef< @@ -64,9 +63,9 @@ const ConversationBubble = forwardRef< bubble = (
-
+
{type === 'ERROR' && ( alert )} (
setOpenSource(openSource === index ? null : index) } >

{index + 1}. {source.title.substring(0, 45)}

@@ -196,9 +192,9 @@ const ConversationBubble = forwardRef< )}
{ handleFeedback?.('LIKE'); setIsLikeClicked(true); @@ -255,25 +249,22 @@ const ConversationBubble = forwardRef<
{ handleFeedback?.('DISLIKE'); setIsDislikeClicked(true); @@ -288,7 +279,7 @@ const ConversationBubble = forwardRef<
{sources && openSource !== null && sources[openSource] && ( -
+

Source: {sources[openSource].title}

From 810dcb90ce689530dea940791128c7f5b18bc4e1 Mon Sep 17 00:00:00 2001 From: ManishMadan2882 Date: Fri, 26 Jan 2024 02:47:51 +0530 Subject: [PATCH 2/4] refactored the divs, prevent overlap --- .../src/conversation/ConversationBubble.tsx | 154 +++++++++--------- 1 file changed, 78 insertions(+), 76 deletions(-) diff --git a/frontend/src/conversation/ConversationBubble.tsx b/frontend/src/conversation/ConversationBubble.tsx index e4add34..082d7d0 100644 --- a/frontend/src/conversation/ConversationBubble.tsx +++ b/frontend/src/conversation/ConversationBubble.tsx @@ -65,7 +65,7 @@ const ConversationBubble = forwardRef< ref={ref} className={`flex self-start flex-wrap ${className} group flex-col pr-20 dark:text-bright-gray`} > -
+
)}
-
+
-
-
+
+
- {copied ? ( - setIsCopyHovered(true)} - onMouseLeave={() => setIsCopyHovered(false)} - /> - ) : ( - { - handleCopyClick(message); - }} - onMouseEnter={() => setIsCopyHovered(true)} - onMouseLeave={() => setIsCopyHovered(false)} - > - )} + > + {copied ? ( + setIsCopyHovered(true)} + onMouseLeave={() => setIsCopyHovered(false)} + /> + ) : ( + { + handleCopyClick(message); + }} + onMouseEnter={() => setIsCopyHovered(true)} + onMouseLeave={() => setIsCopyHovered(false)} + > + )} +
-
-
-
-
- +
+
+ { - handleFeedback?.('LIKE'); - setIsLikeClicked(true); - setIsDislikeClicked(false); - }} - onMouseEnter={() => setIsLikeHovered(true)} - onMouseLeave={() => setIsLikeHovered(false)} - > + ? 'fill-white-3000 stroke-purple-30 dark:fill-transparent' + : 'fill-none stroke-gray-4000' + }`} + onClick={() => { + handleFeedback?.('LIKE'); + setIsLikeClicked(true); + setIsDislikeClicked(false); + }} + onMouseEnter={() => setIsLikeHovered(true)} + onMouseLeave={() => setIsLikeHovered(false)} + > +
-
-
-
-
+
+
- { - handleFeedback?.('DISLIKE'); - setIsDislikeClicked(true); - setIsLikeClicked(false); - }} - onMouseEnter={() => setIsDislikeHovered(true)} - onMouseLeave={() => setIsDislikeHovered(false)} - > + className={`flex items-center justify-center rounded-full p-2 ${isDislikeHovered ? 'bg-[#EEEEEE] dark:bg-purple-taupe' : 'bg-[#ffffff] dark:bg-transparent'}`} + > + { + handleFeedback?.('DISLIKE'); + setIsDislikeClicked(true); + setIsLikeClicked(false); + }} + onMouseEnter={() => setIsDislikeHovered(true)} + onMouseLeave={() => setIsDislikeHovered(false)} + > +
{sources && openSource !== null && sources[openSource] && ( -
+

Source: {sources[openSource].title}

From f0293de1b928f3509d31a81eae7322cfd1e81943 Mon Sep 17 00:00:00 2001 From: ManishMadan2882 Date: Fri, 26 Jan 2024 03:06:15 +0530 Subject: [PATCH 3/4] ui adjustments --- frontend/src/conversation/ConversationBubble.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/conversation/ConversationBubble.tsx b/frontend/src/conversation/ConversationBubble.tsx index 082d7d0..5aac1bc 100644 --- a/frontend/src/conversation/ConversationBubble.tsx +++ b/frontend/src/conversation/ConversationBubble.tsx @@ -78,7 +78,7 @@ const ConversationBubble = forwardRef< />
{sources && openSource !== null && sources[openSource] && ( -
+

Source: {sources[openSource].title}

From 6058939c00162f1c1bcab74f79df3631fcdb6d13 Mon Sep 17 00:00:00 2001 From: ManishMadan2882 Date: Mon, 29 Jan 2024 19:10:03 +0530 Subject: [PATCH 4/4] change size in copy, like , dislike icons --- frontend/src/assets/copy.svg | 2 +- frontend/src/assets/dislike.svg | 2 +- frontend/src/assets/like.svg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/assets/copy.svg b/frontend/src/assets/copy.svg index 846d285..803f82d 100644 --- a/frontend/src/assets/copy.svg +++ b/frontend/src/assets/copy.svg @@ -1,3 +1,3 @@ - + diff --git a/frontend/src/assets/dislike.svg b/frontend/src/assets/dislike.svg index 9d4009b..ec1d24c 100644 --- a/frontend/src/assets/dislike.svg +++ b/frontend/src/assets/dislike.svg @@ -1,4 +1,4 @@ - + diff --git a/frontend/src/assets/like.svg b/frontend/src/assets/like.svg index 0bbe741..c49604e 100644 --- a/frontend/src/assets/like.svg +++ b/frontend/src/assets/like.svg @@ -1,4 +1,4 @@ - +