Dev : Future Updates

Author: Jones-peter

README.md

@@ -56,7 +56,7 @@ JsWeb is a minimalistic yet powerful Python web framework designed for developer
 
 ### Contributors
 <a href="https://github.com/jones-peter/jsweb/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=jones-peter/jsweb" />
+  <img src="https://contrib.rocks/image?repo=jones-peter/jsweb&v=2" />
 </a>
 
 ## Installation

jsweb/admin.py

@@ -1,10 +1,12 @@
 # jsweb/admin.py
 import os
 import logging
+from jinja2 import Environment, FileSystemLoader
+from jsweb import __VERSION__
 from jsweb.blueprints import Blueprint
 from jsweb.database import db_session
 from jsweb.forms import Form, StringField
-from jsweb.response import redirect, url_for, render, HTMLResponse
+from jsweb.response import redirect, url_for, HTMLResponse
 from jsweb.auth import admin_required, login_user
 from sqlalchemy.inspection import inspect
 
@@ -16,7 +18,10 @@ class Admin:
     """
     def __init__(self, app=None):
         self.models = {}
-        # Define the path to the admin's own static files
+        
+        admin_template_dir = os.path.join(os.path.dirname(__file__), "admin_templates")
+        self.jinja_env = Environment(loader=FileSystemLoader(admin_template_dir))
+        
         admin_static_folder = os.path.join(os.path.dirname(__file__), 'admin_static')
 
         self.blueprint = Blueprint(
@@ -29,26 +34,41 @@ def __init__(self, app=None):
         if app:
             self.init_app(app)
 
+    def render(self, request, template_name, context=None):
+        """Renders a template using the admin's isolated Jinja2 environment."""
+        if context is None:
+            context = {}
+        
+        context['request'] = request
+        context['app'] = self.app
+        context['admin_models'] = self.models.keys()
+        context['url_for'] = lambda endpoint, **kwargs: url_for(request, endpoint, **kwargs)
+        context['library_version'] = __VERSION__
+        
+        if hasattr(request, 'csrf_token'):
+            context['csrf_token'] = request.csrf_token
+
+        template = self.jinja_env.get_template(template_name)
+        body = template.render(**context)
+        return HTMLResponse(body)
+
     def init_app(self, app):
         self.app = app
         self._register_dashboard_and_login()
         self.app.register_blueprint(self.blueprint)
 
     def _register_dashboard_and_login(self):
         """Registers the main admin dashboard and handles login."""
-        def index(request):
+        async def index(request):
             error = None
             if request.user and getattr(request.user, 'is_admin', False):
-                context = {
-                    "admin_models": self.models.keys(),
-                    "request": request
-                }
-                return render(request, "dashboard.html", context=context)
+                return self.render(request, "dashboard.html")
 
             if request.method == "POST":
                 from models import User
-                username = request.form.get("username")
-                password = request.form.get("password")
+                form_data = await request.form()
+                username = form_data.get("username")
+                password = form_data.get("password")
 
                 user = User.query.filter_by(username=username).first()
 
@@ -59,7 +79,7 @@ def index(request):
                 else:
                     error = "Invalid credentials or not an admin."
 
-            return render(request, "login.html", context={"error": error, "request": request})
+            return self.render(request, "login.html", context={"error": error})
 
         self.blueprint.add_route("/", index, endpoint="index", methods=["GET", "POST"])
 
@@ -80,75 +100,71 @@ def register(self, model):
         pk_name = inspect(model).primary_key[0].name
 
         @admin_required
-        def list_view(request):
+        async def list_view(request):
             records = db_session.query(model).all()
             columns = [c.name for c in model.__table__.columns]
-            records_data = [r.to_dict() for r in records]
+            records_data = [{c.name: getattr(r, c.name) for c in model.__table__.columns} for r in records]
+
+            AddForm = self._create_form_for_model(model)
+            add_form = AddForm()
+
             context = {
                 "model_name": model_name,
                 "columns": columns,
                 "records": records_data,
                 "pk_name": pk_name,
-                "admin_models": self.models.keys(),
-                "request": request
+                "add_form": add_form
             }
-            return render(request, "list.html", context=context)
+            return self.render(request, "list.html", context=context)
 
         @admin_required
-        def add_view(request):
+        async def add_view(request):
             ModelForm = self._create_form_for_model(model)
-            form = ModelForm(formdata=request.form)
-            if request.method == "POST" and form.validate():
+            form_data = await request.form()
+            form = ModelForm(formdata=form_data)
+
+            if form.validate():
                 new_record = model()
                 for field_name, field in form._fields.items():
                     setattr(new_record, field_name, field.data)
                 new_record.save()
                 return redirect(url_for(request, f"admin.{model_name.lower()}_list"))
 
+            records = db_session.query(model).all()
+            columns = [c.name for c in model.__table__.columns]
+            records_data = [{c.name: getattr(r, c.name) for c in model.__table__.columns} for r in records]
             context = {
                 "model_name": model_name,
-                "form": form,
-                "record": None,
-                "admin_models": self.models.keys(),
-                "request": request,
-                "pk_name": pk_name
+                "columns": columns,
+                "records": records_data,
+                "pk_name": pk_name,
+                "add_form": form
             }
-            
-            # If it's an AJAX request, render only the partial
-            if request.headers.get("X-Requested-With") == "XMLHttpRequest":
-                return render(request, "form_partial.html", context=context)
-            
-            # Otherwise, render the full page
-            return render(request, "form.html", context=context)
+            return self.render(request, "list.html", context=context)
 
         @admin_required
-        def edit_view(request, **kwargs):
+        async def edit_view(request, **kwargs):
             record_id = kwargs.get(pk_name)
             record = db_session.query(model).get(record_id)
+            
             ModelForm = self._create_form_for_model(model, instance=record)
-            form = ModelForm(formdata=request.form)
-            if request.method == "POST" and form.validate():
-                for field_name, field in form._fields.items():
-                    setattr(record, field_name, field.data)
-                record.save()
-                return redirect(url_for(request, f"admin.{model_name.lower()}_list"))
 
-            context = {
-                "model_name": model_name,
-                "form": form,
-                "record": record,
-                "admin_models": self.models.keys(),
-                "request": request,
-                "pk_name": pk_name
-            }
-
-            if request.headers.get("X-Requested-With") == "XMLHttpRequest":
-                return render(request, "form_partial.html", context=context)
+            if request.method == "POST":
+                form_data = await request.form()
+                form = ModelForm(formdata=form_data)
+                if form.validate():
+                    for field_name, field in form._fields.items():
+                        setattr(record, field_name, field.data)
+                    record.save()
+                    return redirect(url_for(request, f"admin.{model_name.lower()}_list"))
+            else:
+                form = ModelForm()
 
-            return render(request, "form.html", context=context)
+            context = {"model_name": model_name, "form": form, "record": record, "pk_name": pk_name}
+            return self.render(request, "form.html", context=context)
 
         @admin_required
-        def delete_view(request, **kwargs):
+        async def delete_view(request, **kwargs):
             if request.method == "POST":
                 record_id = kwargs.get(pk_name)
                 record = db_session.query(model).get(record_id)
@@ -157,6 +173,6 @@ def delete_view(request, **kwargs):
             return redirect(url_for(request, f"admin.{model_name.lower()}_list"))
 
         self.blueprint.add_route(f"/{model_name.lower()}", list_view, endpoint=f"{model_name.lower()}_list")
-        self.blueprint.add_route(f"/{model_name.lower()}/add", add_view, endpoint=f"{model_name.lower()}_add", methods=["GET", "POST"])
+        self.blueprint.add_route(f"/{model_name.lower()}/add", add_view, endpoint=f"{model_name.lower()}_add", methods=["POST"])
         self.blueprint.add_route(f"/{model_name.lower()}/edit/<int:{pk_name}>", edit_view, endpoint=f"{model_name.lower()}_edit", methods=["GET", "POST"])
         self.blueprint.add_route(f"/{model_name.lower()}/delete/<int:{pk_name}>", delete_view, endpoint=f"{model_name.lower()}_delete", methods=["POST"])