fixed some bugs

2025-12-23 13:32:57 +05:00
parent cdc9fa686f
commit 2b46d525f2
30 changed files with 857 additions and 260 deletions
--- a/features/cart/components/CartItemCard.tsx
+++ b/features/cart/components/CartItemCard.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { useState, useEffect, useRef, useCallback } from "react";
 import Image from "next/image";
-import { Minus, Plus, Trash2, Loader2, AlertTriangle } from "lucide-react";
+import { Minus, Plus, Trash2, AlertTriangle } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
 import {
@@ -387,7 +387,7 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
                variant="outline"
                size="icon"
                onClick={handleQuantityDecrease}
-                className={` cursor-pointer rounded-xl bg-blue-50 ${
+                className={` cursor-pointer rounded-lg bg-blue-50 ${
                  isSyncing ? "opacity-70" : ""
                }`}
              >
@@ -396,9 +396,6 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {

              <div className="w-12 text-center font-semibold relative">
                {localQuantity}
-                {isSyncing && (
-                  <Loader2 className="h-3 w-3 animate-spin absolute -top-1 -right-3 text-blue-500" />
-                )}
                {syncError && (
                  <span
                    className="absolute -top-1 -right-3 h-2 w-2 bg-red-500 rounded-full"
@@ -412,7 +409,7 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
                size="icon"
                onClick={handleQuantityIncrease}
                // disabled={localQuantity >= availableStock}
-                className={`rounded-xl cursor-pointer bg-blue-50 ${
+                className={`rounded-lg cursor-pointer bg-blue-50 ${
                  isSyncing ? "opacity-70" : ""
                } ${
                  localQuantity >= availableStock
--- a/features/cart/components/CartItemSkeleton.tsx
+++ b/features/cart/components/CartItemSkeleton.tsx
@@ -1,27 +1,36 @@
-// import { Skeleton } from "@/components/ui/skeleton"
-// import { Card } from "@/components/ui/card"
+import { Card } from "@/components/ui/card";
+import { Skeleton } from "@/components/ui/skeleton";

-// export default function CartItemSkeleton() {
-//   return (
-//     <Card className="p-4 rounded-xl">
-//       <div className="flex gap-4">
-//         {/* Product Image */}
-//         <Skeleton className="w-24 h-24 rounded-lg flex-shrink-0 bg-gray-200" />
+export default function CartItemSkeleton() {
+  return (
+    <Card className="p-4 shadow-none border">
+      <div className="flex flex-col sm:flex-row gap-4">
+        <div className="flex gap-4 flex-1">
+          <Skeleton className="w-[88px] h-[117px] rounded-xl" />
+          <div className="flex flex-col gap-2 flex-1">
+            <Skeleton className="h-5 w-3/4" />
+            <Skeleton className="h-4 w-1/2" />
+            <Skeleton className="h-4 w-1/3" />
+            <Skeleton className="h-5 w-5 rounded" />
+          </div>
+        </div>
+
+        <div className="flex flex-col sm:flex-row items-start sm:items-center gap-4 justify-between">
+          <div className="space-y-2">
+            <Skeleton className="h-4 w-32" />
+            <Skeleton className="h-4 w-24" />
+            <Skeleton className="h-8 w-40 rounded-lg" />
+          </div>
+
+          <div className="flex items-center gap-2">
+            <Skeleton className="h-10 w-10 rounded-xl" />
+            <Skeleton className="h-6 w-12" />
+            <Skeleton className="h-10 w-10 rounded-xl" />
+          </div>
+        </div>
+      </div>
+    </Card>
+  );
+}

-//         {/* Product Info */}
-//         <div className="flex-1 space-y-2">
-//           <Skeleton className="h-4 w-3/4 bg-gray-200" />
-//           <Skeleton className="h-4 w-1/2 bg-gray-200" />
-//           <Skeleton className="h-6 w-20 bg-gray-200 mt-2" />
-//         </div>

-//         {/* Quantity Controls */}
-//         <div className="flex items-center gap-2">
-//           <Skeleton className="w-8 h-8 rounded-lg bg-gray-200" />
-//           <Skeleton className="w-8 h-8 bg-gray-200" />
-//           <Skeleton className="w-8 h-8 rounded-lg bg-gray-200" />
-//         </div>
-//       </div>
-//     </Card>
-//   )
-// }
--- a/features/cart/components/OrderSummarySkeleton.tsx
+++ b/features/cart/components/OrderSummarySkeleton.tsx
@@ -0,0 +1,81 @@
+import { Card } from "@/components/ui/card";
+import { Skeleton } from "@/components/ui/skeleton";
+import { Separator } from "@/components/ui/separator";
+
+export default function OrderSummarySkeleton() {
+  return (
+    <Card className="w-full md:w-[380px] p-4 md:p-6 rounded-xl h-fit sticky top-20">
+      {/* Customer Information */}
+      <div className="mb-6">
+        <Skeleton className="h-6 w-48 mb-3" />
+        <div className="space-y-4">
+          <div>
+            <Skeleton className="h-4 w-20 mb-2" />
+            <Skeleton className="h-10 w-full rounded-lg" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-24 mb-2" />
+            <Skeleton className="h-10 w-full rounded-lg" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-16 mb-2" />
+            <Skeleton className="h-10 w-full rounded-lg" />
+          </div>
+        </div>
+      </div>
+
+      {/* Payment Type */}
+      <div className="mb-6">
+        <Skeleton className="h-6 w-32 mb-3" />
+        <div className="flex gap-2">
+          <Skeleton className="flex-1 h-20 rounded-lg" />
+          <Skeleton className="flex-1 h-20 rounded-lg" />
+        </div>
+      </div>
+
+      {/* Region Selection */}
+      <div className="mb-6">
+        <Skeleton className="h-6 w-36 mb-3" />
+        <div className="flex flex-wrap gap-4">
+          {Array.from({ length: 4 }).map((_, i) => (
+            <div key={i} className="flex items-center gap-2">
+              <Skeleton className="h-4 w-4 rounded-full" />
+              <Skeleton className="h-4 w-16" />
+            </div>
+          ))}
+        </div>
+      </div>
+
+      {/* Province Selection */}
+      <div className="mb-6">
+        <Skeleton className="h-6 w-40 mb-3" />
+        <Skeleton className="h-10 w-full rounded-lg" />
+      </div>
+
+      {/* Note */}
+      <div className="mb-6">
+        <Skeleton className="h-6 w-24 mb-3" />
+        <Skeleton className="h-24 w-full rounded-xl" />
+      </div>
+
+      {/* Billing */}
+      <div className="space-y-2 mb-4">
+        {Array.from({ length: 3 }).map((_, i) => (
+          <div key={i} className="flex justify-between">
+            <Skeleton className="h-5 w-24" />
+            <Skeleton className="h-5 w-20" />
+          </div>
+        ))}
+      </div>
+
+      <Separator className="my-4" />
+
+      <div className="flex justify-between items-center mb-6">
+        <Skeleton className="h-6 w-32" />
+        <Skeleton className="h-6 w-28" />
+      </div>
+
+      <Skeleton className="h-12 w-full rounded-lg" />
+    </Card>
+  );
+}
--- a/features/category/components/CategoryFilters.tsx
+++ b/features/category/components/CategoryFilters.tsx
@@ -77,7 +77,7 @@ export default function CategoryFilters({
        </FilterSection>
      )}

-      <FilterSection title={translations.sort}>
+      {/* <FilterSection title={translations.sort}>
        <RadioItem
          name="sort"
          checked={priceSort === "none"}
@@ -96,7 +96,7 @@ export default function CategoryFilters({
          onChange={() => onPriceSortChange("highToLow")}
          label={translations.price_high_to_low}
        />
-      </FilterSection>
+      </FilterSection> */}

      <PriceFilter
        title={translations.price}
@@ -108,7 +108,7 @@ export default function CategoryFilters({
        }}
      />

-      <Button variant="outline" className="w-full rounded-lg cursor-pointer" onClick={onReset}>
+      <Button variant="outline" className="w-full rounded-lg cursor-pointer mb-6" onClick={onReset}>
        {translations.reset}
      </Button>
    </div>
--- a/features/category/components/CategoryPageClient.tsx
+++ b/features/category/components/CategoryPageClient.tsx
@@ -2,6 +2,7 @@

 import { useEffect, useState, useMemo, useCallback } from "react";
 import { ScrollArea } from "@/components/ui/scroll-area";
+import { Skeleton } from "@/components/ui/skeleton";
 import {
  useCategories,
  useCategoryFilters,
@@ -12,6 +13,7 @@ import type { Category, Product } from "@/lib/types/api";
 import CategoryFilters from "./CategoryFilters";
 import CategoryProductsGrid from "./CategoryProductsGrid";
 import CategoryFiltersSheet from "./CategoryFiltersSheet";
+import ErrorPage from "@/components/ErrorPage";

 interface CategoryPageClientProps {
  params: { locale: string; slug: string };
@@ -24,8 +26,11 @@ export default function CategoryPageClient({
  const t = useTranslations();
  const [isSheetOpen, setIsSheetOpen] = useState(false);

-  const { data: categoriesData, isLoading: categoriesLoading } =
-    useCategories();
+  const { 
+    data: categoriesData, 
+    isLoading: categoriesLoading,
+    isError: categoriesError 
+  } = useCategories();

  const selectedCategory = useMemo(() => {
    if (!categoriesData || !slug) return null;
@@ -57,7 +62,11 @@ export default function CategoryPageClient({
  >(new Set());

  // Fetch filters
-  const { data: filtersData } = useCategoryFilters(selectedCategory?.id, {
+  const { 
+    data: filtersData,
+    isLoading: filtersLoading,
+    isError: filtersError 
+  } = useCategoryFilters(selectedCategory?.id, {
    enabled: !!selectedCategory,
  });

@@ -76,19 +85,18 @@ export default function CategoryPageClient({
      params.categories = Array.from(selectedFilterCategories);
    }

-    if (priceRange[0] > 0) {
-      params.min_price = priceRange[0];
-    }
-
-    if (priceRange[1] < 10000) {
-      params.max_price = priceRange[1];
-    }
+    params.min_price = priceRange[0];
+    params.max_price = priceRange[1];

    return params;
  }, [currentPage, selectedBrands, selectedFilterCategories, priceRange]);

  // Fetch filtered products
-  const { data: productsData, isFetching } = useFilteredCategoryProducts(
+  const { 
+    data: productsData, 
+    isFetching,
+    isError: productsError 
+  } = useFilteredCategoryProducts(
    selectedCategory?.id?.toString() || "",
    filterParams,
    { enabled: !!selectedCategory }
@@ -126,7 +134,7 @@ export default function CategoryPageClient({
        return [...prev, ...newProducts];
      });
    }
-  }, [productsData?.data, currentPage]); 
+  }, [productsData?.data, currentPage]);

  const hasMore = useMemo(() => {
    if (!productsData?.pagination) return false;
@@ -152,7 +160,7 @@ export default function CategoryPageClient({
  const loadMoreData = useCallback(() => {
    if (!hasMore || isFetching) return;
    setCurrentPage((prev) => prev + 1);
-  }, [hasMore, isFetching, currentPage]);
+  }, [hasMore, isFetching]);

  const sortedProducts = useMemo(() => {
    const products = [...allProducts];
@@ -232,9 +240,57 @@ export default function CategoryPageClient({
    [t]
  );

-  
-  if (!selectedCategory)
+  // ERROR STATE
+  if (categoriesError || productsError || filtersError) {
+    return <ErrorPage />;
+  }
+
+  // LOADING STATE
+  if (categoriesLoading) {
+    return (
+      <div className="flex flex-col mx-auto max-w-[1504px] px-2 md:px-4 lg:px-6 pb-12">
+        {/* Title Skeleton */}
+        <Skeleton className="h-16 w-full rounded-t-lg mb-0 bg-white" />
+
+        <div className="flex p-2 md:p-4 gap-4 bg-white rounded-b-lg mt-0">
+          {/* Desktop Filters Skeleton */}
+          <div className="hidden sm:block w-[280px] shrink-0 border-r px-4 space-y-6">
+            <Skeleton className="h-8 w-32" />
+            <div className="space-y-2">
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+            </div>
+            <Skeleton className="h-8 w-32" />
+            <div className="space-y-2">
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+            </div>
+            <Skeleton className="h-32 w-full" />
+            <Skeleton className="h-10 w-full rounded-lg" />
+          </div>
+
+          {/* Products Grid Skeleton */}
+          <div className="flex-1">
+            <div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-3">
+              {Array.from({ length: 8 }).map((_, i) => (
+                <div key={i} className="space-y-2">
+                  <Skeleton className="w-full aspect-square rounded-lg" />
+                  <Skeleton className="h-4 w-3/4" />
+                  <Skeleton className="h-6 w-1/2" />
+                </div>
+              ))}
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  // CATEGORY NOT FOUND
+  if (!selectedCategory) {
    return <div className="text-center py-8">{t("category_not_found")}</div>;
+  }

  return (
    <div className="flex flex-col mx-auto max-w-[1504px] px-2 md:px-4 lg:px-6 pb-12">
@@ -246,19 +302,37 @@ export default function CategoryPageClient({
        {/* Desktop Filters Sidebar */}
        <div className="hidden sm:block w-[280px] shrink-0 border-r px-4">
          <ScrollArea className="h-auto">
-            <CategoryFilters
-              filtersData={filtersData}
-              selectedBrands={selectedBrands}
-              selectedFilterCategories={selectedFilterCategories}
-              priceSort={priceSort}
-              priceRange={priceRange}
-              onBrandToggle={handleBrandToggle}
-              onCategoryToggle={handleCategoryToggle}
-              onPriceSortChange={handlePriceSortChange}
-              onPriceChange={handlePriceChange}
-              onReset={resetFilters}
-              translations={filterTranslations}
-            />
+            {filtersLoading ? (
+              <div className="space-y-6">
+                <div className="space-y-2">
+                  <Skeleton className="h-6 w-24" />
+                  <Skeleton className="h-5 w-full" />
+                  <Skeleton className="h-5 w-full" />
+                  <Skeleton className="h-5 w-full" />
+                </div>
+                <div className="space-y-2">
+                  <Skeleton className="h-6 w-24" />
+                  <Skeleton className="h-5 w-full" />
+                  <Skeleton className="h-5 w-full" />
+                </div>
+                <Skeleton className="h-32 w-full" />
+                <Skeleton className="h-10 w-full rounded-lg" />
+              </div>
+            ) : (
+              <CategoryFilters
+                filtersData={filtersData}
+                selectedBrands={selectedBrands}
+                selectedFilterCategories={selectedFilterCategories}
+                priceSort={priceSort}
+                priceRange={priceRange}
+                onBrandToggle={handleBrandToggle}
+                onCategoryToggle={handleCategoryToggle}
+                onPriceSortChange={handlePriceSortChange}
+                onPriceChange={handlePriceChange}
+                onReset={resetFilters}
+                translations={filterTranslations}
+              />
+            )}
          </ScrollArea>
        </div>

@@ -284,20 +358,38 @@ export default function CategoryPageClient({
        filterLabel={t("filter")}
        closeLabel={t("close")}
      >
-        <CategoryFilters
-          filtersData={filtersData}
-          selectedBrands={selectedBrands}
-          selectedFilterCategories={selectedFilterCategories}
-          priceSort={priceSort}
-          priceRange={priceRange}
-          onBrandToggle={handleBrandToggle}
-          onCategoryToggle={handleCategoryToggle}
-          onPriceSortChange={handlePriceSortChange}
-          onPriceChange={handlePriceChange}
-          onReset={resetFilters}
-          translations={filterTranslations}
-        />
+        {filtersLoading ? (
+          <div className="space-y-6">
+            <div className="space-y-2">
+              <Skeleton className="h-6 w-24" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+            </div>
+            <div className="space-y-2">
+              <Skeleton className="h-6 w-24" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+            </div>
+            <Skeleton className="h-32 w-full" />
+            <Skeleton className="h-10 w-full rounded-lg" />
+          </div>
+        ) : (
+          <CategoryFilters
+            filtersData={filtersData}
+            selectedBrands={selectedBrands}
+            selectedFilterCategories={selectedFilterCategories}
+            priceSort={priceSort}
+            priceRange={priceRange}
+            onBrandToggle={handleBrandToggle}
+            onCategoryToggle={handleCategoryToggle}
+            onPriceSortChange={handlePriceSortChange}
+            onPriceChange={handlePriceChange}
+            onReset={resetFilters}
+            translations={filterTranslations}
+          />
+        )}
      </CategoryFiltersSheet>
    </div>
  );
-}
+}
--- a/features/category/components/CategorySkeleton.tsx
+++ b/features/category/components/CategorySkeleton.tsx
@@ -1,17 +1,17 @@
-import { Skeleton } from "@/components/ui/skeleton"
-import { Card } from "@/components/ui/card"
-import { CardContent } from "@/components/ui/card"
+// import { Skeleton } from "@/components/ui/skeleton"
+// import { Card } from "@/components/ui/card"
+// import { CardContent } from "@/components/ui/card"

-export default function CategorySkeleton() {
-  return (
-    <Card className="overflow-hidden rounded-xl">
-      {/* Image */}
-      <Skeleton className="w-full h-36 bg-gray-200" />
+// export default function CategorySkeleton() {
+//   return (
+//     <Card className="overflow-hidden rounded-xl">
+//       {/* Image */}
+//       <Skeleton className="w-full h-36 bg-gray-200" />

-      {/* Name */}
-      <CardContent className="py-2">
-        <Skeleton className="h-4 w-3/4 bg-gray-200" />
-      </CardContent>
-    </Card>
-  )
-}
+//       {/* Name */}
+//       <CardContent className="py-2">
+//         <Skeleton className="h-4 w-3/4 bg-gray-200" />
+//       </CardContent>
+//     </Card>
+//   )
+// }
--- a/features/collections/components/CollectionFilters.tsx
+++ b/features/collections/components/CollectionFilters.tsx
@@ -107,7 +107,7 @@ export default function CollectionFilters({
        }}
      />

-      <Button variant="outline" className="w-full rounded-lg cursor-pointer" onClick={onReset}>
+      <Button variant="outline" className="w-full rounded-lg cursor-pointer mb-6" onClick={onReset}>
        {translations.reset}
      </Button>
    </div>
--- a/features/collections/components/CollectionPageClient.tsx
+++ b/features/collections/components/CollectionPageClient.tsx
@@ -2,16 +2,18 @@

 import { useEffect, useState, useMemo, useCallback } from "react";
 import { ScrollArea } from "@/components/ui/scroll-area";
-import { useTranslations } from "next-intl";
-import type { Product } from "@/lib/types/api";
-import CollectionFilters from "./CollectionFilters";
-import CollectionProductsGrid from "./CollectionProductsGrid";
-import CollectionFiltersSheet from "./CollectionFiltersSheet";
+import { Skeleton } from "@/components/ui/skeleton";
 import {
  useCollections,
  useCollectionFilters,
  useFilteredCollectionProducts,
 } from "@/features/collections/hooks/useCollections";
+import { useTranslations } from "next-intl";
+import type { Product } from "@/lib/types/api";
+import CollectionFilters from "./CollectionFilters";
+import CollectionProductsGrid from "./CollectionProductsGrid";
+import CollectionFiltersSheet from "./CollectionFiltersSheet";
+import ErrorPage from "@/components/ErrorPage";

 interface CollectionPageClientProps {
  params: { locale: string; slug: string };
@@ -24,8 +26,11 @@ export default function CollectionPageClient({
  const t = useTranslations();
  const [isSheetOpen, setIsSheetOpen] = useState(false);

-  const { data: collectionsData, isLoading: collectionsLoading } =
-    useCollections();
+  const {
+    data: collectionsData,
+    isLoading: collectionsLoading,
+    isError: collectionsError,
+  } = useCollections();

  const selectedCollection = useMemo(() => {
    if (!collectionsData || !slug) return null;
@@ -35,13 +40,21 @@ export default function CollectionPageClient({
  // State management
  const [currentPage, setCurrentPage] = useState(1);
  const [allProducts, setAllProducts] = useState<Product[]>([]);
-  const [priceSort, setPriceSort] = useState<"none" | "lowToHigh" | "highToLow">("none");
+  const [priceSort, setPriceSort] = useState<
+    "none" | "lowToHigh" | "highToLow"
+  >("none");
  const [priceRange, setPriceRange] = useState<[number, number]>([0, 10000]);
  const [selectedBrands, setSelectedBrands] = useState<Set<number>>(new Set());
-  const [selectedCategories, setSelectedCategories] = useState<Set<number>>(new Set());
+  const [selectedCategories, setSelectedCategories] = useState<Set<number>>(
+    new Set()
+  );

  // Fetch filters
-  const { data: filtersData } = useCollectionFilters(selectedCollection?.id, {
+  const {
+    data: filtersData,
+    isLoading: filtersLoading,
+    isError: filtersError,
+  } = useCollectionFilters(selectedCollection?.id, {
    enabled: !!selectedCollection,
  });

@@ -60,19 +73,18 @@ export default function CollectionPageClient({
      params.categories = Array.from(selectedCategories);
    }

-    if (priceRange[0] > 0) {
-      params.min_price = priceRange[0];
-    }
-
-    if (priceRange[1] < 10000) {
-      params.max_price = priceRange[1];
-    }
+    params.min_price = priceRange[0];
+    params.max_price = priceRange[1];

    return params;
  }, [currentPage, selectedBrands, selectedCategories, priceRange]);

  // Fetch filtered products
-  const { data: productsData, isFetching } = useFilteredCollectionProducts(
+  const {
+    data: productsData,
+    isFetching,
+    isError: productsError,
+  } = useFilteredCollectionProducts(
    selectedCollection?.id?.toString() || "",
    filterParams,
    { enabled: !!selectedCollection }
@@ -97,14 +109,20 @@ export default function CollectionPageClient({
        if (currentPage === 1) {
          return productsData.data;
        }
+
        const existingIds = new Set(prev.map((p) => p.id));
        const newProducts = productsData.data.filter(
          (p: Product) => !existingIds.has(p.id)
        );
+
+        if (newProducts.length === 0) {
+          return prev;
+        }
+
        return [...prev, ...newProducts];
      });
    }
-  }, [productsData, currentPage]);
+  }, [productsData?.data, currentPage]);

  const hasMore = useMemo(() => {
    return !!productsData?.pagination?.next_page_url;
@@ -115,6 +133,7 @@ export default function CollectionPageClient({
    setCurrentPage((prev) => prev + 1);
  }, [hasMore, isFetching]);

+  // Client-side sorting
  const sortedProducts = useMemo(() => {
    const products = [...allProducts];
    if (priceSort === "lowToHigh") {
@@ -146,7 +165,9 @@ export default function CollectionPageClient({
  const handleCategoryToggle = useCallback((categoryId: number) => {
    setSelectedCategories((prev) => {
      const newSet = new Set(prev);
-      newSet.has(categoryId) ? newSet.delete(categoryId) : newSet.add(categoryId);
+      newSet.has(categoryId)
+        ? newSet.delete(categoryId)
+        : newSet.add(categoryId);
      return newSet;
    });
    setCurrentPage(1);
@@ -191,9 +212,63 @@ export default function CollectionPageClient({
    [t]
  );

- 
-  if (!selectedCollection)
+  // ERROR STATE
+  if (collectionsError || productsError || filtersError) {
+    return <ErrorPage />;
+  }
+
+  // LOADING STATE
+  if (collectionsLoading) {
+    return (
+      <div className="flex flex-col mx-auto max-w-[1504px] px-2 md:px-4 lg:px-6 pb-12">
+        {/* Title Skeleton */}
+        <Skeleton className="h-16 w-full rounded-t-lg mb-0 bg-white" />
+
+        <div className="flex p-2 md:p-4 gap-4 bg-white rounded-b-lg mt-0">
+          {/* Desktop Filters Skeleton */}
+          <div className="hidden sm:block w-[280px] shrink-0 border-r px-4 space-y-6">
+            <Skeleton className="h-8 w-32" />
+            <div className="space-y-2">
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+            </div>
+            <Skeleton className="h-8 w-32" />
+            <div className="space-y-2">
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+            </div>
+            <Skeleton className="h-8 w-32" />
+            <div className="space-y-2">
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+            </div>
+            <Skeleton className="h-32 w-full" />
+            <Skeleton className="h-10 w-full rounded-lg" />
+          </div>
+
+          {/* Products Grid Skeleton */}
+          <div className="flex-1">
+            <div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-3">
+              {Array.from({ length: 8 }).map((_, i) => (
+                <div key={i} className="space-y-2">
+                  <Skeleton className="w-full aspect-square rounded-lg" />
+                  <Skeleton className="h-4 w-3/4" />
+                  <Skeleton className="h-6 w-1/2" />
+                </div>
+              ))}
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  // COLLECTION NOT FOUND
+  if (!selectedCollection) {
    return <div className="text-center py-8">{t("collection_not_found")}</div>;
+  }

  return (
    <div className="flex flex-col mx-auto max-w-[1504px] px-2 md:px-4 lg:px-6 pb-12">
@@ -201,23 +276,47 @@ export default function CollectionPageClient({
        {selectedCollection.name}
      </h2>

-      <div className="flex  p-2 md:p-4 gap-4 bg-white rounded-b-lg">
+      <div className="flex p-2 md:p-4 gap-4 bg-white rounded-b-lg">
        {/* Desktop Filters Sidebar */}
        <div className="hidden sm:block w-[280px] shrink-0 border-r px-4">
          <ScrollArea className="h-auto">
-            <CollectionFilters
-              filtersData={filtersData}
-              selectedBrands={selectedBrands}
-              selectedCategories={selectedCategories}
-              priceSort={priceSort}
-              priceRange={priceRange}
-              onBrandToggle={handleBrandToggle}
-              onCategoryToggle={handleCategoryToggle}
-              onPriceSortChange={handlePriceSortChange}
-              onPriceChange={handlePriceChange}
-              onReset={resetFilters}
-              translations={filterTranslations}
-            />
+            {filtersLoading ? (
+              <div className="space-y-6">
+                <div className="space-y-2">
+                  <Skeleton className="h-6 w-24" />
+                  <Skeleton className="h-5 w-full" />
+                  <Skeleton className="h-5 w-full" />
+                  <Skeleton className="h-5 w-full" />
+                </div>
+                <div className="space-y-2">
+                  <Skeleton className="h-6 w-24" />
+                  <Skeleton className="h-5 w-full" />
+                  <Skeleton className="h-5 w-full" />
+                </div>
+                <div className="space-y-2">
+                  <Skeleton className="h-6 w-24" />
+                  <Skeleton className="h-5 w-full" />
+                  <Skeleton className="h-5 w-full" />
+                  <Skeleton className="h-5 w-full" />
+                </div>
+                <Skeleton className="h-32 w-full" />
+                <Skeleton className="h-10 w-full rounded-lg" />
+              </div>
+            ) : (
+              <CollectionFilters
+                filtersData={filtersData}
+                selectedBrands={selectedBrands}
+                selectedCategories={selectedCategories}
+                priceSort={priceSort}
+                priceRange={priceRange}
+                onBrandToggle={handleBrandToggle}
+                onCategoryToggle={handleCategoryToggle}
+                onPriceSortChange={handlePriceSortChange}
+                onPriceChange={handlePriceChange}
+                onReset={resetFilters}
+                translations={filterTranslations}
+              />
+            )}
          </ScrollArea>
        </div>

@@ -227,6 +326,7 @@ export default function CollectionPageClient({
            products={sortedProducts}
            hasMore={hasMore}
            onLoadMore={loadMoreData}
+            isFetching={isFetching}
            translations={{
              loading: t("common.loading"),
              no_results: t("no_results"),
@@ -242,20 +342,44 @@ export default function CollectionPageClient({
        filterLabel={t("filter")}
        closeLabel={t("close")}
      >
-        <CollectionFilters
-          filtersData={filtersData}
-          selectedBrands={selectedBrands}
-          selectedCategories={selectedCategories}
-          priceSort={priceSort}
-          priceRange={priceRange}
-          onBrandToggle={handleBrandToggle}
-          onCategoryToggle={handleCategoryToggle}
-          onPriceSortChange={handlePriceSortChange}
-          onPriceChange={handlePriceChange}
-          onReset={resetFilters}
-          translations={filterTranslations}
-        />
+        {filtersLoading ? (
+          <div className="space-y-6">
+            <div className="space-y-2">
+              <Skeleton className="h-6 w-24" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+            </div>
+            <div className="space-y-2">
+              <Skeleton className="h-6 w-24" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+            </div>
+            <div className="space-y-2">
+              <Skeleton className="h-6 w-24" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+              <Skeleton className="h-5 w-full" />
+            </div>
+            <Skeleton className="h-32 w-full" />
+            <Skeleton className="h-10 w-full rounded-lg" />
+          </div>
+        ) : (
+          <CollectionFilters
+            filtersData={filtersData}
+            selectedBrands={selectedBrands}
+            selectedCategories={selectedCategories}
+            priceSort={priceSort}
+            priceRange={priceRange}
+            onBrandToggle={handleBrandToggle}
+            onCategoryToggle={handleCategoryToggle}
+            onPriceSortChange={handlePriceSortChange}
+            onPriceChange={handlePriceChange}
+            onReset={resetFilters}
+            translations={filterTranslations}
+          />
+        )}
      </CollectionFiltersSheet>
    </div>
  );
-}
+}
--- a/features/collections/components/CollectionProductsGrid.tsx
+++ b/features/collections/components/CollectionProductsGrid.tsx
@@ -5,6 +5,7 @@ import type { Product } from "@/lib/types/api";
 interface CollectionProductsGridProps {
  products: Product[];
  hasMore: boolean;
+  isFetching?: boolean;
  onLoadMore: () => void;
  translations: {
    loading: string;
@@ -16,9 +17,10 @@ export default function CollectionProductsGrid({
  products,
  hasMore,
  onLoadMore,
+  isFetching = false,
  translations,
 }: CollectionProductsGridProps) {
-  if (products.length === 0) {
+  if (products.length === 0 && !isFetching) {
    return (
      <div className="text-center py-8 text-gray-500">
        {translations.no_results}
@@ -35,9 +37,17 @@ export default function CollectionProductsGrid({
      style={{ overflow: "visible" }}
      loader={
        <div className="flex justify-center py-4">
-          <div>{translations.loading}</div>
+          <div className="flex items-center gap-2">
+            <div className="w-5 h-5 border-2 border-gray-300 border-t-blue-500 rounded-full animate-spin" />
+            <span>{translations.loading}</span>
+          </div>
        </div>
      }
+      endMessage={
+        products.length > 0 && !hasMore ? (
+          <div className="text-center py-4 text-gray-500 text-sm"></div>
+        ) : null
+      }
    >
      <div className="bg-white rounded-lg grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-3">
        {products.map((product) => (
@@ -55,6 +65,18 @@ export default function CollectionProductsGrid({
          />
        ))}
      </div>
+
+      {isFetching && products.length === 0 && (
+        <div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-3 mt-3">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <div key={i} className="animate-pulse">
+              <div className="bg-gray-200 h-48 rounded-lg mb-2" />
+              <div className="bg-gray-200 h-4 rounded w-3/4 mb-2" />
+              <div className="bg-gray-200 h-4 rounded w-1/2" />
+            </div>
+          ))}
+        </div>
+      )}
    </InfiniteScroll>
  );
-}
+}
--- a/features/favorites/hooks/useFavorites.ts
+++ b/features/favorites/hooks/useFavorites.ts
@@ -27,6 +27,7 @@ async function fetchAllFavorites(): Promise<Favorite[]> {
  const allFavorites: Favorite[] = [];
  let currentPage = 1;
  let hasMorePages = true;
+  let lastError: Error | null = null;

  while (hasMorePages) {
    try {
@@ -37,7 +38,6 @@ async function fetchAllFavorites(): Promise<Favorite[]> {
      const favorites = transformFavoritesResponse(response.data);
      allFavorites.push(...favorites);

-      // Check pagination
      const pagination = response.data?.pagination;
      if (pagination?.next_page_url) {
        currentPage++;
@@ -45,11 +45,22 @@ async function fetchAllFavorites(): Promise<Favorite[]> {
        hasMorePages = false;
      }
    } catch (error) {
-      // If pagination not supported, return what we have
+    
+      if (currentPage === 1) {
+        throw error;
+      }
+      
+      
+      lastError = error as Error;
      hasMorePages = false;
    }
  }

+  
+  if (allFavorites.length === 0 && lastError) {
+    throw lastError;
+  }
+
  return allFavorites;
 }

--- a/features/home/components/CategoryGrid.tsx
+++ b/features/home/components/CategoryGrid.tsx
@@ -3,6 +3,7 @@ import Image from "next/image";
 import Link from "next/link";
 import { Card, CardContent } from "@/components/ui/card";
 import type { Category } from "@/lib/types/api";
+import { Skeleton } from "@/components/ui/skeleton";

 type Props = {
  categories: Category[] | undefined;
@@ -34,11 +35,11 @@ export default function CategoryGrid({
    return (
      <section className="bg-white rounded-2xl shadow-sm p-6">
        <h2 className="text-xl font-semibold mb-4">{title}</h2>
-        <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6 gap-4">
-          {Array.from({ length: 6 }).map((_, i) => (
+        <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4">
+          {Array.from({ length: 10 }).map((_, i) => (
            <div key={i} className="space-y-2">
-              <div className="w-full h-36 bg-gray-200 rounded-lg animate-pulse" />
-              <div className="h-4 bg-gray-200 rounded w-full animate-pulse" />
+              <Skeleton className="w-full h-36 rounded-lg" />
+              <Skeleton className="h-4 w-full" />
            </div>
          ))}
        </div>
--- a/features/home/components/HomePage.tsx
+++ b/features/home/components/HomePage.tsx
@@ -5,6 +5,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
 import HeroCarousel from "./Carousel";
 import CategoryGrid from "./CategoryGrid";
 import CollectionSection from "./ProductGrid";
+import { Skeleton } from "@/components/ui/skeleton";
 import {
  useCategories,
  useCarousels,
@@ -49,8 +50,12 @@ export default function HomePage() {

  return (
    <div className="px-2 md:px-4 lg:px-6 pt-4 pb-12 space-y-8 max-w-[1504px] mx-auto">
-      {!carouselsLoading && carouselItems.length > 0 && (
-        <HeroCarousel items={carouselItems} />
+      {carouselsLoading ? (
+        <section className=" bg-white rounded-2xl overflow-hidden">
+          <Skeleton className="w-full h-[200px] sm:h-[300px] md:h-[496px]" />
+        </section>
+      ) : (
+        carouselItems.length > 0 && <HeroCarousel items={carouselItems} />
      )}

      <CategoryGrid
@@ -71,13 +76,16 @@ export default function HomePage() {
        <div className="space-y-8">
          {Array.from({ length: 3 }).map((_, i) => (
            <section key={i} className="bg-white rounded-2xl shadow-sm p-6">
-              <div className="h-8 bg-gray-200 rounded w-48 mb-4 animate-pulse" />
-              <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4">
-                {Array.from({ length: 5 }).map((_, j) => (
+              <div className="flex items-center justify-between mb-4">
+                <Skeleton className="h-8 w-48" />
+                <Skeleton className="h-6 w-6 rounded-full" />
+              </div>
+              <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-5 gap-4">
+                {Array.from({ length: 10 }).map((_, j) => (
                  <div key={j} className="space-y-2">
-                    <div className="w-full h-[260px] bg-gray-200 rounded-xl animate-pulse" />
-                    <div className="h-4 bg-gray-200 rounded w-3/4 animate-pulse" />
-                    <div className="h-6 bg-gray-200 rounded w-1/2 animate-pulse" />
+                    <Skeleton className="w-full h-[260px] rounded-xl" />
+                    <Skeleton className="h-4 w-3/4 mx-2" />
+                    <Skeleton className="h-6 w-1/2 mx-2" />
                  </div>
                ))}
              </div>
--- a/features/home/components/ProductCard.tsx
+++ b/features/home/components/ProductCard.tsx
@@ -2,7 +2,7 @@

 import { useState, useEffect, useRef, useCallback, MouseEvent } from "react";
 import { useRouter } from "next/navigation";
-import { Heart, ShoppingCart, Loader2, Plus, Minus, AlertTriangle } from "lucide-react";
+import { Heart, ShoppingCart, Plus, Minus, AlertTriangle } from "lucide-react";
 import { toast } from "sonner";
 import {
  Carousel,
@@ -377,8 +377,8 @@ export default function ProductCard({
                >
                  {isSyncing ? (
                    <>
-                      <Loader2 className="h-4 w-4 animate-spin" />
-                      Adding...
+                      
+                      {t("adding")}
                    </>
                  ) : (
                    <>
@@ -400,9 +400,6 @@ export default function ProductCard({
                  </Button>
                  <div className="flex-1 text-center font-semibold text-sm border rounded-lg h-9 flex items-center justify-center bg-white relative">
                    {localQuantity}
-                    {isSyncing && (
-                      <Loader2 className="h-3 w-3 animate-spin absolute -top-1 -right-1 text-blue-500" />
-                    )}
                  </div>
                  <Button
                    variant="outline"
--- a/features/home/components/ProductGrid.tsx
+++ b/features/home/components/ProductGrid.tsx
@@ -4,6 +4,7 @@ import { ChevronRight } from "lucide-react";
 import ProductCard from "@/features/home/components/ProductCard";
 import { useCollectionProducts } from "@/features/collections/hooks/useCollections";
 import type { Collection } from "@/lib/types/api";
+import { Skeleton } from "@/components/ui/skeleton";

 type Props = {
  collection: Collection;
@@ -22,24 +23,19 @@ export default function CollectionSection({ collection, locale }: Props) {
    router.push(`/collections/${collection.slug}`);
  };

-  // Hide section if no products
-  if (!isLoading && (!productsData?.data || productsData.data.length === 0)) {
-    return null;
-  }
-
  if (isLoading) {
    return (
      <section className="bg-white rounded-2xl shadow-sm p-6">
        <div className="flex items-center justify-between mb-4">
-          <div className="h-8 w-48 bg-gray-200 rounded animate-pulse" />
-          <div className="h-6 w-6 bg-gray-200 rounded-full animate-pulse" />
+          <Skeleton className="h-8 w-48" />
+          <Skeleton className="h-6 w-6 rounded-full" />
        </div>
-        <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4">
-          {Array.from({ length: 5 }).map((_, i) => (
+        <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-5 gap-4">
+          {Array.from({ length: 10 }).map((_, i) => (
            <div key={i} className="space-y-2">
-              <div className="w-full h-[260px] bg-gray-200 rounded-xl animate-pulse" />
-              <div className="h-4 bg-gray-200 rounded w-3/4 animate-pulse mx-2" />
-              <div className="h-6 bg-gray-200 rounded w-1/2 animate-pulse mx-2" />
+              <Skeleton className="w-full h-[260px] rounded-xl" />
+              <Skeleton className="h-4 w-3/4 mx-2" />
+              <Skeleton className="h-6 w-1/2 mx-2" />
            </div>
          ))}
        </div>
@@ -49,6 +45,11 @@ export default function CollectionSection({ collection, locale }: Props) {

  if (isError) return null;

+  // Hide section if no products
+  if (!productsData?.data || productsData.data.length === 0) {
+    return null;
+  }
+
  const displayProducts = productsData?.data.slice(0, 10) || [];

  return (
@@ -99,4 +100,4 @@ export default function CollectionSection({ collection, locale }: Props) {
      </div>
    </section>
  );
-}
+}
--- a/features/orders/components/OrderPage.tsx
+++ b/features/orders/components/OrderPage.tsx
@@ -29,6 +29,7 @@ import { useOrders, useCancelOrder } from "@/lib/hooks";
 import { useTranslations } from "next-intl";
 import type { Order } from "@/lib/types/api";
 import EmptyOrders from "./EmptyOrders";
+import ErrorPage from "@/components/ErrorPage";
 interface OrdersPageClientProps {
  locale: string;
 }
@@ -161,30 +162,67 @@ export default function OrdersPageClient({ locale }: OrdersPageClientProps) {

  if (isLoading) {
    return (
-      <div className=" mx-auto p-4 min-h-screen">
-        <h1 className="text-3xl font-bold mb-6">{t("my_orders")}</h1>
+      <div className="mx-auto p-2 lg:p-6 md:p-4 mb-16 min-h-screen">
+        <h1 className="text-xl md:text-2xl lg:text-3xl font-bold mb-6">
+          {t("my_orders")}
+        </h1>
+
+        {/* Tabs Skeleton */}
+        <div className="mb-4 md:mb-6">
+          <div className="flex gap-2 mb-4">
+            <Skeleton className="h-10 w-32 rounded-md" />
+            <Skeleton className="h-10 w-32 rounded-md" />
+          </div>
+        </div>
+
+        {/* Order Cards Skeleton */}
        <div className="space-y-4">
-          {Array.from({ length: 4 }).map((_, i) => (
-            <Skeleton key={i} className="h-32 rounded-lg" />
+          {Array.from({ length: 3 }).map((_, i) => (
+            <Card key={i} className="overflow-hidden py-2 md:py-4 lg:py-6">
+              <div className="p-2 md:p-4 mx-2 md:mx-4 rounded-lg">
+                <div className="flex items-center justify-between">
+                  {/* Left side - Order info */}
+                  <div className="flex items-center gap-4 flex-1">
+                    <Skeleton className="h-5 w-5 rounded" />
+                    <div className="space-y-2">
+                      <Skeleton className="h-5 w-32" />
+                      <Skeleton className="h-4 w-24" />
+                    </div>
+                  </div>
+
+                  {/* Right side - Status and price */}
+                  <div className="flex items-center gap-4">
+                    <div className="flex flex-col md:flex-row gap-2 items-end">
+                      <Skeleton className="h-6 w-20 rounded-full" />
+                      <Skeleton className="h-6 w-24" />
+                    </div>
+                    <Skeleton className="h-5 w-5 rounded" />
+                  </div>
+                </div>
+              </div>
+            </Card>
          ))}
        </div>
      </div>
    );
  }

+  if (isError) {
+    return <ErrorPage />;
+  }
  if (isError || !orders || orders.length === 0) {
-    return (
-    <EmptyOrders/>
-    );
+    return <EmptyOrders />;
  }

  return (
    <div className=" mx-auto p-2 lg:p-6 md:p-4 mb-16 min-h-screen">
-      <h1 className="text-xl md:text-2xl lg:text-3xl font-bold mb-6">{t("my_orders")}</h1>
+      <h1 className="text-xl md:text-2xl lg:text-3xl font-bold mb-6">
+        {t("my_orders")}
+      </h1>

      <Tabs defaultValue="active" className="w-full">
        <TabsList className="mb-4 md:mb-6 w-full md:w-fit gap-2 p-0">
-          <TabsTrigger value="active" >
+          <TabsTrigger value="active">
            {t("active_orders")} ({activeOrders.length})
          </TabsTrigger>
          <TabsTrigger value="completed">
@@ -327,13 +365,12 @@ function CompactOrderCard({

          <div className="flex items-center gap-4">
            <div className="flex flex-col md:flex-row gap-2 items-end">
-              
-            {getStatusBadge(order.status)}
-            <div className="text-right">
-              <p className="font-bold text-lg text-green-600">
-                {total.toFixed(2)} TMT
-              </p>
-            </div>
+              {getStatusBadge(order.status)}
+              <div className="text-right">
+                <p className="font-bold text-lg text-green-600">
+                  {total.toFixed(2)} TMT
+                </p>
+              </div>
            </div>
            {isExpanded ? (
              <ChevronUp className="h-5 w-5 text-gray-400" />
--- a/features/products/components/ProductPurchaseCard.tsx
+++ b/features/products/components/ProductPurchaseCard.tsx
@@ -1,5 +1,5 @@
 import Link from "next/link";
-import { Minus, Plus, Heart, ShoppingCart, Store, Loader2 } from "lucide-react";
+import { Minus, Plus, Heart, ShoppingCart, Store } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
 import { Avatar, AvatarFallback } from "@/components/ui/avatar";
@@ -131,7 +131,7 @@ export function ProductPurchaseCard({
            >
              {isSyncing ? (
                <>
-                  <Loader2 className="mr-2 h-5 w-5 animate-spin" />
+                  
                  {t("adding")}
                </>
              ) : (
--- a/features/products/components/ReviewModal.tsx
+++ b/features/products/components/ReviewModal.tsx
@@ -1,5 +1,5 @@
 import { useState } from "react";
-import { Star, Send, Loader2 } from "lucide-react";
+import { Star, Send } from "lucide-react";
 import {
  Dialog,
  DialogContent,
@@ -107,7 +107,7 @@ export function ReviewModal({
          >
            {isSubmitting ? (
              <>
-                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                
                {t("submitting")}
              </>
            ) : (