diff --git a/backend/api/openapi.yaml b/backend/api/openapi.yaml
index c3310bf4..891df758 100644
--- a/backend/api/openapi.yaml
+++ b/backend/api/openapi.yaml
@@ -1895,6 +1895,15 @@ paths:
       summary: Creates a saved event
       description: Creates a saved event
       operationId: create-saved
+      parameters:
+        - name: Accept-Language
+          in: header
+          schema:
+            type: string
+            default: en-US
+            enum:
+              - en-US
+              - th-TH
       requestBody:
         content:
           application/json:
@@ -1948,6 +1957,14 @@ paths:
             default: 10
             minimum: 1
             maximum: 100
+        - name: Accept-Language
+          in: header
+          schema:
+            type: string
+            default: en-US
+            enum:
+              - en-US
+              - th-TH
       responses:
         "200":
           description: OK
@@ -3390,6 +3407,7 @@ components:
         - name
         - active
         - presigned_url
+        - location_id
         - created_at
         - updated_at
         - stripe_account_id
diff --git a/backend/cmd/main.go b/backend/cmd/main.go
index 4f2482ac..2243e3fe 100644
--- a/backend/cmd/main.go
+++ b/backend/cmd/main.go
@@ -36,7 +36,6 @@ func main() {
 		}
 	}()
 
-
 	port := cfg.Application.Port
 
 	// Listen for connections with a goroutine
@@ -54,7 +53,6 @@ func main() {
 
 	slog.Info("Shutting down server")
 
-
 	// Shutdown server with timeout
 	shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer shutdownCancel()
diff --git a/backend/internal/models/saved.go b/backend/internal/models/saved.go
index 75df2cdd..f8ef272a 100644
--- a/backend/internal/models/saved.go
+++ b/backend/internal/models/saved.go
@@ -19,6 +19,7 @@ type CreateSavedInput struct {
 		GuardianID uuid.UUID `json:"guardian_id" db:"guardian_id" doc:"ID of the guardian that saved this."`
 		EventID    uuid.UUID `json:"event_id" db:"event_id" doc:"ID of this saved event."`
 	}
+	AcceptLanguage string `header:"Accept-Language" default:"en-US" enum:"en-US,th-TH"`
 }
 
 type CreateSavedOutput struct {
@@ -36,9 +37,10 @@ type DeleteSavedOutput struct {
 }
 
 type GetSavedInput struct {
-	ID       uuid.UUID `path:"id"`
-	Page     int       `query:"page" minimum:"1" default:"1" doc:"Page number (starts at 1)"`
-	PageSize int       `query:"page_size" minimum:"1" maximum:"100" default:"10" doc:"Number of items per page"`
+	ID             uuid.UUID `path:"id"`
+	Page           int       `query:"page" minimum:"1" default:"1" doc:"Page number (starts at 1)"`
+	PageSize       int       `query:"page_size" minimum:"1" maximum:"100" default:"10" doc:"Number of items per page"`
+	AcceptLanguage string    `header:"Accept-Language" default:"en-US" enum:"en-US,th-TH"`
 }
 
 type GetSavedOutput struct {
diff --git a/backend/internal/service/handler/saved/getByGuardianID.go b/backend/internal/service/handler/saved/getByGuardianID.go
index df52e811..ec4a3bb6 100644
--- a/backend/internal/service/handler/saved/getByGuardianID.go
+++ b/backend/internal/service/handler/saved/getByGuardianID.go
@@ -9,13 +9,13 @@ import (
 	"github.com/google/uuid"
 )
 
-func (h *Handler) GetByGuardianID(ctx context.Context, id uuid.UUID, pagination utils.Pagination) ([]models.Saved, error) {
+func (h *Handler) GetByGuardianID(ctx context.Context, id uuid.UUID, pagination utils.Pagination, AcceptLanguage string) ([]models.Saved, error) {
 
 	if _, err := h.GuardianRepository.GetGuardianByID(ctx, id); err != nil {
 		return nil, errs.BadRequest("Invalid guardian_id: guardian does not exist")
 	}
 
-	reviews, httpErr := h.SavedRepository.GetByGuardianID(ctx, id, pagination)
+	reviews, httpErr := h.SavedRepository.GetByGuardianID(ctx, id, pagination, AcceptLanguage)
 	if httpErr != nil {
 		return nil, httpErr
 	}
diff --git a/backend/internal/service/handler/saved/handler_test.go b/backend/internal/service/handler/saved/handler_test.go
index c9a43a9a..67e184f0 100644
--- a/backend/internal/service/handler/saved/handler_test.go
+++ b/backend/internal/service/handler/saved/handler_test.go
@@ -37,6 +37,7 @@ func TestHandler_GetByGuardianID(t *testing.T) {
 					mock.Anything,
 					uuid.MustParse("11111111-1111-1111-1111-111111111111"),
 					mock.AnythingOfType("utils.Pagination"),
+					mock.AnythingOfType("string"),
 				).Return([]models.Saved{
 					{
 						ID:         uuid.MustParse("20000000-0000-0000-0000-000000000001"),
@@ -81,6 +82,7 @@ func TestHandler_GetByGuardianID(t *testing.T) {
 					mock.Anything,
 					uuid.MustParse("22222222-2222-2222-2222-222222222222"),
 					mock.AnythingOfType("utils.Pagination"),
+					mock.AnythingOfType("string"),
 				).Return(nil, errs.BadRequest("cannot fetch saved"))
 			},
 			wantSaved: nil,
@@ -105,7 +107,7 @@ func TestHandler_GetByGuardianID(t *testing.T) {
 
 			pagination := utils.Pagination{Page: 1, Limit: 10}
 
-			saved, err := handler.GetByGuardianID(context.Background(), tt.guardianID, pagination)
+			saved, err := handler.GetByGuardianID(context.Background(), tt.guardianID, pagination, "en-US")
 
 			if tt.wantErr {
 				assert.Error(t, err)
diff --git a/backend/internal/service/routes/saved.go b/backend/internal/service/routes/saved.go
index 1d90d39a..0b2986a9 100644
--- a/backend/internal/service/routes/saved.go
+++ b/backend/internal/service/routes/saved.go
@@ -38,7 +38,7 @@ func SetUpSavedRoutes(api huma.API, repo *storage.Repository) {
 			Limit: limit,
 		}
 
-		saveds, err := savedHandler.SavedRepository.GetByGuardianID(ctx, input.ID, pagination)
+		saveds, err := savedHandler.SavedRepository.GetByGuardianID(ctx, input.ID, pagination, input.AcceptLanguage)
 		if err != nil {
 			return nil, err
 		}
diff --git a/backend/internal/service/routes/saved_routes_test.go b/backend/internal/service/routes/saved_routes_test.go
index 63b394e7..9882cb90 100644
--- a/backend/internal/service/routes/saved_routes_test.go
+++ b/backend/internal/service/routes/saved_routes_test.go
@@ -71,6 +71,7 @@ func TestGetSavedByGuardianID_Success(t *testing.T) {
 		mock.Anything,
 		guardianID,
 		utils.Pagination{Page: 1, Limit: 10},
+		mock.AnythingOfType("string"),
 	).Return(expectedSaved, nil)
 
 	app, _ := setupSavedTestAPI(mockRepo)
@@ -141,6 +142,7 @@ func TestGetSavedByGuardianID_WithPagination(t *testing.T) {
 		mock.Anything,
 		guardianID,
 		utils.Pagination{Page: 2, Limit: 10},
+		mock.AnythingOfType("string"),
 	).Return(expectedSaved, nil)
 
 	app, _ := setupSavedTestAPI(mockRepo)
diff --git a/backend/internal/storage/postgres/schema/saved/create.go b/backend/internal/storage/postgres/schema/saved/create.go
index fa44a2bd..d11cde26 100644
--- a/backend/internal/storage/postgres/schema/saved/create.go
+++ b/backend/internal/storage/postgres/schema/saved/create.go
@@ -7,9 +7,10 @@ import (
 	"skillspark/internal/storage/postgres/schema"
 )
 
-const language = "en-US"
+var language string
 
 func (r *SavedRepository) CreateSaved(ctx context.Context, saved *models.CreateSavedInput) (*models.Saved, error) {
+	language = saved.AcceptLanguage
 
 	query, err := schema.ReadSQLBaseScript("create.sql", SqlSavedFiles)
 	if err != nil {
diff --git a/backend/internal/storage/postgres/schema/saved/get_all_for_user.go b/backend/internal/storage/postgres/schema/saved/get_all_for_user.go
index edb61a85..069b2fd0 100644
--- a/backend/internal/storage/postgres/schema/saved/get_all_for_user.go
+++ b/backend/internal/storage/postgres/schema/saved/get_all_for_user.go
@@ -10,7 +10,7 @@ import (
 	"github.com/google/uuid"
 )
 
-func (r *SavedRepository) GetByGuardianID(ctx context.Context, user_id uuid.UUID, pagination utils.Pagination) ([]models.Saved, error) {
+func (r *SavedRepository) GetByGuardianID(ctx context.Context, user_id uuid.UUID, pagination utils.Pagination, AcceptLanguage string) ([]models.Saved, error) {
 
 	query, err := schema.ReadSQLBaseScript("get_all_for_user.sql", SqlSavedFiles)
 	if err != nil {
@@ -64,7 +64,7 @@ func (r *SavedRepository) GetByGuardianID(ctx context.Context, user_id uuid.UUID
 			return nil, &err
 		}
 
-		switch language {
+		switch AcceptLanguage {
 		case "th-TH":
 			if titleTH != nil {
 				s.Event.Title = *titleTH
diff --git a/backend/internal/storage/postgres/schema/saved/get_all_for_user_test.go b/backend/internal/storage/postgres/schema/saved/get_all_for_user_test.go
index 623cb991..4093cb5d 100644
--- a/backend/internal/storage/postgres/schema/saved/get_all_for_user_test.go
+++ b/backend/internal/storage/postgres/schema/saved/get_all_for_user_test.go
@@ -46,7 +46,7 @@ func TestGetReviewsByGuardianID(t *testing.T) {
 	}
 
 	pagination := utils.Pagination{Limit: 10, Page: 1}
-	reviews, err := repo.GetByGuardianID(ctx, firstSaved.GuardianID, pagination)
+	reviews, err := repo.GetByGuardianID(ctx, firstSaved.GuardianID, pagination, "en-US")
 	require.Nil(t, err)
 	require.Len(t, reviews, len(expectedSaved))
 }
@@ -60,7 +60,7 @@ func TestGetReviewsByGuardianID_NoReviews(t *testing.T) {
 	g := guardian.CreateTestGuardian(t, ctx, testDB)
 
 	pagination := utils.Pagination{Limit: 10, Page: 1}
-	reviews, err := repo.GetByGuardianID(ctx, g.ID, pagination)
+	reviews, err := repo.GetByGuardianID(ctx, g.ID, pagination, "en-US")
 
 	require.Nil(t, err)
 	require.NotNil(t, reviews)
diff --git a/backend/internal/storage/repo-mocks/savedMock.go b/backend/internal/storage/repo-mocks/savedMock.go
index f5828b37..b7bbf87b 100644
--- a/backend/internal/storage/repo-mocks/savedMock.go
+++ b/backend/internal/storage/repo-mocks/savedMock.go
@@ -24,8 +24,8 @@ func (m *MockSavedRepository) CreateSaved(ctx context.Context, input *models.Cre
 	return args.Get(0).(*models.Saved), args.Error(1)
 }
 
-func (m *MockSavedRepository) GetByGuardianID(ctx context.Context, id uuid.UUID, pagination utils.Pagination) ([]models.Saved, error) {
-	args := m.Called(ctx, id, pagination)
+func (m *MockSavedRepository) GetByGuardianID(ctx context.Context, id uuid.UUID, pagination utils.Pagination, acceptLanguage string) ([]models.Saved, error) {
+	args := m.Called(ctx, id, pagination, acceptLanguage)
 	if args.Get(0) == nil {
 		if args.Get(1) == nil {
 			return nil, nil
diff --git a/backend/internal/storage/storage.go b/backend/internal/storage/storage.go
index c7bff0e7..06184ded 100644
--- a/backend/internal/storage/storage.go
+++ b/backend/internal/storage/storage.go
@@ -131,7 +131,7 @@ type NotificationRepository interface {
 type SavedRepository interface {
 	CreateSaved(ctx context.Context, saved *models.CreateSavedInput) (*models.Saved, error)
 	DeleteSaved(ctx context.Context, id uuid.UUID) error
-	GetByGuardianID(ctx context.Context, user_id uuid.UUID, pagination utils.Pagination) ([]models.Saved, error)
+	GetByGuardianID(ctx context.Context, user_id uuid.UUID, pagination utils.Pagination, AcceptLanguage string) ([]models.Saved, error)
 }
 
 type Repository struct {
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/_layout.tsx b/frontend/apps/mobile/app/(app)/(tabs)/_layout.tsx
index 1b04bb37..bcbe1840 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/_layout.tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/_layout.tsx
@@ -5,9 +5,11 @@ import { HapticTab } from "@/components/haptic-tab";
 import { IconSymbol } from "@/components/ui/icon-symbol";
 import { Colors } from "@/constants/theme";
 import { useColorScheme } from "@/hooks/use-color-scheme";
+import { useTranslation } from "react-i18next";
 
 export default function TabLayout() {
   const colorScheme = useColorScheme();
+  const { t: translate } = useTranslation();
 
   return (
     <Tabs
@@ -20,7 +22,7 @@ export default function TabLayout() {
       <Tabs.Screen
         name="index"
         options={{
-          title: "Home",
+          title: translate('nav.home'),
           tabBarIcon: ({ color }) => (
             <IconSymbol size={28} name="house.fill" color={color} />
           ),
@@ -29,7 +31,7 @@ export default function TabLayout() {
       <Tabs.Screen
         name="map"
         options={{
-          title: "Map",
+          title: translate('nav.map'),
           tabBarIcon: ({ color }) => (
             <IconSymbol size={28} name="map.fill" color={color} />
           ),
@@ -38,7 +40,7 @@ export default function TabLayout() {
       <Tabs.Screen
         name="profile"
         options={{
-          title: 'Profile',
+          title: translate('nav.profile'),
           tabBarIcon: ({ color }) => <IconSymbol size={28} name="person.fill" color={color} />,
         }}
       />
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/event/[id].tsx b/frontend/apps/mobile/app/(app)/(tabs)/event/[id].tsx
index 95aa807f..2f755369 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/event/[id].tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/event/[id].tsx
@@ -17,6 +17,7 @@ import { AppColors } from "@/constants/theme";
 import { StarRating } from "@/components/StarRating";
 import { BookmarkButton } from "@/components/BookmarkButton";
 import { formatDuration } from "@/utils/format";
+import { useTranslation } from "react-i18next";
 
 function formatAddress(occurrence: EventOccurrence) {
   const loc = occurrence.location;
@@ -29,7 +30,11 @@ function EventOccurrenceDetail({ occurrence }: { occurrence: EventOccurrence })
   const insets = useSafeAreaInsets();
   const [descriptionExpanded, setDescriptionExpanded] = useState(false);
   const [descriptionTruncated, setDescriptionTruncated] = useState(false);
-  const duration = formatDuration(occurrence.start_time, occurrence.end_time);
+  const { t: translate } = useTranslation();
+  const duration = formatDuration(occurrence.start_time, occurrence.end_time, {
+    hr: translate('event.hr'),
+    min: translate('event.min'),
+  });
   const address = formatAddress(occurrence);
 
   return (
@@ -67,7 +72,7 @@ function EventOccurrenceDetail({ occurrence }: { occurrence: EventOccurrence })
               style={{ shadowColor: "#000", shadowOpacity: 0.15, shadowRadius: 8 }}
             >
               <MaterialIcons name="chevron-left" size={20} color={AppColors.primaryText} />
-              <Text className="text-[15px] font-medium" style={{ color: AppColors.primaryText }}>Back</Text>
+              <Text className="text-[15px] font-medium" style={{ color: AppColors.primaryText }}>{translate('event.back')}</Text>
             </TouchableOpacity>
           </View>
 
@@ -116,7 +121,7 @@ function EventOccurrenceDetail({ occurrence }: { occurrence: EventOccurrence })
             {descriptionTruncated && (
               <Pressable onPress={() => setDescriptionExpanded((prev) => !prev)} className="mb-3.5">
                 <Text className="text-[13px] font-semibold" style={{ color: AppColors.primaryText }}>
-                  {descriptionExpanded ? "See less" : "See more"}
+                  {descriptionExpanded ? translate('event.seeLess') : translate('event.seeMore')}
                 </Text>
               </Pressable>
             )}
@@ -128,13 +133,13 @@ function EventOccurrenceDetail({ occurrence }: { occurrence: EventOccurrence })
                     className="border-[1.5px] rounded-full px-4 py-[7px]"
                     style={{ borderColor: AppColors.borderLight }}
                   >
-                    <Text className="text-[13px]" style={{ color: AppColors.secondaryText }}>{cat}</Text>
+                    <Text className="text-[13px]" style={{ color: AppColors.secondaryText }}>{translate(`interests.${cat}`, { defaultValue: cat })}</Text>
                   </View>
                 ))}
               </View>
               <View className="items-end ml-3.5">
                 <Text className="text-xl font-bold" style={{ color: AppColors.primaryText }}>{occurrence.price} THB</Text>
-                <Text className="text-xs" style={{ color: AppColors.subtleText }}>/Session</Text>
+                <Text className="text-xs" style={{ color: AppColors.subtleText }}>{translate('event.perSession')}</Text>
               </View>
             </View>
           </View>
@@ -161,7 +166,7 @@ function EventOccurrenceDetail({ occurrence }: { occurrence: EventOccurrence })
                 className="flex-row items-center gap-[5px] bg-[#F3F4F6] rounded-full px-3 py-[7px]"
               >
                 <MaterialIcons name="directions-walk" size={14} color={AppColors.secondaryText} />
-                <Text className="text-[13px]" style={{ color: AppColors.secondaryText }}>8 min</Text>
+                <Text className="text-[13px]" style={{ color: AppColors.secondaryText }}>8 {translate('event.minWalk')}</Text>
                 <MaterialIcons name="arrow-forward" size={12} color={AppColors.subtleText} />
                 <MaterialIcons name="directions-bus" size={16} color={AppColors.secondaryText} />
               </View>
@@ -175,7 +180,7 @@ function EventOccurrenceDetail({ occurrence }: { occurrence: EventOccurrence })
                   >
                     <View className="w-1.5 h-1.5 rounded-full bg-white" />
                   </View>
-                  <Text className="text-sm font-medium" style={{ color: AppColors.secondaryText }}>Home</Text>
+                  <Text className="text-sm font-medium" style={{ color: AppColors.secondaryText }}>{translate('event.home')}</Text>
                 </View>
                 <View className="pl-1.5 py-0.5">
                   <Text className="text-sm leading-[10px]" style={{ color: AppColors.subtleText }}>•</Text>
@@ -184,7 +189,7 @@ function EventOccurrenceDetail({ occurrence }: { occurrence: EventOccurrence })
                 </View>
                 <View className="flex-row items-center gap-2.5">
                   <MaterialIcons name="location-on" size={16} color={AppColors.secondaryText} />
-                  <Text className="text-sm font-medium" style={{ color: AppColors.secondaryText }}>Location</Text>
+                  <Text className="text-sm font-medium" style={{ color: AppColors.secondaryText }}>{translate('event.location')}</Text>
                 </View>
               </View>
               <TouchableOpacity
@@ -193,7 +198,7 @@ function EventOccurrenceDetail({ occurrence }: { occurrence: EventOccurrence })
                 className="rounded-2xl px-[26px] py-3.5"
                 style={{ backgroundColor: AppColors.primaryText }}
               >
-                <Text className="text-white text-[17px] font-bold">Register</Text>
+                <Text className="text-white text-[17px] font-bold">{translate('event.register')}</Text>
               </TouchableOpacity>
             </View>
           </View>
@@ -206,6 +211,7 @@ function EventOccurrenceDetail({ occurrence }: { occurrence: EventOccurrence })
 export default function EventOccurrenceScreen() {
   const { id } = useLocalSearchParams<{ id: string }>();
   const { data: response, isLoading, error } = useGetEventOccurrencesById(id);
+  const { t: translate } = useTranslation();
 
   if (isLoading) {
     return (
@@ -219,7 +225,7 @@ export default function EventOccurrenceScreen() {
     return (
       <View className="flex-1 items-center justify-center p-6">
         <Text className="text-base font-semibold" style={{ color: AppColors.danger }}>
-          Event not found
+          {translate('event.notFound')}
         </Text>
       </View>
     );
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/family/index.tsx b/frontend/apps/mobile/app/(app)/(tabs)/family/index.tsx
index 87e534e4..39fbfda1 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/family/index.tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/family/index.tsx
@@ -5,10 +5,11 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { ThemedText } from '@/components/themed-text';
 import { ThemedView } from '@/components/themed-view';
 import { IconSymbol } from '@/components/ui/icon-symbol';
-import { useGetChildrenByGuardianId, useGetGuardianById } from '@skillspark/api-client';
 import { Colors, AppColors } from '@/constants/theme';
 import { ChildListItem } from '@/components/ChildListItem';
 import { SectionHeader } from '@/components/SectionHeader';
+import { useTranslation } from 'react-i18next';
+import { useGuardian } from '@/hooks/use-guardian';
 import { useAuthContext } from '@/hooks/use-auth-context';
 import { ErrorScreen } from '@/components/ErrorScreen';
 
@@ -17,23 +18,11 @@ export default function FamilyListScreen() {
   const insets = useSafeAreaInsets();
   const colorScheme = useColorScheme();
   const theme = Colors[colorScheme ?? 'light'];
+  const { t: translate } = useTranslation();
 
+  const { guardian, children, isLoading } = useGuardian();
   const { guardianId } = useAuthContext();
 
-  const { data: guardianResponse, isLoading: guardianLoading } = useGetGuardianById(guardianId!, {
-    query: {
-      enabled: !!guardianId,
-    }
-  });
-  const { data: childrenResponse, isLoading: childrenLoading } = useGetChildrenByGuardianId(guardianId!, {
-    query: {
-      enabled: !!guardianId,
-    }
-  });
-
-  const guardian = guardianResponse?.status === 200 ? guardianResponse.data : null;
-  const children = childrenResponse?.status === 200 ? childrenResponse.data : [];
-
   const handleAddChild = () => {
     router.push('/family/manage');
   };
@@ -52,11 +41,11 @@ export default function FamilyListScreen() {
     });
   };
 
-  if (!guardianId) {
-    return <ErrorScreen message="Illegal state: no guardian ID retrieved" />;
+   if (!guardianId) {
+        return <ErrorScreen message="Illegal state: no guardian ID retrieved" />;
   }
 
-  if (guardianLoading || childrenLoading) {
+  if (isLoading) {
     return (
       <ThemedView className="flex-1 items-center justify-center">
         <ActivityIndicator size="large" />
@@ -74,7 +63,7 @@ export default function FamilyListScreen() {
         >
           <IconSymbol name="chevron.left" size={24} color={theme.text} />
         </TouchableOpacity>
-        <ThemedText className="text-xl text-center font-nunito-bold">Family Information</ThemedText>
+        <ThemedText className="text-xl text-center font-nunito-bold">{translate('familyInformation.title')}</ThemedText>
         <View className="w-10" />
       </View>
 
@@ -91,12 +80,12 @@ export default function FamilyListScreen() {
         </TouchableOpacity>
         <View className="h-px my-3" style={{ backgroundColor: AppColors.divider }} />
         <SectionHeader
-          title="Child Profile"
-          actionLabel="add profile +"
+          title={translate('familyInformation.childProfile')}
+          actionLabel={translate('familyInformation.addProfile')}
           onAction={handleAddChild}
         />
         {children.length === 0 && (
-          <ThemedText className="text-sm pb-4 font-nunito" style={{ color: AppColors.subtleText }}>No child profiles added yet.</ThemedText>
+          <ThemedText className="text-sm pb-4 font-nunito" style={{ color: AppColors.subtleText }}>{translate('common.noChildProfilesAdded')}</ThemedText>
         )}
         {children.map((child: any, idx: number) => (
           <React.Fragment key={child.id}>
@@ -109,8 +98,8 @@ export default function FamilyListScreen() {
         ))}
         <View className="h-px my-3" style={{ backgroundColor: AppColors.divider }} />
         <SectionHeader
-          title="Emergency Contact"
-          actionLabel="add contact +"
+          title={translate('familyInformation.emergencyContact')}
+          actionLabel={translate('familyInformation.addContact')}
           onAction={() => {}}
         />
         {/* TODO: Replace with real emergency contact data from API */}
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/family/manage.tsx b/frontend/apps/mobile/app/(app)/(tabs)/family/manage.tsx
index eb13dee9..48cde6a5 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/family/manage.tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/family/manage.tsx
@@ -17,6 +17,9 @@ import { IconSymbol } from '@/components/ui/icon-symbol';
 import { useQueryClient } from '@tanstack/react-query';
 import { useCreateChild, useUpdateChild, useDeleteChild, getGetChildrenByGuardianIdQueryKey } from '@skillspark/api-client';
 import { ChildProfileForm, MONTHS } from '@/components/ChildProfileForm';
+import { useTranslation } from 'react-i18next';
+import { useGuardian } from '@/hooks/use-guardian';
+
 import { useAuthContext } from '@/hooks/use-auth-context';
 import { ErrorScreen } from '@/components/ErrorScreen';
 
@@ -28,6 +31,7 @@ export default function ManageChildScreen() {
   const theme = Colors[colorScheme ?? 'light'];
   const { guardianId } = useAuthContext();
 
+  const { t: translate } = useTranslation();
   const isEditing = !!params.id;
 
   const [firstName, setFirstName] = useState(
@@ -57,6 +61,7 @@ export default function ManageChildScreen() {
   const [showYearDrop, setShowYearDrop] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
 
+
   const queryClient = useQueryClient();
   const createChildMutation = useCreateChild();
   const updateChildMutation = useUpdateChild();
@@ -68,7 +73,7 @@ export default function ManageChildScreen() {
   
   const handleSave = async () => {
     if (!firstName || !birthYear || !birthMonth || !schoolId) {
-      Alert.alert('Error', 'Please fill in all required fields (Name, Birth Date, School ID)');
+      Alert.alert(translate('common.error'), translate('childProfile.requiredFieldsError'));
       return;
     }
     const name = [firstName, lastName].filter(Boolean).join(' ');
@@ -91,7 +96,7 @@ export default function ManageChildScreen() {
       router.back();
     } catch (error) {
       console.error(error);
-      Alert.alert('Error', 'Failed to save. Please try again.');
+      Alert.alert(translate('common.errorOccurred'), translate('childProfile.saveError'));
     } finally {
       setIsSubmitting(false);
     }
@@ -99,12 +104,12 @@ export default function ManageChildScreen() {
 
   const handleDelete = () => {
     Alert.alert(
-      'Delete Profile',
-      'Are you sure you want to remove this child profile?',
+      translate('childProfile.deleteProfile'),
+      translate('childProfile.deleteConfirm'),
       [
-        { text: 'Cancel', style: 'cancel' },
+        { text: translate('common.cancel'), style: 'cancel' },
         {
-          text: 'Delete', style: 'destructive',
+          text: translate('payment.delete'), style: 'destructive',
           onPress: async () => {
             setIsSubmitting(true);
             try {
@@ -112,7 +117,7 @@ export default function ManageChildScreen() {
               await queryClient.invalidateQueries({ queryKey: getGetChildrenByGuardianIdQueryKey(guardianId) });
               router.back();
             } catch {
-              Alert.alert('Error', 'Failed to delete.');
+              Alert.alert(translate('common.errorOccurred'), translate('childProfile.deleteError'));
               setIsSubmitting(false);
             }
           },
@@ -137,17 +142,17 @@ export default function ManageChildScreen() {
             <TouchableOpacity onPress={() => router.back()} className="w-8 h-8 justify-center items-start">
               <IconSymbol name="chevron.left" size={24} color={theme.text} />
             </TouchableOpacity>
-            <ThemedText className="text-xl text-center font-nunito-bold">Family Information</ThemedText>
+            <ThemedText className="text-xl text-center font-nunito-bold">{translate('familyInformation.title')}</ThemedText>
             {isEditing ? (
               <TouchableOpacity onPress={handleDelete}>
-                <ThemedText className="font-nunito-semibold" style={{ color: AppColors.danger }}>Delete</ThemedText>
+                <ThemedText className="font-nunito-semibold" style={{ color: AppColors.danger }}>{translate('payment.delete')}</ThemedText>
               </TouchableOpacity>
             ) : (
               <View className="w-10" />
             )}
           </View>
           <ThemedText className="text-[22px] font-nunito-semibold mb-5">
-            {isEditing ? 'Edit Child Profile' : 'Create Child Profile'}
+            {isEditing ? translate('childProfile.editTitle') : translate('childProfile.createTitle')}
           </ThemedText>
           <ChildProfileForm
             firstName={firstName}
@@ -176,7 +181,7 @@ export default function ManageChildScreen() {
             disabled={isSubmitting}
           >
             <ThemedText className="text-white text-base font-nunito-semibold">
-              {isSubmitting ? 'Saving...' : 'Save Changes'}
+              {isSubmitting ? translate('childProfile.saving') : translate('childProfile.saveChanges')}
             </ThemedText>
           </TouchableOpacity>
         </ScrollView>
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/index.tsx b/frontend/apps/mobile/app/(app)/(tabs)/index.tsx
index c45ba7e4..59ebfd31 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/index.tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/index.tsx
@@ -16,6 +16,7 @@ import { useRouter } from "expo-router";
 import { AppColors } from "@/constants/theme";
 import { StarRating } from "@/components/StarRating";
 import { formatDuration } from "@/utils/format";
+import { useTranslation } from "react-i18next";
 
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
@@ -37,6 +38,7 @@ function FilterChips({
   active: string[];
   onToggle: (f: string) => void;
 }) {
+  const { t: translate } = useTranslation();
   return (
     <ScrollView
       horizontal
@@ -59,7 +61,7 @@ function FilterChips({
               className="text-[13px] font-medium"
               style={{ color: isActive ? "#fff" : AppColors.secondaryText }}
             >
-              {isActive ? `× ${f}` : f}
+              {isActive ? `× ${translate(`interests.${f}`, { defaultValue: f })}` : translate(`interests.${f}`, { defaultValue: f })}
             </Text>
           </Pressable>
         );
@@ -130,7 +132,11 @@ function DiscoverBanner({ event }: { event: EventOccurrence }) {
 
 function EventCard({ item }: { item: EventOccurrence }) {
   const router = useRouter();
-  const duration = formatDuration(item.start_time, item.end_time);
+  const { t: translate } = useTranslation();
+  const duration = formatDuration(item.start_time, item.end_time, {
+    hr: translate('event.hr'),
+    min: translate('event.min'),
+  });
   const ageLabel = item.event.age_range_min != null
     ? `${item.event.age_range_min}${item.event.age_range_max != null ? `–${item.event.age_range_max}` : ""}+`
     : null;
@@ -188,6 +194,7 @@ function EventOccurrencesList() {
   const { data: response, isLoading, error } = useGetAllEventOccurrences();
   const [activeFilters, setActiveFilters] = useState<string[]>([]);
   const [search, setSearch] = useState("");
+  const { t: translate } = useTranslation();
 
   const toggleFilter = (f: string) =>
     setActiveFilters((prev) =>
@@ -198,7 +205,7 @@ function EventOccurrencesList() {
     return (
       <View className="flex-1 items-center justify-center gap-2">
         <ActivityIndicator size="large" />
-        <ThemedText>Loading events...</ThemedText>
+        <ThemedText>{translate('common.loadingEvents')}</ThemedText>
       </View>
     );
   }
@@ -206,8 +213,8 @@ function EventOccurrencesList() {
   if (error) {
     return (
       <View className="flex-1 items-center justify-center p-4">
-        <ThemedText className="font-semibold" style={{ color: AppColors.danger }}>Error loading events</ThemedText>
-        <ThemedText>{error.detail || "An error occurred"}</ThemedText>
+        <ThemedText className="font-semibold" style={{ color: AppColors.danger }}>{translate('common.errorLoadingEvents')}</ThemedText>
+        <ThemedText>{error.detail || translate('common.errorOccurred')}</ThemedText>
       </View>
     );
   }
@@ -250,7 +257,7 @@ function EventOccurrencesList() {
           {/* Title */}
           <View className="px-5 mb-4">
             <Text className="text-[28px] font-bold tracking-tight" style={{ color: AppColors.primaryText }}>
-              My Dashboard
+              {translate('dashboard.title')}
             </Text>
           </View>
 
@@ -266,7 +273,7 @@ function EventOccurrencesList() {
             <TextInput
               className="flex-1 text-sm"
               style={{ color: AppColors.primaryText }}
-              placeholder="Search for a class"
+              placeholder={translate('dashboard.searchPlaceholder')}
               placeholderTextColor={AppColors.placeholderText}
               value={search}
               onChangeText={setSearch}
@@ -276,7 +283,7 @@ function EventOccurrencesList() {
           {/* Discover Weekly */}
           <View className="flex-row items-center px-5 mb-3">
             <Text className="text-[#7C3AED] text-[13px] mr-1.5">✦</Text>
-            <Text className="text-[15px] font-semibold" style={{ color: AppColors.primaryText }}>Discover Weekly</Text>
+            <Text className="text-[15px] font-semibold" style={{ color: AppColors.primaryText }}>{translate('dashboard.discoverWeekly')}</Text>
           </View>
           {featuredEvent && <DiscoverBanner event={featuredEvent} />}
 
@@ -287,7 +294,7 @@ function EventOccurrencesList() {
                 <View className="w-[26px] h-[26px] rounded-full bg-[#3B82F6] items-center justify-center">
                   <Text className="text-white text-[11px] font-bold">A</Text>
                 </View>
-                <Text className="text-sm font-semibold" style={{ color: AppColors.primaryText }}>For You</Text>
+                <Text className="text-sm font-semibold" style={{ color: AppColors.primaryText }}>{translate('dashboard.forYou')}</Text>
                 <View className="flex-row ml-1">
                   {["#10B981", "#6366F1"].map((c, i) => (
                     <View key={i} className="w-[22px] h-[22px] rounded-full border-2 border-white" style={{ backgroundColor: c, marginLeft: i > 0 ? -8 : 0 }} />
@@ -296,8 +303,8 @@ function EventOccurrencesList() {
               </View>
               <View className="flex-row items-center gap-1">
                 <Text className="text-[#7C3AED] text-xs">✦</Text>
-                <Text className="text-[13px]" style={{ color: AppColors.mutedText }}>Based on </Text>
-                <Text className="text-[13px] text-[#3B82F6]">upcoming events</Text>
+                <Text className="text-[13px]" style={{ color: AppColors.mutedText }}>{translate('dashboard.basedOn')} </Text>
+                <Text className="text-[13px] text-[#3B82F6]">{translate('dashboard.upcomingEvents')}</Text>
               </View>
             </View>
           )}
@@ -308,7 +315,7 @@ function EventOccurrencesList() {
       renderItem={({ item }) => <EventCard item={item} />}
       ListEmptyComponent={
         <View className="items-center p-8">
-          <ThemedText style={{ color: AppColors.subtleText }}>No upcoming events</ThemedText>
+          <ThemedText style={{ color: AppColors.subtleText }}>{translate('common.noUpcomingEvents')}</ThemedText>
         </View>
       }
     />
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/language.tsx b/frontend/apps/mobile/app/(app)/(tabs)/language.tsx
index eac3fa1f..61664cf0 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/language.tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/language.tsx
@@ -6,6 +6,12 @@ import { ThemedText } from '@/components/themed-text';
 import { ThemedView } from '@/components/themed-view';
 import { IconSymbol } from '@/components/ui/icon-symbol';
 import { Colors } from '@/constants/theme';
+import { useTranslation } from 'react-i18next'
+import { useEffect } from 'react';
+import { useGuardian } from '@/hooks/use-guardian';
+import { useUpdateGuardian, getGetGuardianByIdQueryKey, setCurrentLanguage } from '@skillspark/api-client';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
+import * as SecureStore from "expo-secure-store";
 
 const LANGUAGES = [
   { code: 'en', label: 'English', flag: '🇺🇸' },
@@ -16,11 +22,38 @@ export default function LanguageScreen() {
   const router = useRouter();
   const insets = useSafeAreaInsets();
   const colorScheme = useColorScheme();
+  const { t: translate, i18n } = useTranslation();
+
   const theme = Colors[colorScheme ?? 'light'];
+  
 
   const dividerColor = colorScheme === 'dark' ? '#3a3a3c' : '#E5E7EB';
 
-  const [selected, setSelected] = useState('en');
+  const [selected, setSelected] = useState(i18n.language ?? 'en');
+  const { guardian, guardianId } = useGuardian();
+  const updateGuardianMutation = useUpdateGuardian();
+  const queryClient = useQueryClient();
+
+  const updateLanguageData = async (langCode: string) => {
+    setSelected(langCode);
+    await i18n.changeLanguage(langCode);
+    setCurrentLanguage(langCode);
+    await SecureStore.setItemAsync('language_preference', langCode);
+    queryClient.invalidateQueries({ refetchType: 'all' });
+
+    if (guardian) {
+      updateGuardianMutation.mutate({
+        id: guardianId,
+        data: {
+          name: guardian.name,
+          email: guardian.email,
+          username: guardian.username,
+          language_preference: langCode,
+        },
+      });
+    }
+
+  }
 
   return (
     <ThemedView className="flex-1" style={{ paddingTop: insets.top }}>
@@ -32,20 +65,22 @@ export default function LanguageScreen() {
         >
           <IconSymbol name="chevron.left" size={24} color={theme.text} />
         </TouchableOpacity>
-        <ThemedText className="text-xl text-center font-nunito-bold">Settings</ThemedText>
+        <ThemedText className="text-xl text-center font-nunito-bold">{translate('settings.title')}</ThemedText>
         <View className="w-10" />
       </View>
-      <ThemedText className="text-2xl px-5 pt-4 pb-5 font-nunito-bold">Language</ThemedText>
+      <ThemedText className="text-2xl px-5 pt-4 pb-5 font-nunito-bold">{translate('settings.language')}</ThemedText>
       <View className="px-5">
         {LANGUAGES.map((lang, index) => (
           <React.Fragment key={lang.code}>
             <TouchableOpacity
               className="flex-row items-center py-[18px] gap-[14px]"
-              onPress={() => setSelected(lang.code)}
+              onPress={() => {
+                updateLanguageData(lang.code)
+              }}
               activeOpacity={0.6}
             >
               <ThemedText className="text-[38px] leading-[46px]">{lang.flag}</ThemedText>
-              <ThemedText className="flex-1 text-lg font-nunito">{lang.label}</ThemedText>
+              <ThemedText className="flex-1 text-lg font-nunito">{translate(`settings.languages.${lang.code}`)}</ThemedText>
               <IconSymbol
                 name={selected === lang.code ? 'checkmark.circle.fill' : 'circle'}
                 size={26}
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/map.tsx b/frontend/apps/mobile/app/(app)/(tabs)/map.tsx
index b3d99bd6..c251fbf7 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/map.tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/map.tsx
@@ -1,11 +1,13 @@
-import React, { useState, useEffect, useMemo } from "react";
-import { Linking, Button, ActivityIndicator, View } from "react-native";
-import * as Location from "expo-location";
-import { useGetAllEventOccurrences } from "@skillspark/api-client";
-import type { EventOccurrence } from "@skillspark/api-client";
-import { ThemedView } from "@/components/themed-view";
-import { ThemedText } from "@/components/themed-text";
-import { SkillSparkMap } from "@/components/SkillSparkMap";
+import React, { useState, useEffect, useMemo } from 'react';
+import { Linking, Button, ActivityIndicator, View } from 'react-native';
+import * as Location from 'expo-location';
+import { useGetAllEventOccurrences } from '@skillspark/api-client';
+import type { EventOccurrence } from '@skillspark/api-client';
+import { ThemedView } from '@/components/themed-view';
+import { ThemedText } from '@/components/themed-text';
+import { SkillSparkMap } from '@/components/SkillSparkMap';
+import { useTranslation } from 'react-i18next';
+import AsyncStorage from '@react-native-async-storage/async-storage';
 
 export interface LocationPin {
   id: string;
@@ -19,6 +21,7 @@ export interface LocationPin {
 }
 
 export default function MapScreen() {
+  const { t: translate } = useTranslation();
   const { data, isLoading: isApiLoading, error } = useGetAllEventOccurrences();
   
   const occurrences: EventOccurrence[] = data?.status === 200 ? data.data : [];
@@ -71,7 +74,7 @@ export default function MapScreen() {
     return (
       <ThemedView className="flex-1 items-center justify-center p-5">
         <ActivityIndicator size="large" />
-        <ThemedText className="mt-[10px]">Loading Map Data...</ThemedText>
+        <ThemedText className="mt-[10px]">{translate('common.loadingMapData')}</ThemedText>
       </ThemedView>
     );
   }
@@ -80,10 +83,9 @@ export default function MapScreen() {
     return (
       <ThemedView className="flex-1 items-center justify-center p-5">
         <ThemedText className="mb-5 text-center text-base">
-          Permission to access location was denied. Please enable it in
-          settings.
+          {translate('common.locationDenied')}
         </ThemedText>
-        <Button title="Open Settings" onPress={() => Linking.openSettings()} />
+        <Button title={translate('common.openSettings')} onPress={() => Linking.openSettings()} />
       </ThemedView>
     );
   }
@@ -93,19 +95,15 @@ export default function MapScreen() {
       <SkillSparkMap locations={mapLocations} userLocation={userLocation} />
 
       {!isApiLoading && error && (
-        <View className="absolute top-[60px] self-center rounded-[20px] bg-[rgba(0,0,0,0.6)] px-5 py-[10px]">
-          <ThemedText className="text-sm font-semibold text-white">
-            An error occurred while fetching events.
-          </ThemedText>
-        </View>
+         <View className="absolute top-[60px] self-center rounded-[20px] bg-[rgba(0,0,0,0.6)] px-5 py-[10px]">
+            <ThemedText className="text-sm font-semibold text-white">{translate('common.errorFetchingEvents')}</ThemedText>
+         </View>
       )}
 
       {!isApiLoading && !error && mapLocations.length === 0 && (
-        <View className="absolute top-[60px] self-center rounded-[20px] bg-[rgba(0,0,0,0.6)] px-5 py-[10px]">
-          <ThemedText className="text-sm font-semibold text-white">
-            No events found nearby.
-          </ThemedText>
-        </View>
+         <View className="absolute top-[60px] self-center rounded-[20px] bg-[rgba(0,0,0,0.6)] px-5 py-[10px]">
+            <ThemedText className="text-sm font-semibold text-white">{translate('common.noEventsNearby')}</ThemedText>
+         </View>
       )}
     </ThemedView>
   );
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/payment.tsx b/frontend/apps/mobile/app/(app)/(tabs)/payment.tsx
index c436fb47..29202468 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/payment.tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/payment.tsx
@@ -6,12 +6,14 @@ import { ThemedText } from '@/components/themed-text';
 import { ThemedView } from '@/components/themed-view';
 import { IconSymbol } from '@/components/ui/icon-symbol';
 import { Colors, AppColors } from '@/constants/theme';
+import { useTranslation } from 'react-i18next';
 
 export default function PaymentScreen() {
   const router = useRouter();
   const insets = useSafeAreaInsets();
   const colorScheme = useColorScheme();
   const theme = Colors[colorScheme ?? 'light'];
+  const { t: translate } = useTranslation();
 
   const handleUpdateBilling = () => {};
   const handleDelete = () => {};
@@ -26,14 +28,14 @@ export default function PaymentScreen() {
         >
           <IconSymbol name="chevron.left" size={24} color={theme.text} />
         </TouchableOpacity>
-        <ThemedText className="text-xl text-center font-nunito-bold">Payment</ThemedText>
+        <ThemedText className="text-xl text-center font-nunito-bold">{translate('payment.title')}</ThemedText>
         <View className="w-10" />
       </View>
       <View className="px-5 pt-5">
-        <ThemedText className="text-[22px] font-nunito-bold mb-5">Manage Billing</ThemedText>
+        <ThemedText className="text-[22px] font-nunito-bold mb-5">{translate('payment.manageBilling')}</ThemedText>
         {/* TODO: Replace with real payment method data from billing API */}
-        <ThemedText className="text-base font-nunito mb-[6px]">Credit Card</ThemedText>
-        <ThemedText className="text-base font-nunito mb-[6px]">Name</ThemedText>
+        <ThemedText className="text-base font-nunito mb-[6px]">{translate('payment.creditCard')}</ThemedText>
+        <ThemedText className="text-base font-nunito mb-[6px]">{translate('payment.name')}</ThemedText>
         <ThemedText className="text-base font-nunito mb-8 tracking-widest">**** **** **** XXXX</ThemedText>
         <View className="flex-row gap-4">
           <TouchableOpacity
@@ -42,7 +44,7 @@ export default function PaymentScreen() {
             onPress={handleUpdateBilling}
             activeOpacity={0.8}
           >
-            <ThemedText className="text-white text-[15px] font-nunito-semibold">Update Billing</ThemedText>
+            <ThemedText className="text-white text-[15px] font-nunito-semibold">{translate('payment.updateBilling')}</ThemedText>
           </TouchableOpacity>
 
           <TouchableOpacity
@@ -51,7 +53,7 @@ export default function PaymentScreen() {
             onPress={handleDelete}
             activeOpacity={0.8}
           >
-            <ThemedText className="text-[15px] font-nunito" style={{ color: theme.text }}>Delete</ThemedText>
+            <ThemedText className="text-[15px] font-nunito" style={{ color: theme.text }}>{translate('payment.delete')}</ThemedText>
           </TouchableOpacity>
         </View>
       </View>
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/profile.tsx b/frontend/apps/mobile/app/(app)/(tabs)/profile.tsx
index e4c3e8f8..bea612eb 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/profile.tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/profile.tsx
@@ -5,9 +5,10 @@ import { useRouter } from 'expo-router';
 import { ThemedText } from '@/components/themed-text';
 import { ThemedView } from '@/components/themed-view';
 import { IconSymbol } from '@/components/ui/icon-symbol';
-import { useGetGuardianById, useGetChildrenByGuardianId } from '@skillspark/api-client';
 import { FamilyCard } from '@/components/FamilyCard';
 import { ListItem } from '@/components/ListItem';
+import { useTranslation } from 'react-i18next';
+import { useGuardian } from '@/hooks/use-guardian';
 import { useAuthContext } from '@/hooks/use-auth-context';
 import { ErrorScreen } from '@/components/ErrorScreen';
 
@@ -15,30 +16,19 @@ export default function ProfileScreen() {
   const insets = useSafeAreaInsets();
   const colorScheme = useColorScheme();
   const router = useRouter();
+  const { t: translate } = useTranslation();
 
   const listBackgroundColor = colorScheme === 'dark' ? '#1c1c1e' : '#F9FAFB';
   const borderColor = colorScheme === 'dark' ? '#3f3f46' : '#E5E7EB';
 
+  const { guardian, children, isLoading } = useGuardian();
   const { guardianId } = useAuthContext();
 
-  const { data: guardianResponse, isLoading: guardianLoading } = useGetGuardianById(guardianId!, {
-    query: {
-      enabled: !!guardianId,
-    }
-  });
-  const { data: childrenResponse, isLoading: familyLoading } = useGetChildrenByGuardianId(guardianId!, {
-    query: {
-      enabled: !!guardianId,
-    }
-  });
-  const guardian = guardianResponse?.status === 200 ? guardianResponse.data : null;
-  const children = childrenResponse?.status === 200 ? childrenResponse.data : [];
-
   if (!guardianId) {
       return <ErrorScreen message="Illegal state: no guardian ID retrieved" />;
-    }
+  }
 
-  if (guardianLoading || familyLoading) {
+  if (isLoading) {
     return (
       <ThemedView className="flex-1 items-center justify-center" style={{ paddingTop: insets.top }}>
         <ActivityIndicator size="large" />
@@ -67,47 +57,48 @@ export default function ProfileScreen() {
             @{guardian?.username}
           </ThemedText>
           <ThemedText className="text-sm text-[#6B7280] leading-[18px] text-center font-nunito">
-            Contact
+            {translate('profile.contact')}
           </ThemedText>
         </View>
         <View className="px-5 mb-4">
-          <ThemedText className="text-base mb-2 font-nunito-semibold">Family</ThemedText>
+          <ThemedText className="text-base mb-2 font-nunito-semibold">{translate('profile.family')}</ThemedText>
           <View className="flex-row flex-wrap justify-between gap-[10px]">
             {children.length > 0 ? (
               children.map((child: any) => (
                 <FamilyCard
                   key={child.id}
-                  initials={child.name?.charAt(0)}
+                  initials={child.name?.charAt(0) ?? ''}
                   name={child.name}
-                  date={`Born ${child.birth_year}`}
+                  date={translate('profile.born', { year: child.birth_year })}
+                  
                 />
               ))
             ) : (
-              <ThemedText className = "text-[#999] p-2.5">No children found</ThemedText>
+              <ThemedText className = "text-[#999] p-2.5">{translate('common.noChildrenFound')}</ThemedText>
             )}
           </View>
         </View>
         <View className="px-5 mb-4">
-          <ThemedText className="text-base mb-2 font-nunito-semibold">My Bookings</ThemedText>
+          <ThemedText className="text-base mb-2 font-nunito-semibold">{translate('profile.myBookings')}</ThemedText>
           <View
             className="rounded-xl overflow-hidden border"
             style={{ backgroundColor: listBackgroundColor, borderColor }}
           >
-            <ListItem label="Saved" isLast onPress={() => router.push('/saved')}/>
+            <ListItem label={translate('profile.saved')} isLast onPress={() => router.push('/saved')} />
           </View>
         </View>
         <View className="px-5 mb-4">
-          <ThemedText className="text-base mb-2 font-nunito-semibold">Preferences</ThemedText>
+          <ThemedText className="text-base mb-2 font-nunito-semibold">{translate('profile.preferences')}</ThemedText>
           <View
             className="rounded-xl overflow-hidden border"
             style={{ backgroundColor: listBackgroundColor, borderColor }}
           >
-            <ListItem label="Payment" onPress={() => router.push('/payment')} />
+            <ListItem label={translate('profile.payment')} onPress={() => router.push('/payment')} />
             <ListItem
-              label="Family Information"
+              label={translate('profile.familyInformation')}
               onPress={() => router.push('/family')}
             />
-            <ListItem label="Settings" isLast onPress={() => router.push('/settings')} />
+            <ListItem label={translate('profile.settings')} isLast onPress={() => router.push('/settings')} />
           </View>
         </View>
         <View className="h-5" />
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/saved.tsx b/frontend/apps/mobile/app/(app)/(tabs)/saved.tsx
index 1df95330..dca2eefd 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/saved.tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/saved.tsx
@@ -11,6 +11,7 @@ import { ActivityIndicator, Alert, FlatList, TouchableOpacity, useColorScheme, V
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useAuthContext } from '@/hooks/use-auth-context';
 import { ErrorScreen } from '@/components/ErrorScreen';
+import { useTranslation } from 'react-i18next';
 
 export default function SavedScreen() {
   const insets = useSafeAreaInsets();
@@ -19,6 +20,7 @@ export default function SavedScreen() {
   const theme = Colors[colorScheme ?? 'light'];
   const queryClient = useQueryClient();
   const { guardianId } = useAuthContext();
+  const { t: translate } = useTranslation();
 
   const { data: response, isLoading, error } = useGetSavedByGuardianId(guardianId!, undefined, {
     query: { enabled: !!guardianId },
@@ -26,14 +28,14 @@ export default function SavedScreen() {
   const deleteSavedMutation = useDeleteSaved();
 
   if (!guardianId) {
-    return <ErrorScreen message="Illegal state: no guardian ID retrieved" />;
+    return <ErrorScreen message={translate('common.noGuardianId')} />;
   }
 
   if (isLoading) {
     return (
       <View className="flex-1 items-center justify-center gap-2">
         <ActivityIndicator size="large" />
-        <ThemedText>Loading events...</ThemedText>
+        <ThemedText>{translate('common.loadingEvents')}</ThemedText>
       </View>
     );
   }
@@ -41,8 +43,8 @@ export default function SavedScreen() {
   if (error) {
     return (
       <View className="flex-1 items-center justify-center p-4">
-        <ThemedText className="text-red-500 font-semibold">Error loading events</ThemedText>
-        <ThemedText>{error.detail || "An error occurred"}</ThemedText>
+        <ThemedText className="text-red-500 font-semibold">{translate('common.errorLoadingEvents')}</ThemedText>
+        <ThemedText>{error.detail || translate('common.errorOccurred')}</ThemedText>
       </View>
     );
   }
@@ -50,7 +52,7 @@ export default function SavedScreen() {
   if (!response || !Array.isArray(response.data)) {
     return (
       <View className="flex-1 items-center justify-center p-4">
-        <ThemedText>No events available</ThemedText>
+        <ThemedText>{translate('common.noEventsAvailable')}</ThemedText>
       </View>
     );
   }
@@ -61,12 +63,12 @@ export default function SavedScreen() {
 
   const handleDeleteSaved = (savedId: string) => {
     Alert.alert(
-      'Delete saved event',
-      'Are you sure you want remove this saved event?',
+      translate('saved.deleteTitle'),
+      translate('saved.deleteConfirm'),
       [
-        { text: 'Cancel', style: 'cancel' },
+        { text: translate('common.cancel'), style: 'cancel' },
         {
-          text: 'Delete', style: 'destructive',
+          text: translate('payment.delete'), style: 'destructive',
           onPress: async () => {
             deleteSavedMutation.mutate(
               { id: savedId },
@@ -95,14 +97,14 @@ export default function SavedScreen() {
         >
           <IconSymbol name="chevron.left" size={24} color={theme.text} />
         </TouchableOpacity>
-        <ThemedText className="text-xl text-center font-nunito-bold">Saved</ThemedText>
+        <ThemedText className="text-xl text-center font-nunito-bold">{translate('saved.title')}</ThemedText>
         <View className="w-10" />
       </View>
       <ThemedView className="flex-1">
         {savedEvents.length === 0 ? (
           <View className="flex-1 justify-center items-center p-5">
             <ThemedText className="text-center text-lg text-gray-500">
-              You have no saved events.
+              {translate('saved.noEvents')}
             </ThemedText>
           </View>
         ) : (
diff --git a/frontend/apps/mobile/app/(app)/(tabs)/settings.tsx b/frontend/apps/mobile/app/(app)/(tabs)/settings.tsx
index 54ec1674..052f6744 100644
--- a/frontend/apps/mobile/app/(app)/(tabs)/settings.tsx
+++ b/frontend/apps/mobile/app/(app)/(tabs)/settings.tsx
@@ -6,6 +6,7 @@ import { ThemedText } from '@/components/themed-text';
 import { ThemedView } from '@/components/themed-view';
 import { IconSymbol } from '@/components/ui/icon-symbol';
 import { Colors } from '@/constants/theme';
+import { useTranslation } from 'react-i18next';
 import { useAuthContext } from "@/hooks/use-auth-context";
 
 export default function SettingsScreen() {
@@ -13,6 +14,7 @@ export default function SettingsScreen() {
   const insets = useSafeAreaInsets();
   const colorScheme = useColorScheme();
   const theme = Colors[colorScheme ?? 'light'];
+  const { t: translate } = useTranslation();
 
   const cardBg = colorScheme === 'dark' ? '#1c1c1e' : '#EFEFEF';
   const dividerColor = colorScheme === 'dark' ? '#3a3a3c' : '#D1D5DB';
@@ -35,32 +37,32 @@ export default function SettingsScreen() {
         >
           <IconSymbol name="chevron.left" size={24} color={theme.text} />
         </TouchableOpacity>
-        <ThemedText className="text-xl text-center font-nunito-bold">Settings</ThemedText>
+        <ThemedText className="text-xl text-center font-nunito-bold">{translate('settings.title')}</ThemedText>
         <View className="w-10" />
       </View>
       <View className="px-4 pt-5">
         <View className="rounded-2xl overflow-hidden" style={{ backgroundColor: cardBg }}>
           <TouchableOpacity className="flex-row items-center justify-between px-4 py-[18px]" activeOpacity={0.6} onPress={() => router.push('/language')}>
-            <ThemedText className="text-[17px] font-nunito">Language</ThemedText>
+            <ThemedText className="text-[17px] font-nunito">{translate('settings.language')}</ThemedText>
             <IconSymbol name="chevron.right" size={16} color="#9CA3AF" />
           </TouchableOpacity>
           <View className="h-px" style={{ backgroundColor: dividerColor }} />
           <TouchableOpacity className="flex-row items-center justify-between px-4 py-[18px]" activeOpacity={0.6}>
-            <ThemedText className="text-[17px] font-nunito">Terms and Conditions</ThemedText>
+            <ThemedText className="text-[17px] font-nunito">{translate('settings.termsAndConditions')}</ThemedText>
             <IconSymbol name="chevron.right" size={16} color="#9CA3AF" />
           </TouchableOpacity>
           <View className="h-px" style={{ backgroundColor: dividerColor }} />
           <TouchableOpacity className="flex-row items-center justify-between px-4 py-[18px]" activeOpacity={0.6}>
-            <ThemedText className="text-[17px] font-nunito">Privacy Policy</ThemedText>
+            <ThemedText className="text-[17px] font-nunito">{translate('settings.privacyPolicy')}</ThemedText>
             <IconSymbol name="chevron.right" size={16} color="#9CA3AF" />
           </TouchableOpacity>
           <View className="h-px" style={{ backgroundColor: dividerColor }} />
           <TouchableOpacity className="flex-row items-center justify-between px-4 py-[18px]" activeOpacity={0.6} onPress={handleLogOut}>
-            <ThemedText className="text-[17px] font-nunito">Log Out</ThemedText>
+            <ThemedText className="text-[17px] font-nunito">{translate('settings.logOut')}</ThemedText>
           </TouchableOpacity>
           <View className="h-px" style={{ backgroundColor: dividerColor }} />
           <TouchableOpacity className="flex-row items-center justify-between px-4 py-[18px]" activeOpacity={0.6} onPress={handleDeleteAccount}>
-            <ThemedText className="text-[17px] font-nunito">Delete Account</ThemedText>
+            <ThemedText className="text-[17px] font-nunito">{translate('settings.deleteAccount')}</ThemedText>
           </TouchableOpacity>
         </View>
       </View>
diff --git a/frontend/apps/mobile/app/(tabs)/saved.tsx b/frontend/apps/mobile/app/(tabs)/saved.tsx
new file mode 100644
index 00000000..8780756e
--- /dev/null
+++ b/frontend/apps/mobile/app/(tabs)/saved.tsx
@@ -0,0 +1,125 @@
+import { SavedEventCard } from '@/components/SavedEventCard';
+import { ThemedText } from '@/components/themed-text';
+import { ThemedView } from '@/components/themed-view';
+import { IconSymbol } from '@/components/ui/icon-symbol';
+import { Colors } from '@/constants/theme';
+import { getGetSavedByGuardianIdQueryKey, Saved, useDeleteSaved, useGetSavedByGuardianId } from '@skillspark/api-client';
+import { useQueryClient } from '@tanstack/react-query';
+import { useRouter } from 'expo-router';
+import React from 'react';
+import { ActivityIndicator, Alert, FlatList, TouchableOpacity, useColorScheme, View } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { useGuardian } from '@/hooks/use-guardian';
+import { useTranslation } from 'react-i18next';
+
+export default function SavedScreen() {
+
+    const insets = useSafeAreaInsets();
+    const colorScheme = useColorScheme();
+    const router = useRouter();
+    const theme = Colors[colorScheme ?? 'light'];
+    const { guardianId } = useGuardian();
+    const { t: translate } = useTranslation();
+
+    const queryClient = useQueryClient();
+
+    const { data: response, isLoading, error } = useGetSavedByGuardianId(guardianId);
+    const deleteSavedMutation  = useDeleteSaved();
+
+    if (isLoading) {
+        return (
+        <View className="flex-1 items-center justify-center gap-2">
+            <ActivityIndicator size="large" />
+            <ThemedText>{translate('common.loadingEvents')}</ThemedText>
+        </View>
+        );
+    }
+
+    if (error) {
+      console.log(error)
+        return (
+        <View className="flex-1 items-center justify-center p-4">
+            <ThemedText className="text-red-500 font-semibold">{translate('common.errorLoadingEvents')}</ThemedText>
+            <ThemedText>{error.detail || translate('common.errorOccurred')}</ThemedText>
+        </View>
+        );
+    }
+
+    if (!response || !Array.isArray(response.data)) {
+        return (
+        <View className="flex-1 items-center justify-center p-4">
+            <ThemedText>{translate('common.noEventsAvailable')}</ThemedText>
+        </View>
+        );
+    }
+
+    const savedEvents: Saved[] = response.status === 200 && Array.isArray(response.data)
+    ? response.data
+    : [];
+
+    const handleDeleteSaved = (savedId: string) => {
+      Alert.alert(
+        translate('saved.deleteTitle'),
+        translate('saved.deleteConfirm'),
+        [
+          { text: translate('common.cancel'), style: 'cancel' },
+          {
+            text: translate('payment.delete'), style: 'destructive',
+            onPress: async () => {
+              deleteSavedMutation.mutate(
+              { id: savedId }, 
+              {
+                  onSuccess: () => {
+                  queryClient.invalidateQueries({
+                      queryKey: getGetSavedByGuardianIdQueryKey(guardianId)
+                  });
+                  },
+                  onError: (err) => console.error('Failed to delete saved event', err),
+              }
+              );
+            }
+          }
+        ]
+      );
+    };
+
+    return (
+        <ThemedView className="flex-1" style={{ paddingTop: insets.top }}>
+      <View className="flex-row items-center justify-between px-5 py-[14px]">
+        <TouchableOpacity
+          onPress={() => router.navigate('/profile')}
+          className="w-10 justify-center items-start"
+          hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
+        >
+          <IconSymbol name="chevron.left" size={24} color={theme.text} />
+        </TouchableOpacity>
+        <ThemedText className="text-xl text-center font-nunito-bold">{translate('saved.title')}</ThemedText>
+        <View className="w-10" />
+      </View>
+        <ThemedView className="flex-1" style={{ paddingTop: insets.top }}>
+    {savedEvents.length === 0 ? (
+      <View className="flex-1 justify-center items-center p-5">
+        <ThemedText className="text-center text-lg text-gray-500">
+          {translate('saved.noEvents')}
+        </ThemedText>
+      </View>
+    ) : (
+      <FlatList
+        data={savedEvents} // Saved[] array
+        keyExtractor={(item) => item.id}
+        renderItem={({ item }) => (
+          <SavedEventCard
+            event={item.event} // Event object inside Saved
+            onBookmarkPress={() => handleDeleteSaved(item.id)} // Saved.id
+          />
+        )}
+        contentContainerClassName="pt-2.5 pb-5"
+        showsVerticalScrollIndicator={false}
+      />
+    )}
+  </ThemedView>
+    </ThemedView>
+
+    )
+
+} 
\ No newline at end of file
diff --git a/frontend/apps/mobile/app/_layout.tsx b/frontend/apps/mobile/app/_layout.tsx
index 902ca247..e6a64ca8 100644
--- a/frontend/apps/mobile/app/_layout.tsx
+++ b/frontend/apps/mobile/app/_layout.tsx
@@ -5,9 +5,11 @@ import {
 } from "@react-navigation/native";
 import { useFonts } from "expo-font";
 import * as SplashScreen from "expo-splash-screen";
-import { useEffect } from "react";
+import * as SecureStore from "expo-secure-store";
+import { useEffect, useState } from "react";
 import "react-native-reanimated";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { QueryClientProvider } from "@tanstack/react-query";
+import { queryClient } from "@/constants/query-client";
 import { useColorScheme } from "@/hooks/use-color-scheme";
 import "../global.css";
 import {
@@ -18,12 +20,12 @@ import {
 } from "@expo-google-fonts/nunito-sans";
 import { AuthProvider } from '@/contexts/auth-context';
 import { LoginRedirect } from '@/components/LoginRedirect';
+import { setCurrentLanguage } from '@skillspark/api-client';
 SplashScreen.preventAutoHideAsync();
 
-const queryClient = new QueryClient();
-
 export default function RootLayout() {
   const colorScheme = useColorScheme();
+  const [langReady, setLangReady] = useState(false);
   const [loaded, error] = useFonts({
     NunitoSans_400Regular,
     NunitoSans_500Medium,
@@ -32,12 +34,19 @@ export default function RootLayout() {
   });
 
   useEffect(() => {
-    if (loaded || error) {
+    SecureStore.getItemAsync('language_preference').then((lang) => {
+      if (lang) setCurrentLanguage(lang);
+      setLangReady(true);
+    });
+  }, []);
+
+  useEffect(() => {
+    if ((loaded || error) && langReady) {
       SplashScreen.hideAsync();
     }
-  }, [loaded, error]);
+  }, [loaded, error, langReady]);
 
-  if (!loaded && !error) {
+  if ((!loaded && !error) || !langReady) {
     return null;
   }
 
@@ -50,4 +59,4 @@ export default function RootLayout() {
       </ThemeProvider>
     </QueryClientProvider>
   );
-}
+}
\ No newline at end of file
diff --git a/frontend/apps/mobile/components/BookmarkButton.tsx b/frontend/apps/mobile/components/BookmarkButton.tsx
index 18c30e4b..abfeae9d 100644
--- a/frontend/apps/mobile/components/BookmarkButton.tsx
+++ b/frontend/apps/mobile/components/BookmarkButton.tsx
@@ -10,19 +10,32 @@ import type { getSavedByGuardianIdResponse, Saved } from "@skillspark/api-client
 import MaterialIcons from "@expo/vector-icons/MaterialIcons";
 import { AppColors } from "@/constants/theme";
 import { useAuthContext } from "@/hooks/use-auth-context";
+import i18n from "@/i18n";
 
-export function BookmarkButton({ eventId }: { eventId: string }) {
+interface BookmarkButtonProps {
+  eventId: string;
+  // Controlled mode: pass these to skip the internal fetch
+  isBookmarked?: boolean;
+  savedEntryId?: string;
+}
+
+export function BookmarkButton({ eventId, isBookmarked: isBookmarkedProp, savedEntryId }: BookmarkButtonProps) {
   const queryClient = useQueryClient();
   const { guardianId } = useAuthContext();
 
+  const controlled = isBookmarkedProp !== undefined;
+
   const { data: savedResponse } = useGetSavedByGuardianId(guardianId!, undefined, {
-    query: { enabled: !!guardianId },
+    query: { enabled: !!guardianId && !controlled },
   });
 
   const savedQueryKey = getGetSavedByGuardianIdQueryKey(guardianId!);
+
   const savedItems = savedResponse?.status === 200 ? savedResponse.data : [];
-  const savedEntry = savedItems.find((s) => s.event.id === eventId);
-  const isBookmarked = !!savedEntry;
+  const savedEntry = controlled
+    ? (savedEntryId ? { id: savedEntryId } : undefined)
+    : savedItems.find((s) => s.event.id === eventId);
+  const isBookmarked = controlled ? isBookmarkedProp : !!savedEntry;
 
   const optimisticOptions = (updater: (items: Saved[]) => Saved[]) => ({
     mutation: {
@@ -66,7 +79,7 @@ export function BookmarkButton({ eventId }: { eventId: string }) {
 
   const handlePress = () => {
     if (isPending) return;
-    if (isBookmarked && savedEntry.id !== "optimistic") {
+    if (isBookmarked && savedEntry && savedEntry.id !== "optimistic") {
       deleteSaved.mutate({ id: savedEntry.id });
     } else if (!isBookmarked) {
       createSaved.mutate({ data: { event_id: eventId, guardian_id: guardianId } });
@@ -82,4 +95,4 @@ export function BookmarkButton({ eventId }: { eventId: string }) {
       />
     </TouchableOpacity>
   );
-}
\ No newline at end of file
+}
diff --git a/frontend/apps/mobile/components/ChildListItem.tsx b/frontend/apps/mobile/components/ChildListItem.tsx
index ca5488f6..035e1e54 100644
--- a/frontend/apps/mobile/components/ChildListItem.tsx
+++ b/frontend/apps/mobile/components/ChildListItem.tsx
@@ -5,6 +5,7 @@ import { IconSymbol } from '@/components/ui/icon-symbol';
 import { InterestTags } from './InterestTags';
 import { Child } from '@skillspark/api-client';
 import { AppColors } from '@/constants/theme';
+import { useTranslation } from 'react-i18next';
 
 type ChildListItemProps = {
   child: Child;
@@ -12,6 +13,7 @@ type ChildListItemProps = {
 };
 
 export function ChildListItem({ child, onPress }: ChildListItemProps) {
+  const { t: translate } = useTranslation();
   return (
     <TouchableOpacity className="flex-row items-start py-3 gap-3" onPress={onPress} activeOpacity={0.7}>
       <View className="w-11 h-11 rounded-[22px] border-[1.5px] items-center justify-center" style={{ borderColor: AppColors.subtleText }}>
@@ -26,7 +28,7 @@ export function ChildListItem({ child, onPress }: ChildListItemProps) {
           {child.birth_year}
         </ThemedText>
         {child.interests && (
-          <ThemedText className="text-[13px] font-nunito" style={{ color: AppColors.mutedText }}>Interests</ThemedText>
+          <ThemedText className="text-[13px] font-nunito" style={{ color: AppColors.mutedText }}>{translate('familyInformation.interests')}</ThemedText>
         )}
         <InterestTags interests={child.interests} />
       </View>
diff --git a/frontend/apps/mobile/components/ChildProfileForm.tsx b/frontend/apps/mobile/components/ChildProfileForm.tsx
index bc9664ba..949b0a7d 100644
--- a/frontend/apps/mobile/components/ChildProfileForm.tsx
+++ b/frontend/apps/mobile/components/ChildProfileForm.tsx
@@ -1,9 +1,11 @@
 import React from 'react';
-import { View, TextInput, TouchableOpacity, ScrollView, useColorScheme } from 'react-native';
+import { View, TextInput, TouchableOpacity, ScrollView } from 'react-native';
 import { ThemedText } from '@/components/themed-text';
 import { IconSymbol } from '@/components/ui/icon-symbol';
-import { Colors, AppColors, TAG_COLORS } from '@/constants/theme';
+import { AppColors, TAG_COLORS, Colors } from '@/constants/theme';
+import { useColorScheme } from '@/hooks/use-color-scheme';
 import { SchoolPicker } from '@/components/SchoolPicker';
+import { useTranslation } from 'react-i18next';
 
 const INTEREST_OPTIONS = [
   'science', 'math', 'music', 'art', 'sports', 'technology', 'language', 'other',
@@ -52,6 +54,7 @@ export function ChildProfileForm({
 }: ChildProfileFormProps) {
   const colorScheme = useColorScheme();
   const theme = Colors[colorScheme ?? 'light'];
+  const { t: translate } = useTranslation();
 
   const removeInterest = (tag: string) => setInterests(prev => prev.filter(i => i !== tag));
 
@@ -68,31 +71,28 @@ export function ChildProfileForm({
   return (
     <>
       <TextInput
-        className="rounded-[10px] px-4 py-[14px] text-base font-nunito mb-3"
-        style={{ backgroundColor: theme.inputBg, color: theme.text }}
+        className="rounded-[10px] px-4 py-[14px] text-base font-nunito mb-3 bg-[#F3F4F6] dark:bg-[#27272a] text-[#11181C] dark:text-[#ECEDEE]"
         value={firstName}
         onChangeText={setFirstName}
-        placeholder="First Name"
+        placeholder={translate('childProfile.firstName')}
         placeholderTextColor={AppColors.placeholderText}
       />
       <TextInput
-        className="rounded-[10px] px-4 py-[14px] text-base font-nunito mb-3"
-        style={{ backgroundColor: theme.inputBg, color: theme.text }}
+        className="rounded-[10px] px-4 py-[14px] text-base font-nunito mb-3 bg-[#F3F4F6] dark:bg-[#27272a] text-[#11181C] dark:text-[#ECEDEE]"
         value={lastName}
         onChangeText={setLastName}
-        placeholder="Last Name"
+        placeholder={translate('childProfile.lastName')}
         placeholderTextColor={AppColors.placeholderText}
       />
       <View className="flex-row gap-3 mb-6 z-10">
         {/* Month picker */}
         <View className="flex-1 z-10">
           <TouchableOpacity
-            className="rounded-[10px] px-4 py-[14px] flex-row items-center justify-between"
-            style={{ backgroundColor: theme.inputBg }}
+            className="rounded-[10px] px-4 py-[14px] flex-row items-center justify-between bg-[#F3F4F6] dark:bg-[#27272a]"
             onPress={() => { setShowMonthDrop(!showMonthDrop); setShowYearDrop(false); }}
           >
-            <ThemedText className={birthMonth ? '' : 'font-nunito'} style={birthMonth ? {} : { color: AppColors.placeholderText }}>
-              {birthMonth || 'Month'}
+            <ThemedText className={birthMonth ? '' : 'font-nunito text-[#9CA3AF]'}>
+              {birthMonth || translate('childProfile.month')}
             </ThemedText>
             <IconSymbol name="chevron.down" size={16} color={AppColors.mutedText} />
           </TouchableOpacity>
@@ -105,8 +105,7 @@ export function ChildProfileForm({
                 {MONTHS.map(m => (
                   <TouchableOpacity
                     key={m}
-                    className="px-4 py-3 border-b"
-                    style={{ borderBottomColor: theme.borderColor }}
+                    className="px-4 py-3 border-b border-b-[#E5E7EB] dark:border-b-[#3f3f46]"
                     onPress={() => { setBirthMonth(m); setShowMonthDrop(false); }}
                   >
                     <ThemedText>{m}</ThemedText>
@@ -119,12 +118,11 @@ export function ChildProfileForm({
         {/* Year picker */}
         <View className="flex-1 z-10">
           <TouchableOpacity
-            className="rounded-[10px] px-4 py-[14px] flex-row items-center justify-between"
-            style={{ backgroundColor: theme.inputBg }}
+            className="rounded-[10px] px-4 py-[14px] flex-row items-center justify-between bg-[#F3F4F6] dark:bg-[#27272a]"
             onPress={() => { setShowYearDrop(!showYearDrop); setShowMonthDrop(false); }}
           >
-            <ThemedText className={birthYear ? '' : 'font-nunito'} style={birthYear ? {} : { color: AppColors.placeholderText }}>
-              {birthYear || 'Year'}
+            <ThemedText className={birthYear ? '' : 'font-nunito text-[#9CA3AF]'}>
+              {birthYear || translate('childProfile.year')}
             </ThemedText>
             <IconSymbol name="chevron.down" size={16} color={AppColors.mutedText} />
           </TouchableOpacity>
@@ -137,8 +135,7 @@ export function ChildProfileForm({
                 {YEARS.map(y => (
                   <TouchableOpacity
                     key={y}
-                    className="px-4 py-3 border-b"
-                    style={{ borderBottomColor: theme.borderColor }}
+                    className="px-4 py-3 border-b border-b-[#E5E7EB] dark:border-b-[#3f3f46]"
                     onPress={() => { setBirthYear(y); setShowYearDrop(false); }}
                   >
                     <ThemedText>{y}</ThemedText>
@@ -150,7 +147,7 @@ export function ChildProfileForm({
         </View>
       </View>
       <SchoolPicker value={schoolId} onChange={setSchoolId} />
-      <ThemedText className="text-base font-nunito-semibold mb-3">Interests</ThemedText>
+      <ThemedText className="text-base font-nunito-semibold mb-3">{translate('familyInformation.interests')}</ThemedText>
       {interests.length > 0 && (
         <ScrollView horizontal showsHorizontalScrollIndicator={false} className="mb-3" contentContainerStyle={{ gap: 8, paddingRight: 4 }}>
           {interests.map((tag, idx) => {
@@ -163,35 +160,33 @@ export function ChildProfileForm({
                 onPress={() => removeInterest(tag)}
               >
                 <IconSymbol name="camera.filters" size={13} color={color.border} />
-                <ThemedText className="text-xs font-nunito-medium" style={{ color: color.text }}>{capitalize(tag)}</ThemedText>
+                <ThemedText className="text-xs font-nunito-medium" style={{ color: color.text }}>{translate(`interests.${tag}`, { defaultValue: capitalize(tag) })}</ThemedText>
               </TouchableOpacity>
             );
           })}
         </ScrollView>
       )}
-      <View className="border rounded-[10px] overflow-hidden mb-6" style={{ borderColor: theme.borderColor }}>
+      <View className="border rounded-[10px] overflow-hidden mb-6 border-[#E5E7EB] dark:border-[#3f3f46]">
         <View className="flex-row items-center px-4 py-3 gap-2">
           <TextInput
-            className="flex-1 text-base font-nunito"
-            style={{ color: theme.text }}
+            className="flex-1 text-base font-nunito text-[#11181C] dark:text-[#ECEDEE]"
             value={searchQuery}
             onChangeText={setSearchQuery}
-            placeholder="Search interests..."
+            placeholder={translate('childProfile.searchInterests')}
             placeholderTextColor={AppColors.placeholderText}
           />
           <IconSymbol name="magnifyingglass" size={20} color={AppColors.mutedText} />
         </View>
-        <View className="h-px" style={{ backgroundColor: theme.borderColor }} />
+        <View className="h-px bg-[#E5E7EB] dark:bg-[#3f3f46]" />
         <View onStartShouldSetResponder={() => true} onMoveShouldSetResponder={() => true}>
           <ScrollView nestedScrollEnabled showsVerticalScrollIndicator className="max-h-[150px]">
             {filteredOptions.map(item => (
               <TouchableOpacity
                 key={item}
-                className="flex-row items-center justify-between px-4 py-4 border-b"
-                style={{ borderBottomColor: theme.inputBg }}
+                className="flex-row items-center justify-between px-4 py-4 border-b border-b-[#F3F4F6] dark:border-b-[#27272a]"
                 onPress={() => toggleInterest(item)}
               >
-                <ThemedText className="text-base font-nunito">{capitalize(item)}</ThemedText>
+                <ThemedText className="text-base font-nunito">{translate(`interests.${item}`, { defaultValue: capitalize(item) })}</ThemedText>
                 <View
                   className="w-[22px] h-[22px] rounded-[4px] border-[1.5px] items-center justify-center"
                   style={{ borderColor: interests.includes(item) ? AppColors.checkboxSelected : AppColors.subtleText }}
diff --git a/frontend/apps/mobile/components/EventCard.tsx b/frontend/apps/mobile/components/EventCard.tsx
index 802ddb97..b3990990 100644
--- a/frontend/apps/mobile/components/EventCard.tsx
+++ b/frontend/apps/mobile/components/EventCard.tsx
@@ -4,6 +4,7 @@ import { IconSymbol } from '@/components/ui/icon-symbol';
 import { ThemedText } from '@/components/themed-text';
 import { ThemedView } from '@/components/themed-view';
 import { useThemeColor } from '@/hooks/use-theme-color';
+import { useTranslation } from 'react-i18next';
 
 export interface LocationPin {
   id: string;
@@ -25,6 +26,7 @@ export function EventCard({ pin }: EventCardProps) {
     { light: "#D0D0D0", dark: "#333333" },
     "background",
   );
+  const { t: translate } = useTranslation();
 
   return (
     <ThemedView
@@ -49,7 +51,7 @@ export function EventCard({ pin }: EventCardProps) {
             {pin.title}
           </ThemedText>
           <ThemedText className="mb-[6px] text-sm text-[#888]">
-            {pin.members} members
+            {pin.members} {translate('dashboard.members')}
           </ThemedText>
           <View className="mb-2 flex-row items-center">
             {[1, 2, 3, 4, 5].map((star) => (
@@ -71,12 +73,10 @@ export function EventCard({ pin }: EventCardProps) {
       </View>
       <TouchableOpacity
         className="w-full items-center rounded-xl bg-[#333] py-[15px]"
-        activeOpacity={1}
-        onPress={() => Alert.alert("Reservation", `Reserved: ${pin.title}`)}
+        activeOpacity={1} 
+        onPress={() => Alert.alert(translate('dashboard.reserve'), `${translate('dashboard.reserved')}: ${pin.title}`)}
       >
-        <ThemedText className="text-[18px] font-semibold text-white">
-          Reserve
-        </ThemedText>
+        <ThemedText className="text-[18px] font-semibold text-white">{translate('dashboard.reserve')}</ThemedText>
       </TouchableOpacity>
     </ThemedView>
   );
diff --git a/frontend/apps/mobile/components/InterestTags.tsx b/frontend/apps/mobile/components/InterestTags.tsx
index 3bf1fe0b..29c33a5b 100644
--- a/frontend/apps/mobile/components/InterestTags.tsx
+++ b/frontend/apps/mobile/components/InterestTags.tsx
@@ -3,10 +3,12 @@ import { View } from 'react-native';
 import { ThemedText } from '@/components/themed-text';
 import { IconSymbol } from '@/components/ui/icon-symbol';
 import { AppColors, TAG_COLORS } from '@/constants/theme';
+import { useTranslation } from 'react-i18next';
 
 const MAX_VISIBLE_TAGS = 3;
 
 export function InterestTags({ interests }: { interests?: string[] | string }) {
+  const { t: translate } = useTranslation();
   const tags: string[] = Array.isArray(interests)
     ? interests
     : typeof interests === 'string' && interests
@@ -30,7 +32,7 @@ export function InterestTags({ interests }: { interests?: string[] | string }) {
           >
             <IconSymbol name="camera.filters" size={13} color={c.border} />
             <ThemedText className="text-xs font-nunito-medium" style={{ color: c.text }}>
-              {tag}
+              {translate(`interests.${tag}`, { defaultValue: tag })}
             </ThemedText>
           </View>
         );
diff --git a/frontend/apps/mobile/components/LoginRedirect.tsx b/frontend/apps/mobile/components/LoginRedirect.tsx
index 3d6b84ba..94504190 100644
--- a/frontend/apps/mobile/components/LoginRedirect.tsx
+++ b/frontend/apps/mobile/components/LoginRedirect.tsx
@@ -1,13 +1,17 @@
 import { useAuthContext } from "@/hooks/use-auth-context";
 import { Redirect, Stack } from "expo-router";
+import { useEffect } from "react";
+import i18n from "@/i18n";
 
 export const LoginRedirect = () => {
   const { isAuthenticated, isLoading } = useAuthContext();
 
+
   if (isLoading) {
     return <Stack />;
   }
 
+
   return (
     <>
       <Stack>
diff --git a/frontend/apps/mobile/components/SavedEventCard.tsx b/frontend/apps/mobile/components/SavedEventCard.tsx
index 156cf7dc..8bd379d0 100644
--- a/frontend/apps/mobile/components/SavedEventCard.tsx
+++ b/frontend/apps/mobile/components/SavedEventCard.tsx
@@ -4,6 +4,7 @@ import { Image, Pressable, Text, TouchableOpacity, View } from 'react-native';
 import { router } from "expo-router";
 import { AppColors, TAG_COLORS } from "@/constants/theme";
 import { IconSymbol } from '@/components/ui/icon-symbol';
+import { useTranslation } from 'react-i18next';
 
 interface BookmarkIconProps {
   onPress?: () => void;
@@ -23,6 +24,7 @@ interface SavedEventCardProps {
 }
 
 export function SavedEventCard({ event, onBookmarkPress }: SavedEventCardProps) {
+  const { t: translate } = useTranslation();
   return (
     <Pressable
       onPress={() => router.push(`/event/${event.id}`)} //TODO: fix event details to be either event or occurrence based on design
@@ -55,7 +57,7 @@ export function SavedEventCard({ event, onBookmarkPress }: SavedEventCardProps)
                 style={{ backgroundColor: TAG_COLORS[0].bg }}
               >
                 <Text className="text-xs font-medium" style={{ color: TAG_COLORS[0].text }}>
-                  {cat}
+                  {translate(`interests.${cat}`, { defaultValue: cat })}
                 </Text>
               </View>
             ))}
diff --git a/frontend/apps/mobile/components/SchoolPicker.tsx b/frontend/apps/mobile/components/SchoolPicker.tsx
index 836be3ac..f955baeb 100644
--- a/frontend/apps/mobile/components/SchoolPicker.tsx
+++ b/frontend/apps/mobile/components/SchoolPicker.tsx
@@ -1,9 +1,11 @@
 import React, { useState } from 'react';
-import { View, TouchableOpacity, ScrollView, useColorScheme } from 'react-native';
+import { View, TouchableOpacity, ScrollView } from 'react-native';
 import { ThemedText } from '@/components/themed-text';
 import { IconSymbol } from '@/components/ui/icon-symbol';
-import { Colors, AppColors } from '@/constants/theme';
+import { AppColors, Colors } from '@/constants/theme';
+import { useColorScheme } from '@/hooks/use-color-scheme';
 import { useGetAllSchools, School } from '@skillspark/api-client';
+import { useTranslation } from 'react-i18next';
 
 type SchoolPickerProps = {
   value: string;
@@ -11,26 +13,30 @@ type SchoolPickerProps = {
 };
 
 export function SchoolPicker({ value, onChange }: SchoolPickerProps) {
+  const [showDrop, setShowDrop] = useState(false);
   const colorScheme = useColorScheme();
   const theme = Colors[colorScheme ?? 'light'];
-  const [showDrop, setShowDrop] = useState(false);
+  const { t: translate } = useTranslation();
 
   const { data, isLoading, isError } = useGetAllSchools();
   const schools = Array.isArray(data?.data) ? data.data : [];
   const selectedSchool = schools.find((s: School) => s.id === value);
-  const placeholderLabel = isLoading ? 'Loading schools...' : isError ? 'Failed to load schools' : 'Select School';
+
+  const placeholderLabel = isLoading
+    ? translate('childProfile.loadingSchools')
+    : isError
+    ? translate('childProfile.failedToLoadSchools')
+    : translate('childProfile.selectSchool');
 
   return (
-    <View className="z-20">
+    <View className="z-[20]">
       <TouchableOpacity
-        className="rounded-[10px] px-4 py-[14px] flex-row items-center justify-between mb-6"
-        style={{ backgroundColor: theme.inputBg }}
+        className="rounded-[10px] px-4 py-[14px] flex-row items-center justify-between mb-6 bg-[#F3F4F6] dark:bg-[#27272a]"
         onPress={() => setShowDrop(prev => !prev)}
         disabled={isLoading || isError}
       >
         <ThemedText
-          className="font-nunito"
-          style={selectedSchool ? { color: theme.text } : { color: AppColors.placeholderText }}
+          className={`font-nunito ${selectedSchool ? '' : 'text-[#9CA3AF]'}`}
         >
           {selectedSchool ? selectedSchool.name : placeholderLabel}
         </ThemedText>
@@ -52,8 +58,7 @@ export function SchoolPicker({ value, onChange }: SchoolPickerProps) {
             {schools.map(school => (
               <TouchableOpacity
                 key={school.id}
-                className="px-4 py-3 border-b"
-                style={{ borderBottomColor: theme.borderColor }}
+                className="px-4 py-3 border-b border-b-[#E5E7EB] dark:border-b-[#3f3f46]"
                 onPress={() => { onChange(school.id); setShowDrop(false); }}
               >
                 <ThemedText>{school.name}</ThemedText>
@@ -61,7 +66,7 @@ export function SchoolPicker({ value, onChange }: SchoolPickerProps) {
             ))}
             {schools.length === 0 && !isLoading && (
               <View className="px-4 py-3">
-                <ThemedText style={{ color: AppColors.mutedText }}>No schools found</ThemedText>
+                <ThemedText className="text-[#6B7280]">{translate('childProfile.noSchoolsFound')}</ThemedText>
               </View>
             )}
           </ScrollView>
diff --git a/frontend/apps/mobile/components/ui/icon-symbol.tsx b/frontend/apps/mobile/components/ui/icon-symbol.tsx
index 70192dd3..a326360b 100644
--- a/frontend/apps/mobile/components/ui/icon-symbol.tsx
+++ b/frontend/apps/mobile/components/ui/icon-symbol.tsx
@@ -38,6 +38,7 @@ const MAPPING = {
   'bookmark.fill': 'bookmark',
   'location.fill': 'place',
   'record.circle': 'radio-button-on',
+  'checkmark': 'check',
 } as IconMapping;
 
 /**
@@ -69,4 +70,4 @@ export function IconSymbol({
       style={style}
     />
   );
-}
+}
\ No newline at end of file
diff --git a/frontend/apps/mobile/contexts/auth-context.tsx b/frontend/apps/mobile/contexts/auth-context.tsx
index 8e714b5f..a9dd0e77 100644
--- a/frontend/apps/mobile/contexts/auth-context.tsx
+++ b/frontend/apps/mobile/contexts/auth-context.tsx
@@ -7,10 +7,15 @@ import {
   useSignupGuardian,
   useGetGuardianById,
   Guardian,
+  setCurrentLanguage,
+  getGuardianById,
+  getGetSavedByGuardianIdQueryKey,
 } from "@skillspark/api-client";
 import * as SecureStore from "expo-secure-store";
 import { router } from "expo-router";
 import { createContext, useState, useEffect, ReactNode } from "react";
+import { useQueryClient } from "@tanstack/react-query";
+import i18n from "@/i18n";
 
 interface AuthContextType {
   guardianId: string | null;
@@ -44,6 +49,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {
   const [jwt, setJWT] = useState<string | null>(null);
   const [langPref, setLangPref] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(true);
+  const queryClient = useQueryClient();
   const { mutate: loginFunc } = useLoginGuardian();
   const { mutate: signupFunc } = useSignupGuardian();
 
@@ -58,6 +64,11 @@ export function AuthProvider({ children }: { children: ReactNode }) {
       const storedJWT = await SecureStore.getItemAsync("token");
       const storedGuardianId = await SecureStore.getItemAsync("guardian_id");
       const storedLangPref = await SecureStore.getItemAsync("language_preference");
+      if (storedLangPref) {
+        await i18n.changeLanguage(storedLangPref);
+        setCurrentLanguage(storedLangPref);
+        queryClient.invalidateQueries({ refetchType: 'all' });
+      }
       if (storedJWT && storedGuardianId) {
         setJWT(storedJWT);
         setGuardianId(storedGuardianId);
@@ -68,11 +79,21 @@ export function AuthProvider({ children }: { children: ReactNode }) {
     checkAlreadyAuth();
   }, []);
 
+
   useEffect(() => {
     const getUpdatedLangPref = async () => {
       if (!guardianData) return;
+      // SecureStore is the source of truth — only fall back to server value
+      // if there is no locally stored preference (e.g. first login on a new device).
+      const stored = await SecureStore.getItemAsync("language_preference");
+      if (stored) {
+        setLangPref(stored);
+        return;
+      }
       const guardian = (guardianData as unknown as { data: Guardian })?.data;
-      const pref = guardian?.language_preference ?? "en"; // default to english
+      const pref = guardian?.language_preference ?? "en";
+      await i18n.changeLanguage(pref);
+      setCurrentLanguage(pref);
       await SecureStore.setItemAsync("language_preference", pref);
       setLangPref(pref);
     };
diff --git a/frontend/apps/mobile/hooks/use-guardian.ts b/frontend/apps/mobile/hooks/use-guardian.ts
new file mode 100644
index 00000000..3b9975e0
--- /dev/null
+++ b/frontend/apps/mobile/hooks/use-guardian.ts
@@ -0,0 +1,18 @@
+import { useGetGuardianById, useGetChildrenByGuardianId } from '@skillspark/api-client';
+
+// TODO: Replace with authenticated user's guardian ID
+const GUARDIAN_ID = '88888888-8888-8888-8888-888888888888';
+
+export function useGuardian() {
+  const { data: guardianResponse, isLoading: guardianLoading } = useGetGuardianById(GUARDIAN_ID);
+  const { data: childrenResponse, isLoading: childrenLoading } = useGetChildrenByGuardianId(GUARDIAN_ID);
+
+  const guardian = guardianResponse?.status === 200 ? guardianResponse.data : null;
+  const children = childrenResponse?.status === 200 ? childrenResponse.data : [];
+  return {
+    guardian,
+    children,
+    guardianId: GUARDIAN_ID,
+    isLoading: guardianLoading || childrenLoading,
+  };
+}
\ No newline at end of file
diff --git a/frontend/apps/mobile/i18n/en.json b/frontend/apps/mobile/i18n/en.json
new file mode 100644
index 00000000..29baa497
--- /dev/null
+++ b/frontend/apps/mobile/i18n/en.json
@@ -0,0 +1,140 @@
+{
+  "nav": {
+    "home": "Home",
+    "map": "Map",
+    "profile": "Profile",
+    "events": "Events",
+    "about": "About"
+  },
+  "common": {
+    "submit": "Submit",
+    "cancel": "Cancel",
+    "loading": "Loading...",
+    "loadingMapData": "Loading Map Data...",
+    "loadingEvents": "Loading events...",
+    "errorLoadingEvents": "Error loading events",
+    "errorOccurred": "An error occurred",
+    "errorFetchingEvents": "An error occurred while fetching events.",
+    "noEventsNearby": "No events found nearby.",
+    "noEventsAvailable": "No events available",
+    "noUpcomingEvents": "No upcoming events",
+    "noGuardianId": "Unable to load: no account found",
+    "noChildrenFound": "No children found",
+    "noChildProfilesAdded": "No child profiles added yet.",
+    "error": "Error",
+    "locationDenied": "Permission to access location was denied. Please enable it in settings.",
+    "openSettings": "Open Settings"
+  },
+  "home": {
+    "title": "Welcome",
+    "subtitle": "Find events near you"
+  },
+  "dashboard": {
+    "title": "My Dashboard",
+    "searchPlaceholder": "Search for a class",
+    "discoverWeekly": "Discover Weekly",
+    "forYou": "For You",
+    "basedOn": "Based on",
+    "upcomingEvents": "upcoming events",
+    "reserve": "Reserve",
+    "reserved": "Reserved",
+    "members": "members",
+    "categories": {
+      "technology": "technology",
+      "art": "art",
+      "music": "music",
+      "math": "math",
+      "sports": "sports"
+    }
+  },
+  "profile": {
+    "contact": "Contact",
+    "family": "Family",
+    "born": "Born {{year}}",
+    "myBookings": "My Bookings",
+    "upcoming": "Upcoming",
+    "previous": "Previous",
+    "saved": "Saved",
+    "preferences": "Preferences",
+    "payment": "Payment",
+    "familyInformation": "Family Information",
+    "settings": "Settings"
+  },
+  "settings": {
+    "title": "Settings",
+    "language": "Language",
+    "languages": {
+      "en": "English",
+      "th": "Thai"
+    },
+    "termsAndConditions": "Terms and Conditions",
+    "privacyPolicy": "Privacy Policy",
+    "logOut": "Log Out",
+    "deleteAccount": "Delete Account"
+  },
+  "payment": {
+    "title": "Payment",
+    "manageBilling": "Manage Billing",
+    "creditCard": "Credit Card",
+    "name": "Name",
+    "updateBilling": "Update Billing",
+    "delete": "Delete"
+  },
+  "familyInformation": {
+    "title": "Family Information",
+    "childProfile": "Child Profile",
+    "addProfile": "add profile +",
+    "interests": "Interests",
+    "emergencyContact": "Emergency Contact",
+    "addContact": "add contact +"
+  },
+  "childProfile": {
+    "editTitle": "Edit Child Profile",
+    "createTitle": "Create Child Profile",
+    "firstName": "First Name",
+    "lastName": "Last Name",
+    "month": "Month",
+    "year": "Year",
+    "saving": "Saving...",
+    "saveChanges": "Save Changes",
+    "searchInterests": "Search interests...",
+    "selectSchool": "Select School",
+    "loadingSchools": "Loading schools...",
+    "failedToLoadSchools": "Failed to load schools",
+    "noSchoolsFound": "No schools found",
+    "deleteProfile": "Delete Profile",
+    "deleteConfirm": "Are you sure you want to remove this child profile?",
+    "requiredFieldsError": "Please fill in all required fields (Name, Birth Date, School ID)",
+    "saveError": "Failed to save. Please try again.",
+    "deleteError": "Failed to delete."
+  },
+  "saved": {
+    "title": "Saved",
+    "noEvents": "You have no saved events.",
+    "deleteTitle": "Delete saved event",
+    "deleteConfirm": "Are you sure you want to remove this saved event?"
+  },
+  "event": {
+    "back": "Back",
+    "seeMore": "See more",
+    "seeLess": "See less",
+    "perSession": "/Session",
+    "home": "Home",
+    "location": "Location",
+    "register": "Register",
+    "notFound": "Event not found",
+    "minWalk": "min",
+    "hr": "hr",
+    "min": "min"
+  },
+  "interests": {
+    "science": "Science",
+    "math": "Math",
+    "music": "Music",
+    "art": "Art",
+    "sports": "Sports",
+    "technology": "Technology",
+    "language": "Language",
+    "other": "Other"
+  }
+}
\ No newline at end of file
diff --git a/frontend/apps/mobile/i18n/index.ts b/frontend/apps/mobile/i18n/index.ts
new file mode 100644
index 00000000..50bb31bd
--- /dev/null
+++ b/frontend/apps/mobile/i18n/index.ts
@@ -0,0 +1,21 @@
+import i18n from 'i18next'
+import { initReactI18next } from 'react-i18next'
+import en from './en.json'
+import th from './th.json'
+
+
+
+i18n.use(initReactI18next).init({
+  resources: {
+    en: { translation: en },
+    th: { translation: th },
+  },
+  lng: 'en',
+  fallbackLng: 'en',
+  debug: false,
+  interpolation: {
+    escapeValue: false,
+  },
+})
+
+export default i18n
diff --git a/frontend/apps/mobile/i18n/th.json b/frontend/apps/mobile/i18n/th.json
new file mode 100644
index 00000000..24863a6b
--- /dev/null
+++ b/frontend/apps/mobile/i18n/th.json
@@ -0,0 +1,140 @@
+{
+  "nav": {
+    "home": "หน้าหลัก",
+    "map": "แผนที่",
+    "profile": "โปรไฟล์",
+    "events": "กิจกรรม",
+    "about": "เกี่ยวกับ"
+  },
+  "common": {
+    "submit": "ส่ง",
+    "cancel": "ยกเลิก",
+    "loading": "กำลังโหลด...",
+    "loadingMapData": "กำลังโหลดข้อมูลแผนที่...",
+    "loadingEvents": "กำลังโหลดกิจกรรม...",
+    "errorLoadingEvents": "เกิดข้อผิดพลาดในการโหลดกิจกรรม",
+    "errorOccurred": "เกิดข้อผิดพลาด",
+    "errorFetchingEvents": "เกิดข้อผิดพลาดขณะดึงข้อมูลกิจกรรม",
+    "noEventsNearby": "ไม่พบกิจกรรมในบริเวณใกล้เคียง",
+    "noEventsAvailable": "ไม่มีกิจกรรม",
+    "noUpcomingEvents": "ไม่มีกิจกรรมที่จะมาถึง",
+    "noGuardianId": "ไม่สามารถโหลดได้: ไม่พบบัญชี",
+    "noChildrenFound": "ไม่พบข้อมูลเด็ก",
+    "noChildProfilesAdded": "ยังไม่มีโปรไฟล์เด็ก",
+    "error": "ข้อผิดพลาด",
+    "locationDenied": "การเข้าถึงตำแหน่งที่ตั้งถูกปฏิเสธ กรุณาเปิดใช้งานในการตั้งค่า",
+    "openSettings": "เปิดการตั้งค่า"
+  },
+  "home": {
+    "title": "ยินดีต้อนรับ",
+    "subtitle": "ค้นหากิจกรรมใกล้คุณ"
+  },
+  "dashboard": {
+    "title": "แดชบอร์ดของฉัน",
+    "searchPlaceholder": "ค้นหาคลาส",
+    "discoverWeekly": "ค้นพบประจำสัปดาห์",
+    "forYou": "สำหรับคุณ",
+    "basedOn": "ตามจาก",
+    "upcomingEvents": "กิจกรรมที่จะมาถึง",
+    "reserve": "จอง",
+    "reserved": "จองแล้ว",
+    "members": "สมาชิก",
+    "categories": {
+      "technology": "เทคโนโลยี",
+      "art": "ศิลปะ",
+      "music": "ดนตรี",
+      "math": "คณิตศาสตร์",
+      "sports": "กีฬา"
+    }
+  },
+  "profile": {
+    "contact": "ติดต่อ",
+    "family": "ครอบครัว",
+    "born": "เกิด {{year}}",
+    "myBookings": "การจองของฉัน",
+    "upcoming": "ที่จะมาถึง",
+    "previous": "ก่อนหน้า",
+    "saved": "ที่บันทึกไว้",
+    "preferences": "การตั้งค่า",
+    "payment": "การชำระเงิน",
+    "familyInformation": "ข้อมูลครอบครัว",
+    "settings": "ตั้งค่า"
+  },
+  "settings": {
+    "title": "ตั้งค่า",
+    "language": "ภาษา",
+    "languages": {
+      "en": "อังกฤษ",
+      "th": "ไทย"
+    },
+    "termsAndConditions": "ข้อกำหนดและเงื่อนไข",
+    "privacyPolicy": "นโยบายความเป็นส่วนตัว",
+    "logOut": "ออกจากระบบ",
+    "deleteAccount": "ลบบัญชี"
+  },
+  "payment": {
+    "title": "การชำระเงิน",
+    "manageBilling": "จัดการการเรียกเก็บเงิน",
+    "creditCard": "บัตรเครดิต",
+    "name": "ชื่อ",
+    "updateBilling": "อัปเดตการเรียกเก็บเงิน",
+    "delete": "ลบ"
+  },
+  "familyInformation": {
+    "title": "ข้อมูลครอบครัว",
+    "childProfile": "โปรไฟล์เด็ก",
+    "addProfile": "เพิ่มโปรไฟล์ +",
+    "interests": "ความสนใจ",
+    "emergencyContact": "ผู้ติดต่อฉุกเฉิน",
+    "addContact": "เพิ่มผู้ติดต่อ +"
+  },
+  "childProfile": {
+    "editTitle": "แก้ไขโปรไฟล์เด็ก",
+    "createTitle": "สร้างโปรไฟล์เด็ก",
+    "firstName": "ชื่อ",
+    "lastName": "นามสกุล",
+    "month": "เดือน",
+    "year": "ปี",
+    "saving": "กำลังบันทึก...",
+    "saveChanges": "บันทึกการเปลี่ยนแปลง",
+    "searchInterests": "ค้นหาความสนใจ...",
+    "selectSchool": "เลือกโรงเรียน",
+    "loadingSchools": "กำลังโหลดโรงเรียน...",
+    "failedToLoadSchools": "โหลดโรงเรียนไม่สำเร็จ",
+    "noSchoolsFound": "ไม่พบโรงเรียน",
+    "deleteProfile": "ลบโปรไฟล์",
+    "deleteConfirm": "คุณต้องการลบโปรไฟล์เด็กนี้ใช่ไหม?",
+    "requiredFieldsError": "กรุณากรอกข้อมูลที่จำเป็นทั้งหมด (ชื่อ วันเกิด รหัสโรงเรียน)",
+    "saveError": "บันทึกไม่สำเร็จ กรุณาลองอีกครั้ง",
+    "deleteError": "ลบไม่สำเร็จ"
+  },
+  "saved": {
+    "title": "ที่บันทึกไว้",
+    "noEvents": "คุณไม่มีกิจกรรมที่บันทึกไว้",
+    "deleteTitle": "ลบกิจกรรมที่บันทึก",
+    "deleteConfirm": "คุณต้องการลบกิจกรรมที่บันทึกนี้ใช่ไหม?"
+  },
+  "event": {
+    "back": "กลับ",
+    "seeMore": "ดูเพิ่มเติม",
+    "seeLess": "ดูน้อยลง",
+    "perSession": "/เซสชัน",
+    "home": "บ้าน",
+    "location": "สถานที่",
+    "register": "ลงทะเบียน",
+    "notFound": "ไม่พบกิจกรรม",
+    "minWalk": "นาที",
+    "hr": "ชั่วโมง",
+    "min": "นาที"
+  },
+  "interests": {
+    "science": "วิทยาศาสตร์",
+    "math": "คณิตศาสตร์",
+    "music": "ดนตรี",
+    "art": "ศิลปะ",
+    "sports": "กีฬา",
+    "technology": "เทคโนโลยี",
+    "language": "ภาษา",
+    "other": "อื่นๆ"
+  }
+}
diff --git a/frontend/apps/mobile/i18n/translations.md b/frontend/apps/mobile/i18n/translations.md
new file mode 100644
index 00000000..e5b78517
--- /dev/null
+++ b/frontend/apps/mobile/i18n/translations.md
@@ -0,0 +1,151 @@
+# SkillSpark Mobile — Translation Guide
+
+## Overview
+
+The app uses [react-i18next](https://react.i18next.com/) for internationalization. Translation files live in `frontend/apps/mobile/i18n/`.
+
+Currently supported languages:
+- `en` — English (default)
+- `th` — Thai
+
+---
+
+## Adding a New Language
+
+### 1. Create a translation file
+
+Create a new JSON file in `frontend/apps/mobile/i18n/` named `<code>.json` where `<code>` is the [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) language code (e.g. `ja.json` for Japanese).
+
+Copy `en.json` as a starting point and translate every value. Do not translate the keys.
+
+```json
+{
+  "nav": {
+    "home": "ホーム",
+    "map": "マップ",
+    ...
+  }
+}
+```
+
+### 2. Register the language in `i18n/index.ts`
+
+Import the new file and add it to the `resources` object:
+
+```ts
+import ja from './ja.json'
+
+i18n.use(initReactI18next).init({
+  resources: {
+    en: { translation: en },
+    th: { translation: th },
+    ja: { translation: ja },  // add this
+  },
+  ...
+})
+```
+
+### 3. Add the language to the selector in `language.tsx`
+
+Add an entry to the `LANGUAGES` array:
+
+```ts
+const LANGUAGES = [
+  { code: 'en', label: 'English', flag: '🇺🇸' },
+  { code: 'th', label: 'Thai',    flag: '🇹🇭' },
+  { code: 'ja', label: 'Japanese', flag: '🇯🇵' },  // add this
+];
+```
+
+### 4. Add the language label translation to all language files
+
+In every existing translation file (e.g. `en.json`, `th.json`), add the new language's display name under `settings.languages`:
+
+```json
+"settings": {
+  "languages": {
+    "en": "English",
+    "th": "Thai",
+    "ja": "Japanese"
+  }
+}
+```
+
+### 5. Add the `Accept-Language` header mapping in `apiClient.ts`
+
+In `frontend/packages/api-client/src/apiClient.ts`, update the `languageHeader` line to handle the new code:
+
+```ts
+const langMap: Record<string, string> = {
+  en: 'en-US',
+  th: 'th-TH',
+  ja: 'ja-JP',
+};
+const languageHeader = langMap[i18n.language] ?? 'en-US';
+```
+
+---
+
+## Translation Key Reference
+
+All keys follow the structure below. When adding new UI strings, add the key to **all** language files before using `t()` in a component.
+
+```
+nav
+  home, map, profile, events, about
+
+common
+  submit, cancel, loading, loadingMapData, loadingEvents
+  errorLoadingEvents, errorOccurred, errorFetchingEvents
+  noEventsNearby, noEventsAvailable, noUpcomingEvents
+  noChildrenFound, noChildProfilesAdded, error
+  locationDenied, openSettings
+
+home
+  title, subtitle
+
+dashboard
+  title, searchPlaceholder, discoverWeekly, forYou
+  basedOn, upcomingEvents, reserve, reserved, members
+  categories: technology, art, music, math, sports
+
+profile
+  contact, family, born (interpolated: {{year}})
+  myBookings, upcoming, previous, saved
+  preferences, payment, familyInformation, settings
+
+settings
+  title, language
+  languages: en, th
+  termsAndConditions, privacyPolicy, logOut, deleteAccount
+
+payment
+  title, manageBilling, creditCard, name, updateBilling, delete
+
+familyInformation
+  title, childProfile, addProfile, interests
+  emergencyContact, addContact
+
+childProfile
+  editTitle, createTitle, firstName, lastName
+  month, year, saving, saveChanges, searchInterests
+  deleteProfile, deleteConfirm, requiredFieldsError
+  saveError, deleteError
+
+interests
+  science, math, music, art, sports, technology, language, other
+```
+
+---
+
+## How Language Persistence Works
+
+1. On app startup, `_layout.tsx` reads the saved language code from `AsyncStorage` (`'lng'` key) and calls `i18n.changeLanguage()` before rendering.
+2. When the user selects a language in the language screen, `language.tsx` calls `i18n.changeLanguage()`, writes the code to `AsyncStorage`, invalidates the React Query cache (forcing API data to refetch with the new `Accept-Language` header), and updates the guardian's `language_preference` via the backend API.
+3. `i18n/index.ts` listens to the `languageChanged` event and also persists the value to `AsyncStorage` as a safety net.
+
+---
+
+## How API Translations Work
+
+Every API request passes an `Accept-Language` header set from `i18n.language` in `customInstance` (`api-client/src/apiClient.ts`). The backend uses this header to return translated content where supported.
diff --git a/frontend/apps/mobile/metro.config.js b/frontend/apps/mobile/metro.config.js
index b0963fe7..db8f73f7 100644
--- a/frontend/apps/mobile/metro.config.js
+++ b/frontend/apps/mobile/metro.config.js
@@ -1,6 +1,12 @@
 const { getDefaultConfig } = require("expo/metro-config");
 const { withNativeWind } = require("nativewind/metro");
+const path = require("path");
 
-const config = getDefaultConfig(__dirname);
+const projectRoot = __dirname;
+const monorepoRoot = path.resolve(projectRoot, "../..");
+
+const config = getDefaultConfig(projectRoot);
+
+config.watchFolders = [monorepoRoot];
 
 module.exports = withNativeWind(config, { input: "./global.css" });
diff --git a/frontend/apps/mobile/package.json b/frontend/apps/mobile/package.json
index 72b6723c..3bd78108 100644
--- a/frontend/apps/mobile/package.json
+++ b/frontend/apps/mobile/package.json
@@ -11,6 +11,7 @@
   "dependencies": {
     "@expo-google-fonts/nunito-sans": "^0.4.2",
     "@expo/vector-icons": "^15.0.3",
+    "@react-native-async-storage/async-storage": "1.23.1",
     "@react-navigation/bottom-tabs": "^7.4.0",
     "@react-navigation/elements": "^2.6.3",
     "@react-navigation/native": "^7.1.8",
@@ -35,7 +36,8 @@
     "react": "19.1.0",
     "react-compiler-runtime": "^1.0.0",
     "react-dom": "19.1.0",
-    "react-hook-form": "^7.71.2",
+    "react-hook-form": "^7.72.0",
+    "react-i18next": "15.5.2",
     "react-native": "0.81.5",
     "react-native-css-interop": "0.2.1",
     "react-native-gesture-handler": "~2.28.0",
diff --git a/frontend/apps/mobile/utils/format.ts b/frontend/apps/mobile/utils/format.ts
index d8dc238e..abe953e3 100644
--- a/frontend/apps/mobile/utils/format.ts
+++ b/frontend/apps/mobile/utils/format.ts
@@ -1,6 +1,12 @@
-export function formatDuration(start: string, end: string) {
+export function formatDuration(
+  start: string,
+  end: string,
+  labels: { hr: string; min: string } = { hr: 'hr', min: 'min' }
+) {
   const mins = Math.round(
     (new Date(end).getTime() - new Date(start).getTime()) / 60000
   );
-  return mins >= 60 ? `${Math.round(mins / 60)} hr` : `${mins} min`;
+  return mins >= 60
+    ? `${Math.round(mins / 60)} ${labels.hr}`
+    : `${mins} ${labels.min}`;
 }
diff --git a/frontend/apps/web/package.json b/frontend/apps/web/package.json
index 641b21da..70c10077 100644
--- a/frontend/apps/web/package.json
+++ b/frontend/apps/web/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "bash ../../scripts/load-root-env.sh vite",
     "build": "bash ../../scripts/load-root-env.sh sh -c 'tsc -b && vite build'",
+    "build:docker": "tsc -b && vite build",
     "preview": "bash ../../scripts/load-root-env.sh vite preview",
     "type-check": "tsc --noEmit",
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
diff --git a/frontend/bun.lock b/frontend/bun.lock
index 0e0877a2..b24326d6 100644
--- a/frontend/bun.lock
+++ b/frontend/bun.lock
@@ -7,7 +7,11 @@
       "dependencies": {
         "@expo-google-fonts/archivo": "^0.4.2",
         "@expo-google-fonts/nunito-sans": "^0.4.2",
+        "@react-native-async-storage/async-storage": "^3.0.1",
         "expo-font": "^14.0.11",
+        "expo-secure-store": "^55.0.9",
+        "i18next": "^25.8.18",
+        "react-i18next": "^16.5.8",
         "react-native-maps": "^1.27.1",
       },
     },
@@ -17,6 +21,7 @@
       "dependencies": {
         "@expo-google-fonts/nunito-sans": "^0.4.2",
         "@expo/vector-icons": "^15.0.3",
+        "@react-native-async-storage/async-storage": "1.23.1",
         "@react-navigation/bottom-tabs": "^7.4.0",
         "@react-navigation/elements": "^2.6.3",
         "@react-navigation/native": "^7.1.8",
@@ -41,7 +46,8 @@
         "react": "19.1.0",
         "react-compiler-runtime": "^1.0.0",
         "react-dom": "19.1.0",
-        "react-hook-form": "^7.71.2",
+        "react-hook-form": "^7.72.0",
+        "react-i18next": "15.5.2",
         "react-native": "0.81.5",
         "react-native-css-interop": "0.2.1",
         "react-native-gesture-handler": "~2.28.0",
@@ -583,6 +589,8 @@
 
     "@radix-ui/react-use-layout-effect": ["@radix-ui/react-use-layout-effect@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ=="],
 
+    "@react-native-async-storage/async-storage": ["@react-native-async-storage/async-storage@3.0.1", "", { "dependencies": { "idb": "8.0.3" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-VHwHb19sMg4Xh3W5M6YmJ/HSm1uh8RYFa6Dozm9o/jVYTYUgz2BmDXqXF7sum3glQaR34/hlwVc94px1sSdC2A=="],
+
     "@react-native-picker/picker": ["@react-native-picker/picker@2.11.4", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-Kf8h1AMnBo54b1fdiVylP2P/iFcZqzpMYcglC28EEFB1DEnOjsNr6Ucqc+3R9e91vHxEDnhZFbYDmAe79P2gjA=="],
 
     "@react-native/assets-registry": ["@react-native/assets-registry@0.81.5", "", {}, "sha512-705B6x/5Kxm1RKRvSv0ADYWm5JOnoiQ1ufW7h8uu2E6G9Of/eE6hP/Ivw3U5jI16ERqZxiKQwk34VJbB0niX9w=="],
@@ -755,7 +763,7 @@
 
     "@types/babel__traverse": ["@types/babel__traverse@7.28.0", "", { "dependencies": { "@babel/types": "^7.28.2" } }, "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q=="],
 
-    "@types/bun": ["@types/bun@1.3.10", "", { "dependencies": { "bun-types": "1.3.10" } }, "sha512-0+rlrUrOrTSskibryHbvQkDOWRJwJZqZlxrUs1u4oOoTln8+WIXBPmAuCF35SWB2z4Zl3E84Nl/D0P7803nigQ=="],
+    "@types/bun": ["@types/bun@1.3.11", "", { "dependencies": { "bun-types": "1.3.11" } }, "sha512-5vPne5QvtpjGpsGYXiFyycfpDF2ECyPcTSsFBMa0fraoxiQyMJ3SmuQIGhzPg2WJuWxVBoxWJ2kClYTcw/4fAg=="],
 
     "@types/cacheable-request": ["@types/cacheable-request@6.0.3", "", { "dependencies": { "@types/http-cache-semantics": "*", "@types/keyv": "^3.1.4", "@types/node": "*", "@types/responselike": "^1.0.0" } }, "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="],
 
@@ -991,7 +999,7 @@
 
     "buffer-from": ["buffer-from@1.1.2", "", {}, "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="],
 
-    "bun-types": ["bun-types@1.3.10", "", { "dependencies": { "@types/node": "*" } }, "sha512-tcpfCCl6XWo6nCVnpcVrxQ+9AYN1iqMIzgrSKYMB/fjLtV2eyAVEg7AxQJuCq/26R6HpKWykQXuSOq/21RYcbg=="],
+    "bun-types": ["bun-types@1.3.11", "", { "dependencies": { "@types/node": "*" } }, "sha512-1KGPpoxQWl9f6wcZh57LvrPIInQMn2TQ7jsgxqpRzg+l0QPOFvJVH7HmvHo/AiPgwXy+/Thf6Ov3EdVn1vOabg=="],
 
     "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="],
 
@@ -1259,7 +1267,7 @@
 
     "expo-router": ["expo-router@6.0.23", "", { "dependencies": { "@expo/metro-runtime": "^6.1.2", "@expo/schema-utils": "^0.1.8", "@radix-ui/react-slot": "1.2.0", "@radix-ui/react-tabs": "^1.1.12", "@react-navigation/bottom-tabs": "^7.4.0", "@react-navigation/native": "^7.1.8", "@react-navigation/native-stack": "^7.3.16", "client-only": "^0.0.1", "debug": "^4.3.4", "escape-string-regexp": "^4.0.0", "expo-server": "^1.0.5", "fast-deep-equal": "^3.1.3", "invariant": "^2.2.4", "nanoid": "^3.3.8", "query-string": "^7.1.3", "react-fast-compare": "^3.2.2", "react-native-is-edge-to-edge": "^1.1.6", "semver": "~7.6.3", "server-only": "^0.0.1", "sf-symbols-typescript": "^2.1.0", "shallowequal": "^1.1.0", "use-latest-callback": "^0.2.1", "vaul": "^1.1.2" }, "peerDependencies": { "@react-navigation/drawer": "^7.5.0", "@testing-library/react-native": ">= 12.0.0", "expo": "*", "expo-constants": "^18.0.13", "expo-linking": "^8.0.11", "react": "*", "react-dom": "*", "react-native": "*", "react-native-gesture-handler": "*", "react-native-reanimated": "*", "react-native-safe-area-context": ">= 5.4.0", "react-native-screens": "*", "react-native-web": "*", "react-server-dom-webpack": "~19.0.4 || ~19.1.5 || ~19.2.4" }, "optionalPeers": ["@react-navigation/drawer", "@testing-library/react-native", "react-dom", "react-native-gesture-handler", "react-native-reanimated", "react-native-web", "react-server-dom-webpack"] }, "sha512-qCxVAiCrCyu0npky6azEZ6dJDMt77OmCzEbpF6RbUTlfkaCA417LvY14SBkk0xyGruSxy/7pvJOI6tuThaUVCA=="],
 
-    "expo-secure-store": ["expo-secure-store@55.0.8", "", { "peerDependencies": { "expo": "*" } }, "sha512-8w9tQe8U6oRo5YIzqCqVhRrOnfoODNDoitBtLXEx+zS6WLUnkRq5kH7ViJuOgiM7PzLr9pvAliRiDOKyvFbTuQ=="],
+    "expo-secure-store": ["expo-secure-store@55.0.9", "", { "peerDependencies": { "expo": "*" } }, "sha512-TIPGjM73LKlebpXwgAu/yL7lNWr6RQYmFw3vgYHOqLFYQMpsBqkQmopovbNX3c/0+RCE9KZlLAkcz8r6detILQ=="],
 
     "expo-server": ["expo-server@1.0.5", "", {}, "sha512-IGR++flYH70rhLyeXF0Phle56/k4cee87WeQ4mamS+MkVAVP+dDlOHf2nN06Z9Y2KhU0Gp1k+y61KkghF7HdhA=="],
 
@@ -1401,6 +1409,8 @@
 
     "hosted-git-info": ["hosted-git-info@7.0.2", "", { "dependencies": { "lru-cache": "^10.0.1" } }, "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w=="],
 
+    "html-parse-stringify": ["html-parse-stringify@3.0.1", "", { "dependencies": { "void-elements": "3.1.0" } }, "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg=="],
+
     "http-cache-semantics": ["http-cache-semantics@4.2.0", "", {}, "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ=="],
 
     "http-errors": ["http-errors@2.0.1", "", { "dependencies": { "depd": "~2.0.0", "inherits": "~2.0.4", "setprototypeof": "~1.2.0", "statuses": "~2.0.2", "toidentifier": "~1.0.1" } }, "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ=="],
@@ -1413,6 +1423,10 @@
 
     "hyphenate-style-name": ["hyphenate-style-name@1.1.0", "", {}, "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw=="],
 
+    "i18next": ["i18next@25.8.18", "", { "dependencies": { "@babel/runtime": "^7.28.6" }, "peerDependencies": { "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-lzY5X83BiL5AP77+9DydbrqkQHFN9hUzWGjqjLpPcp5ZOzuu1aSoKaU3xbBLSjWx9dAzW431y+d+aogxOZaKRA=="],
+
+    "idb": ["idb@8.0.3", "", {}, "sha512-LtwtVyVYO5BqRvcsKuB2iUMnHwPVByPCXFXOpuU96IZPPoPN6xjOGxZQ74pgSVVLQWtUOYgyeL4GE98BY5D3wg=="],
+
     "ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],
 
     "ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
@@ -1641,6 +1655,8 @@
 
     "memoize-one": ["memoize-one@5.2.1", "", {}, "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="],
 
+    "merge-options": ["merge-options@3.0.4", "", { "dependencies": { "is-plain-obj": "^2.1.0" } }, "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ=="],
+
     "merge-stream": ["merge-stream@2.0.0", "", {}, "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="],
 
     "merge2": ["merge2@1.4.1", "", {}, "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="],
@@ -1879,7 +1895,9 @@
 
     "react-freeze": ["react-freeze@1.0.4", "", { "peerDependencies": { "react": ">=17.0.0" } }, "sha512-r4F0Sec0BLxWicc7HEyo2x3/2icUTrRmDjaaRyzzn+7aDyFZliszMDOgLVwSnQnYENOlL1o569Ze2HZefk8clA=="],
 
-    "react-hook-form": ["react-hook-form@7.71.2", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-1CHvcDYzuRUNOflt4MOq3ZM46AronNJtQ1S7tnX6YN4y72qhgiUItpacZUAQ0TyWYci3yz1X+rXaSxiuEm86PA=="],
+    "react-hook-form": ["react-hook-form@7.72.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-V4v6jubaf6JAurEaVnT9aUPKFbNtDgohj5CIgVGyPHvT9wRx5OZHVjz31GsxnPNI278XMu+ruFz+wGOscHaLKw=="],
+
+    "react-i18next": ["react-i18next@16.5.8", "", { "dependencies": { "@babel/runtime": "^7.28.4", "html-parse-stringify": "^3.0.1", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "i18next": ">= 25.6.2", "react": ">= 16.8.0", "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-2ABeHHlakxVY+LSirD+OiERxFL6+zip0PaHo979bgwzeHg27Sqc82xxXWIrSFmfWX0ZkrvXMHwhsi/NGUf5VQg=="],
 
     "react-is": ["react-is@19.2.4", "", {}, "sha512-W+EWGn2v0ApPKgKKCy/7s7WHXkboGcsrXE+2joLyVxkbyVQfO3MUEaUQDHoSmb8TFFrSKYa9mw64WZHNHSDzYA=="],
 
@@ -2219,6 +2237,8 @@
 
     "vlq": ["vlq@1.0.1", "", {}, "sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="],
 
+    "void-elements": ["void-elements@3.1.0", "", {}, "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="],
+
     "walker": ["walker@1.0.8", "", { "dependencies": { "makeerror": "1.0.12" } }, "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ=="],
 
     "warn-once": ["warn-once@0.1.1", "", {}, "sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q=="],
@@ -2513,6 +2533,8 @@
 
     "lru-cache/yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],
 
+    "merge-options/is-plain-obj": ["is-plain-obj@2.1.0", "", {}, "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="],
+
     "metro/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
 
     "metro/ci-info": ["ci-info@2.0.0", "", {}, "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="],
@@ -2573,6 +2595,12 @@
 
     "simple-plist/bplist-parser": ["bplist-parser@0.3.1", "", { "dependencies": { "big-integer": "1.6.x" } }, "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA=="],
 
+    "skillspark/@react-native-async-storage/async-storage": ["@react-native-async-storage/async-storage@1.23.1", "", { "dependencies": { "merge-options": "^3.0.4" }, "peerDependencies": { "react-native": "^0.0.0-0 || >=0.60 <1.0" } }, "sha512-Qd2kQ3yi6Y3+AcUlrHxSLlnBvpdCEMVGFlVBneVOjaFaPU61g1huc38g339ysXspwY1QZA2aNhrk/KlHGO+ewA=="],
+
+    "skillspark/expo-secure-store": ["expo-secure-store@55.0.8", "", { "peerDependencies": { "expo": "*" } }, "sha512-8w9tQe8U6oRo5YIzqCqVhRrOnfoODNDoitBtLXEx+zS6WLUnkRq5kH7ViJuOgiM7PzLr9pvAliRiDOKyvFbTuQ=="],
+
+    "skillspark/react-i18next": ["react-i18next@15.5.2", "", { "dependencies": { "@babel/runtime": "^7.25.0", "html-parse-stringify": "^3.0.1" }, "peerDependencies": { "i18next": ">= 23.2.3", "react": ">= 16.8.0", "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-ePODyXgmZQAOYTbZXQn5rRsSBu3Gszo69jxW6aKmlSgxKAI1fOhDwSu6bT4EKHciWPKQ7v7lPrjeiadR6Gi+1A=="],
+
     "skillspark/react-native-maps": ["react-native-maps@1.20.1", "", { "dependencies": { "@types/geojson": "^7946.0.13" }, "peerDependencies": { "react": ">= 17.0.1", "react-native": ">= 0.64.3", "react-native-web": ">= 0.11" }, "optionalPeers": ["react-native-web"] }, "sha512-NZI3B5Z6kxAb8gzb2Wxzu/+P2SlFIg1waHGIpQmazDSCRkNoHNY4g96g+xS0QPSaG/9xRBbDNnd2f2/OW6t6LQ=="],
 
     "source-map-support/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="],
diff --git a/frontend/package.json b/frontend/package.json
index e4bfc2c7..59db0072 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,7 +13,11 @@
   "dependencies": {
     "@expo-google-fonts/archivo": "^0.4.2",
     "@expo-google-fonts/nunito-sans": "^0.4.2",
+    "@react-native-async-storage/async-storage": "^3.0.1",
     "expo-font": "^14.0.11",
+    "expo-secure-store": "^55.0.9",
+    "i18next": "^25.8.18",
+    "react-i18next": "^16.5.8",
     "react-native-maps": "^1.27.1"
   }
 }
diff --git a/frontend/packages/api-client/src/apiClient.ts b/frontend/packages/api-client/src/apiClient.ts
index 5790f470..7bd41c41 100644
--- a/frontend/packages/api-client/src/apiClient.ts
+++ b/frontend/packages/api-client/src/apiClient.ts
@@ -3,11 +3,18 @@ import axios, {
   AxiosResponse,
   InternalAxiosRequestConfig,
 } from 'axios';
+export let currentLanguage = 'en';
+export function setCurrentLanguage(lang: string) {
+  currentLanguage = lang;
+}
 
 interface CustomAxiosRequestConfig extends InternalAxiosRequestConfig {
   _retry?: boolean;
 }
 
+
+
+
 // Platform-agnostic storage helper
 const getStorageItem = (key: string): string | null => {
   if (typeof window !== 'undefined' && window.localStorage) {
@@ -34,7 +41,7 @@ const getBaseURL = () => {
       return process.env.NEXT_PUBLIC_API_BASE_URL;
     }
   }
-  
+
   return 'http://localhost:8080';
 };
 
@@ -50,6 +57,7 @@ const apiClient = axios.create({
   withCredentials: true,
 });
 
+
 apiClient.interceptors.request.use(
   (config) => {
     const token = getStorageItem('temp_jwt') || getStorageItem('jwt');
@@ -130,15 +138,17 @@ export async function customInstance<T>(
 ): Promise<T> {
   const baseURL = getBaseURL();
   const fullUrl = `${baseURL}${url}`;
+
+  const languageHeader = currentLanguage === 'th' ? 'th-TH' : 'en-US';
+
   // Get token for auth
   const token = getStorageItem('temp_jwt') || getStorageItem('jwt');
-  
   const response = await fetch(fullUrl, {
     ...options,
     credentials: 'include',
     headers: {
       'Content-Type': 'application/json',
-      'Accept-Language': 'en-US',
+      'Accept-Language': languageHeader,
       ...(token ? { Authorization: `Bearer ${token}` } : {}),
       ...options?.headers,
     },
diff --git a/frontend/packages/api-client/src/generated/auth/auth.ts b/frontend/packages/api-client/src/generated/auth/auth.ts
index 847720c2..c2121e4b 100644
--- a/frontend/packages/api-client/src/generated/auth/auth.ts
+++ b/frontend/packages/api-client/src/generated/auth/auth.ts
@@ -5,13 +5,15 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation } from "@tanstack/react-query";
+import {
+  useMutation
+} from '@tanstack/react-query';
 import type {
   MutationFunction,
   QueryClient,
   UseMutationOptions,
-  UseMutationResult,
-} from "@tanstack/react-query";
+  UseMutationResult
+} from '@tanstack/react-query';
 
 import type {
   ErrorModel,
@@ -21,508 +23,409 @@ import type {
   LoginInputBody,
   ManagerLoginOutputBody,
   ManagerSignUpInputBody,
-  ManagerSignUpOutputBody,
-} from "../skillSparkAPI.schemas";
+  ManagerSignUpOutputBody
+} from '../skillSparkAPI.schemas';
 
-import { customInstance } from "../../apiClient";
+import { customInstance } from '../../apiClient';
 
 // https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> =
-  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
 
 type WritableKeys<T> = {
-  [P in keyof T]-?: IfEquals<
-    { [Q in P]: T[P] },
-    { -readonly [Q in P]: T[P] },
-    P
-  >;
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
 }[keyof T];
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
-) => void
-  ? I
-  : never;
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
 type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
 
 type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>]
-  ? {
-      [P in keyof Writable<T>]: T[P] extends object
-        ? NonReadonly<NonNullable<T[P]>>
-        : T[P];
-    }
-  : DistributeReadOnlyOverUnions<T>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Logs in a guardian
  * @summary Login a guardian
  */
 export type loginGuardianResponse200 = {
-  data: GuardianLoginOutputBody;
-  status: 200;
-};
+  data: GuardianLoginOutputBody
+  status: 200
+}
 
 export type loginGuardianResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type loginGuardianResponseSuccess = loginGuardianResponse200 & {
+export type loginGuardianResponseSuccess = (loginGuardianResponse200) & {
   headers: Headers;
 };
-export type loginGuardianResponseError = loginGuardianResponseDefault & {
+export type loginGuardianResponseError = (loginGuardianResponseDefault) & {
   headers: Headers;
 };
 
-export type loginGuardianResponse =
-  | loginGuardianResponseSuccess
-  | loginGuardianResponseError;
+export type loginGuardianResponse = (loginGuardianResponseSuccess | loginGuardianResponseError)
 
 export const getLoginGuardianUrl = () => {
-  return `/api/v1/auth/login/guardian`;
-};
 
-export const loginGuardian = async (
-  loginInputBody: NonReadonly<LoginInputBody>,
-  options?: RequestInit,
-): Promise<loginGuardianResponse> => {
-  return customInstance<loginGuardianResponse>(getLoginGuardianUrl(), {
+
+  
+
+  return `/api/v1/auth/login/guardian`
+}
+
+export const loginGuardian = async (loginInputBody: NonReadonly<LoginInputBody>, options?: RequestInit): Promise<loginGuardianResponse> => {
+  
+  return customInstance<loginGuardianResponse>(getLoginGuardianUrl(),
+  {      
     ...options,
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(loginInputBody),
-  });
-};
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      loginInputBody,)
+  }
+);}
 
-export const getLoginGuardianMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof loginGuardian>>,
-    TError,
-    { data: NonReadonly<LoginInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof loginGuardian>>,
-  TError,
-  { data: NonReadonly<LoginInputBody> },
-  TContext
-> => {
-  const mutationKey = ["loginGuardian"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof loginGuardian>>,
-    { data: NonReadonly<LoginInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return loginGuardian(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type LoginGuardianMutationResult = NonNullable<
-  Awaited<ReturnType<typeof loginGuardian>>
->;
-export type LoginGuardianMutationBody = NonReadonly<LoginInputBody>;
-export type LoginGuardianMutationError = ErrorModel;
 
-/**
+
+export const getLoginGuardianMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof loginGuardian>>, TError,{data: NonReadonly<LoginInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof loginGuardian>>, TError,{data: NonReadonly<LoginInputBody>}, TContext> => {
+
+const mutationKey = ['loginGuardian'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof loginGuardian>>, {data: NonReadonly<LoginInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  loginGuardian(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type LoginGuardianMutationResult = NonNullable<Awaited<ReturnType<typeof loginGuardian>>>
+    export type LoginGuardianMutationBody = NonReadonly<LoginInputBody>
+    export type LoginGuardianMutationError = ErrorModel
+
+    /**
  * @summary Login a guardian
  */
-export const useLoginGuardian = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof loginGuardian>>,
-      TError,
-      { data: NonReadonly<LoginInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof loginGuardian>>,
-  TError,
-  { data: NonReadonly<LoginInputBody> },
-  TContext
-> => {
-  return useMutation(getLoginGuardianMutationOptions(options), queryClient);
-};
-/**
+export const useLoginGuardian = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof loginGuardian>>, TError,{data: NonReadonly<LoginInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof loginGuardian>>,
+        TError,
+        {data: NonReadonly<LoginInputBody>},
+        TContext
+      > => {
+      return useMutation(getLoginGuardianMutationOptions(options), queryClient);
+    }
+    /**
  * Logs in a manager
  * @summary Login a manager
  */
 export type loginManagerResponse200 = {
-  data: ManagerLoginOutputBody;
-  status: 200;
-};
+  data: ManagerLoginOutputBody
+  status: 200
+}
 
 export type loginManagerResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type loginManagerResponseSuccess = loginManagerResponse200 & {
+export type loginManagerResponseSuccess = (loginManagerResponse200) & {
   headers: Headers;
 };
-export type loginManagerResponseError = loginManagerResponseDefault & {
+export type loginManagerResponseError = (loginManagerResponseDefault) & {
   headers: Headers;
 };
 
-export type loginManagerResponse =
-  | loginManagerResponseSuccess
-  | loginManagerResponseError;
+export type loginManagerResponse = (loginManagerResponseSuccess | loginManagerResponseError)
 
 export const getLoginManagerUrl = () => {
-  return `/api/v1/auth/login/manager`;
-};
 
-export const loginManager = async (
-  loginInputBody: NonReadonly<LoginInputBody>,
-  options?: RequestInit,
-): Promise<loginManagerResponse> => {
-  return customInstance<loginManagerResponse>(getLoginManagerUrl(), {
+
+  
+
+  return `/api/v1/auth/login/manager`
+}
+
+export const loginManager = async (loginInputBody: NonReadonly<LoginInputBody>, options?: RequestInit): Promise<loginManagerResponse> => {
+  
+  return customInstance<loginManagerResponse>(getLoginManagerUrl(),
+  {      
     ...options,
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(loginInputBody),
-  });
-};
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      loginInputBody,)
+  }
+);}
 
-export const getLoginManagerMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof loginManager>>,
-    TError,
-    { data: NonReadonly<LoginInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof loginManager>>,
-  TError,
-  { data: NonReadonly<LoginInputBody> },
-  TContext
-> => {
-  const mutationKey = ["loginManager"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof loginManager>>,
-    { data: NonReadonly<LoginInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return loginManager(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type LoginManagerMutationResult = NonNullable<
-  Awaited<ReturnType<typeof loginManager>>
->;
-export type LoginManagerMutationBody = NonReadonly<LoginInputBody>;
-export type LoginManagerMutationError = ErrorModel;
 
-/**
+
+export const getLoginManagerMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof loginManager>>, TError,{data: NonReadonly<LoginInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof loginManager>>, TError,{data: NonReadonly<LoginInputBody>}, TContext> => {
+
+const mutationKey = ['loginManager'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof loginManager>>, {data: NonReadonly<LoginInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  loginManager(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type LoginManagerMutationResult = NonNullable<Awaited<ReturnType<typeof loginManager>>>
+    export type LoginManagerMutationBody = NonReadonly<LoginInputBody>
+    export type LoginManagerMutationError = ErrorModel
+
+    /**
  * @summary Login a manager
  */
-export const useLoginManager = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof loginManager>>,
-      TError,
-      { data: NonReadonly<LoginInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof loginManager>>,
-  TError,
-  { data: NonReadonly<LoginInputBody> },
-  TContext
-> => {
-  return useMutation(getLoginManagerMutationOptions(options), queryClient);
-};
-/**
+export const useLoginManager = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof loginManager>>, TError,{data: NonReadonly<LoginInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof loginManager>>,
+        TError,
+        {data: NonReadonly<LoginInputBody>},
+        TContext
+      > => {
+      return useMutation(getLoginManagerMutationOptions(options), queryClient);
+    }
+    /**
  * Registers a guardian
  * @summary Register a guardian
  */
 export type signupGuardianResponse200 = {
-  data: GuardianSignUpOutputBody;
-  status: 200;
-};
+  data: GuardianSignUpOutputBody
+  status: 200
+}
 
 export type signupGuardianResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type signupGuardianResponseSuccess = signupGuardianResponse200 & {
+export type signupGuardianResponseSuccess = (signupGuardianResponse200) & {
   headers: Headers;
 };
-export type signupGuardianResponseError = signupGuardianResponseDefault & {
+export type signupGuardianResponseError = (signupGuardianResponseDefault) & {
   headers: Headers;
 };
 
-export type signupGuardianResponse =
-  | signupGuardianResponseSuccess
-  | signupGuardianResponseError;
+export type signupGuardianResponse = (signupGuardianResponseSuccess | signupGuardianResponseError)
 
 export const getSignupGuardianUrl = () => {
-  return `/api/v1/auth/signup/guardian`;
-};
 
-export const signupGuardian = async (
-  guardianSignUpInputBody: NonReadonly<GuardianSignUpInputBody>,
-  options?: RequestInit,
-): Promise<signupGuardianResponse> => {
-  return customInstance<signupGuardianResponse>(getSignupGuardianUrl(), {
+
+  
+
+  return `/api/v1/auth/signup/guardian`
+}
+
+export const signupGuardian = async (guardianSignUpInputBody: NonReadonly<GuardianSignUpInputBody>, options?: RequestInit): Promise<signupGuardianResponse> => {
+  
+  return customInstance<signupGuardianResponse>(getSignupGuardianUrl(),
+  {      
     ...options,
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(guardianSignUpInputBody),
-  });
-};
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      guardianSignUpInputBody,)
+  }
+);}
 
-export const getSignupGuardianMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof signupGuardian>>,
-    TError,
-    { data: NonReadonly<GuardianSignUpInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof signupGuardian>>,
-  TError,
-  { data: NonReadonly<GuardianSignUpInputBody> },
-  TContext
-> => {
-  const mutationKey = ["signupGuardian"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof signupGuardian>>,
-    { data: NonReadonly<GuardianSignUpInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return signupGuardian(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type SignupGuardianMutationResult = NonNullable<
-  Awaited<ReturnType<typeof signupGuardian>>
->;
-export type SignupGuardianMutationBody = NonReadonly<GuardianSignUpInputBody>;
-export type SignupGuardianMutationError = ErrorModel;
 
-/**
+
+export const getSignupGuardianMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof signupGuardian>>, TError,{data: NonReadonly<GuardianSignUpInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof signupGuardian>>, TError,{data: NonReadonly<GuardianSignUpInputBody>}, TContext> => {
+
+const mutationKey = ['signupGuardian'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof signupGuardian>>, {data: NonReadonly<GuardianSignUpInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  signupGuardian(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type SignupGuardianMutationResult = NonNullable<Awaited<ReturnType<typeof signupGuardian>>>
+    export type SignupGuardianMutationBody = NonReadonly<GuardianSignUpInputBody>
+    export type SignupGuardianMutationError = ErrorModel
+
+    /**
  * @summary Register a guardian
  */
-export const useSignupGuardian = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof signupGuardian>>,
-      TError,
-      { data: NonReadonly<GuardianSignUpInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof signupGuardian>>,
-  TError,
-  { data: NonReadonly<GuardianSignUpInputBody> },
-  TContext
-> => {
-  return useMutation(getSignupGuardianMutationOptions(options), queryClient);
-};
-/**
+export const useSignupGuardian = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof signupGuardian>>, TError,{data: NonReadonly<GuardianSignUpInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof signupGuardian>>,
+        TError,
+        {data: NonReadonly<GuardianSignUpInputBody>},
+        TContext
+      > => {
+      return useMutation(getSignupGuardianMutationOptions(options), queryClient);
+    }
+    /**
  * Registers a manager
  * @summary Register a manager
  */
 export type signupManagerResponse200 = {
-  data: ManagerSignUpOutputBody;
-  status: 200;
-};
+  data: ManagerSignUpOutputBody
+  status: 200
+}
 
 export type signupManagerResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type signupManagerResponseSuccess = signupManagerResponse200 & {
+export type signupManagerResponseSuccess = (signupManagerResponse200) & {
   headers: Headers;
 };
-export type signupManagerResponseError = signupManagerResponseDefault & {
+export type signupManagerResponseError = (signupManagerResponseDefault) & {
   headers: Headers;
 };
 
-export type signupManagerResponse =
-  | signupManagerResponseSuccess
-  | signupManagerResponseError;
+export type signupManagerResponse = (signupManagerResponseSuccess | signupManagerResponseError)
 
 export const getSignupManagerUrl = () => {
-  return `/api/v1/auth/signup/manager`;
-};
 
-export const signupManager = async (
-  managerSignUpInputBody: NonReadonly<ManagerSignUpInputBody>,
-  options?: RequestInit,
-): Promise<signupManagerResponse> => {
-  return customInstance<signupManagerResponse>(getSignupManagerUrl(), {
+
+  
+
+  return `/api/v1/auth/signup/manager`
+}
+
+export const signupManager = async (managerSignUpInputBody: NonReadonly<ManagerSignUpInputBody>, options?: RequestInit): Promise<signupManagerResponse> => {
+  
+  return customInstance<signupManagerResponse>(getSignupManagerUrl(),
+  {      
     ...options,
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(managerSignUpInputBody),
-  });
-};
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      managerSignUpInputBody,)
+  }
+);}
 
-export const getSignupManagerMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof signupManager>>,
-    TError,
-    { data: NonReadonly<ManagerSignUpInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof signupManager>>,
-  TError,
-  { data: NonReadonly<ManagerSignUpInputBody> },
-  TContext
-> => {
-  const mutationKey = ["signupManager"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof signupManager>>,
-    { data: NonReadonly<ManagerSignUpInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return signupManager(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type SignupManagerMutationResult = NonNullable<
-  Awaited<ReturnType<typeof signupManager>>
->;
-export type SignupManagerMutationBody = NonReadonly<ManagerSignUpInputBody>;
-export type SignupManagerMutationError = ErrorModel;
 
-/**
+
+export const getSignupManagerMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof signupManager>>, TError,{data: NonReadonly<ManagerSignUpInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof signupManager>>, TError,{data: NonReadonly<ManagerSignUpInputBody>}, TContext> => {
+
+const mutationKey = ['signupManager'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof signupManager>>, {data: NonReadonly<ManagerSignUpInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  signupManager(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type SignupManagerMutationResult = NonNullable<Awaited<ReturnType<typeof signupManager>>>
+    export type SignupManagerMutationBody = NonReadonly<ManagerSignUpInputBody>
+    export type SignupManagerMutationError = ErrorModel
+
+    /**
  * @summary Register a manager
  */
-export const useSignupManager = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof signupManager>>,
-      TError,
-      { data: NonReadonly<ManagerSignUpInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof signupManager>>,
-  TError,
-  { data: NonReadonly<ManagerSignUpInputBody> },
-  TContext
-> => {
-  return useMutation(getSignupManagerMutationOptions(options), queryClient);
-};
+export const useSignupManager = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof signupManager>>, TError,{data: NonReadonly<ManagerSignUpInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof signupManager>>,
+        TError,
+        {data: NonReadonly<ManagerSignUpInputBody>},
+        TContext
+      > => {
+      return useMutation(getSignupManagerMutationOptions(options), queryClient);
+    }
+    
\ No newline at end of file
diff --git a/frontend/packages/api-client/src/generated/child/child.ts b/frontend/packages/api-client/src/generated/child/child.ts
index 092f3fa8..8873e5ef 100644
--- a/frontend/packages/api-client/src/generated/child/child.ts
+++ b/frontend/packages/api-client/src/generated/child/child.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,773 +21,561 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   Child,
   CreateChildInputBody,
   ErrorModel,
-  UpdateChildInputBody,
-} from "../skillSparkAPI.schemas";
+  UpdateChildInputBody
+} from '../skillSparkAPI.schemas';
 
-import { customInstance } from "../../apiClient";
+import { customInstance } from '../../apiClient';
 
 // https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> =
-  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
 
 type WritableKeys<T> = {
-  [P in keyof T]-?: IfEquals<
-    { [Q in P]: T[P] },
-    { -readonly [Q in P]: T[P] },
-    P
-  >;
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
 }[keyof T];
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
-) => void
-  ? I
-  : never;
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
 type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
 
 type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>]
-  ? {
-      [P in keyof Writable<T>]: T[P] extends object
-        ? NonReadonly<NonNullable<T[P]>>
-        : T[P];
-    }
-  : DistributeReadOnlyOverUnions<T>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Creates a child
  * @summary Creates a child
  */
 export type createChildResponse200 = {
-  data: Child;
-  status: 200;
-};
+  data: Child
+  status: 200
+}
 
 export type createChildResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createChildResponseSuccess = createChildResponse200 & {
+export type createChildResponseSuccess = (createChildResponse200) & {
   headers: Headers;
 };
-export type createChildResponseError = createChildResponseDefault & {
+export type createChildResponseError = (createChildResponseDefault) & {
   headers: Headers;
 };
 
-export type createChildResponse =
-  | createChildResponseSuccess
-  | createChildResponseError;
+export type createChildResponse = (createChildResponseSuccess | createChildResponseError)
 
 export const getCreateChildUrl = () => {
-  return `/api/v1/child`;
-};
 
-export const createChild = async (
-  createChildInputBody: NonReadonly<CreateChildInputBody>,
-  options?: RequestInit,
-): Promise<createChildResponse> => {
-  return customInstance<createChildResponse>(getCreateChildUrl(), {
+
+  
+
+  return `/api/v1/child`
+}
+
+export const createChild = async (createChildInputBody: NonReadonly<CreateChildInputBody>, options?: RequestInit): Promise<createChildResponse> => {
+  
+  return customInstance<createChildResponse>(getCreateChildUrl(),
+  {      
     ...options,
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(createChildInputBody),
-  });
-};
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      createChildInputBody,)
+  }
+);}
 
-export const getCreateChildMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createChild>>,
-    TError,
-    { data: NonReadonly<CreateChildInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createChild>>,
-  TError,
-  { data: NonReadonly<CreateChildInputBody> },
-  TContext
-> => {
-  const mutationKey = ["createChild"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createChild>>,
-    { data: NonReadonly<CreateChildInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return createChild(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type CreateChildMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createChild>>
->;
-export type CreateChildMutationBody = NonReadonly<CreateChildInputBody>;
-export type CreateChildMutationError = ErrorModel;
 
-/**
+
+export const getCreateChildMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createChild>>, TError,{data: NonReadonly<CreateChildInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createChild>>, TError,{data: NonReadonly<CreateChildInputBody>}, TContext> => {
+
+const mutationKey = ['createChild'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createChild>>, {data: NonReadonly<CreateChildInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  createChild(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateChildMutationResult = NonNullable<Awaited<ReturnType<typeof createChild>>>
+    export type CreateChildMutationBody = NonReadonly<CreateChildInputBody>
+    export type CreateChildMutationError = ErrorModel
+
+    /**
  * @summary Creates a child
  */
-export const useCreateChild = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createChild>>,
-      TError,
-      { data: NonReadonly<CreateChildInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createChild>>,
-  TError,
-  { data: NonReadonly<CreateChildInputBody> },
-  TContext
-> => {
-  return useMutation(getCreateChildMutationOptions(options), queryClient);
-};
-/**
+export const useCreateChild = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createChild>>, TError,{data: NonReadonly<CreateChildInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createChild>>,
+        TError,
+        {data: NonReadonly<CreateChildInputBody>},
+        TContext
+      > => {
+      return useMutation(getCreateChildMutationOptions(options), queryClient);
+    }
+    /**
  * Returns a child by id
  * @summary Get a child by id
  */
 export type getChildByIdResponse200 = {
-  data: Child;
-  status: 200;
-};
+  data: Child
+  status: 200
+}
 
 export type getChildByIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getChildByIdResponseSuccess = getChildByIdResponse200 & {
+export type getChildByIdResponseSuccess = (getChildByIdResponse200) & {
   headers: Headers;
 };
-export type getChildByIdResponseError = getChildByIdResponseDefault & {
+export type getChildByIdResponseError = (getChildByIdResponseDefault) & {
   headers: Headers;
 };
 
-export type getChildByIdResponse =
-  | getChildByIdResponseSuccess
-  | getChildByIdResponseError;
+export type getChildByIdResponse = (getChildByIdResponseSuccess | getChildByIdResponseError)
 
-export const getGetChildByIdUrl = (id: string) => {
-  return `/api/v1/child/${id}`;
-};
+export const getGetChildByIdUrl = (id: string,) => {
+
+
+  
+
+  return `/api/v1/child/${id}`
+}
 
-export const getChildById = async (
-  id: string,
-  options?: RequestInit,
-): Promise<getChildByIdResponse> => {
-  return customInstance<getChildByIdResponse>(getGetChildByIdUrl(id), {
+export const getChildById = async (id: string, options?: RequestInit): Promise<getChildByIdResponse> => {
+  
+  return customInstance<getChildByIdResponse>(getGetChildByIdUrl(id),
+  {      
     ...options,
-    method: "GET",
-  });
-};
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
 
-export const getGetChildByIdQueryKey = (id: string) => {
-  return [`/api/v1/child/${id}`] as const;
-};
 
-export const getGetChildByIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getChildById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetChildByIdQueryKey = (id: string,) => {
+    return [
+    `/api/v1/child/${id}`
+    ] as const;
+    }
+
+    
+export const getGetChildByIdQueryOptions = <TData = Awaited<ReturnType<typeof getChildById>>, TError = ErrorModel>(id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getGetChildByIdQueryKey(id);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof getChildById>>> = ({
-    signal,
-  }) => getChildById(id, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getChildById>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetChildByIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getChildById>>
->;
-export type GetChildByIdQueryError = ErrorModel;
-
-export function useGetChildById<
-  TData = Awaited<ReturnType<typeof getChildById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData>
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetChildByIdQueryKey(id);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getChildById>>> = ({ signal }) => getChildById(id, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetChildByIdQueryResult = NonNullable<Awaited<ReturnType<typeof getChildById>>>
+export type GetChildByIdQueryError = ErrorModel
+
+
+export function useGetChildById<TData = Awaited<ReturnType<typeof getChildById>>, TError = ErrorModel>(
+ id: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getChildById>>,
           TError,
           Awaited<ReturnType<typeof getChildById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetChildById<
-  TData = Awaited<ReturnType<typeof getChildById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData>
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetChildById<TData = Awaited<ReturnType<typeof getChildById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getChildById>>,
           TError,
           Awaited<ReturnType<typeof getChildById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetChildById<
-  TData = Awaited<ReturnType<typeof getChildById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetChildById<TData = Awaited<ReturnType<typeof getChildById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get a child by id
  */
 
-export function useGetChildById<
-  TData = Awaited<ReturnType<typeof getChildById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetChildByIdQueryOptions(id, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetChildById<TData = Awaited<ReturnType<typeof getChildById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getChildById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetChildByIdQueryOptions(id,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Deletes a child by ID
  * @summary Delete a child
  */
 export type deleteChildResponse200 = {
-  data: Child;
-  status: 200;
-};
+  data: Child
+  status: 200
+}
 
 export type deleteChildResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type deleteChildResponseSuccess = deleteChildResponse200 & {
+export type deleteChildResponseSuccess = (deleteChildResponse200) & {
   headers: Headers;
 };
-export type deleteChildResponseError = deleteChildResponseDefault & {
+export type deleteChildResponseError = (deleteChildResponseDefault) & {
   headers: Headers;
 };
 
-export type deleteChildResponse =
-  | deleteChildResponseSuccess
-  | deleteChildResponseError;
+export type deleteChildResponse = (deleteChildResponseSuccess | deleteChildResponseError)
+
+export const getDeleteChildUrl = (id: string,) => {
 
-export const getDeleteChildUrl = (id: string) => {
-  return `/api/v1/child/${id}`;
-};
 
-export const deleteChild = async (
-  id: string,
-  options?: RequestInit,
-): Promise<deleteChildResponse> => {
-  return customInstance<deleteChildResponse>(getDeleteChildUrl(id), {
+  
+
+  return `/api/v1/child/${id}`
+}
+
+export const deleteChild = async (id: string, options?: RequestInit): Promise<deleteChildResponse> => {
+  
+  return customInstance<deleteChildResponse>(getDeleteChildUrl(id),
+  {      
     ...options,
-    method: "DELETE",
-  });
-};
+    method: 'DELETE'
+    
+    
+  }
+);}
 
-export const getDeleteChildMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteChild>>,
-    TError,
-    { id: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteChild>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  const mutationKey = ["deleteChild"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteChild>>,
-    { id: string }
-  > = (props) => {
-    const { id } = props ?? {};
-
-    return deleteChild(id, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type DeleteChildMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteChild>>
->;
 
-export type DeleteChildMutationError = ErrorModel;
 
-/**
+export const getDeleteChildMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteChild>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof deleteChild>>, TError,{id: string}, TContext> => {
+
+const mutationKey = ['deleteChild'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteChild>>, {id: string}> = (props) => {
+          const {id} = props ?? {};
+
+          return  deleteChild(id,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type DeleteChildMutationResult = NonNullable<Awaited<ReturnType<typeof deleteChild>>>
+    
+    export type DeleteChildMutationError = ErrorModel
+
+    /**
  * @summary Delete a child
  */
-export const useDeleteChild = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteChild>>,
-      TError,
-      { id: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteChild>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  return useMutation(getDeleteChildMutationOptions(options), queryClient);
-};
-/**
+export const useDeleteChild = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteChild>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof deleteChild>>,
+        TError,
+        {id: string},
+        TContext
+      > => {
+      return useMutation(getDeleteChildMutationOptions(options), queryClient);
+    }
+    /**
  * Updates a child by ID
  * @summary Updates a child
  */
 export type updateChildResponse200 = {
-  data: Child;
-  status: 200;
-};
+  data: Child
+  status: 200
+}
 
 export type updateChildResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type updateChildResponseSuccess = updateChildResponse200 & {
+export type updateChildResponseSuccess = (updateChildResponse200) & {
   headers: Headers;
 };
-export type updateChildResponseError = updateChildResponseDefault & {
+export type updateChildResponseError = (updateChildResponseDefault) & {
   headers: Headers;
 };
 
-export type updateChildResponse =
-  | updateChildResponseSuccess
-  | updateChildResponseError;
+export type updateChildResponse = (updateChildResponseSuccess | updateChildResponseError)
+
+export const getUpdateChildUrl = (id: string,) => {
 
-export const getUpdateChildUrl = (id: string) => {
-  return `/api/v1/child/${id}`;
-};
 
-export const updateChild = async (
-  id: string,
-  updateChildInputBody: NonReadonly<UpdateChildInputBody>,
-  options?: RequestInit,
-): Promise<updateChildResponse> => {
-  return customInstance<updateChildResponse>(getUpdateChildUrl(id), {
+  
+
+  return `/api/v1/child/${id}`
+}
+
+export const updateChild = async (id: string,
+    updateChildInputBody: NonReadonly<UpdateChildInputBody>, options?: RequestInit): Promise<updateChildResponse> => {
+  
+  return customInstance<updateChildResponse>(getUpdateChildUrl(id),
+  {      
     ...options,
-    method: "PATCH",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(updateChildInputBody),
-  });
-};
+    method: 'PATCH',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      updateChildInputBody,)
+  }
+);}
 
-export const getUpdateChildMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof updateChild>>,
-    TError,
-    { id: string; data: NonReadonly<UpdateChildInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof updateChild>>,
-  TError,
-  { id: string; data: NonReadonly<UpdateChildInputBody> },
-  TContext
-> => {
-  const mutationKey = ["updateChild"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof updateChild>>,
-    { id: string; data: NonReadonly<UpdateChildInputBody> }
-  > = (props) => {
-    const { id, data } = props ?? {};
-
-    return updateChild(id, data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type UpdateChildMutationResult = NonNullable<
-  Awaited<ReturnType<typeof updateChild>>
->;
-export type UpdateChildMutationBody = NonReadonly<UpdateChildInputBody>;
-export type UpdateChildMutationError = ErrorModel;
 
-/**
+
+export const getUpdateChildMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateChild>>, TError,{id: string;data: NonReadonly<UpdateChildInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof updateChild>>, TError,{id: string;data: NonReadonly<UpdateChildInputBody>}, TContext> => {
+
+const mutationKey = ['updateChild'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof updateChild>>, {id: string;data: NonReadonly<UpdateChildInputBody>}> = (props) => {
+          const {id,data} = props ?? {};
+
+          return  updateChild(id,data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type UpdateChildMutationResult = NonNullable<Awaited<ReturnType<typeof updateChild>>>
+    export type UpdateChildMutationBody = NonReadonly<UpdateChildInputBody>
+    export type UpdateChildMutationError = ErrorModel
+
+    /**
  * @summary Updates a child
  */
-export const useUpdateChild = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof updateChild>>,
-      TError,
-      { id: string; data: NonReadonly<UpdateChildInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof updateChild>>,
-  TError,
-  { id: string; data: NonReadonly<UpdateChildInputBody> },
-  TContext
-> => {
-  return useMutation(getUpdateChildMutationOptions(options), queryClient);
-};
-/**
+export const useUpdateChild = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateChild>>, TError,{id: string;data: NonReadonly<UpdateChildInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof updateChild>>,
+        TError,
+        {id: string;data: NonReadonly<UpdateChildInputBody>},
+        TContext
+      > => {
+      return useMutation(getUpdateChildMutationOptions(options), queryClient);
+    }
+    /**
  * Returns the list of children associated with a given guardian ID
  * @summary Get all children for a guardian
  */
 export type getChildrenByGuardianIdResponse200 = {
-  data: Child[];
-  status: 200;
-};
+  data: Child[]
+  status: 200
+}
 
 export type getChildrenByGuardianIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getChildrenByGuardianIdResponseSuccess =
-  getChildrenByGuardianIdResponse200 & {
-    headers: Headers;
-  };
-export type getChildrenByGuardianIdResponseError =
-  getChildrenByGuardianIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getChildrenByGuardianIdResponse =
-  | getChildrenByGuardianIdResponseSuccess
-  | getChildrenByGuardianIdResponseError;
-
-export const getGetChildrenByGuardianIdUrl = (id: string) => {
-  return `/api/v1/children/${id}`;
+export type getChildrenByGuardianIdResponseSuccess = (getChildrenByGuardianIdResponse200) & {
+  headers: Headers;
 };
-
-export const getChildrenByGuardianId = async (
-  id: string,
-  options?: RequestInit,
-): Promise<getChildrenByGuardianIdResponse> => {
-  return customInstance<getChildrenByGuardianIdResponse>(
-    getGetChildrenByGuardianIdUrl(id),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getChildrenByGuardianIdResponseError = (getChildrenByGuardianIdResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetChildrenByGuardianIdQueryKey = (id: string) => {
-  return [`/api/v1/children/${id}`] as const;
-};
+export type getChildrenByGuardianIdResponse = (getChildrenByGuardianIdResponseSuccess | getChildrenByGuardianIdResponseError)
 
-export const getGetChildrenByGuardianIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetChildrenByGuardianIdUrl = (id: string,) => {
+
+
+  
+
+  return `/api/v1/children/${id}`
+}
+
+export const getChildrenByGuardianId = async (id: string, options?: RequestInit): Promise<getChildrenByGuardianIdResponse> => {
+  
+  return customInstance<getChildrenByGuardianIdResponse>(getGetChildrenByGuardianIdUrl(id),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetChildrenByGuardianIdQueryKey = (id: string,) => {
+    return [
+    `/api/v1/children/${id}`
+    ] as const;
+    }
+
+    
+export const getGetChildrenByGuardianIdQueryOptions = <TData = Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError = ErrorModel>(id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetChildrenByGuardianIdQueryKey(id);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getChildrenByGuardianId>>
-  > = ({ signal }) =>
-    getChildrenByGuardianId(id, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetChildrenByGuardianIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getChildrenByGuardianId>>
->;
-export type GetChildrenByGuardianIdQueryError = ErrorModel;
-
-export function useGetChildrenByGuardianId<
-  TData = Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetChildrenByGuardianIdQueryKey(id);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getChildrenByGuardianId>>> = ({ signal }) => getChildrenByGuardianId(id, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetChildrenByGuardianIdQueryResult = NonNullable<Awaited<ReturnType<typeof getChildrenByGuardianId>>>
+export type GetChildrenByGuardianIdQueryError = ErrorModel
+
+
+export function useGetChildrenByGuardianId<TData = Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError = ErrorModel>(
+ id: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getChildrenByGuardianId>>,
           TError,
           Awaited<ReturnType<typeof getChildrenByGuardianId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetChildrenByGuardianId<
-  TData = Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetChildrenByGuardianId<TData = Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getChildrenByGuardianId>>,
           TError,
           Awaited<ReturnType<typeof getChildrenByGuardianId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetChildrenByGuardianId<
-  TData = Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetChildrenByGuardianId<TData = Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get all children for a guardian
  */
 
-export function useGetChildrenByGuardianId<
-  TData = Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getChildrenByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetChildrenByGuardianIdQueryOptions(id, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetChildrenByGuardianId<TData = Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getChildrenByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetChildrenByGuardianIdQueryOptions(id,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
+
+
+
+
diff --git a/frontend/packages/api-client/src/generated/event-occurrences/event-occurrences.ts b/frontend/packages/api-client/src/generated/event-occurrences/event-occurrences.ts
index 2b7e51ed..187ba854 100644
--- a/frontend/packages/api-client/src/generated/event-occurrences/event-occurrences.ts
+++ b/frontend/packages/api-client/src/generated/event-occurrences/event-occurrences.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,8 +21,8 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   CancelEventOccurrenceOutputBody,
@@ -27,837 +30,562 @@ import type {
   ErrorModel,
   EventOccurrence,
   GetAllEventOccurrencesParams,
-  UpdateEventOccurrenceInputBody,
-} from "../skillSparkAPI.schemas";
+  UpdateEventOccurrenceInputBody
+} from '../skillSparkAPI.schemas';
 
-import { customInstance } from "../../apiClient";
+import { customInstance } from '../../apiClient';
 
 // https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> =
-  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
 
 type WritableKeys<T> = {
-  [P in keyof T]-?: IfEquals<
-    { [Q in P]: T[P] },
-    { -readonly [Q in P]: T[P] },
-    P
-  >;
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
 }[keyof T];
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
-) => void
-  ? I
-  : never;
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
 type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
 
 type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>]
-  ? {
-      [P in keyof Writable<T>]: T[P] extends object
-        ? NonReadonly<NonNullable<T[P]>>
-        : T[P];
-    }
-  : DistributeReadOnlyOverUnions<T>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Returns a list of all event occurrences in the database
  * @summary Get all event occurrences
  */
 export type getAllEventOccurrencesResponse200 = {
-  data: EventOccurrence[];
-  status: 200;
-};
+  data: EventOccurrence[]
+  status: 200
+}
 
 export type getAllEventOccurrencesResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
+
+export type getAllEventOccurrencesResponseSuccess = (getAllEventOccurrencesResponse200) & {
+  headers: Headers;
+};
+export type getAllEventOccurrencesResponseError = (getAllEventOccurrencesResponseDefault) & {
+  headers: Headers;
 };
 
-export type getAllEventOccurrencesResponseSuccess =
-  getAllEventOccurrencesResponse200 & {
-    headers: Headers;
-  };
-export type getAllEventOccurrencesResponseError =
-  getAllEventOccurrencesResponseDefault & {
-    headers: Headers;
-  };
-
-export type getAllEventOccurrencesResponse =
-  | getAllEventOccurrencesResponseSuccess
-  | getAllEventOccurrencesResponseError;
-
-export const getGetAllEventOccurrencesUrl = (
-  params?: GetAllEventOccurrencesParams,
-) => {
+export type getAllEventOccurrencesResponse = (getAllEventOccurrencesResponseSuccess | getAllEventOccurrencesResponseError)
+
+export const getGetAllEventOccurrencesUrl = (params?: GetAllEventOccurrencesParams,) => {
   const normalizedParams = new URLSearchParams();
 
   Object.entries(params || {}).forEach(([key, value]) => {
+    
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? 'null' : value.toString())
     }
   });
 
   const stringifiedParams = normalizedParams.toString();
 
-  return stringifiedParams.length > 0
-    ? `/api/v1/event-occurrences?${stringifiedParams}`
-    : `/api/v1/event-occurrences`;
-};
+  return stringifiedParams.length > 0 ? `/api/v1/event-occurrences?${stringifiedParams}` : `/api/v1/event-occurrences`
+}
 
-export const getAllEventOccurrences = async (
-  params?: GetAllEventOccurrencesParams,
-  options?: RequestInit,
-): Promise<getAllEventOccurrencesResponse> => {
-  return customInstance<getAllEventOccurrencesResponse>(
-    getGetAllEventOccurrencesUrl(params),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
-};
+export const getAllEventOccurrences = async (params?: GetAllEventOccurrencesParams, options?: RequestInit): Promise<getAllEventOccurrencesResponse> => {
+  
+  return customInstance<getAllEventOccurrencesResponse>(getGetAllEventOccurrencesUrl(params),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
 
-export const getGetAllEventOccurrencesQueryKey = (
-  params?: GetAllEventOccurrencesParams,
-) => {
-  return [`/api/v1/event-occurrences`, ...(params ? [params] : [])] as const;
-};
 
-export const getGetAllEventOccurrencesQueryOptions = <
-  TData = Awaited<ReturnType<typeof getAllEventOccurrences>>,
-  TError = ErrorModel,
->(
-  params?: GetAllEventOccurrencesParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getAllEventOccurrences>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+
+
+export const getGetAllEventOccurrencesQueryKey = (params?: GetAllEventOccurrencesParams,) => {
+    return [
+    `/api/v1/event-occurrences`, ...(params ? [params] : [])
+    ] as const;
+    }
+
+    
+export const getGetAllEventOccurrencesQueryOptions = <TData = Awaited<ReturnType<typeof getAllEventOccurrences>>, TError = ErrorModel>(params?: GetAllEventOccurrencesParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllEventOccurrences>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  const queryKey =
-    queryOptions?.queryKey ?? getGetAllEventOccurrencesQueryKey(params);
+const {query: queryOptions, request: requestOptions} = options ?? {};
 
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getAllEventOccurrences>>
-  > = ({ signal }) =>
-    getAllEventOccurrences(params, { signal, ...requestOptions });
+  const queryKey =  queryOptions?.queryKey ?? getGetAllEventOccurrencesQueryKey(params);
 
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getAllEventOccurrences>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
+  
 
-export type GetAllEventOccurrencesQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getAllEventOccurrences>>
->;
-export type GetAllEventOccurrencesQueryError = ErrorModel;
-
-export function useGetAllEventOccurrences<
-  TData = Awaited<ReturnType<typeof getAllEventOccurrences>>,
-  TError = ErrorModel,
->(
-  params: undefined | GetAllEventOccurrencesParams,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getAllEventOccurrences>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getAllEventOccurrences>>> = ({ signal }) => getAllEventOccurrences(params, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getAllEventOccurrences>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetAllEventOccurrencesQueryResult = NonNullable<Awaited<ReturnType<typeof getAllEventOccurrences>>>
+export type GetAllEventOccurrencesQueryError = ErrorModel
+
+
+export function useGetAllEventOccurrences<TData = Awaited<ReturnType<typeof getAllEventOccurrences>>, TError = ErrorModel>(
+ params: undefined |  GetAllEventOccurrencesParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllEventOccurrences>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getAllEventOccurrences>>,
           TError,
           Awaited<ReturnType<typeof getAllEventOccurrences>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetAllEventOccurrences<
-  TData = Awaited<ReturnType<typeof getAllEventOccurrences>>,
-  TError = ErrorModel,
->(
-  params?: GetAllEventOccurrencesParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getAllEventOccurrences>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetAllEventOccurrences<TData = Awaited<ReturnType<typeof getAllEventOccurrences>>, TError = ErrorModel>(
+ params?: GetAllEventOccurrencesParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllEventOccurrences>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getAllEventOccurrences>>,
           TError,
           Awaited<ReturnType<typeof getAllEventOccurrences>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetAllEventOccurrences<
-  TData = Awaited<ReturnType<typeof getAllEventOccurrences>>,
-  TError = ErrorModel,
->(
-  params?: GetAllEventOccurrencesParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getAllEventOccurrences>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetAllEventOccurrences<TData = Awaited<ReturnType<typeof getAllEventOccurrences>>, TError = ErrorModel>(
+ params?: GetAllEventOccurrencesParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllEventOccurrences>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get all event occurrences
  */
 
-export function useGetAllEventOccurrences<
-  TData = Awaited<ReturnType<typeof getAllEventOccurrences>>,
-  TError = ErrorModel,
->(
-  params?: GetAllEventOccurrencesParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getAllEventOccurrences>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetAllEventOccurrencesQueryOptions(params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetAllEventOccurrences<TData = Awaited<ReturnType<typeof getAllEventOccurrences>>, TError = ErrorModel>(
+ params?: GetAllEventOccurrencesParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllEventOccurrences>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetAllEventOccurrencesQueryOptions(params,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Creates a new event occurrence in the database
  * @summary Create an event occurrence
  */
 export type postEventOccurrenceResponse200 = {
-  data: EventOccurrence;
-  status: 200;
-};
+  data: EventOccurrence
+  status: 200
+}
 
 export type postEventOccurrenceResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type postEventOccurrenceResponseSuccess =
-  postEventOccurrenceResponse200 & {
-    headers: Headers;
-  };
-export type postEventOccurrenceResponseError =
-  postEventOccurrenceResponseDefault & {
-    headers: Headers;
-  };
+export type postEventOccurrenceResponseSuccess = (postEventOccurrenceResponse200) & {
+  headers: Headers;
+};
+export type postEventOccurrenceResponseError = (postEventOccurrenceResponseDefault) & {
+  headers: Headers;
+};
 
-export type postEventOccurrenceResponse =
-  | postEventOccurrenceResponseSuccess
-  | postEventOccurrenceResponseError;
+export type postEventOccurrenceResponse = (postEventOccurrenceResponseSuccess | postEventOccurrenceResponseError)
 
 export const getPostEventOccurrenceUrl = () => {
-  return `/api/v1/event-occurrences`;
-};
 
-export const postEventOccurrence = async (
-  createEventOccurrenceInputBody: NonReadonly<CreateEventOccurrenceInputBody>,
-  options?: RequestInit,
-): Promise<postEventOccurrenceResponse> => {
-  return customInstance<postEventOccurrenceResponse>(
-    getPostEventOccurrenceUrl(),
-    {
-      ...options,
-      method: "POST",
-      headers: { "Content-Type": "application/json", ...options?.headers },
-      body: JSON.stringify(createEventOccurrenceInputBody),
-    },
-  );
-};
 
-export const getPostEventOccurrenceMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof postEventOccurrence>>,
-    TError,
-    { data: NonReadonly<CreateEventOccurrenceInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof postEventOccurrence>>,
-  TError,
-  { data: NonReadonly<CreateEventOccurrenceInputBody> },
-  TContext
-> => {
-  const mutationKey = ["postEventOccurrence"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof postEventOccurrence>>,
-    { data: NonReadonly<CreateEventOccurrenceInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return postEventOccurrence(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+  
 
-export type PostEventOccurrenceMutationResult = NonNullable<
-  Awaited<ReturnType<typeof postEventOccurrence>>
->;
-export type PostEventOccurrenceMutationBody =
-  NonReadonly<CreateEventOccurrenceInputBody>;
-export type PostEventOccurrenceMutationError = ErrorModel;
+  return `/api/v1/event-occurrences`
+}
 
-/**
+export const postEventOccurrence = async (createEventOccurrenceInputBody: NonReadonly<CreateEventOccurrenceInputBody>, options?: RequestInit): Promise<postEventOccurrenceResponse> => {
+  
+  return customInstance<postEventOccurrenceResponse>(getPostEventOccurrenceUrl(),
+  {      
+    ...options,
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      createEventOccurrenceInputBody,)
+  }
+);}
+
+
+
+
+export const getPostEventOccurrenceMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postEventOccurrence>>, TError,{data: NonReadonly<CreateEventOccurrenceInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof postEventOccurrence>>, TError,{data: NonReadonly<CreateEventOccurrenceInputBody>}, TContext> => {
+
+const mutationKey = ['postEventOccurrence'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof postEventOccurrence>>, {data: NonReadonly<CreateEventOccurrenceInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  postEventOccurrence(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type PostEventOccurrenceMutationResult = NonNullable<Awaited<ReturnType<typeof postEventOccurrence>>>
+    export type PostEventOccurrenceMutationBody = NonReadonly<CreateEventOccurrenceInputBody>
+    export type PostEventOccurrenceMutationError = ErrorModel
+
+    /**
  * @summary Create an event occurrence
  */
-export const usePostEventOccurrence = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof postEventOccurrence>>,
-      TError,
-      { data: NonReadonly<CreateEventOccurrenceInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof postEventOccurrence>>,
-  TError,
-  { data: NonReadonly<CreateEventOccurrenceInputBody> },
-  TContext
-> => {
-  return useMutation(
-    getPostEventOccurrenceMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const usePostEventOccurrence = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postEventOccurrence>>, TError,{data: NonReadonly<CreateEventOccurrenceInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof postEventOccurrence>>,
+        TError,
+        {data: NonReadonly<CreateEventOccurrenceInputBody>},
+        TContext
+      > => {
+      return useMutation(getPostEventOccurrenceMutationOptions(options), queryClient);
+    }
+    /**
  * Returns an event occurrence that matches the ID
  * @summary Get an event occurrence by ID
  */
 export type getEventOccurrencesByIdResponse200 = {
-  data: EventOccurrence;
-  status: 200;
-};
+  data: EventOccurrence
+  status: 200
+}
 
 export type getEventOccurrencesByIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getEventOccurrencesByIdResponseSuccess =
-  getEventOccurrencesByIdResponse200 & {
-    headers: Headers;
-  };
-export type getEventOccurrencesByIdResponseError =
-  getEventOccurrencesByIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getEventOccurrencesByIdResponse =
-  | getEventOccurrencesByIdResponseSuccess
-  | getEventOccurrencesByIdResponseError;
-
-export const getGetEventOccurrencesByIdUrl = (id: string) => {
-  return `/api/v1/event-occurrences/${id}`;
+export type getEventOccurrencesByIdResponseSuccess = (getEventOccurrencesByIdResponse200) & {
+  headers: Headers;
 };
-
-export const getEventOccurrencesById = async (
-  id: string,
-  options?: RequestInit,
-): Promise<getEventOccurrencesByIdResponse> => {
-  return customInstance<getEventOccurrencesByIdResponse>(
-    getGetEventOccurrencesByIdUrl(id),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getEventOccurrencesByIdResponseError = (getEventOccurrencesByIdResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetEventOccurrencesByIdQueryKey = (id: string) => {
-  return [`/api/v1/event-occurrences/${id}`] as const;
-};
+export type getEventOccurrencesByIdResponse = (getEventOccurrencesByIdResponseSuccess | getEventOccurrencesByIdResponseError)
 
-export const getGetEventOccurrencesByIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getEventOccurrencesById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetEventOccurrencesByIdUrl = (id: string,) => {
+
+
+  
+
+  return `/api/v1/event-occurrences/${id}`
+}
+
+export const getEventOccurrencesById = async (id: string, options?: RequestInit): Promise<getEventOccurrencesByIdResponse> => {
+  
+  return customInstance<getEventOccurrencesByIdResponse>(getGetEventOccurrencesByIdUrl(id),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetEventOccurrencesByIdQueryKey = (id: string,) => {
+    return [
+    `/api/v1/event-occurrences/${id}`
+    ] as const;
+    }
+
+    
+export const getGetEventOccurrencesByIdQueryOptions = <TData = Awaited<ReturnType<typeof getEventOccurrencesById>>, TError = ErrorModel>(id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetEventOccurrencesByIdQueryKey(id);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getEventOccurrencesById>>
-  > = ({ signal }) =>
-    getEventOccurrencesById(id, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getEventOccurrencesById>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetEventOccurrencesByIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getEventOccurrencesById>>
->;
-export type GetEventOccurrencesByIdQueryError = ErrorModel;
-
-export function useGetEventOccurrencesById<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesById>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetEventOccurrencesByIdQueryKey(id);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getEventOccurrencesById>>> = ({ signal }) => getEventOccurrencesById(id, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesById>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetEventOccurrencesByIdQueryResult = NonNullable<Awaited<ReturnType<typeof getEventOccurrencesById>>>
+export type GetEventOccurrencesByIdQueryError = ErrorModel
+
+
+export function useGetEventOccurrencesById<TData = Awaited<ReturnType<typeof getEventOccurrencesById>>, TError = ErrorModel>(
+ id: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesById>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getEventOccurrencesById>>,
           TError,
           Awaited<ReturnType<typeof getEventOccurrencesById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetEventOccurrencesById<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesById>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetEventOccurrencesById<TData = Awaited<ReturnType<typeof getEventOccurrencesById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesById>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getEventOccurrencesById>>,
           TError,
           Awaited<ReturnType<typeof getEventOccurrencesById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetEventOccurrencesById<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetEventOccurrencesById<TData = Awaited<ReturnType<typeof getEventOccurrencesById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get an event occurrence by ID
  */
 
-export function useGetEventOccurrencesById<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetEventOccurrencesByIdQueryOptions(id, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetEventOccurrencesById<TData = Awaited<ReturnType<typeof getEventOccurrencesById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetEventOccurrencesByIdQueryOptions(id,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Cancel an event occurrence and cancel its associated registrations
  * @summary Cancel an event occurrence and cancel its associated registrations
  */
 export type cancelEventOccurrenceResponse200 = {
-  data: CancelEventOccurrenceOutputBody;
-  status: 200;
-};
+  data: CancelEventOccurrenceOutputBody
+  status: 200
+}
 
 export type cancelEventOccurrenceResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type cancelEventOccurrenceResponseSuccess =
-  cancelEventOccurrenceResponse200 & {
-    headers: Headers;
-  };
-export type cancelEventOccurrenceResponseError =
-  cancelEventOccurrenceResponseDefault & {
-    headers: Headers;
-  };
-
-export type cancelEventOccurrenceResponse =
-  | cancelEventOccurrenceResponseSuccess
-  | cancelEventOccurrenceResponseError;
-
-export const getCancelEventOccurrenceUrl = (id: string) => {
-  return `/api/v1/event-occurrences/${id}`;
+export type cancelEventOccurrenceResponseSuccess = (cancelEventOccurrenceResponse200) & {
+  headers: Headers;
 };
-
-export const cancelEventOccurrence = async (
-  id: string,
-  options?: RequestInit,
-): Promise<cancelEventOccurrenceResponse> => {
-  return customInstance<cancelEventOccurrenceResponse>(
-    getCancelEventOccurrenceUrl(id),
-    {
-      ...options,
-      method: "DELETE",
-    },
-  );
+export type cancelEventOccurrenceResponseError = (cancelEventOccurrenceResponseDefault) & {
+  headers: Headers;
 };
 
-export const getCancelEventOccurrenceMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof cancelEventOccurrence>>,
-    TError,
-    { id: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof cancelEventOccurrence>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  const mutationKey = ["cancelEventOccurrence"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof cancelEventOccurrence>>,
-    { id: string }
-  > = (props) => {
-    const { id } = props ?? {};
-
-    return cancelEventOccurrence(id, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type cancelEventOccurrenceResponse = (cancelEventOccurrenceResponseSuccess | cancelEventOccurrenceResponseError)
 
-export type CancelEventOccurrenceMutationResult = NonNullable<
-  Awaited<ReturnType<typeof cancelEventOccurrence>>
->;
+export const getCancelEventOccurrenceUrl = (id: string,) => {
 
-export type CancelEventOccurrenceMutationError = ErrorModel;
 
-/**
+  
+
+  return `/api/v1/event-occurrences/${id}`
+}
+
+export const cancelEventOccurrence = async (id: string, options?: RequestInit): Promise<cancelEventOccurrenceResponse> => {
+  
+  return customInstance<cancelEventOccurrenceResponse>(getCancelEventOccurrenceUrl(id),
+  {      
+    ...options,
+    method: 'DELETE'
+    
+    
+  }
+);}
+
+
+
+
+export const getCancelEventOccurrenceMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof cancelEventOccurrence>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof cancelEventOccurrence>>, TError,{id: string}, TContext> => {
+
+const mutationKey = ['cancelEventOccurrence'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof cancelEventOccurrence>>, {id: string}> = (props) => {
+          const {id} = props ?? {};
+
+          return  cancelEventOccurrence(id,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CancelEventOccurrenceMutationResult = NonNullable<Awaited<ReturnType<typeof cancelEventOccurrence>>>
+    
+    export type CancelEventOccurrenceMutationError = ErrorModel
+
+    /**
  * @summary Cancel an event occurrence and cancel its associated registrations
  */
-export const useCancelEventOccurrence = <
-  TError = ErrorModel,
-  TContext = unknown,
->(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof cancelEventOccurrence>>,
-      TError,
-      { id: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof cancelEventOccurrence>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  return useMutation(
-    getCancelEventOccurrenceMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useCancelEventOccurrence = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof cancelEventOccurrence>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof cancelEventOccurrence>>,
+        TError,
+        {id: string},
+        TContext
+      > => {
+      return useMutation(getCancelEventOccurrenceMutationOptions(options), queryClient);
+    }
+    /**
  * Updates an event occurrence in the database
  * @summary Update an event occurrence
  */
 export type patchEventOccurrenceResponse200 = {
-  data: EventOccurrence;
-  status: 200;
-};
+  data: EventOccurrence
+  status: 200
+}
 
 export type patchEventOccurrenceResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type patchEventOccurrenceResponseSuccess =
-  patchEventOccurrenceResponse200 & {
-    headers: Headers;
-  };
-export type patchEventOccurrenceResponseError =
-  patchEventOccurrenceResponseDefault & {
-    headers: Headers;
-  };
-
-export type patchEventOccurrenceResponse =
-  | patchEventOccurrenceResponseSuccess
-  | patchEventOccurrenceResponseError;
-
-export const getPatchEventOccurrenceUrl = (id: string) => {
-  return `/api/v1/event-occurrences/${id}`;
+export type patchEventOccurrenceResponseSuccess = (patchEventOccurrenceResponse200) & {
+  headers: Headers;
 };
-
-export const patchEventOccurrence = async (
-  id: string,
-  updateEventOccurrenceInputBody: NonReadonly<UpdateEventOccurrenceInputBody>,
-  options?: RequestInit,
-): Promise<patchEventOccurrenceResponse> => {
-  return customInstance<patchEventOccurrenceResponse>(
-    getPatchEventOccurrenceUrl(id),
-    {
-      ...options,
-      method: "PATCH",
-      headers: { "Content-Type": "application/json", ...options?.headers },
-      body: JSON.stringify(updateEventOccurrenceInputBody),
-    },
-  );
+export type patchEventOccurrenceResponseError = (patchEventOccurrenceResponseDefault) & {
+  headers: Headers;
 };
 
-export const getPatchEventOccurrenceMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof patchEventOccurrence>>,
-    TError,
-    { id: string; data: NonReadonly<UpdateEventOccurrenceInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof patchEventOccurrence>>,
-  TError,
-  { id: string; data: NonReadonly<UpdateEventOccurrenceInputBody> },
-  TContext
-> => {
-  const mutationKey = ["patchEventOccurrence"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof patchEventOccurrence>>,
-    { id: string; data: NonReadonly<UpdateEventOccurrenceInputBody> }
-  > = (props) => {
-    const { id, data } = props ?? {};
-
-    return patchEventOccurrence(id, data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type patchEventOccurrenceResponse = (patchEventOccurrenceResponseSuccess | patchEventOccurrenceResponseError)
 
-export type PatchEventOccurrenceMutationResult = NonNullable<
-  Awaited<ReturnType<typeof patchEventOccurrence>>
->;
-export type PatchEventOccurrenceMutationBody =
-  NonReadonly<UpdateEventOccurrenceInputBody>;
-export type PatchEventOccurrenceMutationError = ErrorModel;
+export const getPatchEventOccurrenceUrl = (id: string,) => {
 
-/**
+
+  
+
+  return `/api/v1/event-occurrences/${id}`
+}
+
+export const patchEventOccurrence = async (id: string,
+    updateEventOccurrenceInputBody: NonReadonly<UpdateEventOccurrenceInputBody>, options?: RequestInit): Promise<patchEventOccurrenceResponse> => {
+  
+  return customInstance<patchEventOccurrenceResponse>(getPatchEventOccurrenceUrl(id),
+  {      
+    ...options,
+    method: 'PATCH',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      updateEventOccurrenceInputBody,)
+  }
+);}
+
+
+
+
+export const getPatchEventOccurrenceMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof patchEventOccurrence>>, TError,{id: string;data: NonReadonly<UpdateEventOccurrenceInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof patchEventOccurrence>>, TError,{id: string;data: NonReadonly<UpdateEventOccurrenceInputBody>}, TContext> => {
+
+const mutationKey = ['patchEventOccurrence'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof patchEventOccurrence>>, {id: string;data: NonReadonly<UpdateEventOccurrenceInputBody>}> = (props) => {
+          const {id,data} = props ?? {};
+
+          return  patchEventOccurrence(id,data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type PatchEventOccurrenceMutationResult = NonNullable<Awaited<ReturnType<typeof patchEventOccurrence>>>
+    export type PatchEventOccurrenceMutationBody = NonReadonly<UpdateEventOccurrenceInputBody>
+    export type PatchEventOccurrenceMutationError = ErrorModel
+
+    /**
  * @summary Update an event occurrence
  */
-export const usePatchEventOccurrence = <
-  TError = ErrorModel,
-  TContext = unknown,
->(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof patchEventOccurrence>>,
-      TError,
-      { id: string; data: NonReadonly<UpdateEventOccurrenceInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof patchEventOccurrence>>,
-  TError,
-  { id: string; data: NonReadonly<UpdateEventOccurrenceInputBody> },
-  TContext
-> => {
-  return useMutation(
-    getPatchEventOccurrenceMutationOptions(options),
-    queryClient,
-  );
-};
+export const usePatchEventOccurrence = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof patchEventOccurrence>>, TError,{id: string;data: NonReadonly<UpdateEventOccurrenceInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof patchEventOccurrence>>,
+        TError,
+        {id: string;data: NonReadonly<UpdateEventOccurrenceInputBody>},
+        TContext
+      > => {
+      return useMutation(getPatchEventOccurrenceMutationOptions(options), queryClient);
+    }
+    
\ No newline at end of file
diff --git a/frontend/packages/api-client/src/generated/events/events.ts b/frontend/packages/api-client/src/generated/events/events.ts
index f911dad2..3fcc7324 100644
--- a/frontend/packages/api-client/src/generated/events/events.ts
+++ b/frontend/packages/api-client/src/generated/events/events.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,8 +21,8 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   CreateEventBody,
@@ -27,644 +30,448 @@ import type {
   ErrorModel,
   Event,
   EventOccurrence,
-  UpdateEventBody,
-} from "../skillSparkAPI.schemas";
+  UpdateEventBody
+} from '../skillSparkAPI.schemas';
+
+import { customInstance } from '../../apiClient';
 
-import { customInstance } from "../../apiClient";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Creates a new event
  * @summary Create a new event
  */
 export type createEventResponse200 = {
-  data: Event;
-  status: 200;
-};
+  data: Event
+  status: 200
+}
 
 export type createEventResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createEventResponseSuccess = createEventResponse200 & {
+export type createEventResponseSuccess = (createEventResponse200) & {
   headers: Headers;
 };
-export type createEventResponseError = createEventResponseDefault & {
+export type createEventResponseError = (createEventResponseDefault) & {
   headers: Headers;
 };
 
-export type createEventResponse =
-  | createEventResponseSuccess
-  | createEventResponseError;
+export type createEventResponse = (createEventResponseSuccess | createEventResponseError)
 
 export const getCreateEventUrl = () => {
-  return `/api/v1/events`;
-};
 
-export const createEvent = async (
-  createEventBody: CreateEventBody,
-  options?: RequestInit,
-): Promise<createEventResponse> => {
-  const formData = new FormData();
-  if (createEventBody.age_range_max !== undefined) {
-    formData.append(`age_range_max`, createEventBody.age_range_max.toString());
-  }
-  if (createEventBody.age_range_min !== undefined) {
-    formData.append(`age_range_min`, createEventBody.age_range_min.toString());
-  }
-  if (createEventBody.category !== undefined) {
-    createEventBody.category.forEach((value) =>
-      formData.append(`category`, value),
-    );
-  }
-  formData.append(
-    `description`,
-    createEventBody.description instanceof Blob
-      ? createEventBody.description
-      : new Blob([createEventBody.description], { type: "text/plain" }),
-  );
-  if (createEventBody.header_image !== undefined) {
-    formData.append(`header_image`, createEventBody.header_image);
-  }
-  formData.append(
-    `organization_id`,
-    createEventBody.organization_id instanceof Blob
-      ? createEventBody.organization_id
-      : new Blob([createEventBody.organization_id], { type: "text/plain" }),
-  );
-  formData.append(
-    `title`,
-    createEventBody.title instanceof Blob
-      ? createEventBody.title
-      : new Blob([createEventBody.title], { type: "text/plain" }),
-  );
-
-  return customInstance<createEventResponse>(getCreateEventUrl(), {
+
+  
+
+  return `/api/v1/events`
+}
+
+export const createEvent = async (createEventBody: CreateEventBody, options?: RequestInit): Promise<createEventResponse> => {
+    const formData = new FormData();
+if(createEventBody.age_range_max !== undefined) {
+ formData.append(`age_range_max`, createEventBody.age_range_max.toString())
+ }
+if(createEventBody.age_range_min !== undefined) {
+ formData.append(`age_range_min`, createEventBody.age_range_min.toString())
+ }
+if(createEventBody.category !== undefined) {
+ createEventBody.category.forEach(value => formData.append(`category`, value));
+ }
+formData.append(`description`, createEventBody.description instanceof Blob ? createEventBody.description : new Blob([createEventBody.description], { type: 'text/plain' }));
+if(createEventBody.header_image !== undefined) {
+ formData.append(`header_image`, createEventBody.header_image);
+ }
+formData.append(`organization_id`, createEventBody.organization_id instanceof Blob ? createEventBody.organization_id : new Blob([createEventBody.organization_id], { type: 'text/plain' }));
+formData.append(`title`, createEventBody.title instanceof Blob ? createEventBody.title : new Blob([createEventBody.title], { type: 'text/plain' }));
+
+  return customInstance<createEventResponse>(getCreateEventUrl(),
+  {      
     ...options,
-    method: "POST",
-    body: formData,
-  });
-};
+    method: 'POST'
+    ,
+    body: 
+      formData,
+  }
+);}
 
-export const getCreateEventMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createEvent>>,
-    TError,
-    { data: CreateEventBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createEvent>>,
-  TError,
-  { data: CreateEventBody },
-  TContext
-> => {
-  const mutationKey = ["createEvent"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createEvent>>,
-    { data: CreateEventBody }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return createEvent(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type CreateEventMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createEvent>>
->;
-export type CreateEventMutationBody = CreateEventBody;
-export type CreateEventMutationError = ErrorModel;
 
-/**
+
+export const getCreateEventMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createEvent>>, TError,{data: CreateEventBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createEvent>>, TError,{data: CreateEventBody}, TContext> => {
+
+const mutationKey = ['createEvent'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createEvent>>, {data: CreateEventBody}> = (props) => {
+          const {data} = props ?? {};
+
+          return  createEvent(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateEventMutationResult = NonNullable<Awaited<ReturnType<typeof createEvent>>>
+    export type CreateEventMutationBody = CreateEventBody
+    export type CreateEventMutationError = ErrorModel
+
+    /**
  * @summary Create a new event
  */
-export const useCreateEvent = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createEvent>>,
-      TError,
-      { data: CreateEventBody },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createEvent>>,
-  TError,
-  { data: CreateEventBody },
-  TContext
-> => {
-  return useMutation(getCreateEventMutationOptions(options), queryClient);
-};
-/**
+export const useCreateEvent = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createEvent>>, TError,{data: CreateEventBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createEvent>>,
+        TError,
+        {data: CreateEventBody},
+        TContext
+      > => {
+      return useMutation(getCreateEventMutationOptions(options), queryClient);
+    }
+    /**
  * Returns event occurrences that match the event ID
  * @summary Get event occurrences by event ID
  */
 export type getEventOccurrencesByEventIdResponse200 = {
-  data: EventOccurrence[];
-  status: 200;
-};
+  data: EventOccurrence[]
+  status: 200
+}
 
 export type getEventOccurrencesByEventIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getEventOccurrencesByEventIdResponseSuccess =
-  getEventOccurrencesByEventIdResponse200 & {
-    headers: Headers;
-  };
-export type getEventOccurrencesByEventIdResponseError =
-  getEventOccurrencesByEventIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getEventOccurrencesByEventIdResponse =
-  | getEventOccurrencesByEventIdResponseSuccess
-  | getEventOccurrencesByEventIdResponseError;
-
-export const getGetEventOccurrencesByEventIdUrl = (eventId: string) => {
-  return `/api/v1/events/${eventId}/event-occurrences/`;
+export type getEventOccurrencesByEventIdResponseSuccess = (getEventOccurrencesByEventIdResponse200) & {
+  headers: Headers;
 };
-
-export const getEventOccurrencesByEventId = async (
-  eventId: string,
-  options?: RequestInit,
-): Promise<getEventOccurrencesByEventIdResponse> => {
-  return customInstance<getEventOccurrencesByEventIdResponse>(
-    getGetEventOccurrencesByEventIdUrl(eventId),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getEventOccurrencesByEventIdResponseError = (getEventOccurrencesByEventIdResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetEventOccurrencesByEventIdQueryKey = (eventId: string) => {
-  return [`/api/v1/events/${eventId}/event-occurrences/`] as const;
-};
+export type getEventOccurrencesByEventIdResponse = (getEventOccurrencesByEventIdResponseSuccess | getEventOccurrencesByEventIdResponseError)
 
-export const getGetEventOccurrencesByEventIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-  TError = ErrorModel,
->(
-  eventId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetEventOccurrencesByEventIdUrl = (eventId: string,) => {
+
+
+  
+
+  return `/api/v1/events/${eventId}/event-occurrences/`
+}
+
+export const getEventOccurrencesByEventId = async (eventId: string, options?: RequestInit): Promise<getEventOccurrencesByEventIdResponse> => {
+  
+  return customInstance<getEventOccurrencesByEventIdResponse>(getGetEventOccurrencesByEventIdUrl(eventId),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetEventOccurrencesByEventIdQueryKey = (eventId: string,) => {
+    return [
+    `/api/v1/events/${eventId}/event-occurrences/`
+    ] as const;
+    }
+
+    
+export const getGetEventOccurrencesByEventIdQueryOptions = <TData = Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError = ErrorModel>(eventId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetEventOccurrencesByEventIdQueryKey(eventId);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getEventOccurrencesByEventId>>
-  > = ({ signal }) =>
-    getEventOccurrencesByEventId(eventId, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!eventId,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetEventOccurrencesByEventIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getEventOccurrencesByEventId>>
->;
-export type GetEventOccurrencesByEventIdQueryError = ErrorModel;
-
-export function useGetEventOccurrencesByEventId<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-  TError = ErrorModel,
->(
-  eventId: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetEventOccurrencesByEventIdQueryKey(eventId);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getEventOccurrencesByEventId>>> = ({ signal }) => getEventOccurrencesByEventId(eventId, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(eventId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetEventOccurrencesByEventIdQueryResult = NonNullable<Awaited<ReturnType<typeof getEventOccurrencesByEventId>>>
+export type GetEventOccurrencesByEventIdQueryError = ErrorModel
+
+
+export function useGetEventOccurrencesByEventId<TData = Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError = ErrorModel>(
+ eventId: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
           TError,
           Awaited<ReturnType<typeof getEventOccurrencesByEventId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetEventOccurrencesByEventId<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-  TError = ErrorModel,
->(
-  eventId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetEventOccurrencesByEventId<TData = Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError = ErrorModel>(
+ eventId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
           TError,
           Awaited<ReturnType<typeof getEventOccurrencesByEventId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetEventOccurrencesByEventId<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-  TError = ErrorModel,
->(
-  eventId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetEventOccurrencesByEventId<TData = Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError = ErrorModel>(
+ eventId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get event occurrences by event ID
  */
 
-export function useGetEventOccurrencesByEventId<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-  TError = ErrorModel,
->(
-  eventId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesByEventId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetEventOccurrencesByEventIdQueryOptions(
-    eventId,
-    options,
-  );
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetEventOccurrencesByEventId<TData = Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError = ErrorModel>(
+ eventId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByEventId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetEventOccurrencesByEventIdQueryOptions(eventId,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Deletes an existing event by id
  * @summary Delete an existing event by id
  */
 export type deleteEventResponse200 = {
-  data: DeleteEventOutputBody;
-  status: 200;
-};
+  data: DeleteEventOutputBody
+  status: 200
+}
 
 export type deleteEventResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type deleteEventResponseSuccess = deleteEventResponse200 & {
+export type deleteEventResponseSuccess = (deleteEventResponse200) & {
   headers: Headers;
 };
-export type deleteEventResponseError = deleteEventResponseDefault & {
+export type deleteEventResponseError = (deleteEventResponseDefault) & {
   headers: Headers;
 };
 
-export type deleteEventResponse =
-  | deleteEventResponseSuccess
-  | deleteEventResponseError;
+export type deleteEventResponse = (deleteEventResponseSuccess | deleteEventResponseError)
 
-export const getDeleteEventUrl = (id: string) => {
-  return `/api/v1/events/${id}`;
-};
+export const getDeleteEventUrl = (id: string,) => {
+
+
+  
+
+  return `/api/v1/events/${id}`
+}
 
-export const deleteEvent = async (
-  id: string,
-  options?: RequestInit,
-): Promise<deleteEventResponse> => {
-  return customInstance<deleteEventResponse>(getDeleteEventUrl(id), {
+export const deleteEvent = async (id: string, options?: RequestInit): Promise<deleteEventResponse> => {
+  
+  return customInstance<deleteEventResponse>(getDeleteEventUrl(id),
+  {      
     ...options,
-    method: "DELETE",
-  });
-};
+    method: 'DELETE'
+    
+    
+  }
+);}
 
-export const getDeleteEventMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteEvent>>,
-    TError,
-    { id: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteEvent>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  const mutationKey = ["deleteEvent"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteEvent>>,
-    { id: string }
-  > = (props) => {
-    const { id } = props ?? {};
-
-    return deleteEvent(id, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type DeleteEventMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteEvent>>
->;
 
-export type DeleteEventMutationError = ErrorModel;
 
-/**
+export const getDeleteEventMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteEvent>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof deleteEvent>>, TError,{id: string}, TContext> => {
+
+const mutationKey = ['deleteEvent'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteEvent>>, {id: string}> = (props) => {
+          const {id} = props ?? {};
+
+          return  deleteEvent(id,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type DeleteEventMutationResult = NonNullable<Awaited<ReturnType<typeof deleteEvent>>>
+    
+    export type DeleteEventMutationError = ErrorModel
+
+    /**
  * @summary Delete an existing event by id
  */
-export const useDeleteEvent = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteEvent>>,
-      TError,
-      { id: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteEvent>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  return useMutation(getDeleteEventMutationOptions(options), queryClient);
-};
-/**
+export const useDeleteEvent = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteEvent>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof deleteEvent>>,
+        TError,
+        {id: string},
+        TContext
+      > => {
+      return useMutation(getDeleteEventMutationOptions(options), queryClient);
+    }
+    /**
  * Updates an existing event
  * @summary Update an existing event
  */
 export type updateEventResponse200 = {
-  data: Event;
-  status: 200;
-};
+  data: Event
+  status: 200
+}
 
 export type updateEventResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type updateEventResponseSuccess = updateEventResponse200 & {
+export type updateEventResponseSuccess = (updateEventResponse200) & {
   headers: Headers;
 };
-export type updateEventResponseError = updateEventResponseDefault & {
+export type updateEventResponseError = (updateEventResponseDefault) & {
   headers: Headers;
 };
 
-export type updateEventResponse =
-  | updateEventResponseSuccess
-  | updateEventResponseError;
+export type updateEventResponse = (updateEventResponseSuccess | updateEventResponseError)
 
-export const getUpdateEventUrl = (id: string) => {
-  return `/api/v1/events/${id}`;
-};
+export const getUpdateEventUrl = (id: string,) => {
 
-export const updateEvent = async (
-  id: string,
-  updateEventBody: UpdateEventBody,
-  options?: RequestInit,
-): Promise<updateEventResponse> => {
-  const formData = new FormData();
-  if (updateEventBody.age_range_max !== undefined) {
-    formData.append(`age_range_max`, updateEventBody.age_range_max.toString());
-  }
-  if (updateEventBody.age_range_min !== undefined) {
-    formData.append(`age_range_min`, updateEventBody.age_range_min.toString());
-  }
-  if (updateEventBody.category !== undefined) {
-    updateEventBody.category.forEach((value) =>
-      formData.append(`category`, value),
-    );
-  }
-  if (updateEventBody.description !== undefined) {
-    formData.append(
-      `description`,
-      updateEventBody.description instanceof Blob
-        ? updateEventBody.description
-        : new Blob([updateEventBody.description], { type: "text/plain" }),
-    );
-  }
-  if (updateEventBody.header_image !== undefined) {
-    formData.append(`header_image`, updateEventBody.header_image);
-  }
-  if (updateEventBody.organization_id !== undefined) {
-    formData.append(
-      `organization_id`,
-      updateEventBody.organization_id instanceof Blob
-        ? updateEventBody.organization_id
-        : new Blob([updateEventBody.organization_id], { type: "text/plain" }),
-    );
-  }
-  if (updateEventBody.title !== undefined) {
-    formData.append(
-      `title`,
-      updateEventBody.title instanceof Blob
-        ? updateEventBody.title
-        : new Blob([updateEventBody.title], { type: "text/plain" }),
-    );
-  }
 
-  return customInstance<updateEventResponse>(getUpdateEventUrl(id), {
+  
+
+  return `/api/v1/events/${id}`
+}
+
+export const updateEvent = async (id: string,
+    updateEventBody: UpdateEventBody, options?: RequestInit): Promise<updateEventResponse> => {
+    const formData = new FormData();
+if(updateEventBody.age_range_max !== undefined) {
+ formData.append(`age_range_max`, updateEventBody.age_range_max.toString())
+ }
+if(updateEventBody.age_range_min !== undefined) {
+ formData.append(`age_range_min`, updateEventBody.age_range_min.toString())
+ }
+if(updateEventBody.category !== undefined) {
+ updateEventBody.category.forEach(value => formData.append(`category`, value));
+ }
+if(updateEventBody.description !== undefined) {
+ formData.append(`description`, updateEventBody.description instanceof Blob ? updateEventBody.description : new Blob([updateEventBody.description], { type: 'text/plain' }));
+ }
+if(updateEventBody.header_image !== undefined) {
+ formData.append(`header_image`, updateEventBody.header_image);
+ }
+if(updateEventBody.organization_id !== undefined) {
+ formData.append(`organization_id`, updateEventBody.organization_id instanceof Blob ? updateEventBody.organization_id : new Blob([updateEventBody.organization_id], { type: 'text/plain' }));
+ }
+if(updateEventBody.title !== undefined) {
+ formData.append(`title`, updateEventBody.title instanceof Blob ? updateEventBody.title : new Blob([updateEventBody.title], { type: 'text/plain' }));
+ }
+
+  return customInstance<updateEventResponse>(getUpdateEventUrl(id),
+  {      
     ...options,
-    method: "PATCH",
-    body: formData,
-  });
-};
+    method: 'PATCH'
+    ,
+    body: 
+      formData,
+  }
+);}
 
-export const getUpdateEventMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof updateEvent>>,
-    TError,
-    { id: string; data: UpdateEventBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof updateEvent>>,
-  TError,
-  { id: string; data: UpdateEventBody },
-  TContext
-> => {
-  const mutationKey = ["updateEvent"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof updateEvent>>,
-    { id: string; data: UpdateEventBody }
-  > = (props) => {
-    const { id, data } = props ?? {};
-
-    return updateEvent(id, data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type UpdateEventMutationResult = NonNullable<
-  Awaited<ReturnType<typeof updateEvent>>
->;
-export type UpdateEventMutationBody = UpdateEventBody;
-export type UpdateEventMutationError = ErrorModel;
 
-/**
+
+export const getUpdateEventMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateEvent>>, TError,{id: string;data: UpdateEventBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof updateEvent>>, TError,{id: string;data: UpdateEventBody}, TContext> => {
+
+const mutationKey = ['updateEvent'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof updateEvent>>, {id: string;data: UpdateEventBody}> = (props) => {
+          const {id,data} = props ?? {};
+
+          return  updateEvent(id,data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type UpdateEventMutationResult = NonNullable<Awaited<ReturnType<typeof updateEvent>>>
+    export type UpdateEventMutationBody = UpdateEventBody
+    export type UpdateEventMutationError = ErrorModel
+
+    /**
  * @summary Update an existing event
  */
-export const useUpdateEvent = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof updateEvent>>,
-      TError,
-      { id: string; data: UpdateEventBody },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof updateEvent>>,
-  TError,
-  { id: string; data: UpdateEventBody },
-  TContext
-> => {
-  return useMutation(getUpdateEventMutationOptions(options), queryClient);
-};
+export const useUpdateEvent = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateEvent>>, TError,{id: string;data: UpdateEventBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof updateEvent>>,
+        TError,
+        {id: string;data: UpdateEventBody},
+        TContext
+      > => {
+      return useMutation(getUpdateEventMutationOptions(options), queryClient);
+    }
+    
\ No newline at end of file
diff --git a/frontend/packages/api-client/src/generated/geocoding/geocoding.ts b/frontend/packages/api-client/src/generated/geocoding/geocoding.ts
new file mode 100644
index 00000000..4e197b92
--- /dev/null
+++ b/frontend/packages/api-client/src/generated/geocoding/geocoding.ts
@@ -0,0 +1,156 @@
+/**
+ * Generated by orval v8.4.0 🍺
+ * Do not edit manually.
+ * SkillSpark API
+ * API for the SkillSpark application
+ * OpenAPI spec version: 1.0.0
+ */
+import {
+  useMutation
+} from '@tanstack/react-query';
+import type {
+  MutationFunction,
+  QueryClient,
+  UseMutationOptions,
+  UseMutationResult
+} from '@tanstack/react-query';
+
+import type {
+  ErrorModel,
+  GeocodeAddressInputBody,
+  GeocodeAddressOutputBody
+} from '../skillSparkAPI.schemas';
+
+import { customInstance } from '../../apiClient';
+
+// https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
+
+type WritableKeys<T> = {
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
+}[keyof T];
+
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
+type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
+
+type Writable<T> = Pick<T, WritableKeys<T>>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
+
+type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
+
+
+
+export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
+export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
+export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
+export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
+
+/**
+ * Validates a text address via OpenCage and returns its latitude and longitude.
+ * @summary Geocode a text address
+ */
+export type geocodeAddressResponse200 = {
+  data: GeocodeAddressOutputBody
+  status: 200
+}
+
+export type geocodeAddressResponseDefault = {
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
+
+export type geocodeAddressResponseSuccess = (geocodeAddressResponse200) & {
+  headers: Headers;
+};
+export type geocodeAddressResponseError = (geocodeAddressResponseDefault) & {
+  headers: Headers;
+};
+
+export type geocodeAddressResponse = (geocodeAddressResponseSuccess | geocodeAddressResponseError)
+
+export const getGeocodeAddressUrl = () => {
+
+
+  
+
+  return `/api/v1/geocode`
+}
+
+export const geocodeAddress = async (geocodeAddressInputBody: NonReadonly<GeocodeAddressInputBody>, options?: RequestInit): Promise<geocodeAddressResponse> => {
+  
+  return customInstance<geocodeAddressResponse>(getGeocodeAddressUrl(),
+  {      
+    ...options,
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      geocodeAddressInputBody,)
+  }
+);}
+
+
+
+
+export const getGeocodeAddressMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof geocodeAddress>>, TError,{data: NonReadonly<GeocodeAddressInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof geocodeAddress>>, TError,{data: NonReadonly<GeocodeAddressInputBody>}, TContext> => {
+
+const mutationKey = ['geocodeAddress'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof geocodeAddress>>, {data: NonReadonly<GeocodeAddressInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  geocodeAddress(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type GeocodeAddressMutationResult = NonNullable<Awaited<ReturnType<typeof geocodeAddress>>>
+    export type GeocodeAddressMutationBody = NonReadonly<GeocodeAddressInputBody>
+    export type GeocodeAddressMutationError = ErrorModel
+
+    /**
+ * @summary Geocode a text address
+ */
+export const useGeocodeAddress = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof geocodeAddress>>, TError,{data: NonReadonly<GeocodeAddressInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof geocodeAddress>>,
+        TError,
+        {data: NonReadonly<GeocodeAddressInputBody>},
+        TContext
+      > => {
+      return useMutation(getGeocodeAddressMutationOptions(options), queryClient);
+    }
+    
\ No newline at end of file
diff --git a/frontend/packages/api-client/src/generated/guardians/guardians.ts b/frontend/packages/api-client/src/generated/guardians/guardians.ts
index 1b7ec8e8..dbb24529 100644
--- a/frontend/packages/api-client/src/generated/guardians/guardians.ts
+++ b/frontend/packages/api-client/src/generated/guardians/guardians.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,685 +21,470 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   ErrorModel,
   Guardian,
-  UpdateGuardianInputBody,
-} from "../skillSparkAPI.schemas";
+  UpdateGuardianInputBody
+} from '../skillSparkAPI.schemas';
 
-import { customInstance } from "../../apiClient";
+import { customInstance } from '../../apiClient';
 
 // https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> =
-  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
 
 type WritableKeys<T> = {
-  [P in keyof T]-?: IfEquals<
-    { [Q in P]: T[P] },
-    { -readonly [Q in P]: T[P] },
-    P
-  >;
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
 }[keyof T];
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
-) => void
-  ? I
-  : never;
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
 type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
 
 type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>]
-  ? {
-      [P in keyof Writable<T>]: T[P] extends object
-        ? NonReadonly<NonNullable<T[P]>>
-        : T[P];
-    }
-  : DistributeReadOnlyOverUnions<T>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Returns a guardian by id
  * @summary Get a guardian by id
  */
 export type getGuardianByIdResponse200 = {
-  data: Guardian;
-  status: 200;
-};
+  data: Guardian
+  status: 200
+}
 
 export type getGuardianByIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getGuardianByIdResponseSuccess = getGuardianByIdResponse200 & {
+export type getGuardianByIdResponseSuccess = (getGuardianByIdResponse200) & {
   headers: Headers;
 };
-export type getGuardianByIdResponseError = getGuardianByIdResponseDefault & {
+export type getGuardianByIdResponseError = (getGuardianByIdResponseDefault) & {
   headers: Headers;
 };
 
-export type getGuardianByIdResponse =
-  | getGuardianByIdResponseSuccess
-  | getGuardianByIdResponseError;
+export type getGuardianByIdResponse = (getGuardianByIdResponseSuccess | getGuardianByIdResponseError)
 
-export const getGetGuardianByIdUrl = (id: string) => {
-  return `/api/v1/guardians/${id}`;
-};
+export const getGetGuardianByIdUrl = (id: string,) => {
+
+
+  
+
+  return `/api/v1/guardians/${id}`
+}
 
-export const getGuardianById = async (
-  id: string,
-  options?: RequestInit,
-): Promise<getGuardianByIdResponse> => {
-  return customInstance<getGuardianByIdResponse>(getGetGuardianByIdUrl(id), {
+export const getGuardianById = async (id: string, options?: RequestInit): Promise<getGuardianByIdResponse> => {
+  
+  return customInstance<getGuardianByIdResponse>(getGetGuardianByIdUrl(id),
+  {      
     ...options,
-    method: "GET",
-  });
-};
+    method: 'GET'
+    
+    
+  }
+);}
 
-export const getGetGuardianByIdQueryKey = (id: string) => {
-  return [`/api/v1/guardians/${id}`] as const;
-};
 
-export const getGetGuardianByIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getGuardianById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+
+
+export const getGetGuardianByIdQueryKey = (id: string,) => {
+    return [
+    `/api/v1/guardians/${id}`
+    ] as const;
+    }
+
+    
+export const getGetGuardianByIdQueryOptions = <TData = Awaited<ReturnType<typeof getGuardianById>>, TError = ErrorModel>(id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getGetGuardianByIdQueryKey(id);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof getGuardianById>>> = ({
-    signal,
-  }) => getGuardianById(id, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getGuardianById>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetGuardianByIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getGuardianById>>
->;
-export type GetGuardianByIdQueryError = ErrorModel;
-
-export function useGetGuardianById<
-  TData = Awaited<ReturnType<typeof getGuardianById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianById>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetGuardianByIdQueryKey(id);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getGuardianById>>> = ({ signal }) => getGuardianById(id, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getGuardianById>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetGuardianByIdQueryResult = NonNullable<Awaited<ReturnType<typeof getGuardianById>>>
+export type GetGuardianByIdQueryError = ErrorModel
+
+
+export function useGetGuardianById<TData = Awaited<ReturnType<typeof getGuardianById>>, TError = ErrorModel>(
+ id: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianById>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getGuardianById>>,
           TError,
           Awaited<ReturnType<typeof getGuardianById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetGuardianById<
-  TData = Awaited<ReturnType<typeof getGuardianById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianById>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetGuardianById<TData = Awaited<ReturnType<typeof getGuardianById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianById>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getGuardianById>>,
           TError,
           Awaited<ReturnType<typeof getGuardianById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetGuardianById<
-  TData = Awaited<ReturnType<typeof getGuardianById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetGuardianById<TData = Awaited<ReturnType<typeof getGuardianById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get a guardian by id
  */
 
-export function useGetGuardianById<
-  TData = Awaited<ReturnType<typeof getGuardianById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetGuardianByIdQueryOptions(id, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetGuardianById<TData = Awaited<ReturnType<typeof getGuardianById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetGuardianByIdQueryOptions(id,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Updates a guardian by id
  * @summary Update a guardian by id
  */
 export type updateGuardianResponse200 = {
-  data: Guardian;
-  status: 200;
-};
+  data: Guardian
+  status: 200
+}
 
 export type updateGuardianResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type updateGuardianResponseSuccess = updateGuardianResponse200 & {
+export type updateGuardianResponseSuccess = (updateGuardianResponse200) & {
   headers: Headers;
 };
-export type updateGuardianResponseError = updateGuardianResponseDefault & {
+export type updateGuardianResponseError = (updateGuardianResponseDefault) & {
   headers: Headers;
 };
 
-export type updateGuardianResponse =
-  | updateGuardianResponseSuccess
-  | updateGuardianResponseError;
+export type updateGuardianResponse = (updateGuardianResponseSuccess | updateGuardianResponseError)
+
+export const getUpdateGuardianUrl = (id: string,) => {
 
-export const getUpdateGuardianUrl = (id: string) => {
-  return `/api/v1/guardians/${id}`;
-};
 
-export const updateGuardian = async (
-  id: string,
-  updateGuardianInputBody: NonReadonly<UpdateGuardianInputBody>,
-  options?: RequestInit,
-): Promise<updateGuardianResponse> => {
-  return customInstance<updateGuardianResponse>(getUpdateGuardianUrl(id), {
+  
+
+  return `/api/v1/guardians/${id}`
+}
+
+export const updateGuardian = async (id: string,
+    updateGuardianInputBody: NonReadonly<UpdateGuardianInputBody>, options?: RequestInit): Promise<updateGuardianResponse> => {
+  
+  return customInstance<updateGuardianResponse>(getUpdateGuardianUrl(id),
+  {      
     ...options,
-    method: "PUT",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(updateGuardianInputBody),
-  });
-};
+    method: 'PUT',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      updateGuardianInputBody,)
+  }
+);}
 
-export const getUpdateGuardianMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof updateGuardian>>,
-    TError,
-    { id: string; data: NonReadonly<UpdateGuardianInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof updateGuardian>>,
-  TError,
-  { id: string; data: NonReadonly<UpdateGuardianInputBody> },
-  TContext
-> => {
-  const mutationKey = ["updateGuardian"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof updateGuardian>>,
-    { id: string; data: NonReadonly<UpdateGuardianInputBody> }
-  > = (props) => {
-    const { id, data } = props ?? {};
-
-    return updateGuardian(id, data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type UpdateGuardianMutationResult = NonNullable<
-  Awaited<ReturnType<typeof updateGuardian>>
->;
-export type UpdateGuardianMutationBody = NonReadonly<UpdateGuardianInputBody>;
-export type UpdateGuardianMutationError = ErrorModel;
 
-/**
+
+export const getUpdateGuardianMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateGuardian>>, TError,{id: string;data: NonReadonly<UpdateGuardianInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof updateGuardian>>, TError,{id: string;data: NonReadonly<UpdateGuardianInputBody>}, TContext> => {
+
+const mutationKey = ['updateGuardian'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof updateGuardian>>, {id: string;data: NonReadonly<UpdateGuardianInputBody>}> = (props) => {
+          const {id,data} = props ?? {};
+
+          return  updateGuardian(id,data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type UpdateGuardianMutationResult = NonNullable<Awaited<ReturnType<typeof updateGuardian>>>
+    export type UpdateGuardianMutationBody = NonReadonly<UpdateGuardianInputBody>
+    export type UpdateGuardianMutationError = ErrorModel
+
+    /**
  * @summary Update a guardian by id
  */
-export const useUpdateGuardian = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof updateGuardian>>,
-      TError,
-      { id: string; data: NonReadonly<UpdateGuardianInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof updateGuardian>>,
-  TError,
-  { id: string; data: NonReadonly<UpdateGuardianInputBody> },
-  TContext
-> => {
-  return useMutation(getUpdateGuardianMutationOptions(options), queryClient);
-};
-/**
+export const useUpdateGuardian = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateGuardian>>, TError,{id: string;data: NonReadonly<UpdateGuardianInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof updateGuardian>>,
+        TError,
+        {id: string;data: NonReadonly<UpdateGuardianInputBody>},
+        TContext
+      > => {
+      return useMutation(getUpdateGuardianMutationOptions(options), queryClient);
+    }
+    /**
  * Deletes a guardian by id
  * @summary Delete a guardian by id
  */
 export type deleteGuardianResponse200 = {
-  data: Guardian;
-  status: 200;
-};
+  data: Guardian
+  status: 200
+}
 
 export type deleteGuardianResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type deleteGuardianResponseSuccess = deleteGuardianResponse200 & {
+export type deleteGuardianResponseSuccess = (deleteGuardianResponse200) & {
   headers: Headers;
 };
-export type deleteGuardianResponseError = deleteGuardianResponseDefault & {
+export type deleteGuardianResponseError = (deleteGuardianResponseDefault) & {
   headers: Headers;
 };
 
-export type deleteGuardianResponse =
-  | deleteGuardianResponseSuccess
-  | deleteGuardianResponseError;
+export type deleteGuardianResponse = (deleteGuardianResponseSuccess | deleteGuardianResponseError)
 
-export const getDeleteGuardianUrl = (id: string) => {
-  return `/api/v1/guardians/${id}`;
-};
+export const getDeleteGuardianUrl = (id: string,) => {
+
+
+  
+
+  return `/api/v1/guardians/${id}`
+}
 
-export const deleteGuardian = async (
-  id: string,
-  options?: RequestInit,
-): Promise<deleteGuardianResponse> => {
-  return customInstance<deleteGuardianResponse>(getDeleteGuardianUrl(id), {
+export const deleteGuardian = async (id: string, options?: RequestInit): Promise<deleteGuardianResponse> => {
+  
+  return customInstance<deleteGuardianResponse>(getDeleteGuardianUrl(id),
+  {      
     ...options,
-    method: "DELETE",
-  });
-};
+    method: 'DELETE'
+    
+    
+  }
+);}
 
-export const getDeleteGuardianMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteGuardian>>,
-    TError,
-    { id: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteGuardian>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  const mutationKey = ["deleteGuardian"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteGuardian>>,
-    { id: string }
-  > = (props) => {
-    const { id } = props ?? {};
-
-    return deleteGuardian(id, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type DeleteGuardianMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteGuardian>>
->;
 
-export type DeleteGuardianMutationError = ErrorModel;
 
-/**
+export const getDeleteGuardianMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteGuardian>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof deleteGuardian>>, TError,{id: string}, TContext> => {
+
+const mutationKey = ['deleteGuardian'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteGuardian>>, {id: string}> = (props) => {
+          const {id} = props ?? {};
+
+          return  deleteGuardian(id,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type DeleteGuardianMutationResult = NonNullable<Awaited<ReturnType<typeof deleteGuardian>>>
+    
+    export type DeleteGuardianMutationError = ErrorModel
+
+    /**
  * @summary Delete a guardian by id
  */
-export const useDeleteGuardian = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteGuardian>>,
-      TError,
-      { id: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteGuardian>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  return useMutation(getDeleteGuardianMutationOptions(options), queryClient);
-};
-/**
+export const useDeleteGuardian = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteGuardian>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof deleteGuardian>>,
+        TError,
+        {id: string},
+        TContext
+      > => {
+      return useMutation(getDeleteGuardianMutationOptions(options), queryClient);
+    }
+    /**
  * Returns a guardian by child id
  * @summary Get a guardian by child id
  */
 export type getGuardianByChildIdResponse200 = {
-  data: Guardian;
-  status: 200;
-};
+  data: Guardian
+  status: 200
+}
 
 export type getGuardianByChildIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getGuardianByChildIdResponseSuccess =
-  getGuardianByChildIdResponse200 & {
-    headers: Headers;
-  };
-export type getGuardianByChildIdResponseError =
-  getGuardianByChildIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getGuardianByChildIdResponse =
-  | getGuardianByChildIdResponseSuccess
-  | getGuardianByChildIdResponseError;
-
-export const getGetGuardianByChildIdUrl = (childId: string) => {
-  return `/api/v1/guardians/child/${childId}`;
+export type getGuardianByChildIdResponseSuccess = (getGuardianByChildIdResponse200) & {
+  headers: Headers;
 };
-
-export const getGuardianByChildId = async (
-  childId: string,
-  options?: RequestInit,
-): Promise<getGuardianByChildIdResponse> => {
-  return customInstance<getGuardianByChildIdResponse>(
-    getGetGuardianByChildIdUrl(childId),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getGuardianByChildIdResponseError = (getGuardianByChildIdResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetGuardianByChildIdQueryKey = (childId: string) => {
-  return [`/api/v1/guardians/child/${childId}`] as const;
-};
+export type getGuardianByChildIdResponse = (getGuardianByChildIdResponseSuccess | getGuardianByChildIdResponseError)
 
-export const getGetGuardianByChildIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getGuardianByChildId>>,
-  TError = ErrorModel,
->(
-  childId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianByChildId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetGuardianByChildIdUrl = (childId: string,) => {
+
+
+  
+
+  return `/api/v1/guardians/child/${childId}`
+}
+
+export const getGuardianByChildId = async (childId: string, options?: RequestInit): Promise<getGuardianByChildIdResponse> => {
+  
+  return customInstance<getGuardianByChildIdResponse>(getGetGuardianByChildIdUrl(childId),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetGuardianByChildIdQueryKey = (childId: string,) => {
+    return [
+    `/api/v1/guardians/child/${childId}`
+    ] as const;
+    }
+
+    
+export const getGetGuardianByChildIdQueryOptions = <TData = Awaited<ReturnType<typeof getGuardianByChildId>>, TError = ErrorModel>(childId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianByChildId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetGuardianByChildIdQueryKey(childId);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getGuardianByChildId>>
-  > = ({ signal }) =>
-    getGuardianByChildId(childId, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!childId,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getGuardianByChildId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetGuardianByChildIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getGuardianByChildId>>
->;
-export type GetGuardianByChildIdQueryError = ErrorModel;
-
-export function useGetGuardianByChildId<
-  TData = Awaited<ReturnType<typeof getGuardianByChildId>>,
-  TError = ErrorModel,
->(
-  childId: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianByChildId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetGuardianByChildIdQueryKey(childId);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getGuardianByChildId>>> = ({ signal }) => getGuardianByChildId(childId, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(childId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getGuardianByChildId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetGuardianByChildIdQueryResult = NonNullable<Awaited<ReturnType<typeof getGuardianByChildId>>>
+export type GetGuardianByChildIdQueryError = ErrorModel
+
+
+export function useGetGuardianByChildId<TData = Awaited<ReturnType<typeof getGuardianByChildId>>, TError = ErrorModel>(
+ childId: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianByChildId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getGuardianByChildId>>,
           TError,
           Awaited<ReturnType<typeof getGuardianByChildId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetGuardianByChildId<
-  TData = Awaited<ReturnType<typeof getGuardianByChildId>>,
-  TError = ErrorModel,
->(
-  childId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianByChildId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetGuardianByChildId<TData = Awaited<ReturnType<typeof getGuardianByChildId>>, TError = ErrorModel>(
+ childId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianByChildId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getGuardianByChildId>>,
           TError,
           Awaited<ReturnType<typeof getGuardianByChildId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetGuardianByChildId<
-  TData = Awaited<ReturnType<typeof getGuardianByChildId>>,
-  TError = ErrorModel,
->(
-  childId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianByChildId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetGuardianByChildId<TData = Awaited<ReturnType<typeof getGuardianByChildId>>, TError = ErrorModel>(
+ childId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianByChildId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get a guardian by child id
  */
 
-export function useGetGuardianByChildId<
-  TData = Awaited<ReturnType<typeof getGuardianByChildId>>,
-  TError = ErrorModel,
->(
-  childId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianByChildId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetGuardianByChildIdQueryOptions(childId, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetGuardianByChildId<TData = Awaited<ReturnType<typeof getGuardianByChildId>>, TError = ErrorModel>(
+ childId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianByChildId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetGuardianByChildIdQueryOptions(childId,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
+
+
+
+
diff --git a/frontend/packages/api-client/src/generated/health/health.ts b/frontend/packages/api-client/src/generated/health/health.ts
index 9545e9e1..a8ec07bb 100644
--- a/frontend/packages/api-client/src/generated/health/health.ts
+++ b/frontend/packages/api-client/src/generated/health/health.ts
@@ -5,7 +5,9 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useQuery } from "@tanstack/react-query";
+import {
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -15,210 +17,144 @@ import type {
   QueryKey,
   UndefinedInitialDataOptions,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
-import type { ErrorModel, HealthOutputBody } from "../skillSparkAPI.schemas";
+import type {
+  ErrorModel,
+  HealthOutputBody
+} from '../skillSparkAPI.schemas';
+
+import { customInstance } from '../../apiClient';
 
-import { customInstance } from "../../apiClient";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Check if the API is running and healthy
  * @summary Health check
  */
 export type healthCheckResponse200 = {
-  data: HealthOutputBody;
-  status: 200;
-};
+  data: HealthOutputBody
+  status: 200
+}
 
 export type healthCheckResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type healthCheckResponseSuccess = healthCheckResponse200 & {
+export type healthCheckResponseSuccess = (healthCheckResponse200) & {
   headers: Headers;
 };
-export type healthCheckResponseError = healthCheckResponseDefault & {
+export type healthCheckResponseError = (healthCheckResponseDefault) & {
   headers: Headers;
 };
 
-export type healthCheckResponse =
-  | healthCheckResponseSuccess
-  | healthCheckResponseError;
+export type healthCheckResponse = (healthCheckResponseSuccess | healthCheckResponseError)
 
 export const getHealthCheckUrl = () => {
-  return `/api/v1/health`;
-};
 
-export const healthCheck = async (
-  options?: RequestInit,
-): Promise<healthCheckResponse> => {
-  return customInstance<healthCheckResponse>(getHealthCheckUrl(), {
+
+  
+
+  return `/api/v1/health`
+}
+
+export const healthCheck = async ( options?: RequestInit): Promise<healthCheckResponse> => {
+  
+  return customInstance<healthCheckResponse>(getHealthCheckUrl(),
+  {      
     ...options,
-    method: "GET",
-  });
-};
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
 
 export const getHealthCheckQueryKey = () => {
-  return [`/api/v1/health`] as const;
-};
+    return [
+    `/api/v1/health`
+    ] as const;
+    }
 
-export const getHealthCheckQueryOptions = <
-  TData = Awaited<ReturnType<typeof healthCheck>>,
-  TError = ErrorModel,
->(options?: {
-  query?: Partial<
-    UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData>
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getHealthCheckQueryKey();
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof healthCheck>>> = ({
-    signal,
-  }) => healthCheck({ signal, ...requestOptions });
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof healthCheck>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
+    
+export const getHealthCheckQueryOptions = <TData = Awaited<ReturnType<typeof healthCheck>>, TError = ErrorModel>( options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+) => {
+
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getHealthCheckQueryKey();
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof healthCheck>>> = ({ signal }) => healthCheck({ signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type HealthCheckQueryResult = NonNullable<Awaited<ReturnType<typeof healthCheck>>>
+export type HealthCheckQueryError = ErrorModel
 
-export type HealthCheckQueryResult = NonNullable<
-  Awaited<ReturnType<typeof healthCheck>>
->;
-export type HealthCheckQueryError = ErrorModel;
-
-export function useHealthCheck<
-  TData = Awaited<ReturnType<typeof healthCheck>>,
-  TError = ErrorModel,
->(
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData>
-    > &
-      Pick<
+
+export function useHealthCheck<TData = Awaited<ReturnType<typeof healthCheck>>, TError = ErrorModel>(
+  options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof healthCheck>>,
           TError,
           Awaited<ReturnType<typeof healthCheck>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useHealthCheck<
-  TData = Awaited<ReturnType<typeof healthCheck>>,
-  TError = ErrorModel,
->(
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData>
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useHealthCheck<TData = Awaited<ReturnType<typeof healthCheck>>, TError = ErrorModel>(
+  options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof healthCheck>>,
           TError,
           Awaited<ReturnType<typeof healthCheck>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useHealthCheck<
-  TData = Awaited<ReturnType<typeof healthCheck>>,
-  TError = ErrorModel,
->(
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useHealthCheck<TData = Awaited<ReturnType<typeof healthCheck>>, TError = ErrorModel>(
+  options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Health check
  */
 
-export function useHealthCheck<
-  TData = Awaited<ReturnType<typeof healthCheck>>,
-  TError = ErrorModel,
->(
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getHealthCheckQueryOptions(options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useHealthCheck<TData = Awaited<ReturnType<typeof healthCheck>>, TError = ErrorModel>(
+  options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof healthCheck>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getHealthCheckQueryOptions(options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
+
+
+
+
diff --git a/frontend/packages/api-client/src/generated/locations/locations.ts b/frontend/packages/api-client/src/generated/locations/locations.ts
index 9cc4ff49..bb881123 100644
--- a/frontend/packages/api-client/src/generated/locations/locations.ts
+++ b/frontend/packages/api-client/src/generated/locations/locations.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,583 +21,388 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   CreateLocationInputBody,
   ErrorModel,
   GetAllLocationsParams,
-  Location,
-} from "../skillSparkAPI.schemas";
+  Location
+} from '../skillSparkAPI.schemas';
 
-import { customInstance } from "../../apiClient";
+import { customInstance } from '../../apiClient';
 
 // https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> =
-  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
 
 type WritableKeys<T> = {
-  [P in keyof T]-?: IfEquals<
-    { [Q in P]: T[P] },
-    { -readonly [Q in P]: T[P] },
-    P
-  >;
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
 }[keyof T];
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
-) => void
-  ? I
-  : never;
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
 type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
 
 type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>]
-  ? {
-      [P in keyof Writable<T>]: T[P] extends object
-        ? NonReadonly<NonNullable<T[P]>>
-        : T[P];
-    }
-  : DistributeReadOnlyOverUnions<T>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Returns all locations
  * @summary Get all locations
  */
 export type getAllLocationsResponse200 = {
-  data: Location[];
-  status: 200;
-};
+  data: Location[]
+  status: 200
+}
 
 export type getAllLocationsResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getAllLocationsResponseSuccess = getAllLocationsResponse200 & {
+export type getAllLocationsResponseSuccess = (getAllLocationsResponse200) & {
   headers: Headers;
 };
-export type getAllLocationsResponseError = getAllLocationsResponseDefault & {
+export type getAllLocationsResponseError = (getAllLocationsResponseDefault) & {
   headers: Headers;
 };
 
-export type getAllLocationsResponse =
-  | getAllLocationsResponseSuccess
-  | getAllLocationsResponseError;
+export type getAllLocationsResponse = (getAllLocationsResponseSuccess | getAllLocationsResponseError)
 
-export const getGetAllLocationsUrl = (params?: GetAllLocationsParams) => {
+export const getGetAllLocationsUrl = (params?: GetAllLocationsParams,) => {
   const normalizedParams = new URLSearchParams();
 
   Object.entries(params || {}).forEach(([key, value]) => {
+    
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? 'null' : value.toString())
     }
   });
 
   const stringifiedParams = normalizedParams.toString();
 
-  return stringifiedParams.length > 0
-    ? `/api/v1/locations?${stringifiedParams}`
-    : `/api/v1/locations`;
-};
+  return stringifiedParams.length > 0 ? `/api/v1/locations?${stringifiedParams}` : `/api/v1/locations`
+}
 
-export const getAllLocations = async (
-  params?: GetAllLocationsParams,
-  options?: RequestInit,
-): Promise<getAllLocationsResponse> => {
-  return customInstance<getAllLocationsResponse>(
-    getGetAllLocationsUrl(params),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
-};
+export const getAllLocations = async (params?: GetAllLocationsParams, options?: RequestInit): Promise<getAllLocationsResponse> => {
+  
+  return customInstance<getAllLocationsResponse>(getGetAllLocationsUrl(params),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
 
-export const getGetAllLocationsQueryKey = (params?: GetAllLocationsParams) => {
-  return [`/api/v1/locations`, ...(params ? [params] : [])] as const;
-};
 
-export const getGetAllLocationsQueryOptions = <
-  TData = Awaited<ReturnType<typeof getAllLocations>>,
-  TError = ErrorModel,
->(
-  params?: GetAllLocationsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getAllLocations>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+
+
+export const getGetAllLocationsQueryKey = (params?: GetAllLocationsParams,) => {
+    return [
+    `/api/v1/locations`, ...(params ? [params] : [])
+    ] as const;
+    }
+
+    
+export const getGetAllLocationsQueryOptions = <TData = Awaited<ReturnType<typeof getAllLocations>>, TError = ErrorModel>(params?: GetAllLocationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllLocations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  const queryKey = queryOptions?.queryKey ?? getGetAllLocationsQueryKey(params);
+const {query: queryOptions, request: requestOptions} = options ?? {};
 
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof getAllLocations>>> = ({
-    signal,
-  }) => getAllLocations(params, { signal, ...requestOptions });
+  const queryKey =  queryOptions?.queryKey ?? getGetAllLocationsQueryKey(params);
 
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getAllLocations>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
+  
 
-export type GetAllLocationsQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getAllLocations>>
->;
-export type GetAllLocationsQueryError = ErrorModel;
-
-export function useGetAllLocations<
-  TData = Awaited<ReturnType<typeof getAllLocations>>,
-  TError = ErrorModel,
->(
-  params: undefined | GetAllLocationsParams,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getAllLocations>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getAllLocations>>> = ({ signal }) => getAllLocations(params, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getAllLocations>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetAllLocationsQueryResult = NonNullable<Awaited<ReturnType<typeof getAllLocations>>>
+export type GetAllLocationsQueryError = ErrorModel
+
+
+export function useGetAllLocations<TData = Awaited<ReturnType<typeof getAllLocations>>, TError = ErrorModel>(
+ params: undefined |  GetAllLocationsParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllLocations>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getAllLocations>>,
           TError,
           Awaited<ReturnType<typeof getAllLocations>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetAllLocations<
-  TData = Awaited<ReturnType<typeof getAllLocations>>,
-  TError = ErrorModel,
->(
-  params?: GetAllLocationsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getAllLocations>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetAllLocations<TData = Awaited<ReturnType<typeof getAllLocations>>, TError = ErrorModel>(
+ params?: GetAllLocationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllLocations>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getAllLocations>>,
           TError,
           Awaited<ReturnType<typeof getAllLocations>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetAllLocations<
-  TData = Awaited<ReturnType<typeof getAllLocations>>,
-  TError = ErrorModel,
->(
-  params?: GetAllLocationsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getAllLocations>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetAllLocations<TData = Awaited<ReturnType<typeof getAllLocations>>, TError = ErrorModel>(
+ params?: GetAllLocationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllLocations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get all locations
  */
 
-export function useGetAllLocations<
-  TData = Awaited<ReturnType<typeof getAllLocations>>,
-  TError = ErrorModel,
->(
-  params?: GetAllLocationsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getAllLocations>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetAllLocationsQueryOptions(params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetAllLocations<TData = Awaited<ReturnType<typeof getAllLocations>>, TError = ErrorModel>(
+ params?: GetAllLocationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllLocations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetAllLocationsQueryOptions(params,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Creates a new location
  * @summary Create a new location
  */
 export type postLocationResponse200 = {
-  data: Location;
-  status: 200;
-};
+  data: Location
+  status: 200
+}
 
 export type postLocationResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type postLocationResponseSuccess = postLocationResponse200 & {
+export type postLocationResponseSuccess = (postLocationResponse200) & {
   headers: Headers;
 };
-export type postLocationResponseError = postLocationResponseDefault & {
+export type postLocationResponseError = (postLocationResponseDefault) & {
   headers: Headers;
 };
 
-export type postLocationResponse =
-  | postLocationResponseSuccess
-  | postLocationResponseError;
+export type postLocationResponse = (postLocationResponseSuccess | postLocationResponseError)
 
 export const getPostLocationUrl = () => {
-  return `/api/v1/locations`;
-};
 
-export const postLocation = async (
-  createLocationInputBody: NonReadonly<CreateLocationInputBody>,
-  options?: RequestInit,
-): Promise<postLocationResponse> => {
-  return customInstance<postLocationResponse>(getPostLocationUrl(), {
+
+  
+
+  return `/api/v1/locations`
+}
+
+export const postLocation = async (createLocationInputBody: NonReadonly<CreateLocationInputBody>, options?: RequestInit): Promise<postLocationResponse> => {
+  
+  return customInstance<postLocationResponse>(getPostLocationUrl(),
+  {      
     ...options,
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(createLocationInputBody),
-  });
-};
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      createLocationInputBody,)
+  }
+);}
 
-export const getPostLocationMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof postLocation>>,
-    TError,
-    { data: NonReadonly<CreateLocationInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof postLocation>>,
-  TError,
-  { data: NonReadonly<CreateLocationInputBody> },
-  TContext
-> => {
-  const mutationKey = ["postLocation"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof postLocation>>,
-    { data: NonReadonly<CreateLocationInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return postLocation(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type PostLocationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof postLocation>>
->;
-export type PostLocationMutationBody = NonReadonly<CreateLocationInputBody>;
-export type PostLocationMutationError = ErrorModel;
 
-/**
+
+export const getPostLocationMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postLocation>>, TError,{data: NonReadonly<CreateLocationInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof postLocation>>, TError,{data: NonReadonly<CreateLocationInputBody>}, TContext> => {
+
+const mutationKey = ['postLocation'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof postLocation>>, {data: NonReadonly<CreateLocationInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  postLocation(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type PostLocationMutationResult = NonNullable<Awaited<ReturnType<typeof postLocation>>>
+    export type PostLocationMutationBody = NonReadonly<CreateLocationInputBody>
+    export type PostLocationMutationError = ErrorModel
+
+    /**
  * @summary Create a new location
  */
-export const usePostLocation = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof postLocation>>,
-      TError,
-      { data: NonReadonly<CreateLocationInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof postLocation>>,
-  TError,
-  { data: NonReadonly<CreateLocationInputBody> },
-  TContext
-> => {
-  return useMutation(getPostLocationMutationOptions(options), queryClient);
-};
-/**
+export const usePostLocation = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof postLocation>>, TError,{data: NonReadonly<CreateLocationInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof postLocation>>,
+        TError,
+        {data: NonReadonly<CreateLocationInputBody>},
+        TContext
+      > => {
+      return useMutation(getPostLocationMutationOptions(options), queryClient);
+    }
+    /**
  * Returns a location by id
  * @summary Get a location by id
  */
 export type getLocationByIdResponse200 = {
-  data: Location;
-  status: 200;
-};
+  data: Location
+  status: 200
+}
 
 export type getLocationByIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getLocationByIdResponseSuccess = getLocationByIdResponse200 & {
+export type getLocationByIdResponseSuccess = (getLocationByIdResponse200) & {
   headers: Headers;
 };
-export type getLocationByIdResponseError = getLocationByIdResponseDefault & {
+export type getLocationByIdResponseError = (getLocationByIdResponseDefault) & {
   headers: Headers;
 };
 
-export type getLocationByIdResponse =
-  | getLocationByIdResponseSuccess
-  | getLocationByIdResponseError;
+export type getLocationByIdResponse = (getLocationByIdResponseSuccess | getLocationByIdResponseError)
 
-export const getGetLocationByIdUrl = (id: string) => {
-  return `/api/v1/locations/${id}`;
-};
+export const getGetLocationByIdUrl = (id: string,) => {
+
+
+  
 
-export const getLocationById = async (
-  id: string,
-  options?: RequestInit,
-): Promise<getLocationByIdResponse> => {
-  return customInstance<getLocationByIdResponse>(getGetLocationByIdUrl(id), {
+  return `/api/v1/locations/${id}`
+}
+
+export const getLocationById = async (id: string, options?: RequestInit): Promise<getLocationByIdResponse> => {
+  
+  return customInstance<getLocationByIdResponse>(getGetLocationByIdUrl(id),
+  {      
     ...options,
-    method: "GET",
-  });
-};
+    method: 'GET'
+    
+    
+  }
+);}
 
-export const getGetLocationByIdQueryKey = (id: string) => {
-  return [`/api/v1/locations/${id}`] as const;
-};
 
-export const getGetLocationByIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getLocationById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getLocationById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+
+
+export const getGetLocationByIdQueryKey = (id: string,) => {
+    return [
+    `/api/v1/locations/${id}`
+    ] as const;
+    }
+
+    
+export const getGetLocationByIdQueryOptions = <TData = Awaited<ReturnType<typeof getLocationById>>, TError = ErrorModel>(id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getLocationById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getGetLocationByIdQueryKey(id);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof getLocationById>>> = ({
-    signal,
-  }) => getLocationById(id, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getLocationById>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetLocationByIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getLocationById>>
->;
-export type GetLocationByIdQueryError = ErrorModel;
-
-export function useGetLocationById<
-  TData = Awaited<ReturnType<typeof getLocationById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getLocationById>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetLocationByIdQueryKey(id);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getLocationById>>> = ({ signal }) => getLocationById(id, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getLocationById>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetLocationByIdQueryResult = NonNullable<Awaited<ReturnType<typeof getLocationById>>>
+export type GetLocationByIdQueryError = ErrorModel
+
+
+export function useGetLocationById<TData = Awaited<ReturnType<typeof getLocationById>>, TError = ErrorModel>(
+ id: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getLocationById>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getLocationById>>,
           TError,
           Awaited<ReturnType<typeof getLocationById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetLocationById<
-  TData = Awaited<ReturnType<typeof getLocationById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getLocationById>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetLocationById<TData = Awaited<ReturnType<typeof getLocationById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getLocationById>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getLocationById>>,
           TError,
           Awaited<ReturnType<typeof getLocationById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetLocationById<
-  TData = Awaited<ReturnType<typeof getLocationById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getLocationById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetLocationById<TData = Awaited<ReturnType<typeof getLocationById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getLocationById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get a location by id
  */
 
-export function useGetLocationById<
-  TData = Awaited<ReturnType<typeof getLocationById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getLocationById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetLocationByIdQueryOptions(id, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetLocationById<TData = Awaited<ReturnType<typeof getLocationById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getLocationById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetLocationByIdQueryOptions(id,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
+
+
+
+
diff --git a/frontend/packages/api-client/src/generated/managers/managers.ts b/frontend/packages/api-client/src/generated/managers/managers.ts
index 940e4ca3..fa442f18 100644
--- a/frontend/packages/api-client/src/generated/managers/managers.ts
+++ b/frontend/packages/api-client/src/generated/managers/managers.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,666 +21,469 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   ErrorModel,
   Manager,
-  PatchManagerInputBody,
-} from "../skillSparkAPI.schemas";
+  PatchManagerInputBody
+} from '../skillSparkAPI.schemas';
 
-import { customInstance } from "../../apiClient";
+import { customInstance } from '../../apiClient';
 
 // https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> =
-  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
 
 type WritableKeys<T> = {
-  [P in keyof T]-?: IfEquals<
-    { [Q in P]: T[P] },
-    { -readonly [Q in P]: T[P] },
-    P
-  >;
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
 }[keyof T];
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
-) => void
-  ? I
-  : never;
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
 type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
 
 type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>]
-  ? {
-      [P in keyof Writable<T>]: T[P] extends object
-        ? NonReadonly<NonNullable<T[P]>>
-        : T[P];
-    }
-  : DistributeReadOnlyOverUnions<T>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Returns a manager by id
  * @summary Updates a manager by id
  */
 export type patchManagerResponse200 = {
-  data: Manager;
-  status: 200;
-};
+  data: Manager
+  status: 200
+}
 
 export type patchManagerResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type patchManagerResponseSuccess = patchManagerResponse200 & {
+export type patchManagerResponseSuccess = (patchManagerResponse200) & {
   headers: Headers;
 };
-export type patchManagerResponseError = patchManagerResponseDefault & {
+export type patchManagerResponseError = (patchManagerResponseDefault) & {
   headers: Headers;
 };
 
-export type patchManagerResponse =
-  | patchManagerResponseSuccess
-  | patchManagerResponseError;
+export type patchManagerResponse = (patchManagerResponseSuccess | patchManagerResponseError)
 
 export const getPatchManagerUrl = () => {
-  return `/api/v1/manager`;
-};
 
-export const patchManager = async (
-  patchManagerInputBody: NonReadonly<PatchManagerInputBody>,
-  options?: RequestInit,
-): Promise<patchManagerResponse> => {
-  return customInstance<patchManagerResponse>(getPatchManagerUrl(), {
+
+  
+
+  return `/api/v1/manager`
+}
+
+export const patchManager = async (patchManagerInputBody: NonReadonly<PatchManagerInputBody>, options?: RequestInit): Promise<patchManagerResponse> => {
+  
+  return customInstance<patchManagerResponse>(getPatchManagerUrl(),
+  {      
     ...options,
-    method: "PATCH",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(patchManagerInputBody),
-  });
-};
+    method: 'PATCH',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      patchManagerInputBody,)
+  }
+);}
 
-export const getPatchManagerMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof patchManager>>,
-    TError,
-    { data: NonReadonly<PatchManagerInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof patchManager>>,
-  TError,
-  { data: NonReadonly<PatchManagerInputBody> },
-  TContext
-> => {
-  const mutationKey = ["patchManager"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof patchManager>>,
-    { data: NonReadonly<PatchManagerInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return patchManager(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type PatchManagerMutationResult = NonNullable<
-  Awaited<ReturnType<typeof patchManager>>
->;
-export type PatchManagerMutationBody = NonReadonly<PatchManagerInputBody>;
-export type PatchManagerMutationError = ErrorModel;
 
-/**
+
+export const getPatchManagerMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof patchManager>>, TError,{data: NonReadonly<PatchManagerInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof patchManager>>, TError,{data: NonReadonly<PatchManagerInputBody>}, TContext> => {
+
+const mutationKey = ['patchManager'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof patchManager>>, {data: NonReadonly<PatchManagerInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  patchManager(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type PatchManagerMutationResult = NonNullable<Awaited<ReturnType<typeof patchManager>>>
+    export type PatchManagerMutationBody = NonReadonly<PatchManagerInputBody>
+    export type PatchManagerMutationError = ErrorModel
+
+    /**
  * @summary Updates a manager by id
  */
-export const usePatchManager = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof patchManager>>,
-      TError,
-      { data: NonReadonly<PatchManagerInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof patchManager>>,
-  TError,
-  { data: NonReadonly<PatchManagerInputBody> },
-  TContext
-> => {
-  return useMutation(getPatchManagerMutationOptions(options), queryClient);
-};
-/**
+export const usePatchManager = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof patchManager>>, TError,{data: NonReadonly<PatchManagerInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof patchManager>>,
+        TError,
+        {data: NonReadonly<PatchManagerInputBody>},
+        TContext
+      > => {
+      return useMutation(getPatchManagerMutationOptions(options), queryClient);
+    }
+    /**
  * Returns a manager by id
  * @summary Get a manager by id
  */
 export type getManagerByIdResponse200 = {
-  data: Manager;
-  status: 200;
-};
+  data: Manager
+  status: 200
+}
 
 export type getManagerByIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getManagerByIdResponseSuccess = getManagerByIdResponse200 & {
+export type getManagerByIdResponseSuccess = (getManagerByIdResponse200) & {
   headers: Headers;
 };
-export type getManagerByIdResponseError = getManagerByIdResponseDefault & {
+export type getManagerByIdResponseError = (getManagerByIdResponseDefault) & {
   headers: Headers;
 };
 
-export type getManagerByIdResponse =
-  | getManagerByIdResponseSuccess
-  | getManagerByIdResponseError;
+export type getManagerByIdResponse = (getManagerByIdResponseSuccess | getManagerByIdResponseError)
 
-export const getGetManagerByIdUrl = (id: string) => {
-  return `/api/v1/manager/${id}`;
-};
+export const getGetManagerByIdUrl = (id: string,) => {
 
-export const getManagerById = async (
-  id: string,
-  options?: RequestInit,
-): Promise<getManagerByIdResponse> => {
-  return customInstance<getManagerByIdResponse>(getGetManagerByIdUrl(id), {
+
+  
+
+  return `/api/v1/manager/${id}`
+}
+
+export const getManagerById = async (id: string, options?: RequestInit): Promise<getManagerByIdResponse> => {
+  
+  return customInstance<getManagerByIdResponse>(getGetManagerByIdUrl(id),
+  {      
     ...options,
-    method: "GET",
-  });
-};
+    method: 'GET'
+    
+    
+  }
+);}
+
+
 
-export const getGetManagerByIdQueryKey = (id: string) => {
-  return [`/api/v1/manager/${id}`] as const;
-};
 
-export const getGetManagerByIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getManagerById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+export const getGetManagerByIdQueryKey = (id: string,) => {
+    return [
+    `/api/v1/manager/${id}`
+    ] as const;
+    }
+
+    
+export const getGetManagerByIdQueryOptions = <TData = Awaited<ReturnType<typeof getManagerById>>, TError = ErrorModel>(id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getGetManagerByIdQueryKey(id);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof getManagerById>>> = ({
-    signal,
-  }) => getManagerById(id, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getManagerById>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetManagerByIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getManagerById>>
->;
-export type GetManagerByIdQueryError = ErrorModel;
-
-export function useGetManagerById<
-  TData = Awaited<ReturnType<typeof getManagerById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData>
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetManagerByIdQueryKey(id);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getManagerById>>> = ({ signal }) => getManagerById(id, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetManagerByIdQueryResult = NonNullable<Awaited<ReturnType<typeof getManagerById>>>
+export type GetManagerByIdQueryError = ErrorModel
+
+
+export function useGetManagerById<TData = Awaited<ReturnType<typeof getManagerById>>, TError = ErrorModel>(
+ id: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getManagerById>>,
           TError,
           Awaited<ReturnType<typeof getManagerById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetManagerById<
-  TData = Awaited<ReturnType<typeof getManagerById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData>
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetManagerById<TData = Awaited<ReturnType<typeof getManagerById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getManagerById>>,
           TError,
           Awaited<ReturnType<typeof getManagerById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetManagerById<
-  TData = Awaited<ReturnType<typeof getManagerById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetManagerById<TData = Awaited<ReturnType<typeof getManagerById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get a manager by id
  */
 
-export function useGetManagerById<
-  TData = Awaited<ReturnType<typeof getManagerById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetManagerByIdQueryOptions(id, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetManagerById<TData = Awaited<ReturnType<typeof getManagerById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getManagerById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetManagerByIdQueryOptions(id,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Returns a manager by id
  * @summary Deletes a manager by id
  */
 export type deleteManagerResponse200 = {
-  data: Manager;
-  status: 200;
-};
+  data: Manager
+  status: 200
+}
 
 export type deleteManagerResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type deleteManagerResponseSuccess = deleteManagerResponse200 & {
+export type deleteManagerResponseSuccess = (deleteManagerResponse200) & {
   headers: Headers;
 };
-export type deleteManagerResponseError = deleteManagerResponseDefault & {
+export type deleteManagerResponseError = (deleteManagerResponseDefault) & {
   headers: Headers;
 };
 
-export type deleteManagerResponse =
-  | deleteManagerResponseSuccess
-  | deleteManagerResponseError;
+export type deleteManagerResponse = (deleteManagerResponseSuccess | deleteManagerResponseError)
+
+export const getDeleteManagerUrl = (id: string,) => {
 
-export const getDeleteManagerUrl = (id: string) => {
-  return `/api/v1/manager/${id}`;
-};
 
-export const deleteManager = async (
-  id: string,
-  options?: RequestInit,
-): Promise<deleteManagerResponse> => {
-  return customInstance<deleteManagerResponse>(getDeleteManagerUrl(id), {
+  
+
+  return `/api/v1/manager/${id}`
+}
+
+export const deleteManager = async (id: string, options?: RequestInit): Promise<deleteManagerResponse> => {
+  
+  return customInstance<deleteManagerResponse>(getDeleteManagerUrl(id),
+  {      
     ...options,
-    method: "DELETE",
-  });
-};
+    method: 'DELETE'
+    
+    
+  }
+);}
 
-export const getDeleteManagerMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteManager>>,
-    TError,
-    { id: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteManager>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  const mutationKey = ["deleteManager"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteManager>>,
-    { id: string }
-  > = (props) => {
-    const { id } = props ?? {};
-
-    return deleteManager(id, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type DeleteManagerMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteManager>>
->;
 
-export type DeleteManagerMutationError = ErrorModel;
 
-/**
+export const getDeleteManagerMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteManager>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof deleteManager>>, TError,{id: string}, TContext> => {
+
+const mutationKey = ['deleteManager'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteManager>>, {id: string}> = (props) => {
+          const {id} = props ?? {};
+
+          return  deleteManager(id,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type DeleteManagerMutationResult = NonNullable<Awaited<ReturnType<typeof deleteManager>>>
+    
+    export type DeleteManagerMutationError = ErrorModel
+
+    /**
  * @summary Deletes a manager by id
  */
-export const useDeleteManager = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteManager>>,
-      TError,
-      { id: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteManager>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  return useMutation(getDeleteManagerMutationOptions(options), queryClient);
-};
-/**
+export const useDeleteManager = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteManager>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof deleteManager>>,
+        TError,
+        {id: string},
+        TContext
+      > => {
+      return useMutation(getDeleteManagerMutationOptions(options), queryClient);
+    }
+    /**
  * Returns a manager by organization id
  * @summary Get a manager by organization id
  */
 export type getManagerByOrgIdResponse200 = {
-  data: Manager;
-  status: 200;
-};
+  data: Manager
+  status: 200
+}
 
 export type getManagerByOrgIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getManagerByOrgIdResponseSuccess = getManagerByOrgIdResponse200 & {
+export type getManagerByOrgIdResponseSuccess = (getManagerByOrgIdResponse200) & {
+  headers: Headers;
+};
+export type getManagerByOrgIdResponseError = (getManagerByOrgIdResponseDefault) & {
   headers: Headers;
 };
-export type getManagerByOrgIdResponseError =
-  getManagerByOrgIdResponseDefault & {
-    headers: Headers;
-  };
 
-export type getManagerByOrgIdResponse =
-  | getManagerByOrgIdResponseSuccess
-  | getManagerByOrgIdResponseError;
+export type getManagerByOrgIdResponse = (getManagerByOrgIdResponseSuccess | getManagerByOrgIdResponseError)
 
-export const getGetManagerByOrgIdUrl = (organizationId: string) => {
-  return `/api/v1/manager/org/${organizationId}`;
-};
+export const getGetManagerByOrgIdUrl = (organizationId: string,) => {
 
-export const getManagerByOrgId = async (
-  organizationId: string,
-  options?: RequestInit,
-): Promise<getManagerByOrgIdResponse> => {
-  return customInstance<getManagerByOrgIdResponse>(
-    getGetManagerByOrgIdUrl(organizationId),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
-};
 
-export const getGetManagerByOrgIdQueryKey = (organizationId: string) => {
-  return [`/api/v1/manager/org/${organizationId}`] as const;
-};
+  
 
-export const getGetManagerByOrgIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getManagerByOrgId>>,
-  TError = ErrorModel,
->(
-  organizationId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getManagerByOrgId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+  return `/api/v1/manager/org/${organizationId}`
+}
+
+export const getManagerByOrgId = async (organizationId: string, options?: RequestInit): Promise<getManagerByOrgIdResponse> => {
+  
+  return customInstance<getManagerByOrgIdResponse>(getGetManagerByOrgIdUrl(organizationId),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetManagerByOrgIdQueryKey = (organizationId: string,) => {
+    return [
+    `/api/v1/manager/org/${organizationId}`
+    ] as const;
+    }
+
+    
+export const getGetManagerByOrgIdQueryOptions = <TData = Awaited<ReturnType<typeof getManagerByOrgId>>, TError = ErrorModel>(organizationId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getManagerByOrgId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetManagerByOrgIdQueryKey(organizationId);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getManagerByOrgId>>
-  > = ({ signal }) =>
-    getManagerByOrgId(organizationId, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!organizationId,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getManagerByOrgId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetManagerByOrgIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getManagerByOrgId>>
->;
-export type GetManagerByOrgIdQueryError = ErrorModel;
-
-export function useGetManagerByOrgId<
-  TData = Awaited<ReturnType<typeof getManagerByOrgId>>,
-  TError = ErrorModel,
->(
-  organizationId: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getManagerByOrgId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetManagerByOrgIdQueryKey(organizationId);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getManagerByOrgId>>> = ({ signal }) => getManagerByOrgId(organizationId, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(organizationId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getManagerByOrgId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetManagerByOrgIdQueryResult = NonNullable<Awaited<ReturnType<typeof getManagerByOrgId>>>
+export type GetManagerByOrgIdQueryError = ErrorModel
+
+
+export function useGetManagerByOrgId<TData = Awaited<ReturnType<typeof getManagerByOrgId>>, TError = ErrorModel>(
+ organizationId: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getManagerByOrgId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getManagerByOrgId>>,
           TError,
           Awaited<ReturnType<typeof getManagerByOrgId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetManagerByOrgId<
-  TData = Awaited<ReturnType<typeof getManagerByOrgId>>,
-  TError = ErrorModel,
->(
-  organizationId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getManagerByOrgId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetManagerByOrgId<TData = Awaited<ReturnType<typeof getManagerByOrgId>>, TError = ErrorModel>(
+ organizationId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getManagerByOrgId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getManagerByOrgId>>,
           TError,
           Awaited<ReturnType<typeof getManagerByOrgId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetManagerByOrgId<
-  TData = Awaited<ReturnType<typeof getManagerByOrgId>>,
-  TError = ErrorModel,
->(
-  organizationId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getManagerByOrgId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetManagerByOrgId<TData = Awaited<ReturnType<typeof getManagerByOrgId>>, TError = ErrorModel>(
+ organizationId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getManagerByOrgId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get a manager by organization id
  */
 
-export function useGetManagerByOrgId<
-  TData = Awaited<ReturnType<typeof getManagerByOrgId>>,
-  TError = ErrorModel,
->(
-  organizationId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getManagerByOrgId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetManagerByOrgIdQueryOptions(
-    organizationId,
-    options,
-  );
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetManagerByOrgId<TData = Awaited<ReturnType<typeof getManagerByOrgId>>, TError = ErrorModel>(
+ organizationId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getManagerByOrgId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetManagerByOrgIdQueryOptions(organizationId,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
+
+
+
+
diff --git a/frontend/packages/api-client/src/generated/organizations/organizations.ts b/frontend/packages/api-client/src/generated/organizations/organizations.ts
index acdf155e..2fbdba4d 100644
--- a/frontend/packages/api-client/src/generated/organizations/organizations.ts
+++ b/frontend/packages/api-client/src/generated/organizations/organizations.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,8 +21,8 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   CreateOrganizationBody,
@@ -27,1045 +30,674 @@ import type {
   EventOccurrence,
   ListOrganizationsParams,
   Organization,
-  UpdateOrganizationBody,
-} from "../skillSparkAPI.schemas";
+  UpdateOrganizationBody
+} from '../skillSparkAPI.schemas';
+
+import { customInstance } from '../../apiClient';
 
-import { customInstance } from "../../apiClient";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Returns a paginated list of organizations
  * @summary List all organizations
  */
 export type listOrganizationsResponse200 = {
-  data: Organization[];
-  status: 200;
-};
+  data: Organization[]
+  status: 200
+}
 
 export type listOrganizationsResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type listOrganizationsResponseSuccess = listOrganizationsResponse200 & {
+export type listOrganizationsResponseSuccess = (listOrganizationsResponse200) & {
+  headers: Headers;
+};
+export type listOrganizationsResponseError = (listOrganizationsResponseDefault) & {
   headers: Headers;
 };
-export type listOrganizationsResponseError =
-  listOrganizationsResponseDefault & {
-    headers: Headers;
-  };
 
-export type listOrganizationsResponse =
-  | listOrganizationsResponseSuccess
-  | listOrganizationsResponseError;
+export type listOrganizationsResponse = (listOrganizationsResponseSuccess | listOrganizationsResponseError)
 
-export const getListOrganizationsUrl = (params?: ListOrganizationsParams) => {
+export const getListOrganizationsUrl = (params?: ListOrganizationsParams,) => {
   const normalizedParams = new URLSearchParams();
 
   Object.entries(params || {}).forEach(([key, value]) => {
+    
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? 'null' : value.toString())
     }
   });
 
   const stringifiedParams = normalizedParams.toString();
 
-  return stringifiedParams.length > 0
-    ? `/api/v1/organizations?${stringifiedParams}`
-    : `/api/v1/organizations`;
-};
+  return stringifiedParams.length > 0 ? `/api/v1/organizations?${stringifiedParams}` : `/api/v1/organizations`
+}
 
-export const listOrganizations = async (
-  params?: ListOrganizationsParams,
-  options?: RequestInit,
-): Promise<listOrganizationsResponse> => {
-  return customInstance<listOrganizationsResponse>(
-    getListOrganizationsUrl(params),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
-};
+export const listOrganizations = async (params?: ListOrganizationsParams, options?: RequestInit): Promise<listOrganizationsResponse> => {
+  
+  return customInstance<listOrganizationsResponse>(getListOrganizationsUrl(params),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
 
-export const getListOrganizationsQueryKey = (
-  params?: ListOrganizationsParams,
-) => {
-  return [`/api/v1/organizations`, ...(params ? [params] : [])] as const;
-};
 
-export const getListOrganizationsQueryOptions = <
-  TData = Awaited<ReturnType<typeof listOrganizations>>,
-  TError = ErrorModel,
->(
-  params?: ListOrganizationsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof listOrganizations>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+
+
+export const getListOrganizationsQueryKey = (params?: ListOrganizationsParams,) => {
+    return [
+    `/api/v1/organizations`, ...(params ? [params] : [])
+    ] as const;
+    }
+
+    
+export const getListOrganizationsQueryOptions = <TData = Awaited<ReturnType<typeof listOrganizations>>, TError = ErrorModel>(params?: ListOrganizationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof listOrganizations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  const queryKey =
-    queryOptions?.queryKey ?? getListOrganizationsQueryKey(params);
+const {query: queryOptions, request: requestOptions} = options ?? {};
 
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof listOrganizations>>
-  > = ({ signal }) => listOrganizations(params, { signal, ...requestOptions });
+  const queryKey =  queryOptions?.queryKey ?? getListOrganizationsQueryKey(params);
 
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof listOrganizations>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
+  
 
-export type ListOrganizationsQueryResult = NonNullable<
-  Awaited<ReturnType<typeof listOrganizations>>
->;
-export type ListOrganizationsQueryError = ErrorModel;
-
-export function useListOrganizations<
-  TData = Awaited<ReturnType<typeof listOrganizations>>,
-  TError = ErrorModel,
->(
-  params: undefined | ListOrganizationsParams,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof listOrganizations>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof listOrganizations>>> = ({ signal }) => listOrganizations(params, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof listOrganizations>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type ListOrganizationsQueryResult = NonNullable<Awaited<ReturnType<typeof listOrganizations>>>
+export type ListOrganizationsQueryError = ErrorModel
+
+
+export function useListOrganizations<TData = Awaited<ReturnType<typeof listOrganizations>>, TError = ErrorModel>(
+ params: undefined |  ListOrganizationsParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof listOrganizations>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof listOrganizations>>,
           TError,
           Awaited<ReturnType<typeof listOrganizations>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useListOrganizations<
-  TData = Awaited<ReturnType<typeof listOrganizations>>,
-  TError = ErrorModel,
->(
-  params?: ListOrganizationsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof listOrganizations>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useListOrganizations<TData = Awaited<ReturnType<typeof listOrganizations>>, TError = ErrorModel>(
+ params?: ListOrganizationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof listOrganizations>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof listOrganizations>>,
           TError,
           Awaited<ReturnType<typeof listOrganizations>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useListOrganizations<
-  TData = Awaited<ReturnType<typeof listOrganizations>>,
-  TError = ErrorModel,
->(
-  params?: ListOrganizationsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof listOrganizations>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useListOrganizations<TData = Awaited<ReturnType<typeof listOrganizations>>, TError = ErrorModel>(
+ params?: ListOrganizationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof listOrganizations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary List all organizations
  */
 
-export function useListOrganizations<
-  TData = Awaited<ReturnType<typeof listOrganizations>>,
-  TError = ErrorModel,
->(
-  params?: ListOrganizationsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof listOrganizations>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getListOrganizationsQueryOptions(params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useListOrganizations<TData = Awaited<ReturnType<typeof listOrganizations>>, TError = ErrorModel>(
+ params?: ListOrganizationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof listOrganizations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getListOrganizationsQueryOptions(params,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Creates a new organization with the provided information
  * @summary Create a new organization
  */
 export type createOrganizationResponse200 = {
-  data: Organization;
-  status: 200;
-};
+  data: Organization
+  status: 200
+}
 
 export type createOrganizationResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createOrganizationResponseSuccess =
-  createOrganizationResponse200 & {
-    headers: Headers;
-  };
-export type createOrganizationResponseError =
-  createOrganizationResponseDefault & {
-    headers: Headers;
-  };
+export type createOrganizationResponseSuccess = (createOrganizationResponse200) & {
+  headers: Headers;
+};
+export type createOrganizationResponseError = (createOrganizationResponseDefault) & {
+  headers: Headers;
+};
 
-export type createOrganizationResponse =
-  | createOrganizationResponseSuccess
-  | createOrganizationResponseError;
+export type createOrganizationResponse = (createOrganizationResponseSuccess | createOrganizationResponseError)
 
 export const getCreateOrganizationUrl = () => {
-  return `/api/v1/organizations`;
-};
 
-export const createOrganization = async (
-  createOrganizationBody: CreateOrganizationBody,
-  options?: RequestInit,
-): Promise<createOrganizationResponse> => {
-  const formData = new FormData();
-  if (createOrganizationBody.active !== undefined) {
-    formData.append(`active`, createOrganizationBody.active.toString());
-  }
-  if (createOrganizationBody.location_id !== undefined) {
-    formData.append(
-      `location_id`,
-      createOrganizationBody.location_id instanceof Blob
-        ? createOrganizationBody.location_id
-        : new Blob([createOrganizationBody.location_id], {
-            type: "text/plain",
-          }),
-    );
-  }
-  formData.append(
-    `name`,
-    createOrganizationBody.name instanceof Blob
-      ? createOrganizationBody.name
-      : new Blob([createOrganizationBody.name], { type: "text/plain" }),
-  );
-  if (createOrganizationBody.profile_image !== undefined) {
-    formData.append(`profile_image`, createOrganizationBody.profile_image);
+
+  
+
+  return `/api/v1/organizations`
+}
+
+export const createOrganization = async (createOrganizationBody: CreateOrganizationBody, options?: RequestInit): Promise<createOrganizationResponse> => {
+    const formData = new FormData();
+if(createOrganizationBody.active !== undefined) {
+ formData.append(`active`, createOrganizationBody.active.toString())
+ }
+if(createOrganizationBody.location_id !== undefined) {
+ formData.append(`location_id`, createOrganizationBody.location_id instanceof Blob ? createOrganizationBody.location_id : new Blob([createOrganizationBody.location_id], { type: 'text/plain' }));
+ }
+formData.append(`name`, createOrganizationBody.name instanceof Blob ? createOrganizationBody.name : new Blob([createOrganizationBody.name], { type: 'text/plain' }));
+if(createOrganizationBody.profile_image !== undefined) {
+ formData.append(`profile_image`, createOrganizationBody.profile_image);
+ }
+
+  return customInstance<createOrganizationResponse>(getCreateOrganizationUrl(),
+  {      
+    ...options,
+    method: 'POST'
+    ,
+    body: 
+      formData,
   }
+);}
 
-  return customInstance<createOrganizationResponse>(
-    getCreateOrganizationUrl(),
-    {
-      ...options,
-      method: "POST",
-      body: formData,
-    },
-  );
-};
 
-export const getCreateOrganizationMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createOrganization>>,
-    TError,
-    { data: CreateOrganizationBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createOrganization>>,
-  TError,
-  { data: CreateOrganizationBody },
-  TContext
-> => {
-  const mutationKey = ["createOrganization"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createOrganization>>,
-    { data: CreateOrganizationBody }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return createOrganization(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type CreateOrganizationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createOrganization>>
->;
-export type CreateOrganizationMutationBody = CreateOrganizationBody;
-export type CreateOrganizationMutationError = ErrorModel;
 
-/**
+export const getCreateOrganizationMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrganization>>, TError,{data: CreateOrganizationBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createOrganization>>, TError,{data: CreateOrganizationBody}, TContext> => {
+
+const mutationKey = ['createOrganization'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createOrganization>>, {data: CreateOrganizationBody}> = (props) => {
+          const {data} = props ?? {};
+
+          return  createOrganization(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateOrganizationMutationResult = NonNullable<Awaited<ReturnType<typeof createOrganization>>>
+    export type CreateOrganizationMutationBody = CreateOrganizationBody
+    export type CreateOrganizationMutationError = ErrorModel
+
+    /**
  * @summary Create a new organization
  */
-export const useCreateOrganization = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createOrganization>>,
-      TError,
-      { data: CreateOrganizationBody },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createOrganization>>,
-  TError,
-  { data: CreateOrganizationBody },
-  TContext
-> => {
-  return useMutation(
-    getCreateOrganizationMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useCreateOrganization = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrganization>>, TError,{data: CreateOrganizationBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createOrganization>>,
+        TError,
+        {data: CreateOrganizationBody},
+        TContext
+      > => {
+      return useMutation(getCreateOrganizationMutationOptions(options), queryClient);
+    }
+    /**
  * Returns a single organization by their ID
  * @summary Get organization by ID
  */
 export type getOrganizationResponse200 = {
-  data: Organization;
-  status: 200;
-};
+  data: Organization
+  status: 200
+}
 
 export type getOrganizationResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getOrganizationResponseSuccess = getOrganizationResponse200 & {
+export type getOrganizationResponseSuccess = (getOrganizationResponse200) & {
   headers: Headers;
 };
-export type getOrganizationResponseError = getOrganizationResponseDefault & {
+export type getOrganizationResponseError = (getOrganizationResponseDefault) & {
   headers: Headers;
 };
 
-export type getOrganizationResponse =
-  | getOrganizationResponseSuccess
-  | getOrganizationResponseError;
+export type getOrganizationResponse = (getOrganizationResponseSuccess | getOrganizationResponseError)
 
-export const getGetOrganizationUrl = (id: string) => {
-  return `/api/v1/organizations/${id}`;
-};
+export const getGetOrganizationUrl = (id: string,) => {
 
-export const getOrganization = async (
-  id: string,
-  options?: RequestInit,
-): Promise<getOrganizationResponse> => {
-  return customInstance<getOrganizationResponse>(getGetOrganizationUrl(id), {
+
+  
+
+  return `/api/v1/organizations/${id}`
+}
+
+export const getOrganization = async (id: string, options?: RequestInit): Promise<getOrganizationResponse> => {
+  
+  return customInstance<getOrganizationResponse>(getGetOrganizationUrl(id),
+  {      
     ...options,
-    method: "GET",
-  });
-};
+    method: 'GET'
+    
+    
+  }
+);}
 
-export const getGetOrganizationQueryKey = (id: string) => {
-  return [`/api/v1/organizations/${id}`] as const;
-};
 
-export const getGetOrganizationQueryOptions = <
-  TData = Awaited<ReturnType<typeof getOrganization>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getOrganization>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+
+
+export const getGetOrganizationQueryKey = (id: string,) => {
+    return [
+    `/api/v1/organizations/${id}`
+    ] as const;
+    }
+
+    
+export const getGetOrganizationQueryOptions = <TData = Awaited<ReturnType<typeof getOrganization>>, TError = ErrorModel>(id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganization>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getGetOrganizationQueryKey(id);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganization>>> = ({
-    signal,
-  }) => getOrganization(id, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getOrganization>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetOrganizationQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getOrganization>>
->;
-export type GetOrganizationQueryError = ErrorModel;
-
-export function useGetOrganization<
-  TData = Awaited<ReturnType<typeof getOrganization>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getOrganization>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetOrganizationQueryKey(id);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganization>>> = ({ signal }) => getOrganization(id, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getOrganization>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetOrganizationQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganization>>>
+export type GetOrganizationQueryError = ErrorModel
+
+
+export function useGetOrganization<TData = Awaited<ReturnType<typeof getOrganization>>, TError = ErrorModel>(
+ id: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganization>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getOrganization>>,
           TError,
           Awaited<ReturnType<typeof getOrganization>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetOrganization<
-  TData = Awaited<ReturnType<typeof getOrganization>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getOrganization>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetOrganization<TData = Awaited<ReturnType<typeof getOrganization>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganization>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getOrganization>>,
           TError,
           Awaited<ReturnType<typeof getOrganization>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetOrganization<
-  TData = Awaited<ReturnType<typeof getOrganization>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getOrganization>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetOrganization<TData = Awaited<ReturnType<typeof getOrganization>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganization>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get organization by ID
  */
 
-export function useGetOrganization<
-  TData = Awaited<ReturnType<typeof getOrganization>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getOrganization>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetOrganizationQueryOptions(id, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetOrganization<TData = Awaited<ReturnType<typeof getOrganization>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganization>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetOrganizationQueryOptions(id,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Deletes an organization by ID
  * @summary Delete an organization
  */
 export type deleteOrganizationResponse200 = {
-  data: Organization;
-  status: 200;
-};
+  data: Organization
+  status: 200
+}
 
 export type deleteOrganizationResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type deleteOrganizationResponseSuccess =
-  deleteOrganizationResponse200 & {
-    headers: Headers;
-  };
-export type deleteOrganizationResponseError =
-  deleteOrganizationResponseDefault & {
-    headers: Headers;
-  };
-
-export type deleteOrganizationResponse =
-  | deleteOrganizationResponseSuccess
-  | deleteOrganizationResponseError;
-
-export const getDeleteOrganizationUrl = (id: string) => {
-  return `/api/v1/organizations/${id}`;
+export type deleteOrganizationResponseSuccess = (deleteOrganizationResponse200) & {
+  headers: Headers;
 };
-
-export const deleteOrganization = async (
-  id: string,
-  options?: RequestInit,
-): Promise<deleteOrganizationResponse> => {
-  return customInstance<deleteOrganizationResponse>(
-    getDeleteOrganizationUrl(id),
-    {
-      ...options,
-      method: "DELETE",
-    },
-  );
+export type deleteOrganizationResponseError = (deleteOrganizationResponseDefault) & {
+  headers: Headers;
 };
 
-export const getDeleteOrganizationMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteOrganization>>,
-    TError,
-    { id: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteOrganization>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  const mutationKey = ["deleteOrganization"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteOrganization>>,
-    { id: string }
-  > = (props) => {
-    const { id } = props ?? {};
-
-    return deleteOrganization(id, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type deleteOrganizationResponse = (deleteOrganizationResponseSuccess | deleteOrganizationResponseError)
 
-export type DeleteOrganizationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteOrganization>>
->;
+export const getDeleteOrganizationUrl = (id: string,) => {
 
-export type DeleteOrganizationMutationError = ErrorModel;
 
-/**
+  
+
+  return `/api/v1/organizations/${id}`
+}
+
+export const deleteOrganization = async (id: string, options?: RequestInit): Promise<deleteOrganizationResponse> => {
+  
+  return customInstance<deleteOrganizationResponse>(getDeleteOrganizationUrl(id),
+  {      
+    ...options,
+    method: 'DELETE'
+    
+    
+  }
+);}
+
+
+
+
+export const getDeleteOrganizationMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteOrganization>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof deleteOrganization>>, TError,{id: string}, TContext> => {
+
+const mutationKey = ['deleteOrganization'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteOrganization>>, {id: string}> = (props) => {
+          const {id} = props ?? {};
+
+          return  deleteOrganization(id,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type DeleteOrganizationMutationResult = NonNullable<Awaited<ReturnType<typeof deleteOrganization>>>
+    
+    export type DeleteOrganizationMutationError = ErrorModel
+
+    /**
  * @summary Delete an organization
  */
-export const useDeleteOrganization = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteOrganization>>,
-      TError,
-      { id: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteOrganization>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  return useMutation(
-    getDeleteOrganizationMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useDeleteOrganization = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteOrganization>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof deleteOrganization>>,
+        TError,
+        {id: string},
+        TContext
+      > => {
+      return useMutation(getDeleteOrganizationMutationOptions(options), queryClient);
+    }
+    /**
  * Updates an existing organization with the provided fields (partial update)
  * @summary Update an organization
  */
 export type updateOrganizationResponse200 = {
-  data: Organization;
-  status: 200;
-};
+  data: Organization
+  status: 200
+}
 
 export type updateOrganizationResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type updateOrganizationResponseSuccess =
-  updateOrganizationResponse200 & {
-    headers: Headers;
-  };
-export type updateOrganizationResponseError =
-  updateOrganizationResponseDefault & {
-    headers: Headers;
-  };
-
-export type updateOrganizationResponse =
-  | updateOrganizationResponseSuccess
-  | updateOrganizationResponseError;
-
-export const getUpdateOrganizationUrl = (id: string) => {
-  return `/api/v1/organizations/${id}`;
+export type updateOrganizationResponseSuccess = (updateOrganizationResponse200) & {
+  headers: Headers;
+};
+export type updateOrganizationResponseError = (updateOrganizationResponseDefault) & {
+  headers: Headers;
 };
 
-export const updateOrganization = async (
-  id: string,
-  updateOrganizationBody: UpdateOrganizationBody,
-  options?: RequestInit,
-): Promise<updateOrganizationResponse> => {
-  const formData = new FormData();
-  if (updateOrganizationBody.active !== undefined) {
-    formData.append(`active`, updateOrganizationBody.active.toString());
-  }
-  if (updateOrganizationBody.location_id !== undefined) {
-    formData.append(
-      `location_id`,
-      updateOrganizationBody.location_id instanceof Blob
-        ? updateOrganizationBody.location_id
-        : new Blob([updateOrganizationBody.location_id], {
-            type: "text/plain",
-          }),
-    );
-  }
-  formData.append(
-    `name`,
-    updateOrganizationBody.name instanceof Blob
-      ? updateOrganizationBody.name
-      : new Blob([updateOrganizationBody.name], { type: "text/plain" }),
-  );
-  if (updateOrganizationBody.profile_image !== undefined) {
-    formData.append(`profile_image`, updateOrganizationBody.profile_image);
+export type updateOrganizationResponse = (updateOrganizationResponseSuccess | updateOrganizationResponseError)
+
+export const getUpdateOrganizationUrl = (id: string,) => {
+
+
+  
+
+  return `/api/v1/organizations/${id}`
+}
+
+export const updateOrganization = async (id: string,
+    updateOrganizationBody: UpdateOrganizationBody, options?: RequestInit): Promise<updateOrganizationResponse> => {
+    const formData = new FormData();
+if(updateOrganizationBody.active !== undefined) {
+ formData.append(`active`, updateOrganizationBody.active.toString())
+ }
+if(updateOrganizationBody.location_id !== undefined) {
+ formData.append(`location_id`, updateOrganizationBody.location_id instanceof Blob ? updateOrganizationBody.location_id : new Blob([updateOrganizationBody.location_id], { type: 'text/plain' }));
+ }
+formData.append(`name`, updateOrganizationBody.name instanceof Blob ? updateOrganizationBody.name : new Blob([updateOrganizationBody.name], { type: 'text/plain' }));
+if(updateOrganizationBody.profile_image !== undefined) {
+ formData.append(`profile_image`, updateOrganizationBody.profile_image);
+ }
+
+  return customInstance<updateOrganizationResponse>(getUpdateOrganizationUrl(id),
+  {      
+    ...options,
+    method: 'PATCH'
+    ,
+    body: 
+      formData,
   }
+);}
 
-  return customInstance<updateOrganizationResponse>(
-    getUpdateOrganizationUrl(id),
-    {
-      ...options,
-      method: "PATCH",
-      body: formData,
-    },
-  );
-};
 
-export const getUpdateOrganizationMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof updateOrganization>>,
-    TError,
-    { id: string; data: UpdateOrganizationBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof updateOrganization>>,
-  TError,
-  { id: string; data: UpdateOrganizationBody },
-  TContext
-> => {
-  const mutationKey = ["updateOrganization"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof updateOrganization>>,
-    { id: string; data: UpdateOrganizationBody }
-  > = (props) => {
-    const { id, data } = props ?? {};
-
-    return updateOrganization(id, data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type UpdateOrganizationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof updateOrganization>>
->;
-export type UpdateOrganizationMutationBody = UpdateOrganizationBody;
-export type UpdateOrganizationMutationError = ErrorModel;
 
-/**
+export const getUpdateOrganizationMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateOrganization>>, TError,{id: string;data: UpdateOrganizationBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof updateOrganization>>, TError,{id: string;data: UpdateOrganizationBody}, TContext> => {
+
+const mutationKey = ['updateOrganization'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof updateOrganization>>, {id: string;data: UpdateOrganizationBody}> = (props) => {
+          const {id,data} = props ?? {};
+
+          return  updateOrganization(id,data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type UpdateOrganizationMutationResult = NonNullable<Awaited<ReturnType<typeof updateOrganization>>>
+    export type UpdateOrganizationMutationBody = UpdateOrganizationBody
+    export type UpdateOrganizationMutationError = ErrorModel
+
+    /**
  * @summary Update an organization
  */
-export const useUpdateOrganization = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof updateOrganization>>,
-      TError,
-      { id: string; data: UpdateOrganizationBody },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof updateOrganization>>,
-  TError,
-  { id: string; data: UpdateOrganizationBody },
-  TContext
-> => {
-  return useMutation(
-    getUpdateOrganizationMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useUpdateOrganization = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateOrganization>>, TError,{id: string;data: UpdateOrganizationBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof updateOrganization>>,
+        TError,
+        {id: string;data: UpdateOrganizationBody},
+        TContext
+      > => {
+      return useMutation(getUpdateOrganizationMutationOptions(options), queryClient);
+    }
+    /**
  * Returns event occurrences that match the organization ID
  * @summary Get event occurrences by organization ID
  */
 export type getEventOccurrencesByOrganizationIdResponse200 = {
-  data: EventOccurrence[];
-  status: 200;
-};
+  data: EventOccurrence[]
+  status: 200
+}
 
 export type getEventOccurrencesByOrganizationIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getEventOccurrencesByOrganizationIdResponseSuccess =
-  getEventOccurrencesByOrganizationIdResponse200 & {
-    headers: Headers;
-  };
-export type getEventOccurrencesByOrganizationIdResponseError =
-  getEventOccurrencesByOrganizationIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getEventOccurrencesByOrganizationIdResponse =
-  | getEventOccurrencesByOrganizationIdResponseSuccess
-  | getEventOccurrencesByOrganizationIdResponseError;
-
-export const getGetEventOccurrencesByOrganizationIdUrl = (
-  organizationId: string,
-) => {
-  return `/api/v1/organizations/${organizationId}/event-occurrences/`;
+export type getEventOccurrencesByOrganizationIdResponseSuccess = (getEventOccurrencesByOrganizationIdResponse200) & {
+  headers: Headers;
 };
-
-export const getEventOccurrencesByOrganizationId = async (
-  organizationId: string,
-  options?: RequestInit,
-): Promise<getEventOccurrencesByOrganizationIdResponse> => {
-  return customInstance<getEventOccurrencesByOrganizationIdResponse>(
-    getGetEventOccurrencesByOrganizationIdUrl(organizationId),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getEventOccurrencesByOrganizationIdResponseError = (getEventOccurrencesByOrganizationIdResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetEventOccurrencesByOrganizationIdQueryKey = (
-  organizationId: string,
-) => {
-  return [
-    `/api/v1/organizations/${organizationId}/event-occurrences/`,
-  ] as const;
-};
+export type getEventOccurrencesByOrganizationIdResponse = (getEventOccurrencesByOrganizationIdResponseSuccess | getEventOccurrencesByOrganizationIdResponseError)
 
-export const getGetEventOccurrencesByOrganizationIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-  TError = ErrorModel,
->(
-  organizationId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetEventOccurrencesByOrganizationIdUrl = (organizationId: string,) => {
+
+
+  
+
+  return `/api/v1/organizations/${organizationId}/event-occurrences/`
+}
+
+export const getEventOccurrencesByOrganizationId = async (organizationId: string, options?: RequestInit): Promise<getEventOccurrencesByOrganizationIdResponse> => {
+  
+  return customInstance<getEventOccurrencesByOrganizationIdResponse>(getGetEventOccurrencesByOrganizationIdUrl(organizationId),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetEventOccurrencesByOrganizationIdQueryKey = (organizationId: string,) => {
+    return [
+    `/api/v1/organizations/${organizationId}/event-occurrences/`
+    ] as const;
+    }
+
+    
+export const getGetEventOccurrencesByOrganizationIdQueryOptions = <TData = Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError = ErrorModel>(organizationId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ??
-    getGetEventOccurrencesByOrganizationIdQueryKey(organizationId);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>
-  > = ({ signal }) =>
-    getEventOccurrencesByOrganizationId(organizationId, {
-      signal,
-      ...requestOptions,
-    });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!organizationId,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetEventOccurrencesByOrganizationIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>
->;
-export type GetEventOccurrencesByOrganizationIdQueryError = ErrorModel;
-
-export function useGetEventOccurrencesByOrganizationId<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-  TError = ErrorModel,
->(
-  organizationId: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetEventOccurrencesByOrganizationIdQueryKey(organizationId);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>> = ({ signal }) => getEventOccurrencesByOrganizationId(organizationId, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(organizationId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetEventOccurrencesByOrganizationIdQueryResult = NonNullable<Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>>
+export type GetEventOccurrencesByOrganizationIdQueryError = ErrorModel
+
+
+export function useGetEventOccurrencesByOrganizationId<TData = Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError = ErrorModel>(
+ organizationId: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
           TError,
           Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetEventOccurrencesByOrganizationId<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-  TError = ErrorModel,
->(
-  organizationId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetEventOccurrencesByOrganizationId<TData = Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError = ErrorModel>(
+ organizationId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
           TError,
           Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetEventOccurrencesByOrganizationId<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-  TError = ErrorModel,
->(
-  organizationId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetEventOccurrencesByOrganizationId<TData = Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError = ErrorModel>(
+ organizationId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get event occurrences by organization ID
  */
 
-export function useGetEventOccurrencesByOrganizationId<
-  TData = Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-  TError = ErrorModel,
->(
-  organizationId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetEventOccurrencesByOrganizationIdQueryOptions(
-    organizationId,
-    options,
-  );
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetEventOccurrencesByOrganizationId<TData = Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError = ErrorModel>(
+ organizationId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getEventOccurrencesByOrganizationId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetEventOccurrencesByOrganizationIdQueryOptions(organizationId,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
+
+
+
+
diff --git a/frontend/packages/api-client/src/generated/payments/payments.ts b/frontend/packages/api-client/src/generated/payments/payments.ts
index d1355c1d..84ed3f9b 100644
--- a/frontend/packages/api-client/src/generated/payments/payments.ts
+++ b/frontend/packages/api-client/src/generated/payments/payments.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,8 +21,8 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   AttachPaymentMethodInputBody,
@@ -31,993 +34,705 @@ import type {
   CreateStripeOnboardingLinkOutputBody,
   ErrorModel,
   GetPaymentMethodsByGuardianIDOutputBody,
-  Guardian,
-} from "../skillSparkAPI.schemas";
+  Guardian
+} from '../skillSparkAPI.schemas';
 
-import { customInstance } from "../../apiClient";
+import { customInstance } from '../../apiClient';
 
 // https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> =
-  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
 
 type WritableKeys<T> = {
-  [P in keyof T]-?: IfEquals<
-    { [Q in P]: T[P] },
-    { -readonly [Q in P]: T[P] },
-    P
-  >;
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
 }[keyof T];
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
-) => void
-  ? I
-  : never;
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
 type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
 
 type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>]
-  ? {
-      [P in keyof Writable<T>]: T[P] extends object
-        ? NonReadonly<NonNullable<T[P]>>
-        : T[P];
-    }
-  : DistributeReadOnlyOverUnions<T>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Retrieves all saved payment methods for a specific guardian
  * @summary Get all payment methods for a guardian
  */
 export type getGuardianPaymentMethodsResponse200 = {
-  data: GetPaymentMethodsByGuardianIDOutputBody;
-  status: 200;
-};
+  data: GetPaymentMethodsByGuardianIDOutputBody
+  status: 200
+}
 
 export type getGuardianPaymentMethodsResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getGuardianPaymentMethodsResponseSuccess =
-  getGuardianPaymentMethodsResponse200 & {
-    headers: Headers;
-  };
-export type getGuardianPaymentMethodsResponseError =
-  getGuardianPaymentMethodsResponseDefault & {
-    headers: Headers;
-  };
-
-export type getGuardianPaymentMethodsResponse =
-  | getGuardianPaymentMethodsResponseSuccess
-  | getGuardianPaymentMethodsResponseError;
-
-export const getGetGuardianPaymentMethodsUrl = (guardianId: string) => {
-  return `/api/v1/guardians/${guardianId}/payment-methods`;
+export type getGuardianPaymentMethodsResponseSuccess = (getGuardianPaymentMethodsResponse200) & {
+  headers: Headers;
 };
-
-export const getGuardianPaymentMethods = async (
-  guardianId: string,
-  options?: RequestInit,
-): Promise<getGuardianPaymentMethodsResponse> => {
-  return customInstance<getGuardianPaymentMethodsResponse>(
-    getGetGuardianPaymentMethodsUrl(guardianId),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getGuardianPaymentMethodsResponseError = (getGuardianPaymentMethodsResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetGuardianPaymentMethodsQueryKey = (guardianId: string) => {
-  return [`/api/v1/guardians/${guardianId}/payment-methods`] as const;
-};
+export type getGuardianPaymentMethodsResponse = (getGuardianPaymentMethodsResponseSuccess | getGuardianPaymentMethodsResponseError)
 
-export const getGetGuardianPaymentMethodsQueryOptions = <
-  TData = Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-  TError = ErrorModel,
->(
-  guardianId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetGuardianPaymentMethodsUrl = (guardianId: string,) => {
+
+
+  
+
+  return `/api/v1/guardians/${guardianId}/payment-methods`
+}
+
+export const getGuardianPaymentMethods = async (guardianId: string, options?: RequestInit): Promise<getGuardianPaymentMethodsResponse> => {
+  
+  return customInstance<getGuardianPaymentMethodsResponse>(getGetGuardianPaymentMethodsUrl(guardianId),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetGuardianPaymentMethodsQueryKey = (guardianId: string,) => {
+    return [
+    `/api/v1/guardians/${guardianId}/payment-methods`
+    ] as const;
+    }
+
+    
+export const getGetGuardianPaymentMethodsQueryOptions = <TData = Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError = ErrorModel>(guardianId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetGuardianPaymentMethodsQueryKey(guardianId);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getGuardianPaymentMethods>>
-  > = ({ signal }) =>
-    getGuardianPaymentMethods(guardianId, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!guardianId,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetGuardianPaymentMethodsQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getGuardianPaymentMethods>>
->;
-export type GetGuardianPaymentMethodsQueryError = ErrorModel;
-
-export function useGetGuardianPaymentMethods<
-  TData = Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-  TError = ErrorModel,
->(
-  guardianId: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetGuardianPaymentMethodsQueryKey(guardianId);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getGuardianPaymentMethods>>> = ({ signal }) => getGuardianPaymentMethods(guardianId, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(guardianId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetGuardianPaymentMethodsQueryResult = NonNullable<Awaited<ReturnType<typeof getGuardianPaymentMethods>>>
+export type GetGuardianPaymentMethodsQueryError = ErrorModel
+
+
+export function useGetGuardianPaymentMethods<TData = Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError = ErrorModel>(
+ guardianId: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
           TError,
           Awaited<ReturnType<typeof getGuardianPaymentMethods>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetGuardianPaymentMethods<
-  TData = Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-  TError = ErrorModel,
->(
-  guardianId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetGuardianPaymentMethods<TData = Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError = ErrorModel>(
+ guardianId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
           TError,
           Awaited<ReturnType<typeof getGuardianPaymentMethods>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetGuardianPaymentMethods<
-  TData = Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-  TError = ErrorModel,
->(
-  guardianId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetGuardianPaymentMethods<TData = Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError = ErrorModel>(
+ guardianId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get all payment methods for a guardian
  */
 
-export function useGetGuardianPaymentMethods<
-  TData = Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-  TError = ErrorModel,
->(
-  guardianId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getGuardianPaymentMethods>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetGuardianPaymentMethodsQueryOptions(
-    guardianId,
-    options,
-  );
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetGuardianPaymentMethods<TData = Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError = ErrorModel>(
+ guardianId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getGuardianPaymentMethods>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetGuardianPaymentMethodsQueryOptions(guardianId,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Directly attaches a Stripe payment method to a guardian's customer account. For development/testing only.
  * @summary Attach a payment method to a guardian (testing only)
  */
 export type attachPaymentMethodResponse200 = {
-  data: AttachPaymentMethodOutputBody;
-  status: 200;
-};
+  data: AttachPaymentMethodOutputBody
+  status: 200
+}
 
 export type attachPaymentMethodResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type attachPaymentMethodResponseSuccess =
-  attachPaymentMethodResponse200 & {
-    headers: Headers;
-  };
-export type attachPaymentMethodResponseError =
-  attachPaymentMethodResponseDefault & {
-    headers: Headers;
-  };
-
-export type attachPaymentMethodResponse =
-  | attachPaymentMethodResponseSuccess
-  | attachPaymentMethodResponseError;
-
-export const getAttachPaymentMethodUrl = (guardianId: string) => {
-  return `/api/v1/stripe/attach-pm/${guardianId}`;
+export type attachPaymentMethodResponseSuccess = (attachPaymentMethodResponse200) & {
+  headers: Headers;
 };
-
-export const attachPaymentMethod = async (
-  guardianId: string,
-  attachPaymentMethodInputBody: NonReadonly<AttachPaymentMethodInputBody>,
-  options?: RequestInit,
-): Promise<attachPaymentMethodResponse> => {
-  return customInstance<attachPaymentMethodResponse>(
-    getAttachPaymentMethodUrl(guardianId),
-    {
-      ...options,
-      method: "POST",
-      headers: { "Content-Type": "application/json", ...options?.headers },
-      body: JSON.stringify(attachPaymentMethodInputBody),
-    },
-  );
+export type attachPaymentMethodResponseError = (attachPaymentMethodResponseDefault) & {
+  headers: Headers;
 };
 
-export const getAttachPaymentMethodMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof attachPaymentMethod>>,
-    TError,
-    { guardianId: string; data: NonReadonly<AttachPaymentMethodInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof attachPaymentMethod>>,
-  TError,
-  { guardianId: string; data: NonReadonly<AttachPaymentMethodInputBody> },
-  TContext
-> => {
-  const mutationKey = ["attachPaymentMethod"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof attachPaymentMethod>>,
-    { guardianId: string; data: NonReadonly<AttachPaymentMethodInputBody> }
-  > = (props) => {
-    const { guardianId, data } = props ?? {};
-
-    return attachPaymentMethod(guardianId, data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type attachPaymentMethodResponse = (attachPaymentMethodResponseSuccess | attachPaymentMethodResponseError)
 
-export type AttachPaymentMethodMutationResult = NonNullable<
-  Awaited<ReturnType<typeof attachPaymentMethod>>
->;
-export type AttachPaymentMethodMutationBody =
-  NonReadonly<AttachPaymentMethodInputBody>;
-export type AttachPaymentMethodMutationError = ErrorModel;
+export const getAttachPaymentMethodUrl = (guardianId: string,) => {
 
-/**
+
+  
+
+  return `/api/v1/stripe/attach-pm/${guardianId}`
+}
+
+export const attachPaymentMethod = async (guardianId: string,
+    attachPaymentMethodInputBody: NonReadonly<AttachPaymentMethodInputBody>, options?: RequestInit): Promise<attachPaymentMethodResponse> => {
+  
+  return customInstance<attachPaymentMethodResponse>(getAttachPaymentMethodUrl(guardianId),
+  {      
+    ...options,
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      attachPaymentMethodInputBody,)
+  }
+);}
+
+
+
+
+export const getAttachPaymentMethodMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof attachPaymentMethod>>, TError,{guardianId: string;data: NonReadonly<AttachPaymentMethodInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof attachPaymentMethod>>, TError,{guardianId: string;data: NonReadonly<AttachPaymentMethodInputBody>}, TContext> => {
+
+const mutationKey = ['attachPaymentMethod'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof attachPaymentMethod>>, {guardianId: string;data: NonReadonly<AttachPaymentMethodInputBody>}> = (props) => {
+          const {guardianId,data} = props ?? {};
+
+          return  attachPaymentMethod(guardianId,data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type AttachPaymentMethodMutationResult = NonNullable<Awaited<ReturnType<typeof attachPaymentMethod>>>
+    export type AttachPaymentMethodMutationBody = NonReadonly<AttachPaymentMethodInputBody>
+    export type AttachPaymentMethodMutationError = ErrorModel
+
+    /**
  * @summary Attach a payment method to a guardian (testing only)
  */
-export const useAttachPaymentMethod = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof attachPaymentMethod>>,
-      TError,
-      { guardianId: string; data: NonReadonly<AttachPaymentMethodInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof attachPaymentMethod>>,
-  TError,
-  { guardianId: string; data: NonReadonly<AttachPaymentMethodInputBody> },
-  TContext
-> => {
-  return useMutation(
-    getAttachPaymentMethodMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useAttachPaymentMethod = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof attachPaymentMethod>>, TError,{guardianId: string;data: NonReadonly<AttachPaymentMethodInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof attachPaymentMethod>>,
+        TError,
+        {guardianId: string;data: NonReadonly<AttachPaymentMethodInputBody>},
+        TContext
+      > => {
+      return useMutation(getAttachPaymentMethodMutationOptions(options), queryClient);
+    }
+    /**
  * Create a new Stripe Customer
  * @summary Create a new Stripe Customer
  */
 export type createStripeCustomerResponse200 = {
-  data: Guardian;
-  status: 200;
-};
+  data: Guardian
+  status: 200
+}
 
 export type createStripeCustomerResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createStripeCustomerResponseSuccess =
-  createStripeCustomerResponse200 & {
-    headers: Headers;
-  };
-export type createStripeCustomerResponseError =
-  createStripeCustomerResponseDefault & {
-    headers: Headers;
-  };
-
-export type createStripeCustomerResponse =
-  | createStripeCustomerResponseSuccess
-  | createStripeCustomerResponseError;
-
-export const getCreateStripeCustomerUrl = (guardianId: string) => {
-  return `/api/v1/stripe/customer/${guardianId}`;
+export type createStripeCustomerResponseSuccess = (createStripeCustomerResponse200) & {
+  headers: Headers;
 };
-
-export const createStripeCustomer = async (
-  guardianId: string,
-  options?: RequestInit,
-): Promise<createStripeCustomerResponse> => {
-  return customInstance<createStripeCustomerResponse>(
-    getCreateStripeCustomerUrl(guardianId),
-    {
-      ...options,
-      method: "POST",
-    },
-  );
+export type createStripeCustomerResponseError = (createStripeCustomerResponseDefault) & {
+  headers: Headers;
 };
 
-export const getCreateStripeCustomerMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createStripeCustomer>>,
-    TError,
-    { guardianId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createStripeCustomer>>,
-  TError,
-  { guardianId: string },
-  TContext
-> => {
-  const mutationKey = ["createStripeCustomer"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createStripeCustomer>>,
-    { guardianId: string }
-  > = (props) => {
-    const { guardianId } = props ?? {};
-
-    return createStripeCustomer(guardianId, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type createStripeCustomerResponse = (createStripeCustomerResponseSuccess | createStripeCustomerResponseError)
 
-export type CreateStripeCustomerMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createStripeCustomer>>
->;
+export const getCreateStripeCustomerUrl = (guardianId: string,) => {
 
-export type CreateStripeCustomerMutationError = ErrorModel;
 
-/**
+  
+
+  return `/api/v1/stripe/customer/${guardianId}`
+}
+
+export const createStripeCustomer = async (guardianId: string, options?: RequestInit): Promise<createStripeCustomerResponse> => {
+  
+  return customInstance<createStripeCustomerResponse>(getCreateStripeCustomerUrl(guardianId),
+  {      
+    ...options,
+    method: 'POST'
+    
+    
+  }
+);}
+
+
+
+
+export const getCreateStripeCustomerMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createStripeCustomer>>, TError,{guardianId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createStripeCustomer>>, TError,{guardianId: string}, TContext> => {
+
+const mutationKey = ['createStripeCustomer'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createStripeCustomer>>, {guardianId: string}> = (props) => {
+          const {guardianId} = props ?? {};
+
+          return  createStripeCustomer(guardianId,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateStripeCustomerMutationResult = NonNullable<Awaited<ReturnType<typeof createStripeCustomer>>>
+    
+    export type CreateStripeCustomerMutationError = ErrorModel
+
+    /**
  * @summary Create a new Stripe Customer
  */
-export const useCreateStripeCustomer = <
-  TError = ErrorModel,
-  TContext = unknown,
->(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createStripeCustomer>>,
-      TError,
-      { guardianId: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createStripeCustomer>>,
-  TError,
-  { guardianId: string },
-  TContext
-> => {
-  return useMutation(
-    getCreateStripeCustomerMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useCreateStripeCustomer = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createStripeCustomer>>, TError,{guardianId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createStripeCustomer>>,
+        TError,
+        {guardianId: string},
+        TContext
+      > => {
+      return useMutation(getCreateStripeCustomerMutationOptions(options), queryClient);
+    }
+    /**
  * Generates a login link for organization to access their Stripe Express dashboard
  * @summary Create Stripe dashboard login link for organization
  */
 export type createOrgLoginLinkResponse200 = {
-  data: CreateOrgLoginLinkOutputBody;
-  status: 200;
-};
+  data: CreateOrgLoginLinkOutputBody
+  status: 200
+}
 
 export type createOrgLoginLinkResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createOrgLoginLinkResponseSuccess =
-  createOrgLoginLinkResponse200 & {
-    headers: Headers;
-  };
-export type createOrgLoginLinkResponseError =
-  createOrgLoginLinkResponseDefault & {
-    headers: Headers;
-  };
-
-export type createOrgLoginLinkResponse =
-  | createOrgLoginLinkResponseSuccess
-  | createOrgLoginLinkResponseError;
-
-export const getCreateOrgLoginLinkUrl = (organizationId: string) => {
-  return `/api/v1/stripe/login/${organizationId}`;
+export type createOrgLoginLinkResponseSuccess = (createOrgLoginLinkResponse200) & {
+  headers: Headers;
 };
-
-export const createOrgLoginLink = async (
-  organizationId: string,
-  options?: RequestInit,
-): Promise<createOrgLoginLinkResponse> => {
-  return customInstance<createOrgLoginLinkResponse>(
-    getCreateOrgLoginLinkUrl(organizationId),
-    {
-      ...options,
-      method: "POST",
-    },
-  );
+export type createOrgLoginLinkResponseError = (createOrgLoginLinkResponseDefault) & {
+  headers: Headers;
 };
 
-export const getCreateOrgLoginLinkMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createOrgLoginLink>>,
-    TError,
-    { organizationId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createOrgLoginLink>>,
-  TError,
-  { organizationId: string },
-  TContext
-> => {
-  const mutationKey = ["createOrgLoginLink"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createOrgLoginLink>>,
-    { organizationId: string }
-  > = (props) => {
-    const { organizationId } = props ?? {};
-
-    return createOrgLoginLink(organizationId, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type createOrgLoginLinkResponse = (createOrgLoginLinkResponseSuccess | createOrgLoginLinkResponseError)
 
-export type CreateOrgLoginLinkMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createOrgLoginLink>>
->;
+export const getCreateOrgLoginLinkUrl = (organizationId: string,) => {
 
-export type CreateOrgLoginLinkMutationError = ErrorModel;
 
-/**
+  
+
+  return `/api/v1/stripe/login/${organizationId}`
+}
+
+export const createOrgLoginLink = async (organizationId: string, options?: RequestInit): Promise<createOrgLoginLinkResponse> => {
+  
+  return customInstance<createOrgLoginLinkResponse>(getCreateOrgLoginLinkUrl(organizationId),
+  {      
+    ...options,
+    method: 'POST'
+    
+    
+  }
+);}
+
+
+
+
+export const getCreateOrgLoginLinkMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrgLoginLink>>, TError,{organizationId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createOrgLoginLink>>, TError,{organizationId: string}, TContext> => {
+
+const mutationKey = ['createOrgLoginLink'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createOrgLoginLink>>, {organizationId: string}> = (props) => {
+          const {organizationId} = props ?? {};
+
+          return  createOrgLoginLink(organizationId,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateOrgLoginLinkMutationResult = NonNullable<Awaited<ReturnType<typeof createOrgLoginLink>>>
+    
+    export type CreateOrgLoginLinkMutationError = ErrorModel
+
+    /**
  * @summary Create Stripe dashboard login link for organization
  */
-export const useCreateOrgLoginLink = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createOrgLoginLink>>,
-      TError,
-      { organizationId: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createOrgLoginLink>>,
-  TError,
-  { organizationId: string },
-  TContext
-> => {
-  return useMutation(
-    getCreateOrgLoginLinkMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useCreateOrgLoginLink = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrgLoginLink>>, TError,{organizationId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createOrgLoginLink>>,
+        TError,
+        {organizationId: string},
+        TContext
+      > => {
+      return useMutation(getCreateOrgLoginLinkMutationOptions(options), queryClient);
+    }
+    /**
  * Creates an onboarding link for a Stripe account
  * @summary Creates an onboarding link for a Stripe account
  */
 export type createOrgStripeOnboardingLinkResponse200 = {
-  data: CreateStripeOnboardingLinkOutputBody;
-  status: 200;
-};
+  data: CreateStripeOnboardingLinkOutputBody
+  status: 200
+}
 
 export type createOrgStripeOnboardingLinkResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createOrgStripeOnboardingLinkResponseSuccess =
-  createOrgStripeOnboardingLinkResponse200 & {
-    headers: Headers;
-  };
-export type createOrgStripeOnboardingLinkResponseError =
-  createOrgStripeOnboardingLinkResponseDefault & {
-    headers: Headers;
-  };
-
-export type createOrgStripeOnboardingLinkResponse =
-  | createOrgStripeOnboardingLinkResponseSuccess
-  | createOrgStripeOnboardingLinkResponseError;
-
-export const getCreateOrgStripeOnboardingLinkUrl = (organizationId: string) => {
-  return `/api/v1/stripe/onboarding/${organizationId}`;
+export type createOrgStripeOnboardingLinkResponseSuccess = (createOrgStripeOnboardingLinkResponse200) & {
+  headers: Headers;
 };
-
-export const createOrgStripeOnboardingLink = async (
-  organizationId: string,
-  createStripeOnboardingLinkInputBody: NonReadonly<CreateStripeOnboardingLinkInputBody>,
-  options?: RequestInit,
-): Promise<createOrgStripeOnboardingLinkResponse> => {
-  return customInstance<createOrgStripeOnboardingLinkResponse>(
-    getCreateOrgStripeOnboardingLinkUrl(organizationId),
-    {
-      ...options,
-      method: "POST",
-      headers: { "Content-Type": "application/json", ...options?.headers },
-      body: JSON.stringify(createStripeOnboardingLinkInputBody),
-    },
-  );
+export type createOrgStripeOnboardingLinkResponseError = (createOrgStripeOnboardingLinkResponseDefault) & {
+  headers: Headers;
 };
 
-export const getCreateOrgStripeOnboardingLinkMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>,
-    TError,
-    {
-      organizationId: string;
-      data: NonReadonly<CreateStripeOnboardingLinkInputBody>;
-    },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>,
-  TError,
-  {
-    organizationId: string;
-    data: NonReadonly<CreateStripeOnboardingLinkInputBody>;
-  },
-  TContext
-> => {
-  const mutationKey = ["createOrgStripeOnboardingLink"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>,
-    {
-      organizationId: string;
-      data: NonReadonly<CreateStripeOnboardingLinkInputBody>;
-    }
-  > = (props) => {
-    const { organizationId, data } = props ?? {};
+export type createOrgStripeOnboardingLinkResponse = (createOrgStripeOnboardingLinkResponseSuccess | createOrgStripeOnboardingLinkResponseError)
 
-    return createOrgStripeOnboardingLink(organizationId, data, requestOptions);
-  };
+export const getCreateOrgStripeOnboardingLinkUrl = (organizationId: string,) => {
 
-  return { mutationFn, ...mutationOptions };
-};
 
-export type CreateOrgStripeOnboardingLinkMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>
->;
-export type CreateOrgStripeOnboardingLinkMutationBody =
-  NonReadonly<CreateStripeOnboardingLinkInputBody>;
-export type CreateOrgStripeOnboardingLinkMutationError = ErrorModel;
+  
 
-/**
+  return `/api/v1/stripe/onboarding/${organizationId}`
+}
+
+export const createOrgStripeOnboardingLink = async (organizationId: string,
+    createStripeOnboardingLinkInputBody: NonReadonly<CreateStripeOnboardingLinkInputBody>, options?: RequestInit): Promise<createOrgStripeOnboardingLinkResponse> => {
+  
+  return customInstance<createOrgStripeOnboardingLinkResponse>(getCreateOrgStripeOnboardingLinkUrl(organizationId),
+  {      
+    ...options,
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      createStripeOnboardingLinkInputBody,)
+  }
+);}
+
+
+
+
+export const getCreateOrgStripeOnboardingLinkMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>, TError,{organizationId: string;data: NonReadonly<CreateStripeOnboardingLinkInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>, TError,{organizationId: string;data: NonReadonly<CreateStripeOnboardingLinkInputBody>}, TContext> => {
+
+const mutationKey = ['createOrgStripeOnboardingLink'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>, {organizationId: string;data: NonReadonly<CreateStripeOnboardingLinkInputBody>}> = (props) => {
+          const {organizationId,data} = props ?? {};
+
+          return  createOrgStripeOnboardingLink(organizationId,data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateOrgStripeOnboardingLinkMutationResult = NonNullable<Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>>
+    export type CreateOrgStripeOnboardingLinkMutationBody = NonReadonly<CreateStripeOnboardingLinkInputBody>
+    export type CreateOrgStripeOnboardingLinkMutationError = ErrorModel
+
+    /**
  * @summary Creates an onboarding link for a Stripe account
  */
-export const useCreateOrgStripeOnboardingLink = <
-  TError = ErrorModel,
-  TContext = unknown,
->(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>,
-      TError,
-      {
-        organizationId: string;
-        data: NonReadonly<CreateStripeOnboardingLinkInputBody>;
-      },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>,
-  TError,
-  {
-    organizationId: string;
-    data: NonReadonly<CreateStripeOnboardingLinkInputBody>;
-  },
-  TContext
-> => {
-  return useMutation(
-    getCreateOrgStripeOnboardingLinkMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useCreateOrgStripeOnboardingLink = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>, TError,{organizationId: string;data: NonReadonly<CreateStripeOnboardingLinkInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createOrgStripeOnboardingLink>>,
+        TError,
+        {organizationId: string;data: NonReadonly<CreateStripeOnboardingLinkInputBody>},
+        TContext
+      > => {
+      return useMutation(getCreateOrgStripeOnboardingLinkMutationOptions(options), queryClient);
+    }
+    /**
  * Create a new Stripe account for an organization
  * @summary Create a new Stripe account for an organization
  */
 export type createOrgStripeAccountResponse200 = {
-  data: CreateOrgStripeAccountOutputBody;
-  status: 200;
-};
+  data: CreateOrgStripeAccountOutputBody
+  status: 200
+}
 
 export type createOrgStripeAccountResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createOrgStripeAccountResponseSuccess =
-  createOrgStripeAccountResponse200 & {
-    headers: Headers;
-  };
-export type createOrgStripeAccountResponseError =
-  createOrgStripeAccountResponseDefault & {
-    headers: Headers;
-  };
-
-export type createOrgStripeAccountResponse =
-  | createOrgStripeAccountResponseSuccess
-  | createOrgStripeAccountResponseError;
-
-export const getCreateOrgStripeAccountUrl = (organizationId: string) => {
-  return `/api/v1/stripe/orgaccount/${organizationId}`;
+export type createOrgStripeAccountResponseSuccess = (createOrgStripeAccountResponse200) & {
+  headers: Headers;
 };
-
-export const createOrgStripeAccount = async (
-  organizationId: string,
-  options?: RequestInit,
-): Promise<createOrgStripeAccountResponse> => {
-  return customInstance<createOrgStripeAccountResponse>(
-    getCreateOrgStripeAccountUrl(organizationId),
-    {
-      ...options,
-      method: "POST",
-    },
-  );
+export type createOrgStripeAccountResponseError = (createOrgStripeAccountResponseDefault) & {
+  headers: Headers;
 };
 
-export const getCreateOrgStripeAccountMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createOrgStripeAccount>>,
-    TError,
-    { organizationId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createOrgStripeAccount>>,
-  TError,
-  { organizationId: string },
-  TContext
-> => {
-  const mutationKey = ["createOrgStripeAccount"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createOrgStripeAccount>>,
-    { organizationId: string }
-  > = (props) => {
-    const { organizationId } = props ?? {};
-
-    return createOrgStripeAccount(organizationId, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type createOrgStripeAccountResponse = (createOrgStripeAccountResponseSuccess | createOrgStripeAccountResponseError)
 
-export type CreateOrgStripeAccountMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createOrgStripeAccount>>
->;
+export const getCreateOrgStripeAccountUrl = (organizationId: string,) => {
 
-export type CreateOrgStripeAccountMutationError = ErrorModel;
 
-/**
+  
+
+  return `/api/v1/stripe/orgaccount/${organizationId}`
+}
+
+export const createOrgStripeAccount = async (organizationId: string, options?: RequestInit): Promise<createOrgStripeAccountResponse> => {
+  
+  return customInstance<createOrgStripeAccountResponse>(getCreateOrgStripeAccountUrl(organizationId),
+  {      
+    ...options,
+    method: 'POST'
+    
+    
+  }
+);}
+
+
+
+
+export const getCreateOrgStripeAccountMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrgStripeAccount>>, TError,{organizationId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createOrgStripeAccount>>, TError,{organizationId: string}, TContext> => {
+
+const mutationKey = ['createOrgStripeAccount'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createOrgStripeAccount>>, {organizationId: string}> = (props) => {
+          const {organizationId} = props ?? {};
+
+          return  createOrgStripeAccount(organizationId,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateOrgStripeAccountMutationResult = NonNullable<Awaited<ReturnType<typeof createOrgStripeAccount>>>
+    
+    export type CreateOrgStripeAccountMutationError = ErrorModel
+
+    /**
  * @summary Create a new Stripe account for an organization
  */
-export const useCreateOrgStripeAccount = <
-  TError = ErrorModel,
-  TContext = unknown,
->(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createOrgStripeAccount>>,
-      TError,
-      { organizationId: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createOrgStripeAccount>>,
-  TError,
-  { organizationId: string },
-  TContext
-> => {
-  return useMutation(
-    getCreateOrgStripeAccountMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useCreateOrgStripeAccount = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrgStripeAccount>>, TError,{organizationId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createOrgStripeAccount>>,
+        TError,
+        {organizationId: string},
+        TContext
+      > => {
+      return useMutation(getCreateOrgStripeAccountMutationOptions(options), queryClient);
+    }
+    /**
  * Creates a Stripe SetupIntent and returns client_secret for frontend to collect card details
  * @summary Create a SetupIntent for guardian to add payment method
  */
 export type createGuardianSetupIntentResponse200 = {
-  data: CreateSetupIntentOutputBody;
-  status: 200;
-};
+  data: CreateSetupIntentOutputBody
+  status: 200
+}
 
 export type createGuardianSetupIntentResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createGuardianSetupIntentResponseSuccess =
-  createGuardianSetupIntentResponse200 & {
-    headers: Headers;
-  };
-export type createGuardianSetupIntentResponseError =
-  createGuardianSetupIntentResponseDefault & {
-    headers: Headers;
-  };
-
-export type createGuardianSetupIntentResponse =
-  | createGuardianSetupIntentResponseSuccess
-  | createGuardianSetupIntentResponseError;
-
-export const getCreateGuardianSetupIntentUrl = (guardianId: string) => {
-  return `/api/v1/stripe/setup-intent/${guardianId}`;
+export type createGuardianSetupIntentResponseSuccess = (createGuardianSetupIntentResponse200) & {
+  headers: Headers;
 };
-
-export const createGuardianSetupIntent = async (
-  guardianId: string,
-  options?: RequestInit,
-): Promise<createGuardianSetupIntentResponse> => {
-  return customInstance<createGuardianSetupIntentResponse>(
-    getCreateGuardianSetupIntentUrl(guardianId),
-    {
-      ...options,
-      method: "POST",
-    },
-  );
+export type createGuardianSetupIntentResponseError = (createGuardianSetupIntentResponseDefault) & {
+  headers: Headers;
 };
 
-export const getCreateGuardianSetupIntentMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createGuardianSetupIntent>>,
-    TError,
-    { guardianId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createGuardianSetupIntent>>,
-  TError,
-  { guardianId: string },
-  TContext
-> => {
-  const mutationKey = ["createGuardianSetupIntent"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createGuardianSetupIntent>>,
-    { guardianId: string }
-  > = (props) => {
-    const { guardianId } = props ?? {};
-
-    return createGuardianSetupIntent(guardianId, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type createGuardianSetupIntentResponse = (createGuardianSetupIntentResponseSuccess | createGuardianSetupIntentResponseError)
 
-export type CreateGuardianSetupIntentMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createGuardianSetupIntent>>
->;
+export const getCreateGuardianSetupIntentUrl = (guardianId: string,) => {
 
-export type CreateGuardianSetupIntentMutationError = ErrorModel;
 
-/**
+  
+
+  return `/api/v1/stripe/setup-intent/${guardianId}`
+}
+
+export const createGuardianSetupIntent = async (guardianId: string, options?: RequestInit): Promise<createGuardianSetupIntentResponse> => {
+  
+  return customInstance<createGuardianSetupIntentResponse>(getCreateGuardianSetupIntentUrl(guardianId),
+  {      
+    ...options,
+    method: 'POST'
+    
+    
+  }
+);}
+
+
+
+
+export const getCreateGuardianSetupIntentMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createGuardianSetupIntent>>, TError,{guardianId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createGuardianSetupIntent>>, TError,{guardianId: string}, TContext> => {
+
+const mutationKey = ['createGuardianSetupIntent'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createGuardianSetupIntent>>, {guardianId: string}> = (props) => {
+          const {guardianId} = props ?? {};
+
+          return  createGuardianSetupIntent(guardianId,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateGuardianSetupIntentMutationResult = NonNullable<Awaited<ReturnType<typeof createGuardianSetupIntent>>>
+    
+    export type CreateGuardianSetupIntentMutationError = ErrorModel
+
+    /**
  * @summary Create a SetupIntent for guardian to add payment method
  */
-export const useCreateGuardianSetupIntent = <
-  TError = ErrorModel,
-  TContext = unknown,
->(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createGuardianSetupIntent>>,
-      TError,
-      { guardianId: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createGuardianSetupIntent>>,
-  TError,
-  { guardianId: string },
-  TContext
-> => {
-  return useMutation(
-    getCreateGuardianSetupIntentMutationOptions(options),
-    queryClient,
-  );
-};
+export const useCreateGuardianSetupIntent = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createGuardianSetupIntent>>, TError,{guardianId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createGuardianSetupIntent>>,
+        TError,
+        {guardianId: string},
+        TContext
+      > => {
+      return useMutation(getCreateGuardianSetupIntentMutationOptions(options), queryClient);
+    }
+    
\ No newline at end of file
diff --git a/frontend/packages/api-client/src/generated/registrations/registrations.ts b/frontend/packages/api-client/src/generated/registrations/registrations.ts
index 195b071a..a7c6b070 100644
--- a/frontend/packages/api-client/src/generated/registrations/registrations.ts
+++ b/frontend/packages/api-client/src/generated/registrations/registrations.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,8 +21,8 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   CancelRegistrationOutputBody,
@@ -30,1354 +33,881 @@ import type {
   GetRegistrationsByGuardianIDOutputBody,
   Registration,
   UpdateRegistrationInputBody,
-  UpdateRegistrationPaymentStatusInputBody,
-} from "../skillSparkAPI.schemas";
+  UpdateRegistrationPaymentStatusInputBody
+} from '../skillSparkAPI.schemas';
 
-import { customInstance } from "../../apiClient";
+import { customInstance } from '../../apiClient';
 
 // https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> =
-  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
 
 type WritableKeys<T> = {
-  [P in keyof T]-?: IfEquals<
-    { [Q in P]: T[P] },
-    { -readonly [Q in P]: T[P] },
-    P
-  >;
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
 }[keyof T];
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
-) => void
-  ? I
-  : never;
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
 type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
 
 type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>]
-  ? {
-      [P in keyof Writable<T>]: T[P] extends object
-        ? NonReadonly<NonNullable<T[P]>>
-        : T[P];
-    }
-  : DistributeReadOnlyOverUnions<T>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Create a new registration for a child to attend an event occurrence
  * @summary Create a new registration
  */
 export type createRegistrationResponse200 = {
-  data: Registration;
-  status: 200;
-};
+  data: Registration
+  status: 200
+}
 
 export type createRegistrationResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createRegistrationResponseSuccess =
-  createRegistrationResponse200 & {
-    headers: Headers;
-  };
-export type createRegistrationResponseError =
-  createRegistrationResponseDefault & {
-    headers: Headers;
-  };
+export type createRegistrationResponseSuccess = (createRegistrationResponse200) & {
+  headers: Headers;
+};
+export type createRegistrationResponseError = (createRegistrationResponseDefault) & {
+  headers: Headers;
+};
 
-export type createRegistrationResponse =
-  | createRegistrationResponseSuccess
-  | createRegistrationResponseError;
+export type createRegistrationResponse = (createRegistrationResponseSuccess | createRegistrationResponseError)
 
 export const getCreateRegistrationUrl = () => {
-  return `/api/v1/registrations`;
-};
 
-export const createRegistration = async (
-  createRegistrationInputBody: NonReadonly<CreateRegistrationInputBody>,
-  options?: RequestInit,
-): Promise<createRegistrationResponse> => {
-  return customInstance<createRegistrationResponse>(
-    getCreateRegistrationUrl(),
-    {
-      ...options,
-      method: "POST",
-      headers: { "Content-Type": "application/json", ...options?.headers },
-      body: JSON.stringify(createRegistrationInputBody),
-    },
-  );
-};
 
-export const getCreateRegistrationMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createRegistration>>,
-    TError,
-    { data: NonReadonly<CreateRegistrationInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createRegistration>>,
-  TError,
-  { data: NonReadonly<CreateRegistrationInputBody> },
-  TContext
-> => {
-  const mutationKey = ["createRegistration"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createRegistration>>,
-    { data: NonReadonly<CreateRegistrationInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return createRegistration(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+  
 
-export type CreateRegistrationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createRegistration>>
->;
-export type CreateRegistrationMutationBody =
-  NonReadonly<CreateRegistrationInputBody>;
-export type CreateRegistrationMutationError = ErrorModel;
+  return `/api/v1/registrations`
+}
 
-/**
+export const createRegistration = async (createRegistrationInputBody: NonReadonly<CreateRegistrationInputBody>, options?: RequestInit): Promise<createRegistrationResponse> => {
+  
+  return customInstance<createRegistrationResponse>(getCreateRegistrationUrl(),
+  {      
+    ...options,
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      createRegistrationInputBody,)
+  }
+);}
+
+
+
+
+export const getCreateRegistrationMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createRegistration>>, TError,{data: NonReadonly<CreateRegistrationInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createRegistration>>, TError,{data: NonReadonly<CreateRegistrationInputBody>}, TContext> => {
+
+const mutationKey = ['createRegistration'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createRegistration>>, {data: NonReadonly<CreateRegistrationInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  createRegistration(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateRegistrationMutationResult = NonNullable<Awaited<ReturnType<typeof createRegistration>>>
+    export type CreateRegistrationMutationBody = NonReadonly<CreateRegistrationInputBody>
+    export type CreateRegistrationMutationError = ErrorModel
+
+    /**
  * @summary Create a new registration
  */
-export const useCreateRegistration = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createRegistration>>,
-      TError,
-      { data: NonReadonly<CreateRegistrationInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createRegistration>>,
-  TError,
-  { data: NonReadonly<CreateRegistrationInputBody> },
-  TContext
-> => {
-  return useMutation(
-    getCreateRegistrationMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useCreateRegistration = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createRegistration>>, TError,{data: NonReadonly<CreateRegistrationInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createRegistration>>,
+        TError,
+        {data: NonReadonly<CreateRegistrationInputBody>},
+        TContext
+      > => {
+      return useMutation(getCreateRegistrationMutationOptions(options), queryClient);
+    }
+    /**
  * Retrieve a specific registration by its unique identifier
  * @summary Get registration by ID
  */
 export type getRegistrationByIdResponse200 = {
-  data: Registration;
-  status: 200;
-};
+  data: Registration
+  status: 200
+}
 
 export type getRegistrationByIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getRegistrationByIdResponseSuccess =
-  getRegistrationByIdResponse200 & {
-    headers: Headers;
-  };
-export type getRegistrationByIdResponseError =
-  getRegistrationByIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getRegistrationByIdResponse =
-  | getRegistrationByIdResponseSuccess
-  | getRegistrationByIdResponseError;
-
-export const getGetRegistrationByIdUrl = (id: string) => {
-  return `/api/v1/registrations/${id}`;
+export type getRegistrationByIdResponseSuccess = (getRegistrationByIdResponse200) & {
+  headers: Headers;
 };
-
-export const getRegistrationById = async (
-  id: string,
-  options?: RequestInit,
-): Promise<getRegistrationByIdResponse> => {
-  return customInstance<getRegistrationByIdResponse>(
-    getGetRegistrationByIdUrl(id),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getRegistrationByIdResponseError = (getRegistrationByIdResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetRegistrationByIdQueryKey = (id: string) => {
-  return [`/api/v1/registrations/${id}`] as const;
-};
+export type getRegistrationByIdResponse = (getRegistrationByIdResponseSuccess | getRegistrationByIdResponseError)
 
-export const getGetRegistrationByIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getRegistrationById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetRegistrationByIdUrl = (id: string,) => {
+
+
+  
+
+  return `/api/v1/registrations/${id}`
+}
+
+export const getRegistrationById = async (id: string, options?: RequestInit): Promise<getRegistrationByIdResponse> => {
+  
+  return customInstance<getRegistrationByIdResponse>(getGetRegistrationByIdUrl(id),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetRegistrationByIdQueryKey = (id: string,) => {
+    return [
+    `/api/v1/registrations/${id}`
+    ] as const;
+    }
+
+    
+export const getGetRegistrationByIdQueryOptions = <TData = Awaited<ReturnType<typeof getRegistrationById>>, TError = ErrorModel>(id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getGetRegistrationByIdQueryKey(id);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getRegistrationById>>
-  > = ({ signal }) => getRegistrationById(id, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getRegistrationById>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetRegistrationByIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getRegistrationById>>
->;
-export type GetRegistrationByIdQueryError = ErrorModel;
-
-export function useGetRegistrationById<
-  TData = Awaited<ReturnType<typeof getRegistrationById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationById>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetRegistrationByIdQueryKey(id);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getRegistrationById>>> = ({ signal }) => getRegistrationById(id, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getRegistrationById>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetRegistrationByIdQueryResult = NonNullable<Awaited<ReturnType<typeof getRegistrationById>>>
+export type GetRegistrationByIdQueryError = ErrorModel
+
+
+export function useGetRegistrationById<TData = Awaited<ReturnType<typeof getRegistrationById>>, TError = ErrorModel>(
+ id: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationById>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getRegistrationById>>,
           TError,
           Awaited<ReturnType<typeof getRegistrationById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetRegistrationById<
-  TData = Awaited<ReturnType<typeof getRegistrationById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationById>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetRegistrationById<TData = Awaited<ReturnType<typeof getRegistrationById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationById>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getRegistrationById>>,
           TError,
           Awaited<ReturnType<typeof getRegistrationById>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetRegistrationById<
-  TData = Awaited<ReturnType<typeof getRegistrationById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetRegistrationById<TData = Awaited<ReturnType<typeof getRegistrationById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get registration by ID
  */
 
-export function useGetRegistrationById<
-  TData = Awaited<ReturnType<typeof getRegistrationById>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationById>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetRegistrationByIdQueryOptions(id, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetRegistrationById<TData = Awaited<ReturnType<typeof getRegistrationById>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationById>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetRegistrationByIdQueryOptions(id,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Update the child associated with a registration
  * @summary Update a registration
  */
 export type updateRegistrationResponse200 = {
-  data: Registration;
-  status: 200;
-};
+  data: Registration
+  status: 200
+}
 
 export type updateRegistrationResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type updateRegistrationResponseSuccess =
-  updateRegistrationResponse200 & {
-    headers: Headers;
-  };
-export type updateRegistrationResponseError =
-  updateRegistrationResponseDefault & {
-    headers: Headers;
-  };
-
-export type updateRegistrationResponse =
-  | updateRegistrationResponseSuccess
-  | updateRegistrationResponseError;
-
-export const getUpdateRegistrationUrl = (id: string) => {
-  return `/api/v1/registrations/${id}`;
+export type updateRegistrationResponseSuccess = (updateRegistrationResponse200) & {
+  headers: Headers;
 };
-
-export const updateRegistration = async (
-  id: string,
-  updateRegistrationInputBody: NonReadonly<UpdateRegistrationInputBody>,
-  options?: RequestInit,
-): Promise<updateRegistrationResponse> => {
-  return customInstance<updateRegistrationResponse>(
-    getUpdateRegistrationUrl(id),
-    {
-      ...options,
-      method: "PATCH",
-      headers: { "Content-Type": "application/json", ...options?.headers },
-      body: JSON.stringify(updateRegistrationInputBody),
-    },
-  );
+export type updateRegistrationResponseError = (updateRegistrationResponseDefault) & {
+  headers: Headers;
 };
 
-export const getUpdateRegistrationMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof updateRegistration>>,
-    TError,
-    { id: string; data: NonReadonly<UpdateRegistrationInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof updateRegistration>>,
-  TError,
-  { id: string; data: NonReadonly<UpdateRegistrationInputBody> },
-  TContext
-> => {
-  const mutationKey = ["updateRegistration"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof updateRegistration>>,
-    { id: string; data: NonReadonly<UpdateRegistrationInputBody> }
-  > = (props) => {
-    const { id, data } = props ?? {};
-
-    return updateRegistration(id, data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type updateRegistrationResponse = (updateRegistrationResponseSuccess | updateRegistrationResponseError)
 
-export type UpdateRegistrationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof updateRegistration>>
->;
-export type UpdateRegistrationMutationBody =
-  NonReadonly<UpdateRegistrationInputBody>;
-export type UpdateRegistrationMutationError = ErrorModel;
+export const getUpdateRegistrationUrl = (id: string,) => {
 
-/**
+
+  
+
+  return `/api/v1/registrations/${id}`
+}
+
+export const updateRegistration = async (id: string,
+    updateRegistrationInputBody: NonReadonly<UpdateRegistrationInputBody>, options?: RequestInit): Promise<updateRegistrationResponse> => {
+  
+  return customInstance<updateRegistrationResponse>(getUpdateRegistrationUrl(id),
+  {      
+    ...options,
+    method: 'PATCH',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      updateRegistrationInputBody,)
+  }
+);}
+
+
+
+
+export const getUpdateRegistrationMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateRegistration>>, TError,{id: string;data: NonReadonly<UpdateRegistrationInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof updateRegistration>>, TError,{id: string;data: NonReadonly<UpdateRegistrationInputBody>}, TContext> => {
+
+const mutationKey = ['updateRegistration'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof updateRegistration>>, {id: string;data: NonReadonly<UpdateRegistrationInputBody>}> = (props) => {
+          const {id,data} = props ?? {};
+
+          return  updateRegistration(id,data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type UpdateRegistrationMutationResult = NonNullable<Awaited<ReturnType<typeof updateRegistration>>>
+    export type UpdateRegistrationMutationBody = NonReadonly<UpdateRegistrationInputBody>
+    export type UpdateRegistrationMutationError = ErrorModel
+
+    /**
  * @summary Update a registration
  */
-export const useUpdateRegistration = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof updateRegistration>>,
-      TError,
-      { id: string; data: NonReadonly<UpdateRegistrationInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof updateRegistration>>,
-  TError,
-  { id: string; data: NonReadonly<UpdateRegistrationInputBody> },
-  TContext
-> => {
-  return useMutation(
-    getUpdateRegistrationMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useUpdateRegistration = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateRegistration>>, TError,{id: string;data: NonReadonly<UpdateRegistrationInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof updateRegistration>>,
+        TError,
+        {id: string;data: NonReadonly<UpdateRegistrationInputBody>},
+        TContext
+      > => {
+      return useMutation(getUpdateRegistrationMutationOptions(options), queryClient);
+    }
+    /**
  * Cancel a registration and process refund if applicable
  * @summary Cancel a registration
  */
 export type cancelRegistrationResponse200 = {
-  data: CancelRegistrationOutputBody;
-  status: 200;
-};
+  data: CancelRegistrationOutputBody
+  status: 200
+}
 
 export type cancelRegistrationResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type cancelRegistrationResponseSuccess =
-  cancelRegistrationResponse200 & {
-    headers: Headers;
-  };
-export type cancelRegistrationResponseError =
-  cancelRegistrationResponseDefault & {
-    headers: Headers;
-  };
-
-export type cancelRegistrationResponse =
-  | cancelRegistrationResponseSuccess
-  | cancelRegistrationResponseError;
-
-export const getCancelRegistrationUrl = (id: string) => {
-  return `/api/v1/registrations/${id}/cancel`;
+export type cancelRegistrationResponseSuccess = (cancelRegistrationResponse200) & {
+  headers: Headers;
 };
-
-export const cancelRegistration = async (
-  id: string,
-  options?: RequestInit,
-): Promise<cancelRegistrationResponse> => {
-  return customInstance<cancelRegistrationResponse>(
-    getCancelRegistrationUrl(id),
-    {
-      ...options,
-      method: "POST",
-    },
-  );
+export type cancelRegistrationResponseError = (cancelRegistrationResponseDefault) & {
+  headers: Headers;
 };
 
-export const getCancelRegistrationMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof cancelRegistration>>,
-    TError,
-    { id: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof cancelRegistration>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  const mutationKey = ["cancelRegistration"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof cancelRegistration>>,
-    { id: string }
-  > = (props) => {
-    const { id } = props ?? {};
-
-    return cancelRegistration(id, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type cancelRegistrationResponse = (cancelRegistrationResponseSuccess | cancelRegistrationResponseError)
 
-export type CancelRegistrationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof cancelRegistration>>
->;
+export const getCancelRegistrationUrl = (id: string,) => {
 
-export type CancelRegistrationMutationError = ErrorModel;
 
-/**
+  
+
+  return `/api/v1/registrations/${id}/cancel`
+}
+
+export const cancelRegistration = async (id: string, options?: RequestInit): Promise<cancelRegistrationResponse> => {
+  
+  return customInstance<cancelRegistrationResponse>(getCancelRegistrationUrl(id),
+  {      
+    ...options,
+    method: 'POST'
+    
+    
+  }
+);}
+
+
+
+
+export const getCancelRegistrationMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof cancelRegistration>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof cancelRegistration>>, TError,{id: string}, TContext> => {
+
+const mutationKey = ['cancelRegistration'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof cancelRegistration>>, {id: string}> = (props) => {
+          const {id} = props ?? {};
+
+          return  cancelRegistration(id,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CancelRegistrationMutationResult = NonNullable<Awaited<ReturnType<typeof cancelRegistration>>>
+    
+    export type CancelRegistrationMutationError = ErrorModel
+
+    /**
  * @summary Cancel a registration
  */
-export const useCancelRegistration = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof cancelRegistration>>,
-      TError,
-      { id: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof cancelRegistration>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  return useMutation(
-    getCancelRegistrationMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useCancelRegistration = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof cancelRegistration>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof cancelRegistration>>,
+        TError,
+        {id: string},
+        TContext
+      > => {
+      return useMutation(getCancelRegistrationMutationOptions(options), queryClient);
+    }
+    /**
  * Update the payment intent status for a registration (typically called by webhooks)
  * @summary Update registration payment status
  */
 export type updateRegistrationPaymentStatusResponse200 = {
-  data: Registration;
-  status: 200;
-};
+  data: Registration
+  status: 200
+}
 
 export type updateRegistrationPaymentStatusResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type updateRegistrationPaymentStatusResponseSuccess =
-  updateRegistrationPaymentStatusResponse200 & {
-    headers: Headers;
-  };
-export type updateRegistrationPaymentStatusResponseError =
-  updateRegistrationPaymentStatusResponseDefault & {
-    headers: Headers;
-  };
-
-export type updateRegistrationPaymentStatusResponse =
-  | updateRegistrationPaymentStatusResponseSuccess
-  | updateRegistrationPaymentStatusResponseError;
-
-export const getUpdateRegistrationPaymentStatusUrl = (id: string) => {
-  return `/api/v1/registrations/${id}/payment-status`;
+export type updateRegistrationPaymentStatusResponseSuccess = (updateRegistrationPaymentStatusResponse200) & {
+  headers: Headers;
 };
-
-export const updateRegistrationPaymentStatus = async (
-  id: string,
-  updateRegistrationPaymentStatusInputBody: NonReadonly<UpdateRegistrationPaymentStatusInputBody>,
-  options?: RequestInit,
-): Promise<updateRegistrationPaymentStatusResponse> => {
-  return customInstance<updateRegistrationPaymentStatusResponse>(
-    getUpdateRegistrationPaymentStatusUrl(id),
-    {
-      ...options,
-      method: "PATCH",
-      headers: { "Content-Type": "application/json", ...options?.headers },
-      body: JSON.stringify(updateRegistrationPaymentStatusInputBody),
-    },
-  );
+export type updateRegistrationPaymentStatusResponseError = (updateRegistrationPaymentStatusResponseDefault) & {
+  headers: Headers;
 };
 
-export const getUpdateRegistrationPaymentStatusMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>,
-    TError,
-    { id: string; data: NonReadonly<UpdateRegistrationPaymentStatusInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>,
-  TError,
-  { id: string; data: NonReadonly<UpdateRegistrationPaymentStatusInputBody> },
-  TContext
-> => {
-  const mutationKey = ["updateRegistrationPaymentStatus"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>,
-    { id: string; data: NonReadonly<UpdateRegistrationPaymentStatusInputBody> }
-  > = (props) => {
-    const { id, data } = props ?? {};
-
-    return updateRegistrationPaymentStatus(id, data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
+export type updateRegistrationPaymentStatusResponse = (updateRegistrationPaymentStatusResponseSuccess | updateRegistrationPaymentStatusResponseError)
 
-export type UpdateRegistrationPaymentStatusMutationResult = NonNullable<
-  Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>
->;
-export type UpdateRegistrationPaymentStatusMutationBody =
-  NonReadonly<UpdateRegistrationPaymentStatusInputBody>;
-export type UpdateRegistrationPaymentStatusMutationError = ErrorModel;
+export const getUpdateRegistrationPaymentStatusUrl = (id: string,) => {
 
-/**
+
+  
+
+  return `/api/v1/registrations/${id}/payment-status`
+}
+
+export const updateRegistrationPaymentStatus = async (id: string,
+    updateRegistrationPaymentStatusInputBody: NonReadonly<UpdateRegistrationPaymentStatusInputBody>, options?: RequestInit): Promise<updateRegistrationPaymentStatusResponse> => {
+  
+  return customInstance<updateRegistrationPaymentStatusResponse>(getUpdateRegistrationPaymentStatusUrl(id),
+  {      
+    ...options,
+    method: 'PATCH',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      updateRegistrationPaymentStatusInputBody,)
+  }
+);}
+
+
+
+
+export const getUpdateRegistrationPaymentStatusMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>, TError,{id: string;data: NonReadonly<UpdateRegistrationPaymentStatusInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>, TError,{id: string;data: NonReadonly<UpdateRegistrationPaymentStatusInputBody>}, TContext> => {
+
+const mutationKey = ['updateRegistrationPaymentStatus'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>, {id: string;data: NonReadonly<UpdateRegistrationPaymentStatusInputBody>}> = (props) => {
+          const {id,data} = props ?? {};
+
+          return  updateRegistrationPaymentStatus(id,data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type UpdateRegistrationPaymentStatusMutationResult = NonNullable<Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>>
+    export type UpdateRegistrationPaymentStatusMutationBody = NonReadonly<UpdateRegistrationPaymentStatusInputBody>
+    export type UpdateRegistrationPaymentStatusMutationError = ErrorModel
+
+    /**
  * @summary Update registration payment status
  */
-export const useUpdateRegistrationPaymentStatus = <
-  TError = ErrorModel,
-  TContext = unknown,
->(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>,
-      TError,
-      {
-        id: string;
-        data: NonReadonly<UpdateRegistrationPaymentStatusInputBody>;
-      },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>,
-  TError,
-  { id: string; data: NonReadonly<UpdateRegistrationPaymentStatusInputBody> },
-  TContext
-> => {
-  return useMutation(
-    getUpdateRegistrationPaymentStatusMutationOptions(options),
-    queryClient,
-  );
-};
-/**
+export const useUpdateRegistrationPaymentStatus = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>, TError,{id: string;data: NonReadonly<UpdateRegistrationPaymentStatusInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof updateRegistrationPaymentStatus>>,
+        TError,
+        {id: string;data: NonReadonly<UpdateRegistrationPaymentStatusInputBody>},
+        TContext
+      > => {
+      return useMutation(getUpdateRegistrationPaymentStatusMutationOptions(options), queryClient);
+    }
+    /**
  * Retrieve all registrations for a specific child
  * @summary Get registrations by child ID
  */
 export type getRegistrationsByChildIdResponse200 = {
-  data: GetRegistrationsByChildIDOutputBody;
-  status: 200;
-};
+  data: GetRegistrationsByChildIDOutputBody
+  status: 200
+}
 
 export type getRegistrationsByChildIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getRegistrationsByChildIdResponseSuccess =
-  getRegistrationsByChildIdResponse200 & {
-    headers: Headers;
-  };
-export type getRegistrationsByChildIdResponseError =
-  getRegistrationsByChildIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getRegistrationsByChildIdResponse =
-  | getRegistrationsByChildIdResponseSuccess
-  | getRegistrationsByChildIdResponseError;
-
-export const getGetRegistrationsByChildIdUrl = (childId: string) => {
-  return `/api/v1/registrations/child/${childId}`;
+export type getRegistrationsByChildIdResponseSuccess = (getRegistrationsByChildIdResponse200) & {
+  headers: Headers;
 };
-
-export const getRegistrationsByChildId = async (
-  childId: string,
-  options?: RequestInit,
-): Promise<getRegistrationsByChildIdResponse> => {
-  return customInstance<getRegistrationsByChildIdResponse>(
-    getGetRegistrationsByChildIdUrl(childId),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getRegistrationsByChildIdResponseError = (getRegistrationsByChildIdResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetRegistrationsByChildIdQueryKey = (childId: string) => {
-  return [`/api/v1/registrations/child/${childId}`] as const;
-};
+export type getRegistrationsByChildIdResponse = (getRegistrationsByChildIdResponseSuccess | getRegistrationsByChildIdResponseError)
 
-export const getGetRegistrationsByChildIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-  TError = ErrorModel,
->(
-  childId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetRegistrationsByChildIdUrl = (childId: string,) => {
+
+
+  
+
+  return `/api/v1/registrations/child/${childId}`
+}
+
+export const getRegistrationsByChildId = async (childId: string, options?: RequestInit): Promise<getRegistrationsByChildIdResponse> => {
+  
+  return customInstance<getRegistrationsByChildIdResponse>(getGetRegistrationsByChildIdUrl(childId),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetRegistrationsByChildIdQueryKey = (childId: string,) => {
+    return [
+    `/api/v1/registrations/child/${childId}`
+    ] as const;
+    }
+
+    
+export const getGetRegistrationsByChildIdQueryOptions = <TData = Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError = ErrorModel>(childId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetRegistrationsByChildIdQueryKey(childId);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getRegistrationsByChildId>>
-  > = ({ signal }) =>
-    getRegistrationsByChildId(childId, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!childId,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetRegistrationsByChildIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getRegistrationsByChildId>>
->;
-export type GetRegistrationsByChildIdQueryError = ErrorModel;
-
-export function useGetRegistrationsByChildId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-  TError = ErrorModel,
->(
-  childId: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetRegistrationsByChildIdQueryKey(childId);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getRegistrationsByChildId>>> = ({ signal }) => getRegistrationsByChildId(childId, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(childId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetRegistrationsByChildIdQueryResult = NonNullable<Awaited<ReturnType<typeof getRegistrationsByChildId>>>
+export type GetRegistrationsByChildIdQueryError = ErrorModel
+
+
+export function useGetRegistrationsByChildId<TData = Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError = ErrorModel>(
+ childId: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getRegistrationsByChildId>>,
           TError,
           Awaited<ReturnType<typeof getRegistrationsByChildId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetRegistrationsByChildId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-  TError = ErrorModel,
->(
-  childId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetRegistrationsByChildId<TData = Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError = ErrorModel>(
+ childId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getRegistrationsByChildId>>,
           TError,
           Awaited<ReturnType<typeof getRegistrationsByChildId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetRegistrationsByChildId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-  TError = ErrorModel,
->(
-  childId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetRegistrationsByChildId<TData = Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError = ErrorModel>(
+ childId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get registrations by child ID
  */
 
-export function useGetRegistrationsByChildId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-  TError = ErrorModel,
->(
-  childId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByChildId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetRegistrationsByChildIdQueryOptions(
-    childId,
-    options,
-  );
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetRegistrationsByChildId<TData = Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError = ErrorModel>(
+ childId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByChildId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetRegistrationsByChildIdQueryOptions(childId,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Retrieve all registrations for a specific event occurrence
  * @summary Get registrations by event occurrence ID
  */
 export type getRegistrationsByEventOccurrenceIdResponse200 = {
-  data: GetRegistrationsByEventOccurrenceIDOutputBody;
-  status: 200;
-};
+  data: GetRegistrationsByEventOccurrenceIDOutputBody
+  status: 200
+}
 
 export type getRegistrationsByEventOccurrenceIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getRegistrationsByEventOccurrenceIdResponseSuccess =
-  getRegistrationsByEventOccurrenceIdResponse200 & {
-    headers: Headers;
-  };
-export type getRegistrationsByEventOccurrenceIdResponseError =
-  getRegistrationsByEventOccurrenceIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getRegistrationsByEventOccurrenceIdResponse =
-  | getRegistrationsByEventOccurrenceIdResponseSuccess
-  | getRegistrationsByEventOccurrenceIdResponseError;
-
-export const getGetRegistrationsByEventOccurrenceIdUrl = (
-  eventOccurrenceId: string,
-) => {
-  return `/api/v1/registrations/event_occurrence/${eventOccurrenceId}`;
+export type getRegistrationsByEventOccurrenceIdResponseSuccess = (getRegistrationsByEventOccurrenceIdResponse200) & {
+  headers: Headers;
 };
-
-export const getRegistrationsByEventOccurrenceId = async (
-  eventOccurrenceId: string,
-  options?: RequestInit,
-): Promise<getRegistrationsByEventOccurrenceIdResponse> => {
-  return customInstance<getRegistrationsByEventOccurrenceIdResponse>(
-    getGetRegistrationsByEventOccurrenceIdUrl(eventOccurrenceId),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getRegistrationsByEventOccurrenceIdResponseError = (getRegistrationsByEventOccurrenceIdResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetRegistrationsByEventOccurrenceIdQueryKey = (
-  eventOccurrenceId: string,
-) => {
-  return [
-    `/api/v1/registrations/event_occurrence/${eventOccurrenceId}`,
-  ] as const;
-};
+export type getRegistrationsByEventOccurrenceIdResponse = (getRegistrationsByEventOccurrenceIdResponseSuccess | getRegistrationsByEventOccurrenceIdResponseError)
 
-export const getGetRegistrationsByEventOccurrenceIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-  TError = ErrorModel,
->(
-  eventOccurrenceId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetRegistrationsByEventOccurrenceIdUrl = (eventOccurrenceId: string,) => {
+
+
+  
+
+  return `/api/v1/registrations/event_occurrence/${eventOccurrenceId}`
+}
+
+export const getRegistrationsByEventOccurrenceId = async (eventOccurrenceId: string, options?: RequestInit): Promise<getRegistrationsByEventOccurrenceIdResponse> => {
+  
+  return customInstance<getRegistrationsByEventOccurrenceIdResponse>(getGetRegistrationsByEventOccurrenceIdUrl(eventOccurrenceId),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetRegistrationsByEventOccurrenceIdQueryKey = (eventOccurrenceId: string,) => {
+    return [
+    `/api/v1/registrations/event_occurrence/${eventOccurrenceId}`
+    ] as const;
+    }
+
+    
+export const getGetRegistrationsByEventOccurrenceIdQueryOptions = <TData = Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError = ErrorModel>(eventOccurrenceId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ??
-    getGetRegistrationsByEventOccurrenceIdQueryKey(eventOccurrenceId);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>
-  > = ({ signal }) =>
-    getRegistrationsByEventOccurrenceId(eventOccurrenceId, {
-      signal,
-      ...requestOptions,
-    });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!eventOccurrenceId,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetRegistrationsByEventOccurrenceIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>
->;
-export type GetRegistrationsByEventOccurrenceIdQueryError = ErrorModel;
-
-export function useGetRegistrationsByEventOccurrenceId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-  TError = ErrorModel,
->(
-  eventOccurrenceId: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetRegistrationsByEventOccurrenceIdQueryKey(eventOccurrenceId);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>> = ({ signal }) => getRegistrationsByEventOccurrenceId(eventOccurrenceId, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(eventOccurrenceId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetRegistrationsByEventOccurrenceIdQueryResult = NonNullable<Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>>
+export type GetRegistrationsByEventOccurrenceIdQueryError = ErrorModel
+
+
+export function useGetRegistrationsByEventOccurrenceId<TData = Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError = ErrorModel>(
+ eventOccurrenceId: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
           TError,
           Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetRegistrationsByEventOccurrenceId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-  TError = ErrorModel,
->(
-  eventOccurrenceId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetRegistrationsByEventOccurrenceId<TData = Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError = ErrorModel>(
+ eventOccurrenceId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
           TError,
           Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetRegistrationsByEventOccurrenceId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-  TError = ErrorModel,
->(
-  eventOccurrenceId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetRegistrationsByEventOccurrenceId<TData = Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError = ErrorModel>(
+ eventOccurrenceId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get registrations by event occurrence ID
  */
 
-export function useGetRegistrationsByEventOccurrenceId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-  TError = ErrorModel,
->(
-  eventOccurrenceId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetRegistrationsByEventOccurrenceIdQueryOptions(
-    eventOccurrenceId,
-    options,
-  );
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetRegistrationsByEventOccurrenceId<TData = Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError = ErrorModel>(
+ eventOccurrenceId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByEventOccurrenceId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetRegistrationsByEventOccurrenceIdQueryOptions(eventOccurrenceId,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Retrieve all registrations for children under a specific guardian
  * @summary Get registrations by guardian ID
  */
 export type getRegistrationsByGuardianIdResponse200 = {
-  data: GetRegistrationsByGuardianIDOutputBody;
-  status: 200;
-};
+  data: GetRegistrationsByGuardianIDOutputBody
+  status: 200
+}
 
 export type getRegistrationsByGuardianIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getRegistrationsByGuardianIdResponseSuccess =
-  getRegistrationsByGuardianIdResponse200 & {
-    headers: Headers;
-  };
-export type getRegistrationsByGuardianIdResponseError =
-  getRegistrationsByGuardianIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getRegistrationsByGuardianIdResponse =
-  | getRegistrationsByGuardianIdResponseSuccess
-  | getRegistrationsByGuardianIdResponseError;
-
-export const getGetRegistrationsByGuardianIdUrl = (guardianId: string) => {
-  return `/api/v1/registrations/guardian/${guardianId}`;
+export type getRegistrationsByGuardianIdResponseSuccess = (getRegistrationsByGuardianIdResponse200) & {
+  headers: Headers;
 };
-
-export const getRegistrationsByGuardianId = async (
-  guardianId: string,
-  options?: RequestInit,
-): Promise<getRegistrationsByGuardianIdResponse> => {
-  return customInstance<getRegistrationsByGuardianIdResponse>(
-    getGetRegistrationsByGuardianIdUrl(guardianId),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getRegistrationsByGuardianIdResponseError = (getRegistrationsByGuardianIdResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetRegistrationsByGuardianIdQueryKey = (guardianId: string) => {
-  return [`/api/v1/registrations/guardian/${guardianId}`] as const;
-};
+export type getRegistrationsByGuardianIdResponse = (getRegistrationsByGuardianIdResponseSuccess | getRegistrationsByGuardianIdResponseError)
 
-export const getGetRegistrationsByGuardianIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-  TError = ErrorModel,
->(
-  guardianId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetRegistrationsByGuardianIdUrl = (guardianId: string,) => {
+
+
+  
+
+  return `/api/v1/registrations/guardian/${guardianId}`
+}
+
+export const getRegistrationsByGuardianId = async (guardianId: string, options?: RequestInit): Promise<getRegistrationsByGuardianIdResponse> => {
+  
+  return customInstance<getRegistrationsByGuardianIdResponse>(getGetRegistrationsByGuardianIdUrl(guardianId),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetRegistrationsByGuardianIdQueryKey = (guardianId: string,) => {
+    return [
+    `/api/v1/registrations/guardian/${guardianId}`
+    ] as const;
+    }
+
+    
+export const getGetRegistrationsByGuardianIdQueryOptions = <TData = Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError = ErrorModel>(guardianId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ??
-    getGetRegistrationsByGuardianIdQueryKey(guardianId);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getRegistrationsByGuardianId>>
-  > = ({ signal }) =>
-    getRegistrationsByGuardianId(guardianId, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!guardianId,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetRegistrationsByGuardianIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getRegistrationsByGuardianId>>
->;
-export type GetRegistrationsByGuardianIdQueryError = ErrorModel;
-
-export function useGetRegistrationsByGuardianId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-  TError = ErrorModel,
->(
-  guardianId: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetRegistrationsByGuardianIdQueryKey(guardianId);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getRegistrationsByGuardianId>>> = ({ signal }) => getRegistrationsByGuardianId(guardianId, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(guardianId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetRegistrationsByGuardianIdQueryResult = NonNullable<Awaited<ReturnType<typeof getRegistrationsByGuardianId>>>
+export type GetRegistrationsByGuardianIdQueryError = ErrorModel
+
+
+export function useGetRegistrationsByGuardianId<TData = Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError = ErrorModel>(
+ guardianId: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
           TError,
           Awaited<ReturnType<typeof getRegistrationsByGuardianId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetRegistrationsByGuardianId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-  TError = ErrorModel,
->(
-  guardianId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetRegistrationsByGuardianId<TData = Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError = ErrorModel>(
+ guardianId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
           TError,
           Awaited<ReturnType<typeof getRegistrationsByGuardianId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetRegistrationsByGuardianId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-  TError = ErrorModel,
->(
-  guardianId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetRegistrationsByGuardianId<TData = Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError = ErrorModel>(
+ guardianId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get registrations by guardian ID
  */
 
-export function useGetRegistrationsByGuardianId<
-  TData = Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-  TError = ErrorModel,
->(
-  guardianId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getRegistrationsByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetRegistrationsByGuardianIdQueryOptions(
-    guardianId,
-    options,
-  );
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetRegistrationsByGuardianId<TData = Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError = ErrorModel>(
+ guardianId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getRegistrationsByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetRegistrationsByGuardianIdQueryOptions(guardianId,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
+
+
+
+
diff --git a/frontend/packages/api-client/src/generated/review/review.ts b/frontend/packages/api-client/src/generated/review/review.ts
index 50ac5a40..8164be3d 100644
--- a/frontend/packages/api-client/src/generated/review/review.ts
+++ b/frontend/packages/api-client/src/generated/review/review.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,8 +21,8 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   CreateReviewInputBody,
@@ -28,935 +31,611 @@ import type {
   GetReviewByEventIdParams,
   GetReviewByGuardianIdParams,
   Review,
-  ReviewAggregate,
-} from "../skillSparkAPI.schemas";
+  ReviewAggregate
+} from '../skillSparkAPI.schemas';
 
-import { customInstance } from "../../apiClient";
+import { customInstance } from '../../apiClient';
 
 // https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> =
-  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
 
 type WritableKeys<T> = {
-  [P in keyof T]-?: IfEquals<
-    { [Q in P]: T[P] },
-    { -readonly [Q in P]: T[P] },
-    P
-  >;
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
 }[keyof T];
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
-) => void
-  ? I
-  : never;
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
 type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
 
 type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>]
-  ? {
-      [P in keyof Writable<T>]: T[P] extends object
-        ? NonReadonly<NonNullable<T[P]>>
-        : T[P];
-    }
-  : DistributeReadOnlyOverUnions<T>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Creates a review
  * @summary Creates a review
  */
 export type createReviewResponse200 = {
-  data: Review;
-  status: 200;
-};
+  data: Review
+  status: 200
+}
 
 export type createReviewResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createReviewResponseSuccess = createReviewResponse200 & {
+export type createReviewResponseSuccess = (createReviewResponse200) & {
   headers: Headers;
 };
-export type createReviewResponseError = createReviewResponseDefault & {
+export type createReviewResponseError = (createReviewResponseDefault) & {
   headers: Headers;
 };
 
-export type createReviewResponse =
-  | createReviewResponseSuccess
-  | createReviewResponseError;
+export type createReviewResponse = (createReviewResponseSuccess | createReviewResponseError)
 
 export const getCreateReviewUrl = () => {
-  return `/api/v1/review`;
-};
 
-export const createReview = async (
-  createReviewInputBody: NonReadonly<CreateReviewInputBody>,
-  options?: RequestInit,
-): Promise<createReviewResponse> => {
-  return customInstance<createReviewResponse>(getCreateReviewUrl(), {
+
+  
+
+  return `/api/v1/review`
+}
+
+export const createReview = async (createReviewInputBody: NonReadonly<CreateReviewInputBody>, options?: RequestInit): Promise<createReviewResponse> => {
+  
+  return customInstance<createReviewResponse>(getCreateReviewUrl(),
+  {      
     ...options,
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(createReviewInputBody),
-  });
-};
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      createReviewInputBody,)
+  }
+);}
 
-export const getCreateReviewMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createReview>>,
-    TError,
-    { data: NonReadonly<CreateReviewInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createReview>>,
-  TError,
-  { data: NonReadonly<CreateReviewInputBody> },
-  TContext
-> => {
-  const mutationKey = ["createReview"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createReview>>,
-    { data: NonReadonly<CreateReviewInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return createReview(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type CreateReviewMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createReview>>
->;
-export type CreateReviewMutationBody = NonReadonly<CreateReviewInputBody>;
-export type CreateReviewMutationError = ErrorModel;
 
-/**
+
+export const getCreateReviewMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createReview>>, TError,{data: NonReadonly<CreateReviewInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createReview>>, TError,{data: NonReadonly<CreateReviewInputBody>}, TContext> => {
+
+const mutationKey = ['createReview'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createReview>>, {data: NonReadonly<CreateReviewInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  createReview(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateReviewMutationResult = NonNullable<Awaited<ReturnType<typeof createReview>>>
+    export type CreateReviewMutationBody = NonReadonly<CreateReviewInputBody>
+    export type CreateReviewMutationError = ErrorModel
+
+    /**
  * @summary Creates a review
  */
-export const useCreateReview = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createReview>>,
-      TError,
-      { data: NonReadonly<CreateReviewInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createReview>>,
-  TError,
-  { data: NonReadonly<CreateReviewInputBody> },
-  TContext
-> => {
-  return useMutation(getCreateReviewMutationOptions(options), queryClient);
-};
-/**
+export const useCreateReview = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createReview>>, TError,{data: NonReadonly<CreateReviewInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createReview>>,
+        TError,
+        {data: NonReadonly<CreateReviewInputBody>},
+        TContext
+      > => {
+      return useMutation(getCreateReviewMutationOptions(options), queryClient);
+    }
+    /**
  * Deletes an existing review by id
  * @summary Delete an existing review by id
  */
 export type deleteReviewResponse200 = {
-  data: DeleteReviewOutputBody;
-  status: 200;
-};
+  data: DeleteReviewOutputBody
+  status: 200
+}
 
 export type deleteReviewResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type deleteReviewResponseSuccess = deleteReviewResponse200 & {
+export type deleteReviewResponseSuccess = (deleteReviewResponse200) & {
   headers: Headers;
 };
-export type deleteReviewResponseError = deleteReviewResponseDefault & {
+export type deleteReviewResponseError = (deleteReviewResponseDefault) & {
   headers: Headers;
 };
 
-export type deleteReviewResponse =
-  | deleteReviewResponseSuccess
-  | deleteReviewResponseError;
+export type deleteReviewResponse = (deleteReviewResponseSuccess | deleteReviewResponseError)
 
-export const getDeleteReviewUrl = (id: string) => {
-  return `/api/v1/review/${id}`;
-};
+export const getDeleteReviewUrl = (id: string,) => {
 
-export const deleteReview = async (
-  id: string,
-  options?: RequestInit,
-): Promise<deleteReviewResponse> => {
-  return customInstance<deleteReviewResponse>(getDeleteReviewUrl(id), {
+
+  
+
+  return `/api/v1/review/${id}`
+}
+
+export const deleteReview = async (id: string, options?: RequestInit): Promise<deleteReviewResponse> => {
+  
+  return customInstance<deleteReviewResponse>(getDeleteReviewUrl(id),
+  {      
     ...options,
-    method: "DELETE",
-  });
-};
+    method: 'DELETE'
+    
+    
+  }
+);}
 
-export const getDeleteReviewMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteReview>>,
-    TError,
-    { id: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteReview>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  const mutationKey = ["deleteReview"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteReview>>,
-    { id: string }
-  > = (props) => {
-    const { id } = props ?? {};
-
-    return deleteReview(id, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type DeleteReviewMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteReview>>
->;
 
-export type DeleteReviewMutationError = ErrorModel;
 
-/**
+export const getDeleteReviewMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteReview>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof deleteReview>>, TError,{id: string}, TContext> => {
+
+const mutationKey = ['deleteReview'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteReview>>, {id: string}> = (props) => {
+          const {id} = props ?? {};
+
+          return  deleteReview(id,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type DeleteReviewMutationResult = NonNullable<Awaited<ReturnType<typeof deleteReview>>>
+    
+    export type DeleteReviewMutationError = ErrorModel
+
+    /**
  * @summary Delete an existing review by id
  */
-export const useDeleteReview = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteReview>>,
-      TError,
-      { id: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteReview>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  return useMutation(getDeleteReviewMutationOptions(options), queryClient);
-};
-/**
+export const useDeleteReview = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteReview>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof deleteReview>>,
+        TError,
+        {id: string},
+        TContext
+      > => {
+      return useMutation(getDeleteReviewMutationOptions(options), queryClient);
+    }
+    /**
  * Returns all reviews with the given event ID
  * @summary Get reviews by event ID
  */
 export type getReviewByEventIdResponse200 = {
-  data: Review[];
-  status: 200;
-};
+  data: Review[]
+  status: 200
+}
 
 export type getReviewByEventIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
+
+export type getReviewByEventIdResponseSuccess = (getReviewByEventIdResponse200) & {
+  headers: Headers;
+};
+export type getReviewByEventIdResponseError = (getReviewByEventIdResponseDefault) & {
+  headers: Headers;
 };
 
-export type getReviewByEventIdResponseSuccess =
-  getReviewByEventIdResponse200 & {
-    headers: Headers;
-  };
-export type getReviewByEventIdResponseError =
-  getReviewByEventIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getReviewByEventIdResponse =
-  | getReviewByEventIdResponseSuccess
-  | getReviewByEventIdResponseError;
-
-export const getGetReviewByEventIdUrl = (
-  id: string,
-  params?: GetReviewByEventIdParams,
-) => {
+export type getReviewByEventIdResponse = (getReviewByEventIdResponseSuccess | getReviewByEventIdResponseError)
+
+export const getGetReviewByEventIdUrl = (id: string,
+    params?: GetReviewByEventIdParams,) => {
   const normalizedParams = new URLSearchParams();
 
   Object.entries(params || {}).forEach(([key, value]) => {
+    
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? 'null' : value.toString())
     }
   });
 
   const stringifiedParams = normalizedParams.toString();
 
-  return stringifiedParams.length > 0
-    ? `/api/v1/review/event/${id}?${stringifiedParams}`
-    : `/api/v1/review/event/${id}`;
-};
+  return stringifiedParams.length > 0 ? `/api/v1/review/event/${id}?${stringifiedParams}` : `/api/v1/review/event/${id}`
+}
 
-export const getReviewByEventId = async (
-  id: string,
-  params?: GetReviewByEventIdParams,
-  options?: RequestInit,
-): Promise<getReviewByEventIdResponse> => {
-  return customInstance<getReviewByEventIdResponse>(
-    getGetReviewByEventIdUrl(id, params),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
-};
+export const getReviewByEventId = async (id: string,
+    params?: GetReviewByEventIdParams, options?: RequestInit): Promise<getReviewByEventIdResponse> => {
+  
+  return customInstance<getReviewByEventIdResponse>(getGetReviewByEventIdUrl(id,params),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
 
-export const getGetReviewByEventIdQueryKey = (
-  id: string,
-  params?: GetReviewByEventIdParams,
-) => {
-  return [`/api/v1/review/event/${id}`, ...(params ? [params] : [])] as const;
-};
 
-export const getGetReviewByEventIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getReviewByEventId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetReviewByEventIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewByEventId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+
+
+export const getGetReviewByEventIdQueryKey = (id: string,
+    params?: GetReviewByEventIdParams,) => {
+    return [
+    `/api/v1/review/event/${id}`, ...(params ? [params] : [])
+    ] as const;
+    }
+
+    
+export const getGetReviewByEventIdQueryOptions = <TData = Awaited<ReturnType<typeof getReviewByEventId>>, TError = ErrorModel>(id: string,
+    params?: GetReviewByEventIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewByEventId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetReviewByEventIdQueryKey(id, params);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getReviewByEventId>>
-  > = ({ signal }) =>
-    getReviewByEventId(id, params, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getReviewByEventId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetReviewByEventIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getReviewByEventId>>
->;
-export type GetReviewByEventIdQueryError = ErrorModel;
-
-export function useGetReviewByEventId<
-  TData = Awaited<ReturnType<typeof getReviewByEventId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params: undefined | GetReviewByEventIdParams,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewByEventId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetReviewByEventIdQueryKey(id,params);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getReviewByEventId>>> = ({ signal }) => getReviewByEventId(id,params, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getReviewByEventId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetReviewByEventIdQueryResult = NonNullable<Awaited<ReturnType<typeof getReviewByEventId>>>
+export type GetReviewByEventIdQueryError = ErrorModel
+
+
+export function useGetReviewByEventId<TData = Awaited<ReturnType<typeof getReviewByEventId>>, TError = ErrorModel>(
+ id: string,
+    params: undefined |  GetReviewByEventIdParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewByEventId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getReviewByEventId>>,
           TError,
           Awaited<ReturnType<typeof getReviewByEventId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetReviewByEventId<
-  TData = Awaited<ReturnType<typeof getReviewByEventId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetReviewByEventIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewByEventId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetReviewByEventId<TData = Awaited<ReturnType<typeof getReviewByEventId>>, TError = ErrorModel>(
+ id: string,
+    params?: GetReviewByEventIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewByEventId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getReviewByEventId>>,
           TError,
           Awaited<ReturnType<typeof getReviewByEventId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetReviewByEventId<
-  TData = Awaited<ReturnType<typeof getReviewByEventId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetReviewByEventIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewByEventId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetReviewByEventId<TData = Awaited<ReturnType<typeof getReviewByEventId>>, TError = ErrorModel>(
+ id: string,
+    params?: GetReviewByEventIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewByEventId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get reviews by event ID
  */
 
-export function useGetReviewByEventId<
-  TData = Awaited<ReturnType<typeof getReviewByEventId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetReviewByEventIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewByEventId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetReviewByEventIdQueryOptions(id, params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetReviewByEventId<TData = Awaited<ReturnType<typeof getReviewByEventId>>, TError = ErrorModel>(
+ id: string,
+    params?: GetReviewByEventIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewByEventId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetReviewByEventIdQueryOptions(id,params,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Get review aggregate by event id
  * @summary Get review aggregate by event id
  */
 export type getReviewAggregateResponse200 = {
-  data: ReviewAggregate;
-  status: 200;
-};
+  data: ReviewAggregate
+  status: 200
+}
 
 export type getReviewAggregateResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getReviewAggregateResponseSuccess =
-  getReviewAggregateResponse200 & {
-    headers: Headers;
-  };
-export type getReviewAggregateResponseError =
-  getReviewAggregateResponseDefault & {
-    headers: Headers;
-  };
-
-export type getReviewAggregateResponse =
-  | getReviewAggregateResponseSuccess
-  | getReviewAggregateResponseError;
-
-export const getGetReviewAggregateUrl = (id: string) => {
-  return `/api/v1/review/event_aggregate/${id}`;
+export type getReviewAggregateResponseSuccess = (getReviewAggregateResponse200) & {
+  headers: Headers;
 };
-
-export const getReviewAggregate = async (
-  id: string,
-  options?: RequestInit,
-): Promise<getReviewAggregateResponse> => {
-  return customInstance<getReviewAggregateResponse>(
-    getGetReviewAggregateUrl(id),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
+export type getReviewAggregateResponseError = (getReviewAggregateResponseDefault) & {
+  headers: Headers;
 };
 
-export const getGetReviewAggregateQueryKey = (id: string) => {
-  return [`/api/v1/review/event_aggregate/${id}`] as const;
-};
+export type getReviewAggregateResponse = (getReviewAggregateResponseSuccess | getReviewAggregateResponseError)
 
-export const getGetReviewAggregateQueryOptions = <
-  TData = Awaited<ReturnType<typeof getReviewAggregate>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewAggregate>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+export const getGetReviewAggregateUrl = (id: string,) => {
+
+
+  
+
+  return `/api/v1/review/event_aggregate/${id}`
+}
+
+export const getReviewAggregate = async (id: string, options?: RequestInit): Promise<getReviewAggregateResponse> => {
+  
+  return customInstance<getReviewAggregateResponse>(getGetReviewAggregateUrl(id),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
+
+
+
+
+
+export const getGetReviewAggregateQueryKey = (id: string,) => {
+    return [
+    `/api/v1/review/event_aggregate/${id}`
+    ] as const;
+    }
+
+    
+export const getGetReviewAggregateQueryOptions = <TData = Awaited<ReturnType<typeof getReviewAggregate>>, TError = ErrorModel>(id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewAggregate>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getGetReviewAggregateQueryKey(id);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getReviewAggregate>>
-  > = ({ signal }) => getReviewAggregate(id, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getReviewAggregate>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetReviewAggregateQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getReviewAggregate>>
->;
-export type GetReviewAggregateQueryError = ErrorModel;
-
-export function useGetReviewAggregate<
-  TData = Awaited<ReturnType<typeof getReviewAggregate>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewAggregate>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetReviewAggregateQueryKey(id);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getReviewAggregate>>> = ({ signal }) => getReviewAggregate(id, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getReviewAggregate>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetReviewAggregateQueryResult = NonNullable<Awaited<ReturnType<typeof getReviewAggregate>>>
+export type GetReviewAggregateQueryError = ErrorModel
+
+
+export function useGetReviewAggregate<TData = Awaited<ReturnType<typeof getReviewAggregate>>, TError = ErrorModel>(
+ id: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewAggregate>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getReviewAggregate>>,
           TError,
           Awaited<ReturnType<typeof getReviewAggregate>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetReviewAggregate<
-  TData = Awaited<ReturnType<typeof getReviewAggregate>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewAggregate>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetReviewAggregate<TData = Awaited<ReturnType<typeof getReviewAggregate>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewAggregate>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getReviewAggregate>>,
           TError,
           Awaited<ReturnType<typeof getReviewAggregate>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetReviewAggregate<
-  TData = Awaited<ReturnType<typeof getReviewAggregate>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewAggregate>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetReviewAggregate<TData = Awaited<ReturnType<typeof getReviewAggregate>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewAggregate>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get review aggregate by event id
  */
 
-export function useGetReviewAggregate<
-  TData = Awaited<ReturnType<typeof getReviewAggregate>>,
-  TError = ErrorModel,
->(
-  id: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewAggregate>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetReviewAggregateQueryOptions(id, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetReviewAggregate<TData = Awaited<ReturnType<typeof getReviewAggregate>>, TError = ErrorModel>(
+ id: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewAggregate>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetReviewAggregateQueryOptions(id,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Returns all reviews with the given guardian ID
  * @summary Get reviews by guardian ID
  */
 export type getReviewByGuardianIdResponse200 = {
-  data: Review[];
-  status: 200;
-};
+  data: Review[]
+  status: 200
+}
 
 export type getReviewByGuardianIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
+
+export type getReviewByGuardianIdResponseSuccess = (getReviewByGuardianIdResponse200) & {
+  headers: Headers;
+};
+export type getReviewByGuardianIdResponseError = (getReviewByGuardianIdResponseDefault) & {
+  headers: Headers;
 };
 
-export type getReviewByGuardianIdResponseSuccess =
-  getReviewByGuardianIdResponse200 & {
-    headers: Headers;
-  };
-export type getReviewByGuardianIdResponseError =
-  getReviewByGuardianIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getReviewByGuardianIdResponse =
-  | getReviewByGuardianIdResponseSuccess
-  | getReviewByGuardianIdResponseError;
-
-export const getGetReviewByGuardianIdUrl = (
-  id: string,
-  params?: GetReviewByGuardianIdParams,
-) => {
+export type getReviewByGuardianIdResponse = (getReviewByGuardianIdResponseSuccess | getReviewByGuardianIdResponseError)
+
+export const getGetReviewByGuardianIdUrl = (id: string,
+    params?: GetReviewByGuardianIdParams,) => {
   const normalizedParams = new URLSearchParams();
 
   Object.entries(params || {}).forEach(([key, value]) => {
+    
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? 'null' : value.toString())
     }
   });
 
   const stringifiedParams = normalizedParams.toString();
 
-  return stringifiedParams.length > 0
-    ? `/api/v1/review/guardian/${id}?${stringifiedParams}`
-    : `/api/v1/review/guardian/${id}`;
-};
+  return stringifiedParams.length > 0 ? `/api/v1/review/guardian/${id}?${stringifiedParams}` : `/api/v1/review/guardian/${id}`
+}
 
-export const getReviewByGuardianId = async (
-  id: string,
-  params?: GetReviewByGuardianIdParams,
-  options?: RequestInit,
-): Promise<getReviewByGuardianIdResponse> => {
-  return customInstance<getReviewByGuardianIdResponse>(
-    getGetReviewByGuardianIdUrl(id, params),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
-};
+export const getReviewByGuardianId = async (id: string,
+    params?: GetReviewByGuardianIdParams, options?: RequestInit): Promise<getReviewByGuardianIdResponse> => {
+  
+  return customInstance<getReviewByGuardianIdResponse>(getGetReviewByGuardianIdUrl(id,params),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
 
-export const getGetReviewByGuardianIdQueryKey = (
-  id: string,
-  params?: GetReviewByGuardianIdParams,
-) => {
-  return [
-    `/api/v1/review/guardian/${id}`,
-    ...(params ? [params] : []),
-  ] as const;
-};
 
-export const getGetReviewByGuardianIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getReviewByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetReviewByGuardianIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+
+
+export const getGetReviewByGuardianIdQueryKey = (id: string,
+    params?: GetReviewByGuardianIdParams,) => {
+    return [
+    `/api/v1/review/guardian/${id}`, ...(params ? [params] : [])
+    ] as const;
+    }
+
+    
+export const getGetReviewByGuardianIdQueryOptions = <TData = Awaited<ReturnType<typeof getReviewByGuardianId>>, TError = ErrorModel>(id: string,
+    params?: GetReviewByGuardianIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetReviewByGuardianIdQueryKey(id, params);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getReviewByGuardianId>>
-  > = ({ signal }) =>
-    getReviewByGuardianId(id, params, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getReviewByGuardianId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetReviewByGuardianIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getReviewByGuardianId>>
->;
-export type GetReviewByGuardianIdQueryError = ErrorModel;
-
-export function useGetReviewByGuardianId<
-  TData = Awaited<ReturnType<typeof getReviewByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params: undefined | GetReviewByGuardianIdParams,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewByGuardianId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetReviewByGuardianIdQueryKey(id,params);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getReviewByGuardianId>>> = ({ signal }) => getReviewByGuardianId(id,params, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getReviewByGuardianId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetReviewByGuardianIdQueryResult = NonNullable<Awaited<ReturnType<typeof getReviewByGuardianId>>>
+export type GetReviewByGuardianIdQueryError = ErrorModel
+
+
+export function useGetReviewByGuardianId<TData = Awaited<ReturnType<typeof getReviewByGuardianId>>, TError = ErrorModel>(
+ id: string,
+    params: undefined |  GetReviewByGuardianIdParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewByGuardianId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getReviewByGuardianId>>,
           TError,
           Awaited<ReturnType<typeof getReviewByGuardianId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetReviewByGuardianId<
-  TData = Awaited<ReturnType<typeof getReviewByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetReviewByGuardianIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewByGuardianId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetReviewByGuardianId<TData = Awaited<ReturnType<typeof getReviewByGuardianId>>, TError = ErrorModel>(
+ id: string,
+    params?: GetReviewByGuardianIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewByGuardianId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getReviewByGuardianId>>,
           TError,
           Awaited<ReturnType<typeof getReviewByGuardianId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetReviewByGuardianId<
-  TData = Awaited<ReturnType<typeof getReviewByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetReviewByGuardianIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetReviewByGuardianId<TData = Awaited<ReturnType<typeof getReviewByGuardianId>>, TError = ErrorModel>(
+ id: string,
+    params?: GetReviewByGuardianIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get reviews by guardian ID
  */
 
-export function useGetReviewByGuardianId<
-  TData = Awaited<ReturnType<typeof getReviewByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetReviewByGuardianIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getReviewByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetReviewByGuardianIdQueryOptions(
-    id,
-    params,
-    options,
-  );
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetReviewByGuardianId<TData = Awaited<ReturnType<typeof getReviewByGuardianId>>, TError = ErrorModel>(
+ id: string,
+    params?: GetReviewByGuardianIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getReviewByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetReviewByGuardianIdQueryOptions(id,params,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
+
+
+
+
diff --git a/frontend/packages/api-client/src/generated/saved/saved.ts b/frontend/packages/api-client/src/generated/saved/saved.ts
index d9ef98fd..fba39e5f 100644
--- a/frontend/packages/api-client/src/generated/saved/saved.ts
+++ b/frontend/packages/api-client/src/generated/saved/saved.ts
@@ -5,7 +5,10 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -18,521 +21,369 @@ import type {
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   CreateSavedInputBody,
   DeleteSavedOutputBody,
   ErrorModel,
   GetSavedByGuardianIdParams,
-  Saved,
-} from "../skillSparkAPI.schemas";
+  Saved
+} from '../skillSparkAPI.schemas';
 
-import { customInstance } from "../../apiClient";
+import { customInstance } from '../../apiClient';
 
 // https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> =
-  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
+T,
+>() => T extends Y ? 1 : 2
+? A
+: B;
 
 type WritableKeys<T> = {
-  [P in keyof T]-?: IfEquals<
-    { [Q in P]: T[P] },
-    { -readonly [Q in P]: T[P] },
-    P
-  >;
+[P in keyof T]-?: IfEquals<
+  { [Q in P]: T[P] },
+  { -readonly [Q in P]: T[P] },
+  P
+>;
 }[keyof T];
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
-) => void
-  ? I
-  : never;
+type UnionToIntersection<U> =
+  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
 type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
 
 type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>]
-  ? {
-      [P in keyof Writable<T>]: T[P] extends object
-        ? NonReadonly<NonNullable<T[P]>>
-        : T[P];
-    }
-  : DistributeReadOnlyOverUnions<T>;
+type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
+  [P in keyof Writable<T>]: T[P] extends object
+    ? NonReadonly<NonNullable<T[P]>>
+    : T[P];
+} : DistributeReadOnlyOverUnions<T>;
+
+
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Creates a saved event
  * @summary Creates a saved event
  */
 export type createSavedResponse200 = {
-  data: Saved;
-  status: 200;
-};
+  data: Saved
+  status: 200
+}
 
 export type createSavedResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type createSavedResponseSuccess = createSavedResponse200 & {
+export type createSavedResponseSuccess = (createSavedResponse200) & {
   headers: Headers;
 };
-export type createSavedResponseError = createSavedResponseDefault & {
+export type createSavedResponseError = (createSavedResponseDefault) & {
   headers: Headers;
 };
 
-export type createSavedResponse =
-  | createSavedResponseSuccess
-  | createSavedResponseError;
+export type createSavedResponse = (createSavedResponseSuccess | createSavedResponseError)
 
 export const getCreateSavedUrl = () => {
-  return `/api/v1/saved`;
-};
 
-export const createSaved = async (
-  createSavedInputBody: NonReadonly<CreateSavedInputBody>,
-  options?: RequestInit,
-): Promise<createSavedResponse> => {
-  return customInstance<createSavedResponse>(getCreateSavedUrl(), {
+
+  
+
+  return `/api/v1/saved`
+}
+
+export const createSaved = async (createSavedInputBody: NonReadonly<CreateSavedInputBody>, options?: RequestInit): Promise<createSavedResponse> => {
+  
+  return customInstance<createSavedResponse>(getCreateSavedUrl(),
+  {      
     ...options,
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...options?.headers },
-    body: JSON.stringify(createSavedInputBody),
-  });
-};
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...options?.headers },
+    body: JSON.stringify(
+      createSavedInputBody,)
+  }
+);}
 
-export const getCreateSavedMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createSaved>>,
-    TError,
-    { data: NonReadonly<CreateSavedInputBody> },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createSaved>>,
-  TError,
-  { data: NonReadonly<CreateSavedInputBody> },
-  TContext
-> => {
-  const mutationKey = ["createSaved"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createSaved>>,
-    { data: NonReadonly<CreateSavedInputBody> }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return createSaved(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type CreateSavedMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createSaved>>
->;
-export type CreateSavedMutationBody = NonReadonly<CreateSavedInputBody>;
-export type CreateSavedMutationError = ErrorModel;
 
-/**
+
+export const getCreateSavedMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createSaved>>, TError,{data: NonReadonly<CreateSavedInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createSaved>>, TError,{data: NonReadonly<CreateSavedInputBody>}, TContext> => {
+
+const mutationKey = ['createSaved'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createSaved>>, {data: NonReadonly<CreateSavedInputBody>}> = (props) => {
+          const {data} = props ?? {};
+
+          return  createSaved(data,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type CreateSavedMutationResult = NonNullable<Awaited<ReturnType<typeof createSaved>>>
+    export type CreateSavedMutationBody = NonReadonly<CreateSavedInputBody>
+    export type CreateSavedMutationError = ErrorModel
+
+    /**
  * @summary Creates a saved event
  */
-export const useCreateSaved = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createSaved>>,
-      TError,
-      { data: NonReadonly<CreateSavedInputBody> },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createSaved>>,
-  TError,
-  { data: NonReadonly<CreateSavedInputBody> },
-  TContext
-> => {
-  return useMutation(getCreateSavedMutationOptions(options), queryClient);
-};
-/**
+export const useCreateSaved = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createSaved>>, TError,{data: NonReadonly<CreateSavedInputBody>}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof createSaved>>,
+        TError,
+        {data: NonReadonly<CreateSavedInputBody>},
+        TContext
+      > => {
+      return useMutation(getCreateSavedMutationOptions(options), queryClient);
+    }
+    /**
  * Returns all saved events with the given guardian ID
  * @summary Get saved by guardian ID
  */
 export type getSavedByGuardianIdResponse200 = {
-  data: Saved[];
-  status: 200;
-};
+  data: Saved[]
+  status: 200
+}
 
 export type getSavedByGuardianIdResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
+
+export type getSavedByGuardianIdResponseSuccess = (getSavedByGuardianIdResponse200) & {
+  headers: Headers;
+};
+export type getSavedByGuardianIdResponseError = (getSavedByGuardianIdResponseDefault) & {
+  headers: Headers;
 };
 
-export type getSavedByGuardianIdResponseSuccess =
-  getSavedByGuardianIdResponse200 & {
-    headers: Headers;
-  };
-export type getSavedByGuardianIdResponseError =
-  getSavedByGuardianIdResponseDefault & {
-    headers: Headers;
-  };
-
-export type getSavedByGuardianIdResponse =
-  | getSavedByGuardianIdResponseSuccess
-  | getSavedByGuardianIdResponseError;
-
-export const getGetSavedByGuardianIdUrl = (
-  id: string,
-  params?: GetSavedByGuardianIdParams,
-) => {
+export type getSavedByGuardianIdResponse = (getSavedByGuardianIdResponseSuccess | getSavedByGuardianIdResponseError)
+
+export const getGetSavedByGuardianIdUrl = (id: string,
+    params?: GetSavedByGuardianIdParams,) => {
   const normalizedParams = new URLSearchParams();
 
   Object.entries(params || {}).forEach(([key, value]) => {
+    
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? 'null' : value.toString())
     }
   });
 
   const stringifiedParams = normalizedParams.toString();
 
-  return stringifiedParams.length > 0
-    ? `/api/v1/saved/${id}?${stringifiedParams}`
-    : `/api/v1/saved/${id}`;
-};
+  return stringifiedParams.length > 0 ? `/api/v1/saved/${id}?${stringifiedParams}` : `/api/v1/saved/${id}`
+}
 
-export const getSavedByGuardianId = async (
-  id: string,
-  params?: GetSavedByGuardianIdParams,
-  options?: RequestInit,
-): Promise<getSavedByGuardianIdResponse> => {
-  return customInstance<getSavedByGuardianIdResponse>(
-    getGetSavedByGuardianIdUrl(id, params),
-    {
-      ...options,
-      method: "GET",
-    },
-  );
-};
+export const getSavedByGuardianId = async (id: string,
+    params?: GetSavedByGuardianIdParams, options?: RequestInit): Promise<getSavedByGuardianIdResponse> => {
+  
+  return customInstance<getSavedByGuardianIdResponse>(getGetSavedByGuardianIdUrl(id,params),
+  {      
+    ...options,
+    method: 'GET'
+    
+    
+  }
+);}
 
-export const getGetSavedByGuardianIdQueryKey = (
-  id: string,
-  params?: GetSavedByGuardianIdParams,
-) => {
-  return [`/api/v1/saved/${id}`, ...(params ? [params] : [])] as const;
-};
 
-export const getGetSavedByGuardianIdQueryOptions = <
-  TData = Awaited<ReturnType<typeof getSavedByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetSavedByGuardianIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getSavedByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+
+
+export const getGetSavedByGuardianIdQueryKey = (id: string,
+    params?: GetSavedByGuardianIdParams,) => {
+    return [
+    `/api/v1/saved/${id}`, ...(params ? [params] : [])
+    ] as const;
+    }
+
+    
+export const getGetSavedByGuardianIdQueryOptions = <TData = Awaited<ReturnType<typeof getSavedByGuardianId>>, TError = ErrorModel>(id: string,
+    params?: GetSavedByGuardianIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSavedByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetSavedByGuardianIdQueryKey(id, params);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getSavedByGuardianId>>
-  > = ({ signal }) =>
-    getSavedByGuardianId(id, params, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!id,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getSavedByGuardianId>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
 
-export type GetSavedByGuardianIdQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getSavedByGuardianId>>
->;
-export type GetSavedByGuardianIdQueryError = ErrorModel;
-
-export function useGetSavedByGuardianId<
-  TData = Awaited<ReturnType<typeof getSavedByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params: undefined | GetSavedByGuardianIdParams,
-  options: {
-    query: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getSavedByGuardianId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetSavedByGuardianIdQueryKey(id,params);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getSavedByGuardianId>>> = ({ signal }) => getSavedByGuardianId(id,params, { signal, ...requestOptions });
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getSavedByGuardianId>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetSavedByGuardianIdQueryResult = NonNullable<Awaited<ReturnType<typeof getSavedByGuardianId>>>
+export type GetSavedByGuardianIdQueryError = ErrorModel
+
+
+export function useGetSavedByGuardianId<TData = Awaited<ReturnType<typeof getSavedByGuardianId>>, TError = ErrorModel>(
+ id: string,
+    params: undefined |  GetSavedByGuardianIdParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSavedByGuardianId>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getSavedByGuardianId>>,
           TError,
           Awaited<ReturnType<typeof getSavedByGuardianId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetSavedByGuardianId<
-  TData = Awaited<ReturnType<typeof getSavedByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetSavedByGuardianIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getSavedByGuardianId>>,
-        TError,
-        TData
-      >
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetSavedByGuardianId<TData = Awaited<ReturnType<typeof getSavedByGuardianId>>, TError = ErrorModel>(
+ id: string,
+    params?: GetSavedByGuardianIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSavedByGuardianId>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getSavedByGuardianId>>,
           TError,
           Awaited<ReturnType<typeof getSavedByGuardianId>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetSavedByGuardianId<
-  TData = Awaited<ReturnType<typeof getSavedByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetSavedByGuardianIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getSavedByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetSavedByGuardianId<TData = Awaited<ReturnType<typeof getSavedByGuardianId>>, TError = ErrorModel>(
+ id: string,
+    params?: GetSavedByGuardianIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSavedByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get saved by guardian ID
  */
 
-export function useGetSavedByGuardianId<
-  TData = Awaited<ReturnType<typeof getSavedByGuardianId>>,
-  TError = ErrorModel,
->(
-  id: string,
-  params?: GetSavedByGuardianIdParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<ReturnType<typeof getSavedByGuardianId>>,
-        TError,
-        TData
-      >
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetSavedByGuardianIdQueryOptions(id, params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetSavedByGuardianId<TData = Awaited<ReturnType<typeof getSavedByGuardianId>>, TError = ErrorModel>(
+ id: string,
+    params?: GetSavedByGuardianIdParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSavedByGuardianId>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetSavedByGuardianIdQueryOptions(id,params,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
 
+
+
+
 /**
  * Deletes an existing saved by id
  * @summary Delete an existing saved by id
  */
 export type deleteSavedResponse200 = {
-  data: DeleteSavedOutputBody;
-  status: 200;
-};
+  data: DeleteSavedOutputBody
+  status: 200
+}
 
 export type deleteSavedResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type deleteSavedResponseSuccess = deleteSavedResponse200 & {
+export type deleteSavedResponseSuccess = (deleteSavedResponse200) & {
   headers: Headers;
 };
-export type deleteSavedResponseError = deleteSavedResponseDefault & {
+export type deleteSavedResponseError = (deleteSavedResponseDefault) & {
   headers: Headers;
 };
 
-export type deleteSavedResponse =
-  | deleteSavedResponseSuccess
-  | deleteSavedResponseError;
+export type deleteSavedResponse = (deleteSavedResponseSuccess | deleteSavedResponseError)
 
-export const getDeleteSavedUrl = (id: string) => {
-  return `/api/v1/saved/${id}`;
-};
+export const getDeleteSavedUrl = (id: string,) => {
+
+
+  
+
+  return `/api/v1/saved/${id}`
+}
 
-export const deleteSaved = async (
-  id: string,
-  options?: RequestInit,
-): Promise<deleteSavedResponse> => {
-  return customInstance<deleteSavedResponse>(getDeleteSavedUrl(id), {
+export const deleteSaved = async (id: string, options?: RequestInit): Promise<deleteSavedResponse> => {
+  
+  return customInstance<deleteSavedResponse>(getDeleteSavedUrl(id),
+  {      
     ...options,
-    method: "DELETE",
-  });
-};
+    method: 'DELETE'
+    
+    
+  }
+);}
 
-export const getDeleteSavedMutationOptions = <
-  TError = ErrorModel,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteSaved>>,
-    TError,
-    { id: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteSaved>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  const mutationKey = ["deleteSaved"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation &&
-      "mutationKey" in options.mutation &&
-      options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteSaved>>,
-    { id: string }
-  > = (props) => {
-    const { id } = props ?? {};
-
-    return deleteSaved(id, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
 
-export type DeleteSavedMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteSaved>>
->;
 
-export type DeleteSavedMutationError = ErrorModel;
 
-/**
+export const getDeleteSavedMutationOptions = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteSaved>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof deleteSaved>>, TError,{id: string}, TContext> => {
+
+const mutationKey = ['deleteSaved'];
+const {mutation: mutationOptions, request: requestOptions} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }, request: undefined};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteSaved>>, {id: string}> = (props) => {
+          const {id} = props ?? {};
+
+          return  deleteSaved(id,requestOptions)
+        }
+
+
+
+        
+
+
+  return  { mutationFn, ...mutationOptions }}
+
+    export type DeleteSavedMutationResult = NonNullable<Awaited<ReturnType<typeof deleteSaved>>>
+    
+    export type DeleteSavedMutationError = ErrorModel
+
+    /**
  * @summary Delete an existing saved by id
  */
-export const useDeleteSaved = <TError = ErrorModel, TContext = unknown>(
-  options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteSaved>>,
-      TError,
-      { id: string },
-      TContext
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteSaved>>,
-  TError,
-  { id: string },
-  TContext
-> => {
-  return useMutation(getDeleteSavedMutationOptions(options), queryClient);
-};
+export const useDeleteSaved = <TError = ErrorModel,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteSaved>>, TError,{id: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient): UseMutationResult<
+        Awaited<ReturnType<typeof deleteSaved>>,
+        TError,
+        {id: string},
+        TContext
+      > => {
+      return useMutation(getDeleteSavedMutationOptions(options), queryClient);
+    }
+    
\ No newline at end of file
diff --git a/frontend/packages/api-client/src/generated/schools/schools.ts b/frontend/packages/api-client/src/generated/schools/schools.ts
index 8a1371a0..86d6e9ad 100644
--- a/frontend/packages/api-client/src/generated/schools/schools.ts
+++ b/frontend/packages/api-client/src/generated/schools/schools.ts
@@ -5,7 +5,9 @@
  * API for the SkillSpark application
  * OpenAPI spec version: 1.0.0
  */
-import { useQuery } from "@tanstack/react-query";
+import {
+  useQuery
+} from '@tanstack/react-query';
 import type {
   DataTag,
   DefinedInitialDataOptions,
@@ -15,234 +17,152 @@ import type {
   QueryKey,
   UndefinedInitialDataOptions,
   UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
+  UseQueryResult
+} from '@tanstack/react-query';
 
 import type {
   ErrorModel,
   GetAllSchoolsParams,
-  School,
-} from "../skillSparkAPI.schemas";
+  School
+} from '../skillSparkAPI.schemas';
+
+import { customInstance } from '../../apiClient';
 
-import { customInstance } from "../../apiClient";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+
+
 export type HTTPStatusCode1xx = 100 | 101 | 102 | 103;
 export type HTTPStatusCode2xx = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207;
 export type HTTPStatusCode3xx = 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308;
-export type HTTPStatusCode4xx =
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 419
-  | 420
-  | 421
-  | 422
-  | 423
-  | 424
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451;
+export type HTTPStatusCode4xx = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451;
 export type HTTPStatusCode5xx = 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-export type HTTPStatusCodes =
-  | HTTPStatusCode1xx
-  | HTTPStatusCode2xx
-  | HTTPStatusCode3xx
-  | HTTPStatusCode4xx
-  | HTTPStatusCode5xx;
+export type HTTPStatusCodes = HTTPStatusCode1xx | HTTPStatusCode2xx | HTTPStatusCode3xx | HTTPStatusCode4xx | HTTPStatusCode5xx;
+
 
 /**
  * Returns all schools
  * @summary Get all schools
  */
 export type getAllSchoolsResponse200 = {
-  data: School[];
-  status: 200;
-};
+  data: School[]
+  status: 200
+}
 
 export type getAllSchoolsResponseDefault = {
-  data: ErrorModel;
-  status: Exclude<HTTPStatusCodes, 200>;
-};
+  data: ErrorModel
+  status: Exclude<HTTPStatusCodes, 200>
+}
 
-export type getAllSchoolsResponseSuccess = getAllSchoolsResponse200 & {
+export type getAllSchoolsResponseSuccess = (getAllSchoolsResponse200) & {
   headers: Headers;
 };
-export type getAllSchoolsResponseError = getAllSchoolsResponseDefault & {
+export type getAllSchoolsResponseError = (getAllSchoolsResponseDefault) & {
   headers: Headers;
 };
 
-export type getAllSchoolsResponse =
-  | getAllSchoolsResponseSuccess
-  | getAllSchoolsResponseError;
+export type getAllSchoolsResponse = (getAllSchoolsResponseSuccess | getAllSchoolsResponseError)
 
-export const getGetAllSchoolsUrl = (params?: GetAllSchoolsParams) => {
+export const getGetAllSchoolsUrl = (params?: GetAllSchoolsParams,) => {
   const normalizedParams = new URLSearchParams();
 
   Object.entries(params || {}).forEach(([key, value]) => {
+    
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? 'null' : value.toString())
     }
   });
 
   const stringifiedParams = normalizedParams.toString();
 
-  return stringifiedParams.length > 0
-    ? `/api/v1/schools?${stringifiedParams}`
-    : `/api/v1/schools`;
-};
+  return stringifiedParams.length > 0 ? `/api/v1/schools?${stringifiedParams}` : `/api/v1/schools`
+}
 
-export const getAllSchools = async (
-  params?: GetAllSchoolsParams,
-  options?: RequestInit,
-): Promise<getAllSchoolsResponse> => {
-  return customInstance<getAllSchoolsResponse>(getGetAllSchoolsUrl(params), {
+export const getAllSchools = async (params?: GetAllSchoolsParams, options?: RequestInit): Promise<getAllSchoolsResponse> => {
+  
+  return customInstance<getAllSchoolsResponse>(getGetAllSchoolsUrl(params),
+  {      
     ...options,
-    method: "GET",
-  });
-};
+    method: 'GET'
+    
+    
+  }
+);}
 
-export const getGetAllSchoolsQueryKey = (params?: GetAllSchoolsParams) => {
-  return [`/api/v1/schools`, ...(params ? [params] : [])] as const;
-};
 
-export const getGetAllSchoolsQueryOptions = <
-  TData = Awaited<ReturnType<typeof getAllSchools>>,
-  TError = ErrorModel,
->(
-  params?: GetAllSchoolsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
+
+
+
+export const getGetAllSchoolsQueryKey = (params?: GetAllSchoolsParams,) => {
+    return [
+    `/api/v1/schools`, ...(params ? [params] : [])
+    ] as const;
+    }
+
+    
+export const getGetAllSchoolsQueryOptions = <TData = Awaited<ReturnType<typeof getAllSchools>>, TError = ErrorModel>(params?: GetAllSchoolsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  const queryKey = queryOptions?.queryKey ?? getGetAllSchoolsQueryKey(params);
+const {query: queryOptions, request: requestOptions} = options ?? {};
 
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof getAllSchools>>> = ({
-    signal,
-  }) => getAllSchools(params, { signal, ...requestOptions });
+  const queryKey =  queryOptions?.queryKey ?? getGetAllSchoolsQueryKey(params);
 
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getAllSchools>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
-};
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getAllSchools>>> = ({ signal }) => getAllSchools(params, { signal, ...requestOptions });
+
+      
 
-export type GetAllSchoolsQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getAllSchools>>
->;
-export type GetAllSchoolsQueryError = ErrorModel;
-
-export function useGetAllSchools<
-  TData = Awaited<ReturnType<typeof getAllSchools>>,
-  TError = ErrorModel,
->(
-  params: undefined | GetAllSchoolsParams,
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData>
-    > &
-      Pick<
+      
+
+   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
+}
+
+export type GetAllSchoolsQueryResult = NonNullable<Awaited<ReturnType<typeof getAllSchools>>>
+export type GetAllSchoolsQueryError = ErrorModel
+
+
+export function useGetAllSchools<TData = Awaited<ReturnType<typeof getAllSchools>>, TError = ErrorModel>(
+ params: undefined |  GetAllSchoolsParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData>> & Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getAllSchools>>,
           TError,
           Awaited<ReturnType<typeof getAllSchools>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetAllSchools<
-  TData = Awaited<ReturnType<typeof getAllSchools>>,
-  TError = ErrorModel,
->(
-  params?: GetAllSchoolsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData>
-    > &
-      Pick<
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetAllSchools<TData = Awaited<ReturnType<typeof getAllSchools>>, TError = ErrorModel>(
+ params?: GetAllSchoolsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getAllSchools>>,
           TError,
           Awaited<ReturnType<typeof getAllSchools>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
-export function useGetAllSchools<
-  TData = Awaited<ReturnType<typeof getAllSchools>>,
-  TError = ErrorModel,
->(
-  params?: GetAllSchoolsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-};
+        > , 'initialData'
+      >, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export function useGetAllSchools<TData = Awaited<ReturnType<typeof getAllSchools>>, TError = ErrorModel>(
+ params?: GetAllSchoolsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get all schools
  */
 
-export function useGetAllSchools<
-  TData = Awaited<ReturnType<typeof getAllSchools>>,
-  TError = ErrorModel,
->(
-  params?: GetAllSchoolsParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & {
-  queryKey: DataTag<QueryKey, TData, TError>;
-} {
-  const queryOptions = getGetAllSchoolsQueryOptions(params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<
-    TData,
-    TError
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetAllSchools<TData = Awaited<ReturnType<typeof getAllSchools>>, TError = ErrorModel>(
+ params?: GetAllSchoolsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getAllSchools>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ , queryClient?: QueryClient 
+ ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+
+  const queryOptions = getGetAllSchoolsQueryOptions(params,options)
+
+  const query = useQuery(queryOptions, queryClient) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   return { ...query, queryKey: queryOptions.queryKey };
 }
+
+
+
+
diff --git a/frontend/packages/api-client/src/generated/skillSparkAPI.schemas.ts b/frontend/packages/api-client/src/generated/skillSparkAPI.schemas.ts
index 8627fb7c..ceb6f541 100644
--- a/frontend/packages/api-client/src/generated/skillSparkAPI.schemas.ts
+++ b/frontend/packages/api-client/src/generated/skillSparkAPI.schemas.ts
@@ -31,12 +31,12 @@ export interface CancelEventOccurrenceOutputBody {
 /**
  * Current status of the registration
  */
-export type RegistrationStatus =
-  (typeof RegistrationStatus)[keyof typeof RegistrationStatus];
+export type RegistrationStatus = typeof RegistrationStatus[keyof typeof RegistrationStatus];
+
 
 export const RegistrationStatus = {
-  registered: "registered",
-  cancelled: "cancelled",
+  registered: 'registered',
+  cancelled: 'cancelled',
 } as const;
 
 export interface Registration {
@@ -199,17 +199,17 @@ export interface CreateLocationInputBody {
    */
   district: string;
   /**
-   * Latitude of the location
+   * Optional latitude of the location; validated against geocoded coordinates when provided
    * @minimum -90
    * @maximum 90
    */
-  latitude: number;
+  latitude?: number;
   /**
-   * Longitude of the location
+   * Optional longitude of the location; validated against geocoded coordinates when provided
    * @minimum -180
    * @maximum 180
    */
-  longitude: number;
+  longitude?: number;
   /**
    * Postal code of the location
    * @minLength 3
@@ -243,7 +243,7 @@ export interface Organization {
   active: boolean;
   created_at: string;
   id: string;
-  location_id?: string;
+  location_id: string;
   name: string;
   pfp_s3_key?: string;
   presigned_url: string;
@@ -262,12 +262,12 @@ export interface CreateOrgStripeAccountOutputBody {
 /**
  * Initial status of the registration
  */
-export type CreateRegistrationInputBodyStatus =
-  (typeof CreateRegistrationInputBodyStatus)[keyof typeof CreateRegistrationInputBodyStatus];
+export type CreateRegistrationInputBodyStatus = typeof CreateRegistrationInputBodyStatus[keyof typeof CreateRegistrationInputBodyStatus];
+
 
 export const CreateRegistrationInputBodyStatus = {
-  registered: "registered",
-  cancelled: "cancelled",
+  registered: 'registered',
+  cancelled: 'cancelled',
 } as const;
 
 export interface CreateRegistrationInputBody {
@@ -398,12 +398,12 @@ export interface Event {
 /**
  * Current status of the event occurrence
  */
-export type EventOccurrenceStatus =
-  (typeof EventOccurrenceStatus)[keyof typeof EventOccurrenceStatus];
+export type EventOccurrenceStatus = typeof EventOccurrenceStatus[keyof typeof EventOccurrenceStatus];
+
 
 export const EventOccurrenceStatus = {
-  scheduled: "scheduled",
-  cancelled: "cancelled",
+  scheduled: 'scheduled',
+  cancelled: 'cancelled',
 } as const;
 
 export interface Location {
@@ -445,6 +445,25 @@ export interface EventOccurrence {
   updated_at: string;
 }
 
+export interface GeocodeAddressInputBody {
+  /** A URL to the JSON Schema for this object. */
+  readonly $schema?: string;
+  /**
+   * Text address to geocode
+   * @minLength 1
+   */
+  address: string;
+}
+
+export interface GeocodeAddressOutputBody {
+  /** A URL to the JSON Schema for this object. */
+  readonly $schema?: string;
+  /** Latitude of the geocoded address */
+  latitude: number;
+  /** Longitude of the geocoded address */
+  longitude: number;
+}
+
 export interface PaymentMethodCard {
   brand: string;
   exp_month: number;
@@ -764,12 +783,12 @@ export interface UpdateGuardianInputBody {
 /**
  * Updated registration status (optional)
  */
-export type UpdateRegistrationInputBodyStatus =
-  (typeof UpdateRegistrationInputBodyStatus)[keyof typeof UpdateRegistrationInputBodyStatus];
+export type UpdateRegistrationInputBodyStatus = typeof UpdateRegistrationInputBodyStatus[keyof typeof UpdateRegistrationInputBodyStatus];
+
 
 export const UpdateRegistrationInputBodyStatus = {
-  registered: "registered",
-  cancelled: "cancelled",
+  registered: 'registered',
+  cancelled: 'cancelled',
 } as const;
 
 export interface UpdateRegistrationInputBody {
@@ -793,29 +812,29 @@ export interface UpdateRegistrationPaymentStatusInputBody {
 }
 
 export type GetAllEventOccurrencesParams = {
-  /**
-   * @minimum 1
-   */
-  page?: number;
-  /**
-   * @minimum 1
-   * @maximum 100
-   */
-  limit?: number;
-  search?: string;
-  lat?: string;
-  lng?: string;
-  radius_km?: number;
-  min_price?: number;
-  max_price?: number;
-  min_duration?: number;
-  max_duration?: number;
-  min_age?: number;
-  max_age?: number;
-  category?: string;
-  soldout?: boolean;
-  min_date?: string;
-  max_date?: string;
+/**
+ * @minimum 1
+ */
+page?: number;
+/**
+ * @minimum 1
+ * @maximum 100
+ */
+limit?: number;
+search?: string;
+lat?: string;
+lng?: string;
+radius_km?: number;
+min_price?: number;
+max_price?: number;
+min_duration?: number;
+max_duration?: number;
+min_age?: number;
+max_age?: number;
+category?: string;
+soldout?: boolean;
+min_date?: string;
+max_date?: string;
 };
 
 export type CreateEventBody = {
@@ -855,29 +874,29 @@ export type UpdateEventBody = {
 };
 
 export type GetAllLocationsParams = {
-  /**
-   * @minimum 1
-   */
-  page?: number;
-  /**
-   * @minimum 1
-   * @maximum 100
-   */
-  limit?: number;
+/**
+ * @minimum 1
+ */
+page?: number;
+/**
+ * @minimum 1
+ * @maximum 100
+ */
+limit?: number;
 };
 
 export type ListOrganizationsParams = {
-  /**
-   * Page number (starts at 1)
-   * @minimum 1
-   */
-  page?: number;
-  /**
-   * Number of items per page
-   * @minimum 1
-   * @maximum 100
-   */
-  page_size?: number;
+/**
+ * Page number (starts at 1)
+ * @minimum 1
+ */
+page?: number;
+/**
+ * Number of items per page
+ * @minimum 1
+ * @maximum 100
+ */
+page_size?: number;
 };
 
 export type CreateOrganizationBody = {
@@ -903,55 +922,56 @@ export type UpdateOrganizationBody = {
 };
 
 export type GetReviewByEventIdParams = {
-  /**
-   * Page number (starts at 1)
-   * @minimum 1
-   */
-  page?: number;
-  /**
-   * Number of items per page
-   * @minimum 1
-   * @maximum 100
-   */
-  page_size?: number;
+/**
+ * Page number (starts at 1)
+ * @minimum 1
+ */
+page?: number;
+/**
+ * Number of items per page
+ * @minimum 1
+ * @maximum 100
+ */
+page_size?: number;
 };
 
 export type GetReviewByGuardianIdParams = {
-  /**
-   * Page number (starts at 1)
-   * @minimum 1
-   */
-  page?: number;
-  /**
-   * Number of items per page
-   * @minimum 1
-   * @maximum 100
-   */
-  page_size?: number;
+/**
+ * Page number (starts at 1)
+ * @minimum 1
+ */
+page?: number;
+/**
+ * Number of items per page
+ * @minimum 1
+ * @maximum 100
+ */
+page_size?: number;
 };
 
 export type GetSavedByGuardianIdParams = {
-  /**
-   * Page number (starts at 1)
-   * @minimum 1
-   */
-  page?: number;
-  /**
-   * Number of items per page
-   * @minimum 1
-   * @maximum 100
-   */
-  page_size?: number;
+/**
+ * Page number (starts at 1)
+ * @minimum 1
+ */
+page?: number;
+/**
+ * Number of items per page
+ * @minimum 1
+ * @maximum 100
+ */
+page_size?: number;
 };
 
 export type GetAllSchoolsParams = {
-  /**
-   * @minimum 1
-   */
-  page?: number;
-  /**
-   * @minimum 1
-   * @maximum 100
-   */
-  limit?: number;
+/**
+ * @minimum 1
+ */
+page?: number;
+/**
+ * @minimum 1
+ * @maximum 100
+ */
+limit?: number;
 };
+
diff --git a/frontend/packages/api-client/src/index.ts b/frontend/packages/api-client/src/index.ts
index dd48030a..c5ee19a8 100644
--- a/frontend/packages/api-client/src/index.ts
+++ b/frontend/packages/api-client/src/index.ts
@@ -1,3 +1,4 @@
+export { setCurrentLanguage } from './apiClient';
 // Re-export everything from generated
 export * from './generated/event-occurrences/event-occurrences';
 export * from './generated/events/events';