django-cfg 1.4.91__py3-none-any.whl → 1.4.93__py3-none-any.whl

django_cfg/__init__.py

@@ -32,7 +32,7 @@ Example:
 default_app_config = "django_cfg.apps.DjangoCfgConfig"
 
 # Version information
-__version__ = "1.4.91"
+__version__ = "1.4.93"
 __license__ = "MIT"
 
 # Import registry for organized lazy loading

django_cfg/apps/frontend/views.py

@@ -4,14 +4,17 @@ JWT tokens are automatically injected into HTML responses for authenticated user
 This is specific to Next.js frontend apps only.
 
 Features:
-- Automatic extraction of ZIP archives on first request
+- Automatic extraction of ZIP archives with smart update detection
+- Auto-reextraction when ZIP is modified within last 5 minutes
 - SPA routing with fallback strategies
 - JWT token injection for authenticated users
 """
 
 import logging
 import zipfile
+import shutil
 from pathlib import Path
+from datetime import datetime, timedelta
 from django.http import Http404, HttpResponse, FileResponse
 from django.views.static import serve
 from django.views import View
@@ -23,19 +26,105 @@ from rest_framework_simplejwt.tokens import RefreshToken
 logger = logging.getLogger(__name__)
 
 
+class ZipExtractionMixin:
+    """
+    Mixin for automatic ZIP extraction with smart update detection.
+
+    Provides intelligent ZIP archive handling:
+    - Auto-extraction when directory doesn't exist
+    - Auto-reextraction when ZIP is modified < 5 minutes ago
+    - Timestamp comparison to avoid unnecessary extractions
+
+    Usage:
+        class MyView(ZipExtractionMixin, View):
+            app_name = 'myapp'  # Will look for myapp.zip
+    """
+
+    def extract_zip_if_needed(self, base_dir: Path, zip_path: Path, app_name: str) -> bool:
+        """
+        Extract ZIP archive if needed based on modification times.
+
+        Args:
+            base_dir: Target directory for extraction
+            zip_path: Path to ZIP archive
+            app_name: Name of the app (for logging)
+
+        Returns:
+            bool: True if extraction succeeded or not needed, False if failed
+        """
+        should_extract = False
+
+        # Priority 1: If directory doesn't exist at all - always extract
+        if not base_dir.exists():
+            should_extract = True
+            logger.info(f"[{app_name}] Directory {base_dir} doesn't exist, will extract")
+
+        # Priority 2: Directory exists - check if ZIP is fresh and needs update
+        elif zip_path.exists():
+            # Get ZIP modification time
+            zip_mtime = datetime.fromtimestamp(zip_path.stat().st_mtime)
+            time_since_modification = (datetime.now() - zip_mtime).total_seconds()
+
+            # If ZIP was modified less than 5 minutes ago - check for updates
+            if time_since_modification < 300:  # 5 minutes = 300 seconds
+                # Compare ZIP time with directory time
+                dir_mtime = datetime.fromtimestamp(base_dir.stat().st_mtime)
+
+                # If ZIP is newer than directory, re-extract
+                if zip_mtime > dir_mtime:
+                    logger.info(f"[{app_name}] ZIP is fresh ({time_since_modification:.0f}s) and newer, re-extracting")
+                    try:
+                        shutil.rmtree(base_dir)
+                        should_extract = True
+                    except Exception as e:
+                        logger.error(f"[{app_name}] Failed to remove old directory: {e}")
+                        return False
+                else:
+                    logger.debug(f"[{app_name}] ZIP is fresh but directory is up-to-date")
+            else:
+                # ZIP is old (> 5 min) - use existing directory, no checks needed
+                logger.debug(f"[{app_name}] ZIP is old ({time_since_modification:.0f}s), using existing")
+
+        # Extract ZIP if needed
+        if should_extract:
+            if zip_path.exists():
+                logger.info(f"[{app_name}] Extracting {zip_path.name} to {base_dir}...")
+                try:
+                    base_dir.parent.mkdir(parents=True, exist_ok=True)
+                    with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+                        zip_ref.extractall(base_dir)
+                    logger.info(f"[{app_name}] Successfully extracted {zip_path.name}")
+                    return True
+                except Exception as e:
+                    logger.error(f"[{app_name}] Failed to extract: {e}")
+                    return False
+            else:
+                logger.error(f"[{app_name}] ZIP not found: {zip_path}")
+                return False
+
+        # Directory exists and is up-to-date
+        return True
+
+
 @method_decorator(xframe_options_exempt, name='dispatch')
-class NextJSStaticView(View):
+class NextJSStaticView(ZipExtractionMixin, View):
     """
     Serve Next.js static build files with automatic JWT token injection.
 
     Features:
     - Serves Next.js static export files like a static file server
+    - Smart ZIP extraction: auto-updates when archive modified < 5 minutes ago
     - Automatically injects JWT tokens for authenticated users
     - Tokens injected into HTML responses only
     - Handles Next.js client-side routing (.html fallback)
     - Automatically serves index.html for directory paths
     - X-Frame-Options exempt to allow embedding in iframes
 
+    ZIP Update Logic:
+    - If ZIP modified < 5 minutes ago: removes old files and re-extracts
+    - If ZIP modified > 5 minutes ago: uses existing extraction
+    - This enables hot-reload during development while staying fast in production
+
     Path resolution examples:
     - /cfg/admin/              → /cfg/admin/index.html
     - /cfg/admin/private/      → /cfg/admin/private/index.html (if exists)
@@ -51,22 +140,16 @@ class NextJSStaticView(View):
         import django_cfg
 
         base_dir = Path(django_cfg.__file__).parent / 'static' / 'frontend' / self.app_name
+        zip_path = Path(django_cfg.__file__).parent / 'static' / 'frontend' / f'{self.app_name}.zip'
 
-        # Check if ZIP archive exists and extract if needed
+        # Extract ZIP if needed using mixin
+        if not self.extract_zip_if_needed(base_dir, zip_path, self.app_name):
+            return render(request, 'frontend/404.html', status=404)
+
+        # Ensure directory exists
         if not base_dir.exists():
-            zip_path = Path(django_cfg.__file__).parent / 'static' / 'frontend' / f'{self.app_name}.zip'
-            if zip_path.exists():
-                logger.info(f"Extracting {self.app_name}.zip to {base_dir}...")
-                try:
-                    base_dir.parent.mkdir(parents=True, exist_ok=True)
-                    with zipfile.ZipFile(zip_path, 'r') as zip_ref:
-                        zip_ref.extractall(base_dir)
-                    logger.info(f"Successfully extracted {self.app_name}.zip")
-                except Exception as e:
-                    logger.error(f"Failed to extract {self.app_name}.zip: {e}")
-                    return render(request, 'frontend/404.html', status=404)
-            else:
-                return render(request, 'frontend/404.html', status=404)
+            logger.error(f"[{self.app_name}] Directory doesn't exist after extraction attempt")
+            return render(request, 'frontend/404.html', status=404)
 
         original_path = path  # Store for logging
 

django_cfg/modules/django_client/management/commands/generate_client.py

@@ -571,13 +571,19 @@ class Command(BaseCommand):
 
             self.stdout.write(f"\n📦 Copying TypeScript clients to Next.js admin...")
 
-            # Copy each group
+            # Copy each group (exclude 'cfg' for Next.js admin)
             copied_count = 0
             for group_dir in ts_source.iterdir():
                 if not group_dir.is_dir():
                     continue
 
                 group_name = group_dir.name
+
+                # Skip 'cfg' group for Next.js admin
+                if group_name == 'cfg':
+                    self.stdout.write(f"  ⏭️  Skipping 'cfg' group (excluded from Next.js admin)")
+                    continue
+
                 target_dir = api_output_path / group_name
 
                 # Remove old

django_cfg/modules/django_unfold/navigation.py

@@ -48,7 +48,6 @@ class NavigationManager(BaseCfgModule):
                 collapsible=True,
                 items=[
                     NavigationItem(title="Overview", icon=Icons.DASHBOARD, link=str(reverse_lazy("admin:index"))),
-                    NavigationItem(title="Frontend Admin", icon=Icons.WEB_ASSET, link="/cfg/admin/"),
                     NavigationItem(title="Settings", icon=Icons.SETTINGS, link=str(reverse_lazy("admin:constance_config_changelist"))),
                     NavigationItem(title="Health Check", icon=Icons.HEALTH_AND_SAFETY, link=str(reverse_lazy("django_cfg_drf_health"))),
                     NavigationItem(title="Endpoints Status", icon=Icons.API, link=str(reverse_lazy("endpoints_status_drf"))),

django_cfg/modules/nextjs_admin/views.py

@@ -2,6 +2,12 @@
 Views for Next.js admin integration.
 
 Serves Next.js static files with SPA routing support and JWT injection.
+
+Features:
+- Automatic extraction of ZIP archives with smart update detection
+- Auto-reextraction when ZIP is modified within last 5 minutes
+- SPA routing with fallback strategies
+- JWT token injection for authenticated users
 """
 
 import logging
@@ -13,12 +19,13 @@ from django.views.decorators.clickjacking import xframe_options_exempt
 from django.utils.decorators import method_decorator
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.shortcuts import render
+from django_cfg.apps.frontend.views import ZipExtractionMixin
 
 logger = logging.getLogger(__name__)
 
 
 @method_decorator(xframe_options_exempt, name='dispatch')
-class NextJsAdminView(LoginRequiredMixin, View):
+class NextJsAdminView(ZipExtractionMixin, LoginRequiredMixin, View):
     """
     Serve Next.js admin panel with JWT injection and SPA routing.
 
@@ -38,7 +45,6 @@ class NextJsAdminView(LoginRequiredMixin, View):
         """Serve Next.js files with JWT injection and SPA routing."""
         from django_cfg.core.config import get_current_config
         import django_cfg
-        import zipfile
 
         config = get_current_config()
         if not config or not config.nextjs_admin:
@@ -48,33 +54,24 @@ class NextJsAdminView(LoginRequiredMixin, View):
 
         # Use extracted directory from static/frontend/nextjs_admin/
         base_dir = Path(django_cfg.__file__).parent / 'static' / 'frontend' / 'nextjs_admin'
+        zip_path = Path(django_cfg.__file__).parent / 'static' / 'frontend' / 'nextjs_admin.zip'
+
+        # Fallback: Try solution project static directory
+        if not zip_path.exists():
+            from django.conf import settings
+            solution_zip = Path(settings.BASE_DIR) / 'static' / 'nextjs_admin.zip'
+            if solution_zip.exists():
+                zip_path = solution_zip
+                logger.info(f"[nextjs_admin] Using ZIP from solution project: {solution_zip}")
 
-        # Check if ZIP archive exists and extract if needed
+        # Extract ZIP if needed using mixin
+        if not self.extract_zip_if_needed(base_dir, zip_path, 'nextjs_admin'):
+            return render(request, 'frontend/404.html', status=404)
+
+        # Ensure directory exists
         if not base_dir.exists():
-            # Try django_cfg package location first
-            zip_path = Path(django_cfg.__file__).parent / 'static' / 'frontend' / 'nextjs_admin.zip'
-
-            # Fallback: Try solution project static directory
-            if not zip_path.exists():
-                from django.conf import settings
-                solution_zip = Path(settings.BASE_DIR) / 'static' / 'nextjs_admin.zip'
-                if solution_zip.exists():
-                    zip_path = solution_zip
-                    logger.info(f"Using ZIP from solution project: {solution_zip}")
-
-            if zip_path.exists():
-                logger.info(f"Extracting nextjs_admin.zip to {base_dir}...")
-                try:
-                    base_dir.parent.mkdir(parents=True, exist_ok=True)
-                    with zipfile.ZipFile(zip_path, 'r') as zip_ref:
-                        zip_ref.extractall(base_dir)
-                    logger.info(f"Successfully extracted nextjs_admin.zip from {zip_path}")
-                except Exception as e:
-                    logger.error(f"Failed to extract nextjs_admin.zip: {e}")
-                    return render(request, 'frontend/404.html', status=404)
-            else:
-                logger.error(f"nextjs_admin.zip not found in django_cfg or solution project")
-                return render(request, 'frontend/404.html', status=404)
+            logger.error(f"[nextjs_admin] Directory doesn't exist after extraction attempt")
+            return render(request, 'frontend/404.html', status=404)
 
         static_dir = base_dir
 
@@ -118,27 +115,23 @@ class NextJsAdminView(LoginRequiredMixin, View):
         Resolve SPA path with Next.js routing conventions.
 
         Resolution order:
-        1. Default to iframe_route for empty path
+        1. Default to /admin for empty path or /admin path
         2. Exact file match (static assets)
         3. path/index.html (SPA routes)
         4. path.html (single page)
         5. Fallback to index.html
 
         Examples:
-            '' → 'private.html' (from iframe_route)
-            'private/centrifugo' → 'private/centrifugo/index.html'
+            '' → 'admin/index.html'
+            'admin' → 'admin/index.html'
+            'admin/centrifugo' → 'admin/centrifugo/index.html'
             '_next/static/...' → '_next/static/...' (exact)
         """
-        # Empty path - use iframe_route
-        if not path or path == '/':
-            iframe_route = nextjs_config.get_iframe_route().strip('/')
-            # Try iframe_route.html or iframe_route/index.html
-            html_file = base_dir / f"{iframe_route}.html"
-            if html_file.exists():
-                return f"{iframe_route}.html"
-            index_file = base_dir / iframe_route / 'index.html'
-            if index_file.exists():
-                return f"{iframe_route}/index.html"
+        # Empty path or 'admin' - serve /admin route
+        if not path or path == '/' or path == 'admin' or path == 'admin/':
+            admin_index = base_dir / 'admin' / 'index.html'
+            if admin_index.exists():
+                return 'admin/index.html'
             # Fallback to root index.html
             return 'index.html'
 

django_cfg/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-cfg"
-version = "1.4.91"
-description = "Django AI framework with built-in agents, type-safe Pydantic v2 configuration, and 8 enterprise apps. Replace settings.py, validate at startup, 90% less code. Production-ready AI workflows for Django."
+version = "1.4.93"
+description = "Modern Django framework with type-safe Pydantic v2 configuration, Next.js admin integration, real-time WebSockets, and 8 enterprise apps. Replace settings.py with validated models, 90% less code. Production-ready with AI agents, auto-generated TypeScript clients, and zero-config features."
 readme = "README.md"
-keywords = [ "django", "configuration", "pydantic", "settings", "type-safety", "pydantic-settings", "django-environ", "startup-validation", "ide-autocomplete", "ai-agents", "enterprise-django", "django-settings", "type-safe-config",]
+keywords = [ "django", "configuration", "pydantic", "settings", "type-safety", "pydantic-settings", "django-environ", "startup-validation", "ide-autocomplete", "nextjs-admin", "react-admin", "websocket", "centrifugo", "real-time", "typescript-generation", "ai-agents", "enterprise-django", "django-settings", "type-safe-config", "modern-django",]
 classifiers = [ "Development Status :: 4 - Beta", "Framework :: Django", "Framework :: Django :: 5.2", "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: System :: Systems Administration", "Typing :: Typed",]
 requires-python = ">=3.12,<3.14"
 dependencies = [ "pydantic>=2.11.0,<3.0", "pydantic[email]>=2.11.0,<3.0", "PyYAML>=6.0,<7.0", "click>=8.2.0,<9.0", "questionary>=2.1.0,<3.0", "rich>=14.0.0,<15.0", "cloudflare>=4.3.0,<5.0", "loguru>=0.7.0,<1.0", "colorlog>=6.9.0,<7.0", "cachetools>=5.3.0,<7.0", "toml>=0.10.2,<0.11.0", "ngrok>=1.5.1; python_version>='3.12'", "psycopg[binary,pool]>=3.2.0,<4.0", "dj-database-url>=3.0.0,<4.0", "whitenoise>=6.8.0,<7.0", "django-cors-headers>=4.7.0,<5.0", "djangorestframework>=3.16.0,<4.0", "djangorestframework-simplejwt>=5.5.0,<6.0", "djangorestframework-simplejwt[token-blacklist]>=5.5.0,<6.0", "drf-nested-routers>=0.94.0,<1.0", "django-filter>=25.0,<26.0", "django-ratelimit>=4.1.0,<5.0.0", "drf-spectacular>=0.28.0,<1.0", "drf-spectacular-sidecar>=2025.8.0,<2026.0", "django-json-widget>=2.0.0,<3.0", "django-import-export>=4.3.0,<5.0", "django-extensions>=4.1.0,<5.0", "django-constance>=4.3.0,<5.0", "django-unfold>=0.64.0,<1.0", "django-redis>=6.0.0,<7.0", "redis>=6.4.0,<7.0", "hiredis>=2.0.0,<4.0", "dramatiq[redis]>=1.18.0,<2.0", "django-dramatiq>=0.14.0,<1.0", "pyTelegramBotAPI>=4.28.0,<5.0", "coolname>=2.2.0,<3.0", "django-admin-rangefilter>=0.13.0,<1.0", "python-json-logger>=3.3.0,<4.0", "requests>=2.32.0,<3.0", "tiktoken>=0.11.0,<1.0", "openai>=1.107.0,<2.0", "twilio>=9.8.0,<10.0", "sendgrid>=6.12.0,<7.0", "beautifulsoup4>=4.13.0,<5.0", "lxml>=6.0.0,<7.0", "pgvector>=0.4.0,<1.0", "tenacity>=9.1.2,<10.0.0", "mypy (>=1.18.2,<2.0.0)", "django-tailwind[reload] (>=4.2.0,<5.0.0)", "jinja2 (>=3.1.6,<4.0.0)", "django-axes[ipware] (>=8.0.0,<9.0.0)", "pydantic-settings (>=2.11.0,<3.0.0)",]

django_cfg/templates/admin/index.html

@@ -79,7 +79,27 @@
 {% block content %}
     <!-- Main Container -->
     {% component "unfold/components/container.html" %}
-        <div x-data="{ activeTab: 'builtin' }">
+        <div x-data="{
+            activeTab: 'builtin',
+            previousTab: 'builtin',
+            switchTab(tab) {
+                if (this.previousTab !== tab) {
+                    // Reset iframe to initial URL when switching tabs
+                    this.resetIframe(this.previousTab);
+                    this.previousTab = tab;
+                }
+                this.activeTab = tab;
+            },
+            resetIframe(tab) {
+                // Reset the iframe that was just hidden
+                const iframeId = tab === 'builtin' ? 'nextjs-dashboard-iframe-builtin' : 'nextjs-dashboard-iframe-nextjs';
+                const iframe = document.getElementById(iframeId);
+                if (iframe) {
+                    const originalSrc = iframe.getAttribute('data-original-src') || iframe.src;
+                    iframe.src = originalSrc;
+                }
+            }
+        }">
             {% if is_frontend_dev_mode %}
             <!-- Development Mode Badge -->
             <div class="bg-yellow-100 dark:bg-yellow-900 border-l-4 border-yellow-500 text-yellow-700 dark:text-yellow-300 p-4 mb-4" role="alert">
@@ -106,7 +126,7 @@
                         }
                     </style>
                     <nav class="-mb-px flex space-x-8 px-4" aria-label="Dashboard Tabs">
-                        <button @click="activeTab = 'builtin'"
+                        <button @click="switchTab('builtin')"
                                 class="whitespace-nowrap py-4 px-2 border-b-2 font-medium text-sm flex items-center gap-2 transition-all duration-200"
                                 :class="activeTab === 'builtin'
                                     ? 'border-primary-600 text-primary-600 dark:border-primary-500 dark:text-primary-500'
@@ -115,7 +135,7 @@
                             <span>Built-in Dashboard</span>
                         </button>
 
-                        <button @click="activeTab = 'nextjs'"
+                        <button @click="switchTab('nextjs')"
                                 class="whitespace-nowrap py-4 px-2 border-b-2 font-medium text-sm flex items-center gap-2 transition-all duration-200"
                                 :class="activeTab === 'nextjs'
                                     ? 'border-primary-600 text-primary-600 dark:border-primary-500 dark:text-primary-500'
@@ -140,6 +160,7 @@
                         id="nextjs-dashboard-iframe-builtin"
                         class="nextjs-dashboard-iframe"
                         src="{% nextjs_admin_url %}"
+                        data-original-src="{% nextjs_admin_url %}"
                         title="Next.js Dashboard"
                         sandbox="allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-storage-access-by-user-activation"
                         scrolling="no"
@@ -160,6 +181,7 @@
                         id="nextjs-dashboard-iframe-nextjs"
                         class="nextjs-dashboard-iframe nextjs-external-iframe"
                         src="{% nextjs_external_admin_url %}"
+                        data-original-src="{% nextjs_external_admin_url %}"
                         title="{% nextjs_external_admin_title %}"
                         sandbox="allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-storage-access-by-user-activation"
                         scrolling="no"
@@ -225,22 +247,62 @@
 
                 // Debounce timer for resize events (prevents jittery iframe height changes)
                 let resizeTimer = null;
+                let loadTimeout = null;
 
                 // iframe load event
                 iframe.addEventListener('load', function() {
+                    // Clear the fallback timeout
+                    if (loadTimeout) {
+                        clearTimeout(loadTimeout);
+                        loadTimeout = null;
+                    }
+
                     setTimeout(() => {
                         sendDataToIframe();
                     }, 100);
                 });
 
-                // Fallback: Show iframe after 5 seconds
-                setTimeout(() => {
-                    if (!iframe.classList.contains('loaded')) {
+                // iframe error event - fallback to static files
+                iframe.addEventListener('error', function() {
+                    console.warn('[Django-CFG] iframe failed to load, falling back to static files');
+                    handleLoadFailure();
+                });
+
+                // Timeout fallback - if iframe doesn't load in 3 seconds
+                loadTimeout = setTimeout(() => {
+                    if (!iframe.classList.contains('loaded') && isDevMode) {
+                        console.warn('[Django-CFG] Dev server timeout, falling back to static files');
+                        handleLoadFailure();
+                    } else if (!iframe.classList.contains('loaded')) {
                         console.log('[Django-CFG] Timeout - showing iframe anyway');
                         if (loading) loading.classList.add('hidden');
                         iframe.classList.add('loaded');
                     }
-                }, 5000);
+                }, 3000);
+
+                // Handle load failure - switch to static files
+                function handleLoadFailure() {
+                    if (!isDevMode) return; // Already using static files
+
+                    const originalSrc = iframe.getAttribute('data-original-src');
+                    if (!originalSrc) return;
+
+                    // Extract path from dev server URL
+                    const devUrl = new URL(originalSrc);
+                    const pathPart = devUrl.pathname.replace('/admin', '').replace(/^\//, '');
+
+                    // Build static files URL
+                    const staticUrl = `/cfg/admin/admin/${pathPart}`;
+
+                    console.log('[Django-CFG] Switching to static files:', staticUrl);
+                    iframe.src = staticUrl;
+
+                    // Show iframe after switching
+                    setTimeout(() => {
+                        if (loading) loading.classList.add('hidden');
+                        iframe.classList.add('loaded');
+                    }, 500);
+                }
 
                 // Send theme and auth data to iframe
                 function sendDataToIframe() {

django_cfg/templatetags/django_cfg.py

@@ -5,13 +5,40 @@ Provides template tags for accessing django-cfg configuration constants.
 """
 
 import os
+import socket
 from django import template
+from django.conf import settings
 from django.utils.safestring import mark_safe
 from rest_framework_simplejwt.tokens import RefreshToken
 
 register = template.Library()
 
 
+def _is_port_available(host: str, port: int, timeout: float = 0.1) -> bool:
+    """
+    Check if a port is available (listening) on the specified host.
+
+    Uses a quick socket connection test with minimal timeout.
+    Returns True if the port is open and accepting connections.
+
+    Args:
+        host: Host to check (e.g., 'localhost', '127.0.0.1')
+        port: Port number to check
+        timeout: Connection timeout in seconds (default: 0.1s)
+
+    Returns:
+        bool: True if port is available, False otherwise
+    """
+    try:
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sock.settimeout(timeout)
+        result = sock.connect_ex((host, port))
+        sock.close()
+        return result == 0
+    except Exception:
+        return False
+
+
 @register.simple_tag
 def lib_name():
     """Get the library name."""
@@ -140,37 +167,36 @@ def inject_jwt_tokens_script(context):
 @register.simple_tag
 def nextjs_admin_url(path=''):
     """
-    Get the URL for Next.js Admin Panel.
+    Get the URL for Next.js Admin Panel (Built-in Dashboard - Tab 1).
 
-    In development mode (when DJANGO_CFG_FRONTEND_DEV_MODE=true):
-        Returns http://localhost:3000/{path}
+    Auto-detects development mode with priority:
+        1. If port 3001 is available → http://localhost:3001/admin/{path} (dev server)
+        2. Otherwise → /cfg/admin/admin/{path} (static files)
 
-    In production mode:
-        Returns /cfg/admin/{path}
+    Note: Port 3000 is reserved for external Next.js admin (Tab 2).
 
     Usage in template:
         {% load django_cfg %}
-        <iframe src="{% nextjs_admin_url 'private' %}"></iframe>
-
-    Environment variable:
-        DJANGO_CFG_FRONTEND_DEV_MODE=true    # Enable dev mode
-        DJANGO_CFG_FRONTEND_DEV_PORT=3000    # Custom dev port (default: 3000)
+        <iframe src="{% nextjs_admin_url %}"></iframe>
+        <iframe src="{% nextjs_admin_url 'centrifugo' %}"></iframe>
     """
-    # Check if frontend dev mode is enabled
-    is_dev_mode = os.environ.get('DJANGO_CFG_FRONTEND_DEV_MODE', '').lower() in ('true', '1', 'yes')
+    # Normalize path - remove leading/trailing slashes
+    path = path.strip('/')
+
+    if not settings.DEBUG:
+        # Production mode: always use static files
+        return f'/cfg/admin/admin/{path}' if path else '/cfg/admin/admin/'
 
-    # Normalize path - ensure trailing slash for Django static view
-    if path and not path.endswith('/'):
-        path = f'{path}/'
+    # Check if port 3001 is available for Tab 1 (built-in admin)
+    port_3001_available = _is_port_available('localhost', 3001)
 
-    if is_dev_mode:
-        # Development mode: use Next.js dev server
-        dev_port = os.environ.get('DJANGO_CFG_FRONTEND_DEV_PORT', '3000')
-        base_url = f'http://localhost:{dev_port}'
+    if port_3001_available:
+        # Dev server is running on 3001 - use it
+        base_url = 'http://localhost:3001/admin'
         return f'{base_url}/{path}' if path else base_url
     else:
-        # Production mode: use Django static files
-        return f'/cfg/admin/{path}' if path else '/cfg/admin/'
+        # No dev server or dev server stopped - use static files
+        return f'/cfg/admin/admin/{path}' if path else '/cfg/admin/admin/'
 
 
 @register.simple_tag
@@ -178,7 +204,11 @@ def is_frontend_dev_mode():
     """
     Check if frontend is in development mode.
 
-    Returns True if DJANGO_CFG_FRONTEND_DEV_MODE environment variable is set to true.
+    Auto-detects by checking:
+        - DEBUG=True
+        - AND (port 3000 OR port 3001 is available)
+
+    Returns True if any Next.js dev server is detected.
 
     Usage in template:
         {% load django_cfg %}
@@ -186,7 +216,12 @@ def is_frontend_dev_mode():
             <div class="dev-badge">Dev Mode</div>
         {% endif %}
     """
-    return os.environ.get('DJANGO_CFG_FRONTEND_DEV_MODE', '').lower() in ('true', '1', 'yes')
+    if not settings.DEBUG:
+        return False
+
+    # Check if either dev server is running
+    return (_is_port_available('localhost', 3000) or
+            _is_port_available('localhost', 3001))
 
 
 @register.simple_tag
@@ -214,10 +249,14 @@ def has_nextjs_external_admin():
 @register.simple_tag
 def nextjs_external_admin_url(route=''):
     """
-    Get URL for external Next.js admin (Tab 2).
+    Get URL for external Next.js admin (Tab 2 - solution project).
+
+    Auto-detects development mode:
+        - If DEBUG=True AND localhost:3000 is available → http://localhost:3000/admin/{route}
+        - Otherwise → /cfg/nextjs-admin/admin/{route} (static files)
 
-    Always returns relative URL (Django serves from static/nextjs_admin.zip):
-        Returns /cfg/nextjs-admin/{route}
+    This is for the external admin panel (solution project).
+    No env variable needed - automatically detects running dev server!
 
     Usage in template:
         {% load django_cfg %}
@@ -231,10 +270,16 @@ def nextjs_external_admin_url(route=''):
         if not config or not config.nextjs_admin:
             return ''
 
-        route = route.strip().lstrip('/')
+        route = route.strip('/')
 
-        # Always use relative URL - Django serves from extracted ZIP
-        return f"/cfg/nextjs-admin/{route}" if route else "/cfg/nextjs-admin/"
+        # Auto-detect development mode: DEBUG=True + port 3000 available
+        if settings.DEBUG and _is_port_available('localhost', 3000):
+            # Development mode: solution project on port 3000
+            base_url = 'http://localhost:3000/admin'
+            return f'{base_url}/{route}' if route else base_url
+        else:
+            # Production mode: use relative URL - Django serves from extracted ZIP with /admin prefix
+            return f"/cfg/nextjs-admin/admin/{route}" if route else "/cfg/nextjs-admin/admin/"
     except Exception:
         return ''