refactor(application): restore RSC root layout, add server-side data fetching, and use granular Zustand selectors
Deploy Canina / deploy (push) Failing after 28s

This commit is contained in:
parsa committed 2026-08-06 22:55:54 +03:30
1 parent 102494cef0
commit 9c334c39ae
5 files changed
+63 -21

No files matched your search

+17 -10
View File
@@ -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}
/>
<AuthModal
isOpen={useUserStore(state => state.isAuthModalOpen)}
onClose={() => useUserStore.getState().setAuthModalOpen(false)}
isOpen={isAuthModalOpen}
onClose={() => setAuthModalOpen(false)}
/>
<Toaster position="top-center" expand={true} richColors closeButton />
</>
+13 -7
View File
@@ -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<any>(null);
interface HomeClientProps {
initialData?: any;
}
export default function HomeClient({ initialData }: HomeClientProps) {
const getText = useSettingsStore((state) => state.getText);
const [data, setData] = useState<any>(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 || [];
+3 -1
View File
@@ -68,12 +68,14 @@ export default function RootLayout({
}
};
const safeJsonLd = JSON.stringify(jsonLd).replace(/</g, '\\u003c');
return (
<html lang="fa" dir="rtl" suppressHydrationWarning>
<body className="min-h-screen bg-medical-gray-50 font-sans" suppressHydrationWarning>
<script
type="application/ld+json"
dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
dangerouslySetInnerHTML={{ __html: safeJsonLd }}
/>
<ClientLayout>
{children}
+29 -2
View File
@@ -25,6 +25,33 @@ export const metadata: Metadata = {
}
};
export default function Home() {
return <HomeClient />;
interface HomeData {
heroBanners?: any[];
vetTestimonials?: any[];
smartAdvisorRules?: any[];
[key: string]: any;
}
async function getHomeData(): Promise<HomeData | null> {
try {
const apiUrl = process.env.INTERNAL_API_URL || process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4001/api';
const res = await fetch(`${apiUrl}/home`, {
next: { revalidate: 3600, tags: ['home-data'] },
});
if (!res.ok) {
console.error(`Failed to fetch home data: ${res.status} ${res.statusText}`);
return null;
}
return await res.json();
} catch (error) {
console.error('Error fetching home data on server:', error);
return null;
}
}
export default async function Home() {
const initialData = await getHomeData();
return <HomeClient initialData={initialData} />;
}
+1 -1
View File
@@ -30,5 +30,5 @@
".next/dev/types/**/*.ts",
"**/*.mts"
],
"exclude": ["node_modules", "**/__tests__/**"]
"exclude": ["node_modules", "**/__tests__/**", "vitest.config.ts", "vitest.setup.ts"]
}