Samandar/simple-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added pagination params page

Browse Source
This commit is contained in:
Samandar Turgunboyev
2025-11-17 13:09:24 +05:00
parent 41fe8725c7
commit 0f650ad15a
13 changed files with 544 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/pages/agencies/ui/Agencies.tsx
View File

@@ -26,16 +26,23 @@ import {
} from "lucide-react";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
import { useNavigate, useSearchParams } from "react-router-dom";
import { toast } from "sonner";
export default function TourAgenciesPage() {
const { t } = useTranslation();
const [currentPage, setCurrentPage] = useState(1);
const itemsPerPage = 4;
const [searchParams, setSearchParams] = useSearchParams();
const initialPage = Number(searchParams.get("page")) || 1;
const [currentPage, setCurrentPage] = useState(initialPage);
const itemsPerPage = 6;
const navigate = useNavigate();
const [isDialogOpen, setIsDialogOpen] = useState(false);
const updatePage = (newPage: number) => {
setCurrentPage(newPage);
setSearchParams({ page: newPage.toString() });
};
const { data, refetch, isLoading, isError } = useQuery({
queryKey: ["all_agency", currentPage],
queryFn: () => getAllAgency({ page: currentPage, page_size: itemsPerPage }),
@@ -309,37 +316,40 @@ export default function TourAgenciesPage() {
</div>
{/* Pagination */}
<div className="flex justify-end gap-2">
<div className="flex justify-end mt-10 gap-3">
<button
disabled={currentPage === 1}
onClick={() => setCurrentPage((p) => Math.max(p - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
onClick={() => updatePage(Math.max(currentPage - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronLeft className="w-5 h-5" />
</button>
{[...Array(data?.data.data.total_pages)].map((_, i) => (
{[...Array(data?.data.data.total_pages)].map((_, i) => {
const pageNum = i + 1;
return (
<button
key={i}
onClick={() => setCurrentPage(i + 1)}
className={`px-4 py-2 rounded-lg border transition-all font-medium ${
currentPage === i + 1
? "bg-gradient-to-r from-blue-600 to-cyan-600 border-blue-500 text-white shadow-lg shadow-cyan-500/50"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50 hover:border-slate-500"
onClick={() => updatePage(pageNum)}
className={`px-4 py-2 rounded-lg border font-medium transition-all ${
currentPage === pageNum
? "bg-gradient-to-r from-blue-600 to-cyan-600 text-white border-blue-500"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50"
}`}
>
{i + 1}
{pageNum}
</button>
))}
);
})}
<button
disabled={currentPage === data?.data.data.total_pages}
onClick={() =>
setCurrentPage((p) =>
Math.min(p + 1, data ? data?.data.data.total_pages : 0),
updatePage(
Math.min(currentPage + 1, data?.data.data.total_pages ?? 1),
)
}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronRight className="w-5 h-5" />
</button>

50
src/pages/employees/ui/Employees.tsx
View File

@@ -25,17 +25,26 @@ import {
} from "lucide-react";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { useSearchParams } from "react-router-dom";
import { toast } from "sonner";
const EmployeesManagement = () => {
const { t } = useTranslation();
const [currentPage, setCurrentPage] = useState(1);
const [searchParams, setSearchParams] = useSearchParams();
const initialPage = Number(searchParams.get("page")) || 1;
const [page, setPage] = useState(initialPage);
const [isDialogOpen, setIsDialogOpen] = useState(false);
const queryClient = useQueryClient();
const updatePage = (newPage: number) => {
setPage(newPage);
setSearchParams({ page: newPage.toString() });
};
const { data, isLoading } = useQuery({
queryKey: ["employees", currentPage],
queryFn: () => getAllEmployees({ page: currentPage, page_size: 10 }),
queryKey: ["employees", page],
queryFn: () => getAllEmployees({ page: page, page_size: 12 }),
select: (data) => data.data.data,
});
@@ -193,37 +202,38 @@ const EmployeesManagement = () => {
</div>
{/* Pagination */}
<div className="flex justify-end gap-2">
<div className="flex justify-end mt-10 gap-3">
<button
disabled={currentPage === 1}
onClick={() => setCurrentPage((p) => Math.max(p - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
disabled={page === 1}
onClick={() => updatePage(Math.max(page - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronLeft className="w-5 h-5" />
</button>
{[...Array(data?.total_pages || 0)].map((_, i) => (
{[...Array(data?.total_pages)].map((_, i) => {
const pageNum = i + 1;
return (
<button
key={i}
onClick={() => setCurrentPage(i + 1)}
className={`px-4 py-2 rounded-lg border transition-all font-medium ${
currentPage === i + 1
? "bg-gradient-to-r from-blue-600 to-cyan-600 border-blue-500 text-white shadow-lg shadow-cyan-500/50"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50 hover:border-slate-500"
onClick={() => updatePage(pageNum)}
className={`px-4 py-2 rounded-lg border font-medium transition-all ${
page === pageNum
? "bg-gradient-to-r from-blue-600 to-cyan-600 text-white border-blue-500"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50"
}`}
>
{i + 1}
{pageNum}
</button>
))}
);
})}
<button
disabled={currentPage === data?.total_pages}
disabled={page === data?.total_pages}
onClick={() =>
setCurrentPage((p) =>
Math.min(p + 1, data ? data?.total_pages : 0),
)
updatePage(Math.min(page + 1, data?.total_pages ?? 1))
}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronRight className="w-5 h-5" />
</button>

65
src/pages/faq/ui/Faq.tsx
View File

@@ -54,6 +54,7 @@ import {
import { useEffect, useMemo, useRef, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { useSearchParams } from "react-router-dom";
import { toast } from "sonner";
import z from "zod";
@@ -67,7 +68,10 @@ const faqForm = z.object({
const Faq = () => {
const [activeTab, setActiveTab] = useState<string>("");
const [currentPage, setCurrentPage] = useState(1);
const [searchParams, setSearchParams] = useSearchParams();
const initialPage = Number(searchParams.get("page")) || 1;
const [page, setPage] = useState(initialPage);
const { t } = useTranslation();
const [openModal, setOpenModal] = useState(false);
const [editFaq, setEditFaq] = useState<number | null>(null);
@@ -75,6 +79,11 @@ const Faq = () => {
const scrollRef = useRef<HTMLDivElement>(null);
const loaderRef = useRef<HTMLDivElement>(null);
const updatePage = (newPage: number) => {
setPage(newPage);
setSearchParams({ page: newPage.toString() });
};
// Infinite scroll uchun useInfiniteQuery
const {
data: categoryData,
@@ -96,20 +105,16 @@ const Faq = () => {
initialPageParam: 1,
});
useEffect(() => {
setCurrentPage(1);
}, [activeTab]);
const category = useMemo(() => {
return categoryData?.pages.flatMap((page) => page.data.data.results) ?? [];
}, [categoryData]);
const { data: faq } = useQuery({
queryKey: ["all_faq", activeTab, currentPage],
queryKey: ["all_faq", activeTab, page],
queryFn: () => {
return getAllFaq({
page: currentPage,
page_size: 10,
page,
page_size: 1,
category: Number(activeTab),
});
},
@@ -301,7 +306,14 @@ const Faq = () => {
</div>
{/* Tabs */}
<Tabs value={activeTab} onValueChange={setActiveTab} className="w-full">
<Tabs
value={activeTab}
onValueChange={(value) => {
setActiveTab(value);
updatePage(1);
}}
className="w-full"
>
<div className="relative">
<TabsList
ref={scrollRef}
@@ -390,35 +402,36 @@ const Faq = () => {
))}
</Tabs>
<div className="flex justify-end gap-2">
<div className="flex justify-end mt-10 gap-3">
<button
disabled={currentPage === 1}
onClick={() => setCurrentPage((p) => Math.max(p - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
disabled={page === 1}
onClick={() => updatePage(Math.max(page - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronLeft className="w-5 h-5" />
</button>
{[...Array(faq?.total_pages)].map((_, i) => (
{[...Array(faq?.total_pages)].map((_, i) => {
const pageNum = i + 1;
return (
<button
key={i}
onClick={() => setCurrentPage(i + 1)}
className={`px-4 py-2 rounded-lg border transition-all font-medium ${
currentPage === i + 1
? "bg-gradient-to-r from-blue-600 to-cyan-600 border-blue-500 text-white shadow-lg shadow-cyan-500/50"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50 hover:border-slate-500"
onClick={() => updatePage(pageNum)}
className={`px-4 py-2 rounded-lg border font-medium transition-all ${
page === pageNum
? "bg-gradient-to-r from-blue-600 to-cyan-600 text-white border-blue-500"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50"
}`}
>
{i + 1}
{pageNum}
</button>
))}
);
})}
<button
disabled={currentPage === faq?.total_pages}
onClick={() =>
setCurrentPage((p) => Math.min(p + 1, faq ? faq.total_pages : 0))
}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
disabled={page === faq?.total_pages}
onClick={() => updatePage(Math.min(page + 1, faq?.total_pages ?? 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronRight className="w-5 h-5" />
</button>

51
src/pages/faq/ui/FaqCategory.tsx
View File

@@ -45,6 +45,7 @@ import {
import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { useSearchParams } from "react-router-dom";
import { toast } from "sonner";
import z from "zod";
@@ -55,13 +56,22 @@ const categoryFormSchema = z.object({
const FaqCategory = () => {
const [deleteId, setDeleteId] = useState<number | null>(null);
const [currentPage, setCurrentPage] = useState(1);
const [searchParams, setSearchParams] = useSearchParams();
const initialPage = Number(searchParams.get("page")) || 1;
const [page, setPage] = useState(initialPage);
const [categories, setCategories] = useState<number | null>(null);
const queryClient = useQueryClient();
const updatePage = (newPage: number) => {
setPage(newPage);
setSearchParams({ page: newPage.toString() });
};
const { data: category } = useQuery({
queryKey: ["all_faqcategory", currentPage],
queryKey: ["all_faqcategory", page],
queryFn: () => {
return getAllFaqCategory({ page: currentPage, page_size: 10 });
return getAllFaqCategory({ page: page, page_size: 20 });
},
select(data) {
return data.data.data;
@@ -255,37 +265,38 @@ const FaqCategory = () => {
</Table>
</div>
<div className="flex justify-end gap-2">
<div className="flex justify-end mt-10 gap-3">
<button
disabled={currentPage === 1}
onClick={() => setCurrentPage((p) => Math.max(p - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
disabled={page === 1}
onClick={() => updatePage(Math.max(page - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronLeft className="w-5 h-5" />
</button>
{[...Array(category?.total_pages)].map((_, i) => (
{[...Array(category?.total_pages)].map((_, i) => {
const pageNum = i + 1;
return (
<button
key={i}
onClick={() => setCurrentPage(i + 1)}
className={`px-4 py-2 rounded-lg border transition-all font-medium ${
currentPage === i + 1
? "bg-gradient-to-r from-blue-600 to-cyan-600 border-blue-500 text-white shadow-lg shadow-cyan-500/50"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50 hover:border-slate-500"
onClick={() => updatePage(pageNum)}
className={`px-4 py-2 rounded-lg border font-medium transition-all ${
page === pageNum
? "bg-gradient-to-r from-blue-600 to-cyan-600 text-white border-blue-500"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50"
}`}
>
{i + 1}
{pageNum}
</button>
))}
);
})}
<button
disabled={currentPage === category?.total_pages}
disabled={page === category?.total_pages}
onClick={() =>
setCurrentPage((p) =>
Math.min(p + 1, category ? category.total_pages : 0),
)
updatePage(Math.min(page + 1, category?.total_pages ?? 1))
}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronRight className="w-5 h-5" />
</button>

37
src/pages/finance/ui/Finance.tsx
View File

@@ -40,28 +40,23 @@ export default function FinancePage({ user }: { user: Role }) {
const [searchParams, setSearchParams] = useSearchParams();
const tabParam = searchParams.get("tab") as "bookings" | "agencies" | null;
const pageParam = Number(searchParams.get("page")) || 1;
const filterParam = String(searchParams.get("filter")) || "";
const pageAgencyParam = Number(searchParams.get("page_agency")) || 1;
const [currentPage, setCurrentPage] = useState(pageParam);
const [currentPageAgency, setCurrentPageAgency] = useState(pageAgencyParam);
const [tab, setTab] = useState<"bookings" | "agencies">(
tabParam ?? "bookings",
);
const [filterStatus, setFilterStatus] = useState<
| ""
| "pending_payment"
| "pending_confirmation"
| "confirmed"
| "completed"
| "cancelled"
>("");
const [filterStatus, setFilterStatus] = useState(filterParam);
useEffect(() => {
setSearchParams({
tab,
page: String(currentPage),
page_agency: String(currentPageAgency),
filter: String(filterStatus),
});
}, [tab, currentPage, currentPageAgency, setSearchParams]);
}, [tab, currentPage, currentPageAgency, setSearchParams, filterStatus]);
useEffect(() => {
if (tabParam && tabParam !== tab) {
@@ -69,18 +64,19 @@ export default function FinancePage({ user }: { user: Role }) {
}
}, [tabParam]);
useEffect(() => {
setCurrentPage(1);
setCurrentPageAgency(1);
}, [filterStatus, tab]);
const { data, isLoading, isError, refetch } = useQuery({
queryKey: ["list_order_user", currentPage, filterStatus],
queryFn: () =>
getAllOrder({
page: currentPage,
page_size: 10,
order_status: filterStatus,
page_size: 12,
order_status: filterStatus as
| ""
| "pending_payment"
| "pending_confirmation"
| "confirmed"
| "completed"
| "cancelled",
}),
});
@@ -94,7 +90,7 @@ export default function FinancePage({ user }: { user: Role }) {
queryFn: () =>
getAllOrderAgecy({
page: currentPageAgency,
page_size: 10,
page_size: 12,
}),
});
@@ -277,7 +273,7 @@ export default function FinancePage({ user }: { user: Role }) {
? "bg-blue-600 text-white shadow-md"
: "bg-gray-800 text-gray-300 hover:bg-gray-700"
}`}
onClick={() =>
onClick={() => {
setFilterStatus(
s as
| ""
@@ -286,8 +282,9 @@ export default function FinancePage({ user }: { user: Role }) {
| "confirmed"
| "completed"
| "cancelled",
)
}
);
setCurrentPage(1);
}}
>
{s === ""
? t("Barcha bandlovlar")

52
src/pages/news/ui/News.tsx
View File

@@ -26,22 +26,31 @@ import {
} from "lucide-react";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
import { useNavigate, useSearchParams } from "react-router-dom";
import { toast } from "sonner";
const News = () => {
const [currentPage, setCurrentPage] = useState(1);
const [searchParams, setSearchParams] = useSearchParams();
const initialPage = Number(searchParams.get("page")) || 1;
const [page, setPage] = useState(initialPage);
const { t } = useTranslation();
const [deleteId, setDeleteId] = useState<number | null>(null);
const queryClient = useQueryClient();
const navigate = useNavigate();
const updatePage = (newPage: number) => {
setPage(newPage);
setSearchParams({ page: newPage.toString() });
};
const {
data: allNews,
isLoading,
isError,
} = useQuery({
queryKey: ["all_news", currentPage],
queryFn: () => getAllNews({ page: currentPage, page_size: 10 }),
queryKey: ["all_news", page],
queryFn: () => getAllNews({ page, page_size: 12 }),
});
const { mutate: deleteMutate, isPending } = useMutation({
@@ -303,37 +312,38 @@ const News = () => {
</Dialog>
{/* Pagination */}
<div className="flex justify-end gap-2 w-[90%] mx-auto mt-8">
<div className="flex justify-end mt-10 gap-3">
<button
disabled={currentPage === 1}
onClick={() => setCurrentPage((p) => Math.max(p - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
disabled={page === 1}
onClick={() => updatePage(Math.max(page - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronLeft className="w-5 h-5" />
</button>
{[...Array(allNews?.data.data.total_pages)].map((_, i) => (
{[...Array(allNews?.data.data.total_pages)].map((_, i) => {
const pageNum = i + 1;
return (
<button
key={i}
onClick={() => setCurrentPage(i + 1)}
className={`px-4 py-2 rounded-lg border transition-all font-medium ${
currentPage === i + 1
? "bg-gradient-to-r from-blue-600 to-cyan-600 border-blue-500 text-white shadow-lg shadow-cyan-500/50"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50 hover:border-slate-500"
onClick={() => updatePage(pageNum)}
className={`px-4 py-2 rounded-lg border font-medium transition-all ${
page === pageNum
? "bg-gradient-to-r from-blue-600 to-cyan-600 text-white border-blue-500"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50"
}`}
>
{i + 1}
{pageNum}
</button>
))}
);
})}
<button
disabled={currentPage === allNews?.data.data.total_pages}
disabled={page === allNews?.data.data.total_pages}
onClick={() =>
setCurrentPage((p) =>
Math.min(p + 1, allNews ? allNews?.data.data.total_pages : 0),
)
updatePage(Math.min(page + 1, allNews?.data.data.total_pages ?? 1))
}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronRight className="w-5 h-5" />
</button>

55
src/pages/payout-request/ui/PayoutRequest.tsx
View File

@@ -38,6 +38,7 @@ import {
} from "lucide-react";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { useSearchParams } from "react-router-dom";
import { toast } from "sonner";
export default function WithdrawRequests({
@@ -53,7 +54,16 @@ export default function WithdrawRequests({
| "user";
}) {
const queryClient = useQueryClient();
const [currentPage, setCurrentPage] = useState(1);
const [searchParams, setSearchParams] = useSearchParams();
const initialPage = Number(searchParams.get("page")) || 1;
const [page, setPage] = useState(initialPage);
const updatePage = (newPage: number) => {
setPage(newPage);
setSearchParams({ page: newPage.toString() });
};
const [statusFilter, setStatusFilter] = useState<
"pending" | "approved" | "cancelled" | ""
>("");
@@ -70,11 +80,11 @@ export default function WithdrawRequests({
const [closeId, setCloseId] = useState<number | null>(null);
const { data, isLoading, isError, refetch } = useQuery({
queryKey: ["withdraw-requests", currentPage, statusFilter],
queryKey: ["withdraw-requests", page, statusFilter],
queryFn: () =>
getPayoutList({
page: currentPage,
page_size: 10,
page,
page_size: 20,
status: statusFilter,
}),
});
@@ -178,7 +188,7 @@ export default function WithdrawRequests({
key={tab.value}
onClick={() => {
setStatusFilter(tab.value);
setCurrentPage(1);
updatePage(1);
}}
className={`rounded-xl px-4 py-2 font-medium transition-all ${
statusFilter === tab.value
@@ -360,37 +370,38 @@ export default function WithdrawRequests({
</Card>
{/* 🔹 PAGINATION */}
<div className="flex justify-end gap-2 mt-5">
<div className="flex justify-end mt-10 gap-3">
<button
disabled={currentPage === 1}
onClick={() => setCurrentPage((p) => Math.max(p - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
disabled={page === 1}
onClick={() => updatePage(Math.max(page - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronLeft className="w-5 h-5" />
</button>
{[...Array(data?.data.data.total_pages)].map((_, i) => (
{[...Array(data?.data.data.total_pages)].map((_, i) => {
const pageNum = i + 1;
return (
<button
key={i}
onClick={() => setCurrentPage(i + 1)}
className={`px-4 py-2 rounded-lg border transition-all font-medium ${
currentPage === i + 1
? "bg-gradient-to-r from-blue-600 to-cyan-600 border-blue-500 text-white shadow-lg shadow-cyan-500/50"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50 hover:border-slate-500"
onClick={() => updatePage(pageNum)}
className={`px-4 py-2 rounded-lg border font-medium transition-all ${
page === pageNum
? "bg-gradient-to-r from-blue-600 to-cyan-600 text-white border-blue-500"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50"
}`}
>
{i + 1}
{pageNum}
</button>
))}
);
})}
<button
disabled={currentPage === data?.data.data.total_pages}
disabled={page === data?.data.data.total_pages}
onClick={() =>
setCurrentPage((p) =>
Math.min(p + 1, data ? data?.data.data.total_pages : 0),
)
updatePage(Math.min(page + 1, data?.data.data.total_pages ?? 1))
}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronRight className="w-5 h-5" />
</button>

51
src/pages/site-banner/ui/Banner.tsx
View File

@@ -56,6 +56,7 @@ import {
import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { useSearchParams } from "react-router-dom";
import { toast } from "sonner";
import { z } from "zod";
@@ -92,15 +93,24 @@ const positions = [
];
const SiteBannerAdmin = () => {
const [currentPage, setCurrentPage] = useState(1);
const [searchParams, setSearchParams] = useSearchParams();
const initialPage = Number(searchParams.get("page")) || 1;
const [page, setPage] = useState(initialPage);
const updatePage = (newPage: number) => {
setPage(newPage);
setSearchParams({ page: newPage.toString() });
};
const {
data: banner,
isLoading,
isError,
refetch,
} = useQuery({
queryKey: ["all_banner", currentPage],
queryFn: () => getBanner({ page: currentPage, page_size: 10 }),
queryKey: ["all_banner", page],
queryFn: () => getBanner({ page, page_size: 20 }),
select(data) {
return data.data.data;
},
@@ -385,37 +395,38 @@ const SiteBannerAdmin = () => {
</Table>
</div>
<div className="flex justify-end gap-2 mt-5">
<div className="flex justify-end mt-10 gap-3">
<button
disabled={currentPage === 1}
onClick={() => setCurrentPage((p) => Math.max(p - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
disabled={page === 1}
onClick={() => updatePage(Math.max(page - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronLeft className="w-5 h-5" />
</button>
{[...Array(banner?.total_pages)].map((_, i) => (
{[...Array(banner?.total_pages)].map((_, i) => {
const pageNum = i + 1;
return (
<button
key={i}
onClick={() => setCurrentPage(i + 1)}
className={`px-4 py-2 rounded-lg border transition-all font-medium ${
currentPage === i + 1
? "bg-gradient-to-r from-blue-600 to-cyan-600 border-blue-500 text-white shadow-lg shadow-cyan-500/50"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50 hover:border-slate-500"
onClick={() => updatePage(pageNum)}
className={`px-4 py-2 rounded-lg border font-medium transition-all ${
page === pageNum
? "bg-gradient-to-r from-blue-600 to-cyan-600 text-white border-blue-500"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50"
}`}
>
{i + 1}
{pageNum}
</button>
))}
);
})}
<button
disabled={currentPage === banner?.total_pages}
disabled={page === banner?.total_pages}
onClick={() =>
setCurrentPage((p) =>
Math.min(p + 1, banner ? banner?.total_pages : 0),
)
updatePage(Math.min(page + 1, banner?.total_pages ?? 1))
}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all hover:border-slate-500"
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronRight className="w-5 h-5" />
</button>

65
src/pages/support/ui/SupportAgency.tsx
View File

@@ -15,15 +15,25 @@ import {
DialogTitle,
} from "@/shared/ui/dialog";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { AlertTriangle, Loader2, XIcon } from "lucide-react";
import {
AlertTriangle,
ChevronLeft,
ChevronRight,
Loader2,
XIcon,
} from "lucide-react";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import { Link, useSearchParams } from "react-router-dom";
import { toast } from "sonner";
const SupportAgency = () => {
const [query, setQuery] = useState("");
const queryClient = useQueryClient();
const [searchParams, setSearchParams] = useSearchParams();
const initialPage = Number(searchParams.get("page")) || 1;
const [page, setPage] = useState(initialPage);
const [openUser, setOpenUser] = useState<boolean>(false);
const [user, setUser] = useState<{
status: boolean;
@@ -38,10 +48,15 @@ const SupportAgency = () => {
const { t } = useTranslation();
const [selected, setSelected] = useState<GetSupportAgencyRes | null>(null);
const updatePage = (newPage: number) => {
setPage(newPage);
setSearchParams({ page: newPage.toString() });
};
const { data, isLoading, isError, refetch } = useQuery({
queryKey: ["support_agency"],
queryKey: ["support_agency", page],
queryFn: () =>
getSupportAgency({ page: 1, page_size: 10, search: "", status: "" }),
getSupportAgency({ page: page, page_size: 12, search: "", status: "" }),
});
const { mutate: updateTours } = useMutation({
@@ -117,7 +132,10 @@ const SupportAgency = () => {
<div className="flex gap-3 mb-6">
<input
value={query}
onChange={(e) => setQuery(e.target.value)}
onChange={(e) => {
setQuery(e.target.value);
updatePage(1);
}}
placeholder={t("Qidiruv (ism, email yoki telefon)...")}
className="flex-1 p-2 border rounded-md focus:outline-none focus:ring"
/>
@@ -188,6 +206,43 @@ const SupportAgency = () => {
</div>
)}
<div className="flex justify-end mt-10 gap-3">
<button
disabled={page === 1}
onClick={() => updatePage(Math.max(page - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronLeft className="w-5 h-5" />
</button>
{[...Array(data?.data.data.total_pages)].map((_, i) => {
const pageNum = i + 1;
return (
<button
key={i}
onClick={() => updatePage(pageNum)}
className={`px-4 py-2 rounded-lg border font-medium transition-all ${
page === pageNum
? "bg-gradient-to-r from-blue-600 to-cyan-600 text-white border-blue-500"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50"
}`}
>
{pageNum}
</button>
);
})}
<button
disabled={page === data?.data.data.total_pages}
onClick={() =>
updatePage(Math.min(page + 1, data?.data.data.total_pages ?? 1))
}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronRight className="w-5 h-5" />
</button>
</div>
{selected && (
<div
className="fixed inset-0 z-50 flex items-center justify-center bg-black/70 p-4"

4
src/pages/tours/ui/StepOne.tsx
View File

@@ -272,7 +272,7 @@ const StepOne = ({
function onSubmit(value: z.infer<typeof TourformSchema>) {
const formData = new FormData();
const tour = data ? data.data : null;
// Asosiy ma'lumotlar
formData.append("title", value.title);
formData.append("location_name", value.location_name);
@@ -315,7 +315,7 @@ const StepOne = ({
formData.append("hotel_meals_ru", value.hotel_meals_info_ru);
}
formData.append("duration_days", String(value.duration));
formData.append("rating", String("0.0"));
formData.append("rating", tour ? String(tour.rating) : "0.0");
if (value.banner instanceof File) {
formData.append("image_banner", value.banner);

44
src/pages/tours/ui/Tours.tsx
View File

@@ -37,7 +37,7 @@ import {
} from "lucide-react";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
import { useNavigate, useSearchParams } from "react-router-dom";
import { toast } from "sonner";
type Role =
@@ -51,15 +51,17 @@ type Role =
const Tours = ({ user }: { user: Role }) => {
const { t } = useTranslation();
const [page, setPage] = useState(1);
const [deleteId, setDeleteId] = useState<number | null>(null);
const [showPopularDialog, setShowPopularDialog] = useState(false);
const navigate = useNavigate();
const queryClient = useQueryClient();
const [searchParams, setSearchParams] = useSearchParams();
const initialPage = Number(searchParams.get("page")) || 1;
const [page, setPage] = useState(initialPage);
const { data, isLoading, isError, refetch } = useQuery({
queryKey: ["all_tours", page],
queryFn: () => getAllTours({ page: page, page_size: 10 }),
queryFn: () => getAllTours({ page, page_size: 10 }),
});
const { data: popularTour } = useQuery({
@@ -110,6 +112,11 @@ const Tours = ({ user }: { user: Role }) => {
setShowPopularDialog(false);
};
const updatePage = (newPage: number) => {
setPage(newPage);
setSearchParams({ page: newPage.toString() });
};
if (isLoading) {
return (
<div className="flex flex-col items-center justify-center min-h-screen bg-slate-900 text-white gap-4 w-full">
@@ -343,32 +350,35 @@ const Tours = ({ user }: { user: Role }) => {
<div className="flex justify-end mt-10 gap-3">
<button
disabled={page === 1}
onClick={() => setPage((p) => Math.max(p - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all"
onClick={() => updatePage(Math.max(page - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronLeft className="w-5 h-5" />
</button>
{[...Array(data?.data.data.total_pages)].map((_, i) => (
{[...Array(data?.data.data.total_pages)].map((_, i) => {
const pageNum = i + 1;
return (
<button
key={i}
onClick={() => setPage(i + 1)}
className={`px-4 py-2 rounded-lg border transition-all font-medium ${
page === i + 1
? "bg-gradient-to-r from-blue-600 to-cyan-600 border-blue-500 text-white shadow-lg shadow-cyan-500/50"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50 hover:border-slate-500"
onClick={() => updatePage(pageNum)}
className={`px-4 py-2 rounded-lg border font-medium transition-all ${
page === pageNum
? "bg-gradient-to-r from-blue-600 to-cyan-600 text-white border-blue-500"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50"
}`}
>
{i + 1}
{pageNum}
</button>
))}
);
})}
<button
disabled={page === data?.data.data.total_pages}
onClick={() =>
setPage((p) =>
Math.min(p + 1, data ? data.data.data.total_pages : 1),
)
updatePage(Math.min(page + 1, data?.data.data.total_pages ?? 1))
}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all"
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronRight className="w-5 h-5" />
</button>

161
src/pages/tours/ui/ToursSetting.tsx
View File

@@ -25,6 +25,39 @@ import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate, useSearchParams } from "react-router-dom";
// Error Component
const ErrorDisplay: React.FC<{ message: string; onRetry: () => void }> = ({
message,
onRetry,
}) => {
const { t } = useTranslation();
return (
<div className="flex flex-col items-center justify-center min-h-[300px] bg-slate-800/50 rounded-lg text-center text-white gap-4 p-6">
<AlertTriangle className="w-10 h-10 text-red-500" />
<p className="text-lg">{message}</p>
<Button
onClick={onRetry}
className="bg-gradient-to-r from-blue-600 to-cyan-600 text-white rounded-lg px-5 py-2 hover:opacity-90"
>
{t("Qayta urinish")}
</Button>
</div>
);
};
// Loading Component
const LoadingDisplay: React.FC<{ message?: string }> = ({ message }) => {
const { t } = useTranslation();
return (
<div className="flex flex-col items-center justify-center min-h-[300px] bg-slate-800/50 rounded-lg text-white gap-4">
<Loader2 className="w-10 h-10 animate-spin text-cyan-400" />
<p className="text-slate-400">
{message || t("Ma'lumotlar yuklanmoqda...")}
</p>
</div>
);
};
const ToursSetting: React.FC = () => {
const { t } = useTranslation();
const [searchParams] = useSearchParams();
@@ -134,61 +167,12 @@ const ToursSetting: React.FC = () => {
isError: amenitiesError,
refetch: amenitiesRef,
} = useQuery({
queryKey: ["all_amenities", page, pageSize],
queryFn: () => getAllAmenities({ page, page_size: pageSize }),
queryKey: ["all_amenities", pageAmenities, pageSizeAmenities],
queryFn: () =>
getAllAmenities({ page: pageAmenities, page_size: pageSizeAmenities }),
select: (res) => res.data.data,
});
if (
isLoading ||
tarifLoad ||
transportLoad ||
typeLoad ||
featureLoad ||
featureTypeLoad ||
amenitiesLoad
) {
return (
<div className="flex flex-col items-center justify-center min-h-screen bg-slate-900 text-white gap-4 w-full">
<Loader2 className="w-10 h-10 animate-spin text-cyan-400" />
<p className="text-slate-400">{t("Ma'lumotlar yuklanmoqda...")}</p>
</div>
);
}
if (
isError ||
tarifError ||
transportError ||
typeError ||
featureError ||
featureTypeError ||
amenitiesError
) {
return (
<div className="flex flex-col items-center justify-center min-h-screen bg-slate-900 w-full text-center text-white gap-4">
<AlertTriangle className="w-10 h-10 text-red-500" />
<p className="text-lg">
{t("Ma'lumotlarni yuklashda xatolik yuz berdi.")}
</p>
<Button
onClick={() => {
refetch();
tarifRef();
transportRef();
typeRef();
featureRef();
featureTypeRef();
amenitiesRef();
}}
className="bg-gradient-to-r from-blue-600 to-cyan-600 text-white rounded-lg px-5 py-2 hover:opacity-90"
>
{t("Qayta urinish")}
</Button>
</div>
);
}
const handleTabChange = (value: string) => {
setActiveTab(value);
navigate({
@@ -217,37 +201,95 @@ const ToursSetting: React.FC = () => {
</TabsList>
<TabsContent value="badge" className="space-y-4">
{isLoading ? (
<LoadingDisplay />
) : isError ? (
<ErrorDisplay
message={t("Belgilarni yuklashda xatolik yuz berdi.")}
onRetry={refetch}
/>
) : (
<BadgeTable data={data} page={page} pageSize={pageSize} />
)}
</TabsContent>
<TabsContent value="tarif" className="space-y-4">
{tarifLoad ? (
<LoadingDisplay />
) : tarifError ? (
<ErrorDisplay
message={t("Tariflarni yuklashda xatolik yuz berdi.")}
onRetry={tarifRef}
/>
) : (
<TarifTable
data={tarifData}
page={pageTarif}
pageSize={pageSizeTarif}
/>
)}
</TabsContent>
<TabsContent value="transport" className="space-y-4">
{transportLoad ? (
<LoadingDisplay />
) : transportError ? (
<ErrorDisplay
message={t("Transportlarni yuklashda xatolik yuz berdi.")}
onRetry={transportRef}
/>
) : (
<TransportTable
data={transportData}
page={pageTransport}
pageSize={pageSizeTransport}
/>
)}
</TabsContent>
<TabsContent value="meal" className="space-y-4">
{amenitiesLoad ? (
<LoadingDisplay />
) : amenitiesError ? (
<ErrorDisplay
message={t("Qulayliklarni yuklashda xatolik yuz berdi.")}
onRetry={amenitiesRef}
/>
) : (
<Amenities
data={amenitiesData}
page={pageAmenities}
pageSize={pageSizeAmenities}
/>
)}
</TabsContent>
<TabsContent value="hotel_type" className="space-y-4">
{typeLoad ? (
<LoadingDisplay />
) : typeError ? (
<ErrorDisplay
message={t("Otel turlarini yuklashda xatolik yuz berdi.")}
onRetry={typeRef}
/>
) : (
<MealTable
data={typeData}
page={pageTransport}
pageSize={pageSizeTransport}
page={pageType}
pageSize={pageSizeType}
/>
)}
</TabsContent>
<TabsContent value="hotel_features" className="space-y-4">
{featureLoad ? (
<LoadingDisplay />
) : featureError ? (
<ErrorDisplay
message={t("Otel sharoitlarini yuklashda xatolik yuz berdi.")}
onRetry={featureRef}
/>
) : (
<FeaturesTable
data={featureData}
page={pageFeature}
@@ -255,14 +297,25 @@ const ToursSetting: React.FC = () => {
setActiveTab={setActiveTab}
setFeatureId={setFeatureId}
/>
)}
</TabsContent>
<TabsContent value="feature_type" className="space-y-4">
{featureTypeLoad ? (
<LoadingDisplay />
) : featureTypeError ? (
<ErrorDisplay
message={t("Sharoit turlarini yuklashda xatolik yuz berdi.")}
onRetry={featureTypeRef}
/>
) : (
<FeaturesTableType
data={featureTypeData}
page={pageFeature}
featureId={featureId}
pageSize={pageSizeFeature}
/>
)}
</TabsContent>
</Tabs>
</div>

57
src/pages/users/ui/User.tsx
View File

@@ -18,20 +18,28 @@ import {
} from "lucide-react";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
import { useNavigate, useSearchParams } from "react-router-dom";
export default function UserList() {
const [searchQuery, setSearchQuery] = useState("");
const [currentPage, setCurrentPage] = useState(1);
const [searchParams, setSearchParams] = useSearchParams();
const initialPage = Number(searchParams.get("page")) || 1;
const [page, setPage] = useState(initialPage);
const usersPerPage = 6;
const { t } = useTranslation();
const navigate = useNavigate();
const updatePage = (newPage: number) => {
setPage(newPage);
setSearchParams({ page: newPage.toString() });
};
const { data, isLoading, isError, refetch } = useQuery({
queryKey: ["user_all", currentPage, searchQuery],
queryKey: ["user_all", page, searchQuery],
queryFn: () =>
getAllUsers({
page: currentPage,
page,
page_size: usersPerPage,
search: searchQuery,
}),
@@ -119,7 +127,7 @@ export default function UserList() {
value={searchQuery}
onChange={(e) => {
setSearchQuery(e.target.value);
setCurrentPage(1);
updatePage(1);
}}
className="w-full pl-14 pr-4 py-3 bg-slate-700/30 border border-slate-600/50 text-white placeholder-slate-400 rounded-xl focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all"
/>
@@ -214,41 +222,40 @@ export default function UserList() {
))}
</div>
<div className="flex justify-end gap-2">
<div className="flex justify-end mt-10 gap-3">
<button
disabled={currentPage === 1}
onClick={() => setCurrentPage((p) => Math.max(p - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all"
disabled={page === 1}
onClick={() => updatePage(Math.max(page - 1, 1))}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronLeft className="w-5 h-5" />
</button>
{[...Array(data?.data.data.total_pages)].map((_, i) => (
{[...Array(data?.data.data.total_pages)].map((_, i) => {
const pageNum = i + 1;
return (
<button
key={i}
onClick={() => setCurrentPage(i + 1)}
className={`px-4 py-2 rounded-lg border transition-all font-medium ${
currentPage === i + 1
? "bg-gradient-to-r from-blue-600 to-cyan-600 border-blue-500 text-white shadow-lg shadow-cyan-500/50"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50 hover:border-slate-500"
onClick={() => updatePage(pageNum)}
className={`px-4 py-2 rounded-lg border font-medium transition-all ${
page === pageNum
? "bg-gradient-to-r from-blue-600 to-cyan-600 text-white border-blue-500"
: "border-slate-600 text-slate-300 hover:bg-slate-700/50"
}`}
>
{i + 1}
{pageNum}
</button>
))}
);
})}
<button
disabled={
data
? currentPage === data.data.data.total_pages
: currentPage === 1
}
disabled={page === data?.data.data.total_pages}
onClick={() =>
setCurrentPage((p) =>
Math.min(p + 1, data ? data.data.data.total_pages : 1),
updatePage(
Math.min(page + 1, data?.data.data.total_pages ?? 1),
)
}
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50 disabled:cursor-not-allowed transition-all"
className="p-2 rounded-lg border border-slate-600 text-slate-300 hover:bg-slate-700/50 disabled:opacity-50"
>
<ChevronRight className="w-5 h-5" />
</button>