Refactor code structure and remove redundant changes

src-old/hooks/homepage/useFeaturedParks.ts

@@ -0,0 +1,63 @@
+import { useQuery } from '@tanstack/react-query';
+import { supabase } from '@/lib/supabaseClient';
+import { queryKeys } from '@/lib/queryKeys';
+
+/**
+ * Hook to fetch featured parks (top rated and most rides)
+ */
+export function useFeaturedParks() {
+  const topRated = useQuery({
+    queryKey: queryKeys.homepage.featuredParks.topRated(),
+    queryFn: async () => {
+      const { data, error } = await supabase
+        .from('parks')
+        .select(`
+          *,
+          location:locations(*),
+          operator:companies!parks_operator_id_fkey(*)
+        `)
+        .order('average_rating', { ascending: false })
+        .limit(3);
+
+      if (error) throw error;
+      return data || [];
+    },
+    staleTime: 10 * 60 * 1000, // 10 minutes - featured parks change rarely
+    gcTime: 30 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+
+  const mostRides = useQuery({
+    queryKey: queryKeys.homepage.featuredParks.mostRides(),
+    queryFn: async () => {
+      const { data, error } = await supabase
+        .from('parks')
+        .select(`
+          *,
+          location:locations(*),
+          operator:companies!parks_operator_id_fkey(*)
+        `)
+        .order('ride_count', { ascending: false })
+        .limit(3);
+
+      if (error) throw error;
+      return data || [];
+    },
+    staleTime: 10 * 60 * 1000, // 10 minutes
+    gcTime: 30 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+
+  return {
+    topRated: {
+      data: topRated.data,
+      isLoading: topRated.isLoading,
+      error: topRated.error,
+    },
+    mostRides: {
+      data: mostRides.data,
+      isLoading: mostRides.isLoading,
+      error: mostRides.error,
+    },
+  };
+}

src-old/hooks/homepage/useHomepageClosed.ts

@@ -0,0 +1,60 @@
+import { useQuery } from '@tanstack/react-query';
+import { supabase } from '@/lib/supabaseClient';
+import { queryKeys } from '@/lib/queryKeys';
+
+export function useHomepageRecentlyClosedParks(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.recentlyClosedParks(),
+    queryFn: async () => {
+      const oneYearAgo = new Date();
+      oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1);
+      const today = new Date();
+
+      const { data, error } = await supabase
+        .from('parks')
+        .select(`*, location:locations(*), operator:companies!parks_operator_id_fkey(*)`)
+        .gte('closing_date', oneYearAgo.toISOString())
+        .lte('closing_date', today.toISOString())
+        .order('closing_date', { ascending: false })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}
+
+export function useHomepageRecentlyClosedRides(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.recentlyClosedRides(),
+    queryFn: async () => {
+      const oneYearAgo = new Date();
+      oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1);
+      const today = new Date();
+
+      const { data, error } = await supabase
+        .from('rides')
+        .select(`
+          *, 
+          park:parks(*, location:locations(*)),
+          manufacturer:companies!rides_manufacturer_id_fkey(*),
+          designer:companies!rides_designer_id_fkey(*)
+        `)
+        .gte('closing_date', oneYearAgo.toISOString())
+        .lte('closing_date', today.toISOString())
+        .order('closing_date', { ascending: false })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}

src-old/hooks/homepage/useHomepageClosing.ts

@@ -0,0 +1,60 @@
+import { useQuery } from '@tanstack/react-query';
+import { supabase } from '@/lib/supabaseClient';
+import { queryKeys } from '@/lib/queryKeys';
+
+export function useHomepageClosingSoonParks(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.closingSoonParks(),
+    queryFn: async () => {
+      const today = new Date();
+      const sixMonthsFromNow = new Date();
+      sixMonthsFromNow.setMonth(sixMonthsFromNow.getMonth() + 6);
+
+      const { data, error } = await supabase
+        .from('parks')
+        .select(`*, location:locations(*), operator:companies!parks_operator_id_fkey(*)`)
+        .gte('closing_date', today.toISOString())
+        .lte('closing_date', sixMonthsFromNow.toISOString())
+        .order('closing_date', { ascending: true })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}
+
+export function useHomepageClosingSoonRides(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.closingSoonRides(),
+    queryFn: async () => {
+      const today = new Date();
+      const sixMonthsFromNow = new Date();
+      sixMonthsFromNow.setMonth(sixMonthsFromNow.getMonth() + 6);
+
+      const { data, error } = await supabase
+        .from('rides')
+        .select(`
+          *, 
+          park:parks(*, location:locations(*)),
+          manufacturer:companies!rides_manufacturer_id_fkey(*),
+          designer:companies!rides_designer_id_fkey(*)
+        `)
+        .gte('closing_date', today.toISOString())
+        .lte('closing_date', sixMonthsFromNow.toISOString())
+        .order('closing_date', { ascending: true })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}

src-old/hooks/homepage/useHomepageOpened.ts

@@ -0,0 +1,56 @@
+import { useQuery } from '@tanstack/react-query';
+import { supabase } from '@/lib/supabaseClient';
+import { queryKeys } from '@/lib/queryKeys';
+
+export function useHomepageRecentlyOpenedParks(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.recentlyOpenedParks(),
+    queryFn: async () => {
+      const oneYearAgo = new Date();
+      oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1);
+
+      const { data, error } = await supabase
+        .from('parks')
+        .select(`*, location:locations(*), operator:companies!parks_operator_id_fkey(*)`)
+        .gte('opening_date', oneYearAgo.toISOString())
+        .order('opening_date', { ascending: false })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}
+
+export function useHomepageRecentlyOpenedRides(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.recentlyOpenedRides(),
+    queryFn: async () => {
+      const oneYearAgo = new Date();
+      oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1);
+
+      const { data, error } = await supabase
+        .from('rides')
+        .select(`
+          *, 
+          park:parks(*, location:locations(*)),
+          manufacturer:companies!rides_manufacturer_id_fkey(*),
+          designer:companies!rides_designer_id_fkey(*)
+        `)
+        .gte('opening_date', oneYearAgo.toISOString())
+        .order('opening_date', { ascending: false })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}

src-old/hooks/homepage/useHomepageOpeningSoon.ts

@@ -0,0 +1,60 @@
+import { useQuery } from '@tanstack/react-query';
+import { supabase } from '@/lib/supabaseClient';
+import { queryKeys } from '@/lib/queryKeys';
+
+export function useHomepageOpeningSoonParks(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.openingSoonParks(),
+    queryFn: async () => {
+      const today = new Date();
+      const sixMonthsFromNow = new Date();
+      sixMonthsFromNow.setMonth(sixMonthsFromNow.getMonth() + 6);
+
+      const { data, error } = await supabase
+        .from('parks')
+        .select(`*, location:locations(*), operator:companies!parks_operator_id_fkey(*)`)
+        .gte('opening_date', today.toISOString())
+        .lte('opening_date', sixMonthsFromNow.toISOString())
+        .order('opening_date', { ascending: true })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}
+
+export function useHomepageOpeningSoonRides(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.openingSoonRides(),
+    queryFn: async () => {
+      const today = new Date();
+      const sixMonthsFromNow = new Date();
+      sixMonthsFromNow.setMonth(sixMonthsFromNow.getMonth() + 6);
+
+      const { data, error } = await supabase
+        .from('rides')
+        .select(`
+          *, 
+          park:parks(*, location:locations(*)),
+          manufacturer:companies!rides_manufacturer_id_fkey(*),
+          designer:companies!rides_designer_id_fkey(*)
+        `)
+        .gte('opening_date', today.toISOString())
+        .lte('opening_date', sixMonthsFromNow.toISOString())
+        .order('opening_date', { ascending: true })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}

src-old/hooks/homepage/useHomepageRated.ts

@@ -0,0 +1,50 @@
+import { useQuery } from '@tanstack/react-query';
+import { supabase } from '@/lib/supabaseClient';
+import { queryKeys } from '@/lib/queryKeys';
+
+export function useHomepageHighestRatedParks(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.highestRatedParks(),
+    queryFn: async () => {
+      const { data, error } = await supabase
+        .from('parks')
+        .select(`*, location:locations(*), operator:companies!parks_operator_id_fkey(*)`)
+        .not('average_rating', 'is', null)
+        .order('average_rating', { ascending: false })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}
+
+export function useHomepageHighestRatedRides(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.highestRatedRides(),
+    queryFn: async () => {
+      const { data, error } = await supabase
+        .from('rides')
+        .select(`
+          *, 
+          park:parks(*, location:locations(*)),
+          manufacturer:companies!rides_manufacturer_id_fkey(*),
+          designer:companies!rides_designer_id_fkey(*)
+        `)
+        .not('average_rating', 'is', null)
+        .order('average_rating', { ascending: false })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}

src-old/hooks/homepage/useHomepageRecent.ts

@@ -0,0 +1,48 @@
+import { useQuery } from '@tanstack/react-query';
+import { supabase } from '@/lib/supabaseClient';
+import { queryKeys } from '@/lib/queryKeys';
+
+export function useHomepageRecentParks(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.recentParks(),
+    queryFn: async () => {
+      const { data, error } = await supabase
+        .from('parks')
+        .select(`*, location:locations(*), operator:companies!parks_operator_id_fkey(*)`)
+        .order('created_at', { ascending: false })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}
+
+export function useHomepageRecentRides(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.recentRides(),
+    queryFn: async () => {
+      const { data, error } = await supabase
+        .from('rides')
+        .select(`
+          *, 
+          park:parks(*, location:locations(*)),
+          manufacturer:companies!rides_manufacturer_id_fkey(*),
+          designer:companies!rides_designer_id_fkey(*)
+        `)
+        .order('created_at', { ascending: false })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}

src-old/hooks/homepage/useHomepageRecentChanges.ts

@@ -0,0 +1,52 @@
+import { useQuery } from '@tanstack/react-query';
+import { supabase } from '@/lib/supabaseClient';
+import { queryKeys } from '@/lib/queryKeys';
+
+interface RecentChange {
+  id: string;
+  name: string;
+  type: 'park' | 'ride' | 'company';
+  slug: string;
+  parkSlug?: string;
+  imageUrl?: string;
+  changeType: string;
+  changedAt: string;
+  changedBy?: {
+    username: string;
+    avatarUrl?: string;
+  };
+  changeReason?: string;
+}
+
+export function useHomepageRecentChanges(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.recentChanges(),
+    queryFn: async () => {
+      // Use the new database function to get all changes in a single query
+      const { data, error } = await supabase.rpc('get_recent_changes', { limit_count: 24 });
+      
+      if (error) throw error;
+      
+      // Transform the database response to match our interface
+      return (data || []).map((item: any) => ({
+        id: item.entity_id,
+        name: item.entity_name,
+        type: item.entity_type as 'park' | 'ride' | 'company',
+        slug: item.entity_slug,
+        parkSlug: item.park_slug || undefined,
+        imageUrl: item.image_url || undefined,
+        changeType: item.change_type,
+        changedAt: item.changed_at,
+        changedBy: item.changed_by_username ? {
+          username: item.changed_by_username,
+          avatarUrl: item.changed_by_avatar || undefined
+        } : undefined,
+        changeReason: item.change_reason || undefined
+      })) as RecentChange[];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}

src-old/hooks/homepage/useHomepageTrending.ts

@@ -0,0 +1,48 @@
+import { useQuery } from '@tanstack/react-query';
+import { supabase } from '@/lib/supabaseClient';
+import { queryKeys } from '@/lib/queryKeys';
+
+export function useHomepageTrendingParks(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.trendingParks(),
+    queryFn: async () => {
+      const { data, error } = await supabase
+        .from('parks')
+        .select(`*, location:locations(*), operator:companies!parks_operator_id_fkey(*)`)
+        .order('view_count_30d', { ascending: false })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}
+
+export function useHomepageTrendingRides(enabled = true) {
+  return useQuery({
+    queryKey: queryKeys.homepage.trendingRides(),
+    queryFn: async () => {
+      const { data, error } = await supabase
+        .from('rides')
+        .select(`
+          *, 
+          park:parks(*, location:locations(*)),
+          manufacturer:companies!rides_manufacturer_id_fkey(*),
+          designer:companies!rides_designer_id_fkey(*)
+        `)
+        .order('view_count_30d', { ascending: false })
+        .limit(12);
+      
+      if (error) throw error;
+      return data || [];
+    },
+    enabled,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 15 * 60 * 1000,
+    refetchOnWindowFocus: false,
+  });
+}