Monorepo: consolidate 7 repos into one
Combines shared, blog, market, cart, events, federation, and account into a single repository. Eliminates submodule sync, sibling model copying at build time, and per-app CI orchestration. Changes: - Remove per-app .git, .gitmodules, .gitea, submodule shared/ dirs - Remove stale sibling model copies from each app - Update all 6 Dockerfiles for monorepo build context (root = .) - Add build directives to docker-compose.yml - Add single .gitea/workflows/ci.yml with change detection - Add .dockerignore for monorepo build context - Create __init__.py for federation and account (cross-app imports)
This commit is contained in:
giles
3
blog/bp/menu_items/__init__.py
Normal file
3
blog/bp/menu_items/__init__.py
Normal file
@@ -0,0 +1,3 @@
|
||||
from .routes import register
|
||||
|
||||
__all__ = ["register"]
|
||||
213
blog/bp/menu_items/routes.py
Normal file
213
blog/bp/menu_items/routes.py
Normal file
@@ -0,0 +1,213 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from quart import Blueprint, render_template, make_response, request, jsonify, g
|
||||
|
||||
from shared.browser.app.authz import require_admin
|
||||
from .services.menu_items import (
|
||||
get_all_menu_items,
|
||||
get_menu_item_by_id,
|
||||
create_menu_item,
|
||||
update_menu_item,
|
||||
delete_menu_item,
|
||||
search_pages,
|
||||
MenuItemError,
|
||||
)
|
||||
from shared.browser.app.utils.htmx import is_htmx_request
|
||||
|
||||
def register():
|
||||
bp = Blueprint("menu_items", __name__, url_prefix='/settings/menu_items')
|
||||
|
||||
async def get_menu_items_nav_oob():
|
||||
"""Helper to generate OOB update for root nav menu items"""
|
||||
menu_items = await get_all_menu_items(g.s)
|
||||
|
||||
nav_oob = await render_template(
|
||||
"_types/menu_items/_nav_oob.html",
|
||||
menu_items=menu_items,
|
||||
)
|
||||
return nav_oob
|
||||
|
||||
@bp.get("/")
|
||||
@require_admin
|
||||
async def list_menu_items():
|
||||
"""List all menu items"""
|
||||
menu_items = await get_all_menu_items(g.s)
|
||||
|
||||
|
||||
if not is_htmx_request():
|
||||
# Normal browser request: full page with layout
|
||||
html = await render_template(
|
||||
"_types/menu_items/index.html",
|
||||
menu_items=menu_items,
|
||||
)
|
||||
else:
|
||||
|
||||
html = await render_template(
|
||||
"_types/menu_items/_oob_elements.html",
|
||||
menu_items=menu_items,
|
||||
)
|
||||
#html = await render_template("_types/root/settings/_oob_elements.html")
|
||||
|
||||
|
||||
return await make_response(html)
|
||||
|
||||
@bp.get("/new/")
|
||||
@require_admin
|
||||
async def new_menu_item():
|
||||
"""Show form to create new menu item"""
|
||||
html = await render_template(
|
||||
"_types/menu_items/_form.html",
|
||||
menu_item=None,
|
||||
)
|
||||
return await make_response(html)
|
||||
|
||||
@bp.post("/")
|
||||
@require_admin
|
||||
async def create_menu_item_route():
|
||||
"""Create a new menu item"""
|
||||
form = await request.form
|
||||
post_id = form.get("post_id")
|
||||
|
||||
if not post_id:
|
||||
return jsonify({"message": "Page is required", "errors": {"post_id": ["Please select a page"]}}), 422
|
||||
|
||||
try:
|
||||
post_id = int(post_id)
|
||||
except ValueError:
|
||||
return jsonify({"message": "Invalid page ID", "errors": {"post_id": ["Invalid page"]}}), 422
|
||||
|
||||
try:
|
||||
menu_item = await create_menu_item(g.s, post_id)
|
||||
await g.s.flush()
|
||||
|
||||
# Get updated list and nav OOB
|
||||
menu_items = await get_all_menu_items(g.s)
|
||||
nav_oob = await get_menu_items_nav_oob()
|
||||
|
||||
html = await render_template(
|
||||
"_types/menu_items/_list.html",
|
||||
menu_items=menu_items,
|
||||
)
|
||||
return await make_response(html + nav_oob, 200)
|
||||
|
||||
except MenuItemError as e:
|
||||
return jsonify({"message": str(e), "errors": {}}), 400
|
||||
|
||||
@bp.get("/<int:item_id>/edit/")
|
||||
@require_admin
|
||||
async def edit_menu_item(item_id: int):
|
||||
"""Show form to edit menu item"""
|
||||
menu_item = await get_menu_item_by_id(g.s, item_id)
|
||||
if not menu_item:
|
||||
return await make_response("Menu item not found", 404)
|
||||
|
||||
html = await render_template(
|
||||
"_types/menu_items/_form.html",
|
||||
menu_item=menu_item,
|
||||
)
|
||||
return await make_response(html)
|
||||
|
||||
@bp.put("/<int:item_id>/")
|
||||
@require_admin
|
||||
async def update_menu_item_route(item_id: int):
|
||||
"""Update a menu item"""
|
||||
form = await request.form
|
||||
post_id = form.get("post_id")
|
||||
|
||||
if not post_id:
|
||||
return jsonify({"message": "Page is required", "errors": {"post_id": ["Please select a page"]}}), 422
|
||||
|
||||
try:
|
||||
post_id = int(post_id)
|
||||
except ValueError:
|
||||
return jsonify({"message": "Invalid page ID", "errors": {"post_id": ["Invalid page"]}}), 422
|
||||
|
||||
try:
|
||||
menu_item = await update_menu_item(g.s, item_id, post_id=post_id)
|
||||
await g.s.flush()
|
||||
|
||||
# Get updated list and nav OOB
|
||||
menu_items = await get_all_menu_items(g.s)
|
||||
nav_oob = await get_menu_items_nav_oob()
|
||||
|
||||
html = await render_template(
|
||||
"_types/menu_items/_list.html",
|
||||
menu_items=menu_items,
|
||||
)
|
||||
return await make_response(html + nav_oob, 200)
|
||||
|
||||
except MenuItemError as e:
|
||||
return jsonify({"message": str(e), "errors": {}}), 400
|
||||
|
||||
@bp.delete("/<int:item_id>/")
|
||||
@require_admin
|
||||
async def delete_menu_item_route(item_id: int):
|
||||
"""Delete a menu item"""
|
||||
success = await delete_menu_item(g.s, item_id)
|
||||
|
||||
if not success:
|
||||
return await make_response("Menu item not found", 404)
|
||||
|
||||
await g.s.flush()
|
||||
|
||||
# Get updated list and nav OOB
|
||||
menu_items = await get_all_menu_items(g.s)
|
||||
nav_oob = await get_menu_items_nav_oob()
|
||||
|
||||
html = await render_template(
|
||||
"_types/menu_items/_list.html",
|
||||
menu_items=menu_items,
|
||||
)
|
||||
return await make_response(html + nav_oob, 200)
|
||||
|
||||
@bp.get("/pages/search/")
|
||||
@require_admin
|
||||
async def search_pages_route():
|
||||
"""Search for pages to add as menu items"""
|
||||
query = request.args.get("q", "").strip()
|
||||
page = int(request.args.get("page", 1))
|
||||
per_page = 10
|
||||
|
||||
pages, total = await search_pages(g.s, query, page, per_page)
|
||||
has_more = (page * per_page) < total
|
||||
|
||||
html = await render_template(
|
||||
"_types/menu_items/_page_search_results.html",
|
||||
pages=pages,
|
||||
query=query,
|
||||
page=page,
|
||||
has_more=has_more,
|
||||
)
|
||||
return await make_response(html)
|
||||
|
||||
@bp.post("/reorder/")
|
||||
@require_admin
|
||||
async def reorder_menu_items_route():
|
||||
"""Reorder menu items"""
|
||||
from .services.menu_items import reorder_menu_items
|
||||
|
||||
form = await request.form
|
||||
item_ids_str = form.get("item_ids", "")
|
||||
|
||||
if not item_ids_str:
|
||||
return jsonify({"message": "No items to reorder", "errors": {}}), 400
|
||||
|
||||
try:
|
||||
item_ids = [int(id.strip()) for id in item_ids_str.split(",") if id.strip()]
|
||||
except ValueError:
|
||||
return jsonify({"message": "Invalid item IDs", "errors": {}}), 400
|
||||
|
||||
await reorder_menu_items(g.s, item_ids)
|
||||
await g.s.flush()
|
||||
|
||||
# Get updated list and nav OOB
|
||||
menu_items = await get_all_menu_items(g.s)
|
||||
nav_oob = await get_menu_items_nav_oob()
|
||||
|
||||
html = await render_template(
|
||||
"_types/menu_items/_list.html",
|
||||
menu_items=menu_items,
|
||||
)
|
||||
return await make_response(html + nav_oob, 200)
|
||||
|
||||
return bp
|
||||
209
blog/bp/menu_items/services/menu_items.py
Normal file
209
blog/bp/menu_items/services/menu_items.py
Normal file
@@ -0,0 +1,209 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, func
|
||||
from shared.models.menu_node import MenuNode
|
||||
from models.ghost_content import Post
|
||||
from shared.services.relationships import attach_child, detach_child
|
||||
|
||||
|
||||
class MenuItemError(ValueError):
|
||||
"""Base error for menu item service operations."""
|
||||
|
||||
|
||||
async def get_all_menu_items(session: AsyncSession) -> list[MenuNode]:
|
||||
"""
|
||||
Get all menu nodes (excluding deleted), ordered by sort_order.
|
||||
"""
|
||||
result = await session.execute(
|
||||
select(MenuNode)
|
||||
.where(MenuNode.deleted_at.is_(None), MenuNode.depth == 0)
|
||||
.order_by(MenuNode.sort_order.asc(), MenuNode.id.asc())
|
||||
)
|
||||
return list(result.scalars().all())
|
||||
|
||||
|
||||
async def get_menu_item_by_id(session: AsyncSession, item_id: int) -> MenuNode | None:
|
||||
"""Get a menu node by ID (excluding deleted)."""
|
||||
result = await session.execute(
|
||||
select(MenuNode)
|
||||
.where(MenuNode.id == item_id, MenuNode.deleted_at.is_(None))
|
||||
)
|
||||
return result.scalar_one_or_none()
|
||||
|
||||
|
||||
async def create_menu_item(
|
||||
session: AsyncSession,
|
||||
post_id: int,
|
||||
sort_order: int | None = None
|
||||
) -> MenuNode:
|
||||
"""
|
||||
Create a MenuNode + ContainerRelation for a page.
|
||||
If sort_order is not provided, adds to end of list.
|
||||
"""
|
||||
# Verify post exists and is a page
|
||||
post = await session.scalar(
|
||||
select(Post).where(Post.id == post_id)
|
||||
)
|
||||
if not post:
|
||||
raise MenuItemError(f"Post {post_id} does not exist.")
|
||||
|
||||
if not post.is_page:
|
||||
raise MenuItemError("Only pages can be added as menu items, not posts.")
|
||||
|
||||
# If no sort_order provided, add to end
|
||||
if sort_order is None:
|
||||
max_order = await session.scalar(
|
||||
select(func.max(MenuNode.sort_order))
|
||||
.where(MenuNode.deleted_at.is_(None), MenuNode.depth == 0)
|
||||
)
|
||||
sort_order = (max_order or 0) + 1
|
||||
|
||||
# Check for duplicate (same page, not deleted)
|
||||
existing = await session.scalar(
|
||||
select(MenuNode).where(
|
||||
MenuNode.container_type == "page",
|
||||
MenuNode.container_id == post_id,
|
||||
MenuNode.deleted_at.is_(None),
|
||||
)
|
||||
)
|
||||
if existing:
|
||||
raise MenuItemError("Menu item for this page already exists.")
|
||||
|
||||
menu_node = MenuNode(
|
||||
container_type="page",
|
||||
container_id=post_id,
|
||||
label=post.title,
|
||||
slug=post.slug,
|
||||
feature_image=post.feature_image,
|
||||
sort_order=sort_order,
|
||||
)
|
||||
session.add(menu_node)
|
||||
await session.flush()
|
||||
await attach_child(session, "page", post_id, "menu_node", menu_node.id)
|
||||
|
||||
return menu_node
|
||||
|
||||
|
||||
async def update_menu_item(
|
||||
session: AsyncSession,
|
||||
item_id: int,
|
||||
post_id: int | None = None,
|
||||
sort_order: int | None = None
|
||||
) -> MenuNode:
|
||||
"""Update an existing menu node."""
|
||||
menu_node = await get_menu_item_by_id(session, item_id)
|
||||
if not menu_node:
|
||||
raise MenuItemError(f"Menu item {item_id} not found.")
|
||||
|
||||
if post_id is not None:
|
||||
# Verify post exists and is a page
|
||||
post = await session.scalar(
|
||||
select(Post).where(Post.id == post_id)
|
||||
)
|
||||
if not post:
|
||||
raise MenuItemError(f"Post {post_id} does not exist.")
|
||||
|
||||
if not post.is_page:
|
||||
raise MenuItemError("Only pages can be added as menu items, not posts.")
|
||||
|
||||
# Check for duplicate (same page, different menu node)
|
||||
existing = await session.scalar(
|
||||
select(MenuNode).where(
|
||||
MenuNode.container_type == "page",
|
||||
MenuNode.container_id == post_id,
|
||||
MenuNode.id != item_id,
|
||||
MenuNode.deleted_at.is_(None),
|
||||
)
|
||||
)
|
||||
if existing:
|
||||
raise MenuItemError("Menu item for this page already exists.")
|
||||
|
||||
old_post_id = menu_node.container_id
|
||||
menu_node.container_id = post_id
|
||||
menu_node.label = post.title
|
||||
menu_node.slug = post.slug
|
||||
menu_node.feature_image = post.feature_image
|
||||
|
||||
if sort_order is not None:
|
||||
menu_node.sort_order = sort_order
|
||||
|
||||
await session.flush()
|
||||
|
||||
if post_id is not None and post_id != old_post_id:
|
||||
await detach_child(session, "page", old_post_id, "menu_node", menu_node.id)
|
||||
await attach_child(session, "page", post_id, "menu_node", menu_node.id)
|
||||
|
||||
return menu_node
|
||||
|
||||
|
||||
async def delete_menu_item(session: AsyncSession, item_id: int) -> bool:
|
||||
"""Soft delete a menu node."""
|
||||
menu_node = await get_menu_item_by_id(session, item_id)
|
||||
if not menu_node:
|
||||
return False
|
||||
|
||||
menu_node.deleted_at = func.now()
|
||||
await session.flush()
|
||||
await detach_child(session, "page", menu_node.container_id, "menu_node", menu_node.id)
|
||||
|
||||
return True
|
||||
|
||||
|
||||
async def reorder_menu_items(
|
||||
session: AsyncSession,
|
||||
item_ids: list[int]
|
||||
) -> list[MenuNode]:
|
||||
"""
|
||||
Reorder menu nodes by providing a list of IDs in desired order.
|
||||
Updates sort_order for each node.
|
||||
"""
|
||||
items = []
|
||||
for index, item_id in enumerate(item_ids):
|
||||
menu_node = await get_menu_item_by_id(session, item_id)
|
||||
if menu_node:
|
||||
menu_node.sort_order = index
|
||||
items.append(menu_node)
|
||||
|
||||
await session.flush()
|
||||
|
||||
return items
|
||||
|
||||
|
||||
async def search_pages(
|
||||
session: AsyncSession,
|
||||
query: str,
|
||||
page: int = 1,
|
||||
per_page: int = 10
|
||||
) -> tuple[list[Post], int]:
|
||||
"""
|
||||
Search for pages (not posts) by title.
|
||||
Returns (pages, total_count).
|
||||
"""
|
||||
filters = [
|
||||
Post.is_page == True, # noqa: E712
|
||||
Post.status == "published",
|
||||
Post.deleted_at.is_(None)
|
||||
]
|
||||
|
||||
if query:
|
||||
filters.append(Post.title.ilike(f"%{query}%"))
|
||||
|
||||
# Get total count
|
||||
count_result = await session.execute(
|
||||
select(func.count(Post.id)).where(*filters)
|
||||
)
|
||||
total = count_result.scalar() or 0
|
||||
|
||||
# Get paginated results
|
||||
offset = (page - 1) * per_page
|
||||
result = await session.execute(
|
||||
select(Post)
|
||||
.where(*filters)
|
||||
.order_by(Post.title.asc())
|
||||
.limit(per_page)
|
||||
.offset(offset)
|
||||
)
|
||||
pages = list(result.scalars().all())
|
||||
|
||||
return pages, total
|
||||
Reference in New Issue
Block a user