From 2112176d6e237ec75f9b5a1fbc97e06df946e5dd Mon Sep 17 00:00:00 2001 From: Isaac Wise Date: Sun, 11 Feb 2024 02:48:34 -0600 Subject: [PATCH] Fixed disabled buttons --- components/LinkViews/LinkCard.tsx | 6 -- pages/collections/[id].tsx | 94 +++++++++++++++--------------- pages/links/index.tsx | 96 ++++++++++++++++--------------- pages/links/pinned.tsx | 94 +++++++++++++++--------------- pages/tags/[id].tsx | 38 ++++++------ 5 files changed, 164 insertions(+), 164 deletions(-) diff --git a/components/LinkViews/LinkCard.tsx b/components/LinkViews/LinkCard.tsx index 29c7f87..d5f6ada 100644 --- a/components/LinkViews/LinkCard.tsx +++ b/components/LinkViews/LinkCard.tsx @@ -135,12 +135,6 @@ export default function LinkCard({
)}
diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx index 2d58286..e1dfd58 100644 --- a/pages/collections/[id].tsx +++ b/pages/collections/[id].tsx @@ -329,53 +329,57 @@ export default function Index() {
-
- {links.length > 0 && editMode && ( -
- handleSelectAll()} - checked={ - selectedLinks.length === links.length && links.length > 0 - } - /> - {selectedLinks.length > 0 ? ( - - {selectedLinks.length}{" "} - {selectedLinks.length === 1 ? "link" : "links"} selected - - ) : ( - Nothing selected - )} + {editMode && ( +
+ {links.length > 0 && ( +
+ handleSelectAll()} + checked={ + selectedLinks.length === links.length && links.length > 0 + } + /> + {selectedLinks.length > 0 ? ( + + {selectedLinks.length}{" "} + {selectedLinks.length === 1 ? "link" : "links"} selected + + ) : ( + Nothing selected + )} +
+ )} +
+ {(permissions === true || + permissions?.canUpdate) && ( + + )} + {(permissions === true || + permissions?.canDelete) && ( + + )}
- )} -
- {(permissions === true || permissions?.canUpdate) && ( - - )} - {(permissions === true || permissions?.canDelete) && ( - - )}
-
+ )} {links.some((e) => e.collectionId === Number(router.query.id)) ? (
-
- {links.length > 0 && editMode && ( -
- handleSelectAll()} - checked={ - selectedLinks.length === links.length && links.length > 0 - } - /> - {selectedLinks.length > 0 ? ( - - {selectedLinks.length}{" "} - {selectedLinks.length === 1 ? "link" : "links"} selected - - ) : ( - Nothing selected - )} + {editMode && ( +
+ {links.length > 0 && ( +
+ handleSelectAll()} + checked={ + selectedLinks.length === links.length && links.length > 0 + } + /> + {selectedLinks.length > 0 ? ( + + {selectedLinks.length}{" "} + {selectedLinks.length === 1 ? "link" : "links"} selected + + ) : ( + Nothing selected + )} +
+ )} +
+ {(collectivePermissions === true || + collectivePermissions?.canUpdate) && ( + + )} + {(collectivePermissions === true || + collectivePermissions?.canDelete) && ( + + )}
- )} -
- {(collectivePermissions === true || - collectivePermissions?.canUpdate) && ( - - )} - {(collectivePermissions === true || - collectivePermissions?.canDelete) && ( - - )}
-
+ )} {links[0] ? ( diff --git a/pages/links/pinned.tsx b/pages/links/pinned.tsx index f456653..6714554 100644 --- a/pages/links/pinned.tsx +++ b/pages/links/pinned.tsx @@ -100,53 +100,57 @@ export default function PinnedLinks() {
-
- {links.length > 0 && editMode && ( -
- handleSelectAll()} - checked={ - selectedLinks.length === links.length && links.length > 0 - } - /> - {selectedLinks.length > 0 ? ( - - {selectedLinks.length}{" "} - {selectedLinks.length === 1 ? "link" : "links"} selected - - ) : ( - Nothing selected - )} + {editMode && ( +
+ {links.length > 0 && ( +
+ handleSelectAll()} + checked={ + selectedLinks.length === links.length && links.length > 0 + } + /> + {selectedLinks.length > 0 ? ( + + {selectedLinks.length}{" "} + {selectedLinks.length === 1 ? "link" : "links"} selected + + ) : ( + Nothing selected + )} +
+ )} +
+ {(collectivePermissions === true || + collectivePermissions?.canUpdate) && ( + + )} + {(collectivePermissions === true || + collectivePermissions?.canDelete) && ( + + )}
- )} -
- {(collectivePermissions === true || collectivePermissions?.canUpdate) && ( - - )} - {(collectivePermissions === true || collectivePermissions?.canDelete) && ( - - )}
-
+ )} {links.some((e) => e.pinnedBy && e.pinnedBy[0]) ? ( diff --git a/pages/tags/[id].tsx b/pages/tags/[id].tsx index b6dfaf3..2ba7a58 100644 --- a/pages/tags/[id].tsx +++ b/pages/tags/[id].tsx @@ -115,8 +115,7 @@ export default function Index() { const bulkDeleteLinks = async () => { const load = toast.loading( - `Deleting ${selectedLinks.length} Link${ - selectedLinks.length > 1 ? "s" : "" + `Deleting ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" }...` ); @@ -128,8 +127,7 @@ export default function Index() { response.ok && toast.success( - `Deleted ${selectedLinks.length} Link${ - selectedLinks.length > 1 ? "s" : "" + `Deleted ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" }!` ); }; @@ -188,11 +186,10 @@ export default function Index() {

8 - ? "dropdown-end" - : "" - }`} + className={`dropdown dropdown-bottom font-normal ${activeTag?.name.length && activeTag?.name.length > 8 + ? "dropdown-end" + : "" + }`} >
@@ -279,19 +275,18 @@ export default function Index() {
)}
- {selectedLinks.length > 0 && - (collectivePermissions === true || - collectivePermissions?.canUpdate) && ( + {(collectivePermissions === true || + collectivePermissions?.canUpdate) && ( )} - {selectedLinks.length > 0 && - (collectivePermissions === true || - collectivePermissions?.canDelete) && ( + {(collectivePermissions === true || + collectivePermissions?.canDelete) && (