[Feat] Migrate from Pages to Cookbooks (#664)

* feat:  Add Description to Cookbooks

* feat(frontend):  Cookbook view page

* feat(frontend): 💄 Add final UI touches

* fix(backend): 🐛 Add get by slug or id

* fix linting issue

* test(backend):  Update tests from pages -> cookbooks

* refactor(backend): 🔥 Delete old page files

Co-authored-by: hay-kot <hay-kot@pm.me>
This commit is contained in:
Hayden
2021-08-31 18:51:34 -08:00
committed by GitHub
parent 165fd8efd6
commit 9b1bf56a5d
22 changed files with 167 additions and 173 deletions

View File

@@ -44,7 +44,6 @@ def export_database(background_tasks: BackgroundTasks, data: BackupJob, session:
templates=data.templates,
export_recipes=data.options.recipes,
export_settings=data.options.settings,
export_pages=data.options.pages,
export_users=data.options.users,
export_groups=data.options.groups,
export_notifications=data.options.notifications,
@@ -92,7 +91,6 @@ def import_database(
archive=import_data.name,
import_recipes=import_data.recipes,
import_settings=import_data.settings,
import_pages=import_data.pages,
import_users=import_data.users,
import_groups=import_data.groups,
force_import=import_data.force,

View File

@@ -1,7 +1,7 @@
from fastapi import Depends
from mealie.routes.routers import UserAPIRouter
from mealie.schema.cookbook.cookbook import CreateCookBook, ReadCookBook
from mealie.schema.cookbook.cookbook import CreateCookBook, ReadCookBook, RecipeCookBook
from mealie.services.cookbook import CookbookService
user_router = UserAPIRouter(prefix="/groups/cookbooks", tags=["Groups: Cookbooks"])
@@ -28,7 +28,7 @@ def update_many(data: list[ReadCookBook], cb_service: CookbookService = Depends(
return cb_service.update_many(data)
@user_router.get("/{id}", response_model=ReadCookBook)
@user_router.get("/{id}", response_model=RecipeCookBook)
def get_cookbook(cb_service: CookbookService = Depends(CookbookService.write_existing)):
""" Get cookbook from the Database """
# Get Item

View File

@@ -1,10 +1,8 @@
from fastapi import APIRouter
from . import custom_pages, site_settings
from . import site_settings
settings_router = APIRouter()
settings_router.include_router(custom_pages.public_router)
settings_router.include_router(custom_pages.admin_router)
settings_router.include_router(site_settings.public_router)
settings_router.include_router(site_settings.admin_router)

View File

@@ -1,70 +0,0 @@
from typing import Union
from fastapi import APIRouter, Depends
from sqlalchemy.orm.session import Session
from mealie.db.database import db
from mealie.db.db_setup import generate_session
from mealie.routes.routers import AdminAPIRouter
from mealie.schema.admin import CustomPageBase, CustomPageOut
public_router = APIRouter(prefix="/api/site-settings/custom-pages", tags=["Settings"])
admin_router = AdminAPIRouter(prefix="/api/site-settings/custom-pages", tags=["Settings"])
@public_router.get("")
def get_custom_pages(session: Session = Depends(generate_session)):
""" Returns the sites custom pages """
return db.custom_pages.get_all(session)
@admin_router.post("")
async def create_new_page(
new_page: CustomPageBase,
session: Session = Depends(generate_session),
):
""" Creates a new Custom Page """
db.custom_pages.create(session, new_page.dict())
@admin_router.put("")
async def update_multiple_pages(pages: list[CustomPageOut], session: Session = Depends(generate_session)):
""" Update multiple custom pages """
for page in pages:
db.custom_pages.update(session, page.id, page.dict())
@public_router.get("/{id}")
async def get_single_page(
id: Union[int, str],
session: Session = Depends(generate_session),
):
""" Removes a custom page from the database """
if isinstance(id, int):
return db.custom_pages.get(session, id)
elif isinstance(id, str):
return db.custom_pages.get(session, id, "slug")
@admin_router.put("/{id}")
async def update_single_page(
data: CustomPageOut,
id: int,
session: Session = Depends(generate_session),
):
""" Removes a custom page from the database """
return db.custom_pages.update(session, id, data.dict())
@admin_router.delete("/{id}")
async def delete_custom_page(
id: int,
session: Session = Depends(generate_session),
):
""" Removes a custom page from the database """
db.custom_pages.delete(session, id)
return