remove unused Google Analytics scripts and clean up API fetch logic

Author: tondeee

app/layout.tsx

@@ -68,19 +68,6 @@ export default function RootLayout({
 
         <Footer />
 
-        {/* Google Analytics - Replace with your GA ID */}
-        <Script
-          src="https://www.googletagmanager.com/gtag/js?id=G-XXXXXXXXXX"
-          strategy="afterInteractive"
-        />
-        <Script id="google-analytics" strategy="afterInteractive">
-          {`
-            window.dataLayer = window.dataLayer || [];
-            function gtag(){dataLayer.push(arguments);}
-            gtag('js', new Date());
-            gtag('config', 'G-XXXXXXXXXX');
-          `}
-        </Script>
       </body>
     </html>
   );

components/SearchClientComponent.tsx

@@ -1,9 +1,7 @@
 "use client";
 
-import React, { useState, useEffect, Suspense } from "react";
+import React, { useEffect, Suspense } from "react";
 import { useSearchParams } from "next/navigation";
-import { fetchApisInfinite } from "@/services/api";
-import { cleanDescription } from "@/utils/textProcessing";
 import { useGridLayout } from "@/hooks/useGridLayout";
 import { useApiSearch } from "@/hooks/useApiSearch";
 import { useInfiniteScroll } from "@/hooks/useInfiniteScroll";
@@ -32,14 +30,11 @@ function SearchClientComponentInner({
     searchTerm,
     setSearchTerm,
     allApiCards,
-    setAllApiCards,
     loading,
     setLoading,
     loadingMore,
     hasMore,
-    currentPage,
     loadMoreApis,
-    searchApis,
     resetSearch,
     totalCount,
   } = useApiSearch(initialCombinedSearchTerm, pageSize);
@@ -52,19 +47,8 @@ function SearchClientComponentInner({
   }) as React.RefObject<HTMLDivElement>;
 
   useEffect(() => {
-    const fetchInitialData = async () => {
-      try {
-        setLoading(true);
-        await resetSearch(initialCombinedSearchTerm);
-      } catch (error) {
-        console.error("Error fetching initial data:", error);
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    fetchInitialData();
-  }, [pageSize, initialCombinedSearchTerm, resetSearch, setLoading]);
+    resetSearch(initialCombinedSearchTerm);
+  }, [pageSize, initialCombinedSearchTerm, resetSearch]);
 
   useEffect(() => {
     const handleSearchChange = async () => {
@@ -73,31 +57,16 @@ function SearchClientComponentInner({
         : searchTerm;
 
       if (combinedSearchTerm !== initialCombinedSearchTerm) {
-        try {
-          await resetSearch(combinedSearchTerm);
-        } catch (error) {
-          console.error("Error in debounced search:", error);
-        } finally {
-          setLoading(false);
-        }
-      } else {
-        setLoading(false);
+        await resetSearch(combinedSearchTerm);
       }
     };
 
     const debounceTimer = setTimeout(handleSearchChange, 1000);
     return () => clearTimeout(debounceTimer);
-  }, [
-    searchTerm,
-    initialCombinedSearchTerm,
-    providerSlug,
-    resetSearch,
-    setLoading,
-  ]);
+  }, [searchTerm, initialCombinedSearchTerm, providerSlug, resetSearch]);
 
   const handleSearch = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = e.target.value;
-    setSearchTerm(value);
+    setSearchTerm(e.target.value);
     setLoading(true);
   };
 

functions/api/fetch-apis.js

@@ -13,9 +13,7 @@ export async function onRequestGet({ request, env }) {
     );
     const page = Math.max(parseInt(url.searchParams.get("page") || "1"), 1);
     const search = url.searchParams.get("search")?.toLowerCase().trim();
-    const category = url.searchParams.get("category")?.toLowerCase().trim();
-    const tag = url.searchParams.get("tag")?.toLowerCase().trim();
-    const status = url.searchParams.get("status")?.toLowerCase();
+
     const sortBy = url.searchParams.get("sortBy") || "name";
     const sortOrder =
       url.searchParams.get("sortOrder")?.toLowerCase() === "desc"
@@ -38,28 +36,6 @@ export async function onRequestGet({ request, env }) {
       bindings.push(`%${search}%`, `%${search}%`, `%${search}%`);
     }
 
-    if (category) {
-      conditions.push("a.categories LIKE ?");
-      bindings.push(`%"${category}"%`);
-    }
-
-    if (tag) {
-      conditions.push("a.tags LIKE ?");
-      bindings.push(`%"${tag}"%`);
-    }
-
-    if (status === "new") {
-      const monthAgo = new Date();
-      monthAgo.setDate(monthAgo.getDate() - 30);
-      conditions.push("a.added >= ?");
-      bindings.push(monthAgo.toISOString().split("T")[0]);
-    } else if (status === "updated") {
-      const monthAgo = new Date();
-      monthAgo.setDate(monthAgo.getDate() - 30);
-      conditions.push("a.updated >= ?");
-      bindings.push(monthAgo.toISOString().split("T")[0]);
-    }
-
     if (conditions.length > 0) {
       const whereClause = " WHERE " + conditions.join(" AND ");
       baseQuery += whereClause;
@@ -121,9 +97,6 @@ export async function onRequestGet({ request, env }) {
       },
       filters: {
         search: search || null,
-        category: category || null,
-        tag: tag || null,
-        status: status || null,
         sortBy,
         sortOrder: sortOrder.toLowerCase(),
       },

hooks/useApiSearch.ts

@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from "react";
+import { useState, useCallback } from "react";
 import { ApiCardModel } from "@/models/ApiCardModel";
 import { fetchApisInfinite } from "@/services/api";
 import { cleanDescription } from "@/utils/textProcessing";
@@ -13,20 +13,15 @@ export function useApiSearch(initialSearchTerm: string, pageSize: number) {
   const [totalCount, setTotalCount] = useState(0);
 
   const cleanApiData = useCallback((apis: ApiCardModel[]) => {
-    return apis.map((card) => {
-      const cleanedCard = { ...card };
-      if (cleanedCard.cardDescription) {
-        cleanedCard.cardDescription = cleanDescription(
-          cleanedCard.cardDescription
-        );
-      }
-      if (cleanedCard.markedDescription) {
-        cleanedCard.markedDescription = cleanDescription(
-          cleanedCard.markedDescription
-        );
-      }
-      return cleanedCard;
-    });
+    return apis.map((card) => ({
+      ...card,
+      cardDescription: card.cardDescription
+        ? cleanDescription(card.cardDescription)
+        : card.cardDescription,
+      markedDescription: card.markedDescription
+        ? cleanDescription(card.markedDescription)
+        : card.markedDescription,
+    }));
   }, []);
 
   const loadMoreApis = useCallback(async () => {
@@ -45,9 +40,7 @@ export function useApiSearch(initialSearchTerm: string, pageSize: number) {
         setAllApiCards((prev) => [...prev, ...cleanedApis]);
         setCurrentPage((prev) => prev + 1);
         setHasMore(response.hasMore);
-        if (response.totalCount !== undefined) {
-          setTotalCount(response.totalCount);
-        }
+        setTotalCount(response.totalCount);
       } else {
         setHasMore(false);
       }
@@ -72,7 +65,7 @@ export function useApiSearch(initialSearchTerm: string, pageSize: number) {
         setAllApiCards(cleanedApis);
         setHasMore(response.hasMore);
         setCurrentPage(1);
-        setTotalCount(response.totalCount || 0);
+        setTotalCount(response.totalCount);
       } catch (error) {
         console.error("Error searching APIs:", error);
         setAllApiCards([]);
@@ -85,25 +78,15 @@ export function useApiSearch(initialSearchTerm: string, pageSize: number) {
     [pageSize, cleanApiData]
   );
 
-  const searchApis = useCallback(
-    async (term: string) => {
-      await resetSearch(term);
-    },
-    [resetSearch]
-  );
-
   return {
     searchTerm,
     setSearchTerm,
     allApiCards,
-    setAllApiCards,
     loading,
     setLoading,
     loadingMore,
     hasMore,
-    currentPage,
     loadMoreApis,
-    searchApis,
     resetSearch,
     totalCount,
   };