diff --git a/WebHostLib/static/host_room.css b/WebHostLib/static/host_room.css new file mode 100644 index 00000000..12993f7a --- /dev/null +++ b/WebHostLib/static/host_room.css @@ -0,0 +1,5 @@ +#host-room input[type=text]{ + width: calc(100% - 6px); + padding: 0.125rem; + height: 1.5rem; +} diff --git a/WebHostLib/templates/host_room.html b/WebHostLib/templates/host_room.html index 3b0b5212..8e7c0236 100644 --- a/WebHostLib/templates/host_room.html +++ b/WebHostLib/templates/host_room.html @@ -1,43 +1,48 @@ {% extends 'layout.html' %} + {% block head %} Multiworld {{ room.id }} + {% endblock %} + {% block body %} - {% if room.owner == session["_id"] %} - Room created from Seed #{{ room.seed.id }}
- {% endif %} - {% if room.tracker %} - This room has a Multiworld Tracker enabled.
- {% endif %} - This room will be closed after {{ room.timeout//60//60 }} hours of inactivity. Should you wish to continue later, - you can simply refresh this page and the server will be started again.
- {% if room.owner == session["_id"] %} -
-
- - -
-
- {% endif %} - Log: -
- -{% endblock %} \ No newline at end of file + window.setTimeout(request_new, 1000); + window.setInterval(request_new, 3000); + + +{% endblock %} diff --git a/WebHostLib/templates/landing.html b/WebHostLib/templates/landing.html index 660d9bf8..a58fd524 100644 --- a/WebHostLib/templates/landing.html +++ b/WebHostLib/templates/landing.html @@ -2,7 +2,7 @@ {% block head %} Berserker's Multiworld - + {% endblock %} {% block body %} diff --git a/WebHostLib/templates/layout.html b/WebHostLib/templates/layout.html index 44fab4f9..a5d0b633 100644 --- a/WebHostLib/templates/layout.html +++ b/WebHostLib/templates/layout.html @@ -2,13 +2,7 @@ - - + {% block head %} Berserker's Multiworld {% endblock %} diff --git a/WebHostLib/templates/tracker.html b/WebHostLib/templates/tracker.html index c85695b1..8fb3516b 100644 --- a/WebHostLib/templates/tracker.html +++ b/WebHostLib/templates/tracker.html @@ -1,18 +1,25 @@ {% extends 'layout.html' %} {% block head %} Multiworld Tracker for Room {{ room.id }} - - - + + + + + - {% endblock %} {% block body %} - +
{% for team, players in inventory.items() %} + - - - - {% for name in tracking_names %} - {% if name in icons %} - - {% else %} - - {% endif %} - {% endfor %} - - - - {% for player, items in players.items() %} - - - {% if (team, loop.index) in video %} - - {% else %} - {% endif %} - {% for id in tracking_ids %} - - {% if items[id] %} - - {% else %} - - {% endif %} + + + + {% for name in tracking_names %} + {% if name in icons %} + + {% else %} + + {% endif %} + {% endfor %} + + + + {% for player, items in players.items() %} + + + {% if (team, loop.index) in video %} + + {% else %} + + {% endif %} + {% for id in tracking_ids %} + {% if items[id] %} + + {% else %} + + {% endif %} + {% endfor %} + {% endfor %} - - {% endfor %} - -
#Name{{ name|e }}{{ name|e }}
{{ loop.index }} - - {{ player_names[(team, loop.index)] }} - ▶️{{ player_names[(team, loop.index)] }} - {% if id in multi_items %}{{ items[id] }}{% else %}✔️{% endif %}
#Name + {{ name|e }} + {{ name|e }}
{{ loop.index }} + + {{ player_names[(team, loop.index)] }} + ▶️{{ player_names[(team, loop.index)] }} + {% if id in multi_items %}{{ items[id] }}{% else %}✔️{% endif %}
- {% endfor %} + + + {% endfor %} - {% for team, players in checks_done.items() %} - - - - - - {% for area in ordered_areas %} - {% set colspan = (3 if area in key_locations else 1) %} - {% if area in icons %} - - {% else %} - - {% endif %} - {% endfor %} - - - - {% for area in ordered_areas %} - - {% if area in key_locations %} - - - {% endif %} - {% endfor %} - - - - {% for player, checks in players.items() %} + {% for team, players in checks_done.items() %} +
#Name{{ area }}{{ area }}Last Activity
Checks - Small KeyBig Key
+ + - - + + {% for area in ordered_areas %} - {% set checks_done = checks[area] %} - {% set checks_total = checks_in_area[area] %} - {% if checks_done == checks_total %} - + {% set colspan = (3 if area in key_locations else 1) %} + {% if area in icons %} + {% else %} - - {% endif %} - {% if area in key_locations %} - - + {% endif %} {% endfor %} - {% if activity_timers[(team, player)] %} - - {% else %} - {% endif %} + - {% endfor %} - -
{{ loop.index }}{{ player_names[(team, loop.index)]|e }}#Name - {{ checks_done }}/{{ checks_total }}{{ area }}{{ checks_done }}/{{ checks_total }}{{ inventory[team][player][small_key_ids[area]] }}{% if inventory[team][player][big_key_ids[area]] %}✔️{% endif %}{{ area }}{{ activity_timers[(team, player)] | render_timedelta }}NoneLast Activity
- {% endfor %} + + {% for area in ordered_areas %} + Checks + + {% if area in key_locations %} + Small Key + Big Key + {% endif %} + {% endfor %} + + + + {% for player, checks in players.items() %} + + {{ loop.index }} + {{ player_names[(team, loop.index)]|e }} + {% for area in ordered_areas %} + {% set checks_done = checks[area] %} + {% set checks_total = checks_in_area[area] %} + {% if checks_done == checks_total %} + + {{ checks_done }}/{{ checks_total }} + {% else %} + {{ checks_done }}/{{ checks_total }} + {% endif %} + {% if area in key_locations %} + {{ inventory[team][player][small_key_ids[area]] }} + {% if inventory[team][player][big_key_ids[area]] %}✔️{% endif %} + {% endif %} + {% endfor %} + {% if activity_timers[(team, player)] %} + {{ activity_timers[(team, player)] | render_timedelta }} + {% else %} + None{% endif %} + + {% endfor %} + + + {% endfor %}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/WebHostLib/templates/uploads.html b/WebHostLib/templates/uploads.html index 0e09596a..079d7dad 100644 --- a/WebHostLib/templates/uploads.html +++ b/WebHostLib/templates/uploads.html @@ -2,8 +2,8 @@ {% block head %} Upload Multidata - - + + {% endblock %} {% block body %} diff --git a/WebHostLib/templates/view_seed.html b/WebHostLib/templates/view_seed.html index ade10295..b9609b1e 100644 --- a/WebHostLib/templates/view_seed.html +++ b/WebHostLib/templates/view_seed.html @@ -3,9 +3,8 @@ {% block head %} Multiworld Seed {{ seed.id }} - - - + + {% endblock %} {% block body %}