@djangocfg/layouts 2.1.46 → 2.1.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djangocfg/layouts",
-  "version": "2.1.46",
+  "version": "2.1.47",
   "description": "Simple, straightforward layout components for Next.js - import and use with props",
   "keywords": [
     "layouts",
@@ -92,9 +92,9 @@
     "check": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@djangocfg/api": "^2.1.46",
-    "@djangocfg/centrifugo": "^2.1.46",
-    "@djangocfg/ui-nextjs": "^2.1.46",
+    "@djangocfg/api": "^2.1.47",
+    "@djangocfg/centrifugo": "^2.1.47",
+    "@djangocfg/ui-nextjs": "^2.1.47",
     "@hookform/resolvers": "^5.2.0",
     "consola": "^3.4.2",
     "lucide-react": "^0.545.0",
@@ -115,7 +115,7 @@
     "uuid": "^11.1.0"
   },
   "devDependencies": {
-    "@djangocfg/typescript-config": "^2.1.46",
+    "@djangocfg/typescript-config": "^2.1.47",
     "@types/node": "^24.7.2",
     "@types/react": "^19.1.0",
     "@types/react-dom": "^19.1.0",

package/src/layouts/PrivateLayout/PrivateLayout.tsx

@@ -46,11 +46,12 @@
 
 'use client';
 
-import React, { ReactNode } from 'react';
+import React, { ReactNode, useEffect, useState } from 'react';
+import { useRouter } from 'next/navigation';
 
 import { useAuth } from '@djangocfg/api/auth';
 import {
-    ButtonLink, Preloader, SidebarInset, SidebarProvider
+    Preloader, SidebarInset, SidebarProvider
 } from '@djangocfg/ui-nextjs/components';
 
 import { UserMenuConfig } from '../types';
@@ -93,15 +94,29 @@ export function PrivateLayout({
   header,
   contentPadding = 'default',
 }: PrivateLayoutProps) {
-  const { isAuthenticated, isLoading } = useAuth();
+  const { isAuthenticated, isLoading, saveRedirectUrl } = useAuth();
+  const router = useRouter();
+  const [isRedirecting, setIsRedirecting] = useState(false);
 
-  // Show loading state while auth is being checked
+  useEffect(() => {
+    if (!isLoading && !isAuthenticated && !isRedirecting) {
+      // Save current URL (including query params) before redirecting to auth
+      const currentUrl = window.location.pathname + window.location.search;
+      saveRedirectUrl(currentUrl);
+
+      // Set redirecting state to prevent flicker
+      setIsRedirecting(true);
+      router.push(header?.authPath || '/auth');
+    }
+  }, [isAuthenticated, isLoading, isRedirecting, router, saveRedirectUrl, header?.authPath]);
+
+  // Show loading state while auth is being checked or redirecting
   // Note: SSR hydration is handled by ClientOnly wrapper in AppLayout
-  if (isLoading) {
+  if (isLoading || isRedirecting || !isAuthenticated) {
     return (
       <Preloader
         variant="fullscreen"
-        text="Authenticating..."
+        text={isRedirecting ? "Redirecting to login..." : "Authenticating..."}
         size="lg"
         backdrop={true}
         backdropOpacity={80}
@@ -109,26 +124,6 @@ export function PrivateLayout({
     );
   }
 
-  // Don't render if user is not authenticated
-  if (!isAuthenticated) {
-    return (
-      <div className="flex flex-col items-center justify-center min-h-screen gap-4">
-        <h3 className="text-2xl font-bold">
-          Not Authenticated
-        </h3>
-        <p className="text-muted-foreground">
-          Please log in to continue.
-        </p>
-        <ButtonLink
-          variant="outline"
-          href="/auth"
-        >
-          Login
-        </ButtonLink>
-      </div>
-    );
-  }
-
   return (
     <SidebarProvider defaultOpen={true}>
       {/* Sidebar */}