focomy 0.1.106__py3-none-any.whl → 0.1.108__py3-none-any.whl

core/api/forms.py

@@ -13,6 +13,7 @@ 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"])
 
@@ -30,6 +31,7 @@ async def view_form(
     db: AsyncSession = Depends(get_db),
 ):
     """View a public form."""
+    await require_feature_async("form", db)
     entity_svc = EntityService(db)
 
     # Find form
@@ -83,6 +85,7 @@ async def submit_form(
     db: AsyncSession = Depends(get_db),
 ):
     """Submit a form."""
+    await require_feature_async("form", db)
     entity_svc = EntityService(db)
 
     # Find form

core/config.py

@@ -143,7 +143,7 @@ class FeaturesConfig(BaseModel):
 
     # Phase 5: Extended features
     comment: bool = False
-    form: bool = False
+    form: bool = True
     api_auth: bool = False
     oauth: bool = False
     mail: bool = False

core/engine/routes.py

@@ -163,6 +163,13 @@ async def render_theme(
             # Build edit URL if entity provided
             if entity and content_type:
                 context["edit_url"] = f"/admin/{content_type}/{entity.id}/edit"
+            # Add content_types for admin bar dropdown
+            all_ct = field_service.get_all_content_types()
+            context["content_types"] = {
+                name: ct.model_dump()
+                for name, ct in all_ct.items()
+                if ct.admin_menu  # Only show types with admin_menu=true
+            }
         else:
             context["is_admin"] = False
 

core/main.py

@@ -452,7 +452,6 @@ async def server_error_handler(request: Request, exc: Exception):
 from .admin import routes as admin
 from .api import auth, comments, entities, forms, media, relations, revisions, schema, search, seo
 from .engine import routes as engine
-from .utils import is_feature_enabled
 
 # Phase 1: Core APIs (always enabled)
 app.include_router(entities.router, prefix="/api")
@@ -462,21 +461,16 @@ app.include_router(auth.router, prefix="/api")
 app.include_router(seo.router)
 app.include_router(admin.router)
 
-# Phase 2: Media
-if is_feature_enabled("media"):
-    app.include_router(media.router, prefix="/api")
-
-# Phase 4: Search, Revisions
-if is_feature_enabled("search"):
-    app.include_router(search.router, prefix="/api")
-if is_feature_enabled("revision"):
-    app.include_router(revisions.router, prefix="/api")
-
-# Phase 5: Comments, Forms
-if is_feature_enabled("comment"):
-    app.include_router(comments.router, prefix="/api")
-if is_feature_enabled("form"):
-    app.include_router(forms.router)
+# Phase 2: Media (runtime check in endpoints)
+app.include_router(media.router, prefix="/api")
+
+# Phase 4: Search, Revisions (runtime check in endpoints)
+app.include_router(search.router, prefix="/api")
+app.include_router(revisions.router, prefix="/api")
+
+# Phase 5: Comments, Forms (runtime check in endpoints)
+app.include_router(comments.router, prefix="/api")
+app.include_router(forms.router)
 
 
 @app.get("/api/health")

core/services/settings.py

@@ -39,6 +39,14 @@ DEFAULT_SETTINGS = {
         "lockout_duration": 900,
         "password_min_length": 12,
     },
+    "features": {
+        "media": True,
+        "comment": False,
+        "form": True,
+        "wordpress_import": False,
+        "menu": True,
+        "widget": True,
+    },
 }
 
 
@@ -235,6 +243,7 @@ class SettingsService:
             "media": app_settings.media,
             "security": app_settings.security,
             "theme": app_settings.theme,
+            "features": app_settings.features,
         }
 
         config_obj = config_map.get(category)
@@ -253,6 +262,7 @@ class SettingsService:
             "media": app_settings.media,
             "security": app_settings.security,
             "theme": app_settings.theme,
+            "features": app_settings.features,
         }
 
         categories = [category] if category else config_map.keys()

core/utils.py

@@ -43,3 +43,48 @@ def require_feature(feature: str) -> None:
     """
     if not is_feature_enabled(feature):
         raise HTTPException(status_code=404, detail="Not Found")
+
+
+async def is_feature_enabled_async(feature: str, db) -> bool:
+    """Check if a feature is enabled (async version, DB-first).
+
+    Priority: DB settings > config.yaml > False
+
+    Args:
+        feature: Feature name (e.g., 'form', 'comment')
+        db: AsyncSession database session
+
+    Returns:
+        True if feature is enabled, False otherwise
+    """
+    from .services.settings import SettingsService
+
+    settings_svc = SettingsService(db)
+    db_value = await settings_svc.get(f"features.{feature}")
+
+    if db_value is not None:
+        # DB value exists, use it
+        if isinstance(db_value, bool):
+            return db_value
+        if isinstance(db_value, str):
+            return db_value.lower() in ("true", "1", "yes")
+        return bool(db_value)
+
+    # Fallback to config.yaml
+    return is_feature_enabled(feature)
+
+
+async def require_feature_async(feature: str, db) -> None:
+    """Raise 404 if feature is disabled (async version, DB-first).
+
+    Use this at the start of API endpoints for dynamic feature checking.
+
+    Args:
+        feature: Feature name
+        db: AsyncSession database session
+
+    Raises:
+        HTTPException: 404 if feature is disabled
+    """
+    if not await is_feature_enabled_async(feature, db):
+        raise HTTPException(status_code=404, detail="Not Found")

{focomy-0.1.106.dist-info → focomy-0.1.108.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: focomy
-Version: 0.1.106
+Version: 0.1.108
 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.106.dist-info → focomy-0.1.108.dist-info}/RECORD

@@ -1,11 +1,11 @@
 core/__init__.py,sha256=SHwUSW_pu27kEARvwJFRdY2ZkVu6wzFh0eikYJXjbTY,1123
 core/cli.py,sha256=h5jnf4EJCZ1JZMnDl7W1IaL153UD3dXyKBbxhv1P-KA,35536
-core/config.py,sha256=kLhM1yF3rU9KtJ-DiD8pnzG_tFQsiO8G-M_ffN_yKqE,8200
+core/config.py,sha256=VfRNfh5dAw9ax1MIjzaYN_KEvcNjy7X5-LxE22Rm2-I,8199
 core/database.py,sha256=wqvRuwpDxy25svag9NqreVcNA_VRDDjWsxOMUopsffs,2222
-core/main.py,sha256=em4na_OJu6E3y_nkeYxH_QvugiLdPzKCMbc5Jbc1y1k,16783
+core/main.py,sha256=gc2s5La1qC6WCEq1Bc3UoUK1kKRzO7866-xSeYs_L4I,16647
 core/rate_limit.py,sha256=CX5UjmsU03aFWKXSKjweoHvH2xn0v4NBHNN5ynJC8LE,180
 core/relations.yaml,sha256=7GUCrphKaouEXNkyd8Ht99e6TcUPERhc4m36RGcc41U,2128
-core/utils.py,sha256=7myy64jI7T4WQ_C3Q7j0RPaYKQhfVzGkpNrw9c4yakc,1203
+core/utils.py,sha256=-umiWA5dRuEb9cGuL8QDeZu8khvtcW3jUgb7V4AA4Sc,2521
 core/admin/__init__.py,sha256=IXrr-z-IDXmYodaZ-cVDou6wr_vsVhyWmXHdSNKkQsk,94
 core/admin/routes.py,sha256=h9yl5THrlM74ZUPiiFoAlAVN-p3kMR1h-UH_xK1_T0k,147979
 core/admin/url.py,sha256=FlusKnSz3bZgPSBmRu-dI3W-bQo7lKBDZ3zN8cFHwQc,2243
@@ -13,7 +13,7 @@ core/api/__init__.py,sha256=H1StbYGDVRS6g-Jk3UUf17ibAz1K8IUa27NfPMkaNrA,19
 core/api/auth.py,sha256=Zb37IHcUSjf8_hXiVzhoZPQw6WAiOOS_AoMqE96yat8,11565
 core/api/comments.py,sha256=Eu_0a_JqgiOP1GPsPoslxDztkCv_M324x9qAuBOWPOE,8397
 core/api/entities.py,sha256=sAS12hgjt0Zgudrq2BzfXdCU25myh-8whUxsU_z_jt8,11766
-core/api/forms.py,sha256=tw7oS5cqflTBBAMu5MG-GNx8ndNYxeQV1v2tOQr-Q1s,4702
+core/api/forms.py,sha256=pJc0f72-F1QOTSI7aNDMaqScCmJnHUWbigvmSN4Or7k,4832
 core/api/media.py,sha256=iCsgRBS_-raYK99sksudyAINnTWFl1GhTMBaXJGWkek,6767
 core/api/relations.py,sha256=sErG5lNLBjmWZ5qSXyhGkU7F8iVZAYpFc-_5mY3ZkzU,4874
 core/api/revisions.py,sha256=8BJXtCsq8OJV1R5s33bl369lQrRDNkztWoS0tX70uAA,6960
@@ -44,7 +44,7 @@ core/content_types/user.yaml,sha256=y3SwqzIc9_6C7R1GULk7AwYJPxcTT38ZmZe4_wekfyU,
 core/content_types/widget.yaml,sha256=Jotbts5QQtHaF2bJWQL3rkEoCkp_aq_A3gN-58eJwv8,1454
 core/content_types/workflow_history.yaml,sha256=3wi58LNLYbk7t6Z2QDRi9whQSedJCXKVKuyBhixNUK0,518
 core/engine/__init__.py,sha256=ycR0Kdn6buwdCH6QFG8bV69wFciFSKEg9Ro26cHpa2U,83
-core/engine/routes.py,sha256=CogulY71HAS2bjIPtqw2MK5og8Izns4xkzbO2Y84LbI,41905
+core/engine/routes.py,sha256=LKJYCoctYk3OB9bhKutVRRaBRWNwQjS7dFxSk5cOrAI,42232
 core/migrations/env.py,sha256=1dLI8qcGojLDR_--MdgwP5q-V0p2Z-32klSPjokXx4M,1389
 core/migrations/script.py.mako,sha256=LyYLSC7HzBBGwHZ8s2SguBPMXsWCph0FJp49kPsGhU8,590
 core/migrations/versions/2038bdf6693b_add_import_jobs_table.py,sha256=v8lPC5WmwpUfHUG_YgQn6jepPtfKWFn0JIj9XvD9224,2325
@@ -120,7 +120,7 @@ core/services/schedule.py,sha256=eISYvq5iHyKXdngJNk5PIjTAKeB6O0Rj2j4ktoTSQNU,813
 core/services/search.py,sha256=OSwzQkUHnOLly6yqyDNaj1-RRUNar4QPlWCLhojVtdM,14964
 core/services/sentry.py,sha256=Soilp-qbRDDcvXfeaaS9Bq_trlaRvjNAyHIgvBkplXc,6275
 core/services/seo.py,sha256=qFKKnAzZ2CspWzlHHxvfKx4JBVgNhPWxCSn-adX-2z4,15658
-core/services/settings.py,sha256=FZrXd8k6X_0WQOO3I20lyrksNXzr4nL_yBJm9PmMuDI,8551
+core/services/settings.py,sha256=oZJx1HgFNeSicagtURXHbqq0_O3yPwvcwosuqDmZ13c,8822
 core/services/spam_filter.py,sha256=2O8YWDlZoCr7MhGzsEsx6AKm2SgBP3-kxsXaETVd-0A,11314
 core/services/storage.py,sha256=gaaVf594Ck-zkZMtdt--YcIMvWgPBs7ZGPY0FRIVIzQ,8807
 core/services/theme.py,sha256=-sXcWC0qggV9pmDimKjpmaK0Il9MNCb5urWLgYcWpYk,49304
@@ -186,7 +186,7 @@ themes/default/theme.yaml,sha256=tgcUP1YFptyXVNL2a8DBiPrP7zTjWNH62Cy9D_w6Chk,187
 themes/default/templates/404.html,sha256=6pYUz7zg5hx3nikgxiZWSkwYnv2nENCSV3KjdIF0_lE,1105
 themes/default/templates/500.html,sha256=CtU3gEsHsxAh-vbcnx5McH8V8ruKtdP8usj8hPuu8zY,1174
 themes/default/templates/archive.html,sha256=ZHBxPYewvc2TbrsB745LYO2uM5SJbTFQQR6savWUzYg,2385
-themes/default/templates/base.html,sha256=C2SWfi53TRwtowgLd2r4UbARG8n03nyqIVCupoSeWb8,10317
+themes/default/templates/base.html,sha256=06hSyyeAHqfG2thvMMMUQnxgRTdRD4DCGKieThSzEGM,11901
 themes/default/templates/category.html,sha256=k-yN0vFoOpgxgg6DlGin5X4IzVDBG9xRZ0FOD7OJtU8,3061
 themes/default/templates/channel.html,sha256=1i1zkAWmvpcqyoEfaeQNDc2zrMao2xSXCkjRuwzxOUU,3213
 themes/default/templates/form.html,sha256=OvS2yXVu3sruDOYvEjQCEQNohLf94SMQGR1V9Ky1_Sw,8685
@@ -201,8 +201,8 @@ themes/minimal/templates/base.html,sha256=LFkx-XLDMGH7oFHHa0e6KPB0DJITOBvr6GtPkD
 themes/minimal/templates/home.html,sha256=ygYQgYj1OGCiKwmfsxwkPselVKT8vDH3jLLbfphpqKI,1577
 themes/minimal/templates/page.html,sha256=7Xcoq-ryaxlp913H2S1ishrAro2wsqqGmvsm1osXxd4,389
 themes/minimal/templates/post.html,sha256=FkTRHci8HNIIi3DU6Mb3oL0aDisGyDcsT_IUDwHmrvo,1387
-focomy-0.1.106.dist-info/METADATA,sha256=WuqHmxR0zsPOR2cyZW0vV6yIEBkUgIneDCm1xXgZ30U,7042
-focomy-0.1.106.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-focomy-0.1.106.dist-info/entry_points.txt,sha256=_rF-wxGI1axY7gox3DBsTLHq-JrFKkMCjA65a6b_oqE,41
-focomy-0.1.106.dist-info/licenses/LICENSE,sha256=z9Z7gN7NNV7zYCaY-Knh3bv8RBCu89VueYtAlN_-lro,1063
-focomy-0.1.106.dist-info/RECORD,,
+focomy-0.1.108.dist-info/METADATA,sha256=m0KxVaQT7D-JzBMbuE07RP9JSq416EV9dx03CucikC0,7042
+focomy-0.1.108.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+focomy-0.1.108.dist-info/entry_points.txt,sha256=_rF-wxGI1axY7gox3DBsTLHq-JrFKkMCjA65a6b_oqE,41
+focomy-0.1.108.dist-info/licenses/LICENSE,sha256=z9Z7gN7NNV7zYCaY-Knh3bv8RBCu89VueYtAlN_-lro,1063
+focomy-0.1.108.dist-info/RECORD,,

themes/default/templates/base.html

@@ -123,7 +123,18 @@
     <div id="admin-bar">
         <a href="/" class="admin-bar-site">{{ site_name }}</a>
         <a href="/admin">ダッシュボード</a>
-        <a href="/admin/post/new">+ 新規投稿</a>
+        <div class="admin-bar-dropdown">
+            <button class="admin-bar-dropdown-btn">+ 新規作成</button>
+            <div class="admin-bar-dropdown-menu">
+                {% if content_types %}
+                {% for name, ct in content_types.items()|sort(attribute='0') %}
+                <a href="/admin/{{ name }}/new">{{ ct.label or name }}</a>
+                {% endfor %}
+                {% else %}
+                <a href="/admin/post/new">投稿</a>
+                {% endif %}
+            </div>
+        </div>
         {% if edit_url %}
         <a href="{{ edit_url }}">編集</a>
         {% endif %}
@@ -163,6 +174,44 @@
         .admin-bar-user {
             color: #94a3b8;
         }
+        .admin-bar-dropdown {
+            position: relative;
+        }
+        .admin-bar-dropdown-btn {
+            background: transparent;
+            border: none;
+            color: white;
+            cursor: pointer;
+            font-size: inherit;
+            padding: 0;
+        }
+        .admin-bar-dropdown-btn:hover {
+            text-decoration: underline;
+        }
+        .admin-bar-dropdown-menu {
+            display: none;
+            position: absolute;
+            top: 100%;
+            left: 0;
+            background: #1e293b;
+            border: 1px solid #374151;
+            border-radius: 4px;
+            min-width: 150px;
+            padding: 0.5rem 0;
+            box-shadow: 0 4px 6px rgba(0,0,0,0.3);
+        }
+        .admin-bar-dropdown-menu a {
+            display: block;
+            padding: 0.5rem 1rem;
+            white-space: nowrap;
+        }
+        .admin-bar-dropdown-menu a:hover {
+            background: #374151;
+            text-decoration: none;
+        }
+        .admin-bar-dropdown:hover .admin-bar-dropdown-menu {
+            display: block;
+        }
         body { padding-top: 32px; }
     </style>
     {% endif %}