Nav for switching between trashmaps

.gitignore

@@ -5,3 +5,5 @@ daemon_data.json
 daemon_storage.json
 daemon_log.txt
 *.swp
+*.css.map
+*.sass-cache/*

README.md

@@ -1,5 +1,5 @@
 # DDNet Trashmap
-[DDNet Trashmap](https://trashmap.timakro.de/) is a service for mappers who can't host their own server.
+[DDNet Trashmap](http://trashmap.ddnet.tw/) is a service for mappers who can't host their own server.
 You can create a testing server here and test your map alone or with other players.
 
 ## Development

srv/daemon_control.py → daemon_control.py

@@ -7,12 +7,12 @@
 DELETE_RCON = 14
 
 def getdata():
-    data = json.load(open("/srv/trashmap/daemon_data.json")) 
+    data = json.load(open("/srv/trashmap/srv/daemon_data.json")) 
     return data
 
 def writefifo(order):
     line = json.dumps(order) + "\n"
-    with open("/srv/trashmap/daemon_input.fifo", "w") as fifo:
+    with open("/srv/trashmap/srv/daemon_input.fifo", "w") as fifo:
         fifo.write(line)
 
 print("Welcome to daemon control, enter 'help' to get a list of commands.")

sass/_master.scss

@@ -14,6 +14,7 @@ $shade1: #e3e3e3;
 
 $text1-0: #555;
 $accent1: #378A54;
+$accent1-fade: lighten(desaturate($accent1, 20%), 10%);
 $link1: #37798A;
 $error1: #8a3737;
 $warning1: #935E22;

sass/stylesheet.scss

@@ -231,17 +231,22 @@ body {
 
 .breadcrumbs {
     background-color: $shade0;
-    padding: 5px 0px 5px 20px;
+    padding-left: 20px;
     border-bottom: 1px solid darken($shade1, 10%);
     font-size: 16px;
+    position: relative;
     .separator {
+        padding-top: 5px;
+        padding-bottom: 5px;
         position: relative;
         top: -2px;
         margin-right: 10px;
         height: 1em;
         vertical-align: middle;
     }
     .crumb {
+        padding-top: 5px;
+        padding-bottom: 5px;
         margin-right: 10px;
         color: darken($shade1, 40%);
         font-family: $headerFS;
@@ -252,6 +257,34 @@ body {
             font-weight: 500;
         }
     }
+    .locality_tab {
+        position: absolute;
+        height: 100%;
+        right: 0;
+        background-color: $accent1-fade;
+        border-bottom: 1px solid $accent1-fade;
+        box-sizing: content-box;
+        display: inline-block;
+        padding: 0 20px 0 20px;
+        &:hover {
+            cursor: pointer;
+        }
+        .locality {
+            padding-top: 5px;
+            padding-bottom: 5px;
+            display: inline-block;
+            color: $shade0;
+            font-size: 16px;
+        }
+        .dropdown {
+            position: relative;
+            top: -3px;
+            display: inline-block;
+            font-size: 16px;
+            height: 0.8em;
+            vertical-align: middle;
+        }
+    }
 }
 
 .tingle-modal {
@@ -310,6 +343,23 @@ body {
             }
         }
     }
+    .trashmap_locations_header {
+        border-bottom: 2px solid $accent1;
+        padding-bottom: 8px;
+    }
+    ul.trashmap_locations {
+        list-style-type: none;
+        background-color: desaturate(lighten($accent1, 40%), 10%);
+        margin-top: 0;
+        margin-left: 0;
+        padding: 20px;
+        li a {
+            color: darken($accent1, 5%);
+            &:hover {
+                color: darken($accent1, 20%);
+            }
+        }
+    }
 }
 
 
@@ -332,7 +382,7 @@ body {
             background-color: $shade0;
         }
         &.page_branding {
-            background-color: lighten(desaturate($accent1, 20%), 10%);
+            background-color: $accent1-fade;
             .page_title {
                 color: $shade0;
                 display: inline-block;
@@ -349,7 +399,7 @@ body {
             }
         }
         &.site_branding {
-            background-color: lighten(desaturate($accent1, 20%), 10%);
+            background-color: $accent1-fade;
             padding-top: 60px;
             padding-bottom: 60px;
             overflow: hidden;

srv/daemon_config.json

@@ -1,6 +1,7 @@
 {
-    "name": "DDNet South Africa Trashmap",
-    "ip": "zaf.ddnet.tw",
+    "name": "DDNet GER Trashmap",
+    "locality" : "GER",
+    "ip": "trashmap.ddnet.tw",
     "maxservers": 300,
     "maxserversperip": 2,
     "maxrunningservers": 10,
@@ -9,8 +10,8 @@
     "joinminutes": 5,
     "stophours": 8,
     "deletedays": 30,
-    "mapsizehuman": "2MB",
-    "mapsize": 2097152,
+    "mapsizehuman": "5MB",
+    "mapsize": 5242880,
     "minplayers": 1,
     "maxplayers": 16,
     "defaultplayers": 8,
@@ -20,5 +21,8 @@
     "maxlengthpassword": 25,
     "maxlengthrconcommand": 25,
     "maxlengthrcon": 25,
-    "bannedips": []
+    "bannedips": [],
+    "othertrashmaps" : [
+        { "name":"DDNet ZAF Trashmap", "locality":"ZAF", "ip":"zaf.ddnet.tw" },
+    ]
 }

srv/daemon_storage.json.default

@@ -0,0 +1,47 @@
+{
+    "suggested_rcon": [], 
+    "allowed_rcon": [
+        "up", 
+        "down", 
+        "right", 
+        "left", 
+        "super", 
+        "unsuper", 
+        "totele", 
+        "totelecp", 
+        "addweapon", 
+        "removeweapon", 
+        "tune", 
+        "tune_reset", 
+        "tune_dump", 
+        "tune_zone", 
+        "tune_zone_enter", 
+        "tune_zone_leave", 
+        "tune_zone_reset", 
+        "tune_zone_dump", 
+        "logout", 
+        "status", 
+        "tele", 
+        "kick", 
+        "ban", 
+        "bans", 
+        "unban", 
+        "unban_all", 
+        "ban_range", 
+        "unban_range", 
+        "undeep", 
+        "unsolo", 
+        "shotgun", 
+        "grenade", 
+        "ninja", 
+        "rifle", 
+        "unshotgun", 
+        "ungrenade", 
+        "unrifle", 
+        "jetpack", 
+        "unjetpack", 
+        "move", 
+        "move_raw"
+    ], 
+    "servers": {}
+}

srv/init.cfg

@@ -1,5 +1,3 @@
-sv_welcome Welcome to DDNet South Africa Trashmap! Information at trashmap.timakro.de
-
 sv_input_fifo fifo
 
 sv_inactivekick_time 0

systemd/user/trashmap.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=DDNet Trashmap
+
+[Service]
+Type=simple
+ExecStart=/srv/trashmap/trashmap.py
+ExecReload=/bin/kill -USR1 $MAINPID
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

trashmap.py

@@ -152,6 +152,7 @@ def startserver(identifier):
     if info["password"]:
         commands.append(buildcommand("password", info["password"]))
     commands.append(buildcommand("exec", "banlist.cfg"))
+    commands.append(buildcommand("sv_welcome", "Welcome to {}! Visit trashmap.ddnet.tw".format(data["config"]["name"])))
     commands.append(buildcommand("exec", "/srv/trashmap/srv/init.cfg"))
     for rcon in data["storage"]["allowed_rcon"]:
         commands.append(buildcommand("access_level", rcon, 2))
@@ -459,7 +460,7 @@ def main():
         # sleep for a tick
         delta = next_run - time.time()
         if delta < 0:
-            log("Skipped {0} ticks".format(delta / -data["config"]["tickseconds"]), warning=True)
+            log("Skipped {} ticks".format(delta / -data["config"]["tickseconds"]), warning=True)
         else:
             time.sleep(delta)
 

www/access_server.php

@@ -104,6 +104,12 @@
     <div class="crumb">
         Access Server
     </div>
+    <div class="locality_tab">
+      <h4 class="locality">
+        <?php echo $config["locality"]?>
+      </h4>
+      <img class="dropdown" src="includes/dropdown.svg">
+    </div>
 </div>
 
 <div class="main">

www/access_server_handle.php

@@ -107,7 +107,6 @@
         } elseif($_POST["action"] == "map") {
             $mapfile = tempnam("/srv/trashmap/upload", "");
             move_uploaded_file($_FILES["map"]["tmp_name"], $mapfile);
-            chmod($mapfile, 0666);
             file_put_contents("/srv/trashmap/srv/daemon_input.fifo", json_encode(
                 ["type" => $CHANGE_MAP,
                  "identifier" => $identifier,

www/create_server.php

@@ -76,6 +76,12 @@
   <div class="crumb">
     Create Server
   </div>
+  <div class="locality_tab">
+    <h4 class="locality">
+      <?php echo $config["locality"]?>
+    </h4>
+    <img class="dropdown" src="includes/dropdown.svg">
+  </div>
 </div>
 
 <div class="main">

www/create_server_handle.php

@@ -94,7 +94,6 @@
     $link = "access_server.php?".http_build_query(["id" => $identifier, "key" => $raw_accesskey]);
     $mapfile = tempnam("/srv/trashmap/upload", "");
     move_uploaded_file($_FILES["map"]["tmp_name"], $mapfile);
-    chmod($mapfile, 0666);
     file_put_contents("/srv/trashmap/srv/daemon_input.fifo", json_encode(
         ["type" => $CREATE_SERVER,
          "identifier" => $identifier,

www/daemon_config.json

@@ -0,0 +1,28 @@
+{
+    "name": "DDNet GER Trashmap",
+    "locality" : "GER",
+    "ip": "trashmap.ddnet.tw",
+    "maxservers": 300,
+    "maxserversperip": 2,
+    "maxrunningservers": 10,
+    "tickseconds": 1,
+    "titleupdateseconds": 10,
+    "joinminutes": 5,
+    "stophours": 8,
+    "deletedays": 30,
+    "mapsizehuman": "5MB",
+    "mapsize": 5242880,
+    "minplayers": 1,
+    "maxplayers": 16,
+    "defaultplayers": 8,
+    "defaultrcon": "trashmap",
+    "maxlengthlabel": 25,
+    "maxlengthaccesskey": 25,
+    "maxlengthpassword": 25,
+    "maxlengthrconcommand": 25,
+    "maxlengthrcon": 25,
+    "bannedips": [],
+    "othertrashmaps" : [
+        { "name":"DDNet ZAF Trashmap", "locality":"ZAF", "ip":"zaf.ddnet.tw" },
+    ]
+}

www/includes/breadcrumbs.js

@@ -6,8 +6,8 @@ var breadcrumbs = (function (public) {
         var initialLength = breadcrumbsBar.children.length;
         var crumbs = [];
         for (var i = 1; i < initialLength; i++) {
-            crumbs.push(breadcrumbsBar.children[i]);
-            // console.log(breadcrumbsBar.children[i]);
+            if (!breadcrumbsBar.children[i].classList.contains("locality_tab"))
+                crumbs.push(breadcrumbsBar.children[i]);
         }
         for (var j = 0; j < crumbs.length; j++) {
             var separator = document.createElement("IMG");

www/includes/head.inc.php

@@ -7,3 +7,4 @@
 <script src="includes/breadcrumbs.js"></script>
 <script src="includes/fileUpload.js"></script>
 <script src="includes/start.js"></script>
+<script src="includes/localizeNav.js"></script>

www/includes/localityModal.inc.php

@@ -0,0 +1,8 @@
+<div class="locality_modal" style="display:none;">
+	<h2 class="trashmap_locations_header">Other Trashmap Locations</h2>
+	<ul class="trashmap_locations">
+		<?php foreach ($config['othertrashmaps'] as $othertrashmaps): ?>
+			<li><a href="http://<?php echo $othertrashmaps['ip'];?>"><?php echo $othertrashmaps['name'];?></a></li>
+		<?php endforeach; ?>
+	</ul>
+</div>