From 13a8f509bbd04e1c4669a1d0a15c466b9adcd37e Mon Sep 17 00:00:00 2001 From: VividTruthKeeper Date: Wed, 15 Mar 2023 16:32:48 +0500 Subject: [PATCH] calendar fixed --- src/components/aside/Calendar.tsx | 26 +++++++++++--------------- src/pages/AllPosts.tsx | 21 +++++++++++++++------ 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/components/aside/Calendar.tsx b/src/components/aside/Calendar.tsx index 7fed508..0aa9bee 100644 --- a/src/components/aside/Calendar.tsx +++ b/src/components/aside/Calendar.tsx @@ -13,29 +13,25 @@ const Calendar = () => { const valueMemo = useMemo(() => ({ value, onChange }), [value, onChange]); - const constructDateParam = useCallback(() => { - return `${value.getFullYear()}-${ - value.getDate().toString().length < 2 - ? "0" + value.getDate() - : value.getDate() + const constructDateParam = (date: Date) => { + return `${date.getFullYear()}-${ + (date.getMonth() + 1).toString().length < 2 + ? "0" + (date.getMonth() + 1) + : date.getMonth() + 1 }-${ - (value.getMonth() + 1).toString().length < 2 - ? "0" + (value.getMonth() + 1) - : value.getMonth() + 1 + date.getDate().toString().length < 2 + ? "0" + date.getDate() + : date.getDate() }`; - }, [valueMemo.value]); - - const api = new Api(url + `/posts`, [ - { name: "date", value: constructDateParam() }, - ]); + }; return (
- navigate(`/all?type=date&date=${constructDateParam()}`) + onClickDay={(date) => + navigate(`/all?type=date&date=${constructDateParam(date)}`) } />
diff --git a/src/pages/AllPosts.tsx b/src/pages/AllPosts.tsx index 3af94b2..b3b3f1f 100644 --- a/src/pages/AllPosts.tsx +++ b/src/pages/AllPosts.tsx @@ -79,7 +79,6 @@ const AllPosts = () => { api.get(data, setData); }, [params]); - console.log(pageMemo.activePage); useEffect(() => { if (language !== lastLanguage) { api.get(data, setData); @@ -106,11 +105,21 @@ const AllPosts = () => { /> ) : null} {data ? ( - + data.data.length > 0 ? ( + + ) : ( + + {language === "EN" + ? "No news for the selected date" + : language === "RU" + ? "Нет новостей для выбранной даты" + : "Saýlanan sene üçin habar ýok"} + + ) ) : ( )}