From 0727a2082182d3c042b01754a6733d03b12745f5 Mon Sep 17 00:00:00 2001
From: Alder Whiteford <alderwhiteford@Alders-MacBook-Pro-2.local>
Date: Sat, 15 Jun 2024 14:39:49 -0400
Subject: [PATCH] cd

---
 frontend/lib/package.json                     |  2 +-
 frontend/lib/src/types/category.ts            |  2 --
 frontend/mobile/package.json                  |  2 +-
 .../mobile/src/app/(app)/(tabs)/profile.tsx   |  7 +++---
 frontend/mobile/src/app/(app)/event/[id].tsx  | 10 ++++----
 .../mobile/src/app/(app)/user/interest.tsx    | 24 ++++++-------------
 .../components/Calendar/DayTimeSection.tsx    |  4 ++--
 .../components/GlobalLayout/GlobalLayout.tsx  |  2 +-
 frontend/mobile/src/app/_layout.tsx           |  5 ----
 frontend/mobile/src/hooks/use-categories.ts   | 11 ---------
 frontend/mobile/src/hooks/use-tags.ts         | 11 ---------
 frontend/mobile/src/services/categories.ts    | 14 -----------
 frontend/mobile/src/services/tags.ts          | 14 -----------
 frontend/mobile/yarn.lock                     |  8 +++----
 14 files changed, 23 insertions(+), 93 deletions(-)
 delete mode 100644 frontend/mobile/src/hooks/use-categories.ts
 delete mode 100644 frontend/mobile/src/hooks/use-tags.ts
 delete mode 100644 frontend/mobile/src/services/categories.ts
 delete mode 100644 frontend/mobile/src/services/tags.ts

diff --git a/frontend/lib/package.json b/frontend/lib/package.json
index 10761b939..c08e89d8b 100644
--- a/frontend/lib/package.json
+++ b/frontend/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@generatesac/lib",
-  "version": "0.0.169",
+  "version": "0.0.170",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/frontend/lib/src/types/category.ts b/frontend/lib/src/types/category.ts
index 6577d5693..939d0ae25 100644
--- a/frontend/lib/src/types/category.ts
+++ b/frontend/lib/src/types/category.ts
@@ -1,7 +1,6 @@
 import { z } from "zod";
 
 import { rootModelSchema } from "./root";
-import { tagSchema } from "./tag";
 
 // Schemas:
 export const createCategoryRequestBodySchema = z.object({
@@ -10,7 +9,6 @@ export const createCategoryRequestBodySchema = z.object({
 
 export const categorySchemaIntermediate = z.object({
   name: z.string(),
-  tags: z.array(tagSchema),
 });
 
 export const categorySchema = categorySchemaIntermediate.merge(rootModelSchema);
diff --git a/frontend/mobile/package.json b/frontend/mobile/package.json
index cecda616b..743b29a97 100644
--- a/frontend/mobile/package.json
+++ b/frontend/mobile/package.json
@@ -25,7 +25,7 @@
         "@fortawesome/free-solid-svg-icons": "^6.5.2",
         "@fortawesome/react-fontawesome": "^0.2.2",
         "@fortawesome/react-native-fontawesome": "^0.3.2",
-        "@generatesac/lib": "0.0.169",
+        "@generatesac/lib": "0.0.170",
         "@gorhom/bottom-sheet": "^4.6.3",
         "@hookform/resolvers": "^3.4.2",
         "@react-native-async-storage/async-storage": "^1.23.1",
diff --git a/frontend/mobile/src/app/(app)/(tabs)/profile.tsx b/frontend/mobile/src/app/(app)/(tabs)/profile.tsx
index 1f80b3c45..08f508ebe 100644
--- a/frontend/mobile/src/app/(app)/(tabs)/profile.tsx
+++ b/frontend/mobile/src/app/(app)/(tabs)/profile.tsx
@@ -28,7 +28,7 @@ const ProfileItem = ({ icon, text, textColor, onPress }: ProfileItemProps) => (
     <TouchableOpacity onPress={onPress}>
         <Box
             gap="l"
-            paddingVertical="m"
+            paddingVertical="s"
             flexDirection="row"
             alignItems="center"
         >
@@ -98,9 +98,8 @@ const styles = StyleSheet.create({
         flexDirection: 'column',
         alignItems: 'flex-start',
         justifyContent: 'flex-start',
-        marginHorizontal: Spacing.xl,
-        gap: Spacing.xxl,
-        marginTop: Spacing.xxl
+        marginVertical: Spacing.m,
+        gap: Spacing.l,
     },
     title: {
         fontSize: 20,
diff --git a/frontend/mobile/src/app/(app)/event/[id].tsx b/frontend/mobile/src/app/(app)/event/[id].tsx
index be85507b3..64cc02bf9 100644
--- a/frontend/mobile/src/app/(app)/event/[id].tsx
+++ b/frontend/mobile/src/app/(app)/event/[id].tsx
@@ -181,10 +181,8 @@ const EventPage = () => {
                                             eventName={event.name}
                                             color={MockEvent.color}
                                             club={club?.name}
-                                            startTime={
-                                                new Date(event.start_time)
-                                            }
-                                            endTime={new Date(event.end_time)}
+                                            startTime={event.start_time}
+                                            endTime={event.end_time}
                                             location={
                                                 event.location ||
                                                 'ISEC, Room 204'
@@ -224,8 +222,8 @@ const EventPage = () => {
             </Animated.ScrollView>
             <ShareEventBottomSheet ref={shareEvent} link={MockEvent.link} />
             <RegisterBottomSheet
-                startTime={new Date(event?.start_time as string)}
-                endTime={new Date(event?.end_time as string)}
+                startTime={event?.start_time as string}
+                endTime={event?.end_time as string}
                 eventDetail={event?.description as string}
                 eventName={event?.name as string}
                 location={event?.location as string}
diff --git a/frontend/mobile/src/app/(app)/user/interest.tsx b/frontend/mobile/src/app/(app)/user/interest.tsx
index b2ccf3abe..6486ae606 100644
--- a/frontend/mobile/src/app/(app)/user/interest.tsx
+++ b/frontend/mobile/src/app/(app)/user/interest.tsx
@@ -5,13 +5,11 @@ import { SafeAreaView } from 'react-native-safe-area-context';
 
 import { Stack, router } from 'expo-router';
 
-import { Category, Tag } from '@generatesac/lib';
+import { Category, Tag, categoryApi, tagApi } from '@generatesac/lib';
 import { ZodError } from 'zod';
 
 import { Arrow, Box, Spacing, Text } from '@/src/app/(design-system)';
 import { Tag as TagComponent } from '@/src/app/(design-system)';
-import { useCategories } from '@/src/hooks/use-categories';
-import { useTags } from '@/src/hooks/use-tags';
 import { formatCategoryOrTag } from '@/src/utils/string';
 
 import { Save } from './components/save';
@@ -56,16 +54,8 @@ const UserInterest = () => {
     const { handleSubmit } = useForm<UserInterestsData>();
 
     const [_, setButtonClicked] = useState<boolean>(false);
-    const {
-        data: categoryData,
-        isLoading: loadingCategories,
-        error: errorCategory
-    } = useCategories();
-    const {
-        data: tagsData,
-        isLoading: loadingTags,
-        error: errorTag
-    } = useTags();
+    const { data: tagData, error: tagError, isLoading: tagLoading} = tagApi.useTagsQuery({});
+    const { data: categoryData, error: categoryError, isLoading: categoryLoading} = categoryApi.useCategoriesQuery({});
 
     const [selectedCategory, setSelectedCategory] = useState<Category>();
     const [selectedTags, setSelectedTags] = useState<Tag[]>(mockTags);
@@ -78,16 +68,16 @@ const UserInterest = () => {
         }
     }, [categoryData]);
 
-    if (loadingTags || loadingCategories) {
+    if (tagLoading || categoryLoading) {
         return <Text>Loading...</Text>;
     }
 
-    if (errorTag || errorCategory) {
+    if (tagError || categoryError) {
         return <Text>Error</Text>;
     }
 
-    const tags = tagsData ? tagsData : [];
-    const categories = categoryData ? categoryData : [];
+    const tags = tagData ?? [];
+    const categories = categoryData ?? [];
 
     const isSelected = (item: Tag) => {
         return selectedTags.map((tag) => tag.id).includes(item.id);
diff --git a/frontend/mobile/src/app/(design-system)/components/Calendar/DayTimeSection.tsx b/frontend/mobile/src/app/(design-system)/components/Calendar/DayTimeSection.tsx
index d4d965d5e..861e7e10d 100644
--- a/frontend/mobile/src/app/(design-system)/components/Calendar/DayTimeSection.tsx
+++ b/frontend/mobile/src/app/(design-system)/components/Calendar/DayTimeSection.tsx
@@ -95,8 +95,8 @@ export default function DayTimeSection({ time, data }: DayTimeSectionProps) {
                                 club={event.host_name}
                                 logo={event.host_logo}
                                 eventId={event.id}
-                                startTime={new Date(event.startTime)}
-                                endTime={new Date(event.endTime)}
+                                startTime={event.startTime}
+                                endTime={event.endTime}
                                 image={event.image}
                             />
                         </Box>
diff --git a/frontend/mobile/src/app/(design-system)/components/GlobalLayout/GlobalLayout.tsx b/frontend/mobile/src/app/(design-system)/components/GlobalLayout/GlobalLayout.tsx
index 62af6fe11..a08310b4d 100644
--- a/frontend/mobile/src/app/(design-system)/components/GlobalLayout/GlobalLayout.tsx
+++ b/frontend/mobile/src/app/(design-system)/components/GlobalLayout/GlobalLayout.tsx
@@ -10,7 +10,7 @@ const ViewBase = createBox(View);
 
 export const GlobalLayout = ({ children }: GlobalLayoutProps) => {
     return (
-        <ViewBase flex={1} marginHorizontal={'s'}>
+        <ViewBase flex={1} marginHorizontal={'l'}>
             {children}
         </ViewBase>
     );
diff --git a/frontend/mobile/src/app/_layout.tsx b/frontend/mobile/src/app/_layout.tsx
index 4e3130eaa..267dfa85e 100644
--- a/frontend/mobile/src/app/_layout.tsx
+++ b/frontend/mobile/src/app/_layout.tsx
@@ -9,7 +9,6 @@ import { StatusBar } from 'expo-status-bar';
 
 import FontAwesome from '@expo/vector-icons/FontAwesome';
 import { ThemeProvider } from '@shopify/restyle';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 
 import StoreProvider from '../store/StoreProvider';
 import { useAppSelector } from '../store/store';
@@ -57,17 +56,13 @@ const RootLayout = () => {
 
     if (!loaded) return null;
 
-    const queryClient = new QueryClient();
-
     return (
         <GestureHandlerRootView style={{ flex: 1 }}>
             <StoreProvider>
-                <QueryClientProvider client={queryClient}>
                     <ThemeProvider theme={theme}>
                         <StatusBar style="light" />
                         <InitalLayout />
                     </ThemeProvider>
-                </QueryClientProvider>
             </StoreProvider>
         </GestureHandlerRootView>
     );
diff --git a/frontend/mobile/src/hooks/use-categories.ts b/frontend/mobile/src/hooks/use-categories.ts
deleted file mode 100644
index 61b3d3148..000000000
--- a/frontend/mobile/src/hooks/use-categories.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Category } from '@generatesac/lib';
-import { UseQueryResult, useQuery } from '@tanstack/react-query';
-
-import { getCategories } from '@/src/services/categories';
-
-export const useCategories = (): UseQueryResult<Category[], Error> => {
-    return useQuery<Category[], Error>({
-        queryKey: ['categories'],
-        queryFn: getCategories
-    });
-};
diff --git a/frontend/mobile/src/hooks/use-tags.ts b/frontend/mobile/src/hooks/use-tags.ts
deleted file mode 100644
index 0dfdcb57f..000000000
--- a/frontend/mobile/src/hooks/use-tags.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Tag } from '@generatesac/lib';
-import { UseQueryResult, useQuery } from '@tanstack/react-query';
-
-import { getTags } from '@/src/services/tags';
-
-export const useTags = (): UseQueryResult<Tag[], Error> => {
-    return useQuery<Tag[], Error>({
-        queryKey: ['tags'],
-        queryFn: getTags
-    });
-};
diff --git a/frontend/mobile/src/services/categories.ts b/frontend/mobile/src/services/categories.ts
deleted file mode 100644
index d24d8a063..000000000
--- a/frontend/mobile/src/services/categories.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Category } from '@generatesac/lib';
-import axios from 'axios';
-
-import { URL } from './tags';
-
-export const getCategories = async (): Promise<Category[]> => {
-    try {
-        const categories = await axios.get(`${URL}/categories`);
-        return categories.data;
-    } catch (error) {
-        console.error('Failed to get categories', error);
-        throw error;
-    }
-};
diff --git a/frontend/mobile/src/services/tags.ts b/frontend/mobile/src/services/tags.ts
deleted file mode 100644
index 7fd412a38..000000000
--- a/frontend/mobile/src/services/tags.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Tag } from '@generatesac/lib';
-import axios from 'axios';
-
-export const URL = 'http://127.0.0.1:8080/api/v1';
-
-export const getTags = async (): Promise<Tag[]> => {
-    try {
-        const tags = await axios.get(`${URL}/tags`);
-        return tags.data;
-    } catch (error) {
-        console.error('Failed to get tags', error);
-        throw error;
-    }
-};
diff --git a/frontend/mobile/yarn.lock b/frontend/mobile/yarn.lock
index 079b34305..26a578108 100644
--- a/frontend/mobile/yarn.lock
+++ b/frontend/mobile/yarn.lock
@@ -1402,10 +1402,10 @@
     humps "^2.0.1"
     prop-types "^15.7.2"
 
-"@generatesac/lib@0.0.169":
-  version "0.0.169"
-  resolved "https://registry.yarnpkg.com/@generatesac/lib/-/lib-0.0.169.tgz#6a5799bad43b7c08553a04e5e6ed401ed0b7e7ab"
-  integrity sha512-IeWdlMKTi9zdqeaSMWWB+fjma6zf3Z1lO7mPmQ8Q+PJ49CkjJVbF5G9tdYgnJrNSz9+fazr5kFXZZl26eJaN0w==
+"@generatesac/lib@0.0.170":
+  version "0.0.170"
+  resolved "https://registry.yarnpkg.com/@generatesac/lib/-/lib-0.0.170.tgz#2401ac4216d43dc555f142633aba16d1141ca356"
+  integrity sha512-oPkqZTudQd7tGEQUpAXQrhD/cngIUV595q069d7SMQZ3zZleQqGXirvk1TOjdoEzNug1gN21yS238stq6CL4Nw==
   dependencies:
     "@reduxjs/toolkit" "^2.2.3"
     react "^18.2.0"