diff --git a/LICENSE b/LICENSE index e3c2482f..9e260f41 100644 --- a/LICENSE +++ b/LICENSE @@ -22,3 +22,8 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Subdirectories of this repository may contain their own LICENSE file. Files within +subdirectories containing their own LICENSE file are exempt from the above license +and are subject to the license contained within the LICENSE file in their containing +directory. diff --git a/WebHostLib/__init__.py b/WebHostLib/__init__.py index 3f16f967..5409e98f 100644 --- a/WebHostLib/__init__.py +++ b/WebHostLib/__init__.py @@ -84,7 +84,7 @@ def tutorial(lang='en'): @app.route('/player-settings') def player_settings(): - return render_template("player-settings.html") + return render_template("playerSettings.html") @app.route('/seed/') @@ -92,7 +92,7 @@ def view_seed(seed: UUID): seed = Seed.get(id=seed) if not seed: abort(404) - return render_template("view_seed.html", seed=seed, + return render_template("viewSeed.html", seed=seed, rooms=[room for room in seed.rooms if room.owner == session["_id"]]) diff --git a/WebHostLib/generate.py b/WebHostLib/generate.py index 53606b92..fdd5c853 100644 --- a/WebHostLib/generate.py +++ b/WebHostLib/generate.py @@ -114,7 +114,7 @@ def wait_seed(seed: UUID): return "Generation not found." elif generation.state == STATE_ERROR: return "Generation failed, please retry." - return render_template("wait_seed.html", seed_id=seed_id) + return render_template("waitSeed.html", seed_id=seed_id) def upload_to_db(folder, owner, sid): diff --git a/WebHostLib/static/assets/layout.js b/WebHostLib/static/assets/cookieNotice.js similarity index 60% rename from WebHostLib/static/assets/layout.js rename to WebHostLib/static/assets/cookieNotice.js index fedf419d..f9cbb200 100644 --- a/WebHostLib/static/assets/layout.js +++ b/WebHostLib/static/assets/cookieNotice.js @@ -4,14 +4,7 @@ window.addEventListener('load', () => { const cookieNotice = document.createElement('div'); cookieNotice.innerText = "This website uses cookies to store information about the games you play."; - cookieNotice.style.position = "fixed"; - cookieNotice.style.bottom = "0"; - cookieNotice.style.left = "0"; - cookieNotice.style.width = "100%"; - cookieNotice.style.lineHeight = "40px"; - cookieNotice.style.backgroundColor = "#c7cda5"; - cookieNotice.style.textAlign = "center"; - cookieNotice.style.cursor = "pointer"; + cookieNotice.setAttribute('id', 'cookie-notice'); document.body.appendChild(cookieNotice); cookieNotice.addEventListener('click', () => { localStorage.setItem('cookieNotice', "1"); diff --git a/WebHostLib/static/static/backgrounds/LICENSE b/WebHostLib/static/static/backgrounds/LICENSE new file mode 100644 index 00000000..71d218da --- /dev/null +++ b/WebHostLib/static/static/backgrounds/LICENSE @@ -0,0 +1,4 @@ +Copyright 2020 Berserker66 (Fabian Dill) +Copyright 2020 LegendaryLinux (Chris Wilson) + +All rights reserved. diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/bottom-dirt.png b/WebHostLib/static/static/backgrounds/cliff-pieces/bottom-dirt.png new file mode 100644 index 00000000..ce45d7fb Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/bottom-dirt.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/bottom-grass.png b/WebHostLib/static/static/backgrounds/cliff-pieces/bottom-grass.png new file mode 100644 index 00000000..36f9a2c2 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/bottom-grass.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-bottom-dirt.png b/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-bottom-dirt.png new file mode 100644 index 00000000..148eda37 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-bottom-dirt.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-bottom-grass.png b/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-bottom-grass.png new file mode 100644 index 00000000..b8013772 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-bottom-grass.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-top-dirt.png b/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-top-dirt.png new file mode 100644 index 00000000..889adcce Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-top-dirt.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-top-grass.png b/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-top-grass.png new file mode 100644 index 00000000..1fac54d1 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/left-corner-top-grass.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/left-dirt.png b/WebHostLib/static/static/backgrounds/cliff-pieces/left-dirt.png new file mode 100644 index 00000000..784dd0f0 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/left-dirt.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/left-grass.png b/WebHostLib/static/static/backgrounds/cliff-pieces/left-grass.png new file mode 100644 index 00000000..dda169ec Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/left-grass.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-bottom-dirt.png b/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-bottom-dirt.png new file mode 100644 index 00000000..2bb6d8ea Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-bottom-dirt.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-bottom-grass.png b/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-bottom-grass.png new file mode 100644 index 00000000..f6705efe Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-bottom-grass.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-top-dirt.png b/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-top-dirt.png new file mode 100644 index 00000000..dae1b80f Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-top-dirt.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-top-grass.png b/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-top-grass.png new file mode 100644 index 00000000..dc1255fe Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/right-corner-top-grass.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/right-dirt.png b/WebHostLib/static/static/backgrounds/cliff-pieces/right-dirt.png new file mode 100644 index 00000000..764c88d8 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/right-dirt.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/right-grass.png b/WebHostLib/static/static/backgrounds/cliff-pieces/right-grass.png new file mode 100644 index 00000000..9cf3d213 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/right-grass.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/top-dirt.png b/WebHostLib/static/static/backgrounds/cliff-pieces/top-dirt.png new file mode 100644 index 00000000..3bd4d135 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/top-dirt.png differ diff --git a/WebHostLib/static/static/backgrounds/cliff-pieces/top-grass.png b/WebHostLib/static/static/backgrounds/cliff-pieces/top-grass.png new file mode 100644 index 00000000..fe79641b Binary files /dev/null and b/WebHostLib/static/static/backgrounds/cliff-pieces/top-grass.png differ diff --git a/WebHostLib/static/static/backgrounds/clouds/cloud-0001.png b/WebHostLib/static/static/backgrounds/clouds/cloud-0001.png new file mode 100644 index 00000000..dba338f5 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/clouds/cloud-0001.png differ diff --git a/WebHostLib/static/static/backgrounds/clouds/cloud-0002.png b/WebHostLib/static/static/backgrounds/clouds/cloud-0002.png new file mode 100644 index 00000000..33f09b19 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/clouds/cloud-0002.png differ diff --git a/WebHostLib/static/static/backgrounds/clouds/cloud-0003.png b/WebHostLib/static/static/backgrounds/clouds/cloud-0003.png new file mode 100644 index 00000000..f665015b Binary files /dev/null and b/WebHostLib/static/static/backgrounds/clouds/cloud-0003.png differ diff --git a/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0001.png b/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0001.png new file mode 100644 index 00000000..25a1dcdf Binary files /dev/null and b/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0001.png differ diff --git a/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0002.png b/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0002.png new file mode 100644 index 00000000..119c0c78 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0002.png differ diff --git a/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0003.png b/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0003.png new file mode 100644 index 00000000..35619fb0 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0003.png differ diff --git a/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0004.png b/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0004.png new file mode 100644 index 00000000..7ced1597 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-0004.png differ diff --git a/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-grass-single.png b/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-grass-single.png new file mode 100644 index 00000000..e94f1c95 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/dirt-tiles/dirt-grass-single.png differ diff --git a/WebHostLib/static/static/backgrounds/dirt-tiles/rock-single.png b/WebHostLib/static/static/backgrounds/dirt-tiles/rock-single.png new file mode 100644 index 00000000..59b24590 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/dirt-tiles/rock-single.png differ diff --git a/WebHostLib/static/static/backgrounds/footer/footer-0001.png b/WebHostLib/static/static/backgrounds/footer/footer-0001.png new file mode 100644 index 00000000..8283151a Binary files /dev/null and b/WebHostLib/static/static/backgrounds/footer/footer-0001.png differ diff --git a/WebHostLib/static/static/backgrounds/footer/footer-0002.png b/WebHostLib/static/static/backgrounds/footer/footer-0002.png new file mode 100644 index 00000000..bc862074 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/footer/footer-0002.png differ diff --git a/WebHostLib/static/static/backgrounds/footer/footer-0003.png b/WebHostLib/static/static/backgrounds/footer/footer-0003.png new file mode 100644 index 00000000..2e0089ab Binary files /dev/null and b/WebHostLib/static/static/backgrounds/footer/footer-0003.png differ diff --git a/WebHostLib/static/static/backgrounds/footer/footer-0004.png b/WebHostLib/static/static/backgrounds/footer/footer-0004.png new file mode 100644 index 00000000..4fd5fd65 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/footer/footer-0004.png differ diff --git a/WebHostLib/static/static/backgrounds/grass-tiles/grass-0001.png b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0001.png new file mode 100644 index 00000000..ba73b617 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0001.png differ diff --git a/WebHostLib/static/static/backgrounds/grass-tiles/grass-0002.png b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0002.png new file mode 100644 index 00000000..76679511 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0002.png differ diff --git a/WebHostLib/static/static/backgrounds/grass-tiles/grass-0003.png b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0003.png new file mode 100644 index 00000000..34156013 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0003.png differ diff --git a/WebHostLib/static/static/backgrounds/grass-tiles/grass-0004.png b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0004.png new file mode 100644 index 00000000..ef0dbcf4 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0004.png differ diff --git a/WebHostLib/static/static/backgrounds/grass-tiles/grass-0005.png b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0005.png new file mode 100644 index 00000000..dcc68427 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0005.png differ diff --git a/WebHostLib/static/static/backgrounds/grass-tiles/grass-0006.png b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0006.png new file mode 100644 index 00000000..d2842b3e Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass-tiles/grass-0006.png differ diff --git a/WebHostLib/static/static/backgrounds/grass-tiles/grass-flower-single.png b/WebHostLib/static/static/backgrounds/grass-tiles/grass-flower-single.png new file mode 100644 index 00000000..f7be0523 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass-tiles/grass-flower-single.png differ diff --git a/WebHostLib/static/static/backgrounds/grass-tiles/grass-single.png b/WebHostLib/static/static/backgrounds/grass-tiles/grass-single.png new file mode 100644 index 00000000..a5f28b49 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass-tiles/grass-single.png differ diff --git a/WebHostLib/static/static/backgrounds/header/cloud-header.png b/WebHostLib/static/static/backgrounds/header/cloud-header.png new file mode 100644 index 00000000..639be9a8 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/header/cloud-header.png differ diff --git a/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0001.png b/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0001.png new file mode 100644 index 00000000..133d8926 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0001.png differ diff --git a/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0002.png b/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0002.png new file mode 100644 index 00000000..82b12bbb Binary files /dev/null and b/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0002.png differ diff --git a/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0003.png b/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0003.png new file mode 100644 index 00000000..b9c11d99 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0003.png differ diff --git a/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0004.png b/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0004.png new file mode 100644 index 00000000..e9e639a9 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0004.png differ diff --git a/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0005.png b/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0005.png new file mode 100644 index 00000000..4933ad3e Binary files /dev/null and b/WebHostLib/static/static/backgrounds/ocean-tiles/oceans-0005.png differ diff --git a/WebHostLib/static/styles/cookieNotice.css b/WebHostLib/static/styles/cookieNotice.css new file mode 100644 index 00000000..25ed2abe --- /dev/null +++ b/WebHostLib/static/styles/cookieNotice.css @@ -0,0 +1,11 @@ +#cookie-notice{ + display: block; + position: fixed; + bottom: 0; + left: 0; + width: 100%; + line-height: 40px; + background-color: #c7cda5; + text-align: center; + cursor: pointer; +} diff --git a/WebHostLib/static/styles/layout.css b/WebHostLib/static/styles/layout.css deleted file mode 100644 index 41260f1c..00000000 --- a/WebHostLib/static/styles/layout.css +++ /dev/null @@ -1,58 +0,0 @@ -/** Global colors for all pages */ -body{ - background-color: #dce2bd; - font-size: 1.2rem; - font-family: "Segoe UI", Arial, sans-serif; -} - -/** Button Styles */ -button, input[type=submit]{ - border: 1px solid #7d8c35; - border-radius: 4px; - width: 200px; - height: 75px; - margin-left: 0.25rem; - margin-right: 0.25rem; - background-color: #dce2bd; - font-family: inherit; - font-size: 1.5rem; - cursor: pointer; -} - -button:hover, input[type=submit]:hover{ - background-color: #e0e7bd; -} - -/** Content styles */ -.main-content{ - max-width: 1000px; - border-radius: 8px; - background-color: #bbb288; - padding: 0.5em 1.5rem 1.5rem; - color: #282b28; -} - -.main-content h3{ - margin: 0; - font-size: 3rem; - text-align: center; - font-weight: normal; -} - -.main-content a{ - color: #34768a; - text-decoration: none; -} - -/** Tooltip styles */ -[data-tooltop]{ - position: relative; - z-index: 10; - cursor: pointer; -} - -[data-tooltip]:before, [data-tooltip]:after{ - visibility: hidden; - opacity: 0; - pointer-events: none; -} diff --git a/WebHostLib/static/styles/tooltip.css b/WebHostLib/static/styles/tooltip.css index 5c61098a..a5d8c759 100644 --- a/WebHostLib/static/styles/tooltip.css +++ b/WebHostLib/static/styles/tooltip.css @@ -67,6 +67,12 @@ give it one of the following classes: tooltip-left, tooltip-right, tooltip-top, line-height: 1.2; } +[data-tooltip]:before, [data-tooltip]:after{ + visibility: hidden; + opacity: 0; + pointer-events: none; +} + [data-tooltip]:before, [data-tooltip]:after, .tooltip:before, .tooltip:after, .tooltip-top:before, .tooltip-top:after { bottom: 100%; diff --git a/WebHostLib/templates/check.html b/WebHostLib/templates/check.html index 511bb13f..4e627f0f 100644 --- a/WebHostLib/templates/check.html +++ b/WebHostLib/templates/check.html @@ -1,4 +1,4 @@ -{% extends 'layout.html' %} +{% extends 'pageWrapper.html' %} {% block head %} {{ super() }} diff --git a/WebHostLib/templates/checkresult.html b/WebHostLib/templates/checkresult.html index d32aa8a0..60ec48de 100644 --- a/WebHostLib/templates/checkresult.html +++ b/WebHostLib/templates/checkresult.html @@ -1,4 +1,4 @@ -{% extends 'layout.html' %} +{% extends 'pageWrapper.html' %} {% block head %} {{ super() }} diff --git a/WebHostLib/templates/generate.html b/WebHostLib/templates/generate.html index e33a106c..68027c2f 100644 --- a/WebHostLib/templates/generate.html +++ b/WebHostLib/templates/generate.html @@ -1,4 +1,4 @@ -{% extends 'layout.html' %} +{% extends 'pageWrapper.html' %} {% block head %} {{ super() }} diff --git a/WebHostLib/templates/host_room.html b/WebHostLib/templates/host_room.html index a519fde1..28d99124 100644 --- a/WebHostLib/templates/host_room.html +++ b/WebHostLib/templates/host_room.html @@ -1,4 +1,4 @@ -{% extends 'layout.html' %} +{% extends 'pageWrapper.html' %} {% import "macros.html" as macros %} {% block head %} Multiworld {{ room.id|suuid }} diff --git a/WebHostLib/templates/landing.html b/WebHostLib/templates/landing.html index 68222103..f4b72ff9 100644 --- a/WebHostLib/templates/landing.html +++ b/WebHostLib/templates/landing.html @@ -1,4 +1,4 @@ -{% extends 'layout.html' %} +{% extends 'pageWrapper.html' %} {% block head %} Berserker's Multiworld diff --git a/WebHostLib/templates/layout.html b/WebHostLib/templates/pageWrapper.html similarity index 84% rename from WebHostLib/templates/layout.html rename to WebHostLib/templates/pageWrapper.html index 4118ec9e..1a6b7182 100644 --- a/WebHostLib/templates/layout.html +++ b/WebHostLib/templates/pageWrapper.html @@ -2,11 +2,11 @@ - - + + {% block head %} - Berserker's Multiworld + Multiworld {% endblock %} diff --git a/WebHostLib/templates/player-settings.html b/WebHostLib/templates/playerSettings.html similarity index 98% rename from WebHostLib/templates/player-settings.html rename to WebHostLib/templates/playerSettings.html index 3b9ce687..9bb74e5f 100644 --- a/WebHostLib/templates/player-settings.html +++ b/WebHostLib/templates/playerSettings.html @@ -1,4 +1,4 @@ -{% extends 'layout.html' %} +{% extends 'pageWrapper.html' %} {% block head %} Player Settings diff --git a/WebHostLib/templates/tablepage.html b/WebHostLib/templates/tablepage.html index 0867b2f7..70a4c4d3 100644 --- a/WebHostLib/templates/tablepage.html +++ b/WebHostLib/templates/tablepage.html @@ -1,4 +1,4 @@ -{% extends "layout.html" %} +{% extends "pageWrapper.html" %} {% block head %} Setup Tutorial diff --git a/WebHostLib/templates/view_seed.html b/WebHostLib/templates/viewSeed.html similarity index 98% rename from WebHostLib/templates/view_seed.html rename to WebHostLib/templates/viewSeed.html index 0db581ee..35b4d36a 100644 --- a/WebHostLib/templates/view_seed.html +++ b/WebHostLib/templates/viewSeed.html @@ -1,4 +1,4 @@ -{% extends 'layout.html' %} +{% extends 'pageWrapper.html' %} {% import "macros.html" as macros %} {% block head %} diff --git a/WebHostLib/templates/wait_seed.html b/WebHostLib/templates/waitSeed.html similarity index 93% rename from WebHostLib/templates/wait_seed.html rename to WebHostLib/templates/waitSeed.html index fc2d5c3b..51994a74 100644 --- a/WebHostLib/templates/wait_seed.html +++ b/WebHostLib/templates/waitSeed.html @@ -1,4 +1,4 @@ -{% extends 'layout.html' %} +{% extends 'pageWrapper.html' %} {% import "macros.html" as macros %} {% block head %} diff --git a/requirements.txt b/requirements.txt index 09cb7a3a..0588e3ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ websockets>=8.1 PyYAML>=5.3.1 fuzzywuzzy>=0.18.0 bsdiff4>=1.2.0 -prompt_toolkit>=3.0.6 +prompt_toolkit>=3.0.8 appdirs>=1.4.4 maseya-z3pr>=1.0.0rc1 -xxtea>=2.0.0.post0 \ No newline at end of file +xxtea>=2.0.0.post0