carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

rename /shop to /shop/awards and /hats to /shop/hats

master
Aevann 2023-02-19 11:34:10 +02:00
parent f74d37e286
commit cb9ffefb7f
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/routes/awards.py
View File

@ -20,7 +20,7 @@ from files.__main__ import app, cache, limiter
from .front import frontlist from .front import frontlist
@app.get("/shop") @app.get("/shop/awards")
@app.get("/settings/shop") @app.get("/settings/shop")
@limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID) @limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID)
@auth_required @auth_required

2
files/routes/hats.py
View File

@ -7,7 +7,7 @@ from files.helpers.useractions import *
from files.routes.wrappers import * from files.routes.wrappers import *
from files.__main__ import app, limiter from files.__main__ import app, limiter
@app.get("/hats") @app.get("/shop/hats")
@limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID) @limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID)
@auth_required @auth_required
def hats(v:User): def hats(v:User):

4
files/templates/hats.html
View File

@ -8,10 +8,10 @@
<div class="col p-0"> <div class="col p-0">
<div class="container" style="padding-bottom: 0;"> <div class="container" style="padding-bottom: 0;">
<div class="row box-shadow-bottom bg-white" style="justify-content: center;"> <div class="row box-shadow-bottom bg-white" style="justify-content: center;">
<a class="btn btn-primary btn-block m-0 shop-tab" href="/shop"> <a class="btn btn-primary btn-block m-0 shop-tab" href="/shop/awards">
<span class="mr-auto ml-auto"><i class="fas fa-gift mr-2"></i>AWARDS</span> <span class="mr-auto ml-auto"><i class="fas fa-gift mr-2"></i>AWARDS</span>
</a> </a>
<a class="btn btn-primary btn-block m-0 shop-tab active" href="/hats"> <a class="btn btn-primary btn-block m-0 shop-tab active" href="/shop/hats">
<span class="mr-auto ml-auto"><i class="fas fa-hat-cowboy mr-2"></i>HATS</span> <span class="mr-auto ml-auto"><i class="fas fa-hat-cowboy mr-2"></i>HATS</span>
</a> </a>
</div> </div>

4
files/templates/header.html
View File

@ -184,7 +184,7 @@
{% if FEATURES['AWARDS'] -%} {% if FEATURES['AWARDS'] -%}
<li class="nav-item d-none d-lg-flex align-items-center justify-content-center text-center mx-1"> <li class="nav-item d-none d-lg-flex align-items-center justify-content-center text-center mx-1">
<a class="nav-link" href="/shop" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Shop"><i class="fas fa-store"></i></a> <a class="nav-link" href="/shop/awards" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Shop"><i class="fas fa-store"></i></a>
</li> </li>
{%- endif %} {%- endif %}
@ -200,7 +200,7 @@
<img loading="lazy" src="{{v.profile_url}}" class="profile-pic-35"> <img loading="lazy" src="{{v.profile_url}}" class="profile-pic-35">
{% if v.hat_active(v)[0] -%} {% if v.hat_active(v)[0] -%}
<img id="profile-pic-35-hat" class="profile-pic-35-hat hat" loading="lazy" src="{{v.hat_active(v)[0]}}?h=7"> <img id="profile-pic-35-hat" class="profile-pic-35-hat hat" loading="lazy" src="{{v.hat_active(v)[0]}}?h=7">
{% elif request.path == '/hats' %} {% elif request.path == '/shop/hats' %}
<img id="profile-pic-35-hat" class="profile-pic-35-hat hat d-none" loading="lazy"> <img id="profile-pic-35-hat" class="profile-pic-35-hat hat d-none" loading="lazy">
{%- endif %} {%- endif %}
</div> </div>

4
files/templates/mobile_navigation_bar.html
View File

@ -58,8 +58,8 @@
{%- endif %} {%- endif %}
{% if FEATURES['AWARDS'] -%} {% if FEATURES['AWARDS'] -%}
<button type="button" class="col px-0 mr-3 btn btn-dead m-0" style="background: None !important; border: None;"> <button type="button" class="col px-0 mr-3 btn btn-dead m-0" style="background: None !important; border: None;">
<a href="/shop" class="text-decoration-none"> <a href="/shop/awards" class="text-decoration-none">
<div class="text-center {% if request.path=='/shop' %}text-primary{% else %}text-muted{% endif %}"> <div class="text-center {% if request.path=='/shop/awards' %}text-primary{% else %}text-muted{% endif %}">
<i class="fas fa-store text-lg"></i> <i class="fas fa-store text-lg"></i>
<div class="text-small">Shop</div> <div class="text-small">Shop</div>
</div> </div>

4
files/templates/shop.html
View File

@ -12,10 +12,10 @@
<div class="col p-0"> <div class="col p-0">
<div class="container" style="padding-bottom: 0;"> <div class="container" style="padding-bottom: 0;">
<div class="row box-shadow-bottom bg-white" style="justify-content: center;"> <div class="row box-shadow-bottom bg-white" style="justify-content: center;">
<a class="btn btn-primary btn-block m-0 shop-tab active" href="/shop"> <a class="btn btn-primary btn-block m-0 shop-tab active" href="/shop/awards">
<span class="mr-auto ml-auto"><i class="fas fa-gift mr-2"></i>AWARDS</span> <span class="mr-auto ml-auto"><i class="fas fa-gift mr-2"></i>AWARDS</span>
</a> </a>
<a class="btn btn-primary btn-block m-0 shop-tab" href="/hats"> <a class="btn btn-primary btn-block m-0 shop-tab" href="/shop/hats">
<span class="mr-auto ml-auto"><i class="fas fa-hat-cowboy mr-2"></i>HATS</span> <span class="mr-auto ml-auto"><i class="fas fa-hat-cowboy mr-2"></i>HATS</span>
</a> </a>
</div> </div>