From 4ebc1e4bf653f21d12634c3c7c67c15d9f2efd28 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Fri, 5 Feb 2021 12:10:29 +0000 Subject: [PATCH] WIP type pages --- app/blueprints/homepage/__init__.py | 15 +++++++++++++-- app/blueprints/packages/packages.py | 3 --- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/blueprints/homepage/__init__.py b/app/blueprints/homepage/__init__.py index 3e2e79a..f99f916 100644 --- a/app/blueprints/homepage/__init__.py +++ b/app/blueprints/homepage/__init__.py @@ -1,14 +1,15 @@ from flask import Blueprint, render_template +from sqlalchemy import func bp = Blueprint("homepage", __name__) from app.models import * import flask_menu as menu from sqlalchemy.orm import joinedload -from sqlalchemy.sql.expression import func -@bp.route("/") + @menu.register_menu(bp, ".", "Home") +@bp.route("/") def home(): def join(query): return query.options( @@ -41,3 +42,13 @@ def home(): return render_template("index.html", count=count, downloads=downloads, tags=tags, new=new, updated=updated, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam, high_reviewed=high_reviewed, reviews=reviews) + + +@menu.register_menu(bp, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' }) +@menu.register_menu(bp, ".games", "Games", order=12, endpoint_arguments_constructor=lambda: { 'type': 'game' }) +@menu.register_menu(bp, ".txp", "Texture Packs", order=13, endpoint_arguments_constructor=lambda: { 'type': 'txp' }) +@bp.route("/games/", defaults={ "type": "GAME" }) +@bp.route("/mods/", defaults={ "type": "MOD" }) +@bp.route("/texture_packs/", defaults={ "type": "TXP" }) +def type_page(type_name): + return type_name diff --git a/app/blueprints/packages/packages.py b/app/blueprints/packages/packages.py index 13e857c..bc16ade 100644 --- a/app/blueprints/packages/packages.py +++ b/app/blueprints/packages/packages.py @@ -37,9 +37,6 @@ from ...logic.LogicError import LogicError from ...logic.packages import do_edit_package -@menu.register_menu(bp, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' }) -@menu.register_menu(bp, ".games", "Games", order=12, endpoint_arguments_constructor=lambda: { 'type': 'game' }) -@menu.register_menu(bp, ".txp", "Texture Packs", order=13, endpoint_arguments_constructor=lambda: { 'type': 'txp' }) @menu.register_menu(bp, ".random", "Random", order=14, endpoint_arguments_constructor=lambda: { 'random': '1', 'lucky': '1' }) @bp.route("/packages/") def list_all():