diff --git a/src/features/home/ui/Home.tsx b/src/features/home/ui/Home.tsx index bead137..fce37fb 100644 --- a/src/features/home/ui/Home.tsx +++ b/src/features/home/ui/Home.tsx @@ -8,7 +8,6 @@ import { Banknote, Calendar, FileText, - List, Loader2, MapPinCheck, MapPinHouse, @@ -46,14 +45,14 @@ const navItems: NavItem[] = [ description: "Hujjatlar", featured: true, }, - { - id: "tour_plan", - title: "Tur plan", - link: "/tour-plan", - icon: , - description: "Rejalar", - featured: true, - }, + // { + // id: "tour_plan", + // title: "Tur plan", + // link: "/tour-plan", + // icon: , + // description: "Rejalar", + // featured: true, + // }, ]; export default function Home() { diff --git a/src/features/phamarcy/lib/data.ts b/src/features/phamarcy/lib/data.ts index ee73f3b..0c92962 100644 --- a/src/features/phamarcy/lib/data.ts +++ b/src/features/phamarcy/lib/data.ts @@ -1,8 +1,8 @@ export interface CreatePharmacyReq { name: string; - inn: string; + inn?: string; owner_phone: string; - responsible_phone: string; + responsible_phone?: string; district_id: number; place_id: number; longitude: number; diff --git a/src/features/phamarcy/lib/form.ts b/src/features/phamarcy/lib/form.ts index 86e9010..28db1e4 100644 --- a/src/features/phamarcy/lib/form.ts +++ b/src/features/phamarcy/lib/form.ts @@ -12,9 +12,9 @@ export const objectForm = z.object({ }), latitude: z.number({ error: "Majburiy maydon" }), longitude: z.number({ error: "Majburiy maydon" }), - inn: z.string().min(1, { message: "Majburiy maydon" }), + inn: z.string().optional(), phoneDirector: z.string().min(17, { message: "Majburiy maydon" }), - phonePharmacy: z.string().min(17, { message: "Majburiy maydon" }), + phonePharmacy: z.string().optional(), nearbyCoords: z .array( z.object({ diff --git a/src/features/phamarcy/ui/CreatePharmacy.tsx b/src/features/phamarcy/ui/CreatePharmacy.tsx index 933cd0f..7b08bc1 100644 --- a/src/features/phamarcy/ui/CreatePharmacy.tsx +++ b/src/features/phamarcy/ui/CreatePharmacy.tsx @@ -218,13 +218,15 @@ const CreatePharmacy = () => { latitude: values.latitude, longitude: values.longitude, }, - inn: values.inn, + ...(values.inn && { inn: values.inn }), latitude: values.latitude, longitude: values.longitude, name: values.name, owner_phone: onlyNumber(values.phoneDirector), place_id: Number(values.streets), - responsible_phone: onlyNumber(values.phonePharmacy), + ...(values.phonePharmacy && { + responsible_phone: onlyNumber(values.phonePharmacy), + }), }); }; diff --git a/src/features/plan/lib/data.ts b/src/features/plan/lib/data.ts index ab810be..a3bc490 100644 --- a/src/features/plan/lib/data.ts +++ b/src/features/plan/lib/data.ts @@ -1,5 +1,5 @@ export interface CreatePlansReq { - title: string; + // title: string; description: string; date: string; // "2025-12-05"; doctor_id: number | null; diff --git a/src/features/plan/ui/PlanDetailsDialogProps.tsx b/src/features/plan/ui/PlanDetailsDialogProps.tsx index 445ff63..b93679e 100644 --- a/src/features/plan/ui/PlanDetailsDialogProps.tsx +++ b/src/features/plan/ui/PlanDetailsDialogProps.tsx @@ -111,7 +111,7 @@ export function PlanDetailsDialog({ {/* Title */} -
+ {/*

Sarlavha

{task.title}

-
+
*/} {/* Description */}

Tavsifi

diff --git a/src/features/plan/ui/addPlans.tsx b/src/features/plan/ui/addPlans.tsx index 17f78f3..25a8499 100644 --- a/src/features/plan/ui/addPlans.tsx +++ b/src/features/plan/ui/addPlans.tsx @@ -36,7 +36,7 @@ import z from "zod"; import { plans_api } from "../lib/api"; const plansForm = z.object({ - title: z.string().min(1, "Sarlavha kiritish majburiy"), + // title: z.string().min(1, "Sarlavha kiritish majburiy"), description: z.string().min(1, "Tavsif kiritish majburiy"), date: z.string().optional(), }); @@ -71,7 +71,7 @@ export const AddPlans = ({ const form = useForm>({ resolver: zodResolver(plansForm), defaultValues: { - title: "", + // title: "", description: "", date: formatDate.format(new Date(), "YYYY-MM-DD"), }, @@ -166,7 +166,7 @@ export const AddPlans = ({ useEffect(() => { if (taskEdit) { - form.setValue("title", taskEdit.title); + // form.setValue("title", taskEdit.title); form.setValue("description", taskEdit.description); form.setValue("date", taskEdit.date); } @@ -221,7 +221,7 @@ export const AddPlans = ({ : pharmId ? pharmId.longitude : 63.123, - title: values.title, + // title: values.title, }, id: taskEdit.id, }); @@ -253,7 +253,7 @@ export const AddPlans = ({ : pharmId ? pharmId.longitude : 63.123, - title: values.title, + // title: values.title, }); } } @@ -368,19 +368,7 @@ export const AddPlans = ({

- ( - - Sarlavha - - - - - - )} - /> + {/* Z */}
-

{item.title} -

-

*/} +

{item.description} -

+

diff --git a/vite.config.ts b/vite.config.ts index 0e54ed1..e46aacf 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -17,7 +17,7 @@ export default defineConfig({ port: 5174, host: true, // barcha hostlarga ruxsat allowedHosts: [ - "hugo-quotes-loved-wiki.trycloudflare.com", // ngrok host qo'shildi + "spin-ronald-officers-reasonably.trycloudflare.com", // ngrok host qo'shildi ], }, });