Skip to content

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

replaced button component with shadcn button

daniel31x136ca2774b282f
diff --git a/apps/web/components/ConfirmationModal.tsx b/apps/web/components/ConfirmationModal.tsx
index 9f745b8d..20bc1f81 100644
--- a/apps/web/components/ConfirmationModal.tsx
+++ b/apps/web/components/ConfirmationModal.tsx
@@ -1,5 +1,5 @@
import React, { ReactNode } from "react";
-import Button from "./ui/Button";
+import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
import Modal from "./Modal";
@@ -28,14 +28,14 @@ export default function ConfirmationModal({
{children}
<div className="w-full flex items-center justify-end gap-2 mt-3">
<Button
- intent="ghost"
+ variant="ghost"
className="hover:bg-base-200"
onClick={() => toggleModal()}
>
{t("cancel")}
</Button>
<Button
- intent="destructive"
+ variant="destructive"
onClick={async () => {
await onConfirmed();
toggleModal();
diff --git a/apps/web/components/ImportDropdown.tsx b/apps/web/components/ImportDropdown.tsx
index f8ced06e..8a7c884f 100644
--- a/apps/web/components/ImportDropdown.tsx
+++ b/apps/web/components/ImportDropdown.tsx
@@ -13,7 +13,7 @@ const ImportDropdown = ({}: Props) => {
tabIndex={0}
role="button"
onMouseDown={dropdownTriggerer}
- className="inline-flex items-center gap-2 text-sm btn bg-neutral-content text-secondary-foreground hover:bg-neutral-content/80 border border-neutral/30 hover:border hover:border-neutral/30"
+ className="inline-flex items-center gap-2 text-sm btn bg-neutral-content text-base-content hover:bg-neutral-content/80 border border-neutral/30 hover:border hover:border-neutral/30"
id="import-dropdown"
>
<i className="bi-cloud-upload text-xl duration-100"></i>
diff --git a/apps/web/components/ModalContent/BulkDeleteLinksModal.tsx b/apps/web/components/ModalContent/BulkDeleteLinksModal.tsx
index 5a2b3e96..9c8dd8a8 100644
--- a/apps/web/components/ModalContent/BulkDeleteLinksModal.tsx
+++ b/apps/web/components/ModalContent/BulkDeleteLinksModal.tsx
@@ -1,7 +1,7 @@
import React from "react";
import useLinkStore from "@/store/links";
import Modal from "../Modal";
-import Button from "../ui/Button";
+import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
import { useBulkDeleteLinks } from "@linkwarden/router/links";
import toast from "react-hot-toast";
@@ -63,7 +63,7 @@ export default function BulkDeleteLinksModal({ onClose }: Props) {
<p>{t("shift_key_tip")}</p>
- <Button className="ml-auto" intent="destructive" onClick={deleteLink}>
+ <Button className="ml-auto" variant="destructive" onClick={deleteLink}>
<i className="bi-trash text-xl" />
{t("delete")}
</Button>
diff --git a/apps/web/components/ModalContent/DeleteCollectionModal.tsx b/apps/web/components/ModalContent/DeleteCollectionModal.tsx
index 352f6123..6b65df26 100644
--- a/apps/web/components/ModalContent/DeleteCollectionModal.tsx
+++ b/apps/web/components/ModalContent/DeleteCollectionModal.tsx
@@ -4,7 +4,7 @@ import { CollectionIncludingMembersAndLinkCount } from "@linkwarden/types";
import { useRouter } from "next/router";
import usePermissions from "@/hooks/usePermissions";
import Modal from "../Modal";
-import Button from "../ui/Button";
+import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
import { useDeleteCollection } from "@linkwarden/router/collections";
import toast from "react-hot-toast";
@@ -95,7 +95,7 @@ export default function DeleteCollectionModal({
<Button
disabled={permissions === true && inputField !== collection.name}
onClick={submit}
- intent="destructive"
+ variant="destructive"
className="ml-auto"
>
<i className="bi-trash text-xl"></i>
diff --git a/apps/web/components/ModalContent/DeleteLinkModal.tsx b/apps/web/components/ModalContent/DeleteLinkModal.tsx
index b4a4b267..67067023 100644
--- a/apps/web/components/ModalContent/DeleteLinkModal.tsx
+++ b/apps/web/components/ModalContent/DeleteLinkModal.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
import { LinkIncludingShortenedCollectionAndTags } from "@linkwarden/types";
import Modal from "../Modal";
import { useRouter } from "next/router";
-import Button from "../ui/Button";
+import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
import { useDeleteLink } from "@linkwarden/router/links";
import toast from "react-hot-toast";
@@ -62,7 +62,7 @@ export default function DeleteLinkModal({ onClose, activeLink }: Props) {
<p>{t("shift_key_tip")}</p>
- <Button className="ml-auto" intent="destructive" onClick={submit}>
+ <Button className="ml-auto" variant="destructive" onClick={submit}>
<i className="bi-trash text-xl" />
{t("delete")}
</Button>
diff --git a/apps/web/components/ModalContent/DeleteRssSubscriptionModal.tsx b/apps/web/components/ModalContent/DeleteRssSubscriptionModal.tsx
index 5b49685d..42323aca 100644
--- a/apps/web/components/ModalContent/DeleteRssSubscriptionModal.tsx
+++ b/apps/web/components/ModalContent/DeleteRssSubscriptionModal.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react";
import Modal from "../Modal";
-import Button from "../ui/Button";
+import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
import toast from "react-hot-toast";
import { RssSubscription } from "@linkwarden/prisma/client";
@@ -50,7 +50,7 @@ export default function DeleteRssSubscriptionModal({
<div className="flex flex-col gap-3">
<p>{t("rss_deletion_confirmation")}</p>
- <Button className="ml-auto" intent="destructive" onClick={submit}>
+ <Button className="ml-auto" variant="destructive" onClick={submit}>
<i className="bi-trash text-xl" />
{t("delete")}
</Button>
diff --git a/apps/web/components/ModalContent/DeleteUserModal.tsx b/apps/web/components/ModalContent/DeleteUserModal.tsx
index 76333f9c..1128be7e 100644
--- a/apps/web/components/ModalContent/DeleteUserModal.tsx
+++ b/apps/web/components/ModalContent/DeleteUserModal.tsx
@@ -1,5 +1,5 @@
import Modal from "../Modal";
-import Button from "../ui/Button";
+import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
import { useDeleteUser } from "@linkwarden/router/users";
import { useState } from "react";
@@ -59,7 +59,7 @@ export default function DeleteUserModal({ onClose, userId }: Props) {
</div>
)}
- <Button className="ml-auto" intent="destructive" onClick={submit}>
+ <Button className="ml-auto" variant="destructive" onClick={submit}>
<i className="bi-trash text-xl" />
{isAdmin ? t("delete_confirmation") : t("confirm")}
</Button>
diff --git a/apps/web/components/ModalContent/NewTokenModal.tsx b/apps/web/components/ModalContent/NewTokenModal.tsx
index eba5b5cc..5006925f 100644
--- a/apps/web/components/ModalContent/NewTokenModal.tsx
+++ b/apps/web/components/ModalContent/NewTokenModal.tsx
@@ -4,7 +4,7 @@ import { TokenExpiry } from "@linkwarden/types";
import toast from "react-hot-toast";
import Modal from "../Modal";
import { dropdownTriggerer } from "@/lib/client/utils";
-import Button from "../ui/Button";
+import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
import { useAddToken } from "@linkwarden/router/tokens";
import CopyButton from "../CopyButton";
@@ -102,7 +102,7 @@ export default function NewTokenModal({ onClose }: Props) {
<Button
tabIndex={0}
role="button"
- intent="secondary"
+ variant="metal"
onMouseDown={dropdownTriggerer}
className="whitespace-nowrap w-32"
>
diff --git a/apps/web/components/ModalContent/RevokeTokenModal.tsx b/apps/web/components/ModalContent/RevokeTokenModal.tsx
index 504822b5..2722b72f 100644
--- a/apps/web/components/ModalContent/RevokeTokenModal.tsx
+++ b/apps/web/components/ModalContent/RevokeTokenModal.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react";
import Modal from "../Modal";
-import Button from "../ui/Button";
+import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
import { AccessToken } from "@linkwarden/prisma/client";
import { useRevokeToken } from "@linkwarden/router/tokens";
@@ -47,7 +47,7 @@ export default function DeleteTokenModal({ onClose, activeToken }: Props) {
<div className="flex flex-col gap-3">
<p>{t("revoke_confirmation")}</p>
- <Button className="ml-auto" intent="destructive" onClick={deleteLink}>
+ <Button className="ml-auto" variant="destructive" onClick={deleteLink}>
<i className="bi-trash text-xl" />
{t("revoke")}
</Button>
diff --git a/apps/web/components/ModalContent/SurveyModal.tsx b/apps/web/components/ModalContent/SurveyModal.tsx
index 354c1dc3..a1bca1b5 100644
--- a/apps/web/components/ModalContent/SurveyModal.tsx
+++ b/apps/web/components/ModalContent/SurveyModal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import Modal from "../Modal";
-import Button from "../ui/Button";
+import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
type Props = {
@@ -56,7 +56,7 @@ export default function SurveyModal({ onClose, submit }: Props) {
<Button
className="ml-auto mt-3"
- intent="accent"
+ variant="accent"
onClick={() => submit(referer, other)}
>
{t("submit")}
diff --git a/apps/web/components/ui/Button.tsx b/apps/web/components/ui/Button.tsx
index 65a38172..292cdc99 100644
--- a/apps/web/components/ui/Button.tsx
+++ b/apps/web/components/ui/Button.tsx
@@ -1,62 +1,60 @@
-import { cn } from "@/lib/client/utils";
-
+import * as React from "react";
+import { Slot } from "@radix-ui/react-slot";
import { cva, type VariantProps } from "class-variance-authority";
+import { cn } from "@/lib/utils";
+
const buttonVariants = cva(
- "select-none relative duration-200 rounded-lg text-center w-fit flex justify-center items-center gap-2 disabled:pointer-events-none disabled:opacity-50",
+ "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
{
variants: {
- intent: {
+ variant: {
+ default: "bg-primary text-primary-foreground hover:bg-primary/90",
accent:
"bg-accent text-white hover:bg-accent/80 border border-violet-400",
- primary: "bg-primary text-primary-content hover:bg-primary/80",
- secondary:
- "bg-neutral-content text-secondary-foreground hover:bg-neutral-content/80 border border-neutral/30",
- destructive:
- "bg-error text-white hover:bg-error/80 border border-neutral/60",
+ destructive: "bg-destructive text-white hover:bg-destructive/90",
outline:
- "border border-input bg-background hover:bg-accent hover:text-accent-content",
+ "border border-base-content bg-background hover:bg-base-content hover:text-base-100",
+ secondary:
+ "bg-secondary text-secondary-foreground hover:bg-secondary/80",
+ metal:
+ "bg-neutral-content text-base-content hover:bg-neutral-content/80 border border-neutral/30",
ghost: "hover:bg-accent hover:text-accent-foreground",
link: "text-primary underline-offset-4 hover:underline",
},
size: {
- small: "h-7 px-2",
- medium: "h-10 px-4 py-2",
- large: "h-12 px-7 py-2",
+ default: "h-10 px-4 py-2",
+ sm: "h-9 rounded-md px-3",
+ lg: "h-11 rounded-md px-8",
full: "px-4 py-2 w-full",
icon: "h-10 w-10",
},
- loading: {
- true: "cursor-wait",
- },
},
defaultVariants: {
- intent: "primary",
- size: "medium",
+ variant: "default",
+ size: "default",
},
}
);
export interface ButtonProps
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
- VariantProps<typeof buttonVariants> {}
+ VariantProps<typeof buttonVariants> {
+ asChild?: boolean;
+}
-const Button: React.FC<ButtonProps> = ({
- className,
- intent,
- size,
- children,
- disabled,
- loading = false,
- ...props
-}) => (
- <button
- className={cn(buttonVariants({ intent, size, className }))}
- disabled={loading || disabled}
- {...props}
- >
- {children}
- </button>
+const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
+ ({ className, variant, size, asChild = false, ...props }, ref) => {
+ const Comp = asChild ? Slot : "button";
+ return (
+ <Comp
+ className={cn(buttonVariants({ variant, size, className }))}
+ ref={ref}
+ {...props}
+ />
+ );
+ }
);
+Button.displayName = "Button";
-export default Button;
+export { Button, buttonVariants };
diff --git a/apps/web/pages/auth/reset-password.tsx b/apps/web/pages/auth/reset-password.tsx
index d5db627d..0b28e13e 100644
--- a/apps/web/pages/auth/reset-password.tsx
+++ b/apps/web/pages/auth/reset-password.tsx
@@ -1,4 +1,4 @@
-import Button from "@/components/ui/Button";
+import { Button } from "@/components/ui/button";
import TextInput from "@/components/TextInput";
import CenteredForm from "@/layouts/CenteredForm";
import Link from "next/link";
@@ -92,10 +92,10 @@ export default function ResetPassword() {
</div>
<Button
type="submit"
- intent="accent"
+ variant="accent"
className="mt-2"
size="full"
- loading={submitLoader}
+ disabled={submitLoader}
>
{t("update_password")}
</Button>
diff --git a/apps/web/pages/forgot.tsx b/apps/web/pages/forgot.tsx
index d13dd36b..16c51fa8 100644
--- a/apps/web/pages/forgot.tsx
+++ b/apps/web/pages/forgot.tsx
@@ -1,4 +1,4 @@
-import Button from "@/components/ui/Button";
+import { Button } from "@/components/ui/button";
import TextInput from "@/components/TextInput";
import CenteredForm from "@/layouts/CenteredForm";
import Link from "next/link";
@@ -88,10 +88,10 @@ export default function Forgot() {
<Button
type="submit"
- intent="accent"
+ variant="accent"
className="mt-2"
size="full"
- loading={submitLoader}
+ disabled={submitLoader}
>
{t("send_reset_link")}
</Button>
diff --git a/apps/web/pages/login.tsx b/apps/web/pages/login.tsx
index f463899f..2ce15398 100644
--- a/apps/web/pages/login.tsx
+++ b/apps/web/pages/login.tsx
@@ -1,4 +1,4 @@
-import Button from "@/components/ui/Button";
+import { Button } from "@/components/ui/button";
import TextInput from "@/components/TextInput";
import CenteredForm from "@/layouts/CenteredForm";
import { signIn } from "next-auth/react";
@@ -196,9 +196,9 @@ export default function Login({
<Button
type="submit"
size="full"
- intent="accent"
+ variant="accent"
data-testid="submit-login-button"
- loading={submitLoader}
+ disabled={submitLoader}
>
{t("login")}
</Button>
@@ -220,8 +220,8 @@ export default function Login({
type="button"
onClick={() => loginUserButton(value.method)}
size="full"
- intent="secondary"
- loading={submitLoader}
+ variant="metal"
+ disabled={submitLoader}
>
{value.name.toLowerCase() === "google" ||
(value.name.toLowerCase() === "apple" && (
diff --git a/apps/web/pages/member-onboarding.tsx b/apps/web/pages/member-onboarding.tsx
index aaa5e911..8f45a176 100644
--- a/apps/web/pages/member-onboarding.tsx
+++ b/apps/web/pages/member-onboarding.tsx
@@ -1,4 +1,4 @@
-import Button from "@/components/ui/Button";
+import { Button } from "@/components/ui/button";
import TextInput from "@/components/TextInput";
import CenteredForm from "@/layouts/CenteredForm";
import Link from "next/link";
@@ -134,10 +134,10 @@ export default function MemberOnboarding() {
<Button
type="submit"
- intent="accent"
+ variant="accent"
className="mt-2"
size="full"
- loading={submitLoader}
+ disabled={submitLoader}
>
{t("continue_to_dashboard")}
</Button>
diff --git a/apps/web/pages/register.tsx b/apps/web/pages/register.tsx
index 31d65871..5dd4ef49 100644
--- a/apps/web/pages/register.tsx
+++ b/apps/web/pages/register.tsx
@@ -5,7 +5,7 @@ import { signIn } from "next-auth/react";
import { useRouter } from "next/router";
import CenteredForm from "@/layouts/CenteredForm";
import TextInput from "@/components/TextInput";
-import Button from "@/components/ui/Button";
+import { Button } from "@/components/ui/button";
import { getLogins } from "./api/v1/logins";
import { GetServerSideProps, InferGetServerSidePropsType } from "next";
import { getToken } from "next-auth/jwt";
@@ -130,8 +130,8 @@ export default function Register({
type="button"
onClick={() => loginUserButton(value.method)}
size="full"
- intent="secondary"
- loading={submitLoader}
+ variant="metal"
+ disabled={submitLoader}
>
{value.name.toLowerCase() === "google" ||
(value.name.toLowerCase() === "apple" && (
@@ -275,8 +275,8 @@ export default function Register({
<Button
type="submit"
- loading={submitLoader}
- intent="accent"
+ variant="accent"
+ disabled={submitLoader}
size="full"
data-testid="register-button"
>
diff --git a/apps/web/pages/settings/account.tsx b/apps/web/pages/settings/account.tsx
index ba76dde0..d682a3d9 100644
--- a/apps/web/pages/settings/account.tsx
+++ b/apps/web/pages/settings/account.tsx
@@ -11,7 +11,7 @@ import Link from "next/link";
import Checkbox from "@/components/Checkbox";
import { dropdownTriggerer } from "@/lib/client/utils";
import EmailChangeVerificationModal from "@/components/ModalContent/EmailChangeVerificationModal";
-import Button from "@/components/ui/Button";
+import { Button } from "@/components/ui/button";
import { i18n } from "next-i18next.config";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
@@ -210,8 +210,8 @@ export default function Account() {
<Button
tabIndex={0}
role="button"
- size="small"
- intent="secondary"
+ size="sm"
+ variant="metal"
onMouseDown={dropdownTriggerer}
className="text-sm"
>
@@ -315,7 +315,7 @@ export default function Account() {
<div>
<p className="mb-2">{t("download_data")}</p>
<Link className="w-fit" href="/api/v1/migration">
- <div className="select-none relative duration-200 rounded-lg text-sm text-center w-fit flex justify-center items-center gap-2 disabled:pointer-events-none disabled:opacity-50 bg-neutral-content text-secondary-foreground hover:bg-neutral-content/80 border border-neutral/30 h-10 px-4 py-2">
+ <div className="select-none relative duration-200 rounded-lg text-sm text-center w-fit flex justify-center items-center gap-2 disabled:pointer-events-none disabled:opacity-50 bg-neutral-content text-base-content hover:bg-neutral-content/80 border border-neutral/30 h-10 px-4 py-2">
<i className="bi-cloud-download text-xl duration-100"></i>
<p>{t("export_data")}</p>
</div>
diff --git a/apps/web/pages/settings/delete.tsx b/apps/web/pages/settings/delete.tsx
index 29f7fff4..77d4cb60 100644
--- a/apps/web/pages/settings/delete.tsx
+++ b/apps/web/pages/settings/delete.tsx
@@ -4,7 +4,7 @@ import TextInput from "@/components/TextInput";
import CenteredForm from "@/layouts/CenteredForm";
import { signOut, useSession } from "next-auth/react";
import Link from "next/link";
-import Button from "@/components/ui/Button";
+import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
import getServerSideProps from "@/lib/client/getServerSideProps";
import { useUser } from "@linkwarden/router/user";
@@ -129,8 +129,8 @@ export default function Delete() {
<Button
className="mx-auto"
- intent="destructive"
- loading={submitLoader}
+ variant="destructive"
+ disabled={submitLoader}
onClick={submit}
>
<p className="text-center w-full">{t("delete_your_account")}</p>
diff --git a/apps/web/pages/subscribe.tsx b/apps/web/pages/subscribe.tsx
index c55833fd..ac5fc7e4 100644
--- a/apps/web/pages/subscribe.tsx
+++ b/apps/web/pages/subscribe.tsx
@@ -4,7 +4,7 @@ import { toast } from "react-hot-toast";
import { useRouter } from "next/router";
import CenteredForm from "@/layouts/CenteredForm";
import { Plan } from "@linkwarden/types";
-import Button from "@/components/ui/Button";
+import { Button } from "@/components/ui/button";
import getServerSideProps from "@/lib/client/getServerSideProps";
import { Trans, useTranslation } from "next-i18next";
import { useUser } from "@linkwarden/router/user";
@@ -129,10 +129,10 @@ export default function Subscribe() {
<Button
type="button"
- intent="accent"
+ variant="accent"
size="full"
onClick={submit}
- loading={submitLoader}
+ disabled={submitLoader}
>
{t("complete_subscription")}
</Button>