From 2fe10e96443aa0c2391ef6934f1140c259c1646a Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 7 Nov 2022 02:44:31 +0200 Subject: [PATCH] replace cc toggle with holes toggle --- files/routes/front.py | 20 +++++++------- files/routes/users.py | 10 +++++++ files/templates/home.html | 56 ++++++++++++++++++++------------------- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/files/routes/front.py b/files/routes/front.py index a6c931189..83d2be347 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -63,7 +63,6 @@ def front_all(v, sub=None, subdomain=None): sort=request.values.get("sort", defaultsorting) t=request.values.get('t', defaulttime) - ccmode=request.values.get('ccmode', "false").lower() try: gt=int(request.values.get("after", 0)) except: gt=0 @@ -75,18 +74,19 @@ def front_all(v, sub=None, subdomain=None): else: default = False pins = session.get(sort, default) + holes = session.get('holes', True) ids, next_exists = frontlist(sort=sort, page=page, t=t, v=v, - ccmode=ccmode, filter_words=v.filter_words if v else [], gt=gt, lt=lt, sub=sub, site=SITE, - pins=pins + pins=pins, + holes=holes ) posts = get_posts(ids, v=v) @@ -96,12 +96,12 @@ def front_all(v, sub=None, subdomain=None): award_timers(v) if v and v.client: return {"data": [x.json for x in posts], "next_exists": next_exists} - return render_template("home.html", v=v, listing=posts, next_exists=next_exists, sort=sort, t=t, page=page, ccmode=ccmode, sub=sub, home=True, pins=pins) + return render_template("home.html", v=v, listing=posts, next_exists=next_exists, sort=sort, t=t, page=page, sub=sub, home=True, pins=pins, holes=holes) @cache.memoize(timeout=86400) -def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false", filter_words='', gt=0, lt=0, sub=None, site=None, pins=True): +def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='', gt=0, lt=0, sub=None, site=None, pins=True, holes=True): posts = g.db.query(Submission) @@ -118,15 +118,15 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" if not gt and not lt: posts = apply_time_filter(t, posts, Submission) - if (ccmode == "true") and FEATURES['COUNTRY_CLUB']: - posts = posts.filter(Submission.club == True) - posts = posts.filter_by(is_banned=False, private=False, deleted_utc = 0) - if pins and ccmode == "false" and not gt and not lt: + if pins and not gt and not lt: if sub: posts = posts.filter_by(hole_pinned=None) else: posts = posts.filter_by(stickied=None) + if not sub and not holes: + posts = posts.filter_by(sub=None) + if v: posts = posts.filter(Submission.author_id.notin_(v.userblocks)) @@ -151,7 +151,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" next_exists = (len(posts) > size) posts = posts[:size] - if pins and page == 1 and ccmode == "false" and not gt and not lt: + if pins and page == 1 and not gt and not lt: if sub: pins = g.db.query(Submission).filter(Submission.sub == sub.name, Submission.hole_pinned != None) else: diff --git a/files/routes/users.py b/files/routes/users.py index 9dbaacd62..869b67495 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -1011,6 +1011,16 @@ def toggle_pins(sort): return redirect('/') +@app.get("/toggle_holes") +def toggle_holes(): + holes = session.get('holes', True) + session["holes"] = not holes + + if is_site_url(request.referrer): + return redirect(request.referrer) + return redirect('/') + + @app.get("/badge_owners/") @auth_required def bid_list(v, bid): diff --git a/files/templates/home.html b/files/templates/home.html index 19b74c9a6..49964a3b9 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -67,25 +67,27 @@ {% block navbar %}
{% if request.path=='/catalog' %} - Catalog + Catalog {% else %} - Catalog + Catalog {% endif %} {% if pins %} - {% set bcolor = "primary" %} + {% set pcolor = "primary" %} {% else %} - {% set bcolor = "secondary" %} + {% set pcolor = "secondary" %} {% endif %} - Pins - {% if v.paid_dues %} - {% if ccmode=="true" %} - CC - {% else %} - CC - {% endif %} + Pins + + {% if SITE_NAME != 'WPD' and not sub %} + {% if holes %} + {% set hcolor = "primary" %} + {% else %} + {% set hcolor = "secondary" %} {% endif %} + + Holes {% endif %}
@@ -100,12 +102,12 @@ {{t | capitalize}}
- {% if t != "hour" %}Hour{% endif %} - {% if t != "day" %}Day{% endif %} - {% if t != "week" %}Week{% endif %} - {% if t != "month" %}Month{% endif %} - {% if t != "year" %}Year{% endif %} - {% if t != "all" %}All{% endif %} + {% if t != "hour" %}Hour{% endif %} + {% if t != "day" %}Day{% endif %} + {% if t != "week" %}Week{% endif %} + {% if t != "month" %}Month{% endif %} + {% if t != "year" %}Year{% endif %} + {% if t != "all" %}All{% endif %}
@@ -122,14 +124,14 @@ {{sort | capitalize}}
- {% if sort != "hot" %}Hot{% endif %} - {% if sort != "bump" %}Bump{% endif %} - {% if sort != "top" %}Top{% endif %} - {% if sort != "bottom" %}Bottom{% endif %} - {% if sort != "new" %}New{% endif %} - {% if sort != "old" %}Old{% endif %} - {% if sort != "controversial" %}Controversial{% endif %} - {% if sort != "comments" %}Comments{% endif %} + {% if sort != "hot" %}Hot{% endif %} + {% if sort != "bump" %}Bump{% endif %} + {% if sort != "top" %}Top{% endif %} + {% if sort != "bottom" %}Bottom{% endif %} + {% if sort != "new" %}New{% endif %} + {% if sort != "old" %}Old{% endif %} + {% if sort != "controversial" %}Controversial{% endif %} + {% if sort != "comments" %}Comments{% endif %}
@@ -165,14 +167,14 @@