From f1dd7c38adac1cc60a23b94770cd2c1616f31ab4 Mon Sep 17 00:00:00 2001
From: saeed0920 <sd.eed1381@gmail.com>
Date: Tue, 16 Sep 2025 22:06:39 +0330
Subject: [PATCH] add new componenet for refactors

---
 app/components/ui/CustomCheckBox.tsx    | 33 +++++++++++++
 app/components/ui/base-card.tsx         | 42 +++++++++++++++++
 app/components/ui/dialog.tsx            |  4 +-
 app/components/ui/form-field.tsx        | 61 +++++--------------------
 app/components/ui/funnel-chart.test.tsx | 39 ----------------
 app/components/ui/metric-card.tsx       | 48 +++++++++++++++++++
 6 files changed, 137 insertions(+), 90 deletions(-)
 create mode 100644 app/components/ui/CustomCheckBox.tsx
 create mode 100644 app/components/ui/base-card.tsx
 delete mode 100644 app/components/ui/funnel-chart.test.tsx
 create mode 100644 app/components/ui/metric-card.tsx

diff --git a/app/components/ui/CustomCheckBox.tsx b/app/components/ui/CustomCheckBox.tsx
new file mode 100644
index 0000000..a71fe0f
--- /dev/null
+++ b/app/components/ui/CustomCheckBox.tsx
@@ -0,0 +1,33 @@
+import { useId } from "react";
+
+interface CheckboxProps {
+  checked: boolean;
+  disabled?: boolean;
+  onChange?: (checked: boolean) => void;
+  className?: string;
+  id ?:string;
+}
+
+export default function CustomCheckBox({
+  checked,
+  disabled = false,
+  onChange,
+  className = "",
+  id
+}: CheckboxProps) {
+
+  const handleChange = (e: any) => {
+    onChange?.(e.target.checked);
+  };
+
+  return (
+    <input
+      id={id}
+      type="checkbox"
+      checked={checked}
+      disabled={disabled}
+      onChange={handleChange}
+      className={`form-checkbox ${className}`}
+    />
+  );
+}
diff --git a/app/components/ui/base-card.tsx b/app/components/ui/base-card.tsx
new file mode 100644
index 0000000..0aacd39
--- /dev/null
+++ b/app/components/ui/base-card.tsx
@@ -0,0 +1,42 @@
+import { cn } from "~/lib/utils";
+import { Card, CardContent, CardHeader, CardTitle } from "./card";
+
+interface BaseCardProps {
+  title?: string;
+  className?: string;
+  headerClassName?: string;
+  contentClassName?: string;
+  children: React.ReactNode;
+  withHeader?: boolean;
+}
+
+export function BaseCard({
+  title,
+  className,
+  headerClassName,
+  contentClassName,
+  children,
+  withHeader = false,
+}: BaseCardProps) {
+  return (
+    <Card
+      className={cn(
+        "bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] backdrop-blur-sm py-4 grid items-center",
+        className
+      )}
+    >
+      {withHeader && title ? (
+        <CardHeader className={cn("pb-2 border-b-2 border-gray-500/20", headerClassName)}>
+          <CardTitle className="text-white text-sm text-right font-persian px-4">{title}</CardTitle>
+        </CardHeader>
+      ) : title ? (
+        <div className="border-b-2 border-gray-500/20 pb-2">
+          <h3 className="text-sm font-bold text-white text-right font-persian px-4">{title}</h3>
+        </div>
+      ) : null}
+      <CardContent className={cn("py-2 px-4", contentClassName)}>
+        {children}
+      </CardContent>
+    </Card>
+  );
+}
\ No newline at end of file
diff --git a/app/components/ui/dialog.tsx b/app/components/ui/dialog.tsx
index 2958cae..a15e864 100644
--- a/app/components/ui/dialog.tsx
+++ b/app/components/ui/dialog.tsx
@@ -44,8 +44,8 @@ const DialogContent = React.forwardRef<
       {...props}
     >
       {children}
-      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
-        <X className="h-4 w-4 cursor-pointer" />
+      <DialogPrimitive.Close className="absolute left-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+        <X className="h-6 w-6 cursor-pointer" />
         <span className="sr-only">Close</span>
       </DialogPrimitive.Close>
     </DialogPrimitive.Content>
diff --git a/app/components/ui/form-field.tsx b/app/components/ui/form-field.tsx
index 074ae64..55d8224 100644
--- a/app/components/ui/form-field.tsx
+++ b/app/components/ui/form-field.tsx
@@ -3,6 +3,7 @@ import { cn } from "~/lib/utils";
 import { Eye, EyeOff, AlertCircle, CheckCircle2 } from "lucide-react";
 import { Input } from "./input";
 import { Label } from "./label";
+import CustomCheckbox from "./CustomCheckBox";
 
 interface BaseFieldProps {
   label?: string;
@@ -65,12 +66,6 @@ export function TextField({
       )}
 
       <div className="relative">
-        {leftIcon && (
-          <div className="absolute right-3 top-1/2 transform -translate-y-1/2 text-muted-foreground">
-            {leftIcon}
-          </div>
-        )}
-
         <Input
           id={id}
           type={type}
@@ -82,39 +77,14 @@ export function TextField({
           maxLength={maxLength}
           minLength={minLength}
           className={cn(
-            "w-full h-12 px-4 font-persian text-right transition-all duration-200",
-            leftIcon && "pr-10",
-            (rightIcon || hasError || hasSuccess) && "pl-10",
-            hasError &&
-              "border-destructive focus:border-destructive focus:ring-destructive/20",
-            hasSuccess &&
-              "border-green-500 focus:border-green-500 focus:ring-green-500/20",
+            "w-full h-12 outline-none bg-white text-base text-[#5F6284] px-4 font-persian text-right transition-all duration-200",
             className,
           )}
+          style={{boxShadow : "none"}}
         />
 
-        {(rightIcon || hasError || hasSuccess) && (
-          <div className="absolute left-3 top-1/2 transform -translate-y-1/2">
-            {hasError ? (
-              <AlertCircle className="h-4 w-4 text-destructive" />
-            ) : hasSuccess ? (
-              <CheckCircle2 className="h-4 w-4 text-green-500" />
-            ) : (
-              rightIcon && (
-                <span className="text-muted-foreground">{rightIcon}</span>
-              )
-            )}
-          </div>
-        )}
       </div>
 
-      {error && (
-        <p className="text-sm text-destructive font-persian flex items-center gap-1">
-          <AlertCircle className="h-3 w-3" />
-          {error}
-        </p>
-      )}
-
       {helper && !error && (
         <p className="text-sm text-muted-foreground font-persian">{helper}</p>
       )}
@@ -217,17 +187,19 @@ export function PasswordField({
           autoComplete={autoComplete}
           minLength={minLength}
           className={cn(
-            "w-full h-12 px-4 pl-10 font-persian text-right transition-all duration-200",
+            "w-full h-12 px-4 pl-10 bg-white text-base text-[#5F6284] font-persian text-right transition-all duration-200",
             hasError &&
               "border-destructive focus:border-destructive focus:ring-destructive/20",
             className,
           )}
+          style={{boxShadow : "none"}}
+
         />
 
         <button
           type="button"
           onClick={() => setShowPassword(!showPassword)}
-          className="absolute left-3 top-1/2 transform -translate-y-1/2 text-muted-foreground hover:text-foreground transition-colors"
+          className="absolute left-3 top-1/2 transform -translate-y-1/2 text-muted-foreground hover:text-black transition-colors"
           tabIndex={-1}
         >
           {showPassword ? (
@@ -318,26 +290,17 @@ export function CheckboxField({
 
   return (
     <div className={cn("space-y-2", containerClassName)}>
-      <div className="flex items-center gap-2">
-        <input
+      <div className="flex flex-row-reverse items-center gap-2">
+          <CustomCheckbox 
           id={id}
-          type="checkbox"
           checked={checked}
-          onChange={(e) => onChange(e.target.checked)}
-          disabled={disabled}
-          className={cn(
-            sizes[size],
-            "text-[var(--color-login-primary)] bg-background border-input rounded focus:ring-[var(--color-login-primary)] focus:ring-2 accent-[var(--color-login-primary)] transition-all duration-200",
-            disabled && "opacity-50 cursor-not-allowed",
-            error && "border-destructive focus:ring-destructive",
-            className,
-          )}
-        />
+          onChange={onChange}
+          />
         {label && (
           <Label
             htmlFor={id}
             className={cn(
-              "text-sm font-persian cursor-pointer",
+              "text-sm font-persian font-light text-white cursor-pointer",
               error ? "text-destructive" : "text-foreground",
               disabled && "opacity-50 cursor-not-allowed",
               required &&
diff --git a/app/components/ui/funnel-chart.test.tsx b/app/components/ui/funnel-chart.test.tsx
deleted file mode 100644
index 3d2f68c..0000000
--- a/app/components/ui/funnel-chart.test.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { FunnelChart } from './funnel-chart';
-
-const mockData = [
-  { name: "تعداد کل", value: 250, label: "تعداد کل" },
-  { name: "نمونه موفق", value: 130, label: "نمونه موفق" },
-  { name: "محصولات موفق", value: 70, label: "محصولات موفق" },
-  { name: "بهبود یا تغییر موفق", value: 80, label: "بهبود یا تغییر موفق" },
-  { name: "محصول جدید", value: 50, label: "محصول جدید" },
-];
-
-describe('FunnelChart', () => {
-  it('renders funnel chart with correct data', () => {
-    render(<FunnelChart data={mockData} title="قيف فرآیند پروژه ها" />);
-    
-    expect(screen.getByText('قيف فرآیند پروژه ها')).toBeInTheDocument();
-    expect(screen.getByText('۱۰۰%')).toBeInTheDocument();
-    expect(screen.getByText('۲۵%')).toBeInTheDocument();
-    expect(screen.getByText('ابتدا فرآیند')).toBeInTheDocument();
-    expect(screen.getByText('انتها فرآیند')).toBeInTheDocument();
-  });
-
-  it('displays funnel data values correctly', () => {
-    render(<FunnelChart data={mockData} />);
-    
-    expect(screen.getByText('۲۵۰')).toBeInTheDocument();
-    expect(screen.getByText('۱۳۰')).toBeInTheDocument();
-    expect(screen.getByText('۷۰')).toBeInTheDocument();
-    expect(screen.getByText('۸۰')).toBeInTheDocument();
-    expect(screen.getByText('۵۰')).toBeInTheDocument();
-  });
-
-  it('renders without title when not provided', () => {
-    render(<FunnelChart data={mockData} />);
-    
-    expect(screen.queryByText('قيف فرآیند پروژه ها')).not.toBeInTheDocument();
-  });
-});
diff --git a/app/components/ui/metric-card.tsx b/app/components/ui/metric-card.tsx
new file mode 100644
index 0000000..ae0e47e
--- /dev/null
+++ b/app/components/ui/metric-card.tsx
@@ -0,0 +1,48 @@
+import { formatNumber } from "~/lib/utils";
+import { BaseCard } from "./base-card";
+
+interface MetricCardProps {
+  title: string;
+  value: string | number;
+  percentValue?: string | number;
+  valueLabel?: string;
+  percentLabel?: string;
+}
+
+export function MetricCard({
+  title,
+  value,
+  percentValue,
+  valueLabel = "میلیون ریال",
+  percentLabel = "درصد به کل",
+}: MetricCardProps) {
+  return (
+    <BaseCard title={title}>
+      <div className="flex items-center justify-center flex-col">
+        <div className="flex items-center gap-4">
+              <div className="text-center">
+                <p className="text-3xl font-bold text-green-400">
+                  {formatNumber(value)}
+                </p>
+                <div className="text-xs text-gray-400 font-persian">
+                  {valueLabel}
+                </div>
+              </div>
+              {percentValue !== undefined && (
+                <>
+                  <span className="text-5xl font-thin text-gray-600">/</span>
+                  <div className="text-center">
+                    <p className="text-3xl font-bold text-green-400">
+                      {formatNumber(percentValue)}%
+                    </p>
+                    <div className="text-xs text-gray-400 font-persian">
+                      {percentLabel}
+                    </div>
+                  </div>
+                </>
+              )}
+            </div>
+          </div>
+        </BaseCard>
+  );
+}
\ No newline at end of file