Skip to content

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

improved DX

daniel31x139e4502c015c9
diff --git a/components/CollectionCard.tsx b/components/CollectionCard.tsx
index 5b737351..beca2ae0 100644
--- a/components/CollectionCard.tsx
+++ b/components/CollectionCard.tsx
@@ -192,24 +192,24 @@ export default function CollectionCard({ collection, className }: Props) {
</div>
</div>
</Link>
- <EditCollectionModal
- isOpen={editCollectionModal}
- onClose={() => setEditCollectionModal(false)}
- modalId={"edit-collection-modal" + collection.id}
- activeCollection={collection}
- />
- <EditCollectionSharingModal
- isOpen={editCollectionSharingModal}
- onClose={() => setEditCollectionSharingModal(false)}
- modalId={"edit-collection-sharing-modal" + collection.id}
- activeCollection={collection}
- />
- <DeleteCollectionModal
- isOpen={deleteCollectionModal}
- onClose={() => setDeleteCollectionModal(false)}
- modalId={"delete-collection-modal" + collection.id}
- activeCollection={collection}
- />
+ {editCollectionModal ? (
+ <EditCollectionModal
+ onClose={() => setEditCollectionModal(false)}
+ activeCollection={collection}
+ />
+ ) : undefined}
+ {editCollectionSharingModal ? (
+ <EditCollectionSharingModal
+ onClose={() => setEditCollectionSharingModal(false)}
+ activeCollection={collection}
+ />
+ ) : undefined}
+ {deleteCollectionModal ? (
+ <DeleteCollectionModal
+ onClose={() => setDeleteCollectionModal(false)}
+ activeCollection={collection}
+ />
+ ) : undefined}
</div>
);
}
diff --git a/components/LinkCard.tsx b/components/LinkCard.tsx
index 5d2d9e75..61c43717 100644
--- a/components/LinkCard.tsx
+++ b/components/LinkCard.tsx
@@ -118,7 +118,7 @@ export default function LinkCard({ link, count, className }: Props) {
}
);
- const [newLinkModal, setNewLinkModal] = useState(false);
+ const [editLinkModal, setEditLinkModal] = useState(false);
return (
<div
@@ -168,7 +168,7 @@ export default function LinkCard({ link, count, className }: Props) {
tabIndex={0}
onClick={() => {
(document?.activeElement as HTMLElement)?.blur();
- setNewLinkModal(true);
+ setEditLinkModal(true);
}}
>
Edit
@@ -291,12 +291,12 @@ export default function LinkCard({ link, count, className }: Props) {
</div>
</div>
</div>
- <EditLinkModal
- isOpen={newLinkModal}
- onClose={() => setNewLinkModal(false)}
- modalId={"edit-link-modal" + link.id}
- activeLink={link}
- />
+ {editLinkModal ? (
+ <EditLinkModal
+ onClose={() => setEditLinkModal(false)}
+ activeLink={link}
+ />
+ ) : undefined}
</div>
);
}
diff --git a/components/Modal/Collection/index.tsx b/components/Modal/Collection/index.tsx
index b17f9d15..44802f45 100644
--- a/components/Modal/Collection/index.tsx
+++ b/components/Modal/Collection/index.tsx
@@ -2,7 +2,7 @@ import { Tab } from "@headlessui/react";
import CollectionInfo from "./CollectionInfo";
import { CollectionIncludingMembersAndLinkCount } from "@/types/global";
import TeamManagement from "./TeamManagement";
-import { useState } from "react";
+import { useEffect, useState } from "react";
import DeleteCollection from "./DeleteCollection";
import ViewTeam from "./ViewTeam";
diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx
index d7bd5bfb..cf9ccdca 100644
--- a/components/Modal/index.tsx
+++ b/components/Modal/index.tsx
@@ -1,7 +1,7 @@
-import { MouseEventHandler, ReactNode } from "react";
+import { MouseEventHandler, ReactNode, useEffect } from "react";
import ClickAwayHandler from "@/components/ClickAwayHandler";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faChevronLeft } from "@fortawesome/free-solid-svg-icons";
+import { faClose } from "@fortawesome/free-solid-svg-icons";
type Props = {
toggleModal: Function;
@@ -14,17 +14,14 @@ export default function Modal({ toggleModal, className, children }: Props) {
<div className="overflow-y-auto py-2 fixed top-0 bottom-0 right-0 left-0 bg-black bg-opacity-10 backdrop-blur-sm flex justify-center items-center fade-in z-30">
<ClickAwayHandler
onClickOutside={toggleModal}
- className={`m-auto ${className || ""}`}
+ className={`m-auto w-11/12 max-w-2xl ${className || ""}`}
>
- <div className="slide-up relative border-neutral-content rounded-2xl border-solid border shadow-lg p-5 bg-base-100">
+ <div className="slide-up m-auto relative border-neutral-content rounded-2xl border-solid border shadow-2xl p-5 bg-base-100">
<div
onClick={toggleModal as MouseEventHandler<HTMLDivElement>}
- className="absolute top-5 left-5 inline-flex rounded-md cursor-pointer hover:bg-slate-200 hover:dark:bg-neutral-700 duration-100 z-20 p-2"
+ className="absolute top-3 right-3 btn btn-sm outline-none btn-circle btn-ghost"
>
- <FontAwesomeIcon
- icon={faChevronLeft}
- className="w-4 h-4 text-neutral"
- />
+ <FontAwesomeIcon icon={faClose} className="w-4 h-4 text-neutral" />
</div>
{children}
</div>
diff --git a/components/Modals/DeleteCollectionModal.tsx b/components/Modals/DeleteCollectionModal.tsx
index 43d99e9e..0550c1d2 100644
--- a/components/Modals/DeleteCollectionModal.tsx
+++ b/components/Modals/DeleteCollectionModal.tsx
@@ -1,52 +1,32 @@
import React, { useEffect, useState } from "react";
import TextInput from "@/components/TextInput";
import useCollectionStore from "@/store/collections";
-import toast, { Toaster } from "react-hot-toast";
+import toast from "react-hot-toast";
import {
- faFolder,
faRightFromBracket,
faTrashCan,
} from "@fortawesome/free-solid-svg-icons";
-import { HexColorPicker } from "react-colorful";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { CollectionIncludingMembersAndLinkCount } from "@/types/global";
import { useRouter } from "next/router";
import usePermissions from "@/hooks/usePermissions";
+import Modal from "../Modal";
type Props = {
- modalId: string;
- isOpen: boolean;
onClose: Function;
activeCollection: CollectionIncludingMembersAndLinkCount;
};
export default function DeleteCollectionModal({
- modalId,
- isOpen,
onClose,
activeCollection,
}: Props) {
- const modal = document.getElementById(modalId);
-
const [collection, setCollection] =
useState<CollectionIncludingMembersAndLinkCount>(activeCollection);
useEffect(() => {
- modal?.scrollTo(0, 0);
-
setCollection(activeCollection);
- setInputField("");
-
- modal?.addEventListener("close", () => {
- onClose();
- });
-
- return () => {
- modal?.addEventListener("close", () => {
- onClose();
- });
- };
- }, [isOpen]);
+ }, []);
const [submitLoader, setSubmitLoader] = useState(false);
const { removeCollection } = useCollectionStore();
@@ -74,7 +54,7 @@ export default function DeleteCollectionModal({
if (response.ok) {
toast.success(`Deleted.`);
- (document.getElementById(modalId) as any).close();
+ onClose();
router.push("/collections");
} else toast.error(response.data as string);
@@ -83,98 +63,75 @@ export default function DeleteCollectionModal({
};
return (
- <dialog
- id={modalId}
- className="modal backdrop-blur-sm overflow-y-auto p-5"
- open={isOpen}
- >
- <Toaster
- position="top-center"
- reverseOrder={false}
- toastOptions={{
- className:
- "border border-sky-100 dark:border-neutral-700 dark:bg-neutral-900 dark:text-white",
- }}
- />
- <div className="modal-box max-h-full overflow-y-visible border border-neutral-content w-11/12 max-w-2xl">
- <form method="dialog">
- <button className="btn btn-sm outline-none btn-circle btn-ghost absolute right-3 top-3">
- ✕
- </button>
- </form>
-
- <p className="text-xl mb-5 font-thin text-red-500">
- {permissions === true ? "Delete" : "Leave"} Collection
- </p>
-
- <div className="flex flex-col gap-3">
- {permissions === true ? (
- <>
- <div className="flex flex-col gap-3">
- <p>
- To confirm, type &quot;
- <span className="font-bold">{collection.name}</span>
- &quot; in the box below:
- </p>
-
- <TextInput
- value={inputField}
- onChange={(e) => setInputField(e.target.value)}
- placeholder={`Type "${collection.name}" Here.`}
- className="w-3/4 mx-auto"
+ <Modal toggleModal={onClose}>
+ <p className="text-xl mb-5 font-thin text-red-500">
+ {permissions === true ? "Delete" : "Leave"} Collection
+ </p>
+
+ <div className="flex flex-col gap-3">
+ {permissions === true ? (
+ <>
+ <div className="flex flex-col gap-3">
+ <p>
+ To confirm, type &quot;
+ <span className="font-bold">{collection.name}</span>
+ &quot; in the box below:
+ </p>
+
+ <TextInput
+ value={inputField}
+ onChange={(e) => setInputField(e.target.value)}
+ placeholder={`Type "${collection.name}" Here.`}
+ className="w-3/4 mx-auto"
+ />
+ </div>
+
+ <div role="alert" className="alert alert-warning">
+ <svg
+ xmlns="http://www.w3.org/2000/svg"
+ className="stroke-current shrink-0 h-6 w-6"
+ fill="none"
+ viewBox="0 0 24 24"
+ >
+ <path
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ strokeWidth="2"
+ d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
/>
- </div>
-
- <div role="alert" className="alert alert-warning">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- className="stroke-current shrink-0 h-6 w-6"
- fill="none"
- viewBox="0 0 24 24"
- >
- <path
- strokeLinecap="round"
- strokeLinejoin="round"
- strokeWidth="2"
- d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
- />
- </svg>
- <span>
- <b>
- Warning: Deleting this collection will permanently erase all
- its contents
- </b>
- , and it will become inaccessible to everyone, including
- members with previous access.
- </span>
- </div>
- </>
- ) : (
- <p>Click the button below to leave the current collection.</p>
- )}
-
- <button
- disabled={permissions === true && inputField !== collection.name}
- className={`ml-auto btn w-fit text-white flex items-center gap-2 duration-100 ${
- permissions === true
- ? inputField === collection.name
- ? "bg-red-500 hover:bg-red-400 hover:dark:bg-red-600 cursor-pointer"
- : "cursor-not-allowed bg-red-300 dark:bg-red-900"
- : "bg-red-500 hover:bg-red-400 hover:dark:bg-red-600 cursor-pointer"
- }`}
- onClick={submit}
- >
- <FontAwesomeIcon
- icon={permissions === true ? faTrashCan : faRightFromBracket}
- className="h-5"
- />
- {permissions === true ? "Delete" : "Leave"} Collection
- </button>
- </div>
+ </svg>
+ <span>
+ <b>
+ Warning: Deleting this collection will permanently erase all
+ its contents
+ </b>
+ , and it will become inaccessible to everyone, including members
+ with previous access.
+ </span>
+ </div>
+ </>
+ ) : (
+ <p>Click the button below to leave the current collection.</p>
+ )}
+
+ <button
+ disabled={permissions === true && inputField !== collection.name}
+ className={`ml-auto btn w-fit text-white flex items-center gap-2 duration-100 ${
+ permissions === true
+ ? inputField === collection.name
+ ? "bg-red-500 hover:bg-red-400 hover:dark:bg-red-600 cursor-pointer"
+ : "cursor-not-allowed bg-red-300 dark:bg-red-900"
+ : "bg-red-500 hover:bg-red-400 hover:dark:bg-red-600 cursor-pointer"
+ }`}
+ onClick={submit}
+ >
+ <FontAwesomeIcon
+ icon={permissions === true ? faTrashCan : faRightFromBracket}
+ className="h-5"
+ />
+ {permissions === true ? "Delete" : "Leave"} Collection
+ </button>
</div>
- <form method="dialog" className="modal-backdrop">
- <button>close</button>
- </form>
- </dialog>
+ </Modal>
);
}
diff --git a/components/Modals/EditCollectionModal.tsx b/components/Modals/EditCollectionModal.tsx
index 752d32fe..5d156877 100644
--- a/components/Modals/EditCollectionModal.tsx
+++ b/components/Modals/EditCollectionModal.tsx
@@ -6,37 +6,17 @@ import { faFolder } from "@fortawesome/free-solid-svg-icons";
import { HexColorPicker } from "react-colorful";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { CollectionIncludingMembersAndLinkCount } from "@/types/global";
+import Modal from "../Modal";
type Props = {
- modalId: string;
- isOpen: boolean;
onClose: Function;
activeCollection: CollectionIncludingMembersAndLinkCount;
};
export default function EditCollectionModal({
- modalId,
- isOpen,
onClose,
activeCollection,
}: Props) {
- const modal = document.getElementById(modalId);
-
- useEffect(() => {
- modal?.scrollTo(0, 0);
- setCollection(activeCollection);
-
- modal?.addEventListener("close", () => {
- onClose();
- });
-
- return () => {
- modal?.addEventListener("close", () => {
- onClose();
- });
- };
- }, [isOpen]);
-
const [collection, setCollection] =
useState<CollectionIncludingMembersAndLinkCount>(activeCollection);
@@ -60,7 +40,7 @@ export default function EditCollectionModal({
if (response.ok) {
toast.success(`Updated!`);
- (document.getElementById(modalId) as any).close();
+ onClose();
} else toast.error(response.data as string);
setSubmitLoader(false);
@@ -68,95 +48,70 @@ export default function EditCollectionModal({
};
return (
- <dialog
- id={modalId}
- className="modal backdrop-blur-sm overflow-y-auto p-5"
- open={isOpen}
- >
- <Toaster
- position="top-center"
- reverseOrder={false}
- toastOptions={{
- className:
- "border border-sky-100 dark:border-neutral-700 dark:bg-neutral-900 dark:text-white",
- }}
- />
- <div className="modal-box max-h-full overflow-y-visible border border-neutral-content w-11/12 max-w-2xl">
- <form method="dialog">
- <button className="btn btn-sm outline-none btn-circle btn-ghost absolute right-3 top-3">
- ✕
- </button>
- </form>
-
- <p className="text-xl mb-5 font-thin">Edit Collection Info</p>
-
- <div className="flex flex-col gap-3">
- <div className="flex flex-col sm:flex-row gap-3">
- <div className="w-full">
- <p className="mb-2">Name</p>
- <div className="flex flex-col gap-3">
- <TextInput
- className="bg-base-200"
- value={collection.name}
- placeholder="e.g. Example Collection"
- onChange={(e) =>
- setCollection({ ...collection, name: e.target.value })
- }
- />
- <div>
- <p className="w-full mb-2">Color</p>
- <div className="color-picker flex justify-between">
- <div className="flex flex-col gap-2 items-center w-32">
- <div style={{ color: collection.color }}>
- <FontAwesomeIcon
- icon={faFolder}
- className="w-12 h-12 drop-shadow"
- />
- </div>
- <div
- className="btn btn-ghost btn-xs"
- onClick={() =>
- setCollection({ ...collection, color: "#0ea5e9" })
- }
- >
- Reset
- </div>
+ <Modal toggleModal={onClose}>
+ <p className="text-xl mb-5 font-thin">Edit Collection Info</p>
+
+ <div className="flex flex-col gap-3">
+ <div className="flex flex-col sm:flex-row gap-3">
+ <div className="w-full">
+ <p className="mb-2">Name</p>
+ <div className="flex flex-col gap-3">
+ <TextInput
+ className="bg-base-200"
+ value={collection.name}
+ placeholder="e.g. Example Collection"
+ onChange={(e) =>
+ setCollection({ ...collection, name: e.target.value })
+ }
+ />
+ <div>
+ <p className="w-full mb-2">Color</p>
+ <div className="color-picker flex justify-between">
+ <div className="flex flex-col gap-2 items-center w-32">
+ <div style={{ color: collection.color }}>
+ <FontAwesomeIcon
+ icon={faFolder}
+ className="w-12 h-12 drop-shadow"
+ />
</div>
- <HexColorPicker
- color={collection.color}
- onChange={(e) =>
- setCollection({ ...collection, color: e })
+ <div
+ className="btn btn-ghost btn-xs"
+ onClick={() =>
+ setCollection({ ...collection, color: "#0ea5e9" })
}
- />
+ >
+ Reset
+ </div>
</div>
+ <HexColorPicker
+ color={collection.color}
+ onChange={(e) => setCollection({ ...collection, color: e })}
+ />
</div>
</div>
</div>
-
- <div className="w-full">
- <p className="mb-2">Description</p>
- <textarea
- className="w-full h-[13rem] resize-none border rounded-md duration-100 bg-base-200 p-2 outline-none border-neutral-content focus:border-primary"
- placeholder="The purpose of this Collection..."
- value={collection.description}
- onChange={(e) =>
- setCollection({
- ...collection,
- description: e.target.value,
- })
- }
- />
- </div>
</div>
- <button className="btn btn-accent w-fit ml-auto" onClick={submit}>
- Save
- </button>
+ <div className="w-full">
+ <p className="mb-2">Description</p>
+ <textarea
+ className="w-full h-[13rem] resize-none border rounded-md duration-100 bg-base-200 p-2 outline-none border-neutral-content focus:border-primary"
+ placeholder="The purpose of this Collection..."
+ value={collection.description}
+ onChange={(e) =>
+ setCollection({
+ ...collection,
+ description: e.target.value,
+ })
+ }
+ />
+ </div>
</div>
+
+ <button className="btn btn-accent w-fit ml-auto" onClick={submit}>
+ Save
+ </button>
</div>
- <form method="dialog" className="modal-backdrop">
- <button>close</button>
- </form>
- </dialog>
+ </Modal>
);
}
diff --git a/components/Modals/EditCollectionSharingModal.tsx b/components/Modals/EditCollectionSharingModal.tsx
index a4f96a48..7523e34f 100644
--- a/components/Modals/EditCollectionSharingModal.tsx
+++ b/components/Modals/EditCollectionSharingModal.tsx
@@ -14,22 +14,17 @@ import useAccountStore from "@/store/account";
import usePermissions from "@/hooks/usePermissions";
import ProfilePhoto from "../ProfilePhoto";
import addMemberToCollection from "@/lib/client/addMemberToCollection";
+import Modal from "../Modal";
type Props = {
- modalId: string;
- isOpen: boolean;
onClose: Function;
activeCollection: CollectionIncludingMembersAndLinkCount;
};
export default function EditCollectionSharingModal({
- modalId,
- isOpen,
onClose,
activeCollection,
}: Props) {
- const modal = document.getElementById(modalId);
-
useEffect(() => {
const fetchOwner = async () => {
const owner = await getPublicUserData(collection.ownerId as number);
@@ -38,19 +33,8 @@ export default function EditCollectionSharingModal({
fetchOwner();
- modal?.scrollTo(0, 0);
setCollection(activeCollection);
-
- modal?.addEventListener("close", () => {
- onClose();
- });
-
- return () => {
- modal?.addEventListener("close", () => {
- onClose();
- });
- };
- }, [isOpen]);
+ }, []);
const [collection, setCollection] =
useState<CollectionIncludingMembersAndLinkCount>(activeCollection);
@@ -75,7 +59,7 @@ export default function EditCollectionSharingModal({
if (response.ok) {
toast.success(`Updated!`);
- (document.getElementById(modalId) as any).close();
+ onClose();
} else toast.error(response.data as string);
setSubmitLoader(false);
@@ -110,384 +94,353 @@ export default function EditCollectionSharingModal({
};
return (
- <dialog
- id={modalId}
- className="modal backdrop-blur-sm overflow-y-auto p-5"
- open={isOpen}
- >
- <Toaster
- position="top-center"
- reverseOrder={false}
- toastOptions={{
- className:
- "border border-sky-100 dark:border-neutral-700 dark:bg-neutral-900 dark:text-white",
- }}
- />
- <div className="modal-box max-h-full overflow-y-visible border border-neutral-content w-11/12 max-w-2xl">
- <form method="dialog">
- <button className="btn btn-sm outline-none btn-circle btn-ghost absolute right-3 top-3">
- ✕
- </button>
- </form>
-
- <p className="text-xl font-thin mb-5">
- {permissions === true ? "Share and Collaborate" : "Team"}
- </p>
-
- <div className="flex flex-col gap-3">
- {permissions === true && (
- <div>
- <p>Make Public</p>
-
- <label className="label cursor-pointer justify-start gap-2">
- <input
- type="checkbox"
- checked={collection.isPublic}
- onChange={() =>
- setCollection({
- ...collection,
- isPublic: !collection.isPublic,
- })
- }
- className="checkbox checkbox-primary"
- />
- <span className="label-text">
- Make this a public collection
- </span>
- </label>
-
- <p className="text-neutral text-sm">
- This will let <b>Anyone</b> to view this collection and it's
- users.
- </p>
+ <Modal toggleModal={onClose}>
+ <p className="text-xl font-thin mb-5">
+ {permissions === true ? "Share and Collaborate" : "Team"}
+ </p>
+
+ <div className="flex flex-col gap-3">
+ {permissions === true && (
+ <div>
+ <p>Make Public</p>
+
+ <label className="label cursor-pointer justify-start gap-2">
+ <input
+ type="checkbox"
+ checked={collection.isPublic}
+ onChange={() =>
+ setCollection({
+ ...collection,
+ isPublic: !collection.isPublic,
+ })
+ }
+ className="checkbox checkbox-primary"
+ />
+ <span className="label-text">Make this a public collection</span>
+ </label>
+
+ <p className="text-neutral text-sm">
+ This will let <b>Anyone</b> to view this collection and it's
+ users.
+ </p>
+ </div>
+ )}
+
+ {collection.isPublic ? (
+ <div className={permissions === true ? "pl-5" : ""}>
+ <p className="mb-2">Sharable Link (Click to copy)</p>
+ <div
+ onClick={() => {
+ try {
+ navigator.clipboard
+ .writeText(publicCollectionURL)
+ .then(() => toast.success("Copied!"));
+ } catch (err) {
+ console.log(err);
+ }
+ }}
+ className="w-full hide-scrollbar overflow-x-auto whitespace-nowrap rounded-md p-2 bg-base-200 border-neutral-content border-solid border outline-none hover:border-primary dark:hover:border-primary duration-100 cursor-text"
+ >
+ {publicCollectionURL}
</div>
- )}
+ </div>
+ ) : null}
+
+ {permissions === true && <div className="divider my-3"></div>}
+
+ {permissions === true && (
+ <>
+ <p>Member Management</p>
+
+ <div className="flex items-center gap-2">
+ <TextInput
+ value={memberUsername || ""}
+ className="bg-base-200"
+ placeholder="Username (without the '@')"
+ onChange={(e) => setMemberUsername(e.target.value)}
+ onKeyDown={(e) =>
+ e.key === "Enter" &&
+ addMemberToCollection(
+ account.username as string,
+ memberUsername || "",
+ collection,
+ setMemberState
+ )
+ }
+ />
- {collection.isPublic ? (
- <div className={permissions === true ? "pl-5" : ""}>
- <p className="mb-2">Sharable Link (Click to copy)</p>
<div
- onClick={() => {
- try {
- navigator.clipboard
- .writeText(publicCollectionURL)
- .then(() => toast.success("Copied!"));
- } catch (err) {
- console.log(err);
- }
- }}
- className="w-full hide-scrollbar overflow-x-auto whitespace-nowrap rounded-md p-2 bg-base-200 border-neutral-content border-solid border outline-none hover:border-primary dark:hover:border-primary duration-100 cursor-text"
+ onClick={() =>
+ addMemberToCollection(
+ account.username as string,
+ memberUsername || "",
+ collection,
+ setMemberState
+ )
+ }
+ className="btn btn-primary text-white btn-square"
>
- {publicCollectionURL}
+ <FontAwesomeIcon icon={faUserPlus} className="w-5 h-5" />
</div>
</div>
- ) : null}
-
- {permissions === true && <div className="divider my-3"></div>}
-
- {permissions === true && (
- <>
- <p>Member Management</p>
-
- <div className="flex items-center gap-2">
- <TextInput
- value={memberUsername || ""}
- className="bg-base-200"
- placeholder="Username (without the '@')"
- onChange={(e) => setMemberUsername(e.target.value)}
- onKeyDown={(e) =>
- e.key === "Enter" &&
- addMemberToCollection(
- account.username as string,
- memberUsername || "",
- collection,
- setMemberState
- )
- }
- />
-
- <div
- onClick={() =>
- addMemberToCollection(
- account.username as string,
- memberUsername || "",
- collection,
- setMemberState
- )
- }
- className="btn btn-primary text-white btn-square"
- >
- <FontAwesomeIcon icon={faUserPlus} className="w-5 h-5" />
- </div>
- </div>
- </>
- )}
-
- {collection?.members[0]?.user && (
- <>
- {permissions === true ? (
- <p className="text-center text-neutral text-xs sm:text-sm">
- (All Members have <b>Read</b> access to this collection.)
- </p>
- ) : (
- <p>
- Here are all the members who are collaborating on this
- collection.
- </p>
- )}
-
- <div className="flex flex-col gap-3 rounded-md">
- <div
- className="relative border px-2 rounded-xl border-neutral-content bg-base-200 flex min-h-[7rem] sm:min-h-[5rem] gap-2 justify-between"
- title={`@${collectionOwner.username} is the owner of this collection.`}
- >
- <div className="flex items-center gap-2 w-full">
- <ProfilePhoto
- src={
- collectionOwner.image
- ? collectionOwner.image
- : undefined
- }
- />
- <div className="w-full">
- <div className="flex items-center gap-1 w-full justify-between">
- <p className="text-sm font-bold">
- {collectionOwner.name}
- </p>
- <div className="flex text-xs gap-1 items-center">
- <FontAwesomeIcon
- icon={faCrown}
- className="w-3 h-3 text-yellow-500"
- />
- Admin
- </div>
- </div>
- <p className="text-neutral">
- @{collectionOwner.username}
+ </>
+ )}
+
+ {collection?.members[0]?.user && (
+ <>
+ {permissions === true ? (
+ <p className="text-center text-neutral text-xs sm:text-sm">
+ (All Members have <b>Read</b> access to this collection.)
+ </p>
+ ) : (
+ <p>
+ Here are all the members who are collaborating on this
+ collection.
+ </p>
+ )}
+
+ <div className="flex flex-col gap-3 rounded-md">
+ <div
+ className="relative border px-2 rounded-xl border-neutral-content bg-base-200 flex min-h-[7rem] sm:min-h-[5rem] gap-2 justify-between"
+ title={`@${collectionOwner.username} is the owner of this collection.`}
+ >
+ <div className="flex items-center gap-2 w-full">
+ <ProfilePhoto
+ src={
+ collectionOwner.image ? collectionOwner.image : undefined
+ }
+ />
+ <div className="w-full">
+ <div className="flex items-center gap-1 w-full justify-between">
+ <p className="text-sm font-bold">
+ {collectionOwner.name}
</p>
+ <div className="flex text-xs gap-1 items-center">
+ <FontAwesomeIcon
+ icon={faCrown}
+ className="w-3 h-3 text-yellow-500"
+ />
+ Admin
+ </div>
</div>
+ <p className="text-neutral">@{collectionOwner.username}</p>
</div>
</div>
+ </div>
- {collection.members
- .sort((a, b) => (a.userId as number) - (b.userId as number))
- .map((e, i) => {
- return (
- <div
- key={i}
- className="relative border p-2 rounded-xl border-neutral-content bg-base-200 flex flex-col sm:flex-row sm:items-center gap-2 justify-between"
- >
- {permissions === true && (
- <FontAwesomeIcon
- icon={faClose}
- className="absolute right-2 top-2 text-neutral h-4 hover:text-red-500 dark:hover:text-red-500 duration-100 cursor-pointer"
- title="Remove Member"
- onClick={() => {
- const updatedMembers = collection.members.filter(
- (member) => {
- return (
- member.user.username !== e.user.username
- );
- }
- );
- setCollection({
- ...collection,
- members: updatedMembers,
- });
- }}
- />
- )}
- <div className="flex items-center gap-2">
- <ProfilePhoto
- src={e.user.image ? e.user.image : undefined}
- />
- <div>
- <p className="text-sm font-bold">{e.user.name}</p>
- <p className="text-neutral">@{e.user.username}</p>
- </div>
+ {collection.members
+ .sort((a, b) => (a.userId as number) - (b.userId as number))
+ .map((e, i) => {
+ return (
+ <div
+ key={i}
+ className="relative border p-2 rounded-xl border-neutral-content bg-base-200 flex flex-col sm:flex-row sm:items-center gap-2 justify-between"
+ >
+ {permissions === true && (
+ <FontAwesomeIcon
+ icon={faClose}
+ className="absolute right-2 top-2 text-neutral h-4 hover:text-red-500 dark:hover:text-red-500 duration-100 cursor-pointer"
+ title="Remove Member"
+ onClick={() => {
+ const updatedMembers = collection.members.filter(
+ (member) => {
+ return member.user.username !== e.user.username;
+ }
+ );
+ setCollection({
+ ...collection,
+ members: updatedMembers,
+ });
+ }}
+ />
+ )}
+ <div className="flex items-center gap-2">
+ <ProfilePhoto
+ src={e.user.image ? e.user.image : undefined}
+ />
+ <div>
+ <p className="text-sm font-bold">{e.user.name}</p>
+ <p className="text-neutral">@{e.user.username}</p>
</div>
- <div className="flex sm:block items-center justify-between gap-5 min-w-[10rem]">
- <div>
- <p
- className={`font-bold text-sm ${
- permissions === true ? "" : "mb-2"
- }`}
- >
- Permissions
+ </div>
+ <div className="flex sm:block items-center justify-between gap-5 min-w-[10rem]">
+ <div>
+ <p
+ className={`font-bold text-sm ${
+ permissions === true ? "" : "mb-2"
+ }`}
+ >
+ Permissions
+ </p>
+ {permissions === true && (
+ <p className="text-xs text-neutral mb-2">
+ (Click to toggle.)
</p>
- {permissions === true && (
- <p className="text-xs text-neutral mb-2">
- (Click to toggle.)
- </p>
- )}
- </div>
+ )}
+ </div>
- {permissions !== true &&
- !e.canCreate &&
- !e.canUpdate &&
- !e.canDelete ? (
- <p className="text-sm text-neutral">
- Has no permissions.
- </p>
- ) : (
- <div>
- <label
- className={
+ {permissions !== true &&
+ !e.canCreate &&
+ !e.canUpdate &&
+ !e.canDelete ? (
+ <p className="text-sm text-neutral">
+ Has no permissions.
+ </p>
+ ) : (
+ <div>
+ <label
+ className={
+ permissions === true
+ ? "cursor-pointer mr-1"
+ : "mr-1"
+ }
+ >
+ <input
+ type="checkbox"
+ id="canCreate"
+ className="peer sr-only"
+ checked={e.canCreate}
+ onChange={() => {
+ if (permissions === true) {
+ const updatedMembers =
+ collection.members.map((member) => {
+ if (
+ member.user.username ===
+ e.user.username
+ ) {
+ return {
+ ...member,
+ canCreate: !e.canCreate,
+ };
+ }
+ return member;
+ });
+ setCollection({
+ ...collection,
+ members: updatedMembers,
+ });
+ }
+ }}
+ />
+ <span
+ className={`peer-checked:bg-primary text-sm ${
permissions === true
- ? "cursor-pointer mr-1"
- : "mr-1"
- }
+ ? "hover:bg-neutral-content duration-100"
+ : ""
+ } rounded p-1 select-none`}
>
- <input
- type="checkbox"
- id="canCreate"
- className="peer sr-only"
- checked={e.canCreate}
- onChange={() => {
- if (permissions === true) {
- const updatedMembers =
- collection.members.map((member) => {
- if (
- member.user.username ===
- e.user.username
- ) {
- return {
- ...member,
- canCreate: !e.canCreate,
- };
- }
- return member;
- });
- setCollection({
- ...collection,
- members: updatedMembers,
+ Create
+ </span>
+ </label>
+
+ <label
+ className={
+ permissions === true
+ ? "cursor-pointer mr-1"
+ : "mr-1"
+ }
+ >
+ <input
+ type="checkbox"
+ id="canUpdate"
+ className="peer sr-only"
+ checked={e.canUpdate}
+ onChange={() => {
+ if (permissions === true) {
+ const updatedMembers =
+ collection.members.map((member) => {
+ if (
+ member.user.username ===
+ e.user.username
+ ) {
+ return {
+ ...member,
+ canUpdate: !e.canUpdate,
+ };
+ }
+ return member;
});
- }
- }}
- />
- <span
- className={`peer-checked:bg-primary text-sm ${
- permissions === true
- ? "hover:bg-neutral-content duration-100"
- : ""
- } rounded p-1 select-none`}
- >
- Create
- </span>
- </label>
-
- <label
- className={
+ setCollection({
+ ...collection,
+ members: updatedMembers,
+ });
+ }
+ }}
+ />
+ <span
+ className={`peer-checked:bg-primary text-sm ${
permissions === true
- ? "cursor-pointer mr-1"
- : "mr-1"
- }
+ ? "hover:bg-neutral-content duration-100"
+ : ""
+ } rounded p-1 select-none`}
>
- <input
- type="checkbox"
- id="canUpdate"
- className="peer sr-only"
- checked={e.canUpdate}
- onChange={() => {
- if (permissions === true) {
- const updatedMembers =
- collection.members.map((member) => {
- if (
- member.user.username ===
- e.user.username
- ) {
- return {
- ...member,
- canUpdate: !e.canUpdate,
- };
- }
- return member;
- });
- setCollection({
- ...collection,
- members: updatedMembers,
+ Update
+ </span>
+ </label>
+
+ <label
+ className={
+ permissions === true
+ ? "cursor-pointer mr-1"
+ : "mr-1"
+ }
+ >
+ <input
+ type="checkbox"
+ id="canDelete"
+ className="peer sr-only"
+ checked={e.canDelete}
+ onChange={() => {
+ if (permissions === true) {
+ const updatedMembers =
+ collection.members.map((member) => {
+ if (
+ member.user.username ===
+ e.user.username
+ ) {
+ return {
+ ...member,
+ canDelete: !e.canDelete,
+ };
+ }
+ return member;
});
- }
- }}
- />
- <span
- className={`peer-checked:bg-primary text-sm ${
- permissions === true
- ? "hover:bg-neutral-content duration-100"
- : ""
- } rounded p-1 select-none`}
- >
- Update
- </span>
- </label>
-
- <label
- className={
+ setCollection({
+ ...collection,
+ members: updatedMembers,
+ });
+ }
+ }}
+ />
+ <span
+ className={`peer-checked:bg-primary text-sm ${
permissions === true
- ? "cursor-pointer mr-1"
- : "mr-1"
- }
+ ? "hover:bg-neutral-content duration-100"
+ : ""
+ } rounded p-1 select-none`}
>
- <input
- type="checkbox"
- id="canDelete"
- className="peer sr-only"
- checked={e.canDelete}
- onChange={() => {
- if (permissions === true) {
- const updatedMembers =
- collection.members.map((member) => {
- if (
- member.user.username ===
- e.user.username
- ) {
- return {
- ...member,
- canDelete: !e.canDelete,
- };
- }
- return member;
- });
- setCollection({
- ...collection,
- members: updatedMembers,
- });
- }
- }}
- />
- <span
- className={`peer-checked:bg-primary text-sm ${
- permissions === true
- ? "hover:bg-neutral-content duration-100"
- : ""
- } rounded p-1 select-none`}
- >
- Delete
- </span>
- </label>
- </div>
- )}
- </div>
+ Delete
+ </span>
+ </label>
+ </div>
+ )}
</div>
- );
- })}
- </div>
- </>
- )}
-
- {permissions === true && (
- <button
- className="btn btn-accent w-fit ml-auto mt-3"
- onClick={submit}
- >
- Save
- </button>
- )}
- </div>
+ </div>
+ );
+ })}
+ </div>
+ </>
+ )}
+
+ {permissions === true && (
+ <button
+ className="btn btn-accent w-fit ml-auto mt-3"
+ onClick={submit}
+ >
+ Save
+ </button>
+ )}
</div>
- <form method="dialog" className="modal-backdrop">
- <button>close</button>
- </form>
- </dialog>
+ </Modal>
);
}
diff --git a/components/Modals/EditLinkModal.tsx b/components/Modals/EditLinkModal.tsx
index a90e12ac..6c47db43 100644
--- a/components/Modals/EditLinkModal.tsx
+++ b/components/Modals/EditLinkModal.tsx
@@ -10,22 +10,14 @@ import toast from "react-hot-toast";
import Link from "next/link";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faLink } from "@fortawesome/free-solid-svg-icons";
+import Modal from "../Modal";
type Props = {
- modalId: string;
- isOpen: boolean;
onClose: Function;
activeLink: LinkIncludingShortenedCollectionAndTags;
};
-export default function EditLinkModal({
- modalId,
- isOpen,
- onClose,
- activeLink,
-}: Props) {
- const modal = document.getElementById(modalId);
-
+export default function EditLinkModal({ onClose, activeLink }: Props) {
const [link, setLink] =
useState<LinkIncludingShortenedCollectionAndTags>(activeLink);
@@ -58,20 +50,8 @@ export default function EditLinkModal({
};
useEffect(() => {
- modal?.scrollTo(0, 0);
-
setLink(activeLink);
-
- modal?.addEventListener("close", () => {
- onClose();
- });
-
- return () => {
- modal?.addEventListener("close", () => {
- onClose();
- });
- };
- }, [isOpen]);
+ }, []);
const submit = async () => {
if (!submitLoader) {
@@ -87,7 +67,7 @@ export default function EditLinkModal({
if (response.ok) {
toast.success(`Updated!`);
- (document.getElementById(modalId) as any).close();
+ onClose();
} else toast.error(response.data as string);
setSubmitLoader(false);
@@ -97,111 +77,88 @@ export default function EditLinkModal({
};
return (
- <dialog
- id={modalId}
- className="modal backdrop-blur-sm overflow-y-auto p-5"
- open={isOpen}
- >
- <Toaster
- position="top-center"
- reverseOrder={false}
- toastOptions={{
- className:
- "border border-sky-100 dark:border-neutral-700 dark:bg-neutral-900 dark:text-white",
- }}
- />
- <div className="modal-box max-h-full overflow-y-visible border border-neutral-content w-11/12 max-w-2xl">
- <form method="dialog">
- <button className="btn btn-sm outline-none btn-circle btn-ghost absolute right-3 top-3">
- ✕
- </button>
- </form>
-
- <p className="text-xl mb-5 font-thin">Edit Link</p>
-
- <Link
- href={link.url}
- className="truncate text-neutral flex gap-2 mb-5 w-fit max-w-full"
- title={link.url}
- target="_blank"
- >
- <FontAwesomeIcon
- icon={faLink}
- className="mt-1 w-5 h-5 min-w-[1.25rem]"
- />
- <p>{shortendURL}</p>
- </Link>
-
- <div className="w-full">
- <p className="mb-2">Name</p>
- <TextInput
- value={link.name}
- onChange={(e) => setLink({ ...link, name: e.target.value })}
- placeholder="e.g. Example Link"
- className="bg-base-200"
- />
- </div>
+ <Modal toggleModal={onClose}>
+ <p className="text-xl mb-5 font-thin">Edit Link</p>
+
+ <Link
+ href={link.url}
+ className="truncate text-neutral flex gap-2 mb-5 w-fit max-w-full"
+ title={link.url}
+ target="_blank"
+ >
+ <FontAwesomeIcon
+ icon={faLink}
+ className="mt-1 w-5 h-5 min-w-[1.25rem]"
+ />
+ <p>{shortendURL}</p>
+ </Link>
+
+ <div className="w-full">
+ <p className="mb-2">Name</p>
+ <TextInput
+ value={link.name}
+ onChange={(e) => setLink({ ...link, name: e.target.value })}
+ placeholder="e.g. Example Link"
+ className="bg-base-200"
+ />
+ </div>
- <div className="mt-5">
- {/* <hr className="mb-3 border border-neutral-content" /> */}
- <div className="grid sm:grid-cols-2 gap-3">
- <div>
- <p className="mb-2">Collection</p>
- {link.collection.name ? (
- <CollectionSelection
- onChange={setCollection}
- // defaultValue={{
- // label: link.collection.name,
- // value: link.collection.id,
- // }}
- defaultValue={
- link.collection.id
- ? {
- value: link.collection.id,
- label: link.collection.name,
- }
- : {
- value: null as unknown as number,
- label: "Unorganized",
- }
- }
- />
- ) : null}
- </div>
-
- <div>
- <p className="mb-2">Tags</p>
- <TagSelection
- onChange={setTags}
- defaultValue={link.tags.map((e) => {
- return { label: e.name, value: e.id };
- })}
- />
- </div>
-
- <div className="sm:col-span-2">
- <p className="mb-2">Description</p>
- <textarea
- value={unescapeString(link.description) as string}
- onChange={(e) =>
- setLink({ ...link, description: e.target.value })
+ <div className="mt-5">
+ {/* <hr className="mb-3 border border-neutral-content" /> */}
+ <div className="grid sm:grid-cols-2 gap-3">
+ <div>
+ <p className="mb-2">Collection</p>
+ {link.collection.name ? (
+ <CollectionSelection
+ onChange={setCollection}
+ // defaultValue={{
+ // label: link.collection.name,
+ // value: link.collection.id,
+ // }}
+ defaultValue={
+ link.collection.id
+ ? {
+ value: link.collection.id,
+ label: link.collection.name,
+ }
+ : {
+ value: null as unknown as number,
+ label: "Unorganized",
+ }
}
- placeholder="Will be auto generated if nothing is provided."
- className="resize-none w-full rounded-md p-2 border-neutral-content bg-base-200 focus:border-sky-300 dark:focus:border-sky-600 border-solid border outline-none duration-100"
/>
- </div>
+ ) : null}
+ </div>
+
+ <div>
+ <p className="mb-2">Tags</p>
+ <TagSelection
+ onChange={setTags}
+ defaultValue={link.tags.map((e) => {
+ return { label: e.name, value: e.id };
+ })}
+ />
</div>
- </div>
- <div className="flex justify-end items-center mt-5">
- <button className="btn btn-accent" onClick={submit}>
- Save
- </button>
+ <div className="sm:col-span-2">
+ <p className="mb-2">Description</p>
+ <textarea
+ value={unescapeString(link.description) as string}
+ onChange={(e) =>
+ setLink({ ...link, description: e.target.value })
+ }
+ placeholder="Will be auto generated if nothing is provided."
+ className="resize-none w-full rounded-md p-2 border-neutral-content bg-base-200 focus:border-sky-300 dark:focus:border-sky-600 border-solid border outline-none duration-100"
+ />
+ </div>
</div>
</div>
- <form method="dialog" className="modal-backdrop">
- <button>close</button>
- </form>
- </dialog>
+
+ <div className="flex justify-end items-center mt-5">
+ <button className="btn btn-accent" onClick={submit}>
+ Save
+ </button>
+ </div>
+ </Modal>
);
}
diff --git a/components/Modals/NewCollectionModal.tsx b/components/Modals/NewCollectionModal.tsx
index d604ebd2..27936e4d 100644
--- a/components/Modals/NewCollectionModal.tsx
+++ b/components/Modals/NewCollectionModal.tsx
@@ -6,20 +6,13 @@ import { faFolder } from "@fortawesome/free-solid-svg-icons";
import { HexColorPicker } from "react-colorful";
import { Collection } from "@prisma/client";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import Modal from "../Modal";
type Props = {
- modalId: string;
- isOpen: boolean;
onClose: Function;
};
-export default function NewCollectionModal({
- modalId,
- isOpen,
- onClose,
-}: Props) {
- const modal = document.getElementById(modalId);
-
+export default function NewCollectionModal({ onClose }: Props) {
const initial = {
name: "",
description: "",
@@ -29,20 +22,8 @@ export default function NewCollectionModal({
const [collection, setCollection] = useState<Partial<Collection>>(initial);
useEffect(() => {
- modal?.scrollTo(0, 0);
-
- modal?.addEventListener("close", () => {
- onClose();
- });
-
setCollection(initial);
-
- return () => {
- modal?.addEventListener("close", () => {
- onClose();
- });
- };
- }, [isOpen]);
+ }, []);
const [submitLoader, setSubmitLoader] = useState(false);
const { addCollection } = useCollectionStore();
@@ -64,7 +45,7 @@ export default function NewCollectionModal({
if (response.ok) {
toast.success("Created!");
- (document.getElementById(modalId) as any).close();
+ onClose();
} else toast.error(response.data as string);
setSubmitLoader(false);
@@ -72,95 +53,70 @@ export default function NewCollectionModal({
};
return (
- <dialog
- id={modalId}
- className="modal backdrop-blur-sm overflow-y-auto p-5"
- open={isOpen}
- >
- <Toaster
- position="top-center"
- reverseOrder={false}
- toastOptions={{
- className:
- "border border-sky-100 dark:border-neutral-700 dark:bg-neutral-900 dark:text-white",
- }}
- />
- <div className="modal-box max-h-full overflow-y-visible border border-neutral-content w-11/12 max-w-2xl">
- <form method="dialog">
- <button className="btn btn-sm outline-none btn-circle btn-ghost absolute right-3 top-3">
- ✕
- </button>
- </form>
-
- <p className="text-xl mb-5 font-thin">Create a New Collection</p>
-
- <div className="flex flex-col gap-3">
- <div className="flex flex-col sm:flex-row gap-3">
- <div className="w-full">
- <p className="mb-2">Name</p>
- <div className="flex flex-col gap-3">
- <TextInput
- className="bg-base-200"
- value={collection.name}
- placeholder="e.g. Example Collection"
- onChange={(e) =>
- setCollection({ ...collection, name: e.target.value })
- }
- />
- <div>
- <p className="w-full mb-2">Color</p>
- <div className="color-picker flex justify-between">
- <div className="flex flex-col gap-2 items-center w-32">
- <div style={{ color: collection.color }}>
- <FontAwesomeIcon
- icon={faFolder}
- className="w-12 h-12 drop-shadow"
- />
- </div>
- <div
- className="btn btn-ghost btn-xs"
- onClick={() =>
- setCollection({ ...collection, color: "#0ea5e9" })
- }
- >
- Reset
- </div>
+ <Modal toggleModal={onClose}>
+ <p className="text-xl mb-5 font-thin">Create a New Collection</p>
+
+ <div className="flex flex-col gap-3">
+ <div className="flex flex-col sm:flex-row gap-3">
+ <div className="w-full">
+ <p className="mb-2">Name</p>
+ <div className="flex flex-col gap-3">
+ <TextInput
+ className="bg-base-200"
+ value={collection.name}
+ placeholder="e.g. Example Collection"
+ onChange={(e) =>
+ setCollection({ ...collection, name: e.target.value })
+ }
+ />
+ <div>
+ <p className="w-full mb-2">Color</p>
+ <div className="color-picker flex justify-between">
+ <div className="flex flex-col gap-2 items-center w-32">
+ <div style={{ color: collection.color }}>
+ <FontAwesomeIcon
+ icon={faFolder}
+ className="w-12 h-12 drop-shadow"
+ />
</div>
- <HexColorPicker
- color={collection.color}
- onChange={(e) =>
- setCollection({ ...collection, color: e })
+ <div
+ className="btn btn-ghost btn-xs"
+ onClick={() =>
+ setCollection({ ...collection, color: "#0ea5e9" })
}
- />
+ >
+ Reset
+ </div>
</div>
+ <HexColorPicker
+ color={collection.color}
+ onChange={(e) => setCollection({ ...collection, color: e })}
+ />
</div>
</div>
</div>
-
- <div className="w-full">
- <p className="mb-2">Description</p>
- <textarea
- className="w-full h-[13rem] resize-none border rounded-md duration-100 bg-base-200 p-2 outline-none border-neutral-content focus:border-primary"
- placeholder="The purpose of this Collection..."
- value={collection.description}
- onChange={(e) =>
- setCollection({
- ...collection,
- description: e.target.value,
- })
- }
- />
- </div>
</div>
- <button className="btn btn-accent w-fit ml-auto" onClick={submit}>
- Create Collection
- </button>
+ <div className="w-full">
+ <p className="mb-2">Description</p>
+ <textarea
+ className="w-full h-[13rem] resize-none border rounded-md duration-100 bg-base-200 p-2 outline-none border-neutral-content focus:border-primary"
+ placeholder="The purpose of this Collection..."
+ value={collection.description}
+ onChange={(e) =>
+ setCollection({
+ ...collection,
+ description: e.target.value,
+ })
+ }
+ />
+ </div>
</div>
+
+ <button className="btn btn-accent w-fit ml-auto" onClick={submit}>
+ Create Collection
+ </button>
</div>
- <form method="dialog" className="modal-backdrop">
- <button>close</button>
- </form>
- </dialog>
+ </Modal>
);
}
diff --git a/components/Modals/NewLinkModal.tsx b/components/Modals/NewLinkModal.tsx
index 1674314e..cd7cd53b 100644
--- a/components/Modals/NewLinkModal.tsx
+++ b/components/Modals/NewLinkModal.tsx
@@ -10,16 +10,13 @@ import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
import { useSession } from "next-auth/react";
import { useRouter } from "next/router";
import toast from "react-hot-toast";
+import Modal from "../Modal";
type Props = {
- modalId: string;
- isOpen: boolean;
onClose: Function;
};
-export default function NewLinkModal({ modalId, isOpen, onClose }: Props) {
- const modal = document.getElementById(modalId);
-
+export default function NewLinkModal({ onClose }: Props) {
const { data } = useSession();
const initial = {
@@ -71,7 +68,6 @@ export default function NewLinkModal({ modalId, isOpen, onClose }: Props) {
setResetCollectionSelection(Date.now().toString());
console.log(link);
- modal?.scrollTo(0, 0);
setOptionsExpanded(false);
if (router.query.id) {
const currentCollection = collections.find(
@@ -99,17 +95,7 @@ export default function NewLinkModal({ modalId, isOpen, onClose }: Props) {
ownerId: data?.user.id as number,
},
});
-
- modal?.addEventListener("close", () => {
- onClose();
- });
-
- return () => {
- modal?.addEventListener("close", () => {
- onClose();
- });
- };
- }, [isOpen]);
+ }, []);
const submit = async () => {
if (!submitLoader) {
@@ -125,7 +111,7 @@ export default function NewLinkModal({ modalId, isOpen, onClose }: Props) {
if (response.ok) {
toast.success(`Created!`);
- (document?.getElementById(modalId) as any)?.close();
+ onClose();
} else toast.error(response.data as string);
setSubmitLoader(false);
@@ -135,107 +121,84 @@ export default function NewLinkModal({ modalId, isOpen, onClose }: Props) {
};
return (
- <dialog
- id={modalId}
- className="modal backdrop-blur-sm overflow-y-auto p-5"
- open={isOpen}
- >
- <Toaster
- position="top-center"
- reverseOrder={false}
- toastOptions={{
- className:
- "border border-sky-100 dark:border-neutral-700 dark:bg-neutral-900 dark:text-white",
- }}
- />
- <div className="modal-box max-h-full overflow-y-visible border border-neutral-content w-11/12 max-w-2xl">
- <form method="dialog">
- <button className="btn btn-sm outline-none btn-circle btn-ghost absolute right-3 top-3">
- ✕
- </button>
- </form>
-
- <p className="text-xl mb-5 font-thin">Create a New Link</p>
- <div className="grid grid-flow-row-dense sm:grid-cols-5 gap-3">
- <div className="sm:col-span-3 col-span-5">
- <p className="mb-2">Link</p>
- <TextInput
- value={link.url}
- onChange={(e) => setLink({ ...link, url: e.target.value })}
- placeholder="e.g. http://example.com/"
- className="bg-base-200"
+ <Modal toggleModal={onClose}>
+ <p className="text-xl mb-5 font-thin">Create a New Link</p>
+ <div className="grid grid-flow-row-dense sm:grid-cols-5 gap-3">
+ <div className="sm:col-span-3 col-span-5">
+ <p className="mb-2">Link</p>
+ <TextInput
+ value={link.url}
+ onChange={(e) => setLink({ ...link, url: e.target.value })}
+ placeholder="e.g. http://example.com/"
+ className="bg-base-200"
+ />
+ </div>
+ <div className="sm:col-span-2 col-span-5">
+ <p className="mb-2">Collection</p>
+ {link.collection.name ? (
+ <CollectionSelection
+ onChange={setCollection}
+ defaultValue={{
+ label: link.collection.name,
+ value: link.collection.id,
+ }}
+ id={resetCollectionSelection}
/>
- </div>
- <div className="sm:col-span-2 col-span-5">
- <p className="mb-2">Collection</p>
- {link.collection.name ? (
- <CollectionSelection
- onChange={setCollection}
- defaultValue={{
- label: link.collection.name,
- value: link.collection.id,
- }}
- id={resetCollectionSelection}
- />
- ) : null}
- </div>
+ ) : null}
</div>
+ </div>
- {optionsExpanded ? (
- <div className="mt-5">
- {/* <hr className="mb-3 border border-neutral-content" /> */}
- <div className="grid sm:grid-cols-2 gap-3">
- <div>
- <p className="mb-2">Name</p>
- <TextInput
- value={link.name}
- onChange={(e) => setLink({ ...link, name: e.target.value })}
- placeholder="e.g. Example Link"
- className="bg-base-200"
- />
- </div>
-
- <div>
- <p className="mb-2">Tags</p>
- <TagSelection
- onChange={setTags}
- defaultValue={link.tags.map((e) => {
- return { label: e.name, value: e.id };
- })}
- />
- </div>
-
- <div className="sm:col-span-2">
- <p className="mb-2">Description</p>
- <textarea
- value={unescapeString(link.description) as string}
- onChange={(e) =>
- setLink({ ...link, description: e.target.value })
- }
- placeholder="Will be auto generated if nothing is provided."
- className="resize-none w-full rounded-md p-2 border-neutral-content bg-base-200 focus:border-sky-300 dark:focus:border-sky-600 border-solid border outline-none duration-100"
- />
- </div>
+ {optionsExpanded ? (
+ <div className="mt-5">
+ {/* <hr className="mb-3 border border-neutral-content" /> */}
+ <div className="grid sm:grid-cols-2 gap-3">
+ <div>
+ <p className="mb-2">Name</p>
+ <TextInput
+ value={link.name}
+ onChange={(e) => setLink({ ...link, name: e.target.value })}
+ placeholder="e.g. Example Link"
+ className="bg-base-200"
+ />
+ </div>
+
+ <div>
+ <p className="mb-2">Tags</p>
+ <TagSelection
+ onChange={setTags}
+ defaultValue={link.tags.map((e) => {
+ return { label: e.name, value: e.id };
+ })}
+ />
</div>
- </div>
- ) : undefined}
-
- <div className="flex justify-between items-center mt-5">
- <div
- onClick={() => setOptionsExpanded(!optionsExpanded)}
- className={`rounded-md cursor-pointer btn btn-sm btn-ghost duration-100 flex items-center px-2 w-fit text-sm`}
- >
- <p>{optionsExpanded ? "Hide" : "More"} Options</p>
- </div>
- <button className="btn btn-accent" onClick={submit}>
- Create Link
- </button>
+ <div className="sm:col-span-2">
+ <p className="mb-2">Description</p>
+ <textarea
+ value={unescapeString(link.description) as string}
+ onChange={(e) =>
+ setLink({ ...link, description: e.target.value })
+ }
+ placeholder="Will be auto generated if nothing is provided."
+ className="resize-none w-full rounded-md p-2 border-neutral-content bg-base-200 focus:border-sky-300 dark:focus:border-sky-600 border-solid border outline-none duration-100"
+ />
+ </div>
+ </div>
</div>
+ ) : undefined}
+
+ <div className="flex justify-between items-center mt-5">
+ <div
+ onClick={() => setOptionsExpanded(!optionsExpanded)}
+ className={`rounded-md cursor-pointer btn btn-sm btn-ghost duration-100 flex items-center px-2 w-fit text-sm`}
+ >
+ <p>{optionsExpanded ? "Hide" : "More"} Options</p>
+ </div>
+
+ <button className="btn btn-accent" onClick={submit}>
+ Create Link
+ </button>
</div>
- <form method="dialog" className="modal-backdrop">
- <button>close</button>
- </form>
- </dialog>
+ </Modal>
);
}
diff --git a/components/Navbar.tsx b/components/Navbar.tsx
index 07598cd1..e3f26db0 100644
--- a/components/Navbar.tsx
+++ b/components/Navbar.tsx
@@ -162,16 +162,12 @@ export default function Navbar() {
</ClickAwayHandler>
</div>
) : null}
- <NewLinkModal
- isOpen={newLinkModal}
- onClose={() => setNewLinkModal(false)}
- modalId="new-link-modal-nav"
- />
- <NewCollectionModal
- isOpen={newCollectionModal}
- onClose={() => setNewCollectionModal(false)}
- modalId="new-collection-modal-nav"
- />
+ {newLinkModal ? (
+ <NewLinkModal onClose={() => setNewLinkModal(false)} />
+ ) : undefined}
+ {newCollectionModal ? (
+ <NewCollectionModal onClose={() => setNewCollectionModal(false)} />
+ ) : undefined}
</div>
);
}
diff --git a/components/NoLinksFound.tsx b/components/NoLinksFound.tsx
index bfcc0044..05f4ff15 100644
--- a/components/NoLinksFound.tsx
+++ b/components/NoLinksFound.tsx
@@ -31,11 +31,9 @@ export default function NoLinksFound({ text }: Props) {
</span>
</div>
</div>
- <NewLinkModal
- isOpen={newLinkModal}
- onClose={() => setNewLinkModal(false)}
- modalId="new-link-modal"
- />
+ {newLinkModal ? (
+ <NewLinkModal onClose={() => setNewLinkModal(false)} />
+ ) : undefined}
</div>
);
}
diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx
index 178003e5..2b876d07 100644
--- a/pages/collections/[id].tsx
+++ b/pages/collections/[id].tsx
@@ -233,24 +233,24 @@ export default function Index() {
</div>
{activeCollection ? (
<>
- <EditCollectionModal
- isOpen={editCollectionModal}
- onClose={() => setEditCollectionModal(false)}
- modalId={"edit-collection-modal" + activeCollection.id}
- activeCollection={activeCollection}
- />
- <EditCollectionSharingModal
- isOpen={editCollectionSharingModal}
- onClose={() => setEditCollectionSharingModal(false)}
- modalId={"edit-collection-sharing-modal" + activeCollection.id}
- activeCollection={activeCollection}
- />
- <DeleteCollectionModal
- isOpen={deleteCollectionModal}
- onClose={() => setDeleteCollectionModal(false)}
- modalId={"delete-collection-modal" + activeCollection.id}
- activeCollection={activeCollection}
- />
+ {editCollectionModal ? (
+ <EditCollectionModal
+ onClose={() => setEditCollectionModal(false)}
+ activeCollection={activeCollection}
+ />
+ ) : undefined}
+ {editCollectionSharingModal ? (
+ <EditCollectionSharingModal
+ onClose={() => setEditCollectionSharingModal(false)}
+ activeCollection={activeCollection}
+ />
+ ) : undefined}
+ {deleteCollectionModal ? (
+ <DeleteCollectionModal
+ onClose={() => setDeleteCollectionModal(false)}
+ activeCollection={activeCollection}
+ />
+ ) : undefined}
</>
) : undefined}
</MainLayout>
diff --git a/pages/collections/index.tsx b/pages/collections/index.tsx
index 325a32e3..02f25064 100644
--- a/pages/collections/index.tsx
+++ b/pages/collections/index.tsx
@@ -126,11 +126,9 @@ export default function Collections() {
</>
) : undefined}
</div>
- <NewCollectionModal
- isOpen={newCollectionModal}
- onClose={() => setNewCollectionModal(false)}
- modalId="new-collection-modal-1"
- />
+ {newCollectionModal ? (
+ <NewCollectionModal onClose={() => setNewCollectionModal(false)} />
+ ) : undefined}
</MainLayout>
);
}
diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx
index 20e01f38..22ec9e42 100644
--- a/pages/dashboard.tsx
+++ b/pages/dashboard.tsx
@@ -315,11 +315,9 @@ export default function Dashboard() {
)}
</div>
</div>
- <NewLinkModal
- isOpen={newLinkModal}
- onClose={() => setNewLinkModal(false)}
- modalId="new-link-modal"
- />
+ {newLinkModal ? (
+ <NewLinkModal onClose={() => setNewLinkModal(false)} />
+ ) : undefined}
</MainLayout>
);
}
diff --git a/pages/public/collections/[id].tsx b/pages/public/collections/[id].tsx
index 1c81dd01..a06276df 100644
--- a/pages/public/collections/[id].tsx
+++ b/pages/public/collections/[id].tsx
@@ -228,12 +228,12 @@ export default function PublicCollections() {
</p> */}
</div>
</div>
- <EditCollectionSharingModal
- isOpen={editCollectionSharingModal}
- onClose={() => setEditCollectionSharingModal(false)}
- modalId={"edit-collection-sharing-modal" + collection.id}
- activeCollection={collection}
- />
+ {editCollectionSharingModal ? (
+ <EditCollectionSharingModal
+ onClose={() => setEditCollectionSharingModal(false)}
+ activeCollection={collection}
+ />
+ ) : undefined}
</div>
) : (
<></>
diff --git a/styles/globals.css b/styles/globals.css
index 3d0d4655..d6f55ce3 100644
--- a/styles/globals.css
+++ b/styles/globals.css
@@ -69,7 +69,7 @@ body {
}
.slide-up {
- animation: slide-up-animation 70ms;
+ animation: slide-up-animation 200ms;
}
.slide-down {