From b2dc2162277dfd0948c7aedb2a35d44d09aade2f Mon Sep 17 00:00:00 2001 From: Andy <67167307+aguzmant103@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:51:55 -0600 Subject: [PATCH 1/9] feat: adding copy groupID button --- apps/dashboard/src/pages/group.tsx | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx index b72d47dc..9d873c15 100644 --- a/apps/dashboard/src/pages/group.tsx +++ b/apps/dashboard/src/pages/group.tsx @@ -233,9 +233,27 @@ ${memberIds.join("\n")} - - {_group.name} - + + + {_group.name} + + + {_group.description && ( + + {_group.description} + + )} + + + {_group.description && ( From 1e9213d42f84d8b10fc8e6bf91a6a20a2cb6c680 Mon Sep 17 00:00:00 2001 From: Andy <67167307+aguzmant103@users.noreply.github.com> Date: Tue, 10 Oct 2023 17:42:45 -0600 Subject: [PATCH 2/9] feat: copy groupID on click fix #314 --- apps/dashboard/src/pages/group.tsx | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx index 9d873c15..1511fa46 100644 --- a/apps/dashboard/src/pages/group.tsx +++ b/apps/dashboard/src/pages/group.tsx @@ -48,6 +48,9 @@ export default function GroupPage(): JSX.Element { const { groupId, groupType } = useParams() const [_group, setGroup] = useState() const { hasCopied, setValue: setApiKey, onCopy } = useClipboard("") + const { hasCopied: hasCopied2, onCopy: onCopy2 } = useClipboard( + groupId as string + ) const [_searchMember, setSearchMember] = useState("") const [_removeGroupName, setRemoveGroupName] = useState("") const [_selectedMembers, setSelectedMembers] = useState([]) @@ -243,24 +246,15 @@ ${memberIds.join("\n")} {_group.description} )} - - + - {_group.description && ( - - {_group.description} - - )} - @@ -352,7 +346,7 @@ ${memberIds.join("\n")} > e.preventDefault() From 5f8b144adb93c8d883c6f08fbaa1e46e152699b2 Mon Sep 17 00:00:00 2001 From: Andy <67167307+aguzmant103@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:34:14 -0600 Subject: [PATCH 3/9] refactor: changing style --- apps/dashboard/src/pages/group.tsx | 58 ++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx index 1511fa46..ac7eb8f8 100644 --- a/apps/dashboard/src/pages/group.tsx +++ b/apps/dashboard/src/pages/group.tsx @@ -246,13 +246,6 @@ ${memberIds.join("\n")} {_group.description} )} - @@ -301,7 +294,54 @@ ${memberIds.join("\n")} - + ( + + Group ID + + { + <> + + + + + + + e.preventDefault() + } + icon={ + + } + /> + + + + + } + + ) {groupType === "off-chain" && !_group.credentials && ( )} - - {_group.type === "off-chain" && ( Date: Mon, 16 Oct 2023 11:03:04 -0600 Subject: [PATCH 4/9] style: min style changes --- apps/dashboard/src/pages/group.tsx | 64 +++++++++++++----------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx index ac7eb8f8..724fd132 100644 --- a/apps/dashboard/src/pages/group.tsx +++ b/apps/dashboard/src/pages/group.tsx @@ -302,44 +302,36 @@ ${memberIds.join("\n")} > Group ID - { - <> - - + + - - - - e.preventDefault() - } - icon={ - - } + + + e.preventDefault()} + icon={ + - - - - - } + } + /> + + + ) {groupType === "off-chain" && !_group.credentials && ( From 7fa888e7a10495ac7620a912c8117389dd39c628 Mon Sep 17 00:00:00 2001 From: aguzmant103 <67167307+aguzmant103@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:48:08 -0600 Subject: [PATCH 5/9] Update apps/dashboard/src/pages/group.tsx Co-authored-by: Vivian Plasencia --- apps/dashboard/src/pages/group.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx index 724fd132..d3445417 100644 --- a/apps/dashboard/src/pages/group.tsx +++ b/apps/dashboard/src/pages/group.tsx @@ -318,7 +318,7 @@ ${memberIds.join("\n")} > e.preventDefault()} icon={ From 71d026f22e388992b49e80536a11f60e19895285 Mon Sep 17 00:00:00 2001 From: aguzmant103 <67167307+aguzmant103@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:48:28 -0600 Subject: [PATCH 6/9] Update apps/dashboard/src/pages/group.tsx Co-authored-by: Vivian Plasencia --- apps/dashboard/src/pages/group.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx index d3445417..6a59ccc8 100644 --- a/apps/dashboard/src/pages/group.tsx +++ b/apps/dashboard/src/pages/group.tsx @@ -48,7 +48,7 @@ export default function GroupPage(): JSX.Element { const { groupId, groupType } = useParams() const [_group, setGroup] = useState() const { hasCopied, setValue: setApiKey, onCopy } = useClipboard("") - const { hasCopied: hasCopied2, onCopy: onCopy2 } = useClipboard( + const { hasCopied: hasCopiedGroupId, onCopy: onCopyGroupId } = useClipboard( groupId as string ) const [_searchMember, setSearchMember] = useState("") From 698d9d4c23505c2bc80cb179bf36b048b8ab4c96 Mon Sep 17 00:00:00 2001 From: aguzmant103 <67167307+aguzmant103@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:50:19 -0600 Subject: [PATCH 7/9] Update apps/dashboard/src/pages/group.tsx Co-authored-by: Vivian Plasencia --- apps/dashboard/src/pages/group.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx index 6a59ccc8..3f93962a 100644 --- a/apps/dashboard/src/pages/group.tsx +++ b/apps/dashboard/src/pages/group.tsx @@ -49,7 +49,7 @@ export default function GroupPage(): JSX.Element { const [_group, setGroup] = useState() const { hasCopied, setValue: setApiKey, onCopy } = useClipboard("") const { hasCopied: hasCopiedGroupId, onCopy: onCopyGroupId } = useClipboard( - groupId as string + groupId || "" ) const [_searchMember, setSearchMember] = useState("") const [_removeGroupName, setRemoveGroupName] = useState("") From 0762955508896cab33d9852818a66b4168c46ffe Mon Sep 17 00:00:00 2001 From: aguzmant103 <67167307+aguzmant103@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:50:25 -0600 Subject: [PATCH 8/9] Update apps/dashboard/src/pages/group.tsx Co-authored-by: Vivian Plasencia --- apps/dashboard/src/pages/group.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx index 3f93962a..ed778a4a 100644 --- a/apps/dashboard/src/pages/group.tsx +++ b/apps/dashboard/src/pages/group.tsx @@ -306,7 +306,7 @@ ${memberIds.join("\n")} From 5cd34ebcdb1ec77a26cfc6ffea7d805ecdf83b54 Mon Sep 17 00:00:00 2001 From: Andy <67167307+aguzmant103@users.noreply.github.com> Date: Mon, 16 Oct 2023 14:14:57 -0600 Subject: [PATCH 9/9] style: small style adjustments and changes on variables --- apps/dashboard/src/pages/group.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/dashboard/src/pages/group.tsx b/apps/dashboard/src/pages/group.tsx index ed778a4a..1f5ae9f3 100644 --- a/apps/dashboard/src/pages/group.tsx +++ b/apps/dashboard/src/pages/group.tsx @@ -305,21 +305,23 @@ ${memberIds.join("\n")} e.preventDefault()} icon={