Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

chore: fix linting issues

Andrej44cf37f2de23
diff --git a/apps/web/components.json b/apps/web/components.json
index 1c68cc2f5..f96e9bccd 100644
--- a/apps/web/components.json
+++ b/apps/web/components.json
@@ -1,24 +1,24 @@
{
- "$schema": "https://ui.shadcn.com/schema.json",
- "style": "new-york",
- "rsc": false,
- "tsx": true,
- "tailwind": {
- "config": "tailwind.config.js",
- "css": "src/index.css",
- "baseColor": "zinc",
- "cssVariables": true,
- "prefix": ""
- },
- "iconLibrary": "lucide",
- "aliases": {
- "components": "@/components",
- "utils": "@/lib/cn",
- "ui": "@/components/ui",
- "lib": "@/lib",
- "hooks": "@/hooks"
- },
- "registries": {
- "@coss": "https://coss.com/ui/r/{name}.json"
- }
+ "$schema": "https://ui.shadcn.com/schema.json",
+ "style": "new-york",
+ "rsc": false,
+ "tsx": true,
+ "tailwind": {
+ "config": "tailwind.config.js",
+ "css": "src/index.css",
+ "baseColor": "zinc",
+ "cssVariables": true,
+ "prefix": ""
+ },
+ "iconLibrary": "lucide",
+ "aliases": {
+ "components": "@/components",
+ "utils": "@/lib/cn",
+ "ui": "@/components/ui",
+ "lib": "@/lib",
+ "hooks": "@/hooks"
+ },
+ "registries": {
+ "@coss": "https://coss.com/ui/r/{name}.json"
+ }
}
diff --git a/apps/web/src/components/activity/comment-card.tsx b/apps/web/src/components/activity/comment-card.tsx
index 3f191c631..a631a5df5 100644
--- a/apps/web/src/components/activity/comment-card.tsx
+++ b/apps/web/src/components/activity/comment-card.tsx
@@ -30,17 +30,16 @@ import {
Underline,
X,
} from "lucide-react";
-import { toast } from "@/lib/toast";
+import CustomSlashMenu from "@/components/blocknote/custom-slash-menu";
import { useAuth } from "@/components/providers/auth-provider/hooks/use-auth";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Button } from "@/components/ui/button";
-import CustomSlashMenu from "@/components/blocknote/custom-slash-menu";
+import { KbdSequence } from "@/components/ui/kbd";
import {
HoverCard,
HoverCardContent,
HoverCardTrigger,
} from "@/components/ui/preview-card";
-import { KbdSequence } from "@/components/ui/kbd";
import {
Tooltip,
TooltipContent,
@@ -50,6 +49,7 @@ import {
import useUpdateComment from "@/hooks/mutations/comment/use-update-comment";
import { getModifierKeyText } from "@/hooks/use-keyboard-shortcuts";
import { cn } from "@/lib/cn";
+import { toast } from "@/lib/toast";
import { useUserPreferencesStore } from "@/store/user-preferences";
type CommentCardProps = {
@@ -227,7 +227,7 @@ export default function CommentCard({
<div className="w-full group">
<div className="flex items-center gap-2 mb-2">
<HoverCard>
- <HoverCardTrigger asChild>
+ <HoverCardTrigger>
<div className="flex items-center gap-2 cursor-pointer">
<Avatar className="h-6 w-6">
<AvatarImage src={user?.image ?? ""} alt={user?.name || ""} />
diff --git a/apps/web/src/components/activity/comment-input.tsx b/apps/web/src/components/activity/comment-input.tsx
index 0e114ea1c..fafec223c 100644
--- a/apps/web/src/components/activity/comment-input.tsx
+++ b/apps/web/src/components/activity/comment-input.tsx
@@ -25,9 +25,8 @@ import {
Type,
Underline,
} from "lucide-react";
-import { toast } from "@/lib/toast";
-import { Button } from "@/components/ui/button";
import CustomSlashMenu from "@/components/blocknote/custom-slash-menu";
+import { Button } from "@/components/ui/button";
import { KbdSequence } from "@/components/ui/kbd";
import {
Tooltip,
@@ -38,6 +37,7 @@ import {
import useCreateComment from "@/hooks/mutations/comment/use-create-comment";
import { getModifierKeyText } from "@/hooks/use-keyboard-shortcuts";
import { cn } from "@/lib/cn";
+import { toast } from "@/lib/toast";
import { useUserPreferencesStore } from "@/store/user-preferences";
type CommentInputProps = {
diff --git a/apps/web/src/components/auth/otp-sign-in-form.tsx b/apps/web/src/components/auth/otp-sign-in-form.tsx
index 0b51f6ff5..a8dbc5982 100644
--- a/apps/web/src/components/auth/otp-sign-in-form.tsx
+++ b/apps/web/src/components/auth/otp-sign-in-form.tsx
@@ -2,7 +2,6 @@ import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
import { useRouter } from "@tanstack/react-router";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { Button } from "@/components/ui/button";
import {
@@ -15,6 +14,7 @@ import {
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { authClient } from "@/lib/auth-client";
+import { toast } from "@/lib/toast";
type OtpSignInFormProps = {
invitationId?: string;
@@ -87,11 +87,7 @@ export function OtpSignInForm({
)}
/>
- <Button
- type="submit"
- disabled={isPending}
- className="w-full mt-4"
- >
+ <Button type="submit" disabled={isPending} className="w-full mt-4">
{isPending ? "Sending..." : "Send Verification Code"}
</Button>
</form>
diff --git a/apps/web/src/components/auth/sign-in-form.tsx b/apps/web/src/components/auth/sign-in-form.tsx
index b4442fd6d..7fe095bf8 100644
--- a/apps/web/src/components/auth/sign-in-form.tsx
+++ b/apps/web/src/components/auth/sign-in-form.tsx
@@ -2,7 +2,6 @@ import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
import { Eye, EyeOff } from "lucide-react";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { Button } from "@/components/ui/button";
import {
@@ -15,6 +14,7 @@ import {
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { authClient } from "@/lib/auth-client";
+import { toast } from "@/lib/toast";
export type SignInFormValues = {
email: string;
diff --git a/apps/web/src/components/auth/sign-up-form.tsx b/apps/web/src/components/auth/sign-up-form.tsx
index 15f147888..34e526eab 100644
--- a/apps/web/src/components/auth/sign-up-form.tsx
+++ b/apps/web/src/components/auth/sign-up-form.tsx
@@ -3,7 +3,6 @@ import { useRouter } from "@tanstack/react-router";
import { Eye, EyeOff } from "lucide-react";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { Button } from "@/components/ui/button";
import {
@@ -16,6 +15,7 @@ import {
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { authClient } from "@/lib/auth-client";
+import { toast } from "@/lib/toast";
export type SignUpFormValues = {
email: string;
@@ -151,11 +151,7 @@ export function SignUpForm({ invitationId, defaultEmail }: SignUpFormProps) {
/>
</div>
- <Button
- type="submit"
- disabled={isPending}
- className="w-full mt-4"
- >
+ <Button type="submit" disabled={isPending} className="w-full mt-4">
{isPending ? "Creating Account..." : "Create Account"}
</Button>
</form>
diff --git a/apps/web/src/components/backlog-list-view/backlog-task-row.tsx b/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
index b1508729c..1eece097c 100644
--- a/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
+++ b/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
@@ -4,11 +4,9 @@ import { useNavigate } from "@tanstack/react-router";
import { format } from "date-fns";
import { Calendar, CalendarClock, CalendarX } from "lucide-react";
import { type CSSProperties, useMemo, useState } from "react";
-import { toast } from "@/lib/toast";
import {
AlertDialog,
AlertDialogClose,
-
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -22,6 +20,7 @@ import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-
import { cn } from "@/lib/cn";
import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
import { getPriorityIcon } from "@/lib/priority";
+import { toast } from "@/lib/toast";
import queryClient from "@/query-client";
import useBacklogBulkSelectionStore from "@/store/backlog-bulk-selection";
import useProjectStore from "@/store/project";
diff --git a/apps/web/src/components/backlog-list-view/index.tsx b/apps/web/src/components/backlog-list-view/index.tsx
index 7d874833c..fdd94e878 100644
--- a/apps/web/src/components/backlog-list-view/index.tsx
+++ b/apps/web/src/components/backlog-list-view/index.tsx
@@ -297,8 +297,7 @@ function BacklogListView({ project }: BacklogListViewProps) {
<div
className={cn(
"border-b border-border/50 transition-all duration-200 overflow-auto",
- showDropIndicator &&
- "border-l-4 border-l-ring bg-accent/35",
+ showDropIndicator && "border-l-4 border-l-ring bg-accent/35",
)}
>
<div className="flex items-center justify-between py-2 px-4 bg-muted/60 border-b border-border/50">
diff --git a/apps/web/src/components/blocknote/custom-slash-menu.tsx b/apps/web/src/components/blocknote/custom-slash-menu.tsx
index c95e025db..3f84465c1 100644
--- a/apps/web/src/components/blocknote/custom-slash-menu.tsx
+++ b/apps/web/src/components/blocknote/custom-slash-menu.tsx
@@ -35,11 +35,12 @@ export default function CustomSlashMenu(
className={cn("kaneo-slash-menu-item", {
"is-selected": selectedIndex === index,
})}
- aria-selected={selectedIndex === index}
onMouseDown={(event) => event.preventDefault()}
onClick={() => onItemClick?.(item)}
>
- {item.icon && <span className="kaneo-slash-menu-icon">{item.icon}</span>}
+ {item.icon && (
+ <span className="kaneo-slash-menu-icon">{item.icon}</span>
+ )}
<span className="kaneo-slash-menu-title">{item.title}</span>
{shortcut && (
<span className="kaneo-slash-menu-shortcut">{shortcut}</span>
diff --git a/apps/web/src/components/bulk-selection/backlog-bulk-toolbar.tsx b/apps/web/src/components/bulk-selection/backlog-bulk-toolbar.tsx
index 25e7d60dd..7c89b80b1 100644
--- a/apps/web/src/components/bulk-selection/backlog-bulk-toolbar.tsx
+++ b/apps/web/src/components/bulk-selection/backlog-bulk-toolbar.tsx
@@ -6,8 +6,14 @@ import {
Trash2,
X,
} from "lucide-react";
-import { Fragment, type ReactNode, useEffect, useMemo, useState } from "react";
-import { toast } from "@/lib/toast";
+import {
+ Fragment,
+ type ReactNode,
+ useCallback,
+ useEffect,
+ useMemo,
+ useState,
+} from "react";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import {
Command,
@@ -33,6 +39,7 @@ import { useBulkOperations } from "@/hooks/mutations/task/use-bulk-operations";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";
import { getColumnIcon } from "@/lib/column";
+import { toast } from "@/lib/toast";
import useBacklogBulkSelectionStore from "@/store/backlog-bulk-selection";
import useProjectStore from "@/store/project";
import { Button } from "../ui/button";
@@ -81,20 +88,23 @@ function BacklogBulkToolbar() {
return () => document.removeEventListener("keydown", handleKeyDown);
}, [selectAll, clearSelection]);
- const handleMoveToBoard = async (status: string) => {
- try {
- await bulkMoveToBoard({
- taskIds: Array.from(selectedTaskIds),
- status,
- });
- toast.success(`${selectedCount} tasks moved to board`);
- clearSelection();
- } catch (_error) {
- toast.error("Failed to move tasks to board");
- }
- };
+ const handleMoveToBoard = useCallback(
+ async (status: string) => {
+ try {
+ await bulkMoveToBoard({
+ taskIds: Array.from(selectedTaskIds),
+ status,
+ });
+ toast.success(`${selectedCount} tasks moved to board`);
+ clearSelection();
+ } catch (_error) {
+ toast.error("Failed to move tasks to board");
+ }
+ },
+ [bulkMoveToBoard, selectedTaskIds, selectedCount, clearSelection],
+ );
- const handleBulkDelete = async () => {
+ const handleBulkDelete = useCallback(async () => {
if (
!confirm(`Delete ${selectedCount} tasks? This action cannot be undone.`)
) {
@@ -109,9 +119,9 @@ function BacklogBulkToolbar() {
} catch (_error) {
toast.error("Failed to delete tasks");
}
- };
+ }, [bulkDelete, selectedTaskIds, selectedCount, clearSelection]);
- const handleBulkArchive = async () => {
+ const handleBulkArchive = useCallback(async () => {
try {
await bulkArchive(Array.from(selectedTaskIds));
toast.success(`${selectedCount} tasks archived`);
@@ -120,20 +130,21 @@ function BacklogBulkToolbar() {
} catch (_error) {
toast.error("Failed to archive tasks");
}
- };
+ }, [bulkArchive, selectedTaskIds, selectedCount, clearSelection]);
- const handleBulkAssign = async (userId: string) => {
- try {
- await bulkAssign({ taskIds: Array.from(selectedTaskIds), userId });
- toast.success(`${selectedCount} tasks assigned`);
- clearSelection();
- setIsActionsOpen(false);
- } catch (_error) {
- toast.error("Failed to assign tasks");
- }
- };
-
- if (selectedCount === 0) return null;
+ const handleBulkAssign = useCallback(
+ async (userId: string) => {
+ try {
+ await bulkAssign({ taskIds: Array.from(selectedTaskIds), userId });
+ toast.success(`${selectedCount} tasks assigned`);
+ clearSelection();
+ setIsActionsOpen(false);
+ } catch (_error) {
+ toast.error("Failed to assign tasks");
+ }
+ },
+ [bulkAssign, selectedTaskIds, selectedCount, clearSelection],
+ );
const groupedItems = useMemo<BacklogActionGroup[]>(
() => [
@@ -182,9 +193,16 @@ function BacklogBulkToolbar() {
})),
},
],
- [workspaceUsers?.members],
+ [
+ workspaceUsers?.members,
+ handleBulkDelete,
+ handleBulkArchive,
+ handleBulkAssign,
+ ],
);
+ if (selectedCount === 0) return null;
+
return (
<div className="fixed bottom-6 left-1/2 transform -translate-x-1/2 z-50">
<div className="bg-background text-foreground rounded-xl shadow-lg px-2 py-2 flex items-center gap-1 border border-border">
@@ -263,7 +281,9 @@ function BacklogBulkToolbar() {
)}
</CommandCollection>
</CommandGroup>
- {groupIndex < groupedItems.length - 1 && <CommandSeparator />}
+ {groupIndex < groupedItems.length - 1 && (
+ <CommandSeparator />
+ )}
</Fragment>
)}
</CommandList>
diff --git a/apps/web/src/components/bulk-selection/bulk-toolbar.tsx b/apps/web/src/components/bulk-selection/bulk-toolbar.tsx
index 57c022615..213668b6c 100644
--- a/apps/web/src/components/bulk-selection/bulk-toolbar.tsx
+++ b/apps/web/src/components/bulk-selection/bulk-toolbar.tsx
@@ -1,6 +1,12 @@
import { Archive, ArrowDownToLine, Menu, Trash2, X } from "lucide-react";
-import { Fragment, type ReactNode, useEffect, useMemo, useState } from "react";
-import { toast } from "@/lib/toast";
+import {
+ Fragment,
+ type ReactNode,
+ useCallback,
+ useEffect,
+ useMemo,
+ useState,
+} from "react";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import {
Command,
@@ -20,6 +26,7 @@ import { useBulkOperations } from "@/hooks/mutations/task/use-bulk-operations";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";
import { getColumnIcon } from "@/lib/column";
+import { toast } from "@/lib/toast";
import useBulkSelectionStore from "@/store/bulk-selection";
import useProjectStore from "@/store/project";
import { Button } from "../ui/button";
@@ -73,7 +80,7 @@ function BulkToolbar() {
return () => document.removeEventListener("keydown", handleKeyDown);
}, [selectAll, clearSelection]);
- const handleMoveToBacklog = async () => {
+ const handleMoveToBacklog = useCallback(async () => {
try {
await bulkMoveToBacklog(Array.from(selectedTaskIds));
toast.success(`${selectedCount} tasks moved to backlog`);
@@ -81,9 +88,9 @@ function BulkToolbar() {
} catch (_error) {
toast.error("Failed to move tasks to backlog");
}
- };
+ }, [bulkMoveToBacklog, selectedTaskIds, selectedCount, clearSelection]);
- const handleBulkDelete = async () => {
+ const handleBulkDelete = useCallback(async () => {
if (
!confirm(`Delete ${selectedCount} tasks? This action cannot be undone.`)
) {
@@ -98,9 +105,9 @@ function BulkToolbar() {
} catch (_error) {
toast.error("Failed to delete tasks");
}
- };
+ }, [bulkDelete, selectedTaskIds, selectedCount, clearSelection]);
- const handleBulkArchive = async () => {
+ const handleBulkArchive = useCallback(async () => {
try {
await bulkArchive(Array.from(selectedTaskIds));
toast.success(`${selectedCount} tasks archived`);
@@ -109,31 +116,38 @@ function BulkToolbar() {
} catch (_error) {
toast.error("Failed to archive tasks");
}
- };
-
- const handleBulkChangeStatus = async (status: string) => {
- try {
- await bulkChangeStatus({ taskIds: Array.from(selectedTaskIds), status });
- toast.success(`${selectedCount} tasks updated`);
- clearSelection();
- setIsActionsOpen(false);
- } catch (_error) {
- toast.error("Failed to update tasks");
- }
- };
+ }, [bulkArchive, selectedTaskIds, selectedCount, clearSelection]);
- const handleBulkAssign = async (userId: string) => {
- try {
- await bulkAssign({ taskIds: Array.from(selectedTaskIds), userId });
- toast.success(`${selectedCount} tasks assigned`);
- clearSelection();
- setIsActionsOpen(false);
- } catch (_error) {
- toast.error("Failed to assign tasks");
- }
- };
+ const handleBulkChangeStatus = useCallback(
+ async (status: string) => {
+ try {
+ await bulkChangeStatus({
+ taskIds: Array.from(selectedTaskIds),
+ status,
+ });
+ toast.success(`${selectedCount} tasks updated`);
+ clearSelection();
+ setIsActionsOpen(false);
+ } catch (_error) {
+ toast.error("Failed to update tasks");
+ }
+ },
+ [bulkChangeStatus, selectedTaskIds, selectedCount, clearSelection],
+ );
- if (selectedCount === 0) return null;
+ const handleBulkAssign = useCallback(
+ async (userId: string) => {
+ try {
+ await bulkAssign({ taskIds: Array.from(selectedTaskIds), userId });
+ toast.success(`${selectedCount} tasks assigned`);
+ clearSelection();
+ setIsActionsOpen(false);
+ } catch (_error) {
+ toast.error("Failed to assign tasks");
+ }
+ },
+ [bulkAssign, selectedTaskIds, selectedCount, clearSelection],
+ );
const groupedItems = useMemo<BulkActionGroup[]>(
() => [
@@ -194,9 +208,18 @@ function BulkToolbar() {
})),
},
],
- [project?.columns, workspaceUsers?.members, selectedCount],
+ [
+ project?.columns,
+ workspaceUsers?.members,
+ handleBulkDelete,
+ handleBulkArchive,
+ handleBulkChangeStatus,
+ handleBulkAssign,
+ ],
);
+ if (selectedCount === 0) return null;
+
return (
<div className="fixed bottom-6 left-1/2 transform -translate-x-1/2 z-50">
<div className="bg-background text-foreground rounded-xl shadow-lg px-2 py-2 flex items-center gap-1 border border-border">
@@ -259,7 +282,9 @@ function BulkToolbar() {
)}
</CommandCollection>
</CommandGroup>
- {groupIndex < groupedItems.length - 1 && <CommandSeparator />}
+ {groupIndex < groupedItems.length - 1 && (
+ <CommandSeparator />
+ )}
</Fragment>
)}
</CommandList>
diff --git a/apps/web/src/components/command-palette/index.tsx b/apps/web/src/components/command-palette/index.tsx
index 399808794..56966dbaa 100644
--- a/apps/web/src/components/command-palette/index.tsx
+++ b/apps/web/src/components/command-palette/index.tsx
@@ -1,10 +1,6 @@
import { useNavigate } from "@tanstack/react-router";
-import {
- ArrowDownIcon,
- ArrowUpIcon,
- CornerDownLeftIcon,
-} from "lucide-react";
-import { Fragment, useEffect, useMemo, useState } from "react";
+import { ArrowDownIcon, ArrowUpIcon, CornerDownLeftIcon } from "lucide-react";
+import { Fragment, useCallback, useEffect, useMemo, useState } from "react";
import SearchCommandMenu from "@/components/search-command-menu";
import CreateTaskModal from "@/components/shared/modals/create-task-modal";
import CreateWorkspaceModal from "@/components/shared/modals/create-workspace-modal";
@@ -89,10 +85,10 @@ function CommandPalette() {
},
});
- const runCommand = (command: () => void) => {
+ const runCommand = useCallback((command: () => void) => {
command();
setOpen(false);
- };
+ }, []);
const groupedItems = useMemo<PaletteGroup[]>(
() => [
@@ -191,7 +187,10 @@ function CommandPalette() {
for (const group of groupedItems) {
for (const item of group.items) {
if (!item.shortcut) continue;
- handlers.set(item.shortcut.replace(/\s+/g, "").toLowerCase(), item.onRun);
+ handlers.set(
+ item.shortcut.replace(/\s+/g, "").toLowerCase(),
+ item.onRun,
+ );
}
}
return handlers;
@@ -204,7 +203,12 @@ function CommandPalette() {
let timeout: ReturnType<typeof setTimeout> | undefined;
const onKeyDown = (event: KeyboardEvent) => {
- if (event.metaKey || event.ctrlKey || event.altKey || event.key === "Shift") {
+ if (
+ event.metaKey ||
+ event.ctrlKey ||
+ event.altKey ||
+ event.key === "Shift"
+ ) {
return;
}
@@ -232,7 +236,7 @@ function CommandPalette() {
clearTimeout(timeout);
document.removeEventListener("keydown", onKeyDown);
};
- }, [open, shortcutHandlers]);
+ }, [open, shortcutHandlers, runCommand]);
return (
<>
@@ -258,14 +262,18 @@ function CommandPalette() {
>
<span className="flex-1">{item.label}</span>
{item.shortcut && (
- <CommandShortcut>{item.shortcut}</CommandShortcut>
+ <CommandShortcut>
+ {item.shortcut}
+ </CommandShortcut>
)}
</CommandItem>
);
}}
</CommandCollection>
</CommandGroup>
- {groupIndex < groupedItems.length - 1 && <CommandSeparator />}
+ {groupIndex < groupedItems.length - 1 && (
+ <CommandSeparator />
+ )}
</Fragment>
)}
</CommandList>
diff --git a/apps/web/src/components/kanban-board/task-card-context-menu/task-card-context-menu-content.tsx b/apps/web/src/components/kanban-board/task-card-context-menu/task-card-context-menu-content.tsx
index 15210eb34..ac3c656d6 100644
--- a/apps/web/src/components/kanban-board/task-card-context-menu/task-card-context-menu-content.tsx
+++ b/apps/web/src/components/kanban-board/task-card-context-menu/task-card-context-menu-content.tsx
@@ -1,6 +1,5 @@
import { X } from "lucide-react";
import { useMemo } from "react";
-import { toast } from "@/lib/toast";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Calendar } from "@/components/ui/calendar";
import {
@@ -23,6 +22,7 @@ import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-
import { getColumnIcon } from "@/lib/column";
import { generateLink } from "@/lib/generate-link";
import { getPriorityIcon } from "@/lib/priority";
+import { toast } from "@/lib/toast";
import useProjectStore from "@/store/project";
import type Task from "@/types/task";
diff --git a/apps/web/src/components/list-view/index.tsx b/apps/web/src/components/list-view/index.tsx
index 270ab0bd3..a308fbfd3 100644
--- a/apps/web/src/components/list-view/index.tsx
+++ b/apps/web/src/components/list-view/index.tsx
@@ -22,13 +22,13 @@ import { useNavigate } from "@tanstack/react-router";
import { produce } from "immer";
import { Archive, ChevronRight, Flag, Plus } from "lucide-react";
import { useEffect, useState } from "react";
-import { toast } from "@/lib/toast";
import { priorityColorsTaskCard } from "@/constants/priority-colors";
import { useUpdateTask } from "@/hooks/mutations/task/use-update-task";
import { useRegisterShortcuts } from "@/hooks/use-keyboard-shortcuts";
import { cn } from "@/lib/cn";
import { getColumnIcon } from "@/lib/column";
import toKebabCase from "@/lib/to-kebab-case";
+import { toast } from "@/lib/toast";
import useBulkSelectionStore from "@/store/bulk-selection";
import useProjectStore from "@/store/project";
import type { ProjectWithTasks } from "@/types/project";
@@ -266,8 +266,7 @@ function ListView({ project }: ListViewProps) {
<div
className={cn(
"border-b border-border/50 transition-all duration-200 overflow-auto",
- showDropIndicator &&
- "border-l-4 border-l-ring bg-accent/35",
+ showDropIndicator && "border-l-4 border-l-ring bg-accent/35",
)}
>
<div className="flex items-center justify-between py-2 px-4 bg-muted/60 border-b border-border/50">
diff --git a/apps/web/src/components/list-view/task-row.tsx b/apps/web/src/components/list-view/task-row.tsx
index 4663419cf..28874a630 100644
--- a/apps/web/src/components/list-view/task-row.tsx
+++ b/apps/web/src/components/list-view/task-row.tsx
@@ -10,11 +10,9 @@ import {
GitPullRequest,
} from "lucide-react";
import { type CSSProperties, useMemo, useState } from "react";
-import { toast } from "@/lib/toast";
import {
AlertDialog,
AlertDialogClose,
-
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -34,6 +32,7 @@ import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-
import { cn } from "@/lib/cn";
import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
import { getPriorityIcon } from "@/lib/priority";
+import { toast } from "@/lib/toast";
import queryClient from "@/query-client";
import useBulkSelectionStore from "@/store/bulk-selection";
import useProjectStore from "@/store/project";
diff --git a/apps/web/src/components/notification/notification-dropdown.tsx b/apps/web/src/components/notification/notification-dropdown.tsx
index a2a6f9d8c..b3b53f069 100644
--- a/apps/web/src/components/notification/notification-dropdown.tsx
+++ b/apps/web/src/components/notification/notification-dropdown.tsx
@@ -4,7 +4,6 @@ import { forwardRef, useImperativeHandle, useState } from "react";
import {
AlertDialog,
AlertDialogClose,
-
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -13,12 +12,12 @@ import {
} from "@/components/ui/alert-dialog";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
+import { KbdSequence } from "@/components/ui/kbd";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuTrigger,
} from "@/components/ui/menu";
-import { KbdSequence } from "@/components/ui/kbd";
import {
Tooltip,
TooltipContent,
diff --git a/apps/web/src/components/onboarding/onboarding-flow.tsx b/apps/web/src/components/onboarding/onboarding-flow.tsx
index 87b9745c9..db08cc9d6 100644
--- a/apps/web/src/components/onboarding/onboarding-flow.tsx
+++ b/apps/web/src/components/onboarding/onboarding-flow.tsx
@@ -5,9 +5,7 @@ import { AnimatePresence, motion } from "framer-motion";
import { CheckCircle2 } from "lucide-react";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod/v4";
-
import { Logo } from "@/components/common/logo";
import PageTitle from "@/components/page-title";
import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
@@ -23,6 +21,7 @@ import {
import { Input } from "@/components/ui/input";
import useCreateWorkspace from "@/hooks/queries/workspace/use-create-workspace";
import { authClient } from "@/lib/auth-client";
+import { toast } from "@/lib/toast";
type OnboardingStep = "workspace" | "success";
diff --git a/apps/web/src/components/profile-setup/profile-setup-flow.tsx b/apps/web/src/components/profile-setup/profile-setup-flow.tsx
index 5b369d51c..f978e09d4 100644
--- a/apps/web/src/components/profile-setup/profile-setup-flow.tsx
+++ b/apps/web/src/components/profile-setup/profile-setup-flow.tsx
@@ -5,9 +5,7 @@ import { AnimatePresence, motion } from "framer-motion";
import { CheckCircle2, User } from "lucide-react";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod/v4";
-
import { Logo } from "@/components/common/logo";
import PageTitle from "@/components/page-title";
import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
@@ -22,6 +20,7 @@ import {
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import useUpdateUserProfile from "@/hooks/mutations/use-update-user-profile";
+import { toast } from "@/lib/toast";
type ProfileSetupStep = "profile" | "success";
diff --git a/apps/web/src/components/project/column-editor.tsx b/apps/web/src/components/project/column-editor.tsx
index e14b0a0ac..8fafad7d8 100644
--- a/apps/web/src/components/project/column-editor.tsx
+++ b/apps/web/src/components/project/column-editor.tsx
@@ -1,6 +1,5 @@
import { CheckCircle2, Circle, GripVertical, Plus, Trash2 } from "lucide-react";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Switch } from "@/components/ui/switch";
@@ -9,6 +8,7 @@ import { useDeleteColumn } from "@/hooks/mutations/column/use-delete-column";
import { useReorderColumns } from "@/hooks/mutations/column/use-reorder-columns";
import { useUpdateColumn } from "@/hooks/mutations/column/use-update-column";
import { useGetColumns } from "@/hooks/queries/column/use-get-columns";
+import { toast } from "@/lib/toast";
type ColumnEditorProps = {
projectId: string;
diff --git a/apps/web/src/components/project/github-integration-settings.tsx b/apps/web/src/components/project/github-integration-settings.tsx
index 6caa53b14..d07409ae8 100644
--- a/apps/web/src/components/project/github-integration-settings.tsx
+++ b/apps/web/src/components/project/github-integration-settings.tsx
@@ -13,7 +13,6 @@ import {
} from "lucide-react";
import React from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { RepositoryBrowserModal } from "@/components/project/repository-browser-modal";
import { Badge } from "@/components/ui/badge";
@@ -37,6 +36,7 @@ import {
import useImportGithubIssues from "@/hooks/mutations/github-integration/use-import-github-issues";
import useGetGithubIntegration from "@/hooks/queries/github-integration/use-get-github-integration";
import { cn } from "@/lib/cn";
+import { toast } from "@/lib/toast";
const githubIntegrationSchema = z.object({
repositoryOwner: z
diff --git a/apps/web/src/components/project/tasks-import-export.tsx b/apps/web/src/components/project/tasks-import-export.tsx
index a7d468580..f7a190a3e 100644
--- a/apps/web/src/components/project/tasks-import-export.tsx
+++ b/apps/web/src/components/project/tasks-import-export.tsx
@@ -2,12 +2,17 @@ import { useQueryClient } from "@tanstack/react-query";
import { saveAs } from "file-saver";
import { Download, Loader2, Upload, X } from "lucide-react";
import { useRef, useState } from "react";
-import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
-import { Dialog, DialogClose, DialogPopup, DialogTitle } from "@/components/ui/dialog";
+import {
+ Dialog,
+ DialogClose,
+ DialogPopup,
+ DialogTitle,
+} from "@/components/ui/dialog";
import useExportTasks from "@/hooks/mutations/task/use-export-tasks";
import useImportTasks from "@/hooks/mutations/task/use-import-tasks";
import { cn } from "@/lib/cn";
+import { toast } from "@/lib/toast";
import type { ProjectWithTasks } from "@/types/project";
type TasksImportExportProps = {
@@ -154,32 +159,31 @@ export function TasksImportExport({ project }: TasksImportExportProps) {
</div>
<Dialog open={isImportOpen} onOpenChange={resetAndCloseModal}>
- <DialogPopup className="w-full max-w-md">
- <div className="bg-card rounded-lg shadow-xl border border-border">
- <div className="flex items-center justify-between p-4 border-b border-border">
- <DialogTitle className="text-lg font-semibold text-foreground">
- Import Tasks
- </DialogTitle>
- <DialogClose
- className="text-muted-foreground hover:text-foreground"
- render={<button type="button" />}
- >
- <X size={20} className="cursor-pointer" />
- </DialogClose>
- </div>
+ <DialogPopup className="w-full max-w-md">
+ <div className="bg-card rounded-lg shadow-xl border border-border">
+ <div className="flex items-center justify-between p-4 border-b border-border">
+ <DialogTitle className="text-lg font-semibold text-foreground">
+ Import Tasks
+ </DialogTitle>
+ <DialogClose
+ className="text-muted-foreground hover:text-foreground"
+ render={<button type="button" />}
+ >
+ <X size={20} className="cursor-pointer" />
+ </DialogClose>
+ </div>
- <div className="p-4">
- <p className="text-sm text-muted-foreground mb-2">
- Upload a JSON file containing tasks to import into this
- project.
- </p>
+ <div className="p-4">
+ <p className="text-sm text-muted-foreground mb-2">
+ Upload a JSON file containing tasks to import into this project.
+ </p>
- <div className="mb-4 p-3 bg-muted rounded-md border border-border/50 font-mono text-sm">
- <p className="text-muted-foreground mb-1 text-xs">
- Expected format:
- </p>
- <pre className="text-foreground overflow-auto max-h-32 text-xs">
- {`{
+ <div className="mb-4 p-3 bg-muted rounded-md border border-border/50 font-mono text-sm">
+ <p className="text-muted-foreground mb-1 text-xs">
+ Expected format:
+ </p>
+ <pre className="text-foreground overflow-auto max-h-32 text-xs">
+ {`{
"tasks": [
{
"title": "Task title",
@@ -191,53 +195,53 @@ export function TasksImportExport({ project }: TasksImportExportProps) {
}
]
}`}
- </pre>
- </div>
-
- {/** biome-ignore lint/a11y/noStaticElementInteractions: false positive for onDrop and onDragOver */}
- <div
- className={cn(
- "border-2 border-dashed rounded-lg p-8 text-center mb-4",
- "border-border",
- "hover:border-ring",
- "bg-muted/60",
- "transition-colors",
- )}
- onDrop={handleDrop}
- onDragOver={handleDragOver}
- >
- <div className="flex flex-col items-center justify-center gap-2">
- <Upload className="h-8 w-8 text-muted-foreground" />
- <p className="text-sm text-muted-foreground">
- Drag and drop your JSON file here
- </p>
- <Button
- className="mt-2 bg-card hover:bg-accent text-foreground border border-border"
- size="sm"
- onClick={handleImportClick}
- disabled={isImporting}
- >
- {isImporting ? (
- <Loader2 className="h-4 w-4 mr-2 animate-spin" />
- ) : (
- "Select File"
- )}
- </Button>
- </div>
- </div>
+ </pre>
+ </div>
- <div className="flex justify-end gap-2">
- <DialogClose
- render={
- <Button className="bg-card hover:bg-accent text-foreground border border-border" />
- }
+ {/** biome-ignore lint/a11y/noStaticElementInteractions: false positive for onDrop and onDragOver */}
+ <div
+ className={cn(
+ "border-2 border-dashed rounded-lg p-8 text-center mb-4",
+ "border-border",
+ "hover:border-ring",
+ "bg-muted/60",
+ "transition-colors",
+ )}
+ onDrop={handleDrop}
+ onDragOver={handleDragOver}
+ >
+ <div className="flex flex-col items-center justify-center gap-2">
+ <Upload className="h-8 w-8 text-muted-foreground" />
+ <p className="text-sm text-muted-foreground">
+ Drag and drop your JSON file here
+ </p>
+ <Button
+ className="mt-2 bg-card hover:bg-accent text-foreground border border-border"
+ size="sm"
+ onClick={handleImportClick}
+ disabled={isImporting}
>
- Cancel
- </DialogClose>
+ {isImporting ? (
+ <Loader2 className="h-4 w-4 mr-2 animate-spin" />
+ ) : (
+ "Select File"
+ )}
+ </Button>
</div>
</div>
+
+ <div className="flex justify-end gap-2">
+ <DialogClose
+ render={
+ <Button className="bg-card hover:bg-accent text-foreground border border-border" />
+ }
+ >
+ Cancel
+ </DialogClose>
+ </div>
</div>
- </DialogPopup>
+ </div>
+ </DialogPopup>
</Dialog>
</div>
);
diff --git a/apps/web/src/components/project/workflow-editor.tsx b/apps/web/src/components/project/workflow-editor.tsx
index 8e2c38db3..bcc306c40 100644
--- a/apps/web/src/components/project/workflow-editor.tsx
+++ b/apps/web/src/components/project/workflow-editor.tsx
@@ -1,4 +1,3 @@
-import { toast } from "@/lib/toast";
import {
Select,
SelectContent,
@@ -9,6 +8,7 @@ import {
import { useUpsertWorkflowRule } from "@/hooks/mutations/workflow-rule/use-upsert-workflow-rule";
import { useGetColumns } from "@/hooks/queries/column/use-get-columns";
import { useGetWorkflowRules } from "@/hooks/queries/workflow-rule/use-get-workflow-rules";
+import { toast } from "@/lib/toast";
const GITHUB_EVENTS = [
{ eventType: "branch_push", label: "Branch Push" },
diff --git a/apps/web/src/components/public-project/copy-url-button.tsx b/apps/web/src/components/public-project/copy-url-button.tsx
index 9eeef5a95..51177e59d 100644
--- a/apps/web/src/components/public-project/copy-url-button.tsx
+++ b/apps/web/src/components/public-project/copy-url-button.tsx
@@ -1,7 +1,7 @@
import { Check, Copy } from "lucide-react";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
+import { toast } from "@/lib/toast";
export function CopyUrlButton() {
const [copied, setCopied] = useState(false);
diff --git a/apps/web/src/components/public-project/task-detail-modal.tsx b/apps/web/src/components/public-project/task-detail-modal.tsx
index c8110ffb2..9738a68d2 100644
--- a/apps/web/src/components/public-project/task-detail-modal.tsx
+++ b/apps/web/src/components/public-project/task-detail-modal.tsx
@@ -10,7 +10,7 @@ import {
X,
} from "lucide-react";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
-import { Dialog, DialogClose, DialogPopup, DialogTitle } from "@/components/ui/dialog";
+import { Dialog, DialogClose, DialogPopup } from "@/components/ui/dialog";
import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
import { getPriorityIcon } from "@/lib/priority";
import type { ExternalLink } from "@/types/external-link";
@@ -73,215 +73,215 @@ export function PublicTaskDetailModal({
return (
<Dialog open={open} onOpenChange={onOpenChange}>
- <DialogPopup className="w-full max-w-3xl max-h-[85vh]">
- <div className="bg-background border border-border rounded-lg flex flex-col max-h-[85vh] shadow-lg">
- <div className="flex items-center justify-between p-4 border-b border-border shrink-0">
- <div className="flex items-center gap-2 min-w-0 flex-1">
- <span className="text-xs font-mono text-muted-foreground shrink-0">
- {projectSlug.toUpperCase()}-{task.number}
- </span>
- <span className="text-xs text-muted-foreground px-1.5 py-0.5 bg-muted rounded capitalize shrink-0">
- {task.status?.replace("-", " ")}
- </span>
- </div>
- <DialogClose
- className="shrink-0 p-1.5 hover:bg-muted rounded transition-colors"
- render={<button type="button" />}
- >
- <X className="w-4 h-4 text-muted-foreground" />
- </DialogClose>
+ <DialogPopup className="w-full max-w-3xl max-h-[85vh]">
+ <div className="bg-background border border-border rounded-lg flex flex-col max-h-[85vh] shadow-lg">
+ <div className="flex items-center justify-between p-4 border-b border-border shrink-0">
+ <div className="flex items-center gap-2 min-w-0 flex-1">
+ <span className="text-xs font-mono text-muted-foreground shrink-0">
+ {projectSlug.toUpperCase()}-{task.number}
+ </span>
+ <span className="text-xs text-muted-foreground px-1.5 py-0.5 bg-muted rounded capitalize shrink-0">
+ {task.status?.replace("-", " ")}
+ </span>
</div>
+ <DialogClose
+ className="shrink-0 p-1.5 hover:bg-muted rounded transition-colors"
+ render={<button type="button" />}
+ >
+ <X className="w-4 h-4 text-muted-foreground" />
+ </DialogClose>
+ </div>
- <div className="flex-1 overflow-y-auto p-6 space-y-6">
- <div className="space-y-4">
- <h2 className="text-xl font-semibold text-foreground pr-8">
- {task.title}
- </h2>
+ <div className="flex-1 overflow-y-auto p-6 space-y-6">
+ <div className="space-y-4">
+ <h2 className="text-xl font-semibold text-foreground pr-8">
+ {task.title}
+ </h2>
- <div className="flex flex-wrap gap-2">
- {task.priority && (
- <div className="flex items-center gap-1.5 px-2.5 py-1 text-xs bg-muted text-muted-foreground rounded-md">
- {getPriorityIcon(task.priority)}
- <span className="capitalize">{task.priority}</span>
- </div>
- )}
+ <div className="flex flex-wrap gap-2">
+ {task.priority && (
+ <div className="flex items-center gap-1.5 px-2.5 py-1 text-xs bg-muted text-muted-foreground rounded-md">
+ {getPriorityIcon(task.priority)}
+ <span className="capitalize">{task.priority}</span>
+ </div>
+ )}
- {task.dueDate && (
- <div
- className={`flex items-center gap-1.5 px-2.5 py-1 text-xs rounded-md ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
- >
- {getDueDateStatus(task.dueDate) === "overdue" && (
- <CalendarX className="w-3 h-3" />
- )}
- {getDueDateStatus(task.dueDate) === "due-soon" && (
- <CalendarClock className="w-3 h-3" />
- )}
- {(getDueDateStatus(task.dueDate) === "far-future" ||
- getDueDateStatus(task.dueDate) === "no-due-date") && (
- <Calendar className="w-3 h-3" />
- )}
- <span>Due {format(new Date(task.dueDate), "MMM d")}</span>
- </div>
- )}
+ {task.dueDate && (
+ <div
+ className={`flex items-center gap-1.5 px-2.5 py-1 text-xs rounded-md ${dueDateStatusColors[getDueDateStatus(task.dueDate)]}`}
+ >
+ {getDueDateStatus(task.dueDate) === "overdue" && (
+ <CalendarX className="w-3 h-3" />
+ )}
+ {getDueDateStatus(task.dueDate) === "due-soon" && (
+ <CalendarClock className="w-3 h-3" />
+ )}
+ {(getDueDateStatus(task.dueDate) === "far-future" ||
+ getDueDateStatus(task.dueDate) === "no-due-date") && (
+ <Calendar className="w-3 h-3" />
+ )}
+ <span>Due {format(new Date(task.dueDate), "MMM d")}</span>
+ </div>
+ )}
- {task.assigneeName && (
- <div className="flex items-center gap-2 px-2.5 py-1 text-xs bg-muted text-muted-foreground rounded-md">
- <Avatar className="h-4 w-4">
- <AvatarImage
- src={task.assigneeImage ?? ""}
- alt={task.assigneeName ?? ""}
- />
- <AvatarFallback className="text-[10px]">
- {task.assigneeName.charAt(0).toUpperCase()}
- </AvatarFallback>
- </Avatar>
- <span>{task.assigneeName}</span>
- </div>
- )}
- </div>
+ {task.assigneeName && (
+ <div className="flex items-center gap-2 px-2.5 py-1 text-xs bg-muted text-muted-foreground rounded-md">
+ <Avatar className="h-4 w-4">
+ <AvatarImage
+ src={task.assigneeImage ?? ""}
+ alt={task.assigneeName ?? ""}
+ />
+ <AvatarFallback className="text-[10px]">
+ {task.assigneeName.charAt(0).toUpperCase()}
+ </AvatarFallback>
+ </Avatar>
+ <span>{task.assigneeName}</span>
+ </div>
+ )}
</div>
+ </div>
- {labels.length > 0 && (
- <div className="space-y-2">
- <h3 className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
- Labels
- </h3>
- <PublicTaskLabels labels={labels} />
- </div>
- )}
+ {labels.length > 0 && (
+ <div className="space-y-2">
+ <h3 className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
+ Labels
+ </h3>
+ <PublicTaskLabels labels={labels} />
+ </div>
+ )}
- {task.description && (
- <div className="space-y-2">
- <h3 className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
- Description
- </h3>
- <div className="text-sm text-foreground leading-relaxed bg-muted/30 p-4 rounded-md border border-border/50">
- <MarkdownRenderer content={task.description} />
- </div>
+ {task.description && (
+ <div className="space-y-2">
+ <h3 className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
+ Description
+ </h3>
+ <div className="text-sm text-foreground leading-relaxed bg-muted/30 p-4 rounded-md border border-border/50">
+ <MarkdownRenderer content={task.description} />
</div>
- )}
-
- {externalLinks.length > 0 && (
- <div className="space-y-3">
- <h3 className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
- External Links
- </h3>
+ </div>
+ )}
- {pullRequests.length > 0 && (
- <div className="space-y-2">
- {pullRequests.map((pr) => {
- const status = getPRStatus(pr);
- const repoMatch = pr.url.match(
- /github\.com\/([^/]+\/[^/]+)\/pull/,
- );
- const repoName = repoMatch ? repoMatch[1] : null;
- return (
- <a
- key={pr.id}
- href={pr.url}
- target="_blank"
- rel="noopener noreferrer"
- className="flex items-center justify-between p-3 bg-muted/50 hover:bg-muted rounded-md border border-border/50 transition-colors group"
- >
- <div className="flex items-center gap-2.5 flex-1 min-w-0">
- <div className="flex flex-col gap-0.5 flex-1 min-w-0">
- <span className="text-sm font-medium text-foreground truncate">
- {pr.title || "Pull Request"}
- </span>
- <span className="text-xs text-muted-foreground">
- {repoName}#{pr.externalId}
- </span>
- </div>
- </div>
- <div className="flex items-center gap-2 shrink-0">
- <span
- className={`text-xs font-medium flex items-center gap-1 ${status.className}`}
- >
- {status.icon}
- {status.label}
- </span>
- <ExternalLinkIcon className="w-3.5 h-3.5 text-muted-foreground opacity-0 group-hover:opacity-100 transition-opacity" />
- </div>
- </a>
- );
- })}
- </div>
- )}
+ {externalLinks.length > 0 && (
+ <div className="space-y-3">
+ <h3 className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
+ External Links
+ </h3>
- {issues.length > 0 && (
- <div className="space-y-2">
- {issues.map((issue) => (
+ {pullRequests.length > 0 && (
+ <div className="space-y-2">
+ {pullRequests.map((pr) => {
+ const status = getPRStatus(pr);
+ const repoMatch = pr.url.match(
+ /github\.com\/([^/]+\/[^/]+)\/pull/,
+ );
+ const repoName = repoMatch ? repoMatch[1] : null;
+ return (
<a
- key={issue.id}
- href={issue.url}
+ key={pr.id}
+ href={pr.url}
target="_blank"
rel="noopener noreferrer"
className="flex items-center justify-between p-3 bg-muted/50 hover:bg-muted rounded-md border border-border/50 transition-colors group"
>
<div className="flex items-center gap-2.5 flex-1 min-w-0">
- <GitPullRequest className="w-3.5 h-3.5 text-muted-foreground" />
<div className="flex flex-col gap-0.5 flex-1 min-w-0">
<span className="text-sm font-medium text-foreground truncate">
- {issue.title || "Issue"}
+ {pr.title || "Pull Request"}
</span>
<span className="text-xs text-muted-foreground">
- #{issue.externalId}
+ {repoName}#{pr.externalId}
</span>
</div>
</div>
- <ExternalLinkIcon className="w-3.5 h-3.5 text-muted-foreground opacity-0 group-hover:opacity-100 transition-opacity" />
+ <div className="flex items-center gap-2 shrink-0">
+ <span
+ className={`text-xs font-medium flex items-center gap-1 ${status.className}`}
+ >
+ {status.icon}
+ {status.label}
+ </span>
+ <ExternalLinkIcon className="w-3.5 h-3.5 text-muted-foreground opacity-0 group-hover:opacity-100 transition-opacity" />
+ </div>
</a>
- ))}
- </div>
- )}
+ );
+ })}
+ </div>
+ )}
- {branches.length > 0 && (
- <div className="space-y-2">
- {branches.map((branch) => (
- <a
- key={branch.id}
- href={branch.url}
- target="_blank"
- rel="noopener noreferrer"
- className="flex items-center justify-between p-3 bg-muted/50 hover:bg-muted rounded-md border border-border/50 transition-colors group"
- >
- <div className="flex items-center gap-2.5 flex-1 min-w-0">
- <GitBranch className="w-3.5 h-3.5 text-muted-foreground" />
+ {issues.length > 0 && (
+ <div className="space-y-2">
+ {issues.map((issue) => (
+ <a
+ key={issue.id}
+ href={issue.url}
+ target="_blank"
+ rel="noopener noreferrer"
+ className="flex items-center justify-between p-3 bg-muted/50 hover:bg-muted rounded-md border border-border/50 transition-colors group"
+ >
+ <div className="flex items-center gap-2.5 flex-1 min-w-0">
+ <GitPullRequest className="w-3.5 h-3.5 text-muted-foreground" />
+ <div className="flex flex-col gap-0.5 flex-1 min-w-0">
<span className="text-sm font-medium text-foreground truncate">
- {branch.title || branch.externalId}
+ {issue.title || "Issue"}
+ </span>
+ <span className="text-xs text-muted-foreground">
+ #{issue.externalId}
</span>
</div>
- <ExternalLinkIcon className="w-3.5 h-3.5 text-muted-foreground opacity-0 group-hover:opacity-100 transition-opacity" />
- </a>
- ))}
- </div>
- )}
- </div>
- )}
+ </div>
+ <ExternalLinkIcon className="w-3.5 h-3.5 text-muted-foreground opacity-0 group-hover:opacity-100 transition-opacity" />
+ </a>
+ ))}
+ </div>
+ )}
- <div className="grid grid-cols-2 gap-4 pt-4 border-t border-border/50">
+ {branches.length > 0 && (
+ <div className="space-y-2">
+ {branches.map((branch) => (
+ <a
+ key={branch.id}
+ href={branch.url}
+ target="_blank"
+ rel="noopener noreferrer"
+ className="flex items-center justify-between p-3 bg-muted/50 hover:bg-muted rounded-md border border-border/50 transition-colors group"
+ >
+ <div className="flex items-center gap-2.5 flex-1 min-w-0">
+ <GitBranch className="w-3.5 h-3.5 text-muted-foreground" />
+ <span className="text-sm font-medium text-foreground truncate">
+ {branch.title || branch.externalId}
+ </span>
+ </div>
+ <ExternalLinkIcon className="w-3.5 h-3.5 text-muted-foreground opacity-0 group-hover:opacity-100 transition-opacity" />
+ </a>
+ ))}
+ </div>
+ )}
+ </div>
+ )}
+
+ <div className="grid grid-cols-2 gap-4 pt-4 border-t border-border/50">
+ <div>
+ <div className="text-xs text-muted-foreground mb-1">
+ Created
+ </div>
+ <div className="text-sm text-foreground">
+ {format(new Date(task.createdAt), "MMM d, yyyy")}
+ </div>
+ </div>
+ {task.dueDate && (
<div>
<div className="text-xs text-muted-foreground mb-1">
- Created
+ Due Date
</div>
<div className="text-sm text-foreground">
- {format(new Date(task.createdAt), "MMM d, yyyy")}
+ {format(new Date(task.dueDate), "MMM d, yyyy")}
</div>
</div>
- {task.dueDate && (
- <div>
- <div className="text-xs text-muted-foreground mb-1">
- Due Date
- </div>
- <div className="text-sm text-foreground">
- {format(new Date(task.dueDate), "MMM d, yyyy")}
- </div>
- </div>
- )}
- </div>
+ )}
</div>
</div>
- </DialogPopup>
+ </div>
+ </DialogPopup>
</Dialog>
);
}
diff --git a/apps/web/src/components/settings/api-key-table.tsx b/apps/web/src/components/settings/api-key-table.tsx
index ba5db5568..45baeca4a 100644
--- a/apps/web/src/components/settings/api-key-table.tsx
+++ b/apps/web/src/components/settings/api-key-table.tsx
@@ -1,7 +1,7 @@
import { Trash2 } from "lucide-react";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import useDeleteApiKey from "@/hooks/mutations/api-key/use-delete-api-key";
+import { toast } from "@/lib/toast";
import type { ApiKey } from "@/types/api-key";
import { Button } from "../ui/button";
import {
diff --git a/apps/web/src/components/settings/create-api-key-dialog.tsx b/apps/web/src/components/settings/create-api-key-dialog.tsx
index af0242253..46963a38f 100644
--- a/apps/web/src/components/settings/create-api-key-dialog.tsx
+++ b/apps/web/src/components/settings/create-api-key-dialog.tsx
@@ -1,9 +1,9 @@
import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod";
import useCreateApiKey from "@/hooks/mutations/api-key/use-create-api-key";
+import { toast } from "@/lib/toast";
import type { CreateApiKeyResponse } from "@/types/api-key";
import { Button } from "../ui/button";
import {
diff --git a/apps/web/src/components/shared/modals/create-project-modal.tsx b/apps/web/src/components/shared/modals/create-project-modal.tsx
index a95fbe381..b7023f19f 100644
--- a/apps/web/src/components/shared/modals/create-project-modal.tsx
+++ b/apps/web/src/components/shared/modals/create-project-modal.tsx
@@ -1,7 +1,6 @@
import { useQueryClient } from "@tanstack/react-query";
import { useNavigate } from "@tanstack/react-router";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import {
Breadcrumb,
BreadcrumbItem,
@@ -28,6 +27,7 @@ import useCreateProject from "@/hooks/mutations/project/use-create-project";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { cn } from "@/lib/cn";
import generateProjectSlug from "@/lib/generate-project-id";
+import { toast } from "@/lib/toast";
type CreateProjectModalProps = {
open: boolean;
diff --git a/apps/web/src/components/shared/modals/create-task-modal.tsx b/apps/web/src/components/shared/modals/create-task-modal.tsx
index b65f9c092..ec401b738 100644
--- a/apps/web/src/components/shared/modals/create-task-modal.tsx
+++ b/apps/web/src/components/shared/modals/create-task-modal.tsx
@@ -10,7 +10,6 @@ import {
X,
} from "lucide-react";
import { useCallback, useEffect, useRef, useState } from "react";
-import { toast } from "@/lib/toast";
import TaskDescriptionEditor from "@/components/task/task-description-editor";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Badge } from "@/components/ui/badge";
@@ -42,6 +41,7 @@ import useGetLabelsByWorkspace from "@/hooks/queries/label/use-get-labels-by-wor
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { cn } from "@/lib/cn";
import { getPriorityIcon } from "@/lib/priority";
+import { toast } from "@/lib/toast";
import useProjectStore from "@/store/project";
type CreateTaskModalProps = {
@@ -75,15 +75,51 @@ type Label = {
type PopoverStep = "select" | "color";
const labelColors = [
- { value: "gray" as LabelColor, label: "Stone", color: "var(--color-stone-500)" },
- { value: "dark-gray" as LabelColor, label: "Slate", color: "var(--color-slate-500)" },
- { value: "purple" as LabelColor, label: "Lavender", color: "var(--color-violet-500)" },
- { value: "teal" as LabelColor, label: "Sage", color: "var(--color-emerald-600)" },
- { value: "green" as LabelColor, label: "Forest", color: "var(--color-green-600)" },
- { value: "yellow" as LabelColor, label: "Amber", color: "var(--color-amber-600)" },
- { value: "orange" as LabelColor, label: "Terracotta", color: "var(--color-orange-600)" },
- { value: "pink" as LabelColor, label: "Rose", color: "var(--color-rose-600)" },
- { value: "red" as LabelColor, label: "Crimson", color: "var(--color-red-600)" },
+ {
+ value: "gray" as LabelColor,
+ label: "Stone",
+ color: "var(--color-stone-500)",
+ },
+ {
+ value: "dark-gray" as LabelColor,
+ label: "Slate",
+ color: "var(--color-slate-500)",
+ },
+ {
+ value: "purple" as LabelColor,
+ label: "Lavender",
+ color: "var(--color-violet-500)",
+ },
+ {
+ value: "teal" as LabelColor,
+ label: "Sage",
+ color: "var(--color-emerald-600)",
+ },
+ {
+ value: "green" as LabelColor,
+ label: "Forest",
+ color: "var(--color-green-600)",
+ },
+ {
+ value: "yellow" as LabelColor,
+ label: "Amber",
+ color: "var(--color-amber-600)",
+ },
+ {
+ value: "orange" as LabelColor,
+ label: "Terracotta",
+ color: "var(--color-orange-600)",
+ },
+ {
+ value: "pink" as LabelColor,
+ label: "Rose",
+ color: "var(--color-rose-600)",
+ },
+ {
+ value: "red" as LabelColor,
+ label: "Crimson",
+ color: "var(--color-red-600)",
+ },
];
function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
diff --git a/apps/web/src/components/shared/modals/create-workspace-modal.tsx b/apps/web/src/components/shared/modals/create-workspace-modal.tsx
index dba8b0df4..aba4fea9a 100644
--- a/apps/web/src/components/shared/modals/create-workspace-modal.tsx
+++ b/apps/web/src/components/shared/modals/create-workspace-modal.tsx
@@ -1,7 +1,6 @@
import { useQueryClient } from "@tanstack/react-query";
import { useNavigate } from "@tanstack/react-router";
import { useEffect, useRef, useState } from "react";
-import { toast } from "@/lib/toast";
import {
Breadcrumb,
BreadcrumbItem,
@@ -20,6 +19,7 @@ import {
import { Input } from "@/components/ui/input";
import useCreateWorkspace from "@/hooks/queries/workspace/use-create-workspace";
import { authClient } from "@/lib/auth-client";
+import { toast } from "@/lib/toast";
type CreateWorkspaceModalProps = {
open: boolean;
diff --git a/apps/web/src/components/task/task-assignee-popover.tsx b/apps/web/src/components/task/task-assignee-popover.tsx
index b428714ab..3706d345d 100644
--- a/apps/web/src/components/task/task-assignee-popover.tsx
+++ b/apps/web/src/components/task/task-assignee-popover.tsx
@@ -1,6 +1,5 @@
import { Check } from "lucide-react";
import { useCallback, useMemo, useState } from "react";
-import { toast } from "@/lib/toast";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Button } from "@/components/ui/button";
import {
@@ -12,6 +11,7 @@ import { ShortcutNumber } from "@/components/ui/shortcut-number";
import { useUpdateTaskAssignee } from "@/hooks/mutations/task/use-update-task-assignee";
import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";
import { useNumberedShortcuts } from "@/hooks/use-numbered-shortcuts";
+import { toast } from "@/lib/toast";
import type Task from "@/types/task";
type TaskAssigneePopoverProps = {
diff --git a/apps/web/src/components/task/task-description-editor.tsx b/apps/web/src/components/task/task-description-editor.tsx
index 4fc6fec52..898fbc704 100644
--- a/apps/web/src/components/task/task-description-editor.tsx
+++ b/apps/web/src/components/task/task-description-editor.tsx
@@ -23,9 +23,8 @@ import {
Type,
Underline,
} from "lucide-react";
-
-import { Button } from "@/components/ui/button";
import CustomSlashMenu from "@/components/blocknote/custom-slash-menu";
+import { Button } from "@/components/ui/button";
import { KbdSequence } from "@/components/ui/kbd";
import {
Tooltip,
diff --git a/apps/web/src/components/task/task-description.tsx b/apps/web/src/components/task/task-description.tsx
index 71084aed8..a22f6cabe 100644
--- a/apps/web/src/components/task/task-description.tsx
+++ b/apps/web/src/components/task/task-description.tsx
@@ -24,9 +24,8 @@ import {
Type,
Underline,
} from "lucide-react";
-
-import { Button } from "@/components/ui/button";
import CustomSlashMenu from "@/components/blocknote/custom-slash-menu";
+import { Button } from "@/components/ui/button";
import { Form, FormControl, FormField } from "@/components/ui/form";
import { KbdSequence } from "@/components/ui/kbd";
import {
diff --git a/apps/web/src/components/task/task-due-date-popover.tsx b/apps/web/src/components/task/task-due-date-popover.tsx
index 36f5c1847..ee21dcef7 100644
--- a/apps/web/src/components/task/task-due-date-popover.tsx
+++ b/apps/web/src/components/task/task-due-date-popover.tsx
@@ -1,6 +1,5 @@
import { X } from "lucide-react";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
import { Calendar } from "@/components/ui/calendar";
import {
@@ -9,6 +8,7 @@ import {
PopoverTrigger,
} from "@/components/ui/popover";
import { useUpdateTaskDueDate } from "@/hooks/mutations/task/use-update-task-due-date";
+import { toast } from "@/lib/toast";
import type Task from "@/types/task";
type TaskDueDatePopoverProps = {
diff --git a/apps/web/src/components/task/task-labels-popover.tsx b/apps/web/src/components/task/task-labels-popover.tsx
index bef487b0e..f22877d6d 100644
--- a/apps/web/src/components/task/task-labels-popover.tsx
+++ b/apps/web/src/components/task/task-labels-popover.tsx
@@ -1,7 +1,6 @@
import { useQueryClient } from "@tanstack/react-query";
import { Check, Plus, Search, X } from "lucide-react";
import { useEffect, useMemo, useRef, useState } from "react";
-import { toast } from "@/lib/toast";
import { Input } from "@/components/ui/input";
import {
Popover,
@@ -13,6 +12,7 @@ import useDeleteLabel from "@/hooks/mutations/label/use-delete-label";
import useGetLabelsByTask from "@/hooks/queries/label/use-get-labels-by-task";
import useGetLabelsByWorkspace from "@/hooks/queries/label/use-get-labels-by-workspace";
import { cn } from "@/lib/cn";
+import { toast } from "@/lib/toast";
import type Task from "@/types/task";
const labelColors = [
diff --git a/apps/web/src/components/task/task-priority-popover.tsx b/apps/web/src/components/task/task-priority-popover.tsx
index d11f58ac9..d78ccae03 100644
--- a/apps/web/src/components/task/task-priority-popover.tsx
+++ b/apps/web/src/components/task/task-priority-popover.tsx
@@ -1,6 +1,5 @@
import { Check } from "lucide-react";
import { useCallback, useMemo, useState } from "react";
-import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
import {
Popover,
@@ -11,6 +10,7 @@ import { ShortcutNumber } from "@/components/ui/shortcut-number";
import { useUpdateTaskPriority } from "@/hooks/mutations/task/use-update-task-status-priority";
import { useNumberedShortcuts } from "@/hooks/use-numbered-shortcuts";
import { getPriorityIcon } from "@/lib/priority";
+import { toast } from "@/lib/toast";
import type Task from "@/types/task";
type TaskPriorityPopoverProps = {
diff --git a/apps/web/src/components/task/task-properties-sidebar.tsx b/apps/web/src/components/task/task-properties-sidebar.tsx
index 62530e5d2..9a39d73cc 100644
--- a/apps/web/src/components/task/task-properties-sidebar.tsx
+++ b/apps/web/src/components/task/task-properties-sidebar.tsx
@@ -7,7 +7,6 @@ import {
GitBranch,
Plus,
} from "lucide-react";
-import { toast } from "@/lib/toast";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
@@ -27,6 +26,7 @@ import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-
import { getColumnIcon } from "@/lib/column";
import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
import { getPriorityIcon } from "@/lib/priority";
+import { toast } from "@/lib/toast";
import TaskAssigneePopover from "./task-assignee-popover";
import TaskDueDatePopover from "./task-due-date-popover";
import TaskLabelsPopover from "./task-labels-popover";
diff --git a/apps/web/src/components/task/task-status-popover.tsx b/apps/web/src/components/task/task-status-popover.tsx
index be7afe857..17388faaa 100644
--- a/apps/web/src/components/task/task-status-popover.tsx
+++ b/apps/web/src/components/task/task-status-popover.tsx
@@ -1,6 +1,5 @@
import { Check } from "lucide-react";
import { useCallback, useMemo, useState } from "react";
-import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
import {
Popover,
@@ -11,6 +10,7 @@ import { ShortcutNumber } from "@/components/ui/shortcut-number";
import { useUpdateTaskStatus } from "@/hooks/mutations/task/use-update-task-status";
import { useNumberedShortcuts } from "@/hooks/use-numbered-shortcuts";
import { getColumnIcon } from "@/lib/column";
+import { toast } from "@/lib/toast";
import useProjectStore from "@/store/project";
import type Task from "@/types/task";
diff --git a/apps/web/src/components/team/delete-team-member-modal.tsx b/apps/web/src/components/team/delete-team-member-modal.tsx
index 17fd3c9fe..09616a7a4 100644
--- a/apps/web/src/components/team/delete-team-member-modal.tsx
+++ b/apps/web/src/components/team/delete-team-member-modal.tsx
@@ -34,46 +34,44 @@ function DeleteTeamMemberModal({
return (
<Dialog open={open} onOpenChange={onClose}>
<DialogPopup className="w-full max-w-md">
- <div className="bg-card rounded-lg shadow-xl">
- <div className="flex items-center justify-between p-4 border-b border-border">
- <DialogTitle className="text-lg font-semibold text-foreground">
- Remove Team Member
- </DialogTitle>
+ <div className="bg-card rounded-lg shadow-xl">
+ <div className="flex items-center justify-between p-4 border-b border-border">
+ <DialogTitle className="text-lg font-semibold text-foreground">
+ Remove Team Member
+ </DialogTitle>
+ <DialogClose
+ className="text-muted-foreground hover:text-foreground"
+ render={<button type="button" />}
+ >
+ <X size={20} />
+ </DialogClose>
+ </div>
+
+ <div className="p-4">
+ <p className="text-sm text-muted-foreground mb-6">
+ Are you sure you want to remove{" "}
+ <span className="font-medium text-foreground">{userId}</span> from
+ the team? This action cannot be undone.
+ </p>
+
+ <div className="flex justify-end gap-2">
<DialogClose
- className="text-muted-foreground hover:text-foreground"
- render={<button type="button" />}
+ render={
+ <Button
+ className="bg-muted text-foreground hover:bg-accent"
+ type="button"
+ />
+ }
>
- <X size={20} />
+ Cancel
</DialogClose>
- </div>
-
- <div className="p-4">
- <p className="text-sm text-muted-foreground mb-6">
- Are you sure you want to remove{" "}
- <span className="font-medium text-foreground">
- {userId}
- </span>{" "}
- from the team? This action cannot be undone.
- </p>
-
- <div className="flex justify-end gap-2">
- <DialogClose
- render={
- <Button className="bg-muted text-foreground hover:bg-accent" type="button" />
- }
- >
- Cancel
- </DialogClose>
- <Button
- onClick={onRemoveMember}
- variant="destructive"
- >
- <Trash2 className="w-4 h-4 mr-2" />
- Remove Member
- </Button>
- </div>
+ <Button onClick={onRemoveMember} variant="destructive">
+ <Trash2 className="w-4 h-4 mr-2" />
+ Remove Member
+ </Button>
</div>
</div>
+ </div>
</DialogPopup>
</Dialog>
);
diff --git a/apps/web/src/components/team/invite-team-member-modal.tsx b/apps/web/src/components/team/invite-team-member-modal.tsx
index d10c3ff60..6d215389d 100644
--- a/apps/web/src/components/team/invite-team-member-modal.tsx
+++ b/apps/web/src/components/team/invite-team-member-modal.tsx
@@ -2,11 +2,12 @@ import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
import { useQueryClient } from "@tanstack/react-query";
import { X } from "lucide-react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import useInviteWorkspaceUser from "@/hooks/mutations/workspace-user/use-invite-workspace-user";
+import { toast } from "@/lib/toast";
import { Route } from "@/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/members";
import { Button } from "../ui/button";
+import { Dialog, DialogClose, DialogPopup, DialogTitle } from "../ui/dialog";
import {
Form,
FormControl,
@@ -16,7 +17,6 @@ import {
FormMessage,
} from "../ui/form";
import { Input } from "../ui/input";
-import { Dialog, DialogClose, DialogPopup, DialogTitle } from "../ui/dialog";
type Props = {
open: boolean;
@@ -74,61 +74,62 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
return (
<Dialog open={open} onOpenChange={resetAndCloseModal}>
<DialogPopup className="w-full max-w-md">
- <div className="bg-card rounded-lg shadow-xl">
- <div className="flex items-center justify-between p-4 border-b border-border">
- <DialogTitle className="text-lg font-semibold text-foreground">
- Invite Team Member
- </DialogTitle>
- <DialogClose
- className="text-muted-foreground hover:text-foreground"
- render={<button type="button" />}
- >
- <X size={20} />
- </DialogClose>
- </div>
+ <div className="bg-card rounded-lg shadow-xl">
+ <div className="flex items-center justify-between p-4 border-b border-border">
+ <DialogTitle className="text-lg font-semibold text-foreground">
+ Invite Team Member
+ </DialogTitle>
+ <DialogClose
+ className="text-muted-foreground hover:text-foreground"
+ render={<button type="button" />}
+ >
+ <X size={20} />
+ </DialogClose>
+ </div>
- <Form {...form}>
- <form onSubmit={form.handleSubmit(onSubmit)} className="p-4">
- <div className="space-y-4">
- <div>
- <FormField
- control={form.control}
- name="email"
- render={({ field }) => (
- <FormItem>
- <FormLabel className="block text-sm font-medium text-foreground mb-1">
- Email
- </FormLabel>
- <FormControl>
- <Input
- {...field}
- placeholder="[email protected]"
- className="bg-card/50"
- autoFocus
- />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- </div>
+ <Form {...form}>
+ <form onSubmit={form.handleSubmit(onSubmit)} className="p-4">
+ <div className="space-y-4">
+ <div>
+ <FormField
+ control={form.control}
+ name="email"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel className="block text-sm font-medium text-foreground mb-1">
+ Email
+ </FormLabel>
+ <FormControl>
+ <Input
+ {...field}
+ placeholder="[email protected]"
+ className="bg-card/50"
+ autoFocus
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
</div>
+ </div>
- <div className="flex justify-end gap-2 mt-6">
- <DialogClose
- render={
- <Button className="bg-muted text-foreground hover:bg-accent" type="button" />
- }
- >
- Cancel
- </DialogClose>
- <Button type="submit">
- Send Invitation
- </Button>
- </div>
- </form>
- </Form>
- </div>
+ <div className="flex justify-end gap-2 mt-6">
+ <DialogClose
+ render={
+ <Button
+ className="bg-muted text-foreground hover:bg-accent"
+ type="button"
+ />
+ }
+ >
+ Cancel
+ </DialogClose>
+ <Button type="submit">Send Invitation</Button>
+ </div>
+ </form>
+ </Form>
+ </div>
</DialogPopup>
</Dialog>
);
diff --git a/apps/web/src/components/team/members-table.tsx b/apps/web/src/components/team/members-table.tsx
index 30a9eddd6..a6988c7e0 100644
--- a/apps/web/src/components/team/members-table.tsx
+++ b/apps/web/src/components/team/members-table.tsx
@@ -1,8 +1,8 @@
import { Trash2 } from "lucide-react";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import useCancelInvitation from "@/hooks/mutations/workspace-user/use-cancel-invitation";
import useDeleteWorkspaceUser from "@/hooks/mutations/workspace-user/use-delete-workspace-user";
+import { toast } from "@/lib/toast";
import { Route } from "@/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/members";
import type {
WorkspaceUser,
@@ -12,7 +12,6 @@ import { useAuth } from "../providers/auth-provider/hooks/use-auth";
import {
AlertDialog,
AlertDialogClose,
-
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -277,9 +276,7 @@ function MembersTable({
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogClose disabled={isCancelling}>
- Cancel
- </AlertDialogClose>
+ <AlertDialogClose disabled={isCancelling}>Cancel</AlertDialogClose>
<AlertDialogClose
onClick={handleCancelInvitation}
disabled={isCancelling}
diff --git a/apps/web/src/components/ui/autocomplete.tsx b/apps/web/src/components/ui/autocomplete.tsx
index f7c2a8f44..a9b38da83 100644
--- a/apps/web/src/components/ui/autocomplete.tsx
+++ b/apps/web/src/components/ui/autocomplete.tsx
@@ -2,10 +2,9 @@
import { Autocomplete as AutocompletePrimitive } from "@base-ui/react/autocomplete";
import { ChevronsUpDownIcon, XIcon } from "lucide-react";
-
-import { cn } from "@/lib/cn";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
+import { cn } from "@/lib/cn";
const Autocomplete = AutocompletePrimitive.Root;
diff --git a/apps/web/src/components/ui/badge.tsx b/apps/web/src/components/ui/badge.tsx
index ca532be2e..6f42a715a 100644
--- a/apps/web/src/components/ui/badge.tsx
+++ b/apps/web/src/components/ui/badge.tsx
@@ -23,8 +23,7 @@ const badgeVariants = cva(
variant: {
default:
"bg-primary text-primary-foreground [button&,a&]:hover:bg-primary/90",
- destructive:
- "bg-destructive [button&,a&]:hover:bg-destructive/90",
+ destructive: "bg-destructive [button&,a&]:hover:bg-destructive/90",
error:
"bg-destructive/8 text-destructive-foreground dark:bg-destructive/16",
info: "bg-info/8 text-info-foreground dark:bg-info/16",
diff --git a/apps/web/src/components/ui/checkbox.tsx b/apps/web/src/components/ui/checkbox.tsx
index 78b41717f..661c0ceac 100644
--- a/apps/web/src/components/ui/checkbox.tsx
+++ b/apps/web/src/components/ui/checkbox.tsx
@@ -21,6 +21,7 @@ function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
<span {...props}>
{state.indeterminate ? (
<svg
+ aria-hidden="true"
className="size-3.5 sm:size-3"
fill="none"
height="24"
@@ -36,6 +37,7 @@ function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
</svg>
) : (
<svg
+ aria-hidden="true"
className="size-3.5 sm:size-3"
fill="none"
height="24"
diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsx
index a7441fbd1..402ba0a7e 100644
--- a/apps/web/src/components/ui/combobox.tsx
+++ b/apps/web/src/components/ui/combobox.tsx
@@ -3,10 +3,9 @@
import { Combobox as ComboboxPrimitive } from "@base-ui/react/combobox";
import { ChevronsUpDownIcon, XIcon } from "lucide-react";
import * as React from "react";
-
-import { cn } from "@/lib/cn";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
+import { cn } from "@/lib/cn";
const ComboboxContext = React.createContext<{
chipsRef: React.RefObject<Element | null> | null;
@@ -205,6 +204,7 @@ function ComboboxItem({
>
<ComboboxPrimitive.ItemIndicator className="col-start-1">
<svg
+ aria-hidden="true"
fill="none"
height="24"
stroke="currentColor"
diff --git a/apps/web/src/components/ui/command.tsx b/apps/web/src/components/ui/command.tsx
index 500f8652a..8ff2833b9 100644
--- a/apps/web/src/components/ui/command.tsx
+++ b/apps/web/src/components/ui/command.tsx
@@ -3,7 +3,6 @@
import { Dialog as CommandDialogPrimitive } from "@base-ui/react/dialog";
import { SearchIcon } from "lucide-react";
import type * as React from "react";
-import { cn } from "@/lib/cn";
import {
Autocomplete,
AutocompleteCollection,
@@ -15,6 +14,7 @@ import {
AutocompleteList,
AutocompleteSeparator,
} from "@/components/ui/autocomplete";
+import { cn } from "@/lib/cn";
const CommandDialog = CommandDialogPrimitive.Root;
diff --git a/apps/web/src/components/ui/dialog.tsx b/apps/web/src/components/ui/dialog.tsx
index 5245a1982..94cc96264 100644
--- a/apps/web/src/components/ui/dialog.tsx
+++ b/apps/web/src/components/ui/dialog.tsx
@@ -2,9 +2,9 @@
import { Dialog as DialogPrimitive } from "@base-ui/react/dialog";
import { XIcon } from "lucide-react";
-import { cn } from "@/lib/cn";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
+import { cn } from "@/lib/cn";
const DialogCreateHandle = DialogPrimitive.createHandle;
diff --git a/apps/web/src/components/ui/error-display.tsx b/apps/web/src/components/ui/error-display.tsx
index 6dcc96621..2d3900484 100644
--- a/apps/web/src/components/ui/error-display.tsx
+++ b/apps/web/src/components/ui/error-display.tsx
@@ -67,9 +67,7 @@ export function ErrorDisplay({
key={`step-${index}-${step.slice(0, 10)}`}
className="flex items-start gap-2"
>
- <span className="text-muted-foreground mt-0.5">
- •
- </span>
+ <span className="text-muted-foreground mt-0.5">•</span>
<span>{step}</span>
</li>
))}
diff --git a/apps/web/src/components/ui/form.tsx b/apps/web/src/components/ui/form.tsx
index 3cc1bab9a..75aded036 100644
--- a/apps/web/src/components/ui/form.tsx
+++ b/apps/web/src/components/ui/form.tsx
@@ -4,15 +4,14 @@ import { Slot } from "@radix-ui/react-slot";
import * as React from "react";
import {
Controller,
- FormProvider,
- useFormContext,
type ControllerProps,
type FieldPath,
type FieldValues,
+ FormProvider,
+ useFormContext,
} from "react-hook-form";
-
-import { cn } from "@/lib/cn";
import { Label } from "@/components/ui/label";
+import { cn } from "@/lib/cn";
const Form = FormProvider;
@@ -85,7 +84,10 @@ function FormItem({ className, ...props }: React.ComponentProps<"div">) {
);
}
-function FormLabel({ className, ...props }: React.ComponentProps<typeof Label>) {
+function FormLabel({
+ className,
+ ...props
+}: React.ComponentProps<typeof Label>) {
const { error, formItemId } = useFormField();
return (
@@ -99,7 +101,8 @@ function FormLabel({ className, ...props }: React.ComponentProps<typeof Label>)
}
function FormControl({ ...props }: React.ComponentProps<typeof Slot>) {
- const { error, formDescriptionId, formItemId, formMessageId } = useFormField();
+ const { error, formDescriptionId, formItemId, formMessageId } =
+ useFormField();
return (
<Slot
@@ -127,7 +130,11 @@ function FormDescription({ className, ...props }: React.ComponentProps<"p">) {
);
}
-function FormMessage({ className, children, ...props }: React.ComponentProps<"p">) {
+function FormMessage({
+ className,
+ children,
+ ...props
+}: React.ComponentProps<"p">) {
const { error, formMessageId } = useFormField();
const body = error ? String(error?.message ?? "") : children;
diff --git a/apps/web/src/components/ui/group.tsx b/apps/web/src/components/ui/group.tsx
index 96961d359..25012de66 100644
--- a/apps/web/src/components/ui/group.tsx
+++ b/apps/web/src/components/ui/group.tsx
@@ -4,9 +4,8 @@ import { mergeProps } from "@base-ui/react/merge-props";
import { useRender } from "@base-ui/react/use-render";
import { cva, type VariantProps } from "class-variance-authority";
import type * as React from "react";
-
-import { cn } from "@/lib/cn";
import { Separator } from "@/components/ui/separator";
+import { cn } from "@/lib/cn";
const groupVariants = cva(
"flex w-fit *:focus-visible:z-1 has-[>[data-slot=group]]:gap-2 *:has-focus-visible:z-1 dark:*:[[data-slot=button]:hover~[data-slot=separator]:not([data-slot]:hover~[data-slot=separator]~[data-slot=separator]),[data-slot][data-pressed]~[data-slot=separator]:not([data-slot][data-pressed]~[data-slot=separator]~[data-slot=separator])]:before:bg-input/64 dark:*:[[data-slot=separator]:has(~[data-slot=button]:hover):not(:has(~[data-slot=separator]~[data-slot]:hover)),[data-slot=separator]:has(~[data-slot][data-pressed]):not(:has(~[data-slot=separator]~[data-slot][data-pressed]))]:before:bg-input/64",
@@ -40,7 +39,6 @@ function Group({
className={cn(groupVariants({ orientation }), className)}
data-orientation={orientation}
data-slot="group"
- role="group"
{...props}
>
{children}
diff --git a/apps/web/src/components/ui/input-group.tsx b/apps/web/src/components/ui/input-group.tsx
index c40afaa36..50868728a 100644
--- a/apps/web/src/components/ui/input-group.tsx
+++ b/apps/web/src/components/ui/input-group.tsx
@@ -2,10 +2,9 @@
import { cva, type VariantProps } from "class-variance-authority";
import type * as React from "react";
-
-import { cn } from "@/lib/cn";
import { Input, type InputProps } from "@/components/ui/input";
import { Textarea, type TextareaProps } from "@/components/ui/textarea";
+import { cn } from "@/lib/cn";
function InputGroup({ className, ...props }: React.ComponentProps<"div">) {
return (
@@ -15,7 +14,6 @@ function InputGroup({ className, ...props }: React.ComponentProps<"div">) {
className,
)}
data-slot="input-group"
- role="group"
{...props}
/>
);
@@ -52,21 +50,6 @@ function InputGroupAddon({
className={cn(inputGroupAddonVariants({ align }), className)}
data-align={align}
data-slot="input-group-addon"
- onMouseDown={(e) => {
- const target = e.target as HTMLElement;
- const isInteractive = target.closest(
- "button, a, input, select, textarea, [role='button'], [role='combobox'], [role='listbox'], [data-slot='select-trigger']",
- );
- if (isInteractive) return;
- e.preventDefault();
- const parent = e.currentTarget.parentElement;
- const input = parent?.querySelector<
- HTMLInputElement | HTMLTextAreaElement
- >("input, textarea");
- if (input && !parent?.querySelector("input:focus, textarea:focus")) {
- input.focus();
- }
- }}
{...props}
/>
);
diff --git a/apps/web/src/components/ui/menu.tsx b/apps/web/src/components/ui/menu.tsx
index aba9f9c7a..ea7084005 100644
--- a/apps/web/src/components/ui/menu.tsx
+++ b/apps/web/src/components/ui/menu.tsx
@@ -145,6 +145,7 @@ function MenuCheckboxItem({
width="24"
xmlns="http://www.w3.org/2000/svg"
>
+ <title>Check</title>
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
</svg>
</MenuPrimitive.CheckboxItemIndicator>
@@ -185,6 +186,7 @@ function MenuRadioItem({
width="24"
xmlns="http://www.w3.org/2000/svg"
>
+ <title>Check</title>
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
</svg>
</MenuPrimitive.RadioItemIndicator>
diff --git a/apps/web/src/components/ui/menubar.tsx b/apps/web/src/components/ui/menubar.tsx
index 43d18ca51..7729cd4c3 100644
--- a/apps/web/src/components/ui/menubar.tsx
+++ b/apps/web/src/components/ui/menubar.tsx
@@ -24,7 +24,10 @@ import { cn } from "@/lib/cn";
function Menubar({ className, ...props }: MenubarPrimitive.Props) {
return (
<MenubarPrimitive
- className={cn("flex items-center gap-1 rounded-lg border bg-background p-1", className)}
+ className={cn(
+ "flex items-center gap-1 rounded-lg border bg-background p-1",
+ className,
+ )}
data-slot="menubar"
{...props}
/>
diff --git a/apps/web/src/components/ui/number-field.tsx b/apps/web/src/components/ui/number-field.tsx
index 102479730..ae9cf8798 100644
--- a/apps/web/src/components/ui/number-field.tsx
+++ b/apps/web/src/components/ui/number-field.tsx
@@ -3,9 +3,8 @@
import { NumberField as NumberFieldPrimitive } from "@base-ui/react/number-field";
import { MinusIcon, PlusIcon } from "lucide-react";
import * as React from "react";
-
-import { cn } from "@/lib/cn";
import { Label } from "@/components/ui/label";
+import { cn } from "@/lib/cn";
const NumberFieldContext = React.createContext<{
fieldId: string;
@@ -137,6 +136,7 @@ function NumberFieldScrubArea({
function CursorGrowIcon(props: React.ComponentProps<"svg">) {
return (
<svg
+ aria-hidden="true"
fill="black"
height="14"
stroke="white"
diff --git a/apps/web/src/components/ui/pagination.tsx b/apps/web/src/components/ui/pagination.tsx
index d67334bcc..44aeb4e4a 100644
--- a/apps/web/src/components/ui/pagination.tsx
+++ b/apps/web/src/components/ui/pagination.tsx
@@ -8,9 +8,8 @@ import {
MoreHorizontalIcon,
} from "lucide-react";
import type * as React from "react";
-
-import { cn } from "@/lib/cn";
import { type Button, buttonVariants } from "@/components/ui/button";
+import { cn } from "@/lib/cn";
function Pagination({ className, ...props }: React.ComponentProps<"nav">) {
return (
diff --git a/apps/web/src/components/ui/select.tsx b/apps/web/src/components/ui/select.tsx
index 65351fd1f..a1b3a4b11 100644
--- a/apps/web/src/components/ui/select.tsx
+++ b/apps/web/src/components/ui/select.tsx
@@ -181,6 +181,7 @@ function SelectItem({
>
<SelectPrimitive.ItemIndicator className="col-start-1">
<svg
+ aria-hidden="true"
fill="none"
height="24"
stroke="currentColor"
diff --git a/apps/web/src/components/ui/sheet.tsx b/apps/web/src/components/ui/sheet.tsx
index ab284995e..d24fb49f0 100644
--- a/apps/web/src/components/ui/sheet.tsx
+++ b/apps/web/src/components/ui/sheet.tsx
@@ -2,9 +2,9 @@
import { Dialog as SheetPrimitive } from "@base-ui/react/dialog";
import { XIcon } from "lucide-react";
-import { cn } from "@/lib/cn";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
+import { cn } from "@/lib/cn";
const Sheet = SheetPrimitive.Root;
diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx
index eb9d1c7ac..649abc9ab 100644
--- a/apps/web/src/components/ui/sidebar.tsx
+++ b/apps/web/src/components/ui/sidebar.tsx
@@ -5,8 +5,6 @@ import { useRender } from "@base-ui/react/use-render";
import { cva, type VariantProps } from "class-variance-authority";
import { PanelLeftIcon } from "lucide-react";
import * as React from "react";
-import { useIsMobile } from "@/hooks/use-mobile";
-import { cn } from "@/lib/cn";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
@@ -19,11 +17,9 @@ import {
SheetTitle,
} from "@/components/ui/sheet";
import { Skeleton } from "@/components/ui/skeleton";
-import {
- Tooltip,
- TooltipPopup,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "@/components/ui/tooltip";
+import { useIsMobile } from "@/hooks/use-mobile";
+import { cn } from "@/lib/cn";
const SIDEBAR_COOKIE_NAME = "sidebar_state";
const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
diff --git a/apps/web/src/components/ui/toast.tsx b/apps/web/src/components/ui/toast.tsx
index 46ddf9b82..4cc8dec01 100644
--- a/apps/web/src/components/ui/toast.tsx
+++ b/apps/web/src/components/ui/toast.tsx
@@ -8,9 +8,8 @@ import {
LoaderCircleIcon,
TriangleAlertIcon,
} from "lucide-react";
-
-import { cn } from "@/lib/cn";
import { buttonVariants } from "@/components/ui/button";
+import { cn } from "@/lib/cn";
const toastManager = Toast.createToastManager();
const anchoredToastManager = Toast.createToastManager();
diff --git a/apps/web/src/components/ui/toggle-group.tsx b/apps/web/src/components/ui/toggle-group.tsx
index 8d001a41f..0ad959270 100644
--- a/apps/web/src/components/ui/toggle-group.tsx
+++ b/apps/web/src/components/ui/toggle-group.tsx
@@ -4,13 +4,12 @@ import type { Toggle as TogglePrimitive } from "@base-ui/react/toggle";
import { ToggleGroup as ToggleGroupPrimitive } from "@base-ui/react/toggle-group";
import type { VariantProps } from "class-variance-authority";
import * as React from "react";
-
-import { cn } from "@/lib/cn";
import { Separator } from "@/components/ui/separator";
import {
Toggle as ToggleComponent,
type toggleVariants,
} from "@/components/ui/toggle";
+import { cn } from "@/lib/cn";
const ToggleGroupContext = React.createContext<
VariantProps<typeof toggleVariants>
diff --git a/apps/web/src/lib/priority.tsx b/apps/web/src/lib/priority.tsx
index 37703535b..6f5f947dd 100644
--- a/apps/web/src/lib/priority.tsx
+++ b/apps/web/src/lib/priority.tsx
@@ -13,11 +13,17 @@ export function getPriorityIcon(priority: string) {
<CircleAlert className="h-[12px] w-[12px] text-destructive-foreground" />
);
case "high":
- return <ChevronsUp className="h-[12px] w-[12px] text-warning-foreground" />;
+ return (
+ <ChevronsUp className="h-[12px] w-[12px] text-warning-foreground" />
+ );
case "medium":
- return <ChevronUp className="h-[12px] w-[12px] text-warning-foreground/80" />;
+ return (
+ <ChevronUp className="h-[12px] w-[12px] text-warning-foreground/80" />
+ );
case "low":
- return <ChevronDown className="h-[12px] w-[12px] text-info-foreground/85" />;
+ return (
+ <ChevronDown className="h-[12px] w-[12px] text-info-foreground/85" />
+ );
case "no-priority":
return <Minus className="h-[12px] w-[12px] text-muted-foreground" />;
default:
diff --git a/apps/web/src/lib/status.tsx b/apps/web/src/lib/status.tsx
index 1b176852d..cb9edd709 100644
--- a/apps/web/src/lib/status.tsx
+++ b/apps/web/src/lib/status.tsx
@@ -3,9 +3,7 @@ import { CheckCircle2, Clock } from "lucide-react";
export function getStatusIcon(status: "active" | "pending") {
switch (status) {
case "active":
- return (
- <CheckCircle2 className="h-4 w-4 text-success-foreground" />
- );
+ return <CheckCircle2 className="h-4 w-4 text-success-foreground" />;
case "pending":
return <Clock className="h-4 w-4 text-warning-foreground" />;
}
diff --git a/apps/web/src/lib/toast.ts b/apps/web/src/lib/toast.ts
index efb9ba0e2..5cc83652f 100644
--- a/apps/web/src/lib/toast.ts
+++ b/apps/web/src/lib/toast.ts
@@ -42,11 +42,14 @@ function addToast(
type ToastFn = (title: string, options?: ToastOptions) => string;
-const success: ToastFn = (title, options) => addToast(title, "success", options);
+const success: ToastFn = (title, options) =>
+ addToast(title, "success", options);
const error: ToastFn = (title, options) => addToast(title, "error", options);
const info: ToastFn = (title, options) => addToast(title, "info", options);
-const warning: ToastFn = (title, options) => addToast(title, "warning", options);
-const message: ToastFn = (title, options) => addToast(title, undefined, options);
+const warning: ToastFn = (title, options) =>
+ addToast(title, "warning", options);
+const message: ToastFn = (title, options) =>
+ addToast(title, undefined, options);
const toast = Object.assign(message, {
success,
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/invitations.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/invitations.tsx
index c5f20d2a0..b0e59ab62 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/invitations.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/invitations.tsx
@@ -2,7 +2,6 @@ import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { CheckCircle, Loader2, Mail, X } from "lucide-react";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import Layout from "@/components/common/layout";
import PageTitle from "@/components/page-title";
import { Badge } from "@/components/ui/badge";
@@ -20,6 +19,7 @@ import {
import { usePendingInvitations } from "@/hooks/queries/invitation/use-pending-invitations";
import { authClient } from "@/lib/auth-client";
import { cn } from "@/lib/cn";
+import { toast } from "@/lib/toast";
export const Route = createFileRoute(
"/_layout/_authenticated/dashboard/invitations",
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/information.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/information.tsx
index 36882aedb..1171bd4ed 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/information.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/information.tsx
@@ -3,7 +3,6 @@ import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute } from "@tanstack/react-router";
import { useCallback, useEffect, useRef } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod";
import PageTitle from "@/components/page-title";
import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
@@ -19,6 +18,7 @@ import {
import { Input } from "@/components/ui/input";
import { Separator } from "@/components/ui/separator";
import useUpdateUserProfile from "@/hooks/mutations/use-update-user-profile";
+import { toast } from "@/lib/toast";
export const Route = createFileRoute(
"/_layout/_authenticated/dashboard/settings/account/information",
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx
index c54667bc9..b3c94a772 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx
@@ -76,7 +76,9 @@ function RouteComponent() {
<div className="flex items-center gap-3">
<div className="flex items-center gap-1 rounded-md border border-border bg-muted p-1">
<span className="rounded-full size-2 bg-primary" />
- <span className="text-xs font-normal text-foreground">Aa</span>
+ <span className="text-xs font-normal text-foreground">
+ Aa
+ </span>
</div>
<span className="text-xs font-normal">Light</span>
</div>
@@ -85,7 +87,9 @@ function RouteComponent() {
<div className="flex items-center gap-3">
<div className="flex items-center gap-1 rounded-md border border-border bg-card p-1">
<span className="rounded-full size-2 bg-primary" />
- <span className="text-xs font-normal text-foreground">Aa</span>
+ <span className="text-xs font-normal text-foreground">
+ Aa
+ </span>
</div>
<span className="text-xs font-normal">Dark</span>
</div>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/general.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/general.tsx
index b353cd9f2..bcfebe753 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/general.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/general.tsx
@@ -7,13 +7,11 @@ import {
} from "@tanstack/react-router";
import { useCallback, useEffect, useRef, useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod";
import PageTitle from "@/components/page-title";
import {
AlertDialog,
AlertDialogClose,
-
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -42,6 +40,7 @@ import useUpdateProject from "@/hooks/mutations/project/use-update-project";
import useGetProject from "@/hooks/queries/project/use-get-project";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { cn } from "@/lib/cn";
+import { toast } from "@/lib/toast";
export const Route = createFileRoute(
"/_layout/_authenticated/dashboard/settings/projects/$projectId/general",
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/visibility.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/visibility.tsx
index b9d9df248..272f7d3e9 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/visibility.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/visibility.tsx
@@ -1,7 +1,6 @@
import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute, useParams } from "@tanstack/react-router";
import { useCallback, useRef } from "react";
-import { toast } from "@/lib/toast";
import PageTitle from "@/components/page-title";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
@@ -11,6 +10,7 @@ import { Switch } from "@/components/ui/switch";
import useUpdateProject from "@/hooks/mutations/project/use-update-project";
import useGetProject from "@/hooks/queries/project/use-get-project";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
+import { toast } from "@/lib/toast";
export const Route = createFileRoute(
"/_layout/_authenticated/dashboard/settings/projects/$projectId/visibility",
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx
index 37baaf754..a849f5efd 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx
@@ -3,13 +3,11 @@ import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { useCallback, useEffect, useRef, useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod";
import PageTitle from "@/components/page-title";
import {
AlertDialog,
AlertDialogClose,
-
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -30,6 +28,7 @@ import { Separator } from "@/components/ui/separator";
import useDeleteWorkspace from "@/hooks/mutations/workspace/use-delete-workspace";
import useUpdateWorkspace from "@/hooks/mutations/workspace/use-update-workspace";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
+import { toast } from "@/lib/toast";
export const Route = createFileRoute(
"/_layout/_authenticated/dashboard/settings/workspace/general",
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/index.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/index.tsx
index ee4319ef2..bef0c2002 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/index.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/index.tsx
@@ -145,10 +145,7 @@ function RouteComponent() {
Get started by creating your first project.
</p>
</div>
- <Button
- onClick={handleCreateProject}
- className="gap-2 "
- >
+ <Button onClick={handleCreateProject} className="gap-2 ">
<Plus className="w-4 h-4" />
Create project
</Button>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/create.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/create.tsx
index 382de7c4d..f3747fbc1 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/create.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/create.tsx
@@ -2,14 +2,13 @@ import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { Building2 } from "lucide-react";
import { useEffect, useRef, useState } from "react";
-import { toast } from "@/lib/toast";
-
import PageTitle from "@/components/page-title";
import { Button } from "@/components/ui/button";
import { Card, CardContent } from "@/components/ui/card";
import { Input } from "@/components/ui/input";
import useCreateWorkspace from "@/hooks/queries/workspace/use-create-workspace";
import { authClient } from "@/lib/auth-client";
+import { toast } from "@/lib/toast";
export const Route = createFileRoute(
"/_layout/_authenticated/dashboard/workspace/create",
diff --git a/apps/web/src/routes/_layout/_authenticated/invitations.tsx b/apps/web/src/routes/_layout/_authenticated/invitations.tsx
index 5c2c10a91..7e63b2cfd 100644
--- a/apps/web/src/routes/_layout/_authenticated/invitations.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/invitations.tsx
@@ -2,7 +2,6 @@ import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { CheckCircle, Loader2, Mail, X } from "lucide-react";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import PageTitle from "@/components/page-title";
import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
import { Badge } from "@/components/ui/badge";
@@ -18,6 +17,7 @@ import {
import { usePendingInvitations } from "@/hooks/queries/invitation/use-pending-invitations";
import { authClient } from "@/lib/auth-client";
import { cn } from "@/lib/cn";
+import { toast } from "@/lib/toast";
export const Route = createFileRoute("/_layout/_authenticated/invitations")({
component: InvitationsPage,
diff --git a/apps/web/src/routes/auth/sign-in.tsx b/apps/web/src/routes/auth/sign-in.tsx
index db07c29f5..fe8cd7de7 100644
--- a/apps/web/src/routes/auth/sign-in.tsx
+++ b/apps/web/src/routes/auth/sign-in.tsx
@@ -5,7 +5,6 @@ import {
} from "@tanstack/react-router";
import { Github, KeyRound, UserCheck } from "lucide-react";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import PageTitle from "@/components/page-title";
import { Alert, AlertDescription } from "@/components/ui/alert";
@@ -13,6 +12,7 @@ import { Button } from "@/components/ui/button";
import useGetConfig from "@/hooks/queries/config/use-get-config";
import { authClient } from "@/lib/auth-client";
import { cn } from "@/lib/cn";
+import { toast } from "@/lib/toast";
import { AuthLayout } from "../../components/auth/layout";
import { OtpSignInForm } from "../../components/auth/otp-sign-in-form";
import { SignInForm } from "../../components/auth/sign-in-form";
diff --git a/apps/web/src/routes/auth/sign-up.tsx b/apps/web/src/routes/auth/sign-up.tsx
index 9c1e7a861..a0a187ee6 100644
--- a/apps/web/src/routes/auth/sign-up.tsx
+++ b/apps/web/src/routes/auth/sign-up.tsx
@@ -5,7 +5,6 @@ import {
} from "@tanstack/react-router";
import { UserCheck } from "lucide-react";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { AuthLayout } from "@/components/auth/layout";
import { SignUpForm } from "@/components/auth/sign-up-form";
@@ -15,6 +14,7 @@ import { Alert, AlertDescription } from "@/components/ui/alert";
import { Button } from "@/components/ui/button";
import useGetConfig from "@/hooks/queries/config/use-get-config";
import { authClient } from "@/lib/auth-client";
+import { toast } from "@/lib/toast";
const signUpSearchSchema = z.object({
invitationId: z.string().optional(),
diff --git a/apps/web/src/routes/auth/verify-otp.tsx b/apps/web/src/routes/auth/verify-otp.tsx
index 0bc80deed..c6b00b7cc 100644
--- a/apps/web/src/routes/auth/verify-otp.tsx
+++ b/apps/web/src/routes/auth/verify-otp.tsx
@@ -3,7 +3,6 @@ import { createFileRoute, useRouter, useSearch } from "@tanstack/react-router";
import { REGEXP_ONLY_DIGITS } from "input-otp";
import { useCallback, useEffect, useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import PageTitle from "@/components/page-title";
import { Button } from "@/components/ui/button";
@@ -21,6 +20,7 @@ import {
InputOTPSlot,
} from "@/components/ui/input-otp";
import { authClient } from "@/lib/auth-client";
+import { toast } from "@/lib/toast";
import { AuthLayout } from "../../components/auth/layout";
const verifyOtpSchema = z.object({
@@ -156,11 +156,7 @@ function VerifyOtp() {
)}
/>
- <Button
- type="submit"
- disabled={isPending}
- className="w-full"
- >
+ <Button type="submit" disabled={isPending} className="w-full">
{isPending ? "Verifying..." : "Verify & Sign In"}
</Button>
diff --git a/apps/web/src/routes/invitation/accept.$inviteId.tsx b/apps/web/src/routes/invitation/accept.$inviteId.tsx
index 3195a7c92..438dc6628 100644
--- a/apps/web/src/routes/invitation/accept.$inviteId.tsx
+++ b/apps/web/src/routes/invitation/accept.$inviteId.tsx
@@ -14,12 +14,12 @@ import {
XCircle,
} from "lucide-react";
import { useState } from "react";
-import { toast } from "@/lib/toast";
import PageTitle from "@/components/page-title";
import { Alert, AlertDescription } from "@/components/ui/alert";
import { Button } from "@/components/ui/button";
import { useGetInvitationDetails } from "@/hooks/queries/invitation/use-get-invitation-details";
import { authClient } from "@/lib/auth-client";
+import { toast } from "@/lib/toast";
import { AuthLayout } from "../../components/auth/layout";
export const Route = createFileRoute("/invitation/accept/$inviteId")({