⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
cleaner code
Daniel8af9a36dfaa0
diff --git a/components/CollectionCard.tsx b/components/CollectionCard.tsxindex ffde8ee4..34c8cd07 100644--- a/components/CollectionCard.tsx+++ b/components/CollectionCard.tsx@@ -17,7 +17,7 @@ import ImageWithFallback from "./ImageWithFallback";import Dropdown from "./Dropdown";import { useState } from "react";import Modal from "@/components/Modal";-import EditCollection from "@/components/Modal/EditCollection";+import CollectionModal from "@/components/Modal/CollectionModal";import DeleteCollection from "@/components/Modal/DeleteCollection";export default function ({@@ -26,13 +26,14 @@ export default function ({collection: CollectionIncludingMembers;}) {const { links } = useLinkStore();- const formattedDate = new Date(- collection.createdAt as unknown as string- ).toLocaleString("en-US", {- year: "numeric",- month: "short",- day: "numeric",- });+ const formattedDate = new Date(collection.createdAt as string).toLocaleString(+ "en-US",+ {+ year: "numeric",+ month: "short",+ day: "numeric",+ }+ );const [expandDropdown, setExpandDropdown] = useState(false);const [editCollectionModal, setEditCollectionModal] = useState(false);@@ -129,9 +130,10 @@ export default function ({{editCollectionModal ? (<Modal toggleModal={toggleEditCollectionModal}>- <EditCollection+ <CollectionModaltoggleCollectionModal={toggleEditCollectionModal}activeCollection={collection}+ method="UPDATE"/></Modal>) : null}diff --git a/components/Modal/ChangePassword.tsx b/components/Modal/ChangePassword.tsxindex 110315ec..a719f746 100644--- a/components/Modal/ChangePassword.tsx+++ b/components/Modal/ChangePassword.tsx@@ -12,7 +12,7 @@ type Props = {setPasswordForm: Function;};-export default function AddCollection({+export default function ChangePassword({togglePasswordFormModal,user,setPasswordForm,diff --git a/components/Modal/AddCollection.tsx b/components/Modal/CollectionModal.tsxsimilarity index 77%rename from components/Modal/AddCollection.tsxrename to components/Modal/CollectionModal.tsxindex 00157c5b..989ea725 100644--- a/components/Modal/AddCollection.tsx+++ b/components/Modal/CollectionModal.tsx@@ -3,34 +3,38 @@// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.-import React, { useEffect, useState } from "react";+import React, { useState } from "react";import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";import {faClose,- faPlus,+ faPenToSquare,+ faTrashCan,faUser,faUserPlus,} from "@fortawesome/free-solid-svg-icons";import useCollectionStore from "@/store/collections";import { CollectionIncludingMembers, Member } from "@/types/global";import { useSession } from "next-auth/react";+import Modal from "@/components/Modal";+import DeleteCollection from "@/components/Modal/DeleteCollection";import RequiredBadge from "../RequiredBadge";import addMemberToCollection from "@/lib/client/addMemberToCollection";import ImageWithFallback from "../ImageWithFallback";+import Checkbox from "../Checkbox";type Props = {toggleCollectionModal: Function;+ activeCollection: CollectionIncludingMembers;+ method: "CREATE" | "UPDATE";};-export default function AddCollection({ toggleCollectionModal }: Props) {- const session = useSession();-- const [collection, setCollection] = useState<CollectionIncludingMembers>({- name: "",- description: "",- ownerId: session.data?.user.id as number,- members: [],- });+export default function CollectionModal({+ toggleCollectionModal,+ activeCollection,+ method,+}: Props) {+ const [collection, setCollection] =+ useState<CollectionIncludingMembers>(activeCollection);const [member, setMember] = useState<Member>({canCreate: false,@@ -42,16 +46,16 @@ export default function AddCollection({ toggleCollectionModal }: Props) {},});- const { addCollection } = useCollectionStore();-- const submit = async () => {- if (!collection) return null;+ const { updateCollection, addCollection } = useCollectionStore();- const response = await addCollection(collection);+ const [deleteCollectionModal, setDeleteCollectionModal] = useState(false);- if (response) toggleCollectionModal();+ const toggleDeleteCollectionModal = () => {+ setDeleteCollectionModal(!deleteCollectionModal);};+ const session = useSession();+const setMemberState = (newMember: Member) => {if (!collection) return null;@@ -71,9 +75,23 @@ export default function AddCollection({ toggleCollectionModal }: Props) {});};+ const submit = async () => {+ if (!collection) return null;++ let response = null;++ if (method === "CREATE") response = await updateCollection(collection);+ else if (method === "UPDATE") response = await addCollection(collection);+ else console.log("Unknown method.");++ if (response) toggleCollectionModal();+ };+return (<div className="flex flex-col gap-3 sm:w-[35rem] w-80">- <p className="text-xl text-sky-500 mb-2 text-center">New Collection</p>+ <p className="text-xl text-sky-500 mb-2 text-center">+ {method === "CREATE" ? "Add" : "Edit"} Collection+ </p><div className="flex flex-col sm:flex-row gap-3"><div className="w-full">@@ -109,9 +127,27 @@ export default function AddCollection({ toggleCollectionModal }: Props) {</div></div>- <hr className="border rounded my-2" />+ <hr className="my-2" />++ {/* <p className="text-sky-600">Sharing & Collaboration Settings</p>++ <p className="text-sm font-bold text-sky-300">Collaboration</p>++ <div className="w-fit">+ <div className="border border-sky-100 rounded-md bg-white px-2 py-1 text-center select-none cursor-pointer text-sky-900 duration-100 hover:border-sky-500">+ Manage Team+ </div>+ </div>++ <Checkbox+ label="Make this a public collection."+ state={true}+ onClick={() => console.log("Clicked!")}+ />+ <p className="text-gray-500 text-sm">+ This will let anyone to access this collection.+ </p> */}- <p className="text-sm font-bold text-sky-300">Members</p><div className="relative"><inputvalue={member.user.email}@@ -130,7 +166,7 @@ export default function AddCollection({ toggleCollectionModal }: Props) {onClick={() =>addMemberToCollection(session.data?.user.email as string,- member.user.email as string,+ member.user.email,collection,setMemberState)@@ -140,7 +176,6 @@ export default function AddCollection({ toggleCollectionModal }: Props) {<FontAwesomeIcon icon={faUserPlus} className="w-6 h-6" /></div></div>-{collection?.members[0]?.user ? (<><p className="text-center text-gray-500 text-xs sm:text-sm">@@ -284,13 +319,41 @@ export default function AddCollection({ toggleCollectionModal }: Props) {</>) : null}- <div- className="mx-auto mt-2 bg-sky-500 text-white flex items-center gap-2 py-2 px-5 rounded-md select-none font-bold cursor-pointer duration-100 hover:bg-sky-400"- onClick={submit}- >- <FontAwesomeIcon icon={faPlus} className="h-5" />- Add Collection+ <div className="flex flex-col justify-center items-center gap-2 mt-2">+ <div+ className="bg-sky-500 text-white flex items-center gap-2 py-2 px-5 rounded-md select-none font-bold cursor-pointer duration-100 hover:bg-sky-400"+ onClick={submit}+ >+ <FontAwesomeIcon icon={faPenToSquare} className="h-5" />+ Edit Collection+ </div>++ <div className="flex items-center justify-center gap-2">+ <hr className="w-16 border" />++ <p className="text-gray-400 font-bold">OR</p>++ <hr className="w-16 border" />+ </div>++ <div+ onClick={() => {+ toggleDeleteCollectionModal();+ }}+ className="w-fit inline-flex rounded-md cursor-pointer bg-red-500 hover:bg-red-400 duration-100 p-2"+ >+ <FontAwesomeIcon icon={faTrashCan} className="w-4 h-4 text-white" />+ </div></div>++ {deleteCollectionModal ? (+ <Modal toggleModal={toggleDeleteCollectionModal}>+ <DeleteCollection+ collection={collection}+ toggleDeleteCollectionModal={toggleDeleteCollectionModal}+ />+ </Modal>+ ) : null}</div>);}diff --git a/components/Modal/DeleteCollection.tsx b/components/Modal/DeleteCollection.tsxindex 0cd8dde2..a658f219 100644--- a/components/Modal/DeleteCollection.tsx+++ b/components/Modal/DeleteCollection.tsx@@ -5,7 +5,7 @@import React, { useState } from "react";import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";-import { faPlus, faTrashCan } from "@fortawesome/free-solid-svg-icons";+import { faTrashCan } from "@fortawesome/free-solid-svg-icons";import { CollectionIncludingMembers } from "@/types/global";import useCollectionStore from "@/store/collections";import { useRouter } from "next/router";@@ -15,7 +15,7 @@ type Props = {collection: CollectionIncludingMembers;};-export default function AddCollection({+export default function DeleteCollection({toggleDeleteCollectionModal,collection,}: Props) {diff --git a/components/Modal/EditCollection.tsx b/components/Modal/EditCollection.tsxdeleted file mode 100644index 96e02bdb..00000000--- a/components/Modal/EditCollection.tsx+++ /dev/null@@ -1,345 +0,0 @@-// Copyright (C) 2022-present Daniel31x13 <[email protected]>-// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3.-// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.-// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.--import React, { useState } from "react";-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";-import {- faClose,- faPenToSquare,- faTrashCan,- faUser,- faUserPlus,-} from "@fortawesome/free-solid-svg-icons";-import useCollectionStore from "@/store/collections";-import { CollectionIncludingMembers, Member } from "@/types/global";-import { useSession } from "next-auth/react";-import Modal from "@/components/Modal";-import DeleteCollection from "@/components/Modal/DeleteCollection";-import RequiredBadge from "../RequiredBadge";-import addMemberToCollection from "@/lib/client/addMemberToCollection";-import ImageWithFallback from "../ImageWithFallback";-import Checkbox from "../Checkbox";--type Props = {- toggleCollectionModal: Function;- activeCollection: CollectionIncludingMembers;-};--export default function EditCollection({- toggleCollectionModal,- activeCollection,-}: Props) {- const [collection, setCollection] =- useState<CollectionIncludingMembers>(activeCollection);-- const [member, setMember] = useState<Member>({- canCreate: false,- canUpdate: false,- canDelete: false,- user: {- name: "",- email: "",- },- });-- const { updateCollection } = useCollectionStore();-- const [deleteCollectionModal, setDeleteCollectionModal] = useState(false);-- const toggleDeleteCollectionModal = () => {- setDeleteCollectionModal(!deleteCollectionModal);- };-- const session = useSession();-- const setMemberState = (newMember: Member) => {- if (!collection) return null;-- setCollection({- ...collection,- members: [...collection.members, newMember],- });-- setMember({- canCreate: false,- canUpdate: false,- canDelete: false,- user: {- name: "",- email: "",- },- });- };-- const submit = async () => {- if (!collection) return null;-- const response = await updateCollection(collection);-- if (response) toggleCollectionModal();- };-- return (- <div className="flex flex-col gap-3 sm:w-[35rem] w-80">- <p className="text-xl text-sky-500 mb-2 text-center">Edit Collection</p>-- <div className="flex flex-col sm:flex-row gap-3">- <div className="w-full">- <p className="text-sm font-bold text-sky-300 mb-2">- Name- <RequiredBadge />- </p>- <input- value={collection.name}- onChange={(e) =>- setCollection({ ...collection, name: e.target.value })- }- type="text"- placeholder="e.g. Example Collection"- className="w-full rounded-md p-3 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"- />- </div>-- <div className="w-full">- <p className="text-sm font-bold text-sky-300 mb-2">Description</p>- <input- value={collection.description}- onChange={(e) =>- setCollection({- ...collection,- description: e.target.value,- })- }- type="text"- placeholder="Collection description"- className="w-full rounded-md p-3 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"- />- </div>- </div>-- <hr className="my-2" />-- {/* <p className="text-sky-600">Sharing & Collaboration Settings</p>-- <p className="text-sm font-bold text-sky-300">Collaboration</p>-- <div className="w-fit">- <div className="border border-sky-100 rounded-md bg-white px-2 py-1 text-center select-none cursor-pointer text-sky-900 duration-100 hover:border-sky-500">- Manage Team- </div>- </div>-- <Checkbox- label="Make this a public collection."- state={true}- onClick={() => console.log("Clicked!")}- />- <p className="text-gray-500 text-sm">- This will let anyone to access this collection.- </p> */}-- <div className="relative">- <input- value={member.user.email}- onChange={(e) => {- setMember({- ...member,- user: { ...member.user, email: e.target.value },- });- }}- type="text"- placeholder="Email"- className="w-full rounded-md p-3 pr-12 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"- />-- <div- onClick={() =>- addMemberToCollection(- session.data?.user.email as string,- member.user.email,- collection,- setMemberState- )- }- className="absolute flex items-center justify-center right-2 top-2 bottom-2 bg-sky-500 hover:bg-sky-400 duration-100 text-white w-9 rounded-md cursor-pointer"- >- <FontAwesomeIcon icon={faUserPlus} className="w-6 h-6" />- </div>- </div>- {collection.members[0] ? (- <p className="text-center text-gray-500 text-xs sm:text-sm">- (All Members have <b>Read</b> access to this collection.)- </p>- ) : null}-- <div className="h-36 overflow-auto flex flex-col gap-3 rounded-md shadow-inner">- {collection.members.map((e, i) => {- return (- <div- key={i}- className="relative border p-2 rounded-md border-sky-100 flex flex-col sm:flex-row sm:items-center gap-2 justify-between"- >- <FontAwesomeIcon- icon={faClose}- className="absolute right-2 top-2 text-gray-500 h-4 hover:text-red-500 duration-100 cursor-pointer"- title="Remove Member"- onClick={() => {- const updatedMembers = collection.members.filter((member) => {- return member.user.email !== e.user.email;- });- setCollection({- ...collection,- members: updatedMembers,- });- }}- />- <div className="flex items-center gap-2">- <ImageWithFallback- key={i}- src={`/api/avatar/${e.userId}`}- className="h-10 w-10 shadow rounded-full border-[3px] border-sky-100"- >- <div className="text-white bg-sky-500 h-10 w-10 shadow rounded-full border-[3px] border-sky-100 flex items-center justify-center">- <FontAwesomeIcon icon={faUser} className="w-5 h-5" />- </div>- </ImageWithFallback>- <div>- <p className="text-sm font-bold text-sky-500">- {e.user.name}- </p>- <p className="text-sky-900">{e.user.email}</p>- </div>- </div>- <div className="flex sm:block items-center gap-5">- <div>- <p className="font-bold text-sm text-gray-500">Permissions</p>- <p className="text-xs text-gray-400 mb-2">- (Click to toggle.)- </p>- </div>-- <div>- <label className="cursor-pointer mr-1">- <input- type="checkbox"- id="canCreate"- className="peer sr-only"- checked={e.canCreate}- onChange={() => {- const updatedMembers = collection.members.map(- (member) => {- if (member.user.email === e.user.email) {- return { ...member, canCreate: !e.canCreate };- }- return member;- }- );- setCollection({- ...collection,- members: updatedMembers,- });- }}- />- <span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">- Create- </span>- </label>-- <label className="cursor-pointer mr-1">- <input- type="checkbox"- id="canUpdate"- className="peer sr-only"- checked={e.canUpdate}- onChange={() => {- const updatedMembers = collection.members.map(- (member) => {- if (member.user.email === e.user.email) {- return { ...member, canUpdate: !e.canUpdate };- }- return member;- }- );- setCollection({- ...collection,- members: updatedMembers,- });- }}- />- <span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">- Update- </span>- </label>-- <label className="cursor-pointer mr-1">- <input- type="checkbox"- id="canDelete"- className="peer sr-only"- checked={e.canDelete}- onChange={() => {- const updatedMembers = collection.members.map(- (member) => {- if (member.user.email === e.user.email) {- return { ...member, canDelete: !e.canDelete };- }- return member;- }- );- setCollection({- ...collection,- members: updatedMembers,- });- }}- />- <span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">- Delete- </span>- </label>- </div>- </div>- </div>- );- })}- </div>-- <div className="flex flex-col justify-center items-center gap-2 mt-2">- <div- className="bg-sky-500 text-white flex items-center gap-2 py-2 px-5 rounded-md select-none font-bold cursor-pointer duration-100 hover:bg-sky-400"- onClick={submit}- >- <FontAwesomeIcon icon={faPenToSquare} className="h-5" />- Edit Collection- </div>-- <div className="flex items-center justify-center gap-2">- <hr className="w-16 border" />-- <p className="text-gray-400 font-bold">OR</p>-- <hr className="w-16 border" />- </div>-- <div- onClick={() => {- toggleDeleteCollectionModal();- }}- className="w-fit inline-flex rounded-md cursor-pointer bg-red-500 hover:bg-red-400 duration-100 p-2"- >- <FontAwesomeIcon icon={faTrashCan} className="w-4 h-4 text-white" />- </div>- </div>-- {deleteCollectionModal ? (- <Modal toggleModal={toggleDeleteCollectionModal}>- <DeleteCollection- collection={collection}- toggleDeleteCollectionModal={toggleDeleteCollectionModal}- />- </Modal>- ) : null}- </div>- );-}diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsxindex 59b2d171..ae27ef67 100644--- a/pages/collections/[id].tsx+++ b/pages/collections/[id].tsx@@ -7,7 +7,7 @@ import Dropdown from "@/components/Dropdown";import LinkList from "@/components/LinkList";import Modal from "@/components/Modal";import AddLink from "@/components/Modal/AddLink";-import EditCollection from "@/components/Modal/EditCollection";+import CollectionModal from "@/components/Modal/CollectionModal";import DeleteCollection from "@/components/Modal/DeleteCollection";import useCollectionStore from "@/store/collections";import useLinkStore from "@/store/links";@@ -284,9 +284,10 @@ export default function () {{editCollectionModal && activeCollection ? (<Modal toggleModal={toggleEditCollectionModal}>- <EditCollection+ <CollectionModaltoggleCollectionModal={toggleEditCollectionModal}activeCollection={activeCollection}+ method="UPDATE"/></Modal>) : null}diff --git a/pages/collections/index.tsx b/pages/collections/index.tsxindex e2960cff..29a19f49 100644--- a/pages/collections/index.tsx+++ b/pages/collections/index.tsx@@ -16,10 +16,11 @@ import CollectionCard from "@/components/CollectionCard";import Dropdown from "@/components/Dropdown";import { ChangeEvent, useEffect, useState } from "react";import Modal from "@/components/Modal";-import AddCollection from "@/components/Modal/AddCollection";import MainLayout from "@/layouts/MainLayout";import ClickAwayHandler from "@/components/ClickAwayHandler";import RadioButton from "@/components/RadioButton";+import CollectionModal from "@/components/Modal/CollectionModal";+import { useSession } from "next-auth/react";export default function () {const { collections } = useCollectionStore();@@ -30,6 +31,8 @@ export default function () {const [collectionModal, setCollectionModal] = useState(false);+ const session = useSession();+const toggleCollectionModal = () => {setCollectionModal(!collectionModal);};@@ -65,14 +68,16 @@ export default function () {setSortedCollections(collectionsArray.sort((a, b) =>- new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()+ new Date(b.createdAt as string).getTime() -+ new Date(a.createdAt as string).getTime()));else if (sortBy === "Date (Oldest First)")setSortedCollections(collectionsArray.sort((a, b) =>- new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()+ new Date(a.createdAt as string).getTime() -+ new Date(b.createdAt as string).getTime()));}, [collections, sortBy]);@@ -210,7 +215,16 @@ export default function () {{collectionModal ? (<Modal toggleModal={toggleCollectionModal}>- <AddCollection toggleCollectionModal={toggleCollectionModal} />+ <CollectionModal+ activeCollection={{+ name: "",+ description: "",+ ownerId: session.data?.user.id as number,+ members: [],+ }}+ toggleCollectionModal={toggleCollectionModal}+ method="CREATE"+ /></Modal>) : null}</MainLayout>diff --git a/types/global.ts b/types/global.tsindex 61e1f65d..77822e81 100644--- a/types/global.ts+++ b/types/global.ts@@ -48,7 +48,7 @@ export interface Member {export interface CollectionIncludingMembersextends Omit<Collection, "id" | "createdAt"> {id?: number;- createdAt?: Date;+ createdAt?: string;members: Member[];}