Skip to content

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

visual improvements

daniel31x13e6979d4e7594
diff --git a/README.md b/README.md
index 8f07c2db..6f3d31d4 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
<h1>Linkwarden</h1>
<a href="https://discord.com/invite/CtuYV47nuJ"><img src="https://img.shields.io/discord/1117993124669702164?logo=discord&style=flat-square" alt="Discord"></a>
-<img alt="GitHub commits since latest release (by SemVer including pre-releases)" src="https://img.shields.io/github/commits-since/linkwarden/linkwarden/v1.1.0/dev">
+<img alt="GitHub commits since latest release (by SemVer including pre-releases)" src="https://img.shields.io/github/commits-since/linkwarden/linkwarden/latest/dev">
<img src="https://img.shields.io/github/languages/top/linkwarden/linkwarden?style=flat-square" alt="Top Language">
<img src="https://img.shields.io/github/stars/linkwarden/linkwarden?style=flat-square" alt="Github Stars">
diff --git a/components/AccentSubmitButton.tsx b/components/AccentSubmitButton.tsx
new file mode 100644
index 00000000..37f437f7
--- /dev/null
+++ b/components/AccentSubmitButton.tsx
@@ -0,0 +1,35 @@
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { IconProp } from "@fortawesome/fontawesome-svg-core";
+
+type Props = {
+ onClick?: Function;
+ icon?: IconProp;
+ label: string;
+ loading?: boolean;
+ className?: string;
+ type?: "button" | "submit" | "reset" | undefined;
+};
+
+export default function AccentSubmitButton({
+ onClick,
+ icon,
+ label,
+ loading,
+ className,
+ type,
+}: Props) {
+ return (
+ <button
+ type={type ? type : undefined}
+ className={`border primary-btn-gradient select-none duration-200 bg-black border-[oklch(var(--p))] hover:border-[#0070b5] rounded-lg text-center px-4 py-2 text-white active:scale-95 tracking-wider w-fit flex justify-center items-center gap-2 ${
+ className || ""
+ }`}
+ onClick={() => {
+ if (loading !== undefined && !loading && onClick) onClick();
+ }}
+ >
+ {icon && <FontAwesomeIcon icon={icon} className="h-5" />}
+ <p className="font-bold">{label}</p>
+ </button>
+ );
+}
diff --git a/components/Modal/Link/PreservedFormats.tsx b/components/Modal/Link/PreservedFormats.tsx
index 4017c322..de0a6de2 100644
--- a/components/Modal/Link/PreservedFormats.tsx
+++ b/components/Modal/Link/PreservedFormats.tsx
@@ -166,7 +166,7 @@ export default function PreservedFormats() {
<div className="flex flex-col-reverse sm:flex-row gap-5 items-center justify-center">
{link?.collection.ownerId === session.data?.user.id ? (
<div
- className={`btn btn-accent text-white ${
+ className={`btn btn-accent dark:border-violet-400 text-white ${
link?.pdfPath &&
link?.screenshotPath &&
link?.pdfPath !== "pending" &&
diff --git a/components/ModalContent/EditCollectionModal.tsx b/components/ModalContent/EditCollectionModal.tsx
index 34d2502d..991f6af6 100644
--- a/components/ModalContent/EditCollectionModal.tsx
+++ b/components/ModalContent/EditCollectionModal.tsx
@@ -111,7 +111,7 @@ export default function EditCollectionModal({
</div>
<button
- className="btn btn-accent text-white w-fit ml-auto"
+ className="btn btn-accent dark:border-violet-400 text-white w-fit ml-auto"
onClick={submit}
>
Save
diff --git a/components/ModalContent/EditCollectionSharingModal.tsx b/components/ModalContent/EditCollectionSharingModal.tsx
index 2bd7a41a..79eaf423 100644
--- a/components/ModalContent/EditCollectionSharingModal.tsx
+++ b/components/ModalContent/EditCollectionSharingModal.tsx
@@ -438,7 +438,7 @@ export default function EditCollectionSharingModal({
{permissions === true && (
<button
- className="btn btn-accent text-white w-fit ml-auto mt-3"
+ className="btn btn-accent dark:border-violet-400 text-white w-fit ml-auto mt-3"
onClick={submit}
>
Save
diff --git a/components/ModalContent/EditLinkModal.tsx b/components/ModalContent/EditLinkModal.tsx
index d626e709..94e2ce8e 100644
--- a/components/ModalContent/EditLinkModal.tsx
+++ b/components/ModalContent/EditLinkModal.tsx
@@ -159,7 +159,10 @@ export default function EditLinkModal({ onClose, activeLink }: Props) {
</div>
<div className="flex justify-end items-center mt-5">
- <button className="btn btn-accent text-white" onClick={submit}>
+ <button
+ className="btn btn-accent dark:border-violet-400 text-white"
+ onClick={submit}
+ >
Save
</button>
</div>
diff --git a/components/ModalContent/NewCollectionModal.tsx b/components/ModalContent/NewCollectionModal.tsx
index 0773cb1a..de0fc98c 100644
--- a/components/ModalContent/NewCollectionModal.tsx
+++ b/components/ModalContent/NewCollectionModal.tsx
@@ -116,7 +116,7 @@ export default function NewCollectionModal({ onClose }: Props) {
</div>
<button
- className="btn btn-accent text-white w-fit ml-auto"
+ className="btn btn-accent dark:border-violet-400 text-white w-fit ml-auto"
onClick={submit}
>
Create Collection
diff --git a/components/ModalContent/NewLinkModal.tsx b/components/ModalContent/NewLinkModal.tsx
index 7a0087ce..156fe285 100644
--- a/components/ModalContent/NewLinkModal.tsx
+++ b/components/ModalContent/NewLinkModal.tsx
@@ -192,7 +192,10 @@ export default function NewLinkModal({ onClose }: Props) {
<p>{optionsExpanded ? "Hide" : "More"} Options</p>
</div>
- <button className="btn btn-accent text-white" onClick={submit}>
+ <button
+ className="btn btn-accent dark:border-violet-400 text-white"
+ onClick={submit}
+ >
Create Link
</button>
</div>
diff --git a/components/ModalContent/PreservedFormatsModal.tsx b/components/ModalContent/PreservedFormatsModal.tsx
index 951e9cac..6625d931 100644
--- a/components/ModalContent/PreservedFormatsModal.tsx
+++ b/components/ModalContent/PreservedFormatsModal.tsx
@@ -191,7 +191,7 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
<div className="flex flex-col-reverse sm:flex-row sm:gap-3 items-center justify-center">
{link?.collection.ownerId === session.data?.user.id ? (
<div
- className={`btn btn-accent text-white ${
+ className={`btn btn-accent dark:border-violet-400 text-white ${
link?.pdfPath &&
link?.screenshotPath &&
link?.pdfPath !== "pending" &&
diff --git a/components/ModalContent/UploadFileModal.tsx b/components/ModalContent/UploadFileModal.tsx
index 887ce679..f6e7af4b 100644
--- a/components/ModalContent/UploadFileModal.tsx
+++ b/components/ModalContent/UploadFileModal.tsx
@@ -237,7 +237,10 @@ export default function UploadFileModal({ onClose }: Props) {
<p>{optionsExpanded ? "Hide" : "More"} Options</p>
</div>
- <button className="btn btn-accent text-white" onClick={submit}>
+ <button
+ className="btn btn-accent dark:border-violet-400 text-white"
+ onClick={submit}
+ >
Create Link
</button>
</div>
diff --git a/components/Navbar.tsx b/components/Navbar.tsx
index a493fa9a..e4dbb3af 100644
--- a/components/Navbar.tsx
+++ b/components/Navbar.tsx
@@ -68,7 +68,7 @@ export default function Navbar() {
<div
tabIndex={0}
role="button"
- className="flex items-center group btn btn-accent text-white btn-sm px-2"
+ className="flex items-center group btn btn-accent dark:border-violet-400 text-white btn-sm px-2"
>
<FontAwesomeIcon icon={faPlus} className="w-5 h-5" />
<FontAwesomeIcon
diff --git a/components/NoLinksFound.tsx b/components/NoLinksFound.tsx
index d6d3810e..a5ba21a6 100644
--- a/components/NoLinksFound.tsx
+++ b/components/NoLinksFound.tsx
@@ -20,7 +20,7 @@ export default function NoLinksFound({ text }: Props) {
onClick={() => {
setNewLinkModal(true);
}}
- className="inline-flex gap-1 relative w-[11rem] items-center btn btn-accent text-white group"
+ className="inline-flex gap-1 relative w-[11rem] items-center btn btn-accent dark:border-violet-400 text-white group"
>
<FontAwesomeIcon
icon={faPlus}
diff --git a/components/SubmitButton.tsx b/components/SubmitButton.tsx
index 1ee208b9..7a50b354 100644
--- a/components/SubmitButton.tsx
+++ b/components/SubmitButton.tsx
@@ -21,7 +21,7 @@ export default function SubmitButton({
return (
<button
type={type ? type : undefined}
- className={`btn btn-accent text-white tracking-wider w-fit flex items-center gap-2 ${
+ className={`btn btn-accent dark:border-violet-400 text-white tracking-wider w-fit flex items-center gap-2 ${
className || ""
}`}
onClick={() => {
diff --git a/lib/api/controllers/links/postLink.ts b/lib/api/controllers/links/postLink.ts
index 3d28a3f1..eca8a044 100644
--- a/lib/api/controllers/links/postLink.ts
+++ b/lib/api/controllers/links/postLink.ts
@@ -14,7 +14,7 @@ export default async function postLink(
userId: number
) {
try {
- if (link.url) new URL(link.url);
+ new URL(link.url || "");
} catch (error) {
return {
response:
diff --git a/pages/choose-username.tsx b/pages/choose-username.tsx
index 39b847af..e1e6b691 100644
--- a/pages/choose-username.tsx
+++ b/pages/choose-username.tsx
@@ -6,6 +6,7 @@ import { useSession } from "next-auth/react";
import useAccountStore from "@/store/account";
import CenteredForm from "@/layouts/CenteredForm";
import TextInput from "@/components/TextInput";
+import AccentSubmitButton from "@/components/AccentSubmitButton";
export default function ChooseUsername() {
const [submitLoader, setSubmitLoader] = useState(false);
@@ -72,10 +73,10 @@ export default function ChooseUsername() {
</p>
</div>
- <SubmitButton
+ <AccentSubmitButton
type="submit"
label="Complete Registration"
- className="mt-2 w-full text-center"
+ className="mt-2 w-full"
loading={submitLoader}
/>
diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx
index 64438cad..0cd4bde0 100644
--- a/pages/dashboard.tsx
+++ b/pages/dashboard.tsx
@@ -192,7 +192,7 @@ export default function Dashboard() {
onClick={() => {
setNewLinkModal(true);
}}
- className="inline-flex gap-1 relative w-[11rem] items-center btn btn-accent text-white group"
+ className="inline-flex gap-1 relative w-[11rem] items-center btn btn-accent dark:border-violet-400 text-white group"
>
<FontAwesomeIcon
icon={faPlus}
diff --git a/pages/forgot.tsx b/pages/forgot.tsx
index a1f02e36..d2773d94 100644
--- a/pages/forgot.tsx
+++ b/pages/forgot.tsx
@@ -1,4 +1,4 @@
-import SubmitButton from "@/components/SubmitButton";
+import AccentSubmitButton from "@/components/AccentSubmitButton";
import TextInput from "@/components/TextInput";
import CenteredForm from "@/layouts/CenteredForm";
import { signIn } from "next-auth/react";
@@ -73,10 +73,10 @@ export default function Forgot() {
/>
</div>
- <SubmitButton
+ <AccentSubmitButton
type="submit"
label="Send Login Link"
- className="mt-2 w-full text-center"
+ className="mt-2 w-full"
loading={submitLoader}
/>
<div className="flex items-baseline gap-1 justify-center">
diff --git a/pages/links/[id].tsx b/pages/links/[id].tsx
index 5d98a760..e2879eb7 100644
--- a/pages/links/[id].tsx
+++ b/pages/links/[id].tsx
@@ -244,7 +244,9 @@ export default function Index() {
: undefined}
</p>
- {link?.name ? <p>{link?.description}</p> : undefined}
+ {link?.name ? (
+ <p>{unescapeString(link?.description)}</p>
+ ) : undefined}
</div>
</div>
diff --git a/pages/login.tsx b/pages/login.tsx
index 122c55f1..0bafd9be 100644
--- a/pages/login.tsx
+++ b/pages/login.tsx
@@ -1,4 +1,4 @@
-import SubmitButton from "@/components/SubmitButton";
+import AccentSubmitButton from "@/components/AccentSubmitButton";
import TextInput from "@/components/TextInput";
import CenteredForm from "@/layouts/CenteredForm";
import { signIn } from "next-auth/react";
@@ -78,7 +78,7 @@ export default function Login() {
<form onSubmit={loginUser}>
<div className="p-4 mx-auto flex flex-col gap-3 justify-between max-w-[30rem] min-w-80 w-full bg-base-200 rounded-2xl shadow-md border border-neutral-content">
{process.env.NEXT_PUBLIC_DISABLE_LOGIN !== "true" ? (
- <div>
+ <>
<p className="text-3xl text-center font-extralight">
Enter your credentials
</p>
@@ -126,29 +126,29 @@ export default function Login() {
)}
</div>
- <SubmitButton
+ <AccentSubmitButton
type="submit"
label="Login"
- className=" w-full text-center"
+ className="w-full text-center"
loading={submitLoader}
/>
- </div>
+ </>
) : undefined}
{process.env.NEXT_PUBLIC_KEYCLOAK_ENABLED === "true" ? (
- <SubmitButton
+ <AccentSubmitButton
type="button"
onClick={loginUserKeycloak}
label="Sign in with Keycloak"
- className=" w-full text-center"
+ className="w-full text-center"
loading={submitLoader}
/>
) : undefined}
{process.env.NEXT_PUBLIC_AUTHENTIK_ENABLED === "true" ? (
- <SubmitButton
+ <AccentSubmitButton
type="button"
onClick={loginUserAuthentik}
label="Sign in with Authentiks"
- className=" w-full text-center"
+ className="w-full text-center"
loading={submitLoader}
/>
) : undefined}
diff --git a/pages/register.tsx b/pages/register.tsx
index d8b0650a..d6e3beef 100644
--- a/pages/register.tsx
+++ b/pages/register.tsx
@@ -1,11 +1,11 @@
import Link from "next/link";
import { useState, FormEvent } from "react";
import { toast } from "react-hot-toast";
-import SubmitButton from "@/components/SubmitButton";
import { signIn } from "next-auth/react";
import { useRouter } from "next/router";
import CenteredForm from "@/layouts/CenteredForm";
import TextInput from "@/components/TextInput";
+import AccentSubmitButton from "@/components/AccentSubmitButton";
const emailEnabled = process.env.NEXT_PUBLIC_EMAIL_PROVIDER;
@@ -220,12 +220,12 @@ export default function Register() {
</div>
) : undefined}
- <button
+ <AccentSubmitButton
type="submit"
- className={`border primary-btn-gradient select-none duration-100 bg-black border-[#0071B7] hover:border-[#059bf8] rounded-lg text-center px-4 py-2 text-slate-200 hover:text-white `}
- >
- <p className="text-center w-full font-bold">Sign Up</p>
- </button>
+ label="Sign Up"
+ className="w-full"
+ loading={submitLoader}
+ />
<div className="flex items-baseline gap-1 justify-center">
<p className="w-fit text-neutral">Already have an account?</p>
<Link href={"/login"} className="block font-bold">
diff --git a/pages/settings/account.tsx b/pages/settings/account.tsx
index a3ba9231..ee3e3156 100644
--- a/pages/settings/account.tsx
+++ b/pages/settings/account.tsx
@@ -1,6 +1,10 @@
import { useState, useEffect } from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faClose } from "@fortawesome/free-solid-svg-icons";
+import {
+ faClose,
+ faFileExport,
+ faFileImport,
+} from "@fortawesome/free-solid-svg-icons";
import useAccountStore from "@/store/account";
import { AccountSettings } from "@/types/global";
import { toast } from "react-hot-toast";
@@ -247,10 +251,14 @@ export default function Account() {
<div
tabIndex={0}
role="button"
- className="flex gap-2 text-sm btn btn-outline btn-neutral btn-xs"
+ className="flex gap-2 text-sm btn btn-outline btn-neutral group"
id="import-dropdown"
>
- Import From
+ <FontAwesomeIcon
+ icon={faFileImport}
+ className="w-5 h-5 duration-100"
+ />
+ <p>Import From</p>
</div>
<ul className="shadow menu dropdown-content z-[1] bg-base-200 border border-neutral-content rounded-box mt-1 w-60">
<li>
@@ -300,8 +308,12 @@ export default function Account() {
<div>
<p className="mb-2">Download your data instantly.</p>
<Link className="w-fit" href="/api/v1/migration">
- <div className="btn btn-outline btn-neutral btn-xs">
- Export Data
+ <div className="flex w-fit gap-2 text-sm btn btn-outline btn-neutral group">
+ <FontAwesomeIcon
+ icon={faFileExport}
+ className="w-5 h-5 duration-100"
+ />
+ <p>Export Data</p>
</div>
</Link>
</div>
diff --git a/pages/subscribe.tsx b/pages/subscribe.tsx
index 05248228..3cb4aa24 100644
--- a/pages/subscribe.tsx
+++ b/pages/subscribe.tsx
@@ -4,6 +4,7 @@ import { toast } from "react-hot-toast";
import { useRouter } from "next/router";
import CenteredForm from "@/layouts/CenteredForm";
import { Plan } from "@/types/global";
+import AccentSubmitButton from "@/components/AccentSubmitButton";
export default function Subscribe() {
const [submitLoader, setSubmitLoader] = useState(false);
@@ -47,7 +48,7 @@ export default function Subscribe() {
</p>
</div>
- <div className="flex text-white dark:text-black gap-3 border border-solid border-neutral-content w-4/5 mx-auto p-1 rounded-xl relative">
+ <div className="flex gap-3 border border-solid border-neutral-content w-4/5 mx-auto p-1 rounded-xl relative">
<button
onClick={() => setPlan(Plan.monthly)}
className={`w-full duration-100 text-sm rounded-lg p-1 ${
@@ -95,14 +96,13 @@ export default function Subscribe() {
</fieldset>
</div>
- <button
- className={`border primary-btn-gradient select-none duration-100 bg-black border-[#0071B7] hover:border-[#059bf8] rounded-lg text-center px-4 py-2 text-slate-200 hover:text-white `}
- onClick={() => {
- if (!submitLoader) submit();
- }}
- >
- <p className="text-center w-full font-bold">Complete Subscription!</p>
- </button>
+ <AccentSubmitButton
+ type="button"
+ label="Complete Subscription!"
+ className="w-full"
+ onClick={submit}
+ loading={submitLoader}
+ />
<div
onClick={() => signOut()}
diff --git a/styles/globals.css b/styles/globals.css
index 84eb1622..709ff198 100644
--- a/styles/globals.css
+++ b/styles/globals.css
@@ -181,11 +181,11 @@ body {
}
.primary-btn-gradient {
- box-shadow: inset 0px -10px 10px #0071b7;
+ box-shadow: inset 0px -9px 10px oklch(var(--p));
}
.primary-btn-gradient:hover {
- box-shadow: inset 0px -15px 10px #059bf8;
+ box-shadow: inset 0px -20px 40px #00436c;
}
.line-break * {