From fb3be8a6a09d81068a4d790f73c728ce54deb489 Mon Sep 17 00:00:00 2001 From: HARSHITA GUPTA <119532943+harshita-2003@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:00:47 +0530 Subject: [PATCH 1/5] Update README.md added a lighting emoji to give it more great look --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97a965f5..f50d4ad9 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ Please refer to the [CONTRIBUTING.md](CONTRIBUTING.md) file for information abou We as members, contributors, and leaders, pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation. Please refer to the [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) file for more information about contributing. -## Many Thanks To Our Contributors +## Many Thanks To Our Contributors⚡ Contributors From 147b94d9364b0dd46bd0d861db93c70996f7bf20 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 31 Oct 2023 12:49:25 +0000 Subject: [PATCH 2/5] checkmark bug --- frontend/src/assets/checkMark2.svg | 3 +++ frontend/src/conversation/ConversationBubble.tsx | 4 ++-- frontend/src/conversation/ConversationTile.tsx | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 frontend/src/assets/checkMark2.svg diff --git a/frontend/src/assets/checkMark2.svg b/frontend/src/assets/checkMark2.svg new file mode 100644 index 00000000..9ed02cbd --- /dev/null +++ b/frontend/src/assets/checkMark2.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/frontend/src/conversation/ConversationBubble.tsx b/frontend/src/conversation/ConversationBubble.tsx index 8c0ab8ef..8dca54af 100644 --- a/frontend/src/conversation/ConversationBubble.tsx +++ b/frontend/src/conversation/ConversationBubble.tsx @@ -6,7 +6,7 @@ import Alert from './../assets/alert.svg'; import { ReactComponent as Like } from './../assets/like.svg'; import { ReactComponent as Dislike } from './../assets/dislike.svg'; import { ReactComponent as Copy } from './../assets/copy.svg'; -import { ReactComponent as Checkmark } from './../assets/checkmark.svg'; +import { ReactComponent as CheckMark } from './../assets/checkmark.svg'; import ReactMarkdown from 'react-markdown'; import copy from 'copy-to-clipboard'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; @@ -177,7 +177,7 @@ const ConversationBubble = forwardRef< }} > {copied ? ( - setIsCopyHovered(true)} onMouseLeave={() => setIsCopyHovered(false)} diff --git a/frontend/src/conversation/ConversationTile.tsx b/frontend/src/conversation/ConversationTile.tsx index 3ee67943..8fd6b261 100644 --- a/frontend/src/conversation/ConversationTile.tsx +++ b/frontend/src/conversation/ConversationTile.tsx @@ -3,7 +3,7 @@ import { useSelector } from 'react-redux'; import Edit from '../assets/edit.svg'; import Exit from '../assets/exit.svg'; import Message from '../assets/message.svg'; -import CheckMark from '../assets/checkmark.svg'; +import CheckMark2 from '../assets/checkMark2.svg'; import Trash from '../assets/trash.svg'; import { selectConversationId } from '../preferences/preferenceSlice'; @@ -94,7 +94,7 @@ export default function ConversationTile({ {conversationId === conversation.id && (
Edit Date: Tue, 31 Oct 2023 12:50:38 +0000 Subject: [PATCH 3/5] delete conflicting checkmark --- frontend/src/assets/checkmark.svg | 1 - 1 file changed, 1 deletion(-) delete mode 100644 frontend/src/assets/checkmark.svg diff --git a/frontend/src/assets/checkmark.svg b/frontend/src/assets/checkmark.svg deleted file mode 100644 index 499000e8..00000000 --- a/frontend/src/assets/checkmark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 0c05e1036dc1fe551f5a15f6d627d83bbc23727b Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 31 Oct 2023 12:52:27 +0000 Subject: [PATCH 4/5] del --- frontend/src/assets/checkMark.svg | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 frontend/src/assets/checkMark.svg diff --git a/frontend/src/assets/checkMark.svg b/frontend/src/assets/checkMark.svg deleted file mode 100644 index 9ed02cbd..00000000 --- a/frontend/src/assets/checkMark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file From 5d0b8588f93c0be034fbbf63275d7925f2fb2348 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 31 Oct 2023 12:52:34 +0000 Subject: [PATCH 5/5] Revert "delete conflicting checkmark" This reverts commit 266087c5f16e47fff60334f0725c6115e8ca0e2c. --- frontend/src/assets/checkmark.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 frontend/src/assets/checkmark.svg diff --git a/frontend/src/assets/checkmark.svg b/frontend/src/assets/checkmark.svg new file mode 100644 index 00000000..499000e8 --- /dev/null +++ b/frontend/src/assets/checkmark.svg @@ -0,0 +1 @@ + \ No newline at end of file