Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f35106b
started move
MichaelUnkey Jun 11, 2025
1a1b6fa
Merge branch 'main' of https://github.com/unkeyed/unkey into move-bad…
MichaelUnkey Jun 11, 2025
8b31656
moved to ui
MichaelUnkey Jun 11, 2025
84e3cee
eng docs
MichaelUnkey Jun 11, 2025
76309cb
Merge branch 'main' into move-badge-to-ui
MichaelUnkey Jun 11, 2025
9e9a509
Merge branch 'main' of https://github.com/unkeyed/unkey into move-bad…
MichaelUnkey Jun 11, 2025
24153e7
[autofix.ci] apply automated fixes
autofix-ci[bot] Jun 11, 2025
56aede4
fix merge issues
MichaelUnkey Jun 11, 2025
0e841e1
Merge branch 'move-badge-to-ui' of https://github.com/unkeyed/unkey i…
MichaelUnkey Jun 11, 2025
292a8b6
[autofix.ci] apply automated fixes
autofix-ci[bot] Jun 11, 2025
cf94fb8
Merge branch 'main' of https://github.com/unkeyed/unkey into move-bad…
MichaelUnkey Jun 12, 2025
ca2220d
Merge branch 'main' of https://github.com/unkeyed/unkey into move-bad…
MichaelUnkey Jun 16, 2025
c1f89ef
fix tailwind and make span
MichaelUnkey Jun 16, 2025
75b494f
Merge branch 'main' of https://github.com/unkeyed/unkey into move-bad…
MichaelUnkey Jun 16, 2025
e67662e
Merge branch 'main' of https://github.com/unkeyed/unkey into move-bad…
MichaelUnkey Jun 17, 2025
ff67655
fmtMerge branch 'main' of https://github.com/unkeyed/unkey into move-…
MichaelUnkey Jun 18, 2025
8f930f5
[autofix.ci] apply automated fixes
autofix-ci[bot] Jun 18, 2025
faa0f75
Update apps/engineering/app/layout.tsx
MichaelUnkey Jun 18, 2025
829a6bf
import change
MichaelUnkey Jun 18, 2025
8471ffd
Merge branch 'main' of https://github.com/unkeyed/unkey into move-bad…
MichaelUnkey Jun 18, 2025
6b83ea1
Merge branch 'main' of https://github.com/unkeyed/unkey into move-bad…
MichaelUnkey Jun 20, 2025
7dd0671
merge issue fixed
MichaelUnkey Jun 20, 2025
6635568
nit
MichaelUnkey Jun 20, 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
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
"use client";

import { Badge } from "@/components/ui/badge";
import { formatNumber } from "@/lib/fmt";
import { trpc } from "@/lib/trpc/client";
import { Button, Loading } from "@unkey/ui";
import { Badge, Button, Loading } from "@unkey/ui";
import dynamic from "next/dynamic";

const PermissionList = dynamic(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import type { KeysOverviewLog } from "@unkey/clickhouse/src/keys/keys";
import { XMark } from "@unkey/icons";
import { Button } from "@unkey/ui";
import { Badge, Button } from "@unkey/ui";

export const LogHeader = ({
onClose,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
"use client";
import { Badge } from "@/components/ui/badge";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { formatNumber } from "@/lib/fmt";
import { cn } from "@/lib/utils";
import { ChevronRight } from "@unkey/icons";
import { Button } from "@unkey/ui";
import { Badge, Button } from "@unkey/ui";
import { formatOutcomeName, getOutcomeBadgeStyle, getOutcomeColor } from "../../../utils";
import { STATUS_STYLES } from "../utils/get-row-class";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
"use client";
import { Badge } from "@/components/ui/badge";
import { VirtualTable } from "@/components/virtual-table/index";
import type { Column } from "@/components/virtual-table/types";
import { cn } from "@/lib/utils";
import type { KeysOverviewLog } from "@unkey/clickhouse/src/keys/keys";
import { Ban, BookBookmark } from "@unkey/icons";
import { Button, Empty, TimestampInfo } from "@unkey/ui";
import { Badge, Button, Empty, TimestampInfo } from "@unkey/ui";

import { useSort } from "@/components/logs/hooks/use-sort";
import { formatNumber } from "@/lib/fmt";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"use client";
import { Badge } from "@/components/ui/badge";
import { VirtualTable } from "@/components/virtual-table/index";
import type { Column } from "@/components/virtual-table/types";
import { trpc } from "@/lib/trpc/client";
Expand All @@ -16,9 +15,7 @@ import {
TimeClock,
TriangleWarning2,
} from "@unkey/icons";
import { CopyButton } from "@unkey/ui";
import { TimestampInfo } from "@unkey/ui";
import { Button, Empty, InfoTooltip } from "@unkey/ui";
import { Badge, Button, CopyButton, Empty, InfoTooltip, TimestampInfo } from "@unkey/ui";
import { useCallback, useState } from "react";
import { useKeyDetailsLogsContext } from "../../context/logs";
import { StatusBadge } from "./components/status-badge";
Expand Down Expand Up @@ -349,7 +346,6 @@ export const KeyDetailsLogsTable = ({ keyspaceId, keyId, selectedLog, onLogSelec
asChild
>
<Badge
variant="success"
className={cn(
"whitespace-nowrap max-w-[150px] truncate",
selectedLog?.request_id === log.request_id
Expand Down Expand Up @@ -408,7 +404,6 @@ export const KeyDetailsLogsTable = ({ keyspaceId, keyId, selectedLog, onLogSelec
asChild
>
<Badge
variant="success"
className={cn(
"whitespace-nowrap",
selectedLog?.request_id === log.request_id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Badge } from "@/components/ui/badge";
import { trpc } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
import { ChartActivity2 } from "@unkey/icons";
import { TimestampInfo } from "@unkey/ui";
import { Badge, TimestampInfo } from "@unkey/ui";
import { useRef, useState } from "react";
import { STATUS_STYLES } from "../utils/get-row-class";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import { Badge } from "@unkey/ui";
import { useRef } from "react";
import { STATUS_STYLES } from "../../../utils/get-row-class";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Badge } from "@/components/ui/badge";
import type { AuditLog } from "@/lib/trpc/routers/audit/schema";
import { XMark } from "@unkey/icons";
import { Button } from "@unkey/ui";
import { Badge, Button } from "@unkey/ui";
import { cn } from "@unkey/ui/src/lib/utils";
import { AUDIT_STATUS_STYLES, getEventType } from "../../utils/get-row-class";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
"use client";
import { Badge } from "@/components/ui/badge";
import { VirtualTable, type VirtualTableRef } from "@/components/virtual-table";
import type { Column } from "@/components/virtual-table/types";
import type { AuditLog } from "@/lib/trpc/routers/audit/schema";
import { TimestampInfo } from "@unkey/ui";
import { Badge, TimestampInfo } from "@unkey/ui";
import { cn } from "@unkey/ui/src/lib/utils";
import { FunctionSquare, KeySquare } from "lucide-react";
import { useEffect, useRef } from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import { ChartActivity2 } from "@unkey/icons";
import { TimestampInfo } from "@unkey/ui";
import { Badge, TimestampInfo } from "@unkey/ui";
import { useRef, useState } from "react";
import { STATUS_STYLES } from "../utils/get-row-class";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
"use client";
import { Badge } from "@/components/ui/badge";
import { VirtualTable } from "@/components/virtual-table/index";
import type { Column } from "@/components/virtual-table/types";
import type { Permission } from "@/lib/trpc/routers/authorization/permissions/query";
import { cn } from "@/lib/utils";
import { BookBookmark, HandHoldingKey } from "@unkey/icons";
import { Button, Checkbox, Empty } from "@unkey/ui";
import { cn } from "@unkey/ui/src/lib/utils";
import { Badge, Button, Checkbox, Empty } from "@unkey/ui";
import { useCallback, useMemo, useState } from "react";
import { PermissionsTableActions } from "./components/actions/keys-table-action.popover.constants";
import { AssignedItemsCell } from "./components/assigned-items-cell";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import { ChartActivity2 } from "@unkey/icons";
import { TimestampInfo } from "@unkey/ui";
import { Badge, TimestampInfo } from "@unkey/ui";
import { useRef, useState } from "react";
import { STATUS_STYLES } from "../utils/get-row-class";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { StatusBadge } from "@/app/(app)/apis/[apiId]/settings/components/status-badge";
import { Badge } from "@/components/ui/badge";
import { Key2, Lock } from "@unkey/icons";
import { Button, Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@unkey/ui";
import { Badge, Button, Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@unkey/ui";

type Key = {
id: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { StatusBadge } from "@/app/(app)/apis/[apiId]/settings/components/status-badge";
import { Badge } from "@/components/ui/badge";
import { HandHoldingKey, Lock } from "@unkey/icons";
import { Button, Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@unkey/ui";
import { Badge, Button, Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@unkey/ui";

type Permission = {
id: string;
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/(app)/identities/[identityId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { notFound } from "next/navigation";

import { PageContent } from "@/components/page-content";
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
import { Badge } from "@/components/ui/badge";
import { Code } from "@/components/ui/code";
import {
Table,
Expand All @@ -16,7 +15,7 @@ import { getAuth } from "@/lib/auth";
import { clickhouse } from "@/lib/clickhouse";
import { db } from "@/lib/db";
import { formatNumber } from "@/lib/fmt";
import { Button, CopyButton } from "@unkey/ui";
import { Badge, Button, CopyButton } from "@unkey/ui";
import { ChevronRight, Minus } 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 @@ -2,10 +2,9 @@
import { RED_STATES, YELLOW_STATES } from "@/app/(app)/logs/constants";
import { extractResponseField, getRequestHeader } from "@/app/(app)/logs/utils";
import { RequestResponseDetails } from "@/components/logs/details/request-response-details";
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import type { Log } from "@unkey/clickhouse/src/logs";
import { TimestampInfo } from "@unkey/ui";
import { Badge, TimestampInfo } from "@unkey/ui";

type Props = {
log: Log;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import type { Log } from "@unkey/clickhouse/src/logs";
import { XMark } from "@unkey/icons";
import { Button } from "@unkey/ui";
import { Badge, Button } from "@unkey/ui";

type Props = {
log: Log;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
"use client";

import { Badge } from "@/components/ui/badge";
import { VirtualTable } from "@/components/virtual-table/index";
import type { Column } from "@/components/virtual-table/types";
import { cn } from "@/lib/utils";
import type { Log } from "@unkey/clickhouse/src/logs";
import { BookBookmark, TriangleWarning2 } from "@unkey/icons";
import { Button, Empty, TimestampInfo } from "@unkey/ui";
import { Badge, Button, Empty, TimestampInfo } from "@unkey/ui";
import { useMemo } from "react";
import { isDisplayProperty, useLogsContext } from "../../context/logs";
import { extractResponseField } from "../../utils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"use client";

import { Badge } from "@/components/ui/badge";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import { zodResolver } from "@hookform/resolvers/zod";
import { CircleInfo } from "@unkey/icons";
import {
Badge,
Button,
DialogContainer,
FormInput,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
"use client";

import { useSort } from "@/components/logs/hooks/use-sort";
import { Badge } from "@/components/ui/badge";
import { VirtualTable } from "@/components/virtual-table/index";
import type { Column } from "@/components/virtual-table/types";
import { formatNumber } from "@/lib/fmt";
import { cn } from "@/lib/utils";
import type { RatelimitOverviewLog } from "@unkey/clickhouse/src/ratelimits";
import { Ban, BookBookmark } from "@unkey/icons";
import { Button, Empty, TimestampInfo } from "@unkey/ui";
import { Badge, Button, Empty, TimestampInfo } from "@unkey/ui";
import { useState } from "react";
import { InlineFilter } from "./components/inline-filter";
import { LogsTableAction } from "./components/logs-actions";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
import { RED_STATES, YELLOW_STATES } from "@/app/(app)/logs/constants";
import { extractResponseField, getRequestHeader } from "@/app/(app)/logs/utils";
import { RequestResponseDetails } from "@/components/logs/details/request-response-details";
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import type { RatelimitLog } from "@unkey/clickhouse/src/ratelimits";
import { TimestampInfo } from "@unkey/ui";
import { Badge, TimestampInfo } from "@unkey/ui";

type Props = {
log: RatelimitLog;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import type { RatelimitLog } from "@unkey/clickhouse/src/ratelimits";
import { XMark } from "@unkey/icons";
import { Button } from "@unkey/ui";
import { Badge, Button } from "@unkey/ui";

type Props = {
log: RatelimitLog;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
"use client";

import { safeParseJson } from "@/app/(app)/logs/utils";
import { Badge } from "@/components/ui/badge";
import { VirtualTable } from "@/components/virtual-table/index";
import type { Column } from "@/components/virtual-table/types";
import { cn } from "@/lib/utils";
import type { RatelimitLog } from "@unkey/clickhouse/src/ratelimits";
import { BookBookmark } from "@unkey/icons";
import { Button, Empty, TimestampInfo } from "@unkey/ui";
import { Badge, Button, Empty, TimestampInfo } from "@unkey/ui";
import { useMemo } from "react";
import { DEFAULT_STATUS_FLAG } from "../../constants";
import { useRatelimitLogsContext } from "../../context/logs";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Badge } from "@/components/ui/badge";
import { trpc } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
import { ChartActivity2 } from "@unkey/icons";
import { TimestampInfo } from "@unkey/ui";
import { Badge, TimestampInfo } from "@unkey/ui";
import { useRef, useState } from "react";
import { STATUS_STYLES } from "../_overview/components/table/utils/get-row-class";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
"use client";
import { Badge } from "@/components/ui/badge";
import { VirtualTable } from "@/components/virtual-table";
import type { Column } from "@/components/virtual-table/types";
import { formatNumber } from "@/lib/fmt";
import { trpc } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
import { Empty } from "@unkey/ui";
import { Badge, Empty } from "@unkey/ui";
import ms from "ms";
import { LastUsedCell } from "./last-used-cell";
import { OverridesTableAction } from "./logs-actions";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
"use client";
import { QuickNavPopover } from "@/components/navbar-popover";
import { Navbar } from "@/components/navigation/navbar";
import { Badge } from "@/components/ui/badge";
import { ChevronExpandY, Gear } from "@unkey/icons";
import { Button, CopyButton } from "@unkey/ui";
import { Badge, Button, CopyButton } from "@unkey/ui";
import Link from "next/link";

const settingsNavbar = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"use client";
import { Badge } from "@/components/ui/badge";
import {
Table,
TableBody,
Expand All @@ -9,6 +8,7 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table";
import { Badge } from "@unkey/ui";
import { Check } from "lucide-react";

type Props = {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/app/(app)/settings/team/status-badge.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { Badge } from "@/components/ui/badge";
import { Badge } from "@unkey/ui";
import { memo } from "react";

type StatusBadgeProps = {
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/app/(app)/settings/workspace-navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import { QuickNavPopover } from "@/components/navbar-popover";
import { Navbar } from "@/components/navigation/navbar";
import { Badge } from "@/components/ui/badge";
import { ChevronExpandY, Gear } from "@unkey/icons";
import { Button, CopyButton } from "@unkey/ui";
import { Badge, Button, CopyButton } from "@unkey/ui";
import Link from "next/link";

const settingsNavbar = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"use client";

import { Alert } from "@/components/ui/alert";
import { Badge } from "@/components/ui/badge";
import {
Dialog,
DialogContent,
Expand All @@ -20,7 +19,7 @@ import {
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import type { ColumnDef } from "@tanstack/react-table";
import { Button, Checkbox, InfoTooltip } from "@unkey/ui";
import { Badge, Button, Checkbox, InfoTooltip } from "@unkey/ui";
import { ArrowUpDown, Minus, MoreHorizontal, MoreVertical, Trash } from "lucide-react";
import ms from "ms";
import Link from "next/link";
Expand Down
Loading
Loading