diff --git a/WebHostLib/static/assets/minecraftTracker.js b/WebHostLib/static/assets/minecraftTracker.js new file mode 100644 index 00000000..a698214b --- /dev/null +++ b/WebHostLib/static/assets/minecraftTracker.js @@ -0,0 +1,49 @@ +window.addEventListener('load', () => { + // Reload tracker every 15 seconds + const url = window.location; + setInterval(() => { + const ajax = new XMLHttpRequest(); + ajax.onreadystatechange = () => { + if (ajax.readyState !== 4) { return; } + + // Create a fake DOM using the returned HTML + const domParser = new DOMParser(); + const fakeDOM = domParser.parseFromString(ajax.responseText, 'text/html'); + + // Update item tracker + document.getElementById('inventory-table').innerHTML = fakeDOM.getElementById('inventory-table').innerHTML; + // Update only counters in the location-table + let counters = document.getElementsByClassName('counter'); + const fakeCounters = fakeDOM.getElementsByClassName('counter'); + for (let i = 0; i < counters.length; i++) { + counters[i].innerHTML = fakeCounters[i].innerHTML; + } + }; + ajax.open('GET', url); + ajax.send(); + }, 15000) + + // Collapsible advancement sections + const categories = document.getElementsByClassName("location-category"); + for (let i = 0; i < categories.length; i++) { + let hide_id = categories[i].id.split('-')[0]; + if (hide_id == 'Total') { + continue; + } + categories[i].addEventListener('click', function() { + // Toggle the advancement list + document.getElementById(hide_id).classList.toggle("hide"); + // Change text of the header + const tab_header = document.getElementById(hide_id+'-header').children[0]; + const orig_text = tab_header.innerHTML; + let new_text; + if (orig_text.includes("▼")) { + new_text = orig_text.replace("▼", "▲"); + } + else { + new_text = orig_text.replace("▲", "▼"); + } + tab_header.innerHTML = new_text; + }); + } +}); diff --git a/WebHostLib/static/styles/minecraftTracker.css b/WebHostLib/static/styles/minecraftTracker.css index 94c97f7f..228ce2e6 100644 --- a/WebHostLib/static/styles/minecraftTracker.css +++ b/WebHostLib/static/styles/minecraftTracker.css @@ -9,7 +9,7 @@ border-top-left-radius: 4px; border-top-right-radius: 4px; padding: 3px 3px 10px; - width: 324px; + width: 352px; background-color: #42b149; } @@ -45,7 +45,7 @@ } #location-table{ - width: 324px; + width: 352px; border-left: 2px solid #000000; border-right: 2px solid #000000; border-bottom: 2px solid #000000; @@ -55,6 +55,7 @@ padding: 0 3px 3px; font-family: "Minecraftia", monospace; font-size: 14px; + cursor: default; } #location-table th{ @@ -69,11 +70,15 @@ line-height: 20px; } -#location-table td.counter{ +#location-table td.counter { text-align: right; } -#location-table tr:last-child { +#location-table td.toggle-arrow { + text-align: right; +} + +#location-table tr.location-category:last-child { font-weight: bold; } @@ -82,3 +87,15 @@ max-width: 30px; max-height: 30px; } + +#location-table tbody.locations { + font-size: 12px; +} + +#location-table td.location-name { + padding-left: 16px; +} + +.hide { + display: none; +} diff --git a/WebHostLib/templates/minecraftTracker.html b/WebHostLib/templates/minecraftTracker.html index 6ead397b..e54a8836 100644 --- a/WebHostLib/templates/minecraftTracker.html +++ b/WebHostLib/templates/minecraftTracker.html @@ -2,8 +2,8 @@ {{ player_name }}'s Tracker - - + + @@ -46,10 +46,18 @@ {% for area in checks_done %} + + + + + + {% for location in location_info[area] %} - - + + + {% endfor %} + {% endfor %}
{{ area }} {{'▼' if area != 'Total'}}{{ checks_done[area] }} / {{ checks_in_area[area] }}
{{ area }}{{ checks_done[area] }} / {{ checks_in_area[area] }}{{ location }}{{ '✔' if location_info[area][location] else '' }}
diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py index cc4cf9c1..9ee36908 100644 --- a/WebHostLib/tracker.py +++ b/WebHostLib/tracker.py @@ -503,9 +503,9 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int): # Turn location IDs into advancement tab counts checked_locations = multisave.get("location_checks", {}).get((tracked_team, tracked_player), set()) lookup_name = lambda id: lookup_any_location_id_to_name[id] - location_info = {tab_name: {lookup_name(id): (lookup_name(id) in checked_locations) for id in tab_locations} + location_info = {tab_name: {lookup_name(id): (id in checked_locations) for id in tab_locations} for tab_name, tab_locations in minecraft_location_ids.items()} - checks_done = {tab_name: len([id for id in tab_locations if lookup_name(id) in checked_locations]) + checks_done = {tab_name: len([id for id in tab_locations if id in checked_locations]) for tab_name, tab_locations in minecraft_location_ids.items()} checks_done['Total'] = len(checked_locations) checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in minecraft_location_ids.items()}