stranck-dev #31
1
app.py
1
app.py
|
@ -82,6 +82,7 @@ async def main_start(*_):
|
||||||
app.ctx.tpl = Environment(loader=FileSystemLoader("tpl"), autoescape=True)
|
app.ctx.tpl = Environment(loader=FileSystemLoader("tpl"), autoescape=True)
|
||||||
app.ctx.tpl.globals.update(time=time)
|
app.ctx.tpl.globals.update(time=time)
|
||||||
app.ctx.tpl.globals.update(PROPIC_DEADLINE=PROPIC_DEADLINE)
|
app.ctx.tpl.globals.update(PROPIC_DEADLINE=PROPIC_DEADLINE)
|
||||||
|
app.ctx.tpl.globals.update(ROOM_DEADLINE=ROOM_DEADLINE)
|
||||||
app.ctx.tpl.globals.update(LOCALES=LOCALES)
|
app.ctx.tpl.globals.update(LOCALES=LOCALES)
|
||||||
app.ctx.tpl.globals.update(ITEMS_ID_MAP=ITEMS_ID_MAP)
|
app.ctx.tpl.globals.update(ITEMS_ID_MAP=ITEMS_ID_MAP)
|
||||||
app.ctx.tpl.globals.update(ITEM_VARIATIONS_MAP=ITEM_VARIATIONS_MAP)
|
app.ctx.tpl.globals.update(ITEM_VARIATIONS_MAP=ITEM_VARIATIONS_MAP)
|
||||||
|
|
|
@ -17,6 +17,8 @@ PROPIC_MAX_FILE_SIZE = 5 * 1024 * 1024 # 5MB
|
||||||
PROPIC_MAX_SIZE = (2048, 2048) # (Width, Height)
|
PROPIC_MAX_SIZE = (2048, 2048) # (Width, Height)
|
||||||
PROPIC_MIN_SIZE = (125, 125) # (Width, Height)
|
PROPIC_MIN_SIZE = (125, 125) # (Width, Height)
|
||||||
|
|
||||||
|
ROOM_DEADLINE = 9999999999
|
||||||
|
|
||||||
# This is used for feedback sending inside of the app. Feedbacks will be sent to the specified chat using the bot api id.
|
# This is used for feedback sending inside of the app. Feedbacks will be sent to the specified chat using the bot api id.
|
||||||
TG_BOT_API = '123456789:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
|
TG_BOT_API = '123456789:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
|
||||||
TG_CHAT_ID = -1234567
|
TG_CHAT_ID = -1234567
|
||||||
|
|
11
room.py
11
room.py
|
@ -6,9 +6,18 @@ from config import headers
|
||||||
import os
|
import os
|
||||||
from image_util import generate_room_preview, get_room
|
from image_util import generate_room_preview, get_room
|
||||||
from utils import confirm_room_by_order
|
from utils import confirm_room_by_order
|
||||||
|
from time import time
|
||||||
|
|
||||||
bp = Blueprint("room", url_prefix="/manage/room")
|
bp = Blueprint("room", url_prefix="/manage/room")
|
||||||
|
|
||||||
|
@bp.middleware
|
||||||
|
async def deadline_check(request: Request):
|
||||||
|
order = await get_order(request)
|
||||||
|
if not order:
|
||||||
|
raise exceptions.Forbidden("You have been logged out. Please access the link in your E-Mail to login again!")
|
||||||
|
if time() > ROOM_DEADLINE and not await isSessionAdmin(request, order):
|
||||||
|
raise exceptions.BadRequest("The deadline has passed. You cannot modify the room at this moment.")
|
||||||
|
|
||||||
@bp.post("/create")
|
@bp.post("/create")
|
||||||
async def room_create_post(request, order: Order):
|
async def room_create_post(request, order: Order):
|
||||||
if not order: raise exceptions.Forbidden("You have been logged out. Please access the link in your E-Mail to login again!")
|
if not order: raise exceptions.Forbidden("You have been logged out. Please access the link in your E-Mail to login again!")
|
||||||
|
@ -304,7 +313,7 @@ async def confirm_room(request, order: Order, quotas: Quotas):
|
||||||
#if quotas.get_left(len(order.room_members)) == 0:
|
#if quotas.get_left(len(order.room_members)) == 0:
|
||||||
# raise exceptions.BadRequest("There are no more rooms of this size to reserve.")
|
# raise exceptions.BadRequest("There are no more rooms of this size to reserve.")
|
||||||
|
|
||||||
confirm_room_by_order(order, request)
|
await confirm_room_by_order(order, request)
|
||||||
|
|
||||||
return redirect('/manage/welcome')
|
return redirect('/manage/welcome')
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
{% if person.status == 'pending' %}
|
{% if person.status == 'pending' %}
|
||||||
<p><strong style="color:red;">UNPAID</strong></p>
|
<p><strong style="color:red;">UNPAID</strong></p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if order.room_owner and person.code != order.code and (not order.room_confirmed) %}<a href="/manage/room/kick/{{person.code}}">KICK</a>{% endif %}
|
{% if order.room_owner and person.code != order.code and (not order.room_confirmed) and (time() <= ROOM_DEADLINE or isSessionAdmin) %}<a href="/manage/room/kick/{{person.code}}">KICK</a>{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if person.status != 'paid' %}
|
{% if person.status != 'paid' %}
|
||||||
|
@ -51,7 +51,7 @@
|
||||||
{# {% if order.room_id == order.code and not order.room_confirmed and len(room_members) < 5%} #}
|
{# {% if order.room_id == order.code and not order.room_confirmed and len(room_members) < 5%} #}
|
||||||
{% if order.room_id == order.code and not order.room_confirmed and len(room_members) < order.room_person_no %}
|
{% if order.room_id == order.code and not order.room_confirmed and len(room_members) < order.room_person_no %}
|
||||||
<div>
|
<div>
|
||||||
<a href="javascript:document.getElementById('modal-roominvite').setAttribute('open', 'true');">
|
<a {% if time() <= ROOM_DEADLINE or isSessionAdmin %} href="javascript:document.getElementById('modal-roominvite').setAttribute('open', 'true');" {% else %} disabled {% endif %}>
|
||||||
<div class="propic-container">
|
<div class="propic-container">
|
||||||
<img class="propic" src="/res/new.png" />
|
<img class="propic" src="/res/new.png" />
|
||||||
<h3>Invite</h3>
|
<h3>Invite</h3>
|
||||||
|
@ -63,13 +63,13 @@
|
||||||
</div>
|
</div>
|
||||||
{% elif order.pending_room %}
|
{% elif order.pending_room %}
|
||||||
<p>You have have asked to join the room of another member. Wait for them to confirm or reject your request.</p>
|
<p>You have have asked to join the room of another member. Wait for them to confirm or reject your request.</p>
|
||||||
<a role="button" href="/manage/room/cancel_request">Cancel pending join request</a>
|
<a role="button" href="/manage/room/cancel_request" {{'disabled' if time() > ROOM_DEADLINE and not isSessionAdmin else ''}}>Cancel pending join request</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<p class="notice">🎲 If you don't join a room or create your one within the room deadline, we will randomly put you into a room with free spots.</p>
|
<p class="notice">🎲 If you don't join a room or create your one within the room deadline, we will randomly put you into a room with free spots.</p>
|
||||||
<p>To join a room, ask somebody to send you their room code.</p>
|
<p>To join a room, ask somebody to send you their room code.</p>
|
||||||
<p class="grid">
|
<p class="grid">
|
||||||
<a role="button" href="/manage/room/create">Create a room</a>
|
<a role="button" href="/manage/room/create" {{'disabled' if time() > ROOM_DEADLINE and not isSessionAdmin else ''}}>Create a room</a>
|
||||||
<a role="button" href="javascript:document.getElementById('modal-joinroom').setAttribute('open', 'true');">Join a room</a>
|
<a role="button" href="javascript:document.getElementById('modal-joinroom').setAttribute('open', 'true');" {{'disabled' if time() > ROOM_DEADLINE and not isSessionAdmin else ''}}>Join a room</a>
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@ -83,17 +83,17 @@
|
||||||
{% if order.room_owner %}
|
{% if order.room_owner %}
|
||||||
|
|
||||||
{% if not order.room_confirmed %}
|
{% if not order.room_confirmed %}
|
||||||
{# <a role="button" {% if not room.forbidden and quota.get_left(len(room_members)) > 0 %}href="javascript:document.getElementById('modal-roomconfirm').setAttribute('open', 'true');"{% endif %}>Confirm <strong>{{[None,'single','double','triple','quadruple','quintuple'][len(room_members)]}}</strong> room</a> #}
|
{# <a role="button" {{'disabled' if time() > ROOM_DEADLINE and not isSessionAdmin else ''}} {% if not room.forbidden and quota.get_left(len(room_members)) > 0 %}href="javascript:document.getElementById('modal-roomconfirm').setAttribute('open', 'true');"{% endif %}>Confirm <strong>{{[None,'single','double','triple','quadruple','quintuple'][len(room_members)]}}</strong> room</a> #}
|
||||||
|
|
||||||
<a style="grid-area: 1 / 1 / 2 / 2;" role="button" href="javascript:document.getElementById('modal-roomrename').setAttribute('open', 'true');">Rename room</a>
|
<a style="grid-area: 1 / 1 / 2 / 2;" role="button" href="javascript:document.getElementById('modal-roomrename').setAttribute('open', 'true');" {{'disabled' if time() > ROOM_DEADLINE and not isSessionAdmin else ''}}>Rename room</a>
|
||||||
<a style="grid-area: 1 / 2 / 2 / 3;" href="/manage/room/delete" role="button" {{'disabled' if (len(room_members) > 1) else ''}} >Delete room</a>
|
<a style="grid-area: 1 / 2 / 2 / 3;" href="/manage/room/delete" role="button" {{'disabled' if (len(room_members) > 1) or (time() > ROOM_DEADLINE and not isSessionAdmin) else ''}} >Delete room</a>
|
||||||
<a style="grid-area: 2 / 1 / 3 / 3; display:block;" role="button" {% if not room.forbidden and len(room_members) == order.room_person_no %}href="javascript:document.getElementById('modal-roomconfirm').setAttribute('open', 'true');"{% endif %}>Confirm <strong>{{[None,'single','double','triple','quadruple','quintuple'][order.room_person_no]}}</strong> room</a>
|
<a style="grid-area: 2 / 1 / 3 / 3; display:block;" role="button" {{'disabled' if time() > ROOM_DEADLINE and not isSessionAdmin else ''}} {% if not room.forbidden and len(room_members) == order.room_person_no %}href="javascript:document.getElementById('modal-roomconfirm').setAttribute('open', 'true');"{% endif %}>Confirm <strong>{{[None,'single','double','triple','quadruple','quintuple'][order.room_person_no]}}</strong> room</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
{# <a style="grid-area: 1 / 1 / 2 / 2;" role="button" href="javascript:navigator.share({title: 'Furizon room', text:'Viewing room {{order.room_name}}', url: `${window.location.protocol}//${window.location.host}/manage/room/view/{{order.code}}}`});">Share</a> #}
|
{# <a style="grid-area: 1 / 1 / 2 / 2;" role="button" {{'disabled' if time() > ROOM_DEADLINE and not isSessionAdmin else ''}} href="javascript:navigator.share({title: 'Furizon room', text:'Viewing room {{order.room_name}}', url: `${window.location.protocol}//${window.location.host}/manage/room/view/{{order.code}}}`});">Share</a> #}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% if order.room_id and not order.room_confirmed %}
|
{% if order.room_id and not order.room_confirmed %}
|
||||||
<a href="/manage/room/leave" role="button">Leave room</a>
|
<a href="/manage/room/leave" role="button" {{'disabled' if time() > ROOM_DEADLINE and not isSessionAdmin else ''}}>Leave room</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</p>
|
</p>
|
||||||
|
@ -111,8 +111,8 @@
|
||||||
<td><strong style="color:red;">UNPAID</strong></td>
|
<td><strong style="color:red;">UNPAID</strong></td>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if order.room_owner %}
|
{% if order.room_owner %}
|
||||||
<td style="width:1%;white-space: nowrap;"><a role="button" href="/manage/room/approve/{{person.code}}">Approve</a></td>
|
<td style="width:1%;white-space: nowrap;"><a role="button" href="/manage/room/approve/{{person.code}}" {{'disabled' if time() > ROOM_DEADLINE and not isSessionAdmin else ''}}>Approve</a></td>
|
||||||
<td style="width:1%;white-space: nowrap;"><a role="button" href="/manage/room/reject/{{person.code}}">Reject</a></td>
|
<td style="width:1%;white-space: nowrap;"><a role="button" href="/manage/room/reject/{{person.code}}" {{'disabled' if time() > ROOM_DEADLINE and not isSessionAdmin else ''}}>Reject</a></td>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</tr>
|
</tr>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue