Bugs fixed

Kahdooie
Hossein Rahmani 2024-02-03 11:16:01 +03:30
parent 2fc9cc9951
commit 7e8e3b6b9f
5 changed files with 19 additions and 10 deletions

View File

@ -127,6 +127,10 @@ export default function AdminKeysManagement() {
toast("عملیات شما با موفقیت انجام شد. ", { toast("عملیات شما با موفقیت انجام شد. ", {
className: "!bg-green-500 !text-white", className: "!bg-green-500 !text-white",
}); });
} else if (res.failed > 0) {
toast("مشکلی در تغییر کلید به وجود آمد.", {
className: "!bg-red-500 !text-white",
});
} }
if (intervalRef.current !== null) { if (intervalRef.current !== null) {
clearInterval(intervalRef.current); clearInterval(intervalRef.current);
@ -319,7 +323,9 @@ export default function AdminKeysManagement() {
<div className="w-[95vw] lg:w-[85vw] 3xl:w-[70vw] mt-8 max-sm:mt-16 pt-9 "> <div className="w-[95vw] lg:w-[85vw] 3xl:w-[70vw] mt-8 max-sm:mt-16 pt-9 ">
{polling && ( {polling && (
<div className=" w-full md:w-1/2 mx-auto mt-2"> <div className=" w-full md:w-1/2 mx-auto mt-2">
<p className=" font-bold test-sm">درحال تغییر کلید ...</p> <p className=" font-bold test-sm">
درحال تغییر کلید({Math.floor((done * 100) / total)}%) ...
</p>
<Progress className=" mt-5" value={(done * 100) / total} /> <Progress className=" mt-5" value={(done * 100) / total} />
</div> </div>
)} )}
@ -389,11 +395,11 @@ export default function AdminKeysManagement() {
render={({ field }) => ( render={({ field }) => (
<FormItem className="w-full "> <FormItem className="w-full ">
<FormLabel className="text-[#7C838A] text-sm font-medium "> <FormLabel className="text-[#7C838A] text-sm font-medium ">
کلید عمومی کلید خصوصی
</FormLabel> </FormLabel>
<FormControl> <FormControl>
<Textarea <Textarea
placeholder="کلید عمومی را وارد کنید" placeholder="کلید خصوصی را وارد نمایید."
{...field} {...field}
className="bg-white resize-none" className="bg-white resize-none"
dir="ltr" dir="ltr"

View File

@ -126,6 +126,7 @@ export default function AdminNews() {
const [imageNews, setImageNews] = useState(""); const [imageNews, setImageNews] = useState("");
const [page, setPage] = useState<any>(1); const [page, setPage] = useState<any>(1);
const [totalCount, setTotalCount] = useState<any>(0); const [totalCount, setTotalCount] = useState<any>(0);
const [totalPages, setTotalPages] = useState<any>(0);
const [keyIdDel, setKeyIdDel] = useState(""); const [keyIdDel, setKeyIdDel] = useState("");
const [openAdd, setOpenAdd] = React.useState(false); const [openAdd, setOpenAdd] = React.useState(false);
@ -333,6 +334,7 @@ export default function AdminNews() {
if (data1) { if (data1) {
const headersData = JSON.parse(data1.headers["x-pagination"]); const headersData = JSON.parse(data1.headers["x-pagination"]);
setTotalCount(headersData.TotalCount); setTotalCount(headersData.TotalCount);
setTotalPages(headersData.TotalPages);
setPage(headersData.CurrentPage); setPage(headersData.CurrentPage);
} }
}, [data1]); }, [data1]);
@ -346,7 +348,7 @@ export default function AdminNews() {
}); });
}; };
return ( return (
<div className="w-full min-h-[85vh] flex justify-center pb-4"> <div className="w-full min-h-[85vh] flex justify-center max-lg:pb-20">
<div className="w-[95vw] lg:w-[85vw] 3xl:w-[70vw] mt-8 max-sm:mt-16 pt-9 "> <div className="w-[95vw] lg:w-[85vw] 3xl:w-[70vw] mt-8 max-sm:mt-16 pt-9 ">
<div className="flex flex-row items-center justify-between w-full "> <div className="flex flex-row items-center justify-between w-full ">
{/* 1 */} {/* 1 */}
@ -789,6 +791,7 @@ export default function AdminNews() {
</AlertDialog> </AlertDialog>
{!isListLoading && ( {!isListLoading && (
<Pagination <Pagination
TotalPages={totalPages}
currentPage={page - 1} currentPage={page - 1}
PageSize={5} PageSize={5}
countPage={totalCount} countPage={totalCount}

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "sootzani", "name": "sootzani",
"version": "0.2.15", "version": "0.2.16",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "sootzani", "name": "sootzani",
"version": "0.2.15", "version": "0.2.16",
"dependencies": { "dependencies": {
"@hookform/resolvers": "^3.3.2", "@hookform/resolvers": "^3.3.2",
"@microsoft/signalr": "^8.0.0", "@microsoft/signalr": "^8.0.0",

View File

@ -1,6 +1,6 @@
{ {
"name": "sootzani", "name": "sootzani",
"version": "0.2.15", "version": "0.2.16",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

View File

@ -164,7 +164,7 @@ export async function UpdateWebContents({
// .....News................................................. // .....News.................................................
export async function GetAllNews({ export async function GetAllNews({
PageNumber = 1, PageNumber = 1,
PageSize = 6, PageSize = 4,
}: { }: {
PageNumber?: number; PageNumber?: number;
PageSize?: number; PageSize?: number;