⚡️⚡️⚡️ 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
improvements
daniel31x133bf2daddd101
diff --git a/components/LinkDetails.tsx b/components/LinkDetails.tsxindex ab1358ac..0bd4535f 100644--- a/components/LinkDetails.tsx+++ b/components/LinkDetails.tsx@@ -40,17 +40,23 @@ type Props = {setMode?: Function;onClose?: Function;onUpdateArchive?: Function;+ activeMode?: "view" | "edit";+ onDelete?: Function;+ onPin?: Function;};export default function LinkDetails({className,activeLink,standalone,- mode = "view",- setMode,onClose,onUpdateArchive,+ activeMode,+ onDelete,+ onPin,}: Props) {+ const [mode, setMode] = useState<"view" | "edit">(activeMode || "view");+const [link, setLink] =useState<LinkIncludingShortenedCollectionAndTags>(activeLink);@@ -251,99 +257,6 @@ export default function LinkDetails({><i title="Close" className="bi-x text-xl" /></div>-- {/* <div className="flex gap-2">- {!isPublicRoute && (- <div className={`dropdown dropdown-end z-20`}>- <div- tabIndex={0}- role="button"- onMouseDown={dropdownTriggerer}- className="btn btn-sm btn-circle text-base-content opacity-50 hover:opacity-100 z-10"- >- <i title="More" className="bi-three-dots text-xl" />- </div>- <ul- className={`dropdown-content z-[20] menu shadow bg-base-200 border border-neutral-content rounded-box`}- >- {- <li>- <div- role="button"- tabIndex={0}- onClick={() => {- (document?.activeElement as HTMLElement)?.blur();- onPin();- }}- className="whitespace-nowrap"- >- {link?.pinnedBy && link.pinnedBy[0]- ? t("unpin")- : t("pin_to_dashboard")}- </div>- </li>- }- {link.type === "url" &&- (permissions === true || permissions?.canUpdate) && (- <li>- <div- role="button"- tabIndex={0}- onClick={() => {- (document?.activeElement as HTMLElement)?.blur();- onUpdateArchive();- }}- className="whitespace-nowrap"- >- {t("refresh_preserved_formats")}- </div>- </li>- )}- {(permissions === true || permissions?.canDelete) && (- <li>- <div- role="button"- tabIndex={0}- onClick={async (e) => {- (document?.activeElement as HTMLElement)?.blur();- console.log(e.shiftKey);- if (e.shiftKey) {- const load = toast.loading(t("deleting"));-- await deleteLink.mutateAsync(link.id as number, {- onSettled: (data, error) => {- toast.dismiss(load);-- if (error) {- toast.error(error.message);- } else {- toast.success(t("deleted"));- }- },- });- onClose();- } else {- onDelete();- onClose();- }- }}- className="whitespace-nowrap"- >- {t("delete")}- </div>- </li>- )}- </ul>- </div>- )}- {link.url && (- <Link- href={link.url}- target="_blank"- className="bi-box-arrow-up-right btn-circle text-base-content opacity-50 hover:opacity-100 btn btn-sm select-none z-10"- ></Link>- )}- </div> */}</div>)}<div@@ -502,20 +415,18 @@ export default function LinkDetails({)}<div className={clsx("pb-8 pt-2 p-3", width < 640 && "sm:px-8")}>- {mode === "view" && (+ {mode === "view" ? (<div className="text-xl mt-2 pr-7"><pclassName={clsx("relative w-fit",- !link.name && "text-neutral"+ !link.name ? "text-neutral" : "text-primary")}>{unescapeString(link.name) || t("untitled")}</p></div>- )}-- {mode === "edit" && (+ ) : (<><br />@@ -533,6 +444,53 @@ export default function LinkDetails({</>)}+ {mode === "view" && !standalone && (+ <>+ <br />++ <div className={clsx("flex gap-3")}>+ <div+ title={t("open_modal_new_tab")}+ className="text-center bg-base-200 p-2 rounded-md cursor-pointer duration-100 hover:bg-base-300 active:scale-95 select-none text-2xl w-full"+ onClick={() => {+ window.open("/links/" + link.id, "_blank");+ }}+ >+ <i className="bi-box-arrow-up-right"></i>+ </div>+ {onPin && (+ <div+ title={t("pin_to_dashboard")}+ className="text-center bg-base-200 p-2 rounded-md cursor-pointer duration-100 hover:bg-base-300 active:scale-95 select-none text-2xl w-full"+ onClick={() => {+ onPin();+ }}+ >+ {link?.pinnedBy && link.pinnedBy[0] ? (+ <i className="bi-pin-fill"></i>+ ) : (+ <i className="bi-pin"></i>+ )}+ </div>+ )}+ {(permissions === true || permissions?.canDelete) &&+ onDelete &&+ onClose && (+ <div+ title={t("delete")}+ className="text-center bg-base-200 p-2 rounded-md cursor-pointer duration-100 hover:bg-base-300 active:scale-95 select-none text-2xl w-full"+ onClick={() => {+ onDelete();+ onClose();+ }}+ >+ <i className="bi-trash"></i>+ </div>+ )}+ </div>+ </>+ )}+{link.url && mode === "view" ? (<><br />@@ -567,9 +525,7 @@ export default function LinkDetails({</div></>) : undefined}-<br />-<div className="relative"><p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">{t("collection")}@@ -624,9 +580,7 @@ export default function LinkDetails({/>)}</div>-<br />-<div className="relative"><p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">{t("tags")}@@ -667,9 +621,7 @@ export default function LinkDetails({/>)}</div>-<br />-<div className="relative"><p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">{t("description")}@@ -696,7 +648,6 @@ export default function LinkDetails({/>)}</div>-{mode === "view" && (<div><br />@@ -827,7 +778,7 @@ export default function LinkDetails({"")}`}target="_blank"- className="text-neutral text-center mx-auto duration-100 hover:opacity-60 text-sm"+ className="text-neutral text-center mx-auto duration-100 opacity-100 hover:opacity-60 text-sm"><p>{t("view_latest_snapshot")}@@ -841,7 +792,6 @@ export default function LinkDetails({</div></div>)}-{mode === "view" ? (<><br />diff --git a/components/ModalContent/LinkModal.tsx b/components/ModalContent/LinkModal.tsxindex fb3f1e42..9ded58b8 100644--- a/components/ModalContent/LinkModal.tsx+++ b/components/ModalContent/LinkModal.tsx@@ -1,16 +1,6 @@-import React, { useState } from "react";import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";-import { useTranslation } from "next-i18next";-import { useDeleteLink } from "@/hooks/store/links";import LinkDetails from "../LinkDetails";-import Link from "next/link";-import usePermissions from "@/hooks/usePermissions";-import { useRouter } from "next/router";-import { dropdownTriggerer } from "@/lib/client/utils";-import toast from "react-hot-toast";-import clsx from "clsx";import Modal from "../Modal";-import useWindowDimensions from "@/hooks/useWindowDimensions";type Props = {onClose: Function;@@ -29,27 +19,16 @@ export default function LinkModal({link,activeMode,}: Props) {- const { t } = useTranslation();-- const permissions = usePermissions(link.collection.id as number);-- const router = useRouter();-- const isPublicRoute = router.pathname.startsWith("/public") ? true : false;-- const deleteLink = useDeleteLink();-- const [mode, setMode] = useState<"view" | "edit">(activeMode || "view");-return (<Modal toggleModal={onClose} isLinkModal><LinkDetailsactiveLink={link}className="sm:mt-0 -mt-11"- mode={mode}- setMode={(mode: "view" | "edit") => setMode(mode)}onUpdateArchive={onUpdateArchive}onClose={onClose}+ activeMode={activeMode}+ onDelete={onDelete}+ onPin={onPin}/></Modal>);diff --git a/public/locales/en/common.json b/public/locales/en/common.jsonindex 095210c5..6a5cffb1 100644--- a/public/locales/en/common.json+++ b/public/locales/en/common.json@@ -458,5 +458,6 @@"not_found_404": "404 - Not Found","collection_publicly_shared": "This collection is being shared publicly.","search_for_links": "Search for Links",- "search_query_invalid_symbol": "The search query should not contain '%'."+ "search_query_invalid_symbol": "The search query should not contain '%'.",+ "open_modal_new_tab": "Open this modal in a new tab"}\ No newline at end of file