v1.0.45 - Refactoring, Bump UI, Integrate Jazzmin

Author: app-generator

CHANGELOG.md

@@ -1,4 +1,4 @@
-FROM python:3.9
+FROM python:3.12
 
 # set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -16,8 +16,5 @@ COPY . .
 RUN python manage.py makemigrations
 RUN python manage.py migrate
 
-# Generate API
-RUN python manage.py generate-api -f
-
 # gunicorn
-CMD ["gunicorn", "--config", "gunicorn-cfg.py", "core.wsgi"]
+CMD ["gunicorn", "--config", "gunicorn-cfg.py", "config.wsgi"]

Dockerfile

@@ -7,4 +7,4 @@
 
 class DynApiConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'dyn_api'
+    name = 'apps.dyn_api'

README.md

@@ -5,7 +5,7 @@
 
 from django.contrib import admin
 from django.urls import path
-from dyn_api import views 
+from apps.dyn_api import views 
 
 urlpatterns = [
     path('api/', views.index, name="dynamic_api"),

dyn_api/__init__.py renamed to apps/dyn_api/__init__.py

@@ -2,4 +2,4 @@
 
 class DynDtConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'dyn_dt'
+    name = 'apps.dyn_dt'

dyn_api/admin.py renamed to apps/dyn_api/admin.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.9 on 2025-03-01 07:16
+# Generated by Django 4.2.9 on 2025-03-16 06:05
 
 from django.db import migrations, models
 

dyn_api/apps.py renamed to apps/dyn_api/apps.py

@@ -1,5 +1,5 @@
 from django.urls import path
-from dyn_dt import views 
+from apps.dyn_dt import views 
 
 urlpatterns = [
     path('dynamic-dt/', views.index, name="dynamic_dt"),

dyn_api/helpers.py renamed to apps/dyn_api/helpers.py

@@ -6,14 +6,15 @@
 from django.utils.safestring import mark_safe
 from django.conf import settings
 from django.urls import reverse
-from dyn_dt.models import ModelFilter, PageItems, HideShowFilter
-from dyn_dt.utils import user_filter
 from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
 from django.urls import reverse
 from django.views import View
 from django.db import models
 from pprint import pp 
 
+from apps.dyn_dt.models import ModelFilter, PageItems, HideShowFilter
+from apps.dyn_dt.utils import user_filter
+
 from cli import *
 
 # Create your views here.

core/__init__.py renamed to apps/dyn_api/migrations/__init__.py

@@ -5,7 +5,7 @@
 
 # Register your models here.
 
-app_models = apps.get_app_config('home').get_models()
+app_models = apps.get_app_config('pages').get_models()
 for model in app_models:
     try:    
 

dyn_api/tests.py renamed to apps/dyn_api/tests.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class HomeConfig(AppConfig):
+class PagesConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "home"
+    name = "apps.pages"

dyn_api/urls.py renamed to apps/dyn_api/urls.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.9 on 2025-03-01 07:16
+# Generated by Django 4.2.9 on 2025-03-16 06:05
 
 from django.db import migrations, models
 

dyn_api/views.py renamed to apps/dyn_api/views.py

@@ -4,5 +4,5 @@
 from . import views
 
 urlpatterns = [
-  path(''       , views.index,  name='index'),
+  path('', views.index,  name='index'),
 ]

dyn_dt/.gitkeep renamed to apps/dyn_dt/.gitkeep

@@ -13,4 +13,3 @@ python manage.py collectstatic --no-input
 python manage.py makemigrations
 python manage.py migrate
 
-python manage.py generate-api -f

dyn_dt/__init__.py renamed to apps/dyn_dt/__init__.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 from .common                    import *

dyn_dt/admin.py renamed to apps/dyn_dt/admin.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 import os, subprocess
@@ -14,7 +14,7 @@
 DIR_TMPL              = os.path.join( DIR_ROOT, 'templates' )
 DIR_STATIC            = os.path.join( DIR_ROOT, 'static'    )
 
-DIR_DJ_CORE           = 'core'
+DIR_DJ_CORE           = 'config'
 DIR_DJ_HOME           = 'home'
 
 FILE_DJ_MANAGE_s      = 'manage.py'

dyn_dt/apps.py renamed to apps/dyn_dt/apps.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 import random, string, json, statistics, re, pprint, time

dyn_dt/forms.py renamed to apps/dyn_dt/forms.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 import os, ast, astor, importlib

dyn_dt/migrations/0001_initial.py renamed to apps/dyn_dt/migrations/0001_initial.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 import random, string, time, sys

dyn_dt/migrations/__init__.py renamed to apps/dyn_dt/migrations/__init__.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 from .common   import *

dyn_dt/models.py renamed to apps/dyn_dt/models.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 from .common   import *

dyn_dt/templatetags/__init__.py renamed to apps/dyn_dt/templatetags/__init__.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 from .common   import *

dyn_dt/templatetags/get_attribute.py renamed to apps/dyn_dt/templatetags/get_attribute.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 from .common           import *

dyn_dt/tests.py renamed to apps/dyn_dt/tests.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 from .common           import *

dyn_dt/urls.py renamed to apps/dyn_dt/urls.py

@@ -103,26 +103,30 @@ def file_rm ( aPath ):
     if file_exists( aPath ):
         os.remove( aPath )
 
-def list_files( aPath, aExt=None ):
+def list_files( aPath, aExcludePath, aExt=None ):
 
     matches = []
 
     for root, dirnames, filenames in os.walk( aPath ):
-        
+
+        # Exclude DIRs like ENV, migrations .. etc
+        if any(ext in root for ext in aExcludePath):
+            continue
+
         if aExt: 
 
             for filename in fnmatch.filter(filenames, '*.' + aExt ):
 
-                #item = os.path.join(root, filename)
+                item = os.path.join(root, filename)
 
-                matches.append( filename)
+                matches.append( item )
         else:
 
             for filename in filenames:
 
-                #item = os.path.join(root, filename)
+                item = os.path.join(root, filename)
 
-                matches.append( filename )
+                matches.append( item )
 
     return matches
 

dyn_dt/utils.py renamed to apps/dyn_dt/utils.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 import os

dyn_dt/views.py renamed to apps/dyn_dt/views.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 import os

home/__init__.py renamed to apps/pages/__init__.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 """
-Copyright (c) AppSeed.us
+Copyright (c) App-Generator.dev | AppSeed.us
 """
 
 import random, string

home/admin.py renamed to apps/pages/admin.py

@@ -11,6 +11,6 @@
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "core.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
 
 application = get_asgi_application()

home/apps.py renamed to apps/pages/apps.py

@@ -15,8 +15,6 @@
 from dotenv import load_dotenv
 from str2bool import str2bool
 
-import dyn_dt
-
 load_dotenv()  # take environment variables from .env.
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -46,21 +44,23 @@
 # Application definition
 
 INSTALLED_APPS = [
-    'admin_datta.apps.AdminDattaConfig',
+    'jazzmin',
     "django.contrib.admin",
+    'admin_datta.apps.AdminDattaConfig',
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
 
-    "home",
+    # Serve UI pages
+    "apps.pages",
 
     # Dynamic DT
-    "dyn_dt",
+    "apps.dyn_dt",
 
     # Dynamic API
-    "dyn_api",
+    "apps.dyn_api",
 
     # Tooling API-GEN
     'rest_framework',            # Include DRF           # <-- NEW 
@@ -78,9 +78,9 @@
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = "core.urls"
+ROOT_URLCONF = "config.urls"
 
-HOME_TEMPLATES      = os.path.join(BASE_DIR, 'templates') 
+HOME_TEMPLATES = os.path.join(BASE_DIR, 'templates') 
 
 TEMPLATES = [
     {
@@ -98,8 +98,7 @@
     },
 ]
 
-WSGI_APPLICATION = "core.wsgi.application"
-
+WSGI_APPLICATION = "config.wsgi.application"
 
 # Database
 # https://docs.djangoproject.com/en/4.1/ref/settings/#databases
@@ -185,14 +184,14 @@
 # ### DYNAMIC_DATATB Settings ###
 DYNAMIC_DATATB = {
     # SLUG -> Import_PATH 
-    'product'  : "home.models.Product",
+    'product'  : "apps.pages.models.Product",
 }
 ########################################
 
 # Syntax: URI -> Import_PATH
 DYNAMIC_API = {
     # SLUG -> Import_PATH 
-    'product'  : "home.models.Product",
+    'product'  : "apps.pages.models.Product",
 }
 
 REST_FRAMEWORK = {

home/migrations/0001_initial.py renamed to apps/pages/migrations/0001_initial.py

@@ -18,11 +18,11 @@
 from rest_framework.authtoken.views import obtain_auth_token # <-- NEW
 
 urlpatterns = [
-    path('', include('home.urls')),
-    path("admin/", admin.site.urls),
+    path('', include('apps.pages.urls')),
+    path("", include("apps.dyn_dt.urls")),
+    path("", include("apps.dyn_api.urls")), 
     path("", include('admin_datta.urls')),
-    path("", include("dyn_dt.urls")),
-    path("", include("dyn_api.urls")), 
+    path("admin/", admin.site.urls),
 ]
 
 # Lazy-load on routing is needed

home/migrations/__init__.py renamed to apps/pages/migrations/__init__.py

@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "core.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
 
 application = get_wsgi_application()