From e1a87c34077f5e960cf5d577a851802f8759547a Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Mon, 17 Jan 2022 13:10:59 -0800 Subject: [PATCH] housekeep: move pkgbase templates to their own dir Signed-off-by: Kevin Morris --- aurweb/routers/packages.py | 2 +- aurweb/routers/pkgbase.py | 20 +++++++++---------- .../{packages.html => packages/index.html} | 0 .../{packages => pkgbase}/comments/edit.html | 0 templates/{packages => pkgbase}/delete.html | 0 templates/{packages => pkgbase}/disown.html | 0 .../{packages => pkgbase}/flag-comment.html | 0 templates/{packages => pkgbase}/flag.html | 0 .../{pkgbase.html => pkgbase/index.html} | 0 9 files changed, 11 insertions(+), 11 deletions(-) rename templates/{packages.html => packages/index.html} (100%) rename templates/{packages => pkgbase}/comments/edit.html (100%) rename templates/{packages => pkgbase}/delete.html (100%) rename templates/{packages => pkgbase}/disown.html (100%) rename templates/{packages => pkgbase}/flag-comment.html (100%) rename templates/{packages => pkgbase}/flag.html (100%) rename templates/{pkgbase.html => pkgbase/index.html} (100%) diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py index bb67f2fe..79c6a404 100644 --- a/aurweb/routers/packages.py +++ b/aurweb/routers/packages.py @@ -112,7 +112,7 @@ async def packages_get(request: Request, context: Dict[str, Any], context["packages"] = packages context["packages_count"] = num_packages - return render_template(request, "packages.html", context, + return render_template(request, "packages/index.html", context, status_code=status_code) diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py index 510ca467..3aa73a02 100644 --- a/aurweb/routers/pkgbase.py +++ b/aurweb/routers/pkgbase.py @@ -48,7 +48,7 @@ async def pkgbase(request: Request, name: str) -> Response: context = pkgbaseutil.make_context(request, pkgbase) context["packages"] = pkgbase.packages.all() - return render_template(request, "pkgbase.html", context) + return render_template(request, "pkgbase/index.html", context) @router.get("/pkgbase/{name}/voters") @@ -84,7 +84,7 @@ async def pkgbase_flag_comment(request: Request, name: str): context = templates.make_context(request, "Flag Comment") context["pkgbase"] = pkgbase - return render_template(request, "packages/flag-comment.html", context) + return render_template(request, "pkgbase/flag-comment.html", context) @router.post("/pkgbase/{name}/keywords") @@ -126,7 +126,7 @@ async def pkgbase_flag_get(request: Request, name: str): context = templates.make_context(request, "Flag Package Out-Of-Date") context["pkgbase"] = pkgbase - return render_template(request, "packages/flag.html", context) + return render_template(request, "pkgbase/flag.html", context) @router.post("/pkgbase/{name}/flag") @@ -140,7 +140,7 @@ async def pkgbase_flag_post(request: Request, name: str, context["pkgbase"] = pkgbase context["errors"] = ["The selected packages have not been flagged, " "please enter a comment."] - return render_template(request, "packages/flag.html", context, + return render_template(request, "pkgbase/flag.html", context, status_code=HTTPStatus.BAD_REQUEST) has_cred = request.user.has_credential(creds.PKGBASE_FLAG) @@ -248,7 +248,7 @@ async def pkgbase_comment_edit(request: Request, name: str, id: int, context = await make_variable_context(request, "Edit comment", next=next) context["comment"] = comment - return render_template(request, "packages/comments/edit.html", context) + return render_template(request, "pkgbase/comments/edit.html", context) @router.post("/pkgbase/{name}/comments/{id}") @@ -519,7 +519,7 @@ async def pkgbase_disown_get(request: Request, name: str): context = templates.make_context(request, "Disown Package") context["pkgbase"] = pkgbase - return render_template(request, "packages/disown.html", context) + return render_template(request, "pkgbase/disown.html", context) @router.post("/pkgbase/{name}/disown") @@ -540,7 +540,7 @@ async def pkgbase_disown_post(request: Request, name: str, if not confirm: context["errors"] = [("The selected packages have not been disowned, " "check the confirmation checkbox.")] - return render_template(request, "packages/disown.html", context, + return render_template(request, "pkgbase/disown.html", context, status_code=HTTPStatus.BAD_REQUEST) with db.begin(): @@ -550,7 +550,7 @@ async def pkgbase_disown_post(request: Request, name: str, actions.pkgbase_disown_instance(request, pkgbase) except InvariantError as exc: context["errors"] = [str(exc)] - return render_template(request, "packages/disown.html", context, + return render_template(request, "pkgbase/disown.html", context, status_code=HTTPStatus.BAD_REQUEST) return RedirectResponse(f"/pkgbase/{name}", @@ -739,7 +739,7 @@ async def pkgbase_delete_get(request: Request, name: str): context = templates.make_context(request, "Package Deletion") context["pkgbase"] = get_pkg_or_base(name, PackageBase) - return render_template(request, "packages/delete.html", context) + return render_template(request, "pkgbase/delete.html", context) @router.post("/pkgbase/{name}/delete") @@ -758,7 +758,7 @@ async def pkgbase_delete_post(request: Request, name: str, context["pkgbase"] = pkgbase context["errors"] = [("The selected packages have not been deleted, " "check the confirmation checkbox.")] - return render_template(request, "packages/delete.html", context, + return render_template(request, "pkgbase/delete.html", context, status_code=HTTPStatus.BAD_REQUEST) if comments: diff --git a/templates/packages.html b/templates/packages/index.html similarity index 100% rename from templates/packages.html rename to templates/packages/index.html diff --git a/templates/packages/comments/edit.html b/templates/pkgbase/comments/edit.html similarity index 100% rename from templates/packages/comments/edit.html rename to templates/pkgbase/comments/edit.html diff --git a/templates/packages/delete.html b/templates/pkgbase/delete.html similarity index 100% rename from templates/packages/delete.html rename to templates/pkgbase/delete.html diff --git a/templates/packages/disown.html b/templates/pkgbase/disown.html similarity index 100% rename from templates/packages/disown.html rename to templates/pkgbase/disown.html diff --git a/templates/packages/flag-comment.html b/templates/pkgbase/flag-comment.html similarity index 100% rename from templates/packages/flag-comment.html rename to templates/pkgbase/flag-comment.html diff --git a/templates/packages/flag.html b/templates/pkgbase/flag.html similarity index 100% rename from templates/packages/flag.html rename to templates/pkgbase/flag.html diff --git a/templates/pkgbase.html b/templates/pkgbase/index.html similarity index 100% rename from templates/pkgbase.html rename to templates/pkgbase/index.html