focomy 0.1.109__tar.gz → 0.1.111__tar.gz

{focomy-0.1.109 → focomy-0.1.111}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: focomy
-Version: 0.1.109
+Version: 0.1.111
 Summary: The Most Beautiful CMS - A metadata-driven, zero-duplicate-code content management system
 Project-URL: Homepage, https://github.com/focomy/focomy
 Project-URL: Documentation, https://focomy.dev/docs

{focomy-0.1.109 → focomy-0.1.111}/core/api/forms.py

@@ -9,10 +9,10 @@ from pydantic import BaseModel
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from ..database import get_db
+from ..engine.routes import render_template
 from ..rate_limit import limiter
 from ..services.entity import EntityService
 from ..services.mail import mail_service
-from ..services.theme import theme_service
 from ..utils import require_feature_async
 
 router = APIRouter(prefix="/forms", tags=["forms"])
@@ -63,8 +63,9 @@ async def view_form(
         except json.JSONDecodeError:
             steps = []
 
-    # Render form template
-    html = theme_service.render(
+    # Render form template (with admin bar context)
+    html = await render_template(
+        db,
         "form.html",
         {
             "form": form_data,
@@ -72,6 +73,9 @@ async def view_form(
             "steps": steps,
             "csrf_token": getattr(request.state, "csrf_token", ""),
         },
+        request=request,
+        entity=form,
+        content_type="form",
     )
 
     return HTMLResponse(content=html)
@@ -162,13 +166,15 @@ async def submit_form(
     if "application/json" in content_type:
         return {"success": True, "message": success_message}
 
-    # Render success page
-    html = theme_service.render(
+    # Render success page (with admin bar context)
+    html = await render_template(
+        db,
         "form_success.html",
         {
             "form": form_data,
             "message": success_message,
         },
+        request=request,
     )
 
     return HTMLResponse(content=html)

{focomy-0.1.109 → focomy-0.1.111}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "focomy"
-version = "0.1.109"
+version = "0.1.111"
 description = "The Most Beautiful CMS - A metadata-driven, zero-duplicate-code content management system"
 readme = "README.md"
 license = "MIT"

{focomy-0.1.109 → focomy-0.1.111}/themes/default/templates/form.html

@@ -1,68 +1,5 @@
 {% extends "base.html" %}
 
-{% block title %}{{ form.title }} - {{ site_name }}{% endblock %}
-
-{% block content %}
-<div class="form-page">
-    <header class="form-header">
-        <h1>{{ form.title }}</h1>
-        {% if form.description %}
-        <p class="form-description">{{ form.description }}</p>
-        {% endif %}
-    </header>
-
-    <form id="dynamic-form" method="POST" action="/forms/{{ form.slug }}" class="dynamic-form">
-        <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
-
-        {% if steps and steps|length > 1 %}
-        <!-- ウィザード形式 -->
-        <div class="wizard">
-            <div class="wizard-progress">
-                {% for step in steps %}
-                <div class="wizard-step {% if loop.first %}active{% endif %}" data-step="{{ loop.index }}">
-                    <span class="step-number">{{ loop.index }}</span>
-                    <span class="step-title">{{ step.title }}</span>
-                </div>
-                {% endfor %}
-            </div>
-
-            {% for step in steps %}
-            <div class="wizard-panel {% if loop.first %}active{% endif %}" data-step="{{ loop.index }}">
-                <h2 class="step-heading">{{ step.title }}</h2>
-                {% for field in fields %}
-                    {% if field.name in step.fields %}
-                    {{ render_field(field) }}
-                    {% endif %}
-                {% endfor %}
-
-                <div class="wizard-nav">
-                    {% if not loop.first %}
-                    <button type="button" class="btn btn-secondary prev-step">戻る</button>
-                    {% endif %}
-                    {% if loop.last %}
-                    <button type="submit" class="btn btn-primary">{{ form.submit_label or '送信する' }}</button>
-                    {% else %}
-                    <button type="button" class="btn btn-primary next-step">次へ</button>
-                    {% endif %}
-                </div>
-            </div>
-            {% endfor %}
-        </div>
-        {% else %}
-        <!-- 通常フォーム -->
-        <div class="form-fields">
-            {% for field in fields %}
-            {{ render_field(field) }}
-            {% endfor %}
-        </div>
-
-        <div class="form-actions">
-            <button type="submit" class="btn btn-primary">{{ form.submit_label or '送信する' }}</button>
-        </div>
-        {% endif %}
-    </form>
-</div>
-
 {% macro render_field(field) %}
 <div class="form-group">
     <label for="{{ field.name }}">
@@ -134,6 +71,69 @@
 </div>
 {% endmacro %}
 
+{% block title %}{{ form.title }} - {{ site_name }}{% endblock %}
+
+{% block content %}
+<div class="form-page">
+    <header class="form-header">
+        <h1>{{ form.title }}</h1>
+        {% if form.description %}
+        <p class="form-description">{{ form.description }}</p>
+        {% endif %}
+    </header>
+
+    <form id="dynamic-form" method="POST" action="/forms/{{ form.slug }}" class="dynamic-form">
+        <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
+
+        {% if steps and steps|length > 1 %}
+        <!-- ウィザード形式 -->
+        <div class="wizard">
+            <div class="wizard-progress">
+                {% for step in steps %}
+                <div class="wizard-step {% if loop.first %}active{% endif %}" data-step="{{ loop.index }}">
+                    <span class="step-number">{{ loop.index }}</span>
+                    <span class="step-title">{{ step.title }}</span>
+                </div>
+                {% endfor %}
+            </div>
+
+            {% for step in steps %}
+            <div class="wizard-panel {% if loop.first %}active{% endif %}" data-step="{{ loop.index }}">
+                <h2 class="step-heading">{{ step.title }}</h2>
+                {% for field in fields %}
+                    {% if field.name in step.fields %}
+                    {{ render_field(field) }}
+                    {% endif %}
+                {% endfor %}
+
+                <div class="wizard-nav">
+                    {% if not loop.first %}
+                    <button type="button" class="btn btn-secondary prev-step">戻る</button>
+                    {% endif %}
+                    {% if loop.last %}
+                    <button type="submit" class="btn btn-primary">{{ form.submit_label or '送信する' }}</button>
+                    {% else %}
+                    <button type="button" class="btn btn-primary next-step">次へ</button>
+                    {% endif %}
+                </div>
+            </div>
+            {% endfor %}
+        </div>
+        {% else %}
+        <!-- 通常フォーム -->
+        <div class="form-fields">
+            {% for field in fields %}
+            {{ render_field(field) }}
+            {% endfor %}
+        </div>
+
+        <div class="form-actions">
+            <button type="submit" class="btn btn-primary">{{ form.submit_label or '送信する' }}</button>
+        </div>
+        {% endif %}
+    </form>
+</div>
+
 <style>
 .form-page {
     max-width: 600px;