Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

feat(web): add droppable dashboard links

Kha Nguyen3dfa12dbbf18
diff --git a/apps/web/components/DashboardLinks.tsx b/apps/web/components/DashboardLinks.tsx
index 38802e22..12a6dc79 100644
--- a/apps/web/components/DashboardLinks.tsx
+++ b/apps/web/components/DashboardLinks.tsx
@@ -25,13 +25,19 @@ import LinkFormats from "./LinkViews/LinkComponents/LinkFormats";
import LinkTypeBadge from "./LinkViews/LinkComponents/LinkTypeBadge";
import LinkPin from "./LinkViews/LinkComponents/LinkPin";
import { Separator } from "./ui/separator";
+import { useDraggable } from "@dnd-kit/core";
+import { cn } from "@linkwarden/lib";
+import { Button } from "./ui/button";
+import { GripIcon } from "lucide-react";
export function DashboardLinks({
links,
isLoading,
+ type,
}: {
links?: LinkIncludingShortenedCollectionAndTags[];
isLoading?: boolean;
+ type?: "collection" | "recent";
}) {
return (
<div
@@ -46,7 +52,7 @@ export function DashboardLinks({
<div className="skeleton h-3 w-1/3"></div>
</div>
) : (
- links?.map((e, i) => <Card key={i} link={e} />)
+ links?.map((e, i) => <Card key={i} link={e} dashboardType={type} />)
)}
</div>
);
@@ -55,9 +61,16 @@ export function DashboardLinks({
type Props = {
link: LinkIncludingShortenedCollectionAndTags;
editMode?: boolean;
+ dashboardType?: "collection" | "recent";
};
-export function Card({ link, editMode }: Props) {
+export function Card({ link, editMode, dashboardType }: Props) {
+ const { attributes, listeners, setNodeRef, isDragging } = useDraggable({
+ id: `${link.id}-${dashboardType}`,
+ data: {
+ linkId: link.id,
+ },
+ });
const { data: collections = [] } = useCollections();
const { data: user } = useUser();
@@ -127,94 +140,109 @@ export function Card({ link, editMode }: Props) {
return (
<div
- ref={ref}
- className={`min-w-60 w-60 border border-solid border-neutral-content bg-base-200 duration-100 rounded-xl relative group`}
+ ref={setNodeRef}
+ className={cn(isDragging ? "opacity-30" : "opacity-100")}
+ id={`${link.id}-${dashboardType}`}
>
<div
- className="rounded-xl cursor-pointer h-full w-full flex flex-col justify-between"
- onClick={() =>
- !editMode && openLink(link, user, () => setLinkModal(true))
- }
+ ref={ref}
+ className={`min-w-60 w-60 border border-solid border-neutral-content bg-base-200 duration-100 rounded-xl relative group`}
>
- {show.image && (
- <div>
- <div className={`relative rounded-t-xl h-40 overflow-hidden`}>
- {formatAvailable(link, "preview") ? (
- <Image
- src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.jpeg}&preview=true&updatedAt=${link.updatedAt}`}
- width={1280}
- height={720}
- alt=""
- className={`rounded-t-xl select-none object-cover z-10 h-40 w-full shadow opacity-80 scale-105`}
- style={show.icon ? { filter: "blur(1px)" } : undefined}
- draggable="false"
- onError={(e) => {
- const target = e.target as HTMLElement;
- target.style.display = "none";
- }}
- />
- ) : link.preview === "unavailable" ? (
- <div className={`bg-gray-50 h-40 bg-opacity-80`}></div>
- ) : (
- <div
- className={`h-40 bg-opacity-80 skeleton rounded-none`}
- ></div>
- )}
- {show.icon && (
- <div className="absolute top-0 left-0 right-0 bottom-0 rounded-t-xl flex items-center justify-center rounded-md">
- <LinkIcon link={link} />
- </div>
- )}
- {show.preserved_formats &&
- link.type === "url" &&
- atLeastOneFormatAvailable(link) && (
- <div className="absolute bottom-0 right-0 m-2 bg-base-200 bg-opacity-60 px-1 rounded-md">
- <LinkFormats link={link} />
+ <div
+ className="rounded-xl cursor-pointer h-full w-full flex flex-col justify-between"
+ onClick={() =>
+ !editMode && openLink(link, user, () => setLinkModal(true))
+ }
+ >
+ {show.image && (
+ <div>
+ <div className={`relative rounded-t-xl h-40 overflow-hidden`}>
+ <Button
+ size="icon"
+ className="absolute z-50 opacity-0 top-2 left-2 group-hover:opacity-100"
+ variant="ghost"
+ {...listeners}
+ {...attributes}
+ >
+ <GripIcon />
+ </Button>
+ {formatAvailable(link, "preview") ? (
+ <Image
+ src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.jpeg}&preview=true&updatedAt=${link.updatedAt}`}
+ width={1280}
+ height={720}
+ alt=""
+ className={`rounded-t-xl select-none object-cover z-10 h-40 w-full shadow opacity-80 scale-105`}
+ style={show.icon ? { filter: "blur(1px)" } : undefined}
+ draggable="false"
+ onError={(e) => {
+ const target = e.target as HTMLElement;
+ target.style.display = "none";
+ }}
+ />
+ ) : link.preview === "unavailable" ? (
+ <div className={`bg-gray-50 h-40 bg-opacity-80`}></div>
+ ) : (
+ <div
+ className={`h-40 bg-opacity-80 skeleton rounded-none`}
+ ></div>
+ )}
+ {show.icon && (
+ <div className="absolute top-0 left-0 right-0 bottom-0 rounded-t-xl flex items-center justify-center rounded-md">
+ <LinkIcon link={link} />
</div>
)}
+ {show.preserved_formats &&
+ link.type === "url" &&
+ atLeastOneFormatAvailable(link) && (
+ <div className="absolute bottom-0 right-0 m-2 bg-base-200 bg-opacity-60 px-1 rounded-md">
+ <LinkFormats link={link} />
+ </div>
+ )}
+ </div>
+ <Separator />
</div>
- <Separator />
- </div>
- )}
-
- <div className="flex flex-col justify-between h-full min-h-24">
- <div className="p-3 flex flex-col justify-between h-full gap-2">
- {show.name && (
- <p className="line-clamp-2 w-full text-primary text-sm">
- {unescapeString(link.name)}
- </p>
- )}
+ )}
- {show.link && <LinkTypeBadge link={link} />}
- </div>
+ <div className="flex flex-col justify-between h-full min-h-24">
+ <div className="p-3 flex flex-col justify-between h-full gap-2">
+ {show.name && (
+ <p className="line-clamp-2 w-full text-primary text-sm">
+ {unescapeString(link.name)}
+ </p>
+ )}
- {(show.collection || show.date) && (
- <div>
- <Separator className="mb-1" />
+ {show.link && <LinkTypeBadge link={link} />}
+ </div>
- <div className="flex justify-between items-center text-xs text-neutral px-3 pb-1 gap-2">
- {show.collection && !isPublicRoute && (
- <div className="cursor-pointer truncate">
- <LinkCollection link={link} collection={collection} />
- </div>
- )}
- {show.date && <LinkDate link={link} />}
+ {(show.collection || show.date) && (
+ <div>
+ <Separator className="mb-1" />
+
+ <div className="flex justify-between items-center text-xs text-neutral px-3 pb-1 gap-2">
+ {show.collection && !isPublicRoute && (
+ <div className="cursor-pointer truncate">
+ <LinkCollection link={link} collection={collection} />
+ </div>
+ )}
+ {show.date && <LinkDate link={link} />}
+ </div>
</div>
- </div>
- )}
+ )}
+ </div>
</div>
- </div>
- {/* Overlay on hover */}
- <div className="absolute pointer-events-none top-0 left-0 right-0 bottom-0 bg-base-100 bg-opacity-0 group-hover:bg-opacity-20 group-focus-within:opacity-20 rounded-xl duration-100"></div>
- <LinkActions
- link={link}
- collection={collection}
- linkModal={linkModal}
- setLinkModal={(e) => setLinkModal(e)}
- className="absolute top-3 right-3 group-hover:opacity-100 group-focus-within:opacity-100 opacity-0 duration-100 text-neutral z-20"
- />
- {!isPublicRoute && <LinkPin link={link} />}
+ {/* Overlay on hover */}
+ <div className="absolute pointer-events-none top-0 left-0 right-0 bottom-0 bg-base-100 bg-opacity-0 group-hover:bg-opacity-20 group-focus-within:opacity-20 rounded-xl duration-100"></div>
+ <LinkActions
+ link={link}
+ collection={collection}
+ linkModal={linkModal}
+ setLinkModal={(e) => setLinkModal(e)}
+ className="absolute top-3 right-3 group-hover:opacity-100 opacity-0 duration-100 text-neutral z-20"
+ />
+ {!isPublicRoute && <LinkPin link={link} />}
+ </div>
</div>
);
}
diff --git a/apps/web/components/Droppable.tsx b/apps/web/components/Droppable.tsx
new file mode 100644
index 00000000..3e3b0884
--- /dev/null
+++ b/apps/web/components/Droppable.tsx
@@ -0,0 +1,39 @@
+import { useDroppable } from "@dnd-kit/core";
+
+const Droppable = ({
+ children,
+ id,
+ data,
+}: {
+ children: React.ReactNode;
+ id: string;
+ data?: {
+ collectionId?: string;
+ collectionName?: string;
+ ownerId?: string;
+ };
+}) => {
+ const { setNodeRef, isOver } = useDroppable({
+ id,
+ data,
+ });
+
+ return (
+ <div
+ ref={setNodeRef}
+ className={`${
+ isOver
+ ? "bg-primary/10 border-2 border-dashed border-primary rounded-lg"
+ : ""
+ } transition-colors duration-200 p-2 min-h-20`}
+ style={{
+ position: "relative",
+ zIndex: isOver ? 1 : "auto",
+ }}
+ >
+ {children}
+ </div>
+ );
+};
+
+export default Droppable;