fix nomenclature and others

theopensystemslab · Jan 9, 2025 · cd822a7 · cd822a7
1 parent 937a222
commit cd822a7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/app/components/ui/CalculatorInput.tsx b/app/components/ui/CalculatorInput.tsx
@@ -4,7 +4,7 @@ import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Household } from "@/app/models/Household";
 import Dashboard from "./Dashboard";
-import { formSchema, formType } from "@/app/schemas/formSchema";
+import { formSchema, FormFontend } from "@/app/schemas/formSchema";
 import { useSearchParams } from "next/navigation";
 
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
@@ -36,7 +36,7 @@ const CalculatorInput = () => {
   const urlHouseType = searchParams.get("houseType");
   const urlMaintenancePercentage = searchParams.get("maintenancePercentage");
 
-  const form = useForm<formType>({
+  const form = useForm<FormFontend>({
     resolver: zodResolver(formSchema),
     defaultValues: {
       houseType:
@@ -60,7 +60,7 @@ const CalculatorInput = () => {
     },
   });
 
-  const onSubmit = async (data: formType) => {
+  const onSubmit = async (data: FormFontend) => {
     setView("loading");
     const response = await fetch("/api", {
       method: "POST",
@@ -336,8 +336,14 @@ const CalculatorInput = () => {
         <ClipLoader color="black" size={50} />
       </div>
     );
-  } else if (view === "dashboard") {
-    return <Dashboard processedData={data} inputData={form.getValues()} />;
+  } else if (view === "dashboard" && data) {
+    const formValues = form.getValues();
+    return (
+      <Dashboard
+        processedData={data}
+        inputData={formSchema.parse(formValues)}
+      />
+    );
   }
 };
 

diff --git a/app/components/ui/Dashboard.tsx b/app/components/ui/Dashboard.tsx
@@ -1,11 +1,11 @@
 import React, { useRef, useState } from "react";
 import GraphCard from "./GraphCard";
 import { Household } from "@/app/models/Household";
-import type { formSchema } from "@/app/schemas/formSchema";
+import { FormFontend } from "@/app/schemas/formSchema";
 
 interface DashboardProps {
   processedData: Household;
-  inputData: typeof formSchema;
+  inputData: FormFontend;
 }
 
 const Dashboard: React.FC<DashboardProps> = ({ inputData }) => {

diff --git a/app/components/ui/FormEdit.tsx b/app/components/ui/FormEdit.tsx
@@ -1,6 +1,6 @@
 "use client";
 import React from "react";
-import { formType } from "@/app/schemas/formSchema";
+import { FormFontend } from "@/app/schemas/formSchema";
 import {
   Accordion,
   AccordionContent,
@@ -10,7 +10,7 @@ import {
 import { HouseType } from "../../models/Property";
 
 interface Props {
-  formData: formType;
+  formData: FormFontend;
 }
 
 const houseTypeDisplayNames: Record<HouseType, string> = {

diff --git a/app/schemas/formSchema.ts b/app/schemas/formSchema.ts
@@ -27,4 +27,4 @@ export const formSchema = z.object({
   maintenancePercentage: maintenancePercentageSchema,
 });
 
-export type formType = z.infer<typeof formSchema>;
+export type FormFontend = z.infer<typeof formSchema>;