Skip to content

Open-source status page, incident response and uptime monitoring

🚧 barrel (#964)

Thibault Le Ouay666e97d6a480
diff --git a/apps/web/src/app/(content)/_components/pagination.tsx b/apps/web/src/app/(content)/_components/pagination.tsx
index 70fe25377..5b001b88c 100644
--- a/apps/web/src/app/(content)/_components/pagination.tsx
+++ b/apps/web/src/app/(content)/_components/pagination.tsx
@@ -2,7 +2,7 @@ import type { Changelog } from "contentlayer/generated";
import { ChevronLeft, ChevronRight } from "lucide-react";
import Link from "next/link";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
export function Pagination({
// biome-ignore lint/correctness/noUnusedVariables: <explanation>
diff --git a/apps/web/src/app/(content)/blog/[slug]/page.tsx b/apps/web/src/app/(content)/blog/[slug]/page.tsx
index 3d7c0b02c..040433938 100644
--- a/apps/web/src/app/(content)/blog/[slug]/page.tsx
+++ b/apps/web/src/app/(content)/blog/[slug]/page.tsx
@@ -68,7 +68,7 @@ export default function PostPage({ params }: { params: { slug: string } }) {
return (
<>
<BackButton href="/blog" />
- <Shell className="md:py-12 sm:py-8">
+ <Shell className="sm:py-8 md:py-12">
<Article post={post} />
</Shell>
</>
diff --git a/apps/web/src/app/(content)/blog/page.tsx b/apps/web/src/app/(content)/blog/page.tsx
index 4f4b18f94..1e6f95839 100644
--- a/apps/web/src/app/(content)/blog/page.tsx
+++ b/apps/web/src/app/(content)/blog/page.tsx
@@ -3,7 +3,7 @@ import { Rss } from "lucide-react";
import type { Metadata } from "next";
import Link from "next/link";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import {
defaultMetadata,
diff --git a/apps/web/src/app/(content)/changelog/[slug]/page.tsx b/apps/web/src/app/(content)/changelog/[slug]/page.tsx
index beea68063..fdf93aa22 100644
--- a/apps/web/src/app/(content)/changelog/[slug]/page.tsx
+++ b/apps/web/src/app/(content)/changelog/[slug]/page.tsx
@@ -92,7 +92,7 @@ export default function ChangelogPage({
return (
<>
<BackButton href="/changelog" />
- <Shell className="flex flex-col gap-8 md:gap-12 md:py-12 sm:py-8">
+ <Shell className="flex flex-col gap-8 sm:py-8 md:gap-12 md:py-12">
<ChangelogCard post={post} />
<Separator className="mx-auto max-w-prose" />
<Pagination {...{ next, prev }} />
diff --git a/apps/web/src/app/(content)/changelog/page.tsx b/apps/web/src/app/(content)/changelog/page.tsx
index 43e17c241..6d9d32dc1 100644
--- a/apps/web/src/app/(content)/changelog/page.tsx
+++ b/apps/web/src/app/(content)/changelog/page.tsx
@@ -2,7 +2,7 @@ import { allChangelogs } from "contentlayer/generated";
import { Rss } from "lucide-react";
import type { Metadata } from "next";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import {
defaultMetadata,
diff --git a/apps/web/src/app/(content)/features/_components/banner.tsx b/apps/web/src/app/(content)/features/_components/banner.tsx
index 86649106c..b201052e2 100644
--- a/apps/web/src/app/(content)/features/_components/banner.tsx
+++ b/apps/web/src/app/(content)/features/_components/banner.tsx
@@ -1,5 +1,5 @@
import { Shell } from "@/components/dashboard/shell";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import Link from "next/link";
export function Banner() {
diff --git a/apps/web/src/app/_components/submit-button.tsx b/apps/web/src/app/_components/submit-button.tsx
index 7e6cd60db..33b26fa28 100644
--- a/apps/web/src/app/_components/submit-button.tsx
+++ b/apps/web/src/app/_components/submit-button.tsx
@@ -2,7 +2,7 @@
import { useFormStatus } from "react-dom";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { LoadingAnimation } from "@/components/loading-animation";
diff --git a/apps/web/src/app/about/_components/member.tsx b/apps/web/src/app/about/_components/member.tsx
index 38f5a902c..7b625f4e6 100644
--- a/apps/web/src/app/about/_components/member.tsx
+++ b/apps/web/src/app/about/_components/member.tsx
@@ -1,7 +1,7 @@
import Image from "next/image";
import Link from "next/link";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { cn } from "@openstatus/ui/src/lib/utils";
import { Icons } from "@/components/icons";
diff --git a/apps/web/src/app/about/page.tsx b/apps/web/src/app/about/page.tsx
index 8e522f63c..18e13862c 100644
--- a/apps/web/src/app/about/page.tsx
+++ b/apps/web/src/app/about/page.tsx
@@ -1,6 +1,6 @@
import { allUnrelateds } from "contentlayer/generated";
-import { Separator } from "@openstatus/ui";
+import { Separator } from "@openstatus/ui/src/components/separator";
import { Mdx } from "@/components/content/mdx";
import { Shell } from "@/components/dashboard/shell";
@@ -25,7 +25,7 @@ export default function AboutPage() {
</p>
<p className="italic">Made by developers for developers.</p>
</div>
- <ul className="grid grid-cols-2 gap-4 sm:grid-cols-3 md:gap-8 sm:gap-6">
+ <ul className="grid grid-cols-2 gap-4 sm:grid-cols-3 sm:gap-6 md:gap-8">
{members.map((member) => (
<li key={member.name}>
<Member {...member} />
@@ -34,7 +34,7 @@ export default function AboutPage() {
<li />
</ul>
<Separator className="my-2" />
- <Shell className="mx-auto w-auto shadow dark:border-card-foreground/30 md:px-12 sm:px-8 md:py-12 sm:py-8">
+ <Shell className="mx-auto w-auto shadow sm:px-8 sm:py-8 md:px-12 md:py-12 dark:border-card-foreground/30">
{story ? (
<Mdx
code={story.body.code}
diff --git a/apps/web/src/app/app/(auth)/login/layout.tsx b/apps/web/src/app/app/(auth)/login/layout.tsx
index 811edb45c..0fa5a9cec 100644
--- a/apps/web/src/app/app/(auth)/login/layout.tsx
+++ b/apps/web/src/app/app/(auth)/login/layout.tsx
@@ -14,7 +14,7 @@ export default async function AuthLayout({
return (
<div className="grid min-h-screen grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-5">
- <aside className="col-span-1 flex w-full flex-col gap-4 border border-border p-4 backdrop-blur-[2px] xl:col-span-2 md:p-8">
+ <aside className="col-span-1 flex w-full flex-col gap-4 border border-border p-4 backdrop-blur-[2px] md:p-8 xl:col-span-2">
<Link href="/" className="relative h-8 w-8">
<Image
src="/icon.png"
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
index f1ec07f14..279661265 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
@@ -3,7 +3,7 @@ import { notFound } from "next/navigation";
import { z } from "zod";
import { OSTinybird } from "@openstatus/tinybird";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { EmptyState } from "@/components/dashboard/empty-state";
import { Limit } from "@/components/dashboard/limit";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/page.tsx
index b4dafca35..f6b904554 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/page.tsx
@@ -1,7 +1,7 @@
import Link from "next/link";
import * as z from "zod";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { EmptyState } from "@/components/dashboard/empty-state";
import { ResponseDetails } from "@/components/monitor-dashboard/response-details";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx
index 234d85676..319f1d734 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx
@@ -1,6 +1,6 @@
import { notFound } from "next/navigation";
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import { Header } from "@/components/dashboard/header";
import AppPageWithSidebarLayout from "@/components/layout/app-page-with-sidebar-layout";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsx
index 04a2184c3..c12f289e9 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsx
@@ -5,14 +5,14 @@ export default function Loading() {
<div className="grid gap-4">
<Skeleton className="h-10 w-[150px]" />
<div className="grid gap-6">
- <div className="grid grid-cols-2 gap-4 md:grid-cols-5 sm:grid-cols-4 md:gap-6">
+ <div className="grid grid-cols-2 gap-4 sm:grid-cols-4 md:grid-cols-5 md:gap-6">
{new Array(4).fill(0).map((_, i) => (
// biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
<Skeleton key={i} className="h-16 w-full" />
))}
</div>
<div className="grid gap-4">
- <div className="grid grid-cols-2 gap-4 md:grid-cols-5 sm:grid-cols-4 md:gap-6">
+ <div className="grid grid-cols-2 gap-4 sm:grid-cols-4 md:grid-cols-5 md:gap-6">
{new Array(5).fill(0).map((_, i) => (
// biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
<Skeleton key={i} className="h-16 w-full" />
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/_components/refresh-widget.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/_components/refresh-widget.tsx
index 9243061d8..7e05805d3 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/_components/refresh-widget.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/_components/refresh-widget.tsx
@@ -3,7 +3,7 @@
import { useRouter } from "next/navigation";
import { useEffect, useState } from "react";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { api } from "@/trpc/client";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/page.tsx
index 16a343f0d..8b4d2a03a 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/page.tsx
@@ -1,7 +1,7 @@
import Link from "next/link";
import * as React from "react";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { EmptyState } from "@/components/dashboard/empty-state";
import { Limit } from "@/components/dashboard/limit";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/_components/request-button/request-button.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/_components/request-button/request-button.tsx
index bffa0390d..15d151a94 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/_components/request-button/request-button.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/_components/request-button/request-button.tsx
@@ -1,6 +1,6 @@
"use client";
import { auth } from "@/lib/auth";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { Redis } from "@upstash/redis";
import { useState } from "react";
import { RequestAccessToRum } from "./action";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/_components/rum-metric-card.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/_components/rum-metric-card.tsx
index 9a9df9d43..a559126e5 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/_components/rum-metric-card.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/_components/rum-metric-card.tsx
@@ -10,7 +10,7 @@ export const RUMMetricCards = async ({ dsn }: { dsn: string }) => {
period: "24h",
});
return (
- <div className="grid grid-cols-1 gap-2 lg:grid-cols-5 md:grid-cols-2">
+ <div className="grid grid-cols-1 gap-2 md:grid-cols-2 lg:grid-cols-5">
<RUMCard event="CLS" value={data?.cls || 0} />
<RUMCard event="FCP" value={data?.fcp || 0} />
<RUMCard event="INP" value={data?.inp || 0} />
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/_components/path-card.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/_components/path-card.tsx
index 179811a3f..3abcc78e1 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/_components/path-card.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/_components/path-card.tsx
@@ -21,7 +21,7 @@ export const PathCard = async ({
return null;
}
return (
- <div className="grid grid-cols-1 gap-2 lg:grid-cols-5 md:grid-cols-2">
+ <div className="grid grid-cols-1 gap-2 md:grid-cols-2 lg:grid-cols-5">
<RUMCard event="CLS" value={data?.cls || 0} />
<RUMCard event="FCP" value={data?.fcp || 0} />
<RUMCard event="INP" value={data?.inp || 0} />
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx
index 3d68af6ed..ec99a1754 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx
@@ -38,7 +38,7 @@ export async function ApiKeys({ ownerId }: { ownerId: number }) {
}
>
{key ? (
- <dl className="grid gap-2 [&_dt]:font-light [&>*]:text-sm [&_dt]:text-muted-foreground">
+ <dl className="grid gap-2 [&>*]:text-sm [&_dt]:font-light [&_dt]:text-muted-foreground">
<div className="flex min-w-0 items-center justify-between gap-3">
<dt>Token</dt>
<dd className="font-mono">{key.start}...</dd>
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/submit-button.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/submit-button.tsx
index 7daf17420..ed48e706f 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/submit-button.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/submit-button.tsx
@@ -2,7 +2,7 @@
import { useFormStatus } from "react-dom";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { LoadingAnimation } from "@/components/loading-animation";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/appearance/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/appearance/page.tsx
index 05970a7bd..803591ece 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/appearance/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/appearance/page.tsx
@@ -11,7 +11,7 @@ export default function AppearancePage() {
const { setTheme, theme } = useTheme();
return (
- <div className="grid grid-cols-1 gap-4 md:grid-cols-4 sm:grid-cols-2">
+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-4">
<button type="button" onClick={() => setTheme("light")}>
<LightModeCard active={theme === "light"} />
<span className="mt-2 font-light text-muted-foreground text-sm">
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/_components/customer-portal-button.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/_components/customer-portal-button.tsx
index 00d434515..7fe7c2329 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/_components/customer-portal-button.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/_components/customer-portal-button.tsx
@@ -3,7 +3,7 @@
import { useRouter } from "next/navigation";
import { useTransition } from "react";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { LoadingAnimation } from "@/components/loading-animation";
import { api } from "@/trpc/client";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/general/_components/copy-to-clipboard-button.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/general/_components/copy-to-clipboard-button.tsx
index 3db3d006e..9b5d1013a 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/general/_components/copy-to-clipboard-button.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/general/_components/copy-to-clipboard-button.tsx
@@ -2,8 +2,8 @@
import * as React from "react";
-import { Button } from "@openstatus/ui";
import type { ButtonProps } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { Icons } from "@/components/icons";
import { cn, copyToClipboard } from "@/lib/utils";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/page.tsx
index 26ba6e09d..3162845b7 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/page.tsx
@@ -1,7 +1,7 @@
import Link from "next/link";
import * as React from "react";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { EmptyState } from "@/components/dashboard/empty-state";
import { Limit } from "@/components/dashboard/limit";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsx
index ee99e1a9d..3b0714885 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsx
@@ -1,7 +1,7 @@
import Link from "next/link";
import { notFound } from "next/navigation";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { getBaseUrl } from "@/app/status-page/[domain]/utils";
import { Header } from "@/components/dashboard/header";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/maintenances/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/maintenances/(overview)/page.tsx
index 277e961ed..bcb1e977e 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/maintenances/(overview)/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/maintenances/(overview)/page.tsx
@@ -2,7 +2,7 @@ import { EmptyState } from "@/components/dashboard/empty-state";
import { columns } from "@/components/data-table/maintenance/columns";
import { DataTable } from "@/components/data-table/maintenance/data-table";
import { api } from "@/trpc/server";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import Link from "next/link";
export default async function MaintenancePage({
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/reports/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/reports/(overview)/page.tsx
index 4a3e502bc..d595a13cd 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/reports/(overview)/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/reports/(overview)/page.tsx
@@ -1,7 +1,7 @@
import Link from "next/link";
import * as React from "react";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { EmptyState } from "@/components/dashboard/empty-state";
import { columns } from "@/components/data-table/status-report/columns";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/reports/[reportId]/overview/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/reports/[reportId]/overview/page.tsx
index cbd7d29a5..78268dd5e 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/reports/[reportId]/overview/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/reports/[reportId]/overview/page.tsx
@@ -2,7 +2,7 @@ import Link from "next/link";
import { notFound } from "next/navigation";
import * as React from "react";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { EmptyState } from "@/components/dashboard/empty-state";
import { Events } from "@/components/status-update/events";
diff --git a/apps/web/src/app/app/[workspaceSlug]/onboarding/page.tsx b/apps/web/src/app/app/[workspaceSlug]/onboarding/page.tsx
index 4af992b75..ad735d947 100644
--- a/apps/web/src/app/app/[workspaceSlug]/onboarding/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/onboarding/page.tsx
@@ -1,7 +1,7 @@
import Link from "next/link";
import { redirect } from "next/navigation";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { Header } from "@/components/dashboard/header";
import { MonitorForm } from "@/components/forms/monitor/form";
diff --git a/apps/web/src/app/legal/[slug]/page.tsx b/apps/web/src/app/legal/[slug]/page.tsx
index 19c664416..22203d7ba 100644
--- a/apps/web/src/app/legal/[slug]/page.tsx
+++ b/apps/web/src/app/legal/[slug]/page.tsx
@@ -24,7 +24,7 @@ export default function PostPage({ params }: { params: { slug: string } }) {
return (
<>
<BackButton href="/" />
- <Shell className="md:py-12 sm:py-8">
+ <Shell className="sm:py-8 md:py-12">
<article className="grid gap-8">
<div className="mx-auto grid w-full max-w-prose gap-3">
<h1 className="mb-5 font-cal text-3xl">{post.title}</h1>
diff --git a/apps/web/src/app/not-found.tsx b/apps/web/src/app/not-found.tsx
index 05a6c8193..0908c53cd 100644
--- a/apps/web/src/app/not-found.tsx
+++ b/apps/web/src/app/not-found.tsx
@@ -3,7 +3,7 @@
import Link from "next/link";
import { useRouter } from "next/navigation";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { Shell } from "@/components/dashboard/shell";
diff --git a/apps/web/src/app/play/checker/[id]/page.tsx b/apps/web/src/app/play/checker/[id]/page.tsx
index 6bef578c3..f4c8df1c6 100644
--- a/apps/web/src/app/play/checker/[id]/page.tsx
+++ b/apps/web/src/app/play/checker/[id]/page.tsx
@@ -53,7 +53,7 @@ export default async function CheckPage({ params, searchParams }: Props) {
<Shell className="my-8 flex flex-col gap-8 md:my-16">
<div className="flex justify-between gap-4">
<div className="flex max-w-[calc(100%-50px)] flex-col gap-1">
- <h1 className="truncate text-wrap font-semibold text-lg md:text-3xl sm:text-xl">
+ <h1 className="truncate text-wrap font-semibold text-lg sm:text-xl md:text-3xl">
{data.url}
</h1>
<p className="text-muted-foreground text-sm sm:text-base">
diff --git a/apps/web/src/app/play/checker/_components/global-monitoring.tsx b/apps/web/src/app/play/checker/_components/global-monitoring.tsx
index 262076517..30d6a2944 100644
--- a/apps/web/src/app/play/checker/_components/global-monitoring.tsx
+++ b/apps/web/src/app/play/checker/_components/global-monitoring.tsx
@@ -1,6 +1,6 @@
import Link from "next/link";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { Shell } from "@/components/dashboard/shell";
import type { ValidIcon } from "@/components/icons";
diff --git a/apps/web/src/app/play/checker/_components/testimonial.tsx b/apps/web/src/app/play/checker/_components/testimonial.tsx
index a2cc974f1..234b9b454 100644
--- a/apps/web/src/app/play/checker/_components/testimonial.tsx
+++ b/apps/web/src/app/play/checker/_components/testimonial.tsx
@@ -4,7 +4,7 @@ export const Testimonial = () => {
return (
<div className="mx-auto max-w-2xl lg:max-w-4xl">
<figure className="grid gap-4">
- <blockquote className="text-center font-semibold text-xl leading-8 after:text-muted-foreground before:text-muted-foreground sm:text-2xl sm:leading-9 after:content-['”'] before:content-['“']">
+ <blockquote className="text-center font-semibold text-xl leading-8 before:text-muted-foreground before:content-['“'] after:text-muted-foreground after:content-['”'] sm:text-2xl sm:leading-9">
Just don't give up on your users
</blockquote>
<figcaption className="flex items-center justify-center space-x-3 text-base">
diff --git a/apps/web/src/app/play/page.tsx b/apps/web/src/app/play/page.tsx
index 8496a8ecc..48e5abac2 100644
--- a/apps/web/src/app/play/page.tsx
+++ b/apps/web/src/app/play/page.tsx
@@ -34,7 +34,7 @@ export const metadata: Metadata = {
export default async function PlayPage() {
return (
<>
- <div className="my-8 grid w-full grid-cols-1 gap-4 md:my-16 md:grid-cols-3 sm:grid-cols-2">
+ <div className="my-8 grid w-full grid-cols-1 gap-4 sm:grid-cols-2 md:my-16 md:grid-cols-3">
{playgrounds.map((play, i) => {
const isFirst = i === 0;
return (
diff --git a/apps/web/src/app/public/monitors/[id]/loading.tsx b/apps/web/src/app/public/monitors/[id]/loading.tsx
index 45ffb3760..363e4fd70 100644
--- a/apps/web/src/app/public/monitors/[id]/loading.tsx
+++ b/apps/web/src/app/public/monitors/[id]/loading.tsx
@@ -16,14 +16,14 @@ export default function Loading() {
</Shell>
<Shell className="grid gap-4">
<div className="grid gap-6">
- <div className="grid grid-cols-2 gap-4 md:grid-cols-5 sm:grid-cols-4 md:gap-6">
+ <div className="grid grid-cols-2 gap-4 sm:grid-cols-4 md:grid-cols-5 md:gap-6">
{new Array(4).fill(0).map((_, i) => (
// biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
<Skeleton key={i} className="h-16 w-full" />
))}
</div>
<div className="grid gap-4">
- <div className="grid grid-cols-2 gap-4 md:grid-cols-5 sm:grid-cols-4 md:gap-6">
+ <div className="grid grid-cols-2 gap-4 sm:grid-cols-4 md:grid-cols-5 md:gap-6">
{new Array(5).fill(0).map((_, i) => (
// biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
<Skeleton key={i} className="h-16 w-full" />
diff --git a/apps/web/src/app/status-page/[domain]/_components/header.tsx b/apps/web/src/app/status-page/[domain]/_components/header.tsx
index d0b0626a8..1d5f79d2f 100644
--- a/apps/web/src/app/status-page/[domain]/_components/header.tsx
+++ b/apps/web/src/app/status-page/[domain]/_components/header.tsx
@@ -7,8 +7,6 @@ import type { PublicPage } from "@openstatus/db/src/schema";
import { allPlans } from "@openstatus/db/src/schema/plan/config";
import type { WorkspacePlan } from "@openstatus/db/src/schema/workspaces/validation";
-import { Shell } from "@/components/dashboard/shell";
-import { TabsContainer, TabsLink } from "@/components/dashboard/tabs-link";
import { cn } from "@/lib/utils";
import Link from "next/link";
import { Menu } from "./menu";
diff --git a/apps/web/src/app/status-page/[domain]/_components/menu.tsx b/apps/web/src/app/status-page/[domain]/_components/menu.tsx
index 9f947452b..35d00999e 100644
--- a/apps/web/src/app/status-page/[domain]/_components/menu.tsx
+++ b/apps/web/src/app/status-page/[domain]/_components/menu.tsx
@@ -4,14 +4,14 @@ import { MenuIcon } from "lucide-react";
import { usePathname, useSelectedLayoutSegment } from "next/navigation";
import * as React from "react";
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Button,
Sheet,
SheetContent,
SheetHeader,
SheetTitle,
SheetTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/sheet";
import { AppLink } from "@/components/layout/app-link";
diff --git a/apps/web/src/app/status-page/[domain]/_components/password-form.tsx b/apps/web/src/app/status-page/[domain]/_components/password-form.tsx
index 241479554..da9a479c8 100644
--- a/apps/web/src/app/status-page/[domain]/_components/password-form.tsx
+++ b/apps/web/src/app/status-page/[domain]/_components/password-form.tsx
@@ -7,22 +7,21 @@ import { Suspense, useEffect, useState, useTransition } from "react";
import { useForm } from "react-hook-form";
import { z } from "zod";
+import { LoadingAnimation } from "@/components/loading-animation";
+import { useCookieState } from "@/hooks/use-cookie-state";
+import { toast, toastAction } from "@/lib/toast";
+import { wait } from "@/lib/utils";
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Button,
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
- InputWithAddons,
- Skeleton,
-} from "@openstatus/ui";
-
-import { LoadingAnimation } from "@/components/loading-animation";
-import { useCookieState } from "@/hooks/use-cookie-state";
-import { toast, toastAction } from "@/lib/toast";
-import { wait } from "@/lib/utils";
+} from "@openstatus/ui/src/components/form";
+import { InputWithAddons } from "@openstatus/ui/src/components/input-with-addons";
+import { Skeleton } from "@openstatus/ui/src/components/skeleton";
import { createProtectedCookieKey } from "../utils";
import { handleValidatePassword } from "./actions";
diff --git a/apps/web/src/app/status-page/[domain]/_components/subscribe-button.tsx b/apps/web/src/app/status-page/[domain]/_components/subscribe-button.tsx
index 1ea0ce81f..68cddd7b1 100644
--- a/apps/web/src/app/status-page/[domain]/_components/subscribe-button.tsx
+++ b/apps/web/src/app/status-page/[domain]/_components/subscribe-button.tsx
@@ -4,17 +4,17 @@ import { Mail } from "lucide-react";
import { useFormStatus } from "react-dom";
import {
- Button,
- Input,
- Label,
Popover,
PopoverContent,
PopoverTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/popover";
import { LoadingAnimation } from "@/components/loading-animation";
import { toast } from "@/lib/toast";
import { wait } from "@/lib/utils";
+import { Button } from "@openstatus/ui/src/components/button";
+import { Input } from "@openstatus/ui/src/components/input";
+import { Label } from "@openstatus/ui/src/components/label";
import { handleSubscribe } from "./actions";
interface Props {
diff --git a/apps/web/src/app/status-page/[domain]/events/report/[id]/_components/copy-link-button.tsx b/apps/web/src/app/status-page/[domain]/events/report/[id]/_components/copy-link-button.tsx
index 622854f7e..f93464ca6 100644
--- a/apps/web/src/app/status-page/[domain]/events/report/[id]/_components/copy-link-button.tsx
+++ b/apps/web/src/app/status-page/[domain]/events/report/[id]/_components/copy-link-button.tsx
@@ -2,13 +2,13 @@
import * as React from "react";
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Button,
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/tooltip";
import { Icons } from "@/components/icons";
import { copyToClipboard } from "@/lib/utils";
diff --git a/apps/web/src/app/status-page/[domain]/events/report/[id]/page.tsx b/apps/web/src/app/status-page/[domain]/events/report/[id]/page.tsx
index a9c9b4abf..a66dab555 100644
--- a/apps/web/src/app/status-page/[domain]/events/report/[id]/page.tsx
+++ b/apps/web/src/app/status-page/[domain]/events/report/[id]/page.tsx
@@ -4,7 +4,7 @@ import { Header } from "@/components/dashboard/header";
import { DateTimeTooltip } from "@/components/status-page/datetime-tooltip";
import { StatusReportUpdates } from "@/components/status-page/status-report";
import { api } from "@/trpc/server";
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import { CopyLinkButton } from "./_components/copy-link-button";
export default async function IncidentPage({
diff --git a/apps/web/src/app/status-page/[domain]/loading.tsx b/apps/web/src/app/status-page/[domain]/loading.tsx
index bc129e5d0..6f53e3232 100644
--- a/apps/web/src/app/status-page/[domain]/loading.tsx
+++ b/apps/web/src/app/status-page/[domain]/loading.tsx
@@ -1,4 +1,4 @@
-import { Skeleton } from "@openstatus/ui";
+import { Skeleton } from "@openstatus/ui/src/components/skeleton";
import { Container } from "@/components/dashboard/container";
import { Header } from "@/components/dashboard/header";
diff --git a/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx b/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx
index 974dc9a42..6b5a31970 100644
--- a/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx
+++ b/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx
@@ -5,7 +5,7 @@ import * as z from "zod";
import { flyRegions } from "@openstatus/db/src/schema/constants";
import type { Region } from "@openstatus/tinybird";
import { OSTinybird } from "@openstatus/tinybird";
-import { Separator } from "@openstatus/ui";
+import { Separator } from "@openstatus/ui/src/components/separator";
import { Header } from "@/components/dashboard/header";
import { CombinedChartWrapper } from "@/components/monitor-charts/combined-chart-wrapper";
diff --git a/apps/web/src/app/status-page/[domain]/monitors/page.tsx b/apps/web/src/app/status-page/[domain]/monitors/page.tsx
index 6820ed341..7efa96818 100644
--- a/apps/web/src/app/status-page/[domain]/monitors/page.tsx
+++ b/apps/web/src/app/status-page/[domain]/monitors/page.tsx
@@ -4,7 +4,7 @@ import { notFound } from "next/navigation";
import { z } from "zod";
import { OSTinybird } from "@openstatus/tinybird";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { EmptyState } from "@/components/dashboard/empty-state";
import { Header } from "@/components/dashboard/header";
diff --git a/apps/web/src/components/billing/pro-banner.tsx b/apps/web/src/components/billing/pro-banner.tsx
index b263f14a8..2fd5ce556 100644
--- a/apps/web/src/components/billing/pro-banner.tsx
+++ b/apps/web/src/components/billing/pro-banner.tsx
@@ -5,7 +5,7 @@ import Link from "next/link";
import { useParams } from "next/navigation";
import { useEffect, useState } from "react";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { api } from "@/trpc/client";
diff --git a/apps/web/src/components/content/pre.tsx b/apps/web/src/components/content/pre.tsx
index e50df2d9c..ff049fff7 100644
--- a/apps/web/src/components/content/pre.tsx
+++ b/apps/web/src/components/content/pre.tsx
@@ -1,6 +1,6 @@
"use client";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { Clipboard, ClipboardCopy } from "lucide-react";
import React from "react";
diff --git a/apps/web/src/components/dashboard/tabs.tsx b/apps/web/src/components/dashboard/tabs.tsx
index 50d32db95..62364589e 100644
--- a/apps/web/src/components/dashboard/tabs.tsx
+++ b/apps/web/src/components/dashboard/tabs.tsx
@@ -35,7 +35,7 @@ export function TabsTrigger({
return (
<ShadcnTabsTrigger
className={cn(
- "relative rounded-none border-b-4 border-b-transparent bg-transparent px-4 pt-2 pb-3 text-muted-foreground shadow-none transition-none data-[state=active]:border-b-primary data-[state=active]:bg-transparent data-[state=active]:text-foreground hover:text-primary data-[state=active]:shadow-none",
+ "relative rounded-none border-b-4 border-b-transparent bg-transparent px-4 pt-2 pb-3 text-muted-foreground shadow-none transition-none hover:text-primary data-[state=active]:border-b-primary data-[state=active]:bg-transparent data-[state=active]:text-foreground data-[state=active]:shadow-none",
className,
)}
{...props}
diff --git a/apps/web/src/components/data-table/data-table-badges.tsx b/apps/web/src/components/data-table/data-table-badges.tsx
index ca4aa2c61..695dec2c4 100644
--- a/apps/web/src/components/data-table/data-table-badges.tsx
+++ b/apps/web/src/components/data-table/data-table-badges.tsx
@@ -13,7 +13,7 @@ export function DataTableBadges({ names }: { names: string[] }) {
return (
<div className="flex items-center gap-2">
- <span className="flex max-w-[150px] gap-2 truncate font-medium lg:max-w-[250px] sm:max-w-[200px] xl:max-w-[350px]">
+ <span className="flex max-w-[150px] gap-2 truncate font-medium sm:max-w-[200px] lg:max-w-[250px] xl:max-w-[350px]">
<Badge variant="outline">{first}</Badge>
{second ? <Badge variant="outline">{second}</Badge> : null}
</span>
diff --git a/apps/web/src/components/data-table/data-table-faceted-input-dropdown.tsx b/apps/web/src/components/data-table/data-table-faceted-input-dropdown.tsx
index 4a80b1556..975185f93 100644
--- a/apps/web/src/components/data-table/data-table-faceted-input-dropdown.tsx
+++ b/apps/web/src/components/data-table/data-table-faceted-input-dropdown.tsx
@@ -72,7 +72,7 @@ export function DataTableFacetedInputDropdown<TData, TValue>({
</Select>
<Separator orientation="vertical" className="h-4" />
<input
- className="w-24 rounded-md bg-background px-3 py-2 disabled:cursor-not-allowed placeholder:text-muted-foreground disabled:opacity-50 focus:outline-none"
+ className="w-24 rounded-md bg-background px-3 py-2 placeholder:text-muted-foreground focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
type="number"
placeholder="4000"
min={0}
diff --git a/apps/web/src/components/data-table/data-table-status-badge.tsx b/apps/web/src/components/data-table/data-table-status-badge.tsx
index c11d68fdf..f9dd4a546 100644
--- a/apps/web/src/components/data-table/data-table-status-badge.tsx
+++ b/apps/web/src/components/data-table/data-table-status-badge.tsx
@@ -1,5 +1,5 @@
import type { Ping } from "@openstatus/tinybird";
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import { StatusCodeBadge } from "../monitor/status-code-badge";
diff --git a/apps/web/src/components/data-table/data-table-toolbar.tsx b/apps/web/src/components/data-table/data-table-toolbar.tsx
index 1dab95f49..b19a710f5 100644
--- a/apps/web/src/components/data-table/data-table-toolbar.tsx
+++ b/apps/web/src/components/data-table/data-table-toolbar.tsx
@@ -4,7 +4,7 @@ import type { Table } from "@tanstack/react-table";
import { X } from "lucide-react";
import { useRouter } from "next/navigation";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { flyRegionsDict } from "@openstatus/utils";
import { codesDict } from "@/data/code-dictionary";
diff --git a/apps/web/src/components/data-table/data-table.tsx b/apps/web/src/components/data-table/data-table.tsx
index 8b8361a17..9f1e8f076 100644
--- a/apps/web/src/components/data-table/data-table.tsx
+++ b/apps/web/src/components/data-table/data-table.tsx
@@ -129,7 +129,7 @@ export function DataTable<TData, TValue>({
{row.getIsExpanded() && (
<TableRow
data-state="expanded"
- className="data-[state=expanded]:bg-muted/10 hover:bg-muted/10"
+ className="hover:bg-muted/10 data-[state=expanded]:bg-muted/10"
>
{/* 2nd row is a custom 1 cell row */}
<TableCell colSpan={row.getVisibleCells().length}>
diff --git a/apps/web/src/components/data-table/incident/columns.tsx b/apps/web/src/components/data-table/incident/columns.tsx
index 5adae12c9..23faaec90 100644
--- a/apps/web/src/components/data-table/incident/columns.tsx
+++ b/apps/web/src/components/data-table/incident/columns.tsx
@@ -35,7 +35,7 @@ export const columns: ColumnDef<Incident>[] = [
const date = startedAt ? formatDateTime(startedAt) : "-";
return (
<div className="flex gap-2">
- <span className="max-w-[150px] truncate text-muted-foreground lg:max-w-[250px] sm:max-w-[200px] xl:max-w-[350px]">
+ <span className="max-w-[150px] truncate text-muted-foreground sm:max-w-[200px] lg:max-w-[250px] xl:max-w-[350px]">
{date}
</span>
{incidentScreenshotUrl ? (
@@ -64,7 +64,7 @@ export const columns: ColumnDef<Incident>[] = [
const date = acknowledgedAt ? formatDateTime(acknowledgedAt) : "-";
return (
<div className="flex">
- <span className="max-w-[150px] truncate text-muted-foreground lg:max-w-[250px] sm:max-w-[200px] xl:max-w-[350px]">
+ <span className="max-w-[150px] truncate text-muted-foreground sm:max-w-[200px] lg:max-w-[250px] xl:max-w-[350px]">
{date}
</span>
</div>
@@ -79,7 +79,7 @@ export const columns: ColumnDef<Incident>[] = [
const date = resolvedAt ? formatDateTime(resolvedAt) : "-";
return (
<div className="flex gap-2">
- <span className="max-w-[150px] truncate text-muted-foreground lg:max-w-[250px] sm:max-w-[200px] xl:max-w-[350px]">
+ <span className="max-w-[150px] truncate text-muted-foreground sm:max-w-[200px] lg:max-w-[250px] xl:max-w-[350px]">
{date}
</span>
{recoveryScreenshotUrl ? (
@@ -115,7 +115,7 @@ export const columns: ColumnDef<Incident>[] = [
);
return (
<div className="flex">
- <span className="max-w-[150px] truncate text-muted-foreground lg:max-w-[250px] sm:max-w-[200px] xl:max-w-[350px]">
+ <span className="max-w-[150px] truncate text-muted-foreground sm:max-w-[200px] lg:max-w-[250px] xl:max-w-[350px]">
{duration}
</span>
</div>
diff --git a/apps/web/src/components/data-table/invitation/columns.tsx b/apps/web/src/components/data-table/invitation/columns.tsx
index a2691a751..4618ab8d2 100644
--- a/apps/web/src/components/data-table/invitation/columns.tsx
+++ b/apps/web/src/components/data-table/invitation/columns.tsx
@@ -3,7 +3,7 @@
import type { ColumnDef } from "@tanstack/react-table";
import type { Invitation, WorkspaceRole } from "@openstatus/db/src/schema";
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import { formatDate } from "@/lib/utils";
import { DataTableRowActions } from "./data-table-row-actions";
diff --git a/apps/web/src/components/data-table/notification/columns.tsx b/apps/web/src/components/data-table/notification/columns.tsx
index 0f5b2e76f..bfe4b7d47 100644
--- a/apps/web/src/components/data-table/notification/columns.tsx
+++ b/apps/web/src/components/data-table/notification/columns.tsx
@@ -3,7 +3,7 @@
import type { ColumnDef } from "@tanstack/react-table";
import type { Monitor, Notification } from "@openstatus/db/src/schema";
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import Link from "next/link";
import { z } from "zod";
diff --git a/apps/web/src/components/data-table/user/columns.tsx b/apps/web/src/components/data-table/user/columns.tsx
index 8ce7d85a2..f1f43de09 100644
--- a/apps/web/src/components/data-table/user/columns.tsx
+++ b/apps/web/src/components/data-table/user/columns.tsx
@@ -3,7 +3,7 @@
import type { ColumnDef } from "@tanstack/react-table";
import type { User, WorkspaceRole } from "@openstatus/db/src/schema";
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import { formatDate } from "@/lib/utils";
import { DataTableRowActions } from "./data-table-row-actions";
diff --git a/apps/web/src/components/forms/maintenance/section-connect.tsx b/apps/web/src/components/forms/maintenance/section-connect.tsx
index 05c88b32f..7c0784a24 100644
--- a/apps/web/src/components/forms/maintenance/section-connect.tsx
+++ b/apps/web/src/components/forms/maintenance/section-connect.tsx
@@ -41,7 +41,7 @@ export function SectionConnect({ form, monitors }: Props) {
</span>
</FormDescription>
</div>
- <div className="grid grid-cols-1 grid-rows-1 gap-6 md:grid-cols-3 sm:grid-cols-2">
+ <div className="grid grid-cols-1 grid-rows-1 gap-6 sm:grid-cols-2 md:grid-cols-3">
{monitors?.map((item) => (
<FormField
key={item.id}
diff --git a/apps/web/src/components/forms/monitor/section-notifications.tsx b/apps/web/src/components/forms/monitor/section-notifications.tsx
index 89eb27150..04483e786 100644
--- a/apps/web/src/components/forms/monitor/section-notifications.tsx
+++ b/apps/web/src/components/forms/monitor/section-notifications.tsx
@@ -48,7 +48,7 @@ export function SectionNotifications({ form, notifications }: Props) {
Select the notification channels you want to be informed.
</FormDescription>
</div>
- <div className="grid grid-cols-1 grid-rows-1 gap-4 md:grid-cols-3 sm:grid-cols-2">
+ <div className="grid grid-cols-1 grid-rows-1 gap-4 sm:grid-cols-2 md:grid-cols-3">
{notifications?.map((item) => (
<FormField
key={item.id}
diff --git a/apps/web/src/components/forms/monitor/section-scheduling.tsx b/apps/web/src/components/forms/monitor/section-scheduling.tsx
index 6ebe1a099..76afbb9ea 100644
--- a/apps/web/src/components/forms/monitor/section-scheduling.tsx
+++ b/apps/web/src/components/forms/monitor/section-scheduling.tsx
@@ -50,7 +50,7 @@ export function SectionScheduling({ form, limits, plan }: Props) {
title="Schedule and Regions"
description="Customize the period of time and the regions where your endpoint will be monitored."
/>
- <div className="grid md:grid-cols-3 sm:grid-cols-2">
+ <div className="grid sm:grid-cols-2 md:grid-cols-3">
<FormField
control={form.control}
name="periodicity"
diff --git a/apps/web/src/components/forms/monitor/section-status-page.tsx b/apps/web/src/components/forms/monitor/section-status-page.tsx
index fbbc9aacb..beb7def3a 100644
--- a/apps/web/src/components/forms/monitor/section-status-page.tsx
+++ b/apps/web/src/components/forms/monitor/section-status-page.tsx
@@ -66,7 +66,7 @@ export function SectionStatusPage({ form, pages }: Props) {
Select the pages where you want to display the monitor.
</FormDescription>
</div>
- <div className="grid grid-cols-1 grid-rows-1 gap-4 md:grid-cols-3 sm:grid-cols-2">
+ <div className="grid grid-cols-1 grid-rows-1 gap-4 sm:grid-cols-2 md:grid-cols-3">
{pages?.map((item) => (
<FormField
key={item.id}
diff --git a/apps/web/src/components/forms/notification/section-connect.tsx b/apps/web/src/components/forms/notification/section-connect.tsx
index 636362d5c..b80e3f6ac 100644
--- a/apps/web/src/components/forms/notification/section-connect.tsx
+++ b/apps/web/src/components/forms/notification/section-connect.tsx
@@ -35,7 +35,7 @@ export function SectionConnect({ form, monitors }: Props) {
Attach the notification to specific monitors.
</FormDescription>
</div>
- <div className="grid grid-cols-1 grid-rows-1 gap-6 md:grid-cols-3 sm:grid-cols-2">
+ <div className="grid grid-cols-1 grid-rows-1 gap-6 sm:grid-cols-2 md:grid-cols-3">
{monitors?.map((item) => (
<FormField
key={item.id}
diff --git a/apps/web/src/components/forms/shared/checkbox-label.tsx b/apps/web/src/components/forms/shared/checkbox-label.tsx
index c9f44bbf3..b6f3f534a 100644
--- a/apps/web/src/components/forms/shared/checkbox-label.tsx
+++ b/apps/web/src/components/forms/shared/checkbox-label.tsx
@@ -36,13 +36,13 @@ export function CheckboxLabel({
<Label
htmlFor={`${name}-${id}`}
className={cn(
- "flex h-full items-center gap-1 rounded-md border border-border bg-popover p-4 pr-10 [&:has([data-state=checked])]:border-primary peer-data-[state=checked]:border-primary hover:bg-accent hover:text-accent-foreground",
+ "flex h-full items-center gap-1 rounded-md border border-border bg-popover p-4 pr-10 hover:bg-accent hover:text-accent-foreground peer-data-[state=checked]:border-primary [&:has([data-state=checked])]:border-primary",
className,
)}
>
{children}
</Label>
- <div className="absolute inset-y-0 right-4 hidden items-center [&:has([data-state=checked])]:flex peer-data-[state=checked]:flex">
+ <div className="absolute inset-y-0 right-4 hidden items-center peer-data-[state=checked]:flex [&:has([data-state=checked])]:flex">
<CheckCircle2 className="h-4 w-4" />
</div>
</div>
diff --git a/apps/web/src/components/forms/shared/save-button.tsx b/apps/web/src/components/forms/shared/save-button.tsx
index eafcfe748..6074a481e 100644
--- a/apps/web/src/components/forms/shared/save-button.tsx
+++ b/apps/web/src/components/forms/shared/save-button.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { Kbd } from "../../kbd";
import { LoadingAnimation } from "../../loading-animation";
diff --git a/apps/web/src/components/forms/status-report/section-connect.tsx b/apps/web/src/components/forms/status-report/section-connect.tsx
index a24b71a3d..e10dced61 100644
--- a/apps/web/src/components/forms/status-report/section-connect.tsx
+++ b/apps/web/src/components/forms/status-report/section-connect.tsx
@@ -41,7 +41,7 @@ export function SectionConnect({ form, monitors }: Props) {
will be displayed on the status page they are attached to.
</FormDescription>
</div>
- <div className="grid grid-cols-1 grid-rows-1 gap-6 md:grid-cols-3 sm:grid-cols-2">
+ <div className="grid grid-cols-1 grid-rows-1 gap-6 sm:grid-cols-2 md:grid-cols-3">
{monitors?.map((item) => (
<FormField
key={item.id}
diff --git a/apps/web/src/components/layout/app-menu.tsx b/apps/web/src/components/layout/app-menu.tsx
index f7078cc88..686603e51 100644
--- a/apps/web/src/components/layout/app-menu.tsx
+++ b/apps/web/src/components/layout/app-menu.tsx
@@ -8,7 +8,7 @@ import {
Collapsible,
CollapsibleContent,
CollapsibleTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/collapsible";
import type { Page } from "@/config/pages";
import { AppSidebar } from "./app-sidebar";
@@ -30,7 +30,7 @@ export function AppMenu({ page }: { page?: Page }) {
<span className="font-medium text-foreground">
{activeChild?.title}
</span>
- <span className="inline-flex h-9 w-9 items-center justify-center rounded-md font-medium text-sm transition-colors disabled:pointer-events-none hover:bg-accent hover:text-accent-foreground disabled:opacity-50 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring">
+ <span className="inline-flex h-9 w-9 items-center justify-center rounded-md font-medium text-sm transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50">
<ChevronsUpDown className="h-4 w-4" />
</span>
</CollapsibleTrigger>
diff --git a/apps/web/src/components/layout/app-page-with-sidebar-layout.tsx b/apps/web/src/components/layout/app-page-with-sidebar-layout.tsx
index d0326b69d..296877e41 100644
--- a/apps/web/src/components/layout/app-page-with-sidebar-layout.tsx
+++ b/apps/web/src/components/layout/app-page-with-sidebar-layout.tsx
@@ -18,7 +18,7 @@ export default function AppPageWithSidebarLayout({
return (
<div className="flex w-full flex-1 flex-col gap-6 lg:flex-row lg:gap-8">
- <Shell className="block py-3 lg:hidden md:py-3">
+ <Shell className="block py-3 md:py-3 lg:hidden">
<AppMenu page={page} />
</Shell>
<Shell className="hidden max-h-[calc(100vh-8rem)] max-w-min shrink-0 lg:sticky lg:top-28 lg:block">
diff --git a/apps/web/src/components/layout/back-button.tsx b/apps/web/src/components/layout/back-button.tsx
index 6146193a5..d24c69508 100644
--- a/apps/web/src/components/layout/back-button.tsx
+++ b/apps/web/src/components/layout/back-button.tsx
@@ -2,7 +2,7 @@ import { ChevronLeft } from "lucide-react";
import type { LinkProps } from "next/link";
import Link from "next/link";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
interface BackButtonProps extends LinkProps {
children?: React.ReactNode;
diff --git a/apps/web/src/components/layout/brand-name.tsx b/apps/web/src/components/layout/brand-name.tsx
index 744aad1af..207dd090c 100644
--- a/apps/web/src/components/layout/brand-name.tsx
+++ b/apps/web/src/components/layout/brand-name.tsx
@@ -9,7 +9,7 @@ import {
ContextMenuContent,
ContextMenuItem,
ContextMenuTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/context-menu";
import Image from "next/image";
export function BrandName() {
diff --git a/apps/web/src/components/layout/login-button.tsx b/apps/web/src/components/layout/login-button.tsx
index 35b5551b8..2e067c62a 100644
--- a/apps/web/src/components/layout/login-button.tsx
+++ b/apps/web/src/components/layout/login-button.tsx
@@ -3,8 +3,8 @@
import { useSession } from "next-auth/react";
import Link from "next/link";
-import type { ButtonProps } from "@openstatus/ui";
-import { Button } from "@openstatus/ui";
+import type { ButtonProps } from "@openstatus/ui/src/components/button";
+import { Button } from "@openstatus/ui/src/components/button";
import { cn } from "@/lib/utils";
diff --git a/apps/web/src/components/layout/marketing-header.tsx b/apps/web/src/components/layout/marketing-header.tsx
index 63141c722..8c509df42 100644
--- a/apps/web/src/components/layout/marketing-header.tsx
+++ b/apps/web/src/components/layout/marketing-header.tsx
@@ -11,7 +11,7 @@ import {
NavigationMenuList,
NavigationMenuTrigger,
navigationMenuTriggerStyle,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/navigation-menu";
import { marketingPagesConfig } from "@/config/pages";
import { cn } from "@/lib/utils";
@@ -72,7 +72,7 @@ export function MarketingHeader({ className }: Props) {
{title}
</NavigationMenuTrigger>
<NavigationMenuContent>
- <ul className="grid w-[400px] gap-3 p-4 lg:w-[600px] md:w-[500px] md:grid-cols-2">
+ <ul className="grid w-[400px] gap-3 p-4 md:w-[500px] md:grid-cols-2 lg:w-[600px]">
{children?.map((item) => {
const isExternal = item.href.startsWith("http");
const _externalProps = isExternal
@@ -121,7 +121,7 @@ const ListItem = React.forwardRef<
<Link
ref={ref}
className={cn(
- "flex select-none gap-3 space-y-1 rounded-md p-3 leading-none no-underline outline-none transition-colors focus:bg-accent hover:bg-accent focus:text-accent-foreground hover:text-accent-foreground",
+ "flex select-none gap-3 space-y-1 rounded-md p-3 leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground",
className,
)}
{...props}
diff --git a/apps/web/src/components/layout/marketing-menu.tsx b/apps/web/src/components/layout/marketing-menu.tsx
index 1cd755368..5b3950532 100644
--- a/apps/web/src/components/layout/marketing-menu.tsx
+++ b/apps/web/src/components/layout/marketing-menu.tsx
@@ -9,13 +9,15 @@ import {
AccordionContent,
AccordionItem,
AccordionTrigger,
- Button,
+} from "@openstatus/ui/src/components/accordion";
+import { Button } from "@openstatus/ui/src/components/button";
+import {
Sheet,
SheetContent,
SheetHeader,
SheetTitle,
SheetTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/sheet";
import { marketingPagesConfig } from "@/config/pages";
import { socialsConfig } from "@/config/socials";
@@ -131,7 +133,7 @@ const ListItem = React.forwardRef<
<Link
ref={ref}
className={cn(
- "flex select-none items-center gap-2 space-y-1 rounded-md p-3 leading-none no-underline outline-none transition-colors focus:bg-accent hover:bg-accent focus:text-accent-foreground hover:text-accent-foreground",
+ "flex select-none items-center gap-2 space-y-1 rounded-md p-3 leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground",
className,
)}
{...props}
diff --git a/apps/web/src/components/layout/skeleton-tabs.tsx b/apps/web/src/components/layout/skeleton-tabs.tsx
index b0c7fe6ef..34d7f51d1 100644
--- a/apps/web/src/components/layout/skeleton-tabs.tsx
+++ b/apps/web/src/components/layout/skeleton-tabs.tsx
@@ -1,4 +1,4 @@
-import { Skeleton } from "@openstatus/ui";
+import { Skeleton } from "@openstatus/ui/src/components/skeleton";
interface SkeletonTabsProps {
children?: React.ReactNode;
diff --git a/apps/web/src/components/layout/social-icon-button.tsx b/apps/web/src/components/layout/social-icon-button.tsx
index c92d6ed54..14646a036 100644
--- a/apps/web/src/components/layout/social-icon-button.tsx
+++ b/apps/web/src/components/layout/social-icon-button.tsx
@@ -1,6 +1,6 @@
import Link from "next/link";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import type { Social } from "@/config/socials";
import { Icons } from "../icons";
diff --git a/apps/web/src/components/layout/status-widget-suspense.tsx b/apps/web/src/components/layout/status-widget-suspense.tsx
index ef96798c8..41ed1b5c1 100644
--- a/apps/web/src/components/layout/status-widget-suspense.tsx
+++ b/apps/web/src/components/layout/status-widget-suspense.tsx
@@ -3,13 +3,13 @@ import { Suspense } from "react";
import type { StatusWidgetProps } from "@openstatus/react";
import { StatusWidget } from "@openstatus/react";
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Button,
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/tooltip";
export function StatusWidgetFallback() {
return (
diff --git a/apps/web/src/components/marketing/card.tsx b/apps/web/src/components/marketing/card.tsx
index eb015db21..6c3db4fa9 100644
--- a/apps/web/src/components/marketing/card.tsx
+++ b/apps/web/src/components/marketing/card.tsx
@@ -1,4 +1,4 @@
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import type { FeatureDescription } from "@/config/features";
import { cn } from "@/lib/utils";
diff --git a/apps/web/src/components/marketing/faqs.tsx b/apps/web/src/components/marketing/faqs.tsx
index a2e0efd66..d78950ec2 100644
--- a/apps/web/src/components/marketing/faqs.tsx
+++ b/apps/web/src/components/marketing/faqs.tsx
@@ -7,7 +7,7 @@ import {
AccordionContent,
AccordionItem,
AccordionTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/accordion";
import { Mdx } from "../content/mdx";
import {
diff --git a/apps/web/src/components/marketing/hero.tsx b/apps/web/src/components/marketing/hero.tsx
index 5606d540a..f262076a5 100644
--- a/apps/web/src/components/marketing/hero.tsx
+++ b/apps/web/src/components/marketing/hero.tsx
@@ -2,7 +2,8 @@ import { ChevronRight } from "lucide-react";
import Link from "next/link";
import { Suspense } from "react";
-import { Badge, Button } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
+import { Button } from "@openstatus/ui/src/components/button";
import { getGitHubStars } from "@/lib/github";
import { cn, numberFormatter } from "@/lib/utils";
diff --git a/apps/web/src/components/marketing/in-between-cta.tsx b/apps/web/src/components/marketing/in-between-cta.tsx
index 937dc6421..ec782195f 100644
--- a/apps/web/src/components/marketing/in-between-cta.tsx
+++ b/apps/web/src/components/marketing/in-between-cta.tsx
@@ -1,6 +1,6 @@
import Link from "next/link";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
interface InBetweenCTAProps {
description: string;
diff --git a/apps/web/src/components/marketing/lastest-changelogs.tsx b/apps/web/src/components/marketing/lastest-changelogs.tsx
index 8e8c04302..74082677d 100644
--- a/apps/web/src/components/marketing/lastest-changelogs.tsx
+++ b/apps/web/src/components/marketing/lastest-changelogs.tsx
@@ -1,7 +1,7 @@
import { allChangelogs } from "contentlayer/generated";
import Link from "next/link";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { formatDate } from "@/lib/utils";
import {
diff --git a/apps/web/src/components/marketing/monitor/card.tsx b/apps/web/src/components/marketing/monitor/card.tsx
index c39e52d76..acbc387d4 100644
--- a/apps/web/src/components/marketing/monitor/card.tsx
+++ b/apps/web/src/components/marketing/monitor/card.tsx
@@ -1,6 +1,6 @@
import Link from "next/link";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { cardConfig } from "@/config/features";
import {
diff --git a/apps/web/src/components/marketing/pricing/enterprice-plan.tsx b/apps/web/src/components/marketing/pricing/enterprice-plan.tsx
index 7f1352c7c..dcde4a20f 100644
--- a/apps/web/src/components/marketing/pricing/enterprice-plan.tsx
+++ b/apps/web/src/components/marketing/pricing/enterprice-plan.tsx
@@ -1,4 +1,4 @@
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
export function EnterpricePlan() {
return (
diff --git a/apps/web/src/components/marketing/pricing/pricing-plan-radio.tsx b/apps/web/src/components/marketing/pricing/pricing-plan-radio.tsx
index a9dba868e..82b56b7c7 100644
--- a/apps/web/src/components/marketing/pricing/pricing-plan-radio.tsx
+++ b/apps/web/src/components/marketing/pricing/pricing-plan-radio.tsx
@@ -2,7 +2,11 @@
import { allPlans } from "@openstatus/db/src/schema/plan/config";
import { workspacePlans } from "@openstatus/db/src/schema/workspaces/constants";
-import { Label, RadioGroup, RadioGroupItem } from "@openstatus/ui";
+import { Label } from "@openstatus/ui/src/components/label";
+import {
+ RadioGroup,
+ RadioGroupItem,
+} from "@openstatus/ui/src/components/radio-group";
import { useRouter } from "next/navigation";
import useUpdateSearchParams from "@/hooks/use-update-search-params";
@@ -26,7 +30,7 @@ export function PricingPlanRadio() {
<Label
htmlFor={key}
className={cn(
- "flex flex-col items-center justify-between rounded-md border-2 border-muted bg-popover p-4 [&:has([data-state=checked])]:border-primary peer-data-[state=checked]:border-primary hover:bg-accent hover:text-accent-foreground",
+ "flex flex-col items-center justify-between rounded-md border-2 border-muted bg-popover p-4 hover:bg-accent hover:text-accent-foreground peer-data-[state=checked]:border-primary [&:has([data-state=checked])]:border-primary",
key === "team" && "bg-muted/50",
)}
>
diff --git a/apps/web/src/components/marketing/pricing/pricing-slider.tsx b/apps/web/src/components/marketing/pricing/pricing-slider.tsx
index d81d9927a..145224265 100644
--- a/apps/web/src/components/marketing/pricing/pricing-slider.tsx
+++ b/apps/web/src/components/marketing/pricing/pricing-slider.tsx
@@ -1,7 +1,8 @@
"use client";
import { cn } from "@/lib/utils";
-import { InputWithAddons, Slider } from "@openstatus/ui";
+import { InputWithAddons } from "@openstatus/ui/src/components/input-with-addons";
+import { Slider } from "@openstatus/ui/src/components/slider";
import { useMemo, useState } from "react";
const MAX_REGIONS = 35;
diff --git a/apps/web/src/components/marketing/pricing/pricing-table.tsx b/apps/web/src/components/marketing/pricing/pricing-table.tsx
index aeb8ae2ea..4cc083692 100644
--- a/apps/web/src/components/marketing/pricing/pricing-table.tsx
+++ b/apps/web/src/components/marketing/pricing/pricing-table.tsx
@@ -6,9 +6,9 @@ import { Fragment } from "react";
import { workspacePlans } from "@openstatus/db/src/schema/workspaces/constants";
import type { WorkspacePlan } from "@openstatus/db/src/schema/workspaces/validation";
+import { Badge } from "@openstatus/ui/src/components/badge";
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Badge,
- Button,
Table,
TableBody,
TableCaption,
@@ -16,7 +16,7 @@ import {
TableHead,
TableHeader,
TableRow,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/table";
import { pricingTableConfig } from "../../../config/pricing-table";
import { LoadingAnimation } from "@/components/loading-animation";
diff --git a/apps/web/src/components/marketing/status-page/tracker-example.tsx b/apps/web/src/components/marketing/status-page/tracker-example.tsx
index 4e4aa0b51..d8768d5df 100644
--- a/apps/web/src/components/marketing/status-page/tracker-example.tsx
+++ b/apps/web/src/components/marketing/status-page/tracker-example.tsx
@@ -2,7 +2,7 @@ import Link from "next/link";
import { Suspense } from "react";
import { OSTinybird } from "@openstatus/tinybird";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { Tracker } from "@/components/tracker/tracker";
import { env } from "@/env";
diff --git a/apps/web/src/components/modals/failed-ping-alert-confirmation.tsx b/apps/web/src/components/modals/failed-ping-alert-confirmation.tsx
index 2922ddce6..227b9c03f 100644
--- a/apps/web/src/components/modals/failed-ping-alert-confirmation.tsx
+++ b/apps/web/src/components/modals/failed-ping-alert-confirmation.tsx
@@ -12,7 +12,7 @@ import {
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/alert-dialog";
import { LoadingAnimation } from "@/components/loading-animation";
diff --git a/apps/web/src/components/monitor-charts/region-table.tsx b/apps/web/src/components/monitor-charts/region-table.tsx
index aba15c56c..b585d9bb2 100644
--- a/apps/web/src/components/monitor-charts/region-table.tsx
+++ b/apps/web/src/components/monitor-charts/region-table.tsx
@@ -7,7 +7,7 @@ import {
TableHead,
TableHeader,
TableRow,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/table";
import { flyRegionsDict } from "@openstatus/utils";
import { formatNumber } from "@/components/monitor-dashboard/metrics-card";
diff --git a/apps/web/src/components/monitor-dashboard/button-reset.tsx b/apps/web/src/components/monitor-dashboard/button-reset.tsx
index ebb52ed60..7194f4390 100644
--- a/apps/web/src/components/monitor-dashboard/button-reset.tsx
+++ b/apps/web/src/components/monitor-dashboard/button-reset.tsx
@@ -3,13 +3,13 @@
import { X } from "lucide-react";
import { usePathname, useRouter } from "next/navigation";
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Button,
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/tooltip";
export function ButtonReset() {
const router = useRouter();
diff --git a/apps/web/src/components/monitor-dashboard/interval-preset.tsx b/apps/web/src/components/monitor-dashboard/interval-preset.tsx
index d7b93c5d2..368ae9cef 100644
--- a/apps/web/src/components/monitor-dashboard/interval-preset.tsx
+++ b/apps/web/src/components/monitor-dashboard/interval-preset.tsx
@@ -3,13 +3,13 @@
import { HelpCircle } from "lucide-react";
import * as React from "react";
+import { Label } from "@openstatus/ui/src/components/label";
import {
- Label,
Popover,
PopoverContent,
PopoverTrigger,
- Separator,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/popover";
+import { Separator } from "@openstatus/ui/src/components/separator";
import { intervals } from "@/lib/monitor/utils";
import type { Interval } from "@/lib/monitor/utils";
diff --git a/apps/web/src/components/monitor-dashboard/metrics-card.tsx b/apps/web/src/components/monitor-dashboard/metrics-card.tsx
index 8d7b1c2d7..08ad2ae4e 100644
--- a/apps/web/src/components/monitor-dashboard/metrics-card.tsx
+++ b/apps/web/src/components/monitor-dashboard/metrics-card.tsx
@@ -2,7 +2,7 @@ import type { VariantProps } from "class-variance-authority";
import { cva } from "class-variance-authority";
import { ChevronDown, ChevronUp } from "lucide-react";
-import { Badge } from "@openstatus/ui"; // from @/components/ui/badge
+import { Badge } from "@openstatus/ui/src/components/badge"; // from @/components/ui/badge
import { cn } from "@/lib/utils";
diff --git a/apps/web/src/components/monitor-dashboard/metrics.tsx b/apps/web/src/components/monitor-dashboard/metrics.tsx
index 24157d7bd..d781aa6ad 100644
--- a/apps/web/src/components/monitor-dashboard/metrics.tsx
+++ b/apps/web/src/components/monitor-dashboard/metrics.tsx
@@ -44,7 +44,7 @@ export function Metrics({
return (
<div className="@container grid gap-6">
- <div className="grid grid-cols-2 gap-4 @3xl:grid-cols-5 @xl:grid-cols-4 @3xl:gap-6">
+ <div className="grid @3xl:grid-cols-5 @xl:grid-cols-4 grid-cols-2 @3xl:gap-6 gap-4">
<MetricsCard
title="uptime"
value={uptime * 100}
@@ -76,7 +76,7 @@ export function Metrics({
<MetricsCard title="total pings" value={current.count} suffix="#" />
</div>
<div className="grid gap-4">
- <div className="grid grid-cols-2 gap-4 @3xl:grid-cols-5 @xl:grid-cols-4 @3xl:gap-6">
+ <div className="grid @3xl:grid-cols-5 @xl:grid-cols-4 grid-cols-2 @3xl:gap-6 gap-4">
{metricsOrder.map((key) => {
const value = current[key];
const lastValue = last[key];
diff --git a/apps/web/src/components/monitor-dashboard/pause-button.tsx b/apps/web/src/components/monitor-dashboard/pause-button.tsx
index b22c539ad..42e8d12a5 100644
--- a/apps/web/src/components/monitor-dashboard/pause-button.tsx
+++ b/apps/web/src/components/monitor-dashboard/pause-button.tsx
@@ -5,7 +5,7 @@ import { useRouter } from "next/navigation";
import { useTransition } from "react";
import type { Monitor } from "@openstatus/db/src/schema";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { LoadingAnimation } from "@/components/loading-animation";
import { toastAction } from "@/lib/toast";
diff --git a/apps/web/src/components/monitor-dashboard/quantile-preset.tsx b/apps/web/src/components/monitor-dashboard/quantile-preset.tsx
index 7191597db..80b80a6ca 100644
--- a/apps/web/src/components/monitor-dashboard/quantile-preset.tsx
+++ b/apps/web/src/components/monitor-dashboard/quantile-preset.tsx
@@ -3,13 +3,13 @@
import { HelpCircle } from "lucide-react";
import * as React from "react";
+import { Label } from "@openstatus/ui/src/components/label";
import {
- Label,
Popover,
PopoverContent,
PopoverTrigger,
- Separator,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/popover";
+import { Separator } from "@openstatus/ui/src/components/separator";
import { quantiles } from "@/lib/monitor/utils";
import type { Quantile } from "@/lib/monitor/utils";
diff --git a/apps/web/src/components/monitor-dashboard/region-preset.tsx b/apps/web/src/components/monitor-dashboard/region-preset.tsx
index 25ab3b2b4..fee8d6149 100644
--- a/apps/web/src/components/monitor-dashboard/region-preset.tsx
+++ b/apps/web/src/components/monitor-dashboard/region-preset.tsx
@@ -5,8 +5,8 @@ import { usePathname, useRouter } from "next/navigation";
import * as React from "react";
import type { Region } from "@openstatus/tinybird";
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Button,
Command,
CommandEmpty,
CommandGroup,
@@ -14,10 +14,12 @@ import {
CommandItem,
CommandList,
CommandSeparator,
+} from "@openstatus/ui/src/components/command";
+import {
Popover,
PopoverContent,
PopoverTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/popover";
import {
type Continent,
type RegionInfo,
diff --git a/apps/web/src/components/monitor-dashboard/search-params-preset.tsx b/apps/web/src/components/monitor-dashboard/search-params-preset.tsx
index 732faecb0..4fb2fbd81 100644
--- a/apps/web/src/components/monitor-dashboard/search-params-preset.tsx
+++ b/apps/web/src/components/monitor-dashboard/search-params-preset.tsx
@@ -6,7 +6,7 @@ import {
SelectItem,
SelectTrigger,
SelectValue,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/select";
import { usePathname, useRouter } from "next/navigation";
import type { ReactNode } from "react";
diff --git a/apps/web/src/components/monitor/status-code-badge.tsx b/apps/web/src/components/monitor/status-code-badge.tsx
index b5c21394b..0cc939bb6 100644
--- a/apps/web/src/components/monitor/status-code-badge.tsx
+++ b/apps/web/src/components/monitor/status-code-badge.tsx
@@ -1,4 +1,4 @@
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import { cn } from "@/lib/utils";
diff --git a/apps/web/src/components/monitor/status-dot-with-tooltip.tsx b/apps/web/src/components/monitor/status-dot-with-tooltip.tsx
index 96fe414d9..e979e3572 100644
--- a/apps/web/src/components/monitor/status-dot-with-tooltip.tsx
+++ b/apps/web/src/components/monitor/status-dot-with-tooltip.tsx
@@ -3,7 +3,7 @@ import {
TooltipContent,
TooltipProvider,
TooltipTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/tooltip";
import type { StatusDotProps } from "./status-dot";
import { StatusDot } from "./status-dot";
diff --git a/apps/web/src/components/monitor/tag-badge-with-tooltip.tsx b/apps/web/src/components/monitor/tag-badge-with-tooltip.tsx
index 2bfb0ebd7..eccf40e2e 100644
--- a/apps/web/src/components/monitor/tag-badge-with-tooltip.tsx
+++ b/apps/web/src/components/monitor/tag-badge-with-tooltip.tsx
@@ -1,11 +1,11 @@
import type { MonitorTag } from "@openstatus/db/src/schema";
+import { Badge } from "@openstatus/ui/src/components/badge";
import {
- Badge,
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/tooltip";
import { TagBadge } from "./tag-badge";
diff --git a/apps/web/src/components/monitor/tag-badge.tsx b/apps/web/src/components/monitor/tag-badge.tsx
index 57ae7429a..c53fbb53c 100644
--- a/apps/web/src/components/monitor/tag-badge.tsx
+++ b/apps/web/src/components/monitor/tag-badge.tsx
@@ -1,4 +1,4 @@
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
function getStyle(color: string) {
return {
diff --git a/apps/web/src/components/monitor/visible-icon-with-tooltip.tsx b/apps/web/src/components/monitor/visible-icon-with-tooltip.tsx
index abba01066..168425004 100644
--- a/apps/web/src/components/monitor/visible-icon-with-tooltip.tsx
+++ b/apps/web/src/components/monitor/visible-icon-with-tooltip.tsx
@@ -5,7 +5,7 @@ import {
TooltipContent,
TooltipProvider,
TooltipTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/tooltip";
export function VisibleIconWithTooltip({ visible }: { visible: boolean }) {
return (
diff --git a/apps/web/src/components/ping-response-analysis/copy-link-button.tsx b/apps/web/src/components/ping-response-analysis/copy-link-button.tsx
index 605c44fc4..880a25875 100644
--- a/apps/web/src/components/ping-response-analysis/copy-link-button.tsx
+++ b/apps/web/src/components/ping-response-analysis/copy-link-button.tsx
@@ -1,14 +1,13 @@
"use client";
-import * as React from "react";
-
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Button,
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/tooltip";
+import * as React from "react";
import { Icons } from "@/components/icons";
import { copyToClipboard } from "@/lib/utils";
diff --git a/apps/web/src/components/ping-response-analysis/multi-region-table.tsx b/apps/web/src/components/ping-response-analysis/multi-region-table.tsx
index cd15b5390..a26a55b2f 100644
--- a/apps/web/src/components/ping-response-analysis/multi-region-table.tsx
+++ b/apps/web/src/components/ping-response-analysis/multi-region-table.tsx
@@ -8,7 +8,7 @@ import {
TableHead,
TableHeader,
TableRow,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/table";
import {
type ColumnDef,
diff --git a/apps/web/src/components/ping-response-analysis/region-info.tsx b/apps/web/src/components/ping-response-analysis/region-info.tsx
index a0ae96f13..503b8dda5 100644
--- a/apps/web/src/components/ping-response-analysis/region-info.tsx
+++ b/apps/web/src/components/ping-response-analysis/region-info.tsx
@@ -43,7 +43,7 @@ export function RegionInfo({
<p className="text-muted-foreground">Error:</p>
</div>
<div className="col-span-3 sm:col-span-6">
- <p className="font-medium text-destructive after:content-['_»'] before:content-['«_']">
+ <p className="font-medium text-destructive before:content-['«_'] after:content-['_»']">
{error}
</p>
</div>
diff --git a/apps/web/src/components/ping-response-analysis/response-assertion.tsx b/apps/web/src/components/ping-response-analysis/response-assertion.tsx
index aa07f9c52..63b252e22 100644
--- a/apps/web/src/components/ping-response-analysis/response-assertion.tsx
+++ b/apps/web/src/components/ping-response-analysis/response-assertion.tsx
@@ -11,7 +11,7 @@ import {
TableHead,
TableHeader,
TableRow,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/table";
export function ResponseAssertion({ assertions }: { assertions: Assertion[] }) {
return (
diff --git a/apps/web/src/components/ping-response-analysis/response-header-analysis.tsx b/apps/web/src/components/ping-response-analysis/response-header-analysis.tsx
index f47487d2c..ac8de1ba3 100644
--- a/apps/web/src/components/ping-response-analysis/response-header-analysis.tsx
+++ b/apps/web/src/components/ping-response-analysis/response-header-analysis.tsx
@@ -18,7 +18,7 @@ import {
DialogHeader,
DialogTitle,
DialogTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/dialog";
const allowedHeaders = [
"Cache-Control",
@@ -46,7 +46,7 @@ export function ResponseHeaderAnalysis({
return (
<Dialog>
- <DialogTrigger className="text-muted-foreground data-[state=open]:text-foreground hover:text-foreground">
+ <DialogTrigger className="text-muted-foreground hover:text-foreground data-[state=open]:text-foreground">
<Info className="h-4 w-4" />
</DialogTrigger>
<DialogContent className="sm:max-w-2xl">
diff --git a/apps/web/src/components/ping-response-analysis/response-header-table.tsx b/apps/web/src/components/ping-response-analysis/response-header-table.tsx
index 819b29cce..031bb7d90 100644
--- a/apps/web/src/components/ping-response-analysis/response-header-table.tsx
+++ b/apps/web/src/components/ping-response-analysis/response-header-table.tsx
@@ -6,7 +6,7 @@ import {
TableHead,
TableHeader,
TableRow,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/table";
import { CopyToClipboardButton } from "./copy-to-clipboard-button";
import { ResponseHeaderAnalysis } from "./response-header-analysis";
diff --git a/apps/web/src/components/ping-response-analysis/response-timing-table.tsx b/apps/web/src/components/ping-response-analysis/response-timing-table.tsx
index 5ab84b5a0..0b7637491 100644
--- a/apps/web/src/components/ping-response-analysis/response-timing-table.tsx
+++ b/apps/web/src/components/ping-response-analysis/response-timing-table.tsx
@@ -4,6 +4,8 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
+} from "@openstatus/ui/src/components/popover";
+import {
Table,
TableBody,
TableCaption,
@@ -11,7 +13,7 @@ import {
TableHead,
TableHeader,
TableRow,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/table";
import { timingDict } from "./config";
import type { Timing } from "./utils";
@@ -50,7 +52,7 @@ export function ResponseTimingTable({
<p className="text-muted-foreground">{short}</p>
{!hideInfo ? (
<Popover>
- <PopoverTrigger className="text-muted-foreground data-[state=open]:text-foreground hover:text-foreground">
+ <PopoverTrigger className="text-muted-foreground hover:text-foreground data-[state=open]:text-foreground">
<Info className="mr-2 h-4 w-4" />
</PopoverTrigger>
<PopoverContent>
diff --git a/apps/web/src/components/ping-response-analysis/select-region.tsx b/apps/web/src/components/ping-response-analysis/select-region.tsx
index 1ae33cb19..413ff525d 100644
--- a/apps/web/src/components/ping-response-analysis/select-region.tsx
+++ b/apps/web/src/components/ping-response-analysis/select-region.tsx
@@ -4,14 +4,14 @@ import { usePathname, useRouter } from "next/navigation";
import type { MonitorFlyRegion } from "@openstatus/db/src/schema/constants";
import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { Label } from "@openstatus/ui/src/components/label";
import {
- Label,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/select";
import useUpdateSearchParams from "@/hooks/use-update-search-params";
import { regionFormatter } from "./utils";
diff --git a/apps/web/src/components/play/card.tsx b/apps/web/src/components/play/card.tsx
index a27f106ea..ee2cbbb0b 100644
--- a/apps/web/src/components/play/card.tsx
+++ b/apps/web/src/components/play/card.tsx
@@ -1,7 +1,7 @@
import type { LucideIcon } from "lucide-react";
import Link from "next/link";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { Shell } from "@/components/dashboard/shell";
import { cn } from "@/lib/utils";
@@ -37,7 +37,7 @@ export function Card({
return (
<Shell
className={cn(
- "group flex flex-col gap-3 hover:dark:border-card-foreground/30 hover:shadow",
+ "group flex flex-col gap-3 hover:shadow hover:dark:border-card-foreground/30",
shellClassName,
className,
)}
diff --git a/apps/web/src/components/status-page/datetime-tooltip.tsx b/apps/web/src/components/status-page/datetime-tooltip.tsx
index 64c8a06a5..92fd79db2 100644
--- a/apps/web/src/components/status-page/datetime-tooltip.tsx
+++ b/apps/web/src/components/status-page/datetime-tooltip.tsx
@@ -6,7 +6,7 @@ import {
TooltipContent,
TooltipProvider,
TooltipTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/tooltip";
import { format } from "date-fns";
import { formatInTimeZone } from "date-fns-tz";
import { useState } from "react";
diff --git a/apps/web/src/components/status-page/day-header.tsx b/apps/web/src/components/status-page/day-header.tsx
index 2dabbc138..4efe17d5e 100644
--- a/apps/web/src/components/status-page/day-header.tsx
+++ b/apps/web/src/components/status-page/day-header.tsx
@@ -1,4 +1,5 @@
-import { Badge, Separator } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
+import { Separator } from "@openstatus/ui/src/components/separator";
import { format } from "date-fns";
export function DayHeader({ date }: { date: Date }) {
diff --git a/apps/web/src/components/status-page/status-report.tsx b/apps/web/src/components/status-page/status-report.tsx
index b835492e0..460b1b115 100644
--- a/apps/web/src/components/status-page/status-report.tsx
+++ b/apps/web/src/components/status-page/status-report.tsx
@@ -8,7 +8,7 @@ import type {
PublicMonitor,
StatusReportWithUpdates,
} from "@openstatus/db/src/schema";
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import { setPrefixUrl } from "@/app/status-page/[domain]/utils";
import { statusDict } from "@/data/incidents-dictionary";
diff --git a/apps/web/src/components/status-update/delete-status-update.tsx b/apps/web/src/components/status-update/delete-status-update.tsx
index 837386cbc..a1d01b9cd 100644
--- a/apps/web/src/components/status-update/delete-status-update.tsx
+++ b/apps/web/src/components/status-update/delete-status-update.tsx
@@ -13,8 +13,8 @@ import {
AlertDialogHeader,
AlertDialogTitle,
AlertDialogTrigger,
- Button,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/alert-dialog";
+import { Button } from "@openstatus/ui/src/components/button";
import { Icons } from "@/components/icons";
import { LoadingAnimation } from "@/components/loading-animation";
diff --git a/apps/web/src/components/status-update/edit-status-update.tsx b/apps/web/src/components/status-update/edit-status-update.tsx
index e5e2582a2..6aa2468b5 100644
--- a/apps/web/src/components/status-update/edit-status-update.tsx
+++ b/apps/web/src/components/status-update/edit-status-update.tsx
@@ -3,15 +3,15 @@
import { useState } from "react";
import type { InsertStatusReportUpdate } from "@openstatus/db/src/schema";
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Button,
Dialog,
DialogContent,
DialogDescription,
DialogHeader,
DialogTitle,
DialogTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/dialog";
import { StatusReportUpdateForm } from "../forms/status-report-update/form";
import { Icons } from "../icons";
diff --git a/apps/web/src/components/status-update/events.tsx b/apps/web/src/components/status-update/events.tsx
index 92711f467..ca7b8c17f 100644
--- a/apps/web/src/components/status-update/events.tsx
+++ b/apps/web/src/components/status-update/events.tsx
@@ -4,7 +4,7 @@ import { format } from "date-fns";
import * as React from "react";
import type { StatusReportUpdate } from "@openstatus/db/src/schema";
-import { Button } from "@openstatus/ui";
+import { Button } from "@openstatus/ui/src/components/button";
import { Icons } from "@/components/icons";
import { statusDict } from "@/data/incidents-dictionary";
@@ -59,7 +59,7 @@ export function Events({
</div>
<div className="mt-1 grid flex-1">
{editable ? (
- <div className="absolute top-2 right-2 hidden gap-2 group-active:flex group-hover:flex">
+ <div className="absolute top-2 right-2 hidden gap-2 group-hover:flex group-active:flex">
<EditStatusReportUpdateIconButton
statusReportId={update.statusReportId}
statusReportUpdate={update}
diff --git a/apps/web/src/components/status-update/status-badge.tsx b/apps/web/src/components/status-update/status-badge.tsx
index 36d08d191..4020e6dd7 100644
--- a/apps/web/src/components/status-update/status-badge.tsx
+++ b/apps/web/src/components/status-update/status-badge.tsx
@@ -1,5 +1,5 @@
import type { StatusReport } from "@openstatus/db/src/schema";
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import { statusDict } from "@/data/incidents-dictionary";
import { cn } from "@/lib/utils";
diff --git a/apps/web/src/components/status-update/summary.tsx b/apps/web/src/components/status-update/summary.tsx
index aaa213f08..161c53030 100644
--- a/apps/web/src/components/status-update/summary.tsx
+++ b/apps/web/src/components/status-update/summary.tsx
@@ -5,7 +5,7 @@ import type {
StatusReport,
StatusReportUpdate,
} from "@openstatus/db/src/schema";
-import { Badge } from "@openstatus/ui";
+import { Badge } from "@openstatus/ui/src/components/badge";
import { StatusBadge } from "./status-badge";
diff --git a/apps/web/src/components/support/bubble.tsx b/apps/web/src/components/support/bubble.tsx
index 262763ee6..3cec7f89e 100644
--- a/apps/web/src/components/support/bubble.tsx
+++ b/apps/web/src/components/support/bubble.tsx
@@ -4,12 +4,12 @@ import { MessageCircle } from "lucide-react";
import { useState } from "react";
import {
- Button,
Popover,
PopoverContent,
PopoverTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/popover";
+import { Button } from "@openstatus/ui/src/components/button";
import { useSession } from "next-auth/react";
import { ContactForm } from "./contact-form";
diff --git a/apps/web/src/components/theme-toggle.tsx b/apps/web/src/components/theme-toggle.tsx
index bcba989a4..c4041c877 100644
--- a/apps/web/src/components/theme-toggle.tsx
+++ b/apps/web/src/components/theme-toggle.tsx
@@ -3,13 +3,13 @@
import { useTheme } from "next-themes";
import * as React from "react";
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Button,
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/dropdown-menu";
import { Icons } from "@/components/icons";
diff --git a/apps/web/src/components/tracker/tracker.tsx b/apps/web/src/components/tracker/tracker.tsx
index 1f3bcee2a..bf0c8a607 100644
--- a/apps/web/src/components/tracker/tracker.tsx
+++ b/apps/web/src/components/tracker/tracker.tsx
@@ -20,17 +20,19 @@ import {
startOfDay,
} from "@openstatus/tracker";
import {
- HoverCard,
- HoverCardContent,
- HoverCardTrigger,
- Separator,
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/tooltip";
import { cn } from "@/lib/utils";
+import {
+ HoverCard,
+ HoverCardContent,
+ HoverCardTrigger,
+} from "@openstatus/ui/src/components/hover-card";
+import { Separator } from "@openstatus/ui/src/components/separator";
const tracker = cva("h-10 rounded-full flex-1", {
variants: {
diff --git a/apps/web/src/components/workspace/select-workspace.tsx b/apps/web/src/components/workspace/select-workspace.tsx
index 80d295602..37b25eb61 100644
--- a/apps/web/src/components/workspace/select-workspace.tsx
+++ b/apps/web/src/components/workspace/select-workspace.tsx
@@ -6,16 +6,16 @@ import { usePathname } from "next/navigation";
import * as React from "react";
import type { Workspace } from "@openstatus/db/src/schema";
+import { Button } from "@openstatus/ui/src/components/button";
import {
- Button,
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
- Skeleton,
-} from "@openstatus/ui";
+} from "@openstatus/ui/src/components/dropdown-menu";
+import { Skeleton } from "@openstatus/ui/src/components/skeleton";
import { api } from "@/trpc/client";
diff --git a/apps/web/src/lib/auth/index.ts b/apps/web/src/lib/auth/index.ts
index dce1d2ae9..6a9e4c0dc 100644
--- a/apps/web/src/lib/auth/index.ts
+++ b/apps/web/src/lib/auth/index.ts
@@ -4,9 +4,10 @@ import NextAuth from "next-auth";
import { analytics, trackAnalytics } from "@openstatus/analytics";
import { db, eq } from "@openstatus/db";
import { user } from "@openstatus/db/src/schema";
-import { WelcomeEmail, sendEmail } from "@openstatus/emails";
+import { sendEmail } from "@openstatus/emails/emails/send";
import { identifyUser } from "@/providers/posthog";
+import { WelcomeEmail } from "@openstatus/emails/emails/welcome";
import { adapter } from "./adapter";
import { GitHubProvider, GoogleProvider, ResendProvider } from "./providers";
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 0559aeed2..96bfedc26 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -1,9 +1,10 @@
import { NextResponse } from "next/server";
-import { db, eq } from "@openstatus/db";
+import { db } from "@openstatus/db/src/db";
import { user, usersToWorkspaces, workspace } from "@openstatus/db/src/schema";
import { auth } from "@/lib/auth";
+import { eq } from "@openstatus/db";
import { env } from "./env";
export const getValidSubdomain = (host?: string | null) => {
diff --git a/package.json b/package.json
index 5b388f161..539a29261 100644
--- a/package.json
+++ b/package.json
@@ -12,10 +12,10 @@
"test": "turbo run test"
},
"devDependencies": {
- "@biomejs/biome": "1.7.3",
+ "@biomejs/biome": "1.8.3",
"@turbo/gen": "1.13.3",
"@types/node": "20.8.0",
- "knip": "^5.16.0",
+ "knip": "5.16.0",
"turbo": "1.13.3",
"typescript": "5.5.2"
},
diff --git a/packages/react/src/widget.tsx b/packages/react/src/widget.tsx
index dd607780a..267a8bc37 100644
--- a/packages/react/src/widget.tsx
+++ b/packages/react/src/widget.tsx
@@ -36,7 +36,7 @@ export async function StatusWidget({ slug, href }: StatusWidgetProps) {
return (
<a
- className="inline-flex max-w-fit items-center gap-2 rounded-md border border-gray-200 px-3 py-1 text-gray-700 text-sm dark:border-gray-800 dark:hover:bg-gray-900 hover:bg-gray-100 dark:hover:text-white dark:text-gray-300 hover:text-black"
+ className="inline-flex max-w-fit items-center gap-2 rounded-md border border-gray-200 px-3 py-1 text-gray-700 text-sm hover:bg-gray-100 hover:text-black dark:border-gray-800 dark:text-gray-300 dark:hover:bg-gray-900 dark:hover:text-white"
href={href || `https://${slug}.openstatus.dev`}
target="_blank"
rel="noreferrer"
@@ -45,12 +45,12 @@ export async function StatusWidget({ slug, href }: StatusWidgetProps) {
<span className="relative flex h-2 w-2">
{status === "operational" ? (
<span
- // biome-ignore lint/nursery/useSortedClasses: <explanation>
+ // biome-ignore lint/nursery/useSortedClasses: color is a dynamic value
className={`absolute inline-flex h-full w-full animate-ping rounded-full ${color} opacity-75 duration-1000`}
/>
) : null}
<span
- // biome-ignore lint/nursery/useSortedClasses: <explanation>
+ // biome-ignore lint/nursery/useSortedClasses: color is a dynamic value
className={`relative inline-flex h-2 w-2 rounded-full ${color}`}
/>
</span>
diff --git a/packages/ui/src/components/collabsible.tsx b/packages/ui/src/components/collapsible.tsx
similarity index 100%
rename from packages/ui/src/components/collabsible.tsx
rename to packages/ui/src/components/collapsible.tsx
diff --git a/packages/ui/src/index.tsx b/packages/ui/src/index.tsx
index dcdf507f7..5ea2c55d9 100644
--- a/packages/ui/src/index.tsx
+++ b/packages/ui/src/index.tsx
@@ -34,7 +34,7 @@ export * from "./components/date-time-picker-popover";
export * from "./components/sheet";
export * from "./components/multi-select";
export * from "./components/toggle";
-export * from "./components/collabsible";
+export * from "./components/collapsible";
export * from "./components/sonner";
export * from "./components/sortable";
export * from "./components/navigation-menu";
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b87ea8680..9cb8bb131 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
.:
devDependencies:
'@biomejs/biome':
- specifier: 1.7.3
- version: 1.7.3
+ specifier: 1.8.3
+ version: 1.8.3
'@turbo/gen':
specifier: 1.13.3
version: 1.13.3(@types/[email protected])([email protected])
@@ -18,7 +18,7 @@ importers:
specifier: 20.8.0
version: 20.8.0
knip:
- specifier: ^5.16.0
+ specifier: 5.16.0
version: 5.16.0(@types/[email protected])([email protected])
turbo:
specifier: 1.13.3
@@ -2044,54 +2044,107 @@ packages:
engines: {node: '>=14.21.3'}
hasBin: true
+ '@biomejs/[email protected]':
+ resolution: {integrity: sha512-/uUV3MV+vyAczO+vKrPdOW0Iaet7UnJMU4bNMinggGJTAnBPjCoLEYcyYtYHNnUNYlv4xZMH6hVIQCAozq8d5w==}
+ engines: {node: '>=14.21.3'}
+ hasBin: true
+
'@biomejs/[email protected]':
resolution: {integrity: sha512-eDvLQWmGRqrPIRY7AIrkPHkQ3visEItJKkPYSHCscSDdGvKzYjmBJwG1Gu8+QC5ed6R7eiU63LEC0APFBobmfQ==}
engines: {node: '>=14.21.3'}
cpu: [arm64]
os: [darwin]
+ '@biomejs/[email protected]':
+ resolution: {integrity: sha512-9DYOjclFpKrH/m1Oz75SSExR8VKvNSSsLnVIqdnKexj6NwmiMlKk94Wa1kZEdv6MCOHGHgyyoV57Cw8WzL5n3A==}
+ engines: {node: '>=14.21.3'}
+ cpu: [arm64]
+ os: [darwin]
+
'@biomejs/[email protected]':
resolution: {integrity: sha512-JXCaIseKRER7dIURsVlAJacnm8SG5I0RpxZ4ya3dudASYUc68WGl4+FEN03ABY3KMIq7hcK1tzsJiWlmXyosZg==}
engines: {node: '>=14.21.3'}
cpu: [x64]
os: [darwin]
+ '@biomejs/[email protected]':
+ resolution: {integrity: sha512-UeW44L/AtbmOF7KXLCoM+9PSgPo0IDcyEUfIoOXYeANaNXXf9mLUwV1GeF2OWjyic5zj6CnAJ9uzk2LT3v/wAw==}
+ engines: {node: '>=14.21.3'}
+ cpu: [x64]
+ os: [darwin]
+
'@biomejs/[email protected]':
resolution: {integrity: sha512-c8AlO45PNFZ1BYcwaKzdt46kYbuP6xPGuGQ6h4j3XiEDpyseRRUy/h+6gxj07XovmyxKnSX9GSZ6nVbZvcVUAw==}
engines: {node: '>=14.21.3'}
cpu: [arm64]
os: [linux]
+ '@biomejs/[email protected]':
+ resolution: {integrity: sha512-9yjUfOFN7wrYsXt/T/gEWfvVxKlnh3yBpnScw98IF+oOeCYb5/b/+K7YNqKROV2i1DlMjg9g/EcN9wvj+NkMuQ==}
+ engines: {node: '>=14.21.3'}
+ cpu: [arm64]
+ os: [linux]
+
'@biomejs/[email protected]':
resolution: {integrity: sha512-phNTBpo7joDFastnmZsFjYcDYobLTx4qR4oPvc9tJ486Bd1SfEVPHEvJdNJrMwUQK56T+TRClOQd/8X1nnjA9w==}
engines: {node: '>=14.21.3'}
cpu: [arm64]
os: [linux]
+ '@biomejs/[email protected]':
+ resolution: {integrity: sha512-fed2ji8s+I/m8upWpTJGanqiJ0rnlHOK3DdxsyVLZQ8ClY6qLuPc9uehCREBifRJLl/iJyQpHIRufLDeotsPtw==}
+ engines: {node: '>=14.21.3'}
+ cpu: [arm64]
+ os: [linux]
+
'@biomejs/[email protected]':
resolution: {integrity: sha512-UdEHKtYGWEX3eDmVWvQeT+z05T9/Sdt2+F/7zmMOFQ7boANeX8pcO6EkJPK3wxMudrApsNEKT26rzqK6sZRTRA==}
engines: {node: '>=14.21.3'}
cpu: [x64]
os: [linux]
+ '@biomejs/[email protected]':
+ resolution: {integrity: sha512-UHrGJX7PrKMKzPGoEsooKC9jXJMa28TUSMjcIlbDnIO4EAavCoVmNQaIuUSH0Ls2mpGMwUIf+aZJv657zfWWjA==}
+ engines: {node: '>=14.21.3'}
+ cpu: [x64]
+ os: [linux]
+
'@biomejs/[email protected]':
resolution: {integrity: sha512-vnedYcd5p4keT3iD48oSKjOIRPYcjSNNbd8MO1bKo9ajg3GwQXZLAH+0Cvlr+eMsO67/HddWmscSQwTFrC/uPA==}
engines: {node: '>=14.21.3'}
cpu: [x64]
os: [linux]
+ '@biomejs/[email protected]':
+ resolution: {integrity: sha512-I8G2QmuE1teISyT8ie1HXsjFRz9L1m5n83U1O6m30Kw+kPMPSKjag6QGUn+sXT8V+XWIZxFFBoTDEDZW2KPDDw==}
+ engines: {node: '>=14.21.3'}
+ cpu: [x64]
+ os: [linux]
+
'@biomejs/[email protected]':
resolution: {integrity: sha512-unNCDqUKjujYkkSxs7gFIfdasttbDC4+z0kYmcqzRk6yWVoQBL4dNLcCbdnJS+qvVDNdI9rHp2NwpQ0WAdla4Q==}
engines: {node: '>=14.21.3'}
cpu: [arm64]
os: [win32]
+ '@biomejs/[email protected]':
+ resolution: {integrity: sha512-J+Hu9WvrBevfy06eU1Na0lpc7uR9tibm9maHynLIoAjLZpQU3IW+OKHUtyL8p6/3pT2Ju5t5emReeIS2SAxhkQ==}
+ engines: {node: '>=14.21.3'}
+ cpu: [arm64]
+ os: [win32]
+
'@biomejs/[email protected]':
resolution: {integrity: sha512-ZmByhbrnmz/UUFYB622CECwhKIPjJLLPr5zr3edhu04LzbfcOrz16VYeNq5dpO1ADG70FORhAJkaIGdaVBG00w==}
engines: {node: '>=14.21.3'}
cpu: [x64]
os: [win32]
+ '@biomejs/[email protected]':
+ resolution: {integrity: sha512-/PJ59vA1pnQeKahemaQf4Nyj7IKUvGQSc3Ze1uIGi+Wvr1xF7rGobSrAAG01T/gUDG21vkDsZYM03NAmPiVkqg==}
+ engines: {node: '>=14.21.3'}
+ cpu: [x64]
+ os: [win32]
+
'@chronark/[email protected]':
resolution: {integrity: sha512-hE8kCGLJK5ncH8F7uPaqPiOOqo68vUI66nusg7HO5X9BcyN8lXfeQliu6Ou1kOSq95OYshf9nB2fk2+LEvF4ng==}
@@ -11661,30 +11714,65 @@ snapshots:
'@biomejs/cli-win32-arm64': 1.7.3
'@biomejs/cli-win32-x64': 1.7.3
+ '@biomejs/[email protected]':
+ optionalDependencies:
+ '@biomejs/cli-darwin-arm64': 1.8.3
+ '@biomejs/cli-darwin-x64': 1.8.3
+ '@biomejs/cli-linux-arm64': 1.8.3
+ '@biomejs/cli-linux-arm64-musl': 1.8.3
+ '@biomejs/cli-linux-x64': 1.8.3
+ '@biomejs/cli-linux-x64-musl': 1.8.3
+ '@biomejs/cli-win32-arm64': 1.8.3
+ '@biomejs/cli-win32-x64': 1.8.3
+
'@biomejs/[email protected]':
optional: true
+ '@biomejs/[email protected]':
+ optional: true
+
'@biomejs/[email protected]':
optional: true
+ '@biomejs/[email protected]':
+ optional: true
+
'@biomejs/[email protected]':
optional: true
+ '@biomejs/[email protected]':
+ optional: true
+
'@biomejs/[email protected]':
optional: true
+ '@biomejs/[email protected]':
+ optional: true
+
'@biomejs/[email protected]':
optional: true
+ '@biomejs/[email protected]':
+ optional: true
+
'@biomejs/[email protected]':
optional: true
+ '@biomejs/[email protected]':
+ optional: true
+
'@biomejs/[email protected]':
optional: true
+ '@biomejs/[email protected]':
+ optional: true
+
'@biomejs/[email protected]':
optional: true
+ '@biomejs/[email protected]':
+ optional: true
+
'@chronark/[email protected]':
dependencies:
zod: 3.23.8