From b38e98022e235a3ed31ff84a8d00eb7cd0a8e163 Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 8 Jan 2023 21:23:52 +0100 Subject: [PATCH] Improvement to UX/UI --- tpl/base.html | 56 +++++++- tpl/welcome.html | 361 ++++++++++++++--------------------------------- 2 files changed, 159 insertions(+), 258 deletions(-) diff --git a/tpl/base.html b/tpl/base.html index a91c9bd..fcdc5aa 100644 --- a/tpl/base.html +++ b/tpl/base.html @@ -3,14 +3,24 @@ {% block title %}{% endblock %} - + + + {% block main %}{% endblock %} + + diff --git a/tpl/welcome.html b/tpl/welcome.html index f09bab5..ccd29d5 100644 --- a/tpl/welcome.html +++ b/tpl/welcome.html @@ -3,271 +3,124 @@ {% block main %}
-

{{order.name}}'s Booking

-

ℹ️ If you haven't done it yet, click here to join our chat on Telegram!

+ + + +
- -
-

Payment

- {% if order.status == 'pending' %} -

⚠️ Your order is still pending due to incomplete payment. You will not be able to reserve a room for now. However, you will be able to create one with your friends and confirm it once all attendants have completed the order!

-

If you wish to change payment method, check payment instructions or complete a failed payment please access the payment area.

- - {% elif order.status == 'paid' %} -

✅ Your order has been completed and approved! See you at furizon!

- {% endif %} +

From here, you can easily manage all aspects of your booking, including composing your hotel room, designing your badge, and updating your payment information. Simply use the buttons below to navigate between the different sections.

+

Buttons marked with ⚠️ require your attention

+ +

If you have any questions or issues while using this page, please don't hesitate to contact us for assistance. We look forward to seeing you at Furizon Beyond!

+
+

Useful information

+ + + + + + + + + + + + + +
Where? + Park Hotel Sacro Cuore · Cavalese (TN) +
When?30 May → 3 June 2023
Your ticket + + Show Check-in Barcode ({{order.code}}) + {% if order.status == 'paid' and order.room_confirmed %} +
+ + Download ticket PDF + {% endif %} +
+ +

Manage your booking

+ {% include 'blocks/payment.html' %} + {% include 'blocks/room.html' %} + {% include 'blocks/badge.html' %} + + +
+ Barcard +

This year's badges will be NFC-enabled and serve as a digital barcard, allowing you to load 'drinks' onto your badge and use it to purchase beverages at the bar without the need for physical cash or the risk of losing a paper barcard. The barcard system will be enabled closer to the convention, so you will have the opportunity to load your badge in advance and enjoy a convenient, cashless experience at the event. Keep an eye out for updates on when the system will be live and available for use.

+
+ +

Get to know others

+
+ Attendee list +

If you want to find out where your friends are staying at the convention, just click this link to see a list of all attendees and their assigned rooms. You'll be able to see which rooms are already occupied and by whom, so you can easily plan meet-ups with your friends.

+ Nose count +
+ + +
+ Group Chat & Channels +

We encourage you to join these groups and participate in the conversations so you can stay in the loop and connect with other attendees. To join the groups, simply click on the links provided down below!

- - + + - - + +
Reference ID{{order.code}}Noticeboard@APSFurizon
Order total{{order.data['total']}}€ by {{'Credit card' if order.data['payment_provider'] == 'stripe' else 'Bank Transfer'}}Group Chathttps://t.me/+H-vcfRyHQAxkODk8
- {% if order.status == 'paid' and order.room_confirmed %} -

Download ticket

- {% endif %} - {% if order.status != 'paid' %} - - {% endif %} -
- - -
-

Your room {% if room_members %}- {{room_members[0].ans('room_name')}}{% endif %}

- - {# Show alert if room owner has wrong people inside #} - {% if order.room_owner and quota.get_left(len(room_members)) == 0 and (not order.room_confirmed) %} -

⚠️ Your room contains {{len(room_members)}} people inside, but sadly there are 0 rooms of this size available. Add or remove people until you reach the size of an available room.

- {% endif %} - - {# Show alert if room was not confirmed #} - {% if order.room_id and not order.room_confirmed %} -

⚠️ Your room hasn't been confirmed yet. Unconfirmed rooms are subject to changes by the staff as we optimize for hotel capacity.

- {% endif %} - - {# Show notice if the room is confirmed #} - {% if order.room_confirmed %} -

✅ Your {{[None,'single','double','triple','quadruple','quintuple'][len(room_members)]}} room has been confirmed

- {% endif %} - - {# Show roommates if room is set #} - {% if order.room_id %} -
- {% set room = namespace(forbidden=false) %} - {% for person in room_members %} -
- -

{{person.ans('fursona_name')}}

- {% if person.code == order.room_id %}

ROOM OWNER

{% endif %} -

{{person.ans('staff_title') if person.ans('staff_title') else ''}} {{'Fursuiter' if person.ans('is_fursuiter') != 'No'}}

- {% if person.status == 'pending' %} -

UNPAID

- {% endif %} - {% if order.room_owner and person.code != order.code and (not order.room_confirmed) %}KICK{% endif %} -
- - {% if person.status != 'paid' %} - {% set room.forbidden = True %} - {% endif %} - {% endfor %} - - {% if order.room_id == order.code and not order.room_confirmed and len(room_members) < 5 %} -
- - -

Invite

-

Get room code

- -
- {% endif %} -
- {% elif order.pending_room %} -

You have have asked to join the room of another member. Wait for them to confirm or reject your request.

- Cancel pending join request - {% else %} -

🎲 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.

-

To join a room, ask somebody to send you their room code.

-

- Create a room - Join a room -

- {% endif %} - - {% if order.room_owner %} - {% if quota.get_left(len(room_members)) == 0 %} -

⚠️ There are no more {{[None,'single','double','triple','quadruple','quintuple'][len(room_members)]}}, therefore you will not be able to confirm this room. Please add or remove people until you reach an available room.

- {% elif room.forbidden %} -

⚠️ There are roommates for which a payment was not received yet, you will be able to confirm this room only once all payments are completed.

- {% endif %} - {% endif %} - -

- {% if order.room_owner %} - {% if len(room_members) == 1 and not order.room_confirmed %} - Delete room - {% endif %} - - {% if not order.room_confirmed %} - 0 %}href="javascript:document.getElementById('modal-roomconfirm').setAttribute('open', 'true');"{% endif %}>Confirm {{[None,'single','double','triple','quadruple','quintuple'][len(room_members)]}} room - {% endif %} - {% else %} - {% if order.room_id and not order.room_confirmed %} - Leave room - {% endif %} - {% endif %} -

- - {# Pending roommates #} - {% if pending_roommates %} -

Pending roommates

-

These people have asked to join your room.

- - {% for person in pending_roommates %} - - - - {% if person.status == 'pending' %} - - {% endif %} - - - - - - {% if person.status != 'paid' %} - {% set room.forbidden = True %} - {% endif %} - {% endfor %} -
{{person.name}}UNPAIDApproveReject
- {% endif %} - - {# Room availability is always shown #} - {% if not order.room_confirmed %} -

Room availability

- - {% for q in quota.data['results'] if 'Room' in q['name'] %} - - - - - {% endfor %} -
{{q['name']}}{{q['available_number']}} left
- {% endif %} -
- -
- {# Badge is always shown #} -

Badge

- {% if (not order.ans('propic')) or (order.ans('is_fursuiter') != 'No' and not order.ans('propic_fursuiter')) %} -

⚠️ One or more badge pictures are missing! This will cause you badge to be empty, so make sure to upload something before the deadline!

-

⚠️ Photos must be suitable for any audience. Any inappropriate pictures will be removed by the staff

- {% endif %} -
-
-
- {% if not order.ans('propic') %} - - {% else %} - - {% endif %} -

Normal Badge

-
- {% if order.ans('is_fursuiter') != 'No' %} -
- {% if not order.ans('propic_fursuiter') %} - - {% else %} - - {% endif %} -

Fursuit Badge

-
- {% endif %} -
-

Min size: 64x64 - Max Size: 5MB, 2048x2048 - Formats: jpg, png

-
- {% if order.ans('propic') %} - - {% endif %} - {% if order.ans('propic_fursuiter') %} - - {% endif %} - {% if (not order.ans('propic')) or (order.ans('is_fursuiter') != 'No' and not order.ans('propic_fursuiter')) %} - - {% endif %} -
- -
-
+ - {% if order.room_owner and not order.room_confirmed %} - - -
- -

Invite your friends!

- - - - -

Send your Ticket ID and room PIN to other attendants you want in your room.

-

If you want to change the room PIN, use the "Reset PIN" button to change the secret code.

- -
- + + + {% include 'blocks/room_extra.html' %} - {% if not order.room_id %} -
- -
- -

Join a room!

- - - - -
- -
-
- -
- {% endif %} + +
+ + +

{{order.code}}

+
+ {% endblock %}