Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
7e6813d
copy to ui with eng docs
MichaelUnkey Jun 26, 2025
e95d1e4
Small change to eng docs
MichaelUnkey Jun 30, 2025
74a32af
First set of toaster changed in dashboard
MichaelUnkey Jul 8, 2025
d58ed48
Merge branch 'main' of https://github.com/unkeyed/unkey into move-toa…
MichaelUnkey Jul 8, 2025
a1b2812
Merge branch 'main' of https://github.com/unkeyed/unkey into move-toa…
MichaelUnkey Jul 8, 2025
b844b6e
swapped some toasts
MichaelUnkey Jul 8, 2025
311c623
Merge branch 'main' of https://github.com/unkeyed/unkey into move-toa…
MichaelUnkey Jul 8, 2025
4a32840
openapi file revert
MichaelUnkey Jul 8, 2025
00dfee7
Merge branch 'main' of https://github.com/unkeyed/unkey into move-toa…
MichaelUnkey Jul 8, 2025
1b15a12
[autofix.ci] apply automated fixes
autofix-ci[bot] Jul 8, 2025
192e108
next set converted
MichaelUnkey Jul 8, 2025
905d52d
rabbit
MichaelUnkey Jul 8, 2025
009bafa
[autofix.ci] apply automated fixes
autofix-ci[bot] Jul 8, 2025
582cec8
more rabbit
MichaelUnkey Jul 8, 2025
db6987a
rabbit
MichaelUnkey Jul 9, 2025
d8e19a8
Merge branch 'main' of https://github.com/unkeyed/unkey into move-toa…
MichaelUnkey Jul 9, 2025
3988327
Merge branch 'main' of https://github.com/unkeyed/unkey into Move-toa…
MichaelUnkey Jul 9, 2025
df429b9
react component to string
MichaelUnkey Jul 9, 2025
ec162b9
use copy button
MichaelUnkey Jul 10, 2025
9f22261
Merge branch 'main' into move-toaster-to-ui-step-3
MichaelUnkey Jul 10, 2025
b90fc2d
Merge branch 'main' of https://github.com/unkeyed/unkey into Move-toa…
MichaelUnkey Jul 10, 2025
d84d970
set changed
MichaelUnkey Jul 10, 2025
ea95942
Merge branch 'move-toaster-to-ui-step-2' into Move-toaster-to-UI-step-5
MichaelUnkey Jul 10, 2025
34277d3
Merge branch 'main' of https://github.com/unkeyed/unkey into Move-toa…
MichaelUnkey Jul 10, 2025
7f790f3
Merge branch 'main' of https://github.com/unkeyed/unkey into move-toa…
MichaelUnkey Jul 10, 2025
53d0716
Merge branch 'move-toaster-to-ui-step-3' into Move-toaster-to-UI-step-4
MichaelUnkey Jul 10, 2025
2fa2b37
Merge branch 'main' into Move-toaster-to-UI-step-4
perkinsjr Jul 10, 2025
2292a57
swap button
MichaelUnkey Jul 10, 2025
a393d29
Merge branch 'Move-toaster-to-UI-step-4' of https://github.com/unkeye…
MichaelUnkey Jul 10, 2025
ac1a253
Merge branch 'Move-toaster-to-UI-step-4' into Move-toaster-to-UI-step-5
MichaelUnkey Jul 10, 2025
d4f86fe
merge fix
MichaelUnkey Jul 10, 2025
f386896
last toasts moved
MichaelUnkey Jul 10, 2025
c834581
small fix
MichaelUnkey Jul 10, 2025
3f7a54f
Merge branch 'Move-toaster-to-UI-step-5' into Move-toaster-to-UI-step-6
MichaelUnkey Jul 10, 2025
e0bcd3b
Merge branch 'main' into Move-toaster-to-UI-step-5
perkinsjr Jul 10, 2025
95ca66e
fix
MichaelUnkey Jul 10, 2025
b7fe4e6
Merge branch 'Move-toaster-to-UI-step-5' of https://github.com/unkeye…
MichaelUnkey Jul 10, 2025
842a440
Merge branch 'Move-toaster-to-UI-step-5' into Move-toaster-to-UI-step-6
MichaelUnkey Jul 10, 2025
01a7762
[autofix.ci] apply automated fixes
autofix-ci[bot] Jul 10, 2025
ce0e622
rabbit
MichaelUnkey Jul 10, 2025
10402b0
Merge branch 'Move-toaster-to-UI-step-5' into Move-toaster-to-UI-step-6
MichaelUnkey Jul 10, 2025
1e2e0c5
Merge branch 'main' into Move-toaster-to-UI-step-6
perkinsjr Jul 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions apps/dashboard/app/(app)/settings/team/invitations.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table";
import { toast } from "@/components/ui/toaster";
import type { AuthenticatedUser, Organization } from "@/lib/auth/types";
import { trpc } from "@/lib/trpc/client";
import { Button, Empty, Loading } from "@unkey/ui";
import { Button, Empty, Loading, toast } from "@unkey/ui";
import { memo } from "react";
import { InviteButton } from "./invite";
import { StatusBadge } from "./status-badge";
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/app/(app)/settings/team/invite.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client";

import { toast } from "@/components/ui/toaster";
import type { AuthenticatedUser, Organization } from "@/lib/auth/types";
import { trpc } from "@/lib/trpc/client";
import { zodResolver } from "@hookform/resolvers/zod";
Expand All @@ -14,6 +13,7 @@ import {
SelectItem,
SelectTrigger,
SelectValue,
toast,
} from "@unkey/ui";
import type React from "react";
import { useState } from "react";
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/(app)/settings/team/members.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table";
import { toast } from "@/components/ui/toaster";
import type { AuthenticatedUser, Membership, Organization } from "@/lib/auth/types";
import { trpc } from "@/lib/trpc/client";
import { Button, Empty, Loading } from "@unkey/ui";
import { Button, Empty, Loading, toast } from "@unkey/ui";
import { memo } from "react";
import { InviteButton } from "./invite";
import { RoleSwitcher } from "./role-switcher";
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/app/(app)/settings/team/role-switcher.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client";

import { toast } from "@/components/ui/toaster";
import type { AuthenticatedUser, Membership, Organization } from "@/lib/auth/types";
import { trpc } from "@/lib/trpc/client";
import {
Expand All @@ -11,6 +10,7 @@ import {
SelectItem,
SelectTrigger,
SelectValue,
toast,
} from "@unkey/ui";
import { memo, useState } from "react";

Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/app/(app)/settings/vercel/client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { Label } from "@/components/ui/label";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
import type { Api, Key, VercelBinding } from "@unkey/db";
Expand All @@ -31,6 +30,7 @@ import {
Tooltip,
TooltipContent,
TooltipTrigger,
toast,
} from "@unkey/ui";
import { formatDistanceToNow } from "date-fns";
import { ExternalLink, Link2, MoreHorizontal, Plus, RefreshCw, Trash, Unlink2 } from "lucide-react";
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/auth/sign-in/email-code.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"use client";

import { toast } from "@/components/ui/toaster";
import { cn } from "@/lib/utils";
import { Loading } from "@unkey/ui";
import { Loading, toast } from "@unkey/ui";
import { OTPInput, type SlotProps } from "input-otp";
import { useCallback, useEffect, useRef, useState } from "react";
import { useSignIn } from "../hooks";
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/auth/sign-in/email-verify.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

import * as React from "react";

import { toast } from "@/components/ui/toaster";
import { AuthErrorCode, errorMessages } from "@/lib/auth/types";
import { cn } from "@/lib/utils";
import { Loading } from "@unkey/ui";
import { Loading, toast } from "@unkey/ui";
import { OTPInput, type SlotProps } from "input-otp";
import { useSignUp } from "../hooks/useSignUp";

Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/auth/sign-in/oauth-signin.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
"use client";

import { GitHub, Google } from "@/components/ui/icons";
import { toast } from "@/components/ui/toaster";
import type { OAuthStrategy } from "@/lib/auth/types";
import { Loading } from "@unkey/ui";
import { Loading, toast } from "@unkey/ui";
import { useSearchParams } from "next/navigation";
import * as React from "react";
import { signInViaOAuth } from "../actions";
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/auth/sign-up/email-code.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

import * as React from "react";

import { toast } from "@/components/ui/toaster";
import { AuthErrorCode, errorMessages } from "@/lib/auth/types";
import { cn } from "@/lib/utils";
import { Loading } from "@unkey/ui";
import { Loading, toast } from "@unkey/ui";
import { OTPInput, type SlotProps } from "input-otp";
import { useSignUp } from "../hooks/useSignUp";

Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/auth/sign-up/email-signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import * as React from "react";

import { toast } from "@/components/ui/toaster";
import { AuthErrorCode, errorMessages } from "@/lib/auth/types";
import { FormInput, Loading } from "@unkey/ui";
import { FormInput, Loading, toast } from "@unkey/ui";
import { useSearchParams } from "next/navigation";
import { useSignUp } from "../hooks/useSignUp";

Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/auth/sign-up/oauth-signup.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
"use client";

import { GitHub, Google } from "@/components/ui/icons";
import { toast } from "@/components/ui/toaster";
import type { OAuthStrategy } from "@/lib/auth/types";
import { Loading } from "@unkey/ui";
import { Loading, toast } from "@unkey/ui";
import * as React from "react";
import { signInViaOAuth } from "../actions";
import { OAuthButton } from "../oauth-button";
Expand Down
11 changes: 9 additions & 2 deletions apps/dashboard/app/integrations/vercel/callback/client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@
import { PageHeader } from "@/components/dashboard/page-header";
import { Label } from "@/components/ui/label";
import { ScrollArea } from "@/components/ui/scroll-area";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import type { Api, VercelBinding } from "@unkey/db";
import { Button, Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@unkey/ui";
import {
Button,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
toast,
} from "@unkey/ui";
import { X } from "lucide-react";
import { useRouter } from "next/navigation";
import { useState } from "react";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ import type React from "react";
import { useState } from "react";

import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { toast } from "@/components/ui/toaster";
import { setSessionCookie } from "@/lib/auth/cookies";
import { trpc } from "@/lib/trpc/client";
import { Loading } from "@unkey/ui";
import { Loading, toast } from "@unkey/ui";

export const WorkspaceSwitcher: React.FC = (): JSX.Element => {
const { data: user } = trpc.user.getCurrentUser.useQuery();
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/new/create-api.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
"use client";

import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { PostHogIdentify } from "@/providers/PostHogProvider";
import { zodResolver } from "@hookform/resolvers/zod";
import { Button, FormInput } from "@unkey/ui";
import { Button, FormInput, toast } from "@unkey/ui";
import { Code2 } from "lucide-react";
import { useRouter } from "next/navigation";
import { Controller, useForm } from "react-hook-form";
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/new/create-workspace.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
"use client";

import { toast } from "@/components/ui/toaster";
import { setCookie } from "@/lib/auth/cookies";
import { UNKEY_SESSION_COOKIE } from "@/lib/auth/types";
import { trpc } from "@/lib/trpc/client";
import { zodResolver } from "@hookform/resolvers/zod";
import { Button, FormInput } from "@unkey/ui";
import { Button, FormInput, toast } from "@unkey/ui";
import { Box } from "lucide-react";
import { useRouter } from "next/navigation";
import { useRef, useTransition } from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client";

import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { zodResolver } from "@hookform/resolvers/zod";
import { CircleInfo } from "@unkey/icons";
Expand All @@ -13,6 +12,7 @@ import {
SelectItem,
SelectTrigger,
SelectValue,
toast,
} from "@unkey/ui";
import { parseAsBoolean, useQueryState } from "nuqs";
import { Controller, useForm } from "react-hook-form";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import type { ColumnDef } from "@tanstack/react-table";
import { Badge } from "@unkey/ui";
import { Button, Checkbox, InfoTooltip } from "@unkey/ui";
import { Badge, Button, Checkbox, InfoTooltip, toast } from "@unkey/ui";
import { ArrowUpDown, Minus, MoreHorizontal, MoreVertical, Trash } from "lucide-react";
import ms from "ms";
import Link from "next/link";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ import {
DropdownMenuContent,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { Button, Input } from "@unkey/ui";
import { Button, Input, toast } from "@unkey/ui";
import { useRouter } from "next/navigation";
import { useState } from "react";
interface DataTableProps<TData, TValue> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { toast } from "@/components/ui/toaster";
import { cn } from "@/lib/utils";
import { InfoTooltip } from "@unkey/ui";
import { InfoTooltip, toast } from "@unkey/ui";
import type { ReactNode } from "react";

type Field<T> = {
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/components/logs/queries/list-group.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { toast } from "@/components/ui/toaster";
import { cn } from "@/lib/utils";
import { Bookmark, CircleCheck, Layers2 } from "@unkey/icons";
import { InfoTooltip } from "@unkey/ui";
import { InfoTooltip, toast } from "@unkey/ui";
import { useEffect, useState } from "react";
import { useQueries } from "./queries-context";
import { QueriesItemRow } from "./queries-item-row";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ import {
} from "@/components/ui/dropdown-menu";
import { ScrollArea } from "@/components/ui/scroll-area";
import { useSidebar } from "@/components/ui/sidebar";
import { toast } from "@/components/ui/toaster";
import { setSessionCookie } from "@/lib/auth/cookies";
import { trpc } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
import { ChevronExpandY } from "@unkey/icons";
import { InfoTooltip, Loading } from "@unkey/ui";
import { InfoTooltip, Loading, toast } from "@unkey/ui";
import { Check, Plus, UserPlus } from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/navigation";
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/components/opt-in.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
"use client";

import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { PostHogEvent } from "@/providers/PostHogProvider";
import type { Workspace } from "@unkey/db";
import { Button, Empty } from "@unkey/ui";
import { Button, Empty, toast } from "@unkey/ui";
import Link from "next/link";
import { useRouter } from "next/navigation";
import type React from "react";
Expand Down
29 changes: 0 additions & 29 deletions apps/dashboard/components/ui/toaster.tsx

This file was deleted.