From 3801739778ef90840924295b380397eca1659ec8 Mon Sep 17 00:00:00 2001 From: OkaykOrhmn Date: Sat, 22 Feb 2025 16:50:19 +0330 Subject: [PATCH] fix categories. --- lib/core/services/api/api_service.dart | 2 +- lib/data/repositories/category_repository.dart | 8 +++++--- lib/presentation/ui/screens/home/screens/home_screen.dart | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/core/services/api/api_service.dart b/lib/core/services/api/api_service.dart index 782928a..94af093 100644 --- a/lib/core/services/api/api_service.dart +++ b/lib/core/services/api/api_service.dart @@ -28,7 +28,7 @@ class ApiService { enabled: kDebugMode, )); setAuthToken( - 'eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJheC1zX3N3Tm5fU1hDTVkzWFowSDVKekNhQ0psVXh6bmZ0WHBxSk1YUEF3In0.eyJleHAiOjE3NDAwNjQ5NDcsImlhdCI6MTc0MDAyODk0NywianRpIjoiNDVhYTQ0YWItYTEyMC00N2M3LWIyMWUtNjExNDllMWZlM2EyIiwiaXNzIjoiaHR0cHM6Ly9rZXljbG9hay5saWFyYS5ydW4vcmVhbG1zL2xiYSIsImF1ZCI6ImFjY291bnQiLCJzdWIiOiJmMzljODIxNi0zODhhLTQ0ZTEtODVhOC00Zjk5NmU2NmU2MDQiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJmcm9udGVuZCIsInNpZCI6ImEwNjUwMmU3LTY4MzItNDVhNC04MmUwLTdhZWI4ODBlZTc5ZiIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiaHR0cHM6Ly9sYmEtYXBpLmxpYXJhLnJ1bi8qIiwiaHR0cDovL2xvY2FsaG9zdDozMDAwLyoiLCIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1sYmEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19LCJmcm9udGVuZCI6eyJyb2xlcyI6WyJzaG9wIiwidXNlciJdfX0sInNjb3BlIjoib3BlbmlkIGVtYWlsIHByb2ZpbGUiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwibmFtZSI6ImRlbW8gZGVtbyIsInByZWZlcnJlZF91c2VybmFtZSI6ImRlbW8iLCJnaXZlbl9uYW1lIjoiZGVtbyIsImZhbWlseV9uYW1lIjoiZGVtbyIsImVtYWlsIjoiZGVtb0BnbWFpbC5jb20ifQ.iwAMzwyuQu9BkNXA65u8XfZIYoGtGvQ99qpCwTCPLDfe2DFZU_1wcOu5TV_7My80UHifzLR587CPGH1xwlJmD1JFtrEh0wk_sBe0iYKOmiz7OhFCLUNAuLkV5dvwYPfqyzPFYQPe8F0QdnK9107pF-15uyjn8w1MLfSE4uCRtc8Arh43WeZqoYALlLkHvQgltxvuBE_FXt_AulIBzmrhwDhA_Aw7gS4J05mGAkMAAX1B4mXxB-OCBN-ZPFEAU14YPQPHAjUdKtJ1scC4VYworjaEA3kkx_gYWdfi-o_3YykDlaE6fxOm4yQnFzg2DjJhE_7i8Lsjchc3GrBNzt4UeQ'); + 'eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJheC1zX3N3Tm5fU1hDTVkzWFowSDVKekNhQ0psVXh6bmZ0WHBxSk1YUEF3In0.eyJleHAiOjE3NDAyMzg4NzQsImlhdCI6MTc0MDIwMjg3NCwianRpIjoiYjljZTBkZDUtMGJmMy00YWIyLWIxODktNTQyNmZjZWFkODc0IiwiaXNzIjoiaHR0cHM6Ly9rZXljbG9hay5saWFyYS5ydW4vcmVhbG1zL2xiYSIsImF1ZCI6ImFjY291bnQiLCJzdWIiOiJmMzljODIxNi0zODhhLTQ0ZTEtODVhOC00Zjk5NmU2NmU2MDQiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJmcm9udGVuZCIsInNpZCI6IjA5NGNjNmI5LWUwYWMtNDk5Zi04ZGYyLTA5NjkyY2M4YTFiMiIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiaHR0cHM6Ly9sYmEtYXBpLmxpYXJhLnJ1bi8qIiwiaHR0cDovL2xvY2FsaG9zdDozMDAwLyoiLCIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1sYmEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19LCJmcm9udGVuZCI6eyJyb2xlcyI6WyJzaG9wIiwidXNlciJdfX0sInNjb3BlIjoib3BlbmlkIGVtYWlsIHByb2ZpbGUiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwibmFtZSI6ImRlbW8gZGVtbyIsInByZWZlcnJlZF91c2VybmFtZSI6ImRlbW8iLCJnaXZlbl9uYW1lIjoiZGVtbyIsImZhbWlseV9uYW1lIjoiZGVtbyIsImVtYWlsIjoiZGVtb0BnbWFpbC5jb20ifQ.Z25daqvbCQ-g2wp_geuKilZlx6YhBkJVs4IeS2P-R89WIuDcxu0BiJJkiqolO7H1iirEo_r2P3-RkrzDBRBRPFmLIlxJCR_D_sr7e6qanudqtVkRrSxQPykcRDlRqKZkfyB4pSe8nfimlpt0XCsiXSEC-rOUWVctOoibYWiCcRrMq9TD5SZ0HUuZoC0tiRAAQ1PtgwwHG0anqTbSdtHV9H1RpfhCuz34fbWFm8g9fOPM2wrVkhjnBg8wx0ein_NAj8vbj18NVzn46b9EoIS5r7njH7hPIjx-VWQ2fnlogzVw7Odv6cSf8IlEf93hxHBDYs9PsAu3oPsQ1HP_CGcR1g'); } /// 🔹 Handle GET requests diff --git a/lib/data/repositories/category_repository.dart b/lib/data/repositories/category_repository.dart index d92fe5f..90378ea 100644 --- a/lib/data/repositories/category_repository.dart +++ b/lib/data/repositories/category_repository.dart @@ -7,7 +7,9 @@ class CategoryRepository { static Future>> fetchAll( {int page = 1}) async { try { - var response = await apiService.get('${ApiRoutes.category}?page=$page'); + var response = await apiService.get(ApiRoutes.category, params: { + 'page': page, + }); final res = ResponseModel>.fromJson( response, (data) { @@ -26,8 +28,8 @@ class CategoryRepository { static Future>> fetchAllChild( {int page = 1, required final String id}) async { try { - var response = await apiService - .get('${ApiRoutes.category}?page=$page?filter.parent_id=$id'); + var response = await apiService.get(ApiRoutes.category, + params: {'page': page, 'filter.parent_id': id}); final res = ResponseModel>.fromJson( response, (data) { diff --git a/lib/presentation/ui/screens/home/screens/home_screen.dart b/lib/presentation/ui/screens/home/screens/home_screen.dart index 628018a..50434e8 100644 --- a/lib/presentation/ui/screens/home/screens/home_screen.dart +++ b/lib/presentation/ui/screens/home/screens/home_screen.dart @@ -184,6 +184,7 @@ class _HomeScreenState extends State { ), body: RefreshIndicator( onRefresh: () async { + context.read().resetPagination(); context.read().getAllCategories(); }, child: SingleChildScrollView( @@ -648,7 +649,7 @@ class _HomeScreenState extends State { CircularProgressIndicator(), errorBuilder: (context, error, stackTrace) => - Icon(Icons.error), + Icon(Icons.category), ), if (!Responsive(context).isMobile()) ...[ 8.w,