merge conlicts

Author: arcoraven

.changeset/khaki-items-tease.md

@@ -46,7 +46,7 @@
     "@radix-ui/react-switch": "^1.1.0",
     "@radix-ui/react-tooltip": "1.1.2",
     "@sentry/nextjs": "8.32.0",
-    "@shazow/whatsabi": "^0.14.1",
+    "@shazow/whatsabi": "^0.15.2",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^3.5.0",
     "@tanstack/react-query": "5.56.2",
@@ -110,14 +110,14 @@
     "@next/eslint-plugin-next": "14.2.13",
     "@playwright/test": "1.47.2",
     "@storybook/addon-essentials": "8.3.4",
-    "@storybook/addon-interactions": "8.3.4",
+    "@storybook/addon-interactions": "8.3.5",
     "@storybook/addon-links": "8.3.4",
     "@storybook/addon-onboarding": "8.3.4",
     "@storybook/addon-viewport": "8.3.4",
     "@storybook/blocks": "8.3.4",
     "@storybook/nextjs": "8.3.4",
     "@storybook/react": "8.3.4",
-    "@storybook/test": "8.3.4",
+    "@storybook/test": "8.3.5",
     "@types/color": "^3.0.6",
     "@types/node": "20.14.9",
     "@types/papaparse": "^5.3.14",

apps/dashboard/package.json

@@ -9,12 +9,12 @@ export type Team = {
   slug: string;
   createdAt: string;
   updatedAt: string;
-  deletedAt: string | null;
-  bannedAt: string | null;
-  // image: string; // -> TODO
+  deletedAt?: string;
+  bannedAt?: string;
+  image?: string;
   billingPlan: "pro" | "growth" | "free";
   billingStatus: "validPayment" | (string & {}); // what's the other value?
-  // billingEmail: string;
+  billingEmail: string;
   // billingExternalId: string;
   // billingType: "STRIPE" | ??
   // billingCustomerPayload: ?? | null

apps/dashboard/public/assets/solutions-pages/gaming/gaming-speed-racer.png

@@ -0,0 +1,15 @@
+"use client";
+
+import { useEffect } from "react";
+import { setCookie } from "../../stores/SyncStoreToCookies";
+
+export function DashboardTypeCookieSetter(props: {
+  type: "team" | "old";
+}) {
+  // eslint-disable-next-line no-restricted-syntax
+  useEffect(() => {
+    setCookie("x-dashboard-type", props.type);
+  }, [props.type]);
+
+  return null;
+}

apps/dashboard/public/assets/solutions-pages/gaming/gaming-tappyfowl.png

@@ -9,7 +9,7 @@ export function ProjectAvatar(props: {
   return (
     <Img
       src={props.src}
-      className={cn("rounded-lg border", props.className)}
+      className={cn("rounded-lg border border-border", props.className)}
       alt={""}
       fallback={
         <div className="flex items-center justify-center bg-muted/50">

apps/dashboard/public/assets/templates/speed-racer.png

@@ -11,9 +11,12 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
+import { cn } from "../../lib/utils";
 
 export function DangerSettingCard(props: {
   title: string;
+  className?: string;
+  footerClassName?: string;
   description: string;
   buttonLabel: string;
   buttonOnClick: () => void;
@@ -22,18 +25,31 @@ export function DangerSettingCard(props: {
     title: string;
     description: string;
   };
+  children?: React.ReactNode;
 }) {
   return (
-    <div className="overflow-hidden rounded-lg border border-red-500/70">
-      <div className="bg-muted/50 px-4 py-6 lg:px-6">
+    <div
+      className={cn(
+        "overflow-hidden rounded-lg border border-red-500/70",
+        props.className,
+      )}
+    >
+      <div className="px-4 py-6 lg:px-6">
         <h3 className="font-semibold text-xl tracking-tight">{props.title}</h3>
 
         <p className="mt-1.5 mb-4 text-foreground text-sm">
           {props.description}
         </p>
+
+        {props.children}
       </div>
 
-      <div className="flex justify-end border-red-500/70 border-t bg-red-100 px-4 py-4 lg:px-6 dark:bg-red-500/20">
+      <div
+        className={cn(
+          "flex justify-end border-red-500/70 border-t bg-red-100 px-4 py-4 lg:px-6 dark:bg-red-500/20",
+          props.footerClassName,
+        )}
+      >
         <Dialog>
           <DialogTrigger asChild>
             <Button
@@ -46,7 +62,10 @@ export function DangerSettingCard(props: {
             </Button>
           </DialogTrigger>
 
-          <DialogContent>
+          <DialogContent
+            className="z-[10001]"
+            dialogOverlayClassName="z-[10000]"
+          >
             <DialogHeader className="pr-10">
               <DialogTitle className="leading-snug">
                 {props.confirmationDialog.title}