From d5106d85e928b19ba0d4c216fbd5b59e1aeb148f Mon Sep 17 00:00:00 2001
From: Samandar Turgunboyev <turgunboyevsamandar4@gmail.com>
Date: Tue, 3 Feb 2026 18:56:12 +0500
Subject: [PATCH] bug fixed

---
 src/features/users/lib/data.ts     |  7 ++--
 src/features/users/ui/UserCard.tsx | 58 +++---------------------------
 vite.config.ts                     |  2 +-
 3 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/src/features/users/lib/data.ts b/src/features/users/lib/data.ts
index aef4d26..cf8ce97 100644
--- a/src/features/users/lib/data.ts
+++ b/src/features/users/lib/data.ts
@@ -2,11 +2,8 @@ export interface UserData {
   id: number;
   username: string;
   first_name: string;
-  last_name: string;
-  middle_name: null | string;
-  gender: "M" | "F" | null;
-  region: null | string;
-  address: null | string;
+  name: string;
+  short_name: string;
   created_at: string;
   password_set: boolean;
 }
diff --git a/src/features/users/ui/UserCard.tsx b/src/features/users/ui/UserCard.tsx
index 6a617ae..48f2b17 100644
--- a/src/features/users/ui/UserCard.tsx
+++ b/src/features/users/ui/UserCard.tsx
@@ -2,7 +2,7 @@
 
 import { user_api } from "@/features/users/lib/api";
 import type { UserData } from "@/features/users/lib/data";
-import { Badge } from "@/shared/ui/badge";
+import formatDate from "@/shared/lib/formatDate";
 import { Button } from "@/shared/ui/button";
 import {
   Dialog,
@@ -51,35 +51,6 @@ export function UserCard({ users }: UserListProps) {
   const [open, setOpen] = useState<boolean>(false);
   const queryClient = useQueryClient();
 
-  const getGenderColor = (gender: "M" | "F" | null) => {
-    switch (gender) {
-      case "M":
-        return "bg-blue-100 text-blue-800";
-      case "F":
-        return "bg-pink-100 text-pink-800";
-      default:
-        return "bg-gray-100 text-gray-800";
-    }
-  };
-
-  const getGenderLabel = (gender: "M" | "F" | null) => {
-    switch (gender) {
-      case "M":
-        return "Erkak";
-      case "F":
-        return "Ayol";
-      default:
-        return "Ko'rsatilmagan";
-    }
-  };
-
-  const getFullName = (user: UserData) => {
-    const parts = [user.first_name, user.middle_name, user.last_name].filter(
-      Boolean,
-    );
-    return parts.length > 0 ? parts.join(" ") : user.username;
-  };
-
   const form = useForm<z.infer<typeof passwordSet>>({
     resolver: zodResolver(passwordSet),
     defaultValues: {
@@ -130,9 +101,6 @@ export function UserCard({ users }: UserListProps) {
             <TableHead className="w-[50px]">ID</TableHead>
             <TableHead>To'liq ism</TableHead>
             <TableHead>Username</TableHead>
-            <TableHead>Jinsi</TableHead>
-            <TableHead>Hudud</TableHead>
-            <TableHead>Manzil</TableHead>
             <TableHead>Ro'yxatdan o'tgan</TableHead>
             <TableHead className="text-right">Amallar</TableHead>
           </TableRow>
@@ -143,34 +111,16 @@ export function UserCard({ users }: UserListProps) {
               <TableCell className="font-medium">{user.id}</TableCell>
               <TableCell>
                 <div className="flex flex-col">
-                  <span className="font-medium">{getFullName(user)}</span>
+                  <span className="font-medium">{user.name}</span>
                 </div>
               </TableCell>
               <TableCell>
                 <span className="text-muted-foreground">@{user.username}</span>
               </TableCell>
-              <TableCell>
-                <Badge className={getGenderColor(user.gender)}>
-                  {getGenderLabel(user.gender)}
-                </Badge>
-              </TableCell>
+
               <TableCell>
                 <span className="text-sm text-muted-foreground">
-                  {user.region || "-"}
-                </span>
-              </TableCell>
-              <TableCell>
-                <span className="text-sm text-muted-foreground">
-                  {user.address || "-"}
-                </span>
-              </TableCell>
-              <TableCell>
-                <span className="text-sm text-muted-foreground">
-                  {new Date(user.created_at).toLocaleDateString("uz-UZ", {
-                    year: "numeric",
-                    month: "short",
-                    day: "numeric",
-                  })}
+                  {formatDate.format(user.created_at, "DD-MM-YYYY")}
                 </span>
               </TableCell>
               <TableCell className="text-right">
diff --git a/vite.config.ts b/vite.config.ts
index 3ee6e79..41fe404 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -11,7 +11,7 @@ export default defineConfig({
     alias: [{ find: "@", replacement: path.resolve(__dirname, "src") }],
   },
   server: {
-    port: 3002,
+    port: 8081,
     open: true,
   },
 });