From 9c334c39ae814fa30e6e231b0619f221768731c4 Mon Sep 17 00:00:00 2001 From: parsaaghayi Date: Thu, 6 Aug 2026 22:55:54 +0330 Subject: [PATCH] refactor(application): restore RSC root layout, add server-side data fetching, and use granular Zustand selectors --- frontend/application/app/ClientLayout.tsx | 27 ++++++++++++-------- frontend/application/app/HomeClient.tsx | 20 ++++++++++----- frontend/application/app/layout.tsx | 4 ++- frontend/application/app/page.tsx | 31 +++++++++++++++++++++-- frontend/application/tsconfig.json | 2 +- 5 files changed, 63 insertions(+), 21 deletions(-) diff --git a/frontend/application/app/ClientLayout.tsx b/frontend/application/app/ClientLayout.tsx index 67b8e4d0..2c1519b1 100644 --- a/frontend/application/app/ClientLayout.tsx +++ b/frontend/application/app/ClientLayout.tsx @@ -18,18 +18,25 @@ import { useUIStore } from "../lib/store/uiStore"; import MaintenancePage from "../components/MaintenancePage"; export default function ClientLayout({ children }: { children: React.ReactNode }) { - const { - isCartOpen, isLoginModalOpen, isB2BPortalOpen, advisorData, - setCartOpen, setLoginModalOpen, setB2BPortalOpen, clearAdvisorData - } = useUIStore(); + const isCartOpen = useUIStore((state) => state.isCartOpen); + const isLoginModalOpen = useUIStore((state) => state.isLoginModalOpen); + const isB2BPortalOpen = useUIStore((state) => state.isB2BPortalOpen); + const advisorData = useUIStore((state) => state.advisorData); + const setCartOpen = useUIStore((state) => state.setCartOpen); + const setLoginModalOpen = useUIStore((state) => state.setLoginModalOpen); + const setB2BPortalOpen = useUIStore((state) => state.setB2BPortalOpen); + const clearAdvisorData = useUIStore((state) => state.clearAdvisorData); const pathname = usePathname(); const router = useRouter(); - const { fetchProfile, role } = useUserStore(); - const fetchSettings = useSettingsStore(state => state.fetchSettings); - const getText = useSettingsStore(state => state.getText); - const isInitialized = useSettingsStore(state => state.isInitialized); + const fetchProfile = useUserStore((state) => state.fetchProfile); + const role = useUserStore((state) => state.role); + const isAuthModalOpen = useUserStore((state) => state.isAuthModalOpen); + const setAuthModalOpen = useUserStore((state) => state.setAuthModalOpen); + + const fetchSettings = useSettingsStore((state) => state.fetchSettings); + const getText = useSettingsStore((state) => state.getText); useEffect(() => { fetchSettings(); @@ -117,8 +124,8 @@ export default function ClientLayout({ children }: { children: React.ReactNode } isAdvisorContext={!!advisorData} /> state.isAuthModalOpen)} - onClose={() => useUserStore.getState().setAuthModalOpen(false)} + isOpen={isAuthModalOpen} + onClose={() => setAuthModalOpen(false)} /> diff --git a/frontend/application/app/HomeClient.tsx b/frontend/application/app/HomeClient.tsx index aec91bba..1d6cbee8 100644 --- a/frontend/application/app/HomeClient.tsx +++ b/frontend/application/app/HomeClient.tsx @@ -11,15 +11,21 @@ import { useSettingsStore } from "../lib/store/settingsStore"; import api from "../lib/services/api"; import Image from "next/image"; -export default function HomeClient() { - const getText = useSettingsStore(state => state.getText); - const [data, setData] = useState(null); +interface HomeClientProps { + initialData?: any; +} + +export default function HomeClient({ initialData }: HomeClientProps) { + const getText = useSettingsStore((state) => state.getText); + const [data, setData] = useState(initialData || null); useEffect(() => { - api.get('/home') - .then(res => setData(res.data)) - .catch(err => console.error('Home data fetch error:', err)); - }, []); + if (!initialData) { + api.get('/home') + .then(res => setData(res.data)) + .catch(err => console.error('Home data fetch error:', err)); + } + }, [initialData]); const banners = data?.heroBanners || []; const testimonials = data?.vetTestimonials || []; diff --git a/frontend/application/app/layout.tsx b/frontend/application/app/layout.tsx index 10575993..7424f248 100644 --- a/frontend/application/app/layout.tsx +++ b/frontend/application/app/layout.tsx @@ -68,12 +68,14 @@ export default function RootLayout({ } }; + const safeJsonLd = JSON.stringify(jsonLd).replace(/