diff --git a/meal-manager/pyproject.toml b/pyproject.toml similarity index 91% rename from meal-manager/pyproject.toml rename to pyproject.toml index d1995ac..69a955f 100644 --- a/meal-manager/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "new-registration-app" +name = "meal-manager" version = "0.1.0" description = "Add your description here" readme = "README.md" @@ -10,6 +10,9 @@ dependencies = [ "sqlalchemy>=2.0.44", "uvicorn[standard]>=0.35.0", ] +[build-system] +requires = ["uv_build>=0.9.0,<0.10.0"] +build-backend = "uv_build" [dependency-groups] dev = [ @@ -19,7 +22,6 @@ dev = [ [tool.isort] profile = "black" - [tool.alembic] # path to migration scripts. diff --git a/src/meal_manager/__init__.py b/src/meal_manager/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/meal-manager/alembic.ini b/src/meal_manager/alembic.ini similarity index 100% rename from meal-manager/alembic.ini rename to src/meal_manager/alembic.ini diff --git a/meal-manager/alembic/README b/src/meal_manager/alembic/README similarity index 100% rename from meal-manager/alembic/README rename to src/meal_manager/alembic/README diff --git a/meal-manager/alembic/env.py b/src/meal_manager/alembic/env.py similarity index 95% rename from meal-manager/alembic/env.py rename to src/meal_manager/alembic/env.py index 68c9ea7..406d133 100644 --- a/meal-manager/alembic/env.py +++ b/src/meal_manager/alembic/env.py @@ -1,9 +1,7 @@ from logging.config import fileConfig -from sqlalchemy import engine_from_config -from sqlalchemy import pool - from alembic import context +from sqlalchemy import engine_from_config, pool # this is the Alembic Config object, which provides # access to the values within the .ini file in use. @@ -18,7 +16,7 @@ if config.config_file_name is not None: # for 'autogenerate' support # from myapp import mymodel # target_metadata = mymodel.Base.metadata -from models import Base +from meal_manager.models import Base target_metadata = Base.metadata diff --git a/meal-manager/alembic/script.py.mako b/src/meal_manager/alembic/script.py.mako similarity index 100% rename from meal-manager/alembic/script.py.mako rename to src/meal_manager/alembic/script.py.mako diff --git a/meal-manager/alembic/versions/2025_10_12_2046-299a83240036_inital_revision.py b/src/meal_manager/alembic/versions/2025_10_12_2046-299a83240036_inital_revision.py similarity index 99% rename from meal-manager/alembic/versions/2025_10_12_2046-299a83240036_inital_revision.py rename to src/meal_manager/alembic/versions/2025_10_12_2046-299a83240036_inital_revision.py index a8fa23e..1718dda 100644 --- a/meal-manager/alembic/versions/2025_10_12_2046-299a83240036_inital_revision.py +++ b/src/meal_manager/alembic/versions/2025_10_12_2046-299a83240036_inital_revision.py @@ -8,9 +8,8 @@ Create Date: 2025-10-12 20:46:13.452705 from typing import Sequence, Union -from alembic import op import sqlalchemy as sa - +from alembic import op # revision identifiers, used by Alembic. revision: str = "299a83240036" diff --git a/meal-manager/main.py b/src/meal_manager/main.py similarity index 97% rename from meal-manager/main.py rename to src/meal_manager/main.py index 9a39f8c..59c926b 100644 --- a/meal-manager/main.py +++ b/src/meal_manager/main.py @@ -11,7 +11,14 @@ from fastapi.templating import Jinja2Templates from sqlalchemy import create_engine, select from sqlalchemy.orm import Session -from models import Base, Event, Household, Registration, Subscription, TeamRegistration +from meal_manager.models import ( + Base, + Event, + Household, + Registration, + Subscription, + TeamRegistration, +) sqlite_file_name = "database.db" sqlite_url = f"sqlite:///{sqlite_file_name}" @@ -38,9 +45,9 @@ async def on_startup(app_: FastAPI): app = FastAPI(lifespan=on_startup) -app.mount("/static", StaticFiles(directory="static"), name="static") +app.mount("/static", StaticFiles(directory="src/meal_manager/static"), name="static") -templates = Jinja2Templates(directory="templates") +templates = Jinja2Templates(directory="src/meal_manager/templates") SessionDep = Annotated[Session, Depends(get_session)] diff --git a/meal-manager/models.py b/src/meal_manager/models.py similarity index 100% rename from meal-manager/models.py rename to src/meal_manager/models.py diff --git a/meal-manager/static/css/allmende.css b/src/meal_manager/static/css/allmende.css similarity index 100% rename from meal-manager/static/css/allmende.css rename to src/meal_manager/static/css/allmende.css diff --git a/meal-manager/static/css/bootstrap-grid.css b/src/meal_manager/static/css/bootstrap-grid.css similarity index 100% rename from meal-manager/static/css/bootstrap-grid.css rename to src/meal_manager/static/css/bootstrap-grid.css diff --git a/meal-manager/static/css/bootstrap-grid.css.map b/src/meal_manager/static/css/bootstrap-grid.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-grid.css.map rename to src/meal_manager/static/css/bootstrap-grid.css.map diff --git a/meal-manager/static/css/bootstrap-grid.min.css b/src/meal_manager/static/css/bootstrap-grid.min.css similarity index 100% rename from meal-manager/static/css/bootstrap-grid.min.css rename to src/meal_manager/static/css/bootstrap-grid.min.css diff --git a/meal-manager/static/css/bootstrap-grid.min.css.map b/src/meal_manager/static/css/bootstrap-grid.min.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-grid.min.css.map rename to src/meal_manager/static/css/bootstrap-grid.min.css.map diff --git a/meal-manager/static/css/bootstrap-grid.rtl.css b/src/meal_manager/static/css/bootstrap-grid.rtl.css similarity index 100% rename from meal-manager/static/css/bootstrap-grid.rtl.css rename to src/meal_manager/static/css/bootstrap-grid.rtl.css diff --git a/meal-manager/static/css/bootstrap-grid.rtl.css.map b/src/meal_manager/static/css/bootstrap-grid.rtl.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-grid.rtl.css.map rename to src/meal_manager/static/css/bootstrap-grid.rtl.css.map diff --git a/meal-manager/static/css/bootstrap-grid.rtl.min.css b/src/meal_manager/static/css/bootstrap-grid.rtl.min.css similarity index 100% rename from meal-manager/static/css/bootstrap-grid.rtl.min.css rename to src/meal_manager/static/css/bootstrap-grid.rtl.min.css diff --git a/meal-manager/static/css/bootstrap-grid.rtl.min.css.map b/src/meal_manager/static/css/bootstrap-grid.rtl.min.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-grid.rtl.min.css.map rename to src/meal_manager/static/css/bootstrap-grid.rtl.min.css.map diff --git a/meal-manager/static/css/bootstrap-reboot.css b/src/meal_manager/static/css/bootstrap-reboot.css similarity index 100% rename from meal-manager/static/css/bootstrap-reboot.css rename to src/meal_manager/static/css/bootstrap-reboot.css diff --git a/meal-manager/static/css/bootstrap-reboot.css.map b/src/meal_manager/static/css/bootstrap-reboot.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-reboot.css.map rename to src/meal_manager/static/css/bootstrap-reboot.css.map diff --git a/meal-manager/static/css/bootstrap-reboot.min.css b/src/meal_manager/static/css/bootstrap-reboot.min.css similarity index 100% rename from meal-manager/static/css/bootstrap-reboot.min.css rename to src/meal_manager/static/css/bootstrap-reboot.min.css diff --git a/meal-manager/static/css/bootstrap-reboot.min.css.map b/src/meal_manager/static/css/bootstrap-reboot.min.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-reboot.min.css.map rename to src/meal_manager/static/css/bootstrap-reboot.min.css.map diff --git a/meal-manager/static/css/bootstrap-reboot.rtl.css b/src/meal_manager/static/css/bootstrap-reboot.rtl.css similarity index 100% rename from meal-manager/static/css/bootstrap-reboot.rtl.css rename to src/meal_manager/static/css/bootstrap-reboot.rtl.css diff --git a/meal-manager/static/css/bootstrap-reboot.rtl.css.map b/src/meal_manager/static/css/bootstrap-reboot.rtl.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-reboot.rtl.css.map rename to src/meal_manager/static/css/bootstrap-reboot.rtl.css.map diff --git a/meal-manager/static/css/bootstrap-reboot.rtl.min.css b/src/meal_manager/static/css/bootstrap-reboot.rtl.min.css similarity index 100% rename from meal-manager/static/css/bootstrap-reboot.rtl.min.css rename to src/meal_manager/static/css/bootstrap-reboot.rtl.min.css diff --git a/meal-manager/static/css/bootstrap-reboot.rtl.min.css.map b/src/meal_manager/static/css/bootstrap-reboot.rtl.min.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-reboot.rtl.min.css.map rename to src/meal_manager/static/css/bootstrap-reboot.rtl.min.css.map diff --git a/meal-manager/static/css/bootstrap-utilities.css b/src/meal_manager/static/css/bootstrap-utilities.css similarity index 100% rename from meal-manager/static/css/bootstrap-utilities.css rename to src/meal_manager/static/css/bootstrap-utilities.css diff --git a/meal-manager/static/css/bootstrap-utilities.css.map b/src/meal_manager/static/css/bootstrap-utilities.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-utilities.css.map rename to src/meal_manager/static/css/bootstrap-utilities.css.map diff --git a/meal-manager/static/css/bootstrap-utilities.min.css b/src/meal_manager/static/css/bootstrap-utilities.min.css similarity index 100% rename from meal-manager/static/css/bootstrap-utilities.min.css rename to src/meal_manager/static/css/bootstrap-utilities.min.css diff --git a/meal-manager/static/css/bootstrap-utilities.min.css.map b/src/meal_manager/static/css/bootstrap-utilities.min.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-utilities.min.css.map rename to src/meal_manager/static/css/bootstrap-utilities.min.css.map diff --git a/meal-manager/static/css/bootstrap-utilities.rtl.css b/src/meal_manager/static/css/bootstrap-utilities.rtl.css similarity index 100% rename from meal-manager/static/css/bootstrap-utilities.rtl.css rename to src/meal_manager/static/css/bootstrap-utilities.rtl.css diff --git a/meal-manager/static/css/bootstrap-utilities.rtl.css.map b/src/meal_manager/static/css/bootstrap-utilities.rtl.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-utilities.rtl.css.map rename to src/meal_manager/static/css/bootstrap-utilities.rtl.css.map diff --git a/meal-manager/static/css/bootstrap-utilities.rtl.min.css b/src/meal_manager/static/css/bootstrap-utilities.rtl.min.css similarity index 100% rename from meal-manager/static/css/bootstrap-utilities.rtl.min.css rename to src/meal_manager/static/css/bootstrap-utilities.rtl.min.css diff --git a/meal-manager/static/css/bootstrap-utilities.rtl.min.css.map b/src/meal_manager/static/css/bootstrap-utilities.rtl.min.css.map similarity index 100% rename from meal-manager/static/css/bootstrap-utilities.rtl.min.css.map rename to src/meal_manager/static/css/bootstrap-utilities.rtl.min.css.map diff --git a/meal-manager/static/css/bootstrap.css b/src/meal_manager/static/css/bootstrap.css similarity index 100% rename from meal-manager/static/css/bootstrap.css rename to src/meal_manager/static/css/bootstrap.css diff --git a/meal-manager/static/css/bootstrap.css.map b/src/meal_manager/static/css/bootstrap.css.map similarity index 100% rename from meal-manager/static/css/bootstrap.css.map rename to src/meal_manager/static/css/bootstrap.css.map diff --git a/meal-manager/static/css/bootstrap.min.css b/src/meal_manager/static/css/bootstrap.min.css similarity index 100% rename from meal-manager/static/css/bootstrap.min.css rename to src/meal_manager/static/css/bootstrap.min.css diff --git a/meal-manager/static/css/bootstrap.min.css.map b/src/meal_manager/static/css/bootstrap.min.css.map similarity index 100% rename from meal-manager/static/css/bootstrap.min.css.map rename to src/meal_manager/static/css/bootstrap.min.css.map diff --git a/meal-manager/static/css/bootstrap.rtl.css b/src/meal_manager/static/css/bootstrap.rtl.css similarity index 100% rename from meal-manager/static/css/bootstrap.rtl.css rename to src/meal_manager/static/css/bootstrap.rtl.css diff --git a/meal-manager/static/css/bootstrap.rtl.css.map b/src/meal_manager/static/css/bootstrap.rtl.css.map similarity index 100% rename from meal-manager/static/css/bootstrap.rtl.css.map rename to src/meal_manager/static/css/bootstrap.rtl.css.map diff --git a/meal-manager/static/css/bootstrap.rtl.min.css b/src/meal_manager/static/css/bootstrap.rtl.min.css similarity index 100% rename from meal-manager/static/css/bootstrap.rtl.min.css rename to src/meal_manager/static/css/bootstrap.rtl.min.css diff --git a/meal-manager/static/css/bootstrap.rtl.min.css.map b/src/meal_manager/static/css/bootstrap.rtl.min.css.map similarity index 100% rename from meal-manager/static/css/bootstrap.rtl.min.css.map rename to src/meal_manager/static/css/bootstrap.rtl.min.css.map diff --git a/meal-manager/static/icons/bootstrap-icons.css b/src/meal_manager/static/icons/bootstrap-icons.css similarity index 100% rename from meal-manager/static/icons/bootstrap-icons.css rename to src/meal_manager/static/icons/bootstrap-icons.css diff --git a/meal-manager/static/icons/bootstrap-icons.json b/src/meal_manager/static/icons/bootstrap-icons.json similarity index 100% rename from meal-manager/static/icons/bootstrap-icons.json rename to src/meal_manager/static/icons/bootstrap-icons.json diff --git a/meal-manager/static/icons/bootstrap-icons.min.css b/src/meal_manager/static/icons/bootstrap-icons.min.css similarity index 100% rename from meal-manager/static/icons/bootstrap-icons.min.css rename to src/meal_manager/static/icons/bootstrap-icons.min.css diff --git a/meal-manager/static/icons/bootstrap-icons.scss b/src/meal_manager/static/icons/bootstrap-icons.scss similarity index 100% rename from meal-manager/static/icons/bootstrap-icons.scss rename to src/meal_manager/static/icons/bootstrap-icons.scss diff --git a/meal-manager/static/icons/fonts/bootstrap-icons.woff b/src/meal_manager/static/icons/fonts/bootstrap-icons.woff similarity index 100% rename from meal-manager/static/icons/fonts/bootstrap-icons.woff rename to src/meal_manager/static/icons/fonts/bootstrap-icons.woff diff --git a/meal-manager/static/icons/fonts/bootstrap-icons.woff2 b/src/meal_manager/static/icons/fonts/bootstrap-icons.woff2 similarity index 100% rename from meal-manager/static/icons/fonts/bootstrap-icons.woff2 rename to src/meal_manager/static/icons/fonts/bootstrap-icons.woff2 diff --git a/meal-manager/static/img/Logo.png b/src/meal_manager/static/img/Logo.png similarity index 100% rename from meal-manager/static/img/Logo.png rename to src/meal_manager/static/img/Logo.png diff --git a/meal-manager/static/js/bootstrap.bundle.js b/src/meal_manager/static/js/bootstrap.bundle.js similarity index 100% rename from meal-manager/static/js/bootstrap.bundle.js rename to src/meal_manager/static/js/bootstrap.bundle.js diff --git a/meal-manager/static/js/bootstrap.bundle.js.map b/src/meal_manager/static/js/bootstrap.bundle.js.map similarity index 100% rename from meal-manager/static/js/bootstrap.bundle.js.map rename to src/meal_manager/static/js/bootstrap.bundle.js.map diff --git a/meal-manager/static/js/bootstrap.bundle.min.js b/src/meal_manager/static/js/bootstrap.bundle.min.js similarity index 100% rename from meal-manager/static/js/bootstrap.bundle.min.js rename to src/meal_manager/static/js/bootstrap.bundle.min.js diff --git a/meal-manager/static/js/bootstrap.bundle.min.js.map b/src/meal_manager/static/js/bootstrap.bundle.min.js.map similarity index 100% rename from meal-manager/static/js/bootstrap.bundle.min.js.map rename to src/meal_manager/static/js/bootstrap.bundle.min.js.map diff --git a/meal-manager/static/js/bootstrap.esm.js b/src/meal_manager/static/js/bootstrap.esm.js similarity index 100% rename from meal-manager/static/js/bootstrap.esm.js rename to src/meal_manager/static/js/bootstrap.esm.js diff --git a/meal-manager/static/js/bootstrap.esm.js.map b/src/meal_manager/static/js/bootstrap.esm.js.map similarity index 100% rename from meal-manager/static/js/bootstrap.esm.js.map rename to src/meal_manager/static/js/bootstrap.esm.js.map diff --git a/meal-manager/static/js/bootstrap.esm.min.js b/src/meal_manager/static/js/bootstrap.esm.min.js similarity index 100% rename from meal-manager/static/js/bootstrap.esm.min.js rename to src/meal_manager/static/js/bootstrap.esm.min.js diff --git a/meal-manager/static/js/bootstrap.esm.min.js.map b/src/meal_manager/static/js/bootstrap.esm.min.js.map similarity index 100% rename from meal-manager/static/js/bootstrap.esm.min.js.map rename to src/meal_manager/static/js/bootstrap.esm.min.js.map diff --git a/meal-manager/static/js/bootstrap.js b/src/meal_manager/static/js/bootstrap.js similarity index 100% rename from meal-manager/static/js/bootstrap.js rename to src/meal_manager/static/js/bootstrap.js diff --git a/meal-manager/static/js/bootstrap.js.map b/src/meal_manager/static/js/bootstrap.js.map similarity index 100% rename from meal-manager/static/js/bootstrap.js.map rename to src/meal_manager/static/js/bootstrap.js.map diff --git a/meal-manager/static/js/bootstrap.min.js b/src/meal_manager/static/js/bootstrap.min.js similarity index 100% rename from meal-manager/static/js/bootstrap.min.js rename to src/meal_manager/static/js/bootstrap.min.js diff --git a/meal-manager/static/js/bootstrap.min.js.map b/src/meal_manager/static/js/bootstrap.min.js.map similarity index 100% rename from meal-manager/static/js/bootstrap.min.js.map rename to src/meal_manager/static/js/bootstrap.min.js.map diff --git a/meal-manager/templates/add_event.html b/src/meal_manager/templates/add_event.html similarity index 100% rename from meal-manager/templates/add_event.html rename to src/meal_manager/templates/add_event.html diff --git a/meal-manager/templates/base.html b/src/meal_manager/templates/base.html similarity index 100% rename from meal-manager/templates/base.html rename to src/meal_manager/templates/base.html diff --git a/meal-manager/templates/event.html b/src/meal_manager/templates/event.html similarity index 100% rename from meal-manager/templates/event.html rename to src/meal_manager/templates/event.html diff --git a/meal-manager/templates/index.html b/src/meal_manager/templates/index.html similarity index 100% rename from meal-manager/templates/index.html rename to src/meal_manager/templates/index.html diff --git a/meal-manager/templates/subscribe.html b/src/meal_manager/templates/subscribe.html similarity index 100% rename from meal-manager/templates/subscribe.html rename to src/meal_manager/templates/subscribe.html diff --git a/meal-manager/uv.lock b/uv.lock similarity index 99% rename from meal-manager/uv.lock rename to uv.lock index df168a7..9015dca 100644 --- a/meal-manager/uv.lock +++ b/uv.lock @@ -333,18 +333,9 @@ wheels = [ ] [[package]] -name = "mypy-extensions" -version = "1.1.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a2/6e/371856a3fb9d31ca8dac321cda606860fa4548858c0cc45d9d1d4ca2628b/mypy_extensions-1.1.0.tar.gz", hash = "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558", size = 6343, upload-time = "2025-04-22T14:54:24.164Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/79/7b/2c79738432f5c924bef5071f933bcc9efd0473bac3b4aa584a6f7c1c8df8/mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", size = 4963, upload-time = "2025-04-22T14:54:22.983Z" }, -] - -[[package]] -name = "new-registration-app" +name = "meal-manager" version = "0.1.0" -source = { virtual = "." } +source = { editable = "." } dependencies = [ { name = "alembic" }, { name = "fastapi", extra = ["standard"] }, @@ -372,6 +363,15 @@ dev = [ { name = "isort", specifier = ">=6.0.1" }, ] +[[package]] +name = "mypy-extensions" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a2/6e/371856a3fb9d31ca8dac321cda606860fa4548858c0cc45d9d1d4ca2628b/mypy_extensions-1.1.0.tar.gz", hash = "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558", size = 6343, upload-time = "2025-04-22T14:54:24.164Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/79/7b/2c79738432f5c924bef5071f933bcc9efd0473bac3b4aa584a6f7c1c8df8/mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", size = 4963, upload-time = "2025-04-22T14:54:22.983Z" }, +] + [[package]] name = "packaging" version = "25.0"