django-cfg 1.4.97__tar.gz → 1.4.101__tar.gz

{django_cfg-1.4.97 → django_cfg-1.4.101}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-cfg
-Version: 1.4.97
+Version: 1.4.101
 Summary: 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.
 Project-URL: Homepage, https://djangocfg.com
 Project-URL: Documentation, https://djangocfg.com

{django_cfg-1.4.97 → django_cfg-1.4.101}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-cfg"
-version = "1.4.97"
+version = "1.4.101"
 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", "nextjs-admin", "react-admin", "websocket", "centrifugo", "real-time", "typescript-generation", "ai-agents", "enterprise-django", "django-settings", "type-safe-config", "modern-django",]

{django_cfg-1.4.97 → django_cfg-1.4.101}/src/django_cfg/__init__.py

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

{django_cfg-1.4.97 → django_cfg-1.4.101}/src/django_cfg/modules/django_client/management/commands/generate_client.py

@@ -710,19 +710,11 @@ class Command(BaseCommand):
                             self.stdout.write(self.style.SUCCESS(
                                 f"   ✅ Created ZIP archive: {django_static_zip.relative_to(base_dir)} ({zip_size_mb:.1f}MB)"
                             ))
-
-                            # Copy ZIP to django_cfg package static/frontend directory
-                            import django_cfg
-                            django_cfg_static_zip = Path(django_cfg.__file__).parent / 'static' / 'frontend' / 'nextjs_admin.zip'
-                            django_cfg_static_zip.parent.mkdir(parents=True, exist_ok=True)
-
-                            if django_cfg_static_zip.exists():
-                                django_cfg_static_zip.unlink()
-
-                            shutil.copy2(django_static_zip, django_cfg_static_zip)
-
                             self.stdout.write(self.style.SUCCESS(
-                                f"   ✅ Copied ZIP to django_cfg: {django_cfg_static_zip.relative_to(Path(django_cfg.__file__).parent)}"
+                                f"   📍 ZIP location: {django_static_zip.relative_to(base_dir)}"
+                            ))
+                            self.stdout.write(self.style.SUCCESS(
+                                "   ℹ️  This ZIP is used by NextJsAdminView (Tab 2: External Admin)"
                             ))
 
                         except Exception as zip_error:

{django_cfg-1.4.97 → django_cfg-1.4.101}/src/django_cfg/modules/django_unfold/navigation.py

@@ -63,7 +63,7 @@ class NavigationManager(BaseCfgModule):
                     separator=True,
                     collapsible=True,
                     items=[
-                        NavigationItem(title="Dashboard", icon=Icons.MONITOR_HEART, link="/cfg/admin/private/centrifugo"),
+                        NavigationItem(title="Dashboard", icon=Icons.MONITOR_HEART, link="/cfg/admin/admin/centrifugo"),
                         NavigationItem(title="Logs", icon=Icons.LIST_ALT, link=str(reverse_lazy("admin:django_cfg_centrifugo_centrifugolog_changelist"))),
                     ]
                 )

{django_cfg-1.4.97 → django_cfg-1.4.101}/src/django_cfg/modules/nextjs_admin/views.py

@@ -4,15 +4,13 @@ Views for Next.js admin integration.
 Serves Next.js static files with SPA routing support and JWT injection.
 
 Features:
-- Priority-based ZIP resolution (solution project → package fallback)
 - Automatic extraction with metadata comparison (ZIP size + mtime vs marker file)
 - Cache busting (no-store headers for HTML)
 - SPA routing with fallback strategies
 - JWT token injection for authenticated users
 
-ZIP Resolution Priority:
-1. Solution project: {BASE_DIR}/static/nextjs_admin.zip → {BASE_DIR}/static/nextjs_admin/
-2. Package fallback: django_cfg/static/frontend/nextjs_admin.zip → django_cfg/static/frontend/nextjs_admin/
+ZIP Location:
+- Solution project: {BASE_DIR}/static/nextjs_admin.zip → {BASE_DIR}/static/nextjs_admin/
 
 Extraction Logic:
 - Marker file (.zip_meta) tracks ZIP metadata (size:mtime)
@@ -41,16 +39,14 @@ class NextJsAdminView(ZipExtractionMixin, LoginRequiredMixin, View):
     Serve Next.js admin panel with JWT injection and SPA routing.
 
     Features:
-    - Serves Next.js static build files
-    - Priority-based ZIP resolution (solution first, package fallback)
+    - Serves Next.js static build files from solution project
     - Smart ZIP extraction: metadata comparison (size + mtime) with marker file
     - Cache busting: no-store headers for HTML files
     - Automatic JWT token injection for authenticated users
     - SPA routing support (path/to/route → path/to/route/index.html)
 
-    ZIP Resolution Priority:
-    1. Solution: {BASE_DIR}/static/nextjs_admin.zip → {BASE_DIR}/static/nextjs_admin/
-    2. Package: django_cfg/static/frontend/nextjs_admin.zip → django_cfg/static/frontend/nextjs_admin/
+    ZIP Location:
+    - {BASE_DIR}/static/nextjs_admin.zip → {BASE_DIR}/static/nextjs_admin/
 
     ZIP Extraction Logic:
     - If directory doesn't exist: extract from ZIP
@@ -76,28 +72,18 @@ class NextJsAdminView(ZipExtractionMixin, LoginRequiredMixin, View):
 
         nextjs_config = config.nextjs_admin
 
-        # Priority 1: Try solution project static directory first
+        # Use solution project static directory
         from django.conf import settings
-        solution_zip = Path(settings.BASE_DIR) / 'static' / 'nextjs_admin.zip'
-        solution_base_dir = Path(settings.BASE_DIR) / 'static' / 'nextjs_admin'
-
-        # Priority 2: Fallback to django_cfg package
-        default_zip = Path(django_cfg.__file__).parent / 'static' / 'frontend' / 'nextjs_admin.zip'
-        default_base_dir = Path(django_cfg.__file__).parent / 'static' / 'frontend' / 'nextjs_admin'
-
-        # Choose which ZIP to use
-        if solution_zip.exists():
-            zip_path = solution_zip
-            base_dir = solution_base_dir
-            logger.info(f"[nextjs_admin] Using ZIP from solution project: {solution_zip}")
-        elif default_zip.exists():
-            zip_path = default_zip
-            base_dir = default_base_dir
-            logger.info(f"[nextjs_admin] Using ZIP from django_cfg package: {default_zip}")
-        else:
-            logger.error(f"[nextjs_admin] No ZIP found in solution ({solution_zip}) or package ({default_zip})")
+        zip_path = Path(settings.BASE_DIR) / 'static' / 'nextjs_admin.zip'
+        base_dir = Path(settings.BASE_DIR) / 'static' / 'nextjs_admin'
+
+        # Check if ZIP exists
+        if not zip_path.exists():
+            logger.error(f"[nextjs_admin] ZIP not found: {zip_path}")
             return render(request, 'frontend/404.html', status=404)
 
+        logger.info(f"[nextjs_admin] Using ZIP from solution project: {zip_path}")
+
         # 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)

{django_cfg-1.4.97 → django_cfg-1.4.101}/src/django_cfg/templates/admin/index.html

@@ -9,28 +9,80 @@
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link rel="stylesheet" href="{% static 'admin/css/dashboard.css' %}">
     <style>
+        /* Make content container full height and full width */
+        #content {
+            display: flex;
+            flex-direction: column;
+            height: 100%;
+        }
+
+        /* Remove container centering and width limits */
+        #content.container,
+        #content.mx-auto,
+        #content .mx-auto {
+            margin-left: 0 !important;
+            margin-right: 0 !important;
+            max-width: none !important;
+        }
+
+        /* Also remove from unfold container component and make it full height */
+        #content > .mx-auto {
+            margin-left: 0 !important;
+            margin-right: 0 !important;
+            max-width: none !important;
+            height: 100%;
+        }
+
+        /* Remove horizontal padding on mobile for @container */
+        @media (max-width: 768px) {
+            div[class*="@container"].px-4 {
+                padding-left: 0 !important;
+                padding-right: 0 !important;
+            }
+        }
+
+        /* Make Alpine tabs wrapper full height */
+        #content [x-data] {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+        }
+
+        /* Make tab content blocks full height */
+        #content [x-data] > div[x-show] {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+        }
+
         .nextjs-dashboard-iframe {
             width: 100%;
-            min-height: 500px;
-            height: 500px;
+            height: 100%;
             border: none;
             display: block;
             visibility: hidden;
             opacity: 0;
-            transition: height 0.2s ease-in-out, opacity 0.3s ease-in-out;
+            transition: opacity 0.3s ease-in-out;
         }
 
         .nextjs-dashboard-iframe.loaded {
             visibility: visible;
             opacity: 1;
-            height: auto;
-            min-height: 600px;
         }
 
         .iframe-container {
             position: relative;
             background: transparent;
-            min-height: 500px;
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            border: 1px solid rgba(209, 213, 219, 0.2);
+            border-radius: 0.375rem; /* rounded-md */
+            overflow: hidden;
+        }
+
+        .dark .iframe-container {
+            border-color: rgba(75, 85, 99, 0.2);
         }
 
         .iframe-loading {
@@ -67,6 +119,8 @@
 
 {% block breadcrumbs %}{% endblock %}
 
+{% block coltype %}{% endblock %}
+
 {% block title %}
     {% if subtitle %}{{ subtitle }} | {% endif %}
     {{ title }} | {{ site_title|default:'Django site admin' }}
@@ -102,7 +156,7 @@
         }">
             {% 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">
+            <div class="bg-yellow-100 dark:bg-yellow-900 border-l-4 border-yellow-500 text-yellow-700 dark:text-yellow-300" role="alert">
                 <div class="flex items-center">
                     <svg class="w-5 h-5 mr-2" fill="currentColor" viewBox="0 0 20 20">
                         <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd"/>
@@ -118,14 +172,15 @@
             <!-- Tab Navigation -->
             {% has_nextjs_external_admin as is_external_enabled %}
             {% if is_external_enabled %}
-            <div class="mb-6">
+            <div>
                 <div class="border-b border-gray-300 dark:border-gray-600" style="border-bottom-color: rgba(209, 213, 219, 0.2);">
                     <style>
                         .dark [style*="border-bottom-color"] {
                             border-bottom-color: rgba(75, 85, 99, 0.2) !important;
                         }
                     </style>
-                    <nav class="-mb-px flex space-x-8 px-4" aria-label="Dashboard Tabs">
+                    <div class="flex items-center justify-between px-4">
+                        <nav class="-mb-px flex space-x-8" aria-label="Dashboard Tabs">
                         <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'
@@ -144,6 +199,15 @@
                             <span>{% nextjs_external_admin_title %}</span>
                         </button>
                     </nav>
+
+                    <!-- Version info -->
+                    <div class="py-4 text-xs text-gray-400 dark:text-gray-500">
+                        {% load django_cfg %}
+                        <a href="{% lib_site_url %}" class="text-blue-600 hover:text-blue-700">
+                            {% lib_name %}
+                        </a>
+                    </div>
+                </div>
                 </div>
             </div>
             {% endif %}
@@ -163,7 +227,6 @@
                         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"
                     ></iframe>
                 </div>
             </div>
@@ -179,31 +242,16 @@
 
                     <iframe
                         id="nextjs-dashboard-iframe-nextjs"
-                        class="nextjs-dashboard-iframe nextjs-external-iframe"
+                        class="nextjs-dashboard-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"
                     ></iframe>
                 </div>
             </div>
             {% endif %}
         </div>
-
-        <!-- Footer Section -->
-        <div class="text-center py-8 mt-5">
-            <p class="text-sm text-gray-500 dark:text-gray-400">
-                {% load django_cfg %}
-                <a href="{% lib_site_url %}" class="text-blue-600 hover:text-blue-700 font-medium">
-                    {% lib_name %}
-                </a>
-                <span class="mx-2">•</span>
-                <a href="{% lib_health_url %}" class="text-blue-600 hover:text-blue-700">
-                    System Health
-                </a>
-            </p>
-        </div>
     {% endcomponent %}
 {% endblock %}
 
@@ -392,23 +440,31 @@
                             break;
 
                         case 'iframe-resize':
-                            if (data?.height && typeof data.height === 'number') {
-                                // First resize - show iframe immediately
-                                if (!iframe.classList.contains('loaded')) {
-                                    console.log('[Django-CFG] First resize received - showing iframe');
-                                    if (loading) loading.classList.add('hidden');
-                                    iframe.classList.add('loaded');
-                                }
-
-                                // Debounce resize updates (300ms delay)
-                                if (resizeTimer) {
-                                    clearTimeout(resizeTimer);
-                                }
-
-                                resizeTimer = setTimeout(() => {
-                                    const newHeight = Math.max(600, data.height + 50);
-                                    iframe.style.height = newHeight + 'px';
-                                }, 300);
+                            // DISABLED: Fixed height 80vh instead of dynamic resize
+                            // if (data?.height && typeof data.height === 'number') {
+                            //     // First resize - show iframe immediately
+                            //     if (!iframe.classList.contains('loaded')) {
+                            //         console.log('[Django-CFG] First resize received - showing iframe');
+                            //         if (loading) loading.classList.add('hidden');
+                            //         iframe.classList.add('loaded');
+                            //     }
+                            //
+                            //     // Debounce resize updates (300ms delay)
+                            //     if (resizeTimer) {
+                            //         clearTimeout(resizeTimer);
+                            //     }
+                            //
+                            //     resizeTimer = setTimeout(() => {
+                            //         const newHeight = Math.max(600, data.height + 50);
+                            //         iframe.style.height = newHeight + 'px';
+                            //     }, 300);
+                            // }
+
+                            // Show iframe on first resize event
+                            if (!iframe.classList.contains('loaded')) {
+                                console.log('[Django-CFG] First resize received - showing iframe');
+                                if (loading) loading.classList.add('hidden');
+                                iframe.classList.add('loaded');
                             }
                             break;
 

{django_cfg-1.4.97 → django_cfg-1.4.101}/src/django_cfg/templatetags/django_cfg.py

@@ -174,30 +174,30 @@ def nextjs_admin_url(path=''):
         2. Otherwise → /cfg/admin/admin/{path} (static files)
 
     Note: Port 3000 is reserved for external Next.js admin (Tab 2).
+    Both tabs use /admin route for consistency.
 
     Usage in template:
         {% load django_cfg %}
         <iframe src="{% nextjs_admin_url %}"></iframe>
-        <iframe src="{% nextjs_admin_url 'centrifugo' %}"></iframe>
+        <iframe src="{% nextjs_admin_url 'crypto' %}"></iframe>
     """
     # Normalize path - remove leading/trailing slashes
     path = path.strip('/')
 
     if not settings.DEBUG:
-        # Production mode: always use static files
-        return f'/cfg/admin/{path}' if path else '/cfg/admin/'
+        # Production mode: always use static files with /admin route
+        return f'/cfg/admin/admin/{path}' if path else '/cfg/admin/admin/'
 
     # Check if port 3001 is available for Tab 1 (built-in admin)
     port_3001_available = _is_port_available('localhost', 3001)
 
     if port_3001_available:
-        # Dev server is running on 3001 - use it (builtin admin has no /admin prefix)
-        base_url = 'http://localhost:3001'
+        # Dev server is running on 3001 - use /admin route for consistency
+        base_url = 'http://localhost:3001/admin'
         return f'{base_url}/{path}' if path else base_url
     else:
-        # No dev server or dev server stopped - use static files
-        # Static files are served from /cfg/admin/ but ZIP contains files in root (no /admin prefix)
-        return f'/cfg/admin/{path}' if path else '/cfg/admin/'
+        # No dev server - use static files with /admin route
+        return f'/cfg/admin/admin/{path}' if path else '/cfg/admin/admin/'
 
 
 @register.simple_tag