🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor GoalCard and Turnstile components for improved user interaction and theme handling
Bill Yangbab439111fa6
diff --git a/client/src/app/[site]/goals/components/GoalCard.tsx b/client/src/app/[site]/goals/components/GoalCard.tsxindex 87adb0146..f6f81c1d9 100644--- a/client/src/app/[site]/goals/components/GoalCard.tsx+++ b/client/src/app/[site]/goals/components/GoalCard.tsx@@ -132,47 +132,39 @@ export default function GoalCard({ goal, siteId }: GoalCardProps) {{/* Right section - Actions */}<div className="flex flex-shrink-0 gap-1 pl-4">- <GoalFormModal- siteId={siteId}- goal={goal}- trigger={- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="ghost"- size="smIcon"- onClick={e => {- e.stopPropagation(); // Prevent expanding when clicking edit- }}- >- <Edit className="h-4 w-4" />- </Button>- </TooltipTrigger>- <TooltipContent>Edit Goal</TooltipContent>- </Tooltip>- }- />- <GoalFormModal- siteId={siteId}- goal={goal}- isCloneMode={true}- trigger={- <Tooltip>- <TooltipTrigger asChild>- <Button- variant="ghost"- size="smIcon"- onClick={e => {- e.stopPropagation(); // Prevent expanding when clicking clone- }}- >- <Copy className="h-4 w-4" />- </Button>- </TooltipTrigger>- <TooltipContent>Clone Goal</TooltipContent>- </Tooltip>- }- />+ <div onClick={e => e.stopPropagation()}>+ <GoalFormModal+ siteId={siteId}+ goal={goal}+ trigger={+ <Tooltip>+ <TooltipTrigger asChild>+ <Button variant="ghost" size="smIcon">+ <Edit className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Edit Goal</TooltipContent>+ </Tooltip>+ }+ />+ </div>+ <div onClick={e => e.stopPropagation()}>+ <GoalFormModal+ siteId={siteId}+ goal={goal}+ isCloneMode={true}+ trigger={+ <Tooltip>+ <TooltipTrigger asChild>+ <Button variant="ghost" size="smIcon">+ <Copy className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>Clone Goal</TooltipContent>+ </Tooltip>+ }+ />+ </div><Tooltip><TooltipTrigger asChild><Buttondiff --git a/client/src/components/auth/Turnstile.tsx b/client/src/components/auth/Turnstile.tsxindex 51824240a..5a0b6eda1 100644--- a/client/src/components/auth/Turnstile.tsx+++ b/client/src/components/auth/Turnstile.tsx@@ -1,6 +1,7 @@"use client";import { Turnstile as CloudflareTurnstile, TurnstileInstance } from "@marsidev/react-turnstile";+import { useTheme } from "next-themes";import { useRef } from "react";interface TurnstileProps {@@ -13,6 +14,7 @@ interface TurnstileProps {export function Turnstile({ onSuccess, onError, onExpire, className = "" }: TurnstileProps) {const turnstileRef = useRef<TurnstileInstance>(null);const siteKey = process.env.NEXT_PUBLIC_TURNSTILE_SITE_KEY;+ const { theme } = useTheme();if (!siteKey) {console.error("NEXT_PUBLIC_TURNSTILE_SITE_KEY is not defined");@@ -34,7 +36,7 @@ export function Turnstile({ onSuccess, onError, onExpire, className = "" }: TurnonExpire?.();}}options={{- theme: "dark",+ theme: theme === "dark" ? "dark" : "auto",size: "normal",}}/>