From 10fea3cf2ad541c3405d86af9f9e5ccf55f7f80f Mon Sep 17 00:00:00 2001 From: SlimusMinus Date: Tue, 18 Aug 2026 01:06:50 +0300 Subject: [PATCH] fixed start page and scroll in modal window --- src/components/AuthModal.jsx | 2 +- src/components/feed/FeedContent.jsx | 2 + src/components/landing/Navbar.jsx | 7 +++ src/hooks/useFeedActions.jsx | 45 ++++++++++++++--- src/locales/en.json | 4 +- src/locales/ru.json | 4 +- src/pages/CreateUpdatePost.jsx | 2 +- src/pages/MainFeed.jsx | 16 ++++-- src/pages/PostOnFeed.jsx | 17 ++----- src/pages/ReviewsPage.jsx | 2 +- src/{components => pages}/RulesModal.jsx | 10 +++- src/styles/NakhodkaLanding.css | 62 +++++++++++++----------- src/styles/card.css | 15 +++--- src/styles/chat.css | 6 +++ src/styles/layout.css | 2 +- src/styles/modal.css | 13 ++++- src/styles/reviews.css | 1 + 17 files changed, 142 insertions(+), 68 deletions(-) rename src/{components => pages}/RulesModal.jsx (97%) diff --git a/src/components/AuthModal.jsx b/src/components/AuthModal.jsx index cecb76f..cf747d0 100644 --- a/src/components/AuthModal.jsx +++ b/src/components/AuthModal.jsx @@ -15,7 +15,7 @@ export default function AuthModal({ onClose }) { const { login: saveAuth } = useAuthContext(); return ( -
e.target === e.currentTarget && onClose()}> +
e.target === e.currentTarget && onClose()}>
diff --git a/src/components/feed/FeedContent.jsx b/src/components/feed/FeedContent.jsx index 8d85705..67e0a9d 100644 --- a/src/components/feed/FeedContent.jsx +++ b/src/components/feed/FeedContent.jsx @@ -8,6 +8,7 @@ export default function FeedContent({ filteredAds, activeNav, liked, + likeCountAdj, onLike, onEdit, onDelete, @@ -58,6 +59,7 @@ export default function FeedContent({ key={ad.id} ad={ad} liked={liked.has(ad.id)} + likeCountAdj={likeCountAdj[ad.id] || 0} onLike={onLike} onEdit={activeNav === "myads" ? onEdit : undefined} onDelete={activeNav === "myads" ? onDelete : undefined} diff --git a/src/components/landing/Navbar.jsx b/src/components/landing/Navbar.jsx index f64bde6..944b31a 100644 --- a/src/components/landing/Navbar.jsx +++ b/src/components/landing/Navbar.jsx @@ -1,16 +1,23 @@ import { useTranslation } from 'react-i18next'; import GlobeIcon from "../icons/GlobeIcon"; +import MoonIcon from "../icons/MoonIcon"; +import SunIcon from "../icons/SunIcon"; import { useLanguageToggle } from "../../hooks/useLanguageToggle"; +import { useTheme } from "../../context/ThemeContext"; export default function Navbar({ onLoginClick }) { const { t } = useTranslation(); const { language, toggleLanguage } = useLanguageToggle(); + const { theme, toggle: toggleTheme } = useTheme(); return (