easy

0-don · Feb 26, 2024 · 62812b2 · 62812b2
1 parent b255442
commit 62812b2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/web/src/app/[locale]/(main)/(user)/@userModal/(.)user/[id]/page.tsx b/web/src/app/[locale]/(main)/(user)/@userModal/(.)user/[id]/page.tsx
@@ -6,18 +6,18 @@ import { useGqlQuery } from "@/fetcher";
 import { ResultOf } from "gql.tada";
 
 interface UserDetailsModalProps {
-  params: { id: number };
+  params: { id: string };
 }
 
 export default function IdPage({ params }: UserDetailsModalProps) {
   const { data: { getUserAdmin } = {}, refetch } = useGqlQuery(GET_USER_ADMIN, {
-    where: { id: { equals: Number(params.id) } },
+    where: { id: { equals: params.id } },
   });
   return (
     <MyModal className="md:w-2/5">
       <main className="mt-5 w-full rounded-lg bg-default-50 p-5">
         <UserProfile
-          user={getUserAdmin as ResultOf<typeof GET_USER_ADMIN>["getUserAdmin"]}
+          user={getUserAdmin}
           refetch={refetch}
         />
       </main>

diff --git a/web/src/app/[locale]/(main)/(user)/user/[id]/page.tsx b/web/src/app/[locale]/(main)/(user)/user/[id]/page.tsx
@@ -6,12 +6,12 @@ import { useGqlQuery } from "@/fetcher";
 import { ResultOf } from "gql.tada";
 
 interface UserDetailsPageProps {
-  params: { id: number };
+  params: { id: string };
 }
 
 export default function UserDetailsPage({ params }: UserDetailsPageProps) {
   const { data: { getUserAdmin } = {}, refetch } = useGqlQuery(GET_USER_ADMIN, {
-    where: { id: { equals: Number(params.id) } },
+    where: { id: { equals: params.id } },
   });
   return (
     <main className="mt-5 w-full max-w-3xl rounded-lg bg-default-50 p-5">

diff --git a/web/src/components/pages/dashboard/table/TableMealItem.tsx b/web/src/components/pages/dashboard/table/TableMealItem.tsx
@@ -122,7 +122,7 @@ export const TableMealItem: React.FC<TableMealItemProps> = ({
                     ),
                     weeklyMealGroupId: Number(props.group),
                     timeOfDay: groupItem?.timeOfDay,
-                    userId: Number(me?.id),
+                    userId: me?.id || "",
                     mealId: props.meal.id,
                     date: dayjs(props.date).add(1, "day").toISOString(),
                   },

diff --git a/web/src/components/pages/user/settings/UserProfile.tsx b/web/src/components/pages/user/settings/UserProfile.tsx
@@ -26,9 +26,9 @@ type TimeOfDayAndMealLocation = {
 };
 
 interface UserProfileProps {
-  user: Partial<
+  user?: Partial<
     ResultOf<typeof GET_USER_ADMIN>["getUserAdmin"] | ResultOf<typeof ME>["me"]
-  >;
+  > | null;
   refetch: (args?: any) => Promise<any>;
 }
 
@@ -62,7 +62,7 @@ export const UserProfile: React.FC<UserProfileProps> = ({ user, refetch }) => {
       try {
         await createUserMealLocation({
           data: {
-            userId: Number(user?.id),
+            userId: String(user?.id),
             mealLocation:
               changedState.mealLocation as keyof typeof MealLocation,
             timeOfDay: changedState.timeOfDay as keyof typeof TimeOfDay,
@@ -292,7 +292,7 @@ export const UserProfile: React.FC<UserProfileProps> = ({ user, refetch }) => {
                                     await deleteUserMealLocation({
                                       where: {
                                         id,
-                                        userId: { equals: Number(user?.id) },
+                                        userId: { equals: String(user?.id) },
                                       },
                                     });
                                     onOpen();