focomy 0.1.115__tar.gz → 0.1.117__tar.gz

{focomy-0.1.115 → focomy-0.1.117}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: focomy
-Version: 0.1.115
+Version: 0.1.117
 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.115 → focomy-0.1.117}/core/admin/routes.py

@@ -2020,6 +2020,38 @@ async def preview_render(
     return {"html": html}
 
 
+@router.post("/api/preview/token")
+async def create_preview_token(
+    request: Request,
+    db: AsyncSession = Depends(get_db),
+    current_user: Entity = Depends(require_admin_api),
+):
+    """Create a preview token for an entity."""
+    from ..services.preview import get_preview_service
+
+    try:
+        body = await request.json()
+    except Exception:
+        raise HTTPException(status_code=400, detail="Invalid JSON")
+
+    entity_id = body.get("entity_id")
+    if not entity_id:
+        raise HTTPException(status_code=400, detail="entity_id required")
+
+    # Verify entity exists
+    entity_svc = EntityService(db)
+    entity = await entity_svc.get(entity_id)
+    if not entity:
+        raise HTTPException(status_code=404, detail="Entity not found")
+
+    # Create preview token
+    preview_svc = get_preview_service(db)
+    token = await preview_svc.create_token(entity_id, current_user.id)
+    preview_url = preview_svc.get_preview_url(token)
+
+    return {"token": token, "url": preview_url}
+
+
 @router.get("/system", response_class=HTMLResponse)
 async def system_info(
     request: Request,

{focomy-0.1.115 → focomy-0.1.117}/core/engine/routes.py

@@ -261,6 +261,59 @@ async def sitemap_xml(
     return Response(content=xml_content, media_type="application/xml")
 
 
+# === Preview Routes ===
+
+
+@router.get("/preview/{token}", response_class=HTMLResponse)
+async def preview_entity(
+    token: str,
+    request: Request,
+    db: AsyncSession = Depends(get_db),
+):
+    """Preview an entity with a valid token (shows draft/unpublished content)."""
+    from ..services.preview import get_preview_service
+
+    preview_svc = get_preview_service(db)
+    entity = await preview_svc.get_preview_entity(token)
+
+    if not entity:
+        raise HTTPException(status_code=404, detail="Preview not found or expired")
+
+    entity_svc = EntityService(db)
+    entity_data = entity_svc.serialize(entity)
+
+    # Get content type info
+    content_type = entity.type
+    ct = field_service.get_content_type(content_type)
+
+    # Get site URL and contexts
+    site_url = str(request.base_url).rstrip("/")
+    menus_ctx = await get_menus_context(db)
+    widgets_ctx = await get_widgets_context(db)
+    seo_ctx = await get_seo_settings(db, site_url)
+
+    # Add preview flag to context
+    context = {
+        "post": entity_data,
+        "entity": entity_data,
+        "content": entity_data,
+        "is_preview": True,
+        "content_type": ct,
+        **menus_ctx,
+        **widgets_ctx,
+        **seo_ctx,
+    }
+
+    # Determine template
+    template = "post.html"
+    if ct and ct.template:
+        template = ct.template
+
+    html = await render_theme(db, template, context, request=request)
+
+    return HTMLResponse(content=html)
+
+
 async def get_menus_context(db: AsyncSession) -> dict:
     """Get menus context for templates."""
     menu_svc = MenuService(db)

{focomy-0.1.115 → focomy-0.1.117}/core/services/theme.py

@@ -388,25 +388,39 @@ class ThemeService:
         return css.strip()
 
     def get_css_variables(self, theme_name: str = None, minify: bool = True) -> str:
-        """Generate CSS variables from theme config."""
+        """Generate CSS variables from theme config with customizations applied."""
         theme = self.get_theme(theme_name)
         if not theme:
             return ""
 
+        # Get user customizations
+        customizations = self.get_customizations(theme_name)
+
         lines = [":root {"]
 
-        # Colors
-        for name, value in theme.colors.items():
+        # Colors (with customization override)
+        for name, default_value in theme.colors.items():
+            value = customizations.get(f"color_{name}", default_value)
             lines.append(f"  --color-{name}: {value};")
 
-        # Fonts
-        for name, value in theme.fonts.items():
+        # Fonts (with customization override)
+        for name, default_value in theme.fonts.items():
+            value = customizations.get(f"font_{name}", default_value)
             lines.append(f"  --font-{name}: {value};")
 
-        # Spacing
-        for name, value in theme.spacing.items():
+        # Spacing (with customization override)
+        for name, default_value in theme.spacing.items():
+            value = customizations.get(f"space_{name}", default_value)
             lines.append(f"  --space-{name}: {value};")
 
+        # Header/Background images
+        header_image = customizations.get("header_image", "")
+        background_image = customizations.get("background_image", "")
+        if header_image:
+            lines.append(f"  --header-image: url({header_image});")
+        if background_image:
+            lines.append(f"  --background-image: url({background_image});")
+
         lines.append("}")
 
         # Add base styles
@@ -416,7 +430,10 @@ class ThemeService:
 
 body {
     font-family: var(--font-sans);
-    background: var(--color-background);
+    background: var(--background-image, var(--color-background));
+    background-size: cover;
+    background-position: center;
+    background-attachment: fixed;
     color: var(--color-text);
     line-height: 1.6;
 }
@@ -428,7 +445,9 @@ body {
 }
 
 .site-header {
-    background: var(--color-surface);
+    background: var(--header-image, var(--color-surface));
+    background-size: cover;
+    background-position: center;
     border-bottom: 1px solid var(--color-border);
     padding: var(--space-md) 0;
 }
@@ -645,9 +664,12 @@ body {
 """
         )
 
-        # Add custom CSS
-        if theme.custom_css:
-            lines.append(theme.custom_css)
+        # Add custom CSS (from customizations or theme default)
+        custom_css = customizations.get("custom_css", theme.custom_css or "")
+        if custom_css:
+            lines.append("")
+            lines.append("/* Custom CSS */")
+            lines.append(custom_css)
 
         css = "\n".join(lines)
         return self._minify_css(css) if minify else css
@@ -1240,6 +1262,46 @@ body {
         customizations = self.get_customizations(theme_name)
         settings = []
 
+        # Site Identity (logo, favicon)
+        settings.append({
+            "id": "site_logo",
+            "type": "image",
+            "label": "サイトロゴ",
+            "category": "site_identity",
+            "default": "",
+            "value": customizations.get("site_logo", ""),
+            "description": "ヘッダーに表示されるロゴ画像（推奨: 高さ60px以下）",
+        })
+        settings.append({
+            "id": "site_icon",
+            "type": "image",
+            "label": "サイトアイコン",
+            "category": "site_identity",
+            "default": "",
+            "value": customizations.get("site_icon", ""),
+            "description": "ファビコン・アプリアイコン（推奨: 512x512px）",
+        })
+
+        # Header Images
+        settings.append({
+            "id": "header_image",
+            "type": "image",
+            "label": "ヘッダー画像",
+            "category": "header",
+            "default": "",
+            "value": customizations.get("header_image", ""),
+            "description": "ヘッダー背景画像（推奨: 1920x400px）",
+        })
+        settings.append({
+            "id": "background_image",
+            "type": "image",
+            "label": "背景画像",
+            "category": "header",
+            "default": "",
+            "value": customizations.get("background_image", ""),
+            "description": "サイト全体の背景画像",
+        })
+
         # Colors
         for name, default_value in theme.colors.items():
             settings.append({
@@ -1273,6 +1335,17 @@ body {
                 "value": customizations.get(f"space_{name}", default_value),
             })
 
+        # Custom CSS
+        settings.append({
+            "id": "custom_css",
+            "type": "code",
+            "label": "カスタムCSS",
+            "category": "custom_css",
+            "default": theme.custom_css or "",
+            "value": customizations.get("custom_css", theme.custom_css or ""),
+            "description": "独自のCSSを追加できます",
+        })
+
         return settings
 
     def generate_preview_css(self, preview_values: dict, theme_name: str = None) -> str:
@@ -1311,8 +1384,23 @@ body {
             value = values.get(f"space_{name}", default_value)
             lines.append(f"  --space-{name}: {value};")
 
+        # Header/Background images
+        header_image = values.get("header_image", "")
+        background_image = values.get("background_image", "")
+        if header_image:
+            lines.append(f"  --header-image: url({header_image});")
+        if background_image:
+            lines.append(f"  --background-image: url({background_image});")
+
         lines.append("}")
 
+        # Custom CSS
+        custom_css = values.get("custom_css", "")
+        if custom_css:
+            lines.append("")
+            lines.append("/* Custom CSS */")
+            lines.append(custom_css)
+
         return "\n".join(lines)
 
 

{focomy-0.1.115 → focomy-0.1.117}/core/templates/admin/customize.html

@@ -22,6 +22,74 @@
 
 <div class="customize-layout">
     <div class="customize-sidebar">
+        <!-- Site Identity -->
+        {% if grouped_settings.site_identity %}
+        <div class="customize-section">
+            <h3>サイトID</h3>
+            {% for setting in grouped_settings.site_identity %}
+            <div class="customize-field">
+                <label for="{{ setting.id }}">{{ setting.label }}</label>
+                {% if setting.description %}
+                <p class="field-description">{{ setting.description }}</p>
+                {% endif %}
+                <div class="image-input-wrapper">
+                    <div class="image-preview" id="{{ setting.id }}_preview">
+                        {% if setting.value %}
+                        <img src="{{ setting.value }}" alt="{{ setting.label }}">
+                        {% else %}
+                        <span class="no-image">画像未設定</span>
+                        {% endif %}
+                    </div>
+                    <input type="url"
+                           id="{{ setting.id }}"
+                           name="{{ setting.id }}"
+                           value="{{ setting.value }}"
+                           data-default="{{ setting.default }}"
+                           class="customize-input image-url-input"
+                           placeholder="https://example.com/image.png">
+                    <div class="image-actions">
+                        <button type="button" class="btn btn-sm btn-outline" onclick="clearImageInput('{{ setting.id }}')">クリア</button>
+                    </div>
+                </div>
+            </div>
+            {% endfor %}
+        </div>
+        {% endif %}
+
+        <!-- Header Images -->
+        {% if grouped_settings.header %}
+        <div class="customize-section">
+            <h3>ヘッダー・背景</h3>
+            {% for setting in grouped_settings.header %}
+            <div class="customize-field">
+                <label for="{{ setting.id }}">{{ setting.label }}</label>
+                {% if setting.description %}
+                <p class="field-description">{{ setting.description }}</p>
+                {% endif %}
+                <div class="image-input-wrapper">
+                    <div class="image-preview" id="{{ setting.id }}_preview">
+                        {% if setting.value %}
+                        <img src="{{ setting.value }}" alt="{{ setting.label }}">
+                        {% else %}
+                        <span class="no-image">画像未設定</span>
+                        {% endif %}
+                    </div>
+                    <input type="url"
+                           id="{{ setting.id }}"
+                           name="{{ setting.id }}"
+                           value="{{ setting.value }}"
+                           data-default="{{ setting.default }}"
+                           class="customize-input image-url-input"
+                           placeholder="https://example.com/image.png">
+                    <div class="image-actions">
+                        <button type="button" class="btn btn-sm btn-outline" onclick="clearImageInput('{{ setting.id }}')">クリア</button>
+                    </div>
+                </div>
+            </div>
+            {% endfor %}
+        </div>
+        {% endif %}
+
         <!-- Colors -->
         {% if grouped_settings.colors %}
         <div class="customize-section">
@@ -82,6 +150,27 @@
             {% endfor %}
         </div>
         {% endif %}
+
+        <!-- Custom CSS -->
+        {% if grouped_settings.custom_css %}
+        <div class="customize-section">
+            <h3>カスタムCSS</h3>
+            {% for setting in grouped_settings.custom_css %}
+            <div class="customize-field">
+                <label for="{{ setting.id }}">{{ setting.label }}</label>
+                {% if setting.description %}
+                <p class="field-description">{{ setting.description }}</p>
+                {% endif %}
+                <textarea id="{{ setting.id }}"
+                          name="{{ setting.id }}"
+                          data-default="{{ setting.default }}"
+                          class="customize-input code-input"
+                          rows="10"
+                          placeholder="/* CSSを入力 */&#10;.my-class {&#10;  color: red;&#10;}">{{ setting.value }}</textarea>
+            </div>
+            {% endfor %}
+        </div>
+        {% endif %}
     </div>
 
     <div class="customize-preview">
@@ -191,6 +280,66 @@
     font-family: monospace;
 }
 
+.field-description {
+    font-size: 0.75rem;
+    color: var(--text-muted);
+    margin-bottom: 0.5rem;
+}
+
+.code-input {
+    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+    font-size: 0.8125rem;
+    line-height: 1.5;
+    resize: vertical;
+    min-height: 150px;
+    background: #1e1e1e;
+    color: #d4d4d4;
+    padding: 0.75rem;
+}
+
+.image-input-wrapper {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+}
+
+.image-preview {
+    width: 100%;
+    height: 80px;
+    border: 2px dashed var(--border);
+    border-radius: 0.375rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: var(--bg);
+    overflow: hidden;
+}
+
+.image-preview img {
+    max-width: 100%;
+    max-height: 100%;
+    object-fit: contain;
+}
+
+.image-preview .no-image {
+    color: var(--text-muted);
+    font-size: 0.75rem;
+}
+
+.image-url-input {
+    font-size: 0.8125rem;
+}
+
+.image-actions {
+    display: flex;
+    gap: 0.5rem;
+}
+
+.btn-sm {
+    padding: 0.25rem 0.5rem;
+    font-size: 0.75rem;
+}
+
 .customize-preview {
     background: var(--card);
     border: 1px solid var(--border);
@@ -360,8 +509,36 @@
         if (!input.classList.contains('color-input')) {
             input.addEventListener('input', debouncedUpdate);
         }
+        // Add image preview update for image-url-input
+        if (input.classList.contains('image-url-input')) {
+            input.addEventListener('input', () => {
+                updateImagePreview(input.id, input.value);
+            });
+        }
     });
 
+    // Update image preview
+    function updateImagePreview(inputId, url) {
+        const previewEl = document.getElementById(inputId + '_preview');
+        if (!previewEl) return;
+
+        if (url && url.trim()) {
+            previewEl.innerHTML = `<img src="${url}" alt="Preview" onerror="this.parentElement.innerHTML='<span class=\\'no-image\\'>読み込みエラー</span>'">`;
+        } else {
+            previewEl.innerHTML = '<span class="no-image">画像未設定</span>';
+        }
+    }
+
+    // Clear image input (global function for onclick)
+    window.clearImageInput = function(inputId) {
+        const input = document.getElementById(inputId);
+        if (input) {
+            input.value = '';
+            updateImagePreview(inputId, '');
+            debouncedUpdate();
+        }
+    };
+
     // Save button
     saveBtn.addEventListener('click', async () => {
         const values = getValues();
@@ -402,15 +579,18 @@
         if (!confirm('カスタマイズをデフォルトに戻しますか？')) return;
 
         inputs.forEach(input => {
-            const defaultValue = input.dataset.default;
-            if (defaultValue) {
-                input.value = defaultValue;
-
-                // Sync color text input
-                if (input.classList.contains('color-input')) {
-                    const textInput = document.getElementById(input.id + '_text');
-                    if (textInput) textInput.value = defaultValue;
-                }
+            const defaultValue = input.dataset.default || '';
+            input.value = defaultValue;
+
+            // Sync color text input
+            if (input.classList.contains('color-input')) {
+                const textInput = document.getElementById(input.id + '_text');
+                if (textInput) textInput.value = defaultValue;
+            }
+
+            // Update image preview
+            if (input.classList.contains('image-url-input')) {
+                updateImagePreview(input.id, defaultValue);
             }
         });
 

{focomy-0.1.115 → focomy-0.1.117}/core/templates/admin/entity_form.html

@@ -388,6 +388,7 @@
             <a href="{{ cancel_url }}" class="btn btn-secondary">Cancel</a>
             {% if entity %}
             <button type="button" class="btn btn-secondary" onclick="toggleRevisions()">History</button>
+            <button type="button" class="btn btn-secondary" onclick="openPreview()">Preview</button>
             {% endif %}
             <button type="submit" class="btn btn-primary">
                 {% if entity %}Update{% else %}Create{% endif %}
@@ -1239,6 +1240,34 @@ function toggleRevisions() {
     }
 }
 
+// Preview in new tab
+async function openPreview() {
+    const entityId = '{{ entity.id if entity else "" }}';
+    if (!entityId) {
+        alert('Please save the content first before previewing.');
+        return;
+    }
+
+    try {
+        const response = await fetch('/admin/api/preview/token', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ entity_id: entityId })
+        });
+
+        if (!response.ok) {
+            const error = await response.json();
+            alert('Preview error: ' + (error.detail || 'Unknown error'));
+            return;
+        }
+
+        const data = await response.json();
+        window.open(data.url, '_blank');
+    } catch (e) {
+        alert('Preview error: ' + e.message);
+    }
+}
+
 async function loadRevisions() {
     const entityId = '{{ entity.id }}';
     const list = document.getElementById('revisions-list');

{focomy-0.1.115 → focomy-0.1.117}/pyproject.toml

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

focomy-0.1.117/themes/default/customizations.json

@@ -0,0 +1,22 @@
+{
+  "color_primary": "#2563eb",
+  "color_primary-hover": "#1d4ed8",
+  "color_background": "#ffffff",
+  "color_surface": "#f8fafc",
+  "color_text": "#1e293b",
+  "color_text-muted": "#64748b",
+  "color_border": "#e2e8f0",
+  "color_success": "#22c55e",
+  "color_error": "#ef4444",
+  "color_warning": "#f59e0b",
+  "font_sans": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif",
+  "font_serif": "Georgia, 'Times New Roman', serif",
+  "font_mono": "ui-monospace, SFMono-Regular, Menlo, monospace",
+  "space_xs": "0.25rem",
+  "space_sm": "0.5rem",
+  "space_md": "1rem",
+  "space_lg": "1.5rem",
+  "space_xl": "2rem",
+  "space_2xl": "3rem",
+  "custom_css": "/* Test CSS */\n.test-class { color: red; }"
+}