format
This commit is contained in:
parent
4faf389a2b
commit
94be3a7448
|
@ -1,5 +1,8 @@
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { AccountSettings, CollectionIncludingMembersAndLinkCount } from "@/types/global";
|
import {
|
||||||
|
AccountSettings,
|
||||||
|
CollectionIncludingMembersAndLinkCount,
|
||||||
|
} from "@/types/global";
|
||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import ProfilePhoto from "./ProfilePhoto";
|
import ProfilePhoto from "./ProfilePhoto";
|
||||||
import usePermissions from "@/hooks/usePermissions";
|
import usePermissions from "@/hooks/usePermissions";
|
||||||
|
@ -33,7 +36,9 @@ export default function CollectionCard({ collection, className }: Props) {
|
||||||
|
|
||||||
const permissions = usePermissions(collection.id as number);
|
const permissions = usePermissions(collection.id as number);
|
||||||
|
|
||||||
const [collectionOwner, setCollectionOwner] = useState<Partial<AccountSettings>>({});
|
const [collectionOwner, setCollectionOwner] = useState<
|
||||||
|
Partial<AccountSettings>
|
||||||
|
>({});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchOwner = async () => {
|
const fetchOwner = async () => {
|
||||||
|
@ -151,8 +156,10 @@ export default function CollectionCard({ collection, className }: Props) {
|
||||||
<Link
|
<Link
|
||||||
href={`/collections/${collection.id}`}
|
href={`/collections/${collection.id}`}
|
||||||
style={{
|
style={{
|
||||||
backgroundImage: `linear-gradient(45deg, ${collection.color}30 10%, ${settings.theme === "dark" ? "oklch(var(--b2))" : "oklch(var(--b2))"
|
backgroundImage: `linear-gradient(45deg, ${collection.color}30 10%, ${
|
||||||
} 50%, ${settings.theme === "dark" ? "oklch(var(--b2))" : "oklch(var(--b2))"
|
settings.theme === "dark" ? "oklch(var(--b2))" : "oklch(var(--b2))"
|
||||||
|
} 50%, ${
|
||||||
|
settings.theme === "dark" ? "oklch(var(--b2))" : "oklch(var(--b2))"
|
||||||
} 100%)`,
|
} 100%)`,
|
||||||
}}
|
}}
|
||||||
className="card card-compact shadow-md hover:shadow-none duration-200 border border-neutral-content"
|
className="card card-compact shadow-md hover:shadow-none duration-200 border border-neutral-content"
|
||||||
|
|
|
@ -231,7 +231,8 @@ const renderItem = (
|
||||||
return (
|
return (
|
||||||
<div ref={provided.innerRef} {...provided.draggableProps} className="mb-1">
|
<div ref={provided.innerRef} {...provided.draggableProps} className="mb-1">
|
||||||
<div
|
<div
|
||||||
className={`${currentPath === `/collections/${collection.id}`
|
className={`${
|
||||||
|
currentPath === `/collections/${collection.id}`
|
||||||
? "bg-primary/20 is-active"
|
? "bg-primary/20 is-active"
|
||||||
: "hover:bg-neutral/20"
|
: "hover:bg-neutral/20"
|
||||||
} duration-100 flex gap-1 items-center pr-2 pl-1 rounded-md`}
|
} duration-100 flex gap-1 items-center pr-2 pl-1 rounded-md`}
|
||||||
|
|
|
@ -60,7 +60,9 @@ export default function Dropdown({
|
||||||
}
|
}
|
||||||
}, [points, dropdownHeight]);
|
}, [points, dropdownHeight]);
|
||||||
|
|
||||||
return !points || pos && (
|
return (
|
||||||
|
!points ||
|
||||||
|
(pos && (
|
||||||
<ClickAwayHandler
|
<ClickAwayHandler
|
||||||
onMount={(e) => {
|
onMount={(e) => {
|
||||||
setDropdownHeight(e.height);
|
setDropdownHeight(e.height);
|
||||||
|
@ -76,7 +78,8 @@ export default function Dropdown({
|
||||||
: undefined
|
: undefined
|
||||||
}
|
}
|
||||||
onClickOutside={onClickOutside}
|
onClickOutside={onClickOutside}
|
||||||
className={`${className || ""
|
className={`${
|
||||||
|
className || ""
|
||||||
} py-1 shadow-md border border-neutral-content bg-base-200 rounded-md flex flex-col z-20`}
|
} py-1 shadow-md border border-neutral-content bg-base-200 rounded-md flex flex-col z-20`}
|
||||||
>
|
>
|
||||||
{items.map((e, i) => {
|
{items.map((e, i) => {
|
||||||
|
@ -101,5 +104,6 @@ export default function Dropdown({
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</ClickAwayHandler>
|
</ClickAwayHandler>
|
||||||
|
))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,8 @@ export default function LinkActions({
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
className={`dropdown dropdown-left absolute ${position || "top-3 right-3"
|
className={`dropdown dropdown-left absolute ${
|
||||||
|
position || "top-3 right-3"
|
||||||
} ${alignToTop ? "" : "dropdown-end"} z-20`}
|
} ${alignToTop ? "" : "dropdown-end"} z-20`}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
|
@ -91,7 +92,8 @@ export default function LinkActions({
|
||||||
<i title="More" className="bi-three-dots text-xl" />
|
<i title="More" className="bi-three-dots text-xl" />
|
||||||
</div>
|
</div>
|
||||||
<ul
|
<ul
|
||||||
className={`dropdown-content z-[20] menu shadow bg-base-200 border border-neutral-content rounded-box w-44 mr-1 ${alignToTop ? "" : "translate-y-10"
|
className={`dropdown-content z-[20] menu shadow bg-base-200 border border-neutral-content rounded-box w-44 mr-1 ${
|
||||||
|
alignToTop ? "" : "translate-y-10"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<li>
|
<li>
|
||||||
|
@ -122,7 +124,8 @@ export default function LinkActions({
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
)}
|
)}
|
||||||
{permissions === true || permissions?.canUpdate && (
|
{permissions === true ||
|
||||||
|
(permissions?.canUpdate && (
|
||||||
<li>
|
<li>
|
||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
|
@ -135,7 +138,7 @@ export default function LinkActions({
|
||||||
{t("edit_link")}
|
{t("edit_link")}
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
)}
|
))}
|
||||||
{link.type === "url" && (
|
{link.type === "url" && (
|
||||||
<li>
|
<li>
|
||||||
<div
|
<div
|
||||||
|
@ -150,7 +153,8 @@ export default function LinkActions({
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
)}
|
)}
|
||||||
{permissions === true || permissions?.canDelete && (
|
{permissions === true ||
|
||||||
|
(permissions?.canDelete && (
|
||||||
<li>
|
<li>
|
||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
|
@ -163,7 +167,7 @@ export default function LinkActions({
|
||||||
{t("delete")}
|
{t("delete")}
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
)}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,8 @@ export default function LinkCardCompact({
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
className={`${selectedStyle} border relative items-center flex ${!showInfo && !isPWA() ? "hover:bg-base-300 p-3" : "py-3"
|
className={`${selectedStyle} border relative items-center flex ${
|
||||||
|
!showInfo && !isPWA() ? "hover:bg-base-300 p-3" : "py-3"
|
||||||
} duration-200 rounded-lg w-full`}
|
} duration-200 rounded-lg w-full`}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
selectable
|
selectable
|
||||||
|
|
|
@ -21,7 +21,8 @@ export default function MobileNavigation({ }: Props) {
|
||||||
className={`fixed bottom-0 left-0 right-0 z-30 duration-200 sm:hidden`}
|
className={`fixed bottom-0 left-0 right-0 z-30 duration-200 sm:hidden`}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className={`w-full flex bg-base-100 ${isIphone() && isPWA() ? "pb-5" : ""
|
className={`w-full flex bg-base-100 ${
|
||||||
|
isIphone() && isPWA() ? "pb-5" : ""
|
||||||
} border-solid border-t-neutral-content border-t`}
|
} border-solid border-t-neutral-content border-t`}
|
||||||
>
|
>
|
||||||
<MobileNavigationButton href={`/dashboard`} icon={"bi-house"} />
|
<MobileNavigationButton href={`/dashboard`} icon={"bi-house"} />
|
||||||
|
@ -83,9 +84,7 @@ export default function MobileNavigation({ }: Props) {
|
||||||
<MobileNavigationButton href={`/collections`} icon={"bi-folder"} />
|
<MobileNavigationButton href={`/collections`} icon={"bi-folder"} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{newLinkModal && (
|
{newLinkModal && <NewLinkModal onClose={() => setNewLinkModal(false)} />}
|
||||||
<NewLinkModal onClose={() => setNewLinkModal(false)} />
|
|
||||||
)}
|
|
||||||
{newCollectionModal && (
|
{newCollectionModal && (
|
||||||
<NewCollectionModal onClose={() => setNewCollectionModal(false)} />
|
<NewCollectionModal onClose={() => setNewCollectionModal(false)} />
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -2,7 +2,11 @@ import React, { useEffect, useState } from "react";
|
||||||
import TextInput from "@/components/TextInput";
|
import TextInput from "@/components/TextInput";
|
||||||
import useCollectionStore from "@/store/collections";
|
import useCollectionStore from "@/store/collections";
|
||||||
import toast from "react-hot-toast";
|
import toast from "react-hot-toast";
|
||||||
import { AccountSettings, CollectionIncludingMembersAndLinkCount, Member } from "@/types/global";
|
import {
|
||||||
|
AccountSettings,
|
||||||
|
CollectionIncludingMembersAndLinkCount,
|
||||||
|
Member,
|
||||||
|
} from "@/types/global";
|
||||||
import getPublicUserData from "@/lib/client/getPublicUserData";
|
import getPublicUserData from "@/lib/client/getPublicUserData";
|
||||||
import useAccountStore from "@/store/account";
|
import useAccountStore from "@/store/account";
|
||||||
import usePermissions from "@/hooks/usePermissions";
|
import usePermissions from "@/hooks/usePermissions";
|
||||||
|
@ -62,7 +66,9 @@ export default function EditCollectionSharingModal({
|
||||||
|
|
||||||
const [memberUsername, setMemberUsername] = useState("");
|
const [memberUsername, setMemberUsername] = useState("");
|
||||||
|
|
||||||
const [collectionOwner, setCollectionOwner] = useState<Partial<AccountSettings>>({});
|
const [collectionOwner, setCollectionOwner] = useState<
|
||||||
|
Partial<AccountSettings>
|
||||||
|
>({});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchOwner = async () => {
|
const fetchOwner = async () => {
|
||||||
|
|
|
@ -38,7 +38,9 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
|
||||||
|
|
||||||
let isPublic = router.pathname.startsWith("/public") ? true : undefined;
|
let isPublic = router.pathname.startsWith("/public") ? true : undefined;
|
||||||
|
|
||||||
const [collectionOwner, setCollectionOwner] = useState<Partial<AccountSettings>>({});
|
const [collectionOwner, setCollectionOwner] = useState<
|
||||||
|
Partial<AccountSettings>
|
||||||
|
>({});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchOwner = async () => {
|
const fetchOwner = async () => {
|
||||||
|
@ -206,7 +208,9 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
|
||||||
<p className="text-center text-2xl">{t("preservation_in_queue")}</p>
|
<p className="text-center text-2xl">{t("preservation_in_queue")}</p>
|
||||||
<p className="text-center text-lg">{t("check_back_later")}</p>
|
<p className="text-center text-lg">{t("check_back_later")}</p>
|
||||||
</div>
|
</div>
|
||||||
) : !isReady() && atLeastOneFormatAvailable() && (
|
) : (
|
||||||
|
!isReady() &&
|
||||||
|
atLeastOneFormatAvailable() && (
|
||||||
<div className={`w-full h-full flex flex-col justify-center p-5`}>
|
<div className={`w-full h-full flex flex-col justify-center p-5`}>
|
||||||
<BeatLoader
|
<BeatLoader
|
||||||
color="oklch(var(--p))"
|
color="oklch(var(--p))"
|
||||||
|
@ -216,10 +220,12 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
|
||||||
<p className="text-center">{t("there_are_more_formats")}</p>
|
<p className="text-center">{t("there_are_more_formats")}</p>
|
||||||
<p className="text-center text-sm">{t("check_back_later")}</p>
|
<p className="text-center text-sm">{t("check_back_later")}</p>
|
||||||
</div>
|
</div>
|
||||||
|
)
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div
|
<div
|
||||||
className={`flex flex-col sm:flex-row gap-3 items-center justify-center ${isReady() ? "sm:mt " : ""
|
className={`flex flex-col sm:flex-row gap-3 items-center justify-center ${
|
||||||
|
isReady() ? "sm:mt " : ""
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<Link
|
<Link
|
||||||
|
|
|
@ -120,9 +120,7 @@ export default function Navbar() {
|
||||||
</ClickAwayHandler>
|
</ClickAwayHandler>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{newLinkModal && (
|
{newLinkModal && <NewLinkModal onClose={() => setNewLinkModal(false)} />}
|
||||||
<NewLinkModal onClose={() => setNewLinkModal(false)} />
|
|
||||||
)}
|
|
||||||
{newCollectionModal && (
|
{newCollectionModal && (
|
||||||
<NewCollectionModal onClose={() => setNewCollectionModal(false)} />
|
<NewCollectionModal onClose={() => setNewCollectionModal(false)} />
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -39,9 +39,7 @@ export default function NoLinksFound({ text }: Props) {
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{newLinkModal && (
|
{newLinkModal && <NewLinkModal onClose={() => setNewLinkModal(false)} />}
|
||||||
<NewLinkModal onClose={() => setNewLinkModal(false)} />
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,17 +90,19 @@ export default function PreservedFormatRow({
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex gap-1">
|
<div className="flex gap-1">
|
||||||
{downloadable || false && (
|
{downloadable ||
|
||||||
|
(false && (
|
||||||
<div
|
<div
|
||||||
onClick={() => handleDownload()}
|
onClick={() => handleDownload()}
|
||||||
className="btn btn-sm btn-square"
|
className="btn btn-sm btn-square"
|
||||||
>
|
>
|
||||||
<i className="bi-cloud-arrow-down text-xl text-neutral" />
|
<i className="bi-cloud-arrow-down text-xl text-neutral" />
|
||||||
</div>
|
</div>
|
||||||
)}
|
))}
|
||||||
|
|
||||||
<Link
|
<Link
|
||||||
href={`${isPublic ? "/public" : ""
|
href={`${
|
||||||
|
isPublic ? "/public" : ""
|
||||||
}/preserved/${link?.id}?format=${format}`}
|
}/preserved/${link?.id}?format=${format}`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
className="btn btn-sm btn-square"
|
className="btn btn-sm btn-square"
|
||||||
|
|
|
@ -32,7 +32,8 @@ export default function ProfileDropdown() {
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<ul
|
<ul
|
||||||
className={`dropdown-content z-[1] menu shadow bg-base-200 border border-neutral-content rounded-box ${isAdmin ? "w-48" : "w-40"
|
className={`dropdown-content z-[1] menu shadow bg-base-200 border border-neutral-content rounded-box ${
|
||||||
|
isAdmin ? "w-48" : "w-40"
|
||||||
} mt-1`}
|
} mt-1`}
|
||||||
>
|
>
|
||||||
<li>
|
<li>
|
||||||
|
|
|
@ -192,7 +192,8 @@ export default function ReadableView({ link }: Props) {
|
||||||
>
|
>
|
||||||
<i className="bi-link-45deg"></i>
|
<i className="bi-link-45deg"></i>
|
||||||
|
|
||||||
{isValidUrl(link?.url || "") && new URL(link?.url as string).host}
|
{isValidUrl(link?.url || "") &&
|
||||||
|
new URL(link?.url as string).host}
|
||||||
</Link>
|
</Link>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
@ -257,7 +258,8 @@ export default function ReadableView({ link }: Props) {
|
||||||
></div>
|
></div>
|
||||||
) : (
|
) : (
|
||||||
<div
|
<div
|
||||||
className={`w-full h-full flex flex-col justify-center p-10 ${link?.readable === "pending" || !link?.readable ? "skeleton" : ""
|
className={`w-full h-full flex flex-col justify-center p-10 ${
|
||||||
|
link?.readable === "pending" || !link?.readable ? "skeleton" : ""
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<svg
|
<svg
|
||||||
|
|
|
@ -10,7 +10,9 @@ export default function ToggleDarkMode({ className }: Props) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { settings, updateSettings } = useLocalSettingsStore();
|
const { settings, updateSettings } = useLocalSettingsStore();
|
||||||
|
|
||||||
const [theme, setTheme] = useState<string | null>(localStorage.getItem("theme"));
|
const [theme, setTheme] = useState<string | null>(
|
||||||
|
localStorage.getItem("theme")
|
||||||
|
);
|
||||||
|
|
||||||
const handleToggle = (e: ChangeEvent<HTMLInputElement>) => {
|
const handleToggle = (e: ChangeEvent<HTMLInputElement>) => {
|
||||||
setTheme(e.target.checked ? "dark" : "light");
|
setTheme(e.target.checked ? "dark" : "light");
|
||||||
|
|
|
@ -25,7 +25,8 @@ export default function CenteredForm({
|
||||||
<div className="m-auto flex flex-col gap-2 w-full">
|
<div className="m-auto flex flex-col gap-2 w-full">
|
||||||
{settings.theme && (
|
{settings.theme && (
|
||||||
<Image
|
<Image
|
||||||
src={`/linkwarden_${settings.theme === "dark" ? "dark" : "light"
|
src={`/linkwarden_${
|
||||||
|
settings.theme === "dark" ? "dark" : "light"
|
||||||
}.png`}
|
}.png`}
|
||||||
width={640}
|
width={640}
|
||||||
height={136}
|
height={136}
|
||||||
|
|
|
@ -26,7 +26,7 @@ export default async function exportData(userId: number) {
|
||||||
if (Array.isArray(data)) {
|
if (Array.isArray(data)) {
|
||||||
data.forEach((item) => redactIds(item));
|
data.forEach((item) => redactIds(item));
|
||||||
} else if (data !== null && typeof data === "object") {
|
} else if (data !== null && typeof data === "object") {
|
||||||
const fieldsToRedact = ['id', 'parentId', 'collectionId', 'ownerId'];
|
const fieldsToRedact = ["id", "parentId", "collectionId", "ownerId"];
|
||||||
|
|
||||||
fieldsToRedact.forEach((field) => {
|
fieldsToRedact.forEach((field) => {
|
||||||
if (field in data) {
|
if (field in data) {
|
||||||
|
@ -37,7 +37,10 @@ export default async function exportData(userId: number) {
|
||||||
// Recursively call redactIds for each property that is an object or an array
|
// Recursively call redactIds for each property that is an object or an array
|
||||||
Object.keys(data).forEach((key) => {
|
Object.keys(data).forEach((key) => {
|
||||||
const value = (data as any)[key];
|
const value = (data as any)[key];
|
||||||
if (value !== null && (typeof value === "object" || Array.isArray(value))) {
|
if (
|
||||||
|
value !== null &&
|
||||||
|
(typeof value === "object" || Array.isArray(value))
|
||||||
|
) {
|
||||||
redactIds(value);
|
redactIds(value);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -63,7 +63,8 @@ async function processBookmarks(
|
||||||
) as Element;
|
) as Element;
|
||||||
|
|
||||||
if (collectionName) {
|
if (collectionName) {
|
||||||
const collectionNameContent = (collectionName.children[0] as TextNode)?.content;
|
const collectionNameContent = (collectionName.children[0] as TextNode)
|
||||||
|
?.content;
|
||||||
if (collectionNameContent) {
|
if (collectionNameContent) {
|
||||||
collectionId = await createCollection(
|
collectionId = await createCollection(
|
||||||
userId,
|
userId,
|
||||||
|
@ -274,4 +275,3 @@ function processNodes(nodes: Node[]) {
|
||||||
nodes.forEach(findAndProcessDL);
|
nodes.forEach(findAndProcessDL);
|
||||||
return nodes;
|
return nodes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,10 +24,7 @@ export default async function deleteUserById(
|
||||||
|
|
||||||
if (!isServerAdmin) {
|
if (!isServerAdmin) {
|
||||||
if (user.password) {
|
if (user.password) {
|
||||||
const isPasswordValid = bcrypt.compareSync(
|
const isPasswordValid = bcrypt.compareSync(body.password, user.password);
|
||||||
body.password,
|
|
||||||
user.password
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!isPasswordValid && !isServerAdmin) {
|
if (!isPasswordValid && !isServerAdmin) {
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -7,10 +7,15 @@ export function isPWA() {
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isIphone() {
|
export function isIphone() {
|
||||||
return /iPhone/.test(navigator.userAgent) && !(window as unknown as { MSStream?: any }).MSStream;
|
return (
|
||||||
|
/iPhone/.test(navigator.userAgent) &&
|
||||||
|
!(window as unknown as { MSStream?: any }).MSStream
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function dropdownTriggerer(e: React.FocusEvent<HTMLElement> | React.MouseEvent<HTMLElement>) {
|
export function dropdownTriggerer(
|
||||||
|
e: React.FocusEvent<HTMLElement> | React.MouseEvent<HTMLElement>
|
||||||
|
) {
|
||||||
let targetEl = e.currentTarget;
|
let targetEl = e.currentTarget;
|
||||||
if (targetEl && targetEl.matches(":focus")) {
|
if (targetEl && targetEl.matches(":focus")) {
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
|
|
|
@ -39,7 +39,9 @@ export function monolithAvailable(
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function previewAvailable(link: LinkIncludingShortenedCollectionAndTags) {
|
export function previewAvailable(
|
||||||
|
link: LinkIncludingShortenedCollectionAndTags
|
||||||
|
) {
|
||||||
return (
|
return (
|
||||||
link &&
|
link &&
|
||||||
link.preview &&
|
link.preview &&
|
||||||
|
|
|
@ -104,9 +104,7 @@ export default function Admin() {
|
||||||
<p>{t("no_users_found")}</p>
|
<p>{t("no_users_found")}</p>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{newUserModal && (
|
{newUserModal && <NewUserModal onClose={() => setNewUserModal(false)} />}
|
||||||
<NewUserModal onClose={() => setNewUserModal(false)} />
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -189,8 +189,12 @@ export default async function Index(req: NextApiRequest, res: NextApiResponse) {
|
||||||
where: { id: linkId },
|
where: { id: linkId },
|
||||||
data: {
|
data: {
|
||||||
preview: isPDF ? "unavailable" : undefined,
|
preview: isPDF ? "unavailable" : undefined,
|
||||||
image: isImage ? `archives/${collectionPermissions.id}/${linkId + suffix}` : null,
|
image: isImage
|
||||||
pdf: isPDF ? `archives/${collectionPermissions.id}/${linkId + suffix}` : null,
|
? `archives/${collectionPermissions.id}/${linkId + suffix}`
|
||||||
|
: null,
|
||||||
|
pdf: isPDF
|
||||||
|
? `archives/${collectionPermissions.id}/${linkId + suffix}`
|
||||||
|
: null,
|
||||||
lastPreserved: new Date().toISOString(),
|
lastPreserved: new Date().toISOString(),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -54,7 +54,9 @@ export default function Index() {
|
||||||
|
|
||||||
const { account } = useAccountStore();
|
const { account } = useAccountStore();
|
||||||
|
|
||||||
const [collectionOwner, setCollectionOwner] = useState<Partial<AccountSettings>>({});
|
const [collectionOwner, setCollectionOwner] = useState<
|
||||||
|
Partial<AccountSettings>
|
||||||
|
>({});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchOwner = async () => {
|
const fetchOwner = async () => {
|
||||||
|
@ -108,7 +110,8 @@ export default function Index() {
|
||||||
<div
|
<div
|
||||||
className="h-[60rem] p-5 flex gap-3 flex-col"
|
className="h-[60rem] p-5 flex gap-3 flex-col"
|
||||||
style={{
|
style={{
|
||||||
backgroundImage: `linear-gradient(${activeCollection?.color}20 10%, ${settings.theme === "dark" ? "#262626" : "#f3f4f6"
|
backgroundImage: `linear-gradient(${activeCollection?.color}20 10%, ${
|
||||||
|
settings.theme === "dark" ? "#262626" : "#f3f4f6"
|
||||||
} 13rem, ${settings.theme === "dark" ? "#171717" : "#ffffff"} 100%)`,
|
} 13rem, ${settings.theme === "dark" ? "#171717" : "#ffffff"} 100%)`,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
@ -210,7 +213,7 @@ export default function Index() {
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{activeCollection.members
|
{activeCollection.members
|
||||||
.sort((a, b) => (a.userId) - (b.userId))
|
.sort((a, b) => a.userId - b.userId)
|
||||||
.map((e, i) => {
|
.map((e, i) => {
|
||||||
return (
|
return (
|
||||||
<ProfilePhoto
|
<ProfilePhoto
|
||||||
|
|
|
@ -60,7 +60,10 @@ export default function Dashboard() {
|
||||||
handleNumberOfLinksToShow();
|
handleNumberOfLinksToShow();
|
||||||
}, [width]);
|
}, [width]);
|
||||||
|
|
||||||
const importBookmarks = async (e: React.ChangeEvent<HTMLInputElement>, format: MigrationFormat) => {
|
const importBookmarks = async (
|
||||||
|
e: React.ChangeEvent<HTMLInputElement>,
|
||||||
|
format: MigrationFormat
|
||||||
|
) => {
|
||||||
const file: File | null = e.target.files && e.target.files[0];
|
const file: File | null = e.target.files && e.target.files[0];
|
||||||
|
|
||||||
if (file) {
|
if (file) {
|
||||||
|
@ -324,9 +327,7 @@ export default function Dashboard() {
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{newLinkModal && (
|
{newLinkModal && <NewLinkModal onClose={() => setNewLinkModal(false)} />}
|
||||||
<NewLinkModal onClose={() => setNewLinkModal(false)} />
|
|
||||||
)}
|
|
||||||
</MainLayout>
|
</MainLayout>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -224,9 +224,9 @@ export default function Login({
|
||||||
loading={submitLoader}
|
loading={submitLoader}
|
||||||
>
|
>
|
||||||
{value.name.toLowerCase() === "google" ||
|
{value.name.toLowerCase() === "google" ||
|
||||||
value.name.toLowerCase() === "apple" && (
|
(value.name.toLowerCase() === "apple" && (
|
||||||
<i className={"bi-" + value.name.toLowerCase()}></i>
|
<i className={"bi-" + value.name.toLowerCase()}></i>
|
||||||
)}
|
))}
|
||||||
{value.name}
|
{value.name}
|
||||||
</Button>
|
</Button>
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
|
|
|
@ -37,7 +37,9 @@ export default function PublicCollections() {
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
const [collectionOwner, setCollectionOwner] = useState<Partial<AccountSettings>>({});
|
const [collectionOwner, setCollectionOwner] = useState<
|
||||||
|
Partial<AccountSettings>
|
||||||
|
>({});
|
||||||
|
|
||||||
const [searchFilter, setSearchFilter] = useState({
|
const [searchFilter, setSearchFilter] = useState({
|
||||||
name: true,
|
name: true,
|
||||||
|
@ -103,7 +105,8 @@ export default function PublicCollections() {
|
||||||
<div
|
<div
|
||||||
className="h-96"
|
className="h-96"
|
||||||
style={{
|
style={{
|
||||||
backgroundImage: `linear-gradient(${collection?.color}30 10%, ${settings.theme === "dark" ? "#262626" : "#f3f4f6"
|
backgroundImage: `linear-gradient(${collection?.color}30 10%, ${
|
||||||
|
settings.theme === "dark" ? "#262626" : "#f3f4f6"
|
||||||
} 13rem, ${settings.theme === "dark" ? "#171717" : "#ffffff"} 100%)`,
|
} 13rem, ${settings.theme === "dark" ? "#171717" : "#ffffff"} 100%)`,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|
|
@ -133,9 +133,9 @@ export default function Register({
|
||||||
loading={submitLoader}
|
loading={submitLoader}
|
||||||
>
|
>
|
||||||
{value.name.toLowerCase() === "google" ||
|
{value.name.toLowerCase() === "google" ||
|
||||||
value.name.toLowerCase() === "apple" && (
|
(value.name.toLowerCase() === "apple" && (
|
||||||
<i className={"bi-" + value.name.toLowerCase()}></i>
|
<i className={"bi-" + value.name.toLowerCase()}></i>
|
||||||
)}
|
))}
|
||||||
{value.name}
|
{value.name}
|
||||||
</Button>
|
</Button>
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
|
|
|
@ -102,7 +102,10 @@ export default function Account() {
|
||||||
setSubmitLoader(false);
|
setSubmitLoader(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
const importBookmarks = async (e: ChangeEvent<HTMLInputElement>, format: MigrationFormat) => {
|
const importBookmarks = async (
|
||||||
|
e: ChangeEvent<HTMLInputElement>,
|
||||||
|
format: MigrationFormat
|
||||||
|
) => {
|
||||||
setSubmitLoader(true);
|
setSubmitLoader(true);
|
||||||
const file = e.target.files?.[0];
|
const file = e.target.files?.[0];
|
||||||
|
|
||||||
|
@ -421,7 +424,8 @@ export default function Account() {
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
{t("delete_account_warning")}
|
{t("delete_account_warning")}
|
||||||
{process.env.NEXT_PUBLIC_STRIPE && " " + t("cancel_subscription_notice")}
|
{process.env.NEXT_PUBLIC_STRIPE &&
|
||||||
|
" " + t("cancel_subscription_notice")}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ export enum Sort {
|
||||||
DescriptionZA,
|
DescriptionZA,
|
||||||
}
|
}
|
||||||
|
|
||||||
export type Order = { [key: string]: 'asc' | 'desc' };
|
export type Order = { [key: string]: "asc" | "desc" };
|
||||||
|
|
||||||
export type LinkRequestQuery = {
|
export type LinkRequestQuery = {
|
||||||
sort: Sort;
|
sort: Sort;
|
||||||
|
|
Ŝarĝante…
Reference in New Issue