refactor: date & minor fallback

isd-sgcu · Feb 20, 2024 · c41abfd · c41abfd
1 parent 721339b
commit c41abfd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/app/admin/pets/add/page.tsx b/src/app/admin/pets/add/page.tsx
@@ -152,7 +152,7 @@ const adminCreate = () => {
  </div>
  </div>
  <div className="hidden md:block">
- {data && <SmallPetCardList isLoading={isLoading} pets={data.pets} />}
+ <SmallPetCardList isLoading={isLoading} pets={data?.pets} />
  </div>
  </>
  );

diff --git a/src/components/Admin/Pets/Add/DateInputInfo.tsx b/src/components/Admin/Pets/Add/DateInputInfo.tsx
@@ -19,7 +19,8 @@ const DateInputInfo = (props: DateInputInfoProps) => {
  };
 
  const birthdate = useMemo(() => {
- return dayjs(props.value).format("MMMM DD, YYYY");
+ if (props.value != "-") return dayjs(props.value).format("MMMM DD, YYYY");
+ return "-";
  }, [props.value]);
 
  return (
@@ -40,7 +41,9 @@ const DateInputInfo = (props: DateInputInfoProps) => {
  />
  </div>
  ) : (
- <div className="ml-2 font-semibold">{birthdate}</div>
+ <div className="ml-2 font-semibold">
+ {birthdate ? birthdate : "-"}
+ </div>
  )}
  </div>
  </div>

diff --git a/src/components/Admin/Pets/Add/EditInfoAndSubmit.tsx b/src/components/Admin/Pets/Add/EditInfoAndSubmit.tsx
@@ -9,8 +9,8 @@ import TextInputInfo from "./TextInputInfo";
 import ToggleInputInfo from "./ToggleInputInfo";
 
 export type info = {
- type: string;
- gender: string;
+ type: "dog" | "cat" | "-";
+ gender: "male" | "female" | "-";
  color: string;
  age: string;
  nature: string;
@@ -37,13 +37,11 @@ const EditInfoAndSubmit = (props: EditInfoAndSubmitProps) => {
  const addNoneInfo = showInfo;
  if (addNoneInfo.age === "") addNoneInfo["age"] = "-";
  if (addNoneInfo.nature === "") addNoneInfo["nature"] = "-";
- if (addNoneInfo.gender === "") addNoneInfo["gender"] = "-";
  props.setValue(addNoneInfo);
  } else {
  const removeEmptyInfo = props.value;
  if (removeEmptyInfo.age === "-") removeEmptyInfo["age"] = "";
  if (removeEmptyInfo.nature === "-") removeEmptyInfo["nature"] = "";
- if (removeEmptyInfo.gender === "-") removeEmptyInfo["gender"] = "";
  setShowInfo(removeEmptyInfo);
  }
  setEnableEdit(!enableEdit);