Create website-redesign branch. Include incomplete redesign assets. Very much in-progress.

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.

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/<suuid: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"]])
 
 

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):

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.setAttribute('id', 'cookie-notice');
-    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";
     document.body.appendChild(cookieNotice);
     cookieNotice.addEventListener('click', () => {
         localStorage.setItem('cookieNotice', "1");

WebHostLib/static/static/backgrounds/LICENSE

@@ -0,0 +1,4 @@
+Copyright 2020 Berserker66 (Fabian Dill)
+Copyright 2020 LegendaryLinux (Chris Wilson)
+
+All rights reserved.

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;
+}

WebHostLib/static/styles/layout.css

@@ -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;
-}

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%;

WebHostLib/templates/check.html

@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'pageWrapper.html' %}
 
 {% block head %}
     {{ super() }}

WebHostLib/templates/checkresult.html

@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'pageWrapper.html' %}
 
 {% block head %}
     {{ super() }}

WebHostLib/templates/generate.html

@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'pageWrapper.html' %}
 
 {% block head %}
     {{ super() }}

WebHostLib/templates/host_room.html

@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'pageWrapper.html' %}
 {% import "macros.html" as macros %}
 {% block head %}
     <title>Multiworld {{ room.id|suuid }}</title>

WebHostLib/templates/landing.html

@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'pageWrapper.html' %}
 
 {% block head %}
     <title>Berserker's Multiworld</title>

WebHostLib/templates/pageWrapper.html

@@ -2,11 +2,11 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/layout.css") }}" />
     <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/tooltip.css") }}" />
-    <script type="application/ecmascript" src="{{ static_autoversion("assets/layout.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/cookieNotice.css") }}" />
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/cookieNotice.js") }}"></script>
     {% block head %}
-        <title>Berserker's Multiworld</title>
+        <title>Multiworld</title>
     {% endblock %}
 </head>
 <body>

WebHostLib/templates/playerSettings.html

@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'pageWrapper.html' %}
 
 {% block head %}
     <title>Player Settings</title>

WebHostLib/templates/tablepage.html

@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "pageWrapper.html" %}
 {% block head %}
     <link rel="stylesheet"
           type="text/css"

WebHostLib/templates/tutorial.html

@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'pageWrapper.html' %}
 
 {% block head %}
     <title>Setup Tutorial</title>

WebHostLib/templates/viewSeed.html

@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'pageWrapper.html' %}
 {% import "macros.html" as macros %}
 
 {% block head %}

WebHostLib/templates/waitSeed.html

@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'pageWrapper.html' %}
 {% import "macros.html" as macros %}
 
 {% block head %}

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