Merge branch 'main' of https://github.com/unkeyed/unkey

apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/new/client.tsx

@@ -149,7 +149,7 @@ export const CreateKey = ({ apiId, keyAuthId, defaultBytes, defaultPrefix }: Pro
     form.resetField("limit", undefined);
   };
 
-  // biome-ignore lint: only run once
+  // biome-ignore lint/correctness/useExhaustiveDependencies: reset is only required on mount
   useEffect(() => {
     // React hook form + zod doesn't play nice with nested objects, so we need to reset them on load.
     resetRateLimit();

apps/dashboard/app/(app)/settings/root-keys/new/client.tsx

@@ -93,7 +93,7 @@ export const Client: React.FC<Props> = ({ apis }) => {
     }));
   };
 
-  // biome-ignore lint: should only run once
+  // biome-ignore lint/correctness/useExhaustiveDependencies: effect must be called once to set initial cards state
   useEffect(() => {
     const initialSelectedApiSet = new Set<string>();
     selectedPermissions.forEach((permission) => {

apps/dashboard/app/auth/sign-in/email-signin.tsx

@@ -20,13 +20,14 @@ export function EmailSignIn(props: {
   const router = useRouter();
   const [lastUsed, setLastUsed] = useLastUsed();
 
-  // biome-ignore lint: this works
+  // biome-ignore lint/correctness/useExhaustiveDependencies: effect must be called once if sign-in is loaded
   React.useEffect(() => {
     const signUpOrgUser = async () => {
-      const ticket = new URL(window.location.href).searchParams.get(param);
       if (!signInLoaded) {
         return;
       }
+
+      const ticket = new URL(window.location.href).searchParams.get(param);
       if (!ticket) {
         return;
       }

apps/dashboard/app/auth/sign-up/email-signup.tsx

@@ -20,9 +20,14 @@ export const EmailSignUp: React.FC<Props> = ({ setError, setVerification }) => {
   const [isLoading, setIsLoading] = React.useState(false);
   const [_transferLoading, setTransferLoading] = React.useState(true);
   const router = useRouter();
-  // biome-ignore lint: works fine as is
+
+  // biome-ignore lint/correctness/useExhaustiveDependencies: effect must be called once if sign-up is loaded
   React.useEffect(() => {
     const signUpFromParams = async () => {
+      if (!signUpLoaded) {
+        return;
+      }
+
       const ticket = new URL(window.location.href).searchParams.get("__clerk_ticket");
       const emailParam = new URL(window.location.href).searchParams.get("email");
       if (!ticket && !emailParam) {
@@ -69,6 +74,7 @@ export const EmailSignUp: React.FC<Props> = ({ setError, setVerification }) => {
           });
       }
     };
+
     signUpFromParams();
     setTransferLoading(false);
   }, [signUpLoaded]);

apps/dashboard/app/layout.tsx

@@ -4,6 +4,7 @@ import { TooltipProvider } from "@/components/ui/tooltip";
 import { PHProvider, PostHogPageview } from "@/providers/PostHogProvider";
 import "@/styles/tailwind/tailwind.css";
 import { ClerkProvider } from "@clerk/nextjs";
+import "@unkey/ui/css";
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import localFont from "next/font/local";
@@ -29,8 +30,8 @@ export const metadata = {
   openGraph: {
     title: "Open Source API Authentication",
     description: "Build better APIs faster ",
-    url: "https://unkey.dev",
-    siteName: "unkey.dev",
+    url: "https://app.unkey.com",
+    siteName: "app.unkey.com",
     images: ["https://www.unkey.com/og.png"],
   },
   twitter: {

apps/dashboard/package.json

@@ -48,12 +48,14 @@
     "@unkey/error": "workspace:^",
     "@unkey/events": "workspace:^",
     "@unkey/hash": "workspace:^",
+    "@unkey/icons": "workspace:^",
     "@unkey/id": "workspace:^",
     "@unkey/keys": "workspace:^",
     "@unkey/ratelimit": "workspace:^",
     "@unkey/rbac": "workspace:^",
     "@unkey/resend": "workspace:^",
     "@unkey/schema": "workspace:^",
+    "@unkey/ui": "workspace:^",
     "@unkey/validation": "workspace:^",
     "@unkey/vault": "workspace:^",
     "@unkey/vercel": "workspace:^",

apps/dashboard/tailwind.config.js

@@ -1,5 +1,7 @@
 /** @type {import('tailwindcss').Config} */
 const defaultTheme = require("tailwindcss/defaultTheme");
+import unkeyUiTailwindConfig from "@unkey/ui/tailwind.config";
+
 const _plugin = require("tailwindcss/plugin");
 
 module.exports = {
@@ -9,8 +11,10 @@ module.exports = {
     "./components/**/*.{ts,tsx}",
     "./app/**/*.{ts,tsx}",
     "./src/**/*.{ts,tsx}",
+    "../../internal/ui/src/**/*.tsx",
+    "../../internal/icons/src/**/*.tsx",
   ],
-  theme: {
+  theme: mergeObjects(unkeyUiTailwindConfig, {
     fontSize: {
       xxs: ["10px", "16px"],
       xs: ["0.75rem", { lineHeight: "1rem" }],
@@ -134,11 +138,28 @@ module.exports = {
         ],
       },
     },
-  },
+  }),
   plugins: [
     require("tailwindcss-animate"),
     require("@tailwindcss/typography"),
     require("@tailwindcss/aspect-ratio"),
     require("@tailwindcss/container-queries"),
   ],
 };
+
+function mergeObjects(obj1, obj2) {
+  for (const key in obj2) {
+    // biome-ignore lint/suspicious/noPrototypeBuiltins: don't tell me what to do
+    if (obj2.hasOwnProperty(key)) {
+      if (typeof obj2[key] === "object" && !Array.isArray(obj2[key])) {
+        if (!obj1[key]) {
+          obj1[key] = {};
+        }
+        obj1[key] = mergeObjects(obj1[key], obj2[key]);
+      } else {
+        obj1[key] = obj2[key];
+      }
+    }
+  }
+  return obj1;
+}

apps/www/components/footer/footer.tsx

@@ -37,6 +37,11 @@ const navigation = [
         title: "Glossary",
         href: "/glossary",
       },
+      {
+        title: "Status Page",
+        href: "https://status.unkey.com",
+        external: true,
+      },
     ],
   },
   {

apps/www/components/shiny-card.tsx

@@ -61,7 +61,7 @@ export const ShinyCardGroup: React.FC<ShinyCardGroupProps> = ({
         });
       }
     }
-  }, [mousePosition.x, mousePosition.y]);
+  }, [boxes, mousePosition.x, mousePosition.y]);
 
   useEffect(() => {
     onMouseMove();