diff --git a/README.md b/README.md index 8f07c2db..6f3d31d4 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

Linkwarden

Discord -GitHub commits since latest release (by SemVer including pre-releases) +GitHub commits since latest release (by SemVer including pre-releases) Top Language 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 ( + + ); +} 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() {
{link?.collection.ownerId === session.data?.user.id ? (
-
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) {
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) {
{link?.collection.ownerId === session.data?.user.id ? (
{optionsExpanded ? "Hide" : "More"} Options

-
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() {
{ 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" > { 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() {

- 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" > -
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}

- {link?.name ?

{link?.description}

: undefined} + {link?.name ? ( +

{unescapeString(link?.description)}

+ ) : undefined}
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() {
{process.env.NEXT_PUBLIC_DISABLE_LOGIN !== "true" ? ( -
+ <>

Enter your credentials

@@ -126,29 +126,29 @@ export default function Login() { )}
- -
+ ) : undefined} {process.env.NEXT_PUBLIC_KEYCLOAK_ENABLED === "true" ? ( - ) : undefined} {process.env.NEXT_PUBLIC_AUTHENTIK_ENABLED === "true" ? ( - ) : 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() { ) : undefined} - + label="Sign Up" + className="w-full" + loading={submitLoader} + />

Already have an account?

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() {
- Import From + +

Import From

  • @@ -300,8 +308,12 @@ export default function Account() {

    Download your data instantly.

    -
    - Export Data +
    + +

    Export Data

    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() {

    -
    +
    - +
    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 * {