Skip to content

Commit 8f95d87

Browse files
TGRHavocTGRHavoc
committed
feat: moved from php to html
HTML is the new PHP. Now people can host the livemap on webservers that don't support PHP. Wooo
1 parent 6afa8d4 commit 8f95d87

File tree

2 files changed

+215
-61
lines changed

2 files changed

+215
-61
lines changed

‎index.php ‎debug.html

+31-61
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,6 @@
2020
2121
-->
2222
<!DOCTYPE html>
23-
24-
<?php
25-
require_once("utils/minifier.php");
26-
require_once("utils/config.php");
27-
require_once("utils/params.php");
28-
require_once("utils/update_checker.php");
29-
//require_once("utils/servers.php");
30-
31-
Update::getCurrentVersion();
32-
33-
$debug = true;
34-
35-
$parser = ParamParser::getParser();
36-
37-
if(ISSET($_GET["server"])){
38-
/*
39-
$name = $_GET["server"];
40-
41-
if(array_key_exists($name, Config::$servers)){
42-
$srv = Config::$servers[$name];
43-
}else{
44-
$name = key(Config::$servers); // get the first server in array
45-
$srv = Config::$servers[$name];
46-
}
47-
*/
48-
49-
unset($_GET["server"]);
50-
}else{
51-
$name = key(Config::$servers); // get the first server in array
52-
$srv = Config::$servers[$name];
53-
}
54-
?>
55-
5623
<html>
5724
<head>
5825
<meta charset="utf-8">
@@ -62,32 +29,41 @@
6229
<link href="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABILAAASCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP74zAv++Mwn/vjMMf74zDH++Mwm//jMCQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD++c0d/vnNROPLnGDw4bRX/vnNQ/75zRkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACFKwBThSsAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACFLQABhSwAvIUsAKyGLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhS0AYYUtAP+FLQD+hS0AUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACGLgAAhi4AYYUtAPmFLQD/hS0A/4UtAPWGLgBVhi4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACHLwABhi4AkoUuAP+MMQD/uEQA/7ZDAP+LMAD/hS4A/oYuAIONNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhzAAWoYvAP/DTQD//8Ay///mSP//5Uj//7ov/7dHAP+FLwD+hi8ASgAAAAAAAAAAAAAAAAAAAAAAAAAAiC0AAIYwAM2UNgD//888///pS///6Uv//+lL///pS///xjf/jTMA/4UwAL0AAAAAAAAAAAAAAAAAAAAAAAAAAIYxAAmGMAD66WQN///qTP//6Uz//+lM///pTP//6Uz//+pM/9NYCP+FMADxhTAAAwAAAAAAAAAAAAAAAAAAAACFMQALhTEA/PduE///6k3//+pN///qTf//6k3//+pN///qTf/iYg7/hTEA84MxAAMAAAAAAAAAAAAAAAAAAAAAhDEAAYQxANemQwH//+RK///qTf//6k3//+pN///qTf//30j/mjwA/4UxAMcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEMgBshDEA//93Gf//50z//+tO///rTv//5Ev/8W0V/4QxAP+EMgBbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgzIAA4MyAK+CMQD/tEwH//+AH///fh7/rUgF/4IxAP+BMQCggDEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDMgAEgjIAc4MyAOCDMgD+gzIA/oEyANyCMgBqgDEAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+MAACgTIAFn4xABV/MQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+B8AAPgfAAD+fwAA/D8AAPw/AADwDwAA4AcAAOAHAADABwAAwAMAAMADAADABwAA4AcAAOAHAADwDwAA/D8AAA==" rel="icon" type="image/x-icon">
6330

6431
<link type="text/css" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700">
65-
<?php
66-
// Print the CSS stuff for the webapp. This will either print the minfied version or, links to the CSS filees
67-
Minifier::printCss($debug);
68-
?>
69-
<link type="text/css" rel="stylesheet" href="style/fontawesome-all.min.css" />
70-
71-
<script src="js/jquery-3.2.1.min.js"></script>
7232

73-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js" integrity="sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh" crossorigin="anonymous"></script>
33+
<!-- Vendor Stylesheets -->
34+
<link rel="stylesheet" href="style/vendor/all.css" />
35+
<link rel="stylesheet" href="style/vendor/bootstrap.css" />
36+
<link rel="stylesheet" href="style/vendor/bootstrap-grid.css" />
37+
<link rel="stylesheet" href="style/vendor/bootstrap-reboot.css" />
38+
<link rel="stylesheet" href="style/vendor/bootstrap-theme.css" />
7439

75-
<script src="js/bootstrap.bundle.min.js"></script>
76-
<script src="js/bootstrap.min.js"></script>
77-
<script src="js/bootstrap-notify.min.js"></script>
40+
<!-- Custom stylesheet-->
41+
<link rel="stylesheet" href="style/src/style.css" />
7842

7943
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.4.0/dist/leaflet.css"
80-
integrity="sha512-puBpdR0798OZvTTbP4A8Ix/l+A4dHDD0DGqYW6RQ+9jxkRFclaxxQb/SJAWZfWAkuyeQUytO7+7N4QKrDh+drA=="
81-
crossorigin=""/>
44+
integrity="sha512-puBpdR0798OZvTTbP4A8Ix/l+A4dHDD0DGqYW6RQ+9jxkRFclaxxQb/SJAWZfWAkuyeQUytO7+7N4QKrDh+drA=="
45+
crossorigin=""/>
8246

8347
<script src="https://unpkg.com/leaflet@1.4.0/dist/leaflet.js"
84-
integrity="sha512-QVftwZFqvtRNi0ZyCtsznlKSWOStnDORoefr1enyq5mVL4tmKB3S/EnC3rRJcxCPavG10IcrVGSmPh6Qw5lwrg=="
85-
crossorigin=""></script>
86-
87-
88-
<?php
89-
Minifier::printFirstJs($debug);
90-
?>
48+
integrity="sha512-QVftwZFqvtRNi0ZyCtsznlKSWOStnDORoefr1enyq5mVL4tmKB3S/EnC3rRJcxCPavG10IcrVGSmPh6Qw5lwrg=="
49+
crossorigin=""></script>
50+
51+
<!-- Vendor JS -->
52+
<!-- They only have a letter in front of them because, I cba adding vendors to gulpfile manually.
53+
I'd rather just add a JS file and be good to go.
54+
-->
55+
<script src="js/vendor/a_jquery-3.3.1.js"></script>
56+
<script src="js/vendor/b_bootstrap.js"></script>
57+
<script src="js/vendor/c_bootstrap-notify.js"></script>
58+
59+
<!-- Custom JS files -->
60+
<script src="js/src/alerter.1.js"></script>
61+
<script src="js/src/objects.1.js"></script>
62+
<script src="js/src/utils.1.js"></script>
63+
<script src="js/src/map.1.js"></script>
64+
<script src="js/src/markers.1.js"></script>
65+
<script src="js/src/init.1.js"></script>
66+
<script src="js/src/socket.1.js"></script>
9167

9268
</head>
9369
<body>
@@ -100,7 +76,7 @@
10076
</button>
10177
<a class="navbar-brand" href="https://github.com/TGRHavoc/">
10278
<img src="https://avatars1.githubusercontent.com/u/1770893?s=460&v=4" style="max-height: 30px" >
103-
Live Map v<?php echo Update::$version ?>
79+
Live Map v<span id="livemap_version">2.0.0</span>
10480
</a>
10581

10682
<div class="collapse navbar-collapse" id="navbarNav">
@@ -208,13 +184,7 @@
208184
</main>
209185
</div>
210186

211-
<?php
212-
Minifier::printLastJs($debug);
213-
$parser->printJsForParams();
214-
if(!Update::latestVersion()){
215-
echo Update::alertJs();
216-
}
217-
?>
187+
<script src="js/src/controls.2.js"></script>
218188

219189
<script>
220190
var greenIcon = L.icon({

‎index.html

+184
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
<!--
2+
3+
// ************************************************************************** //
4+
// LiveMap Interface - The web interface for the livemap
5+
// Copyright (C) 2017 Jordan Dalton
6+
//
7+
// This program is free software: you can redistribute it and/or modify
8+
// it under the terms of the GNU General Public License as published by
9+
// the Free Software Foundation, either version 3 of the License, or
10+
// (at your option) any later version.
11+
//
12+
// This program is distributed in the hope that it will be useful,
13+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
// GNU General Public License for more details.
16+
//
17+
// You should have received a copy of the GNU General Public License
18+
// along with this program in the file "LICENSE". If not, see <http://www.gnu.org/licenses/>.
19+
// ************************************************************************** //
20+
21+
-->
22+
<!DOCTYPE html>
23+
<html>
24+
<head>
25+
<meta charset="utf-8">
26+
<title>Havoc's Live map</title>
27+
28+
<!-- Pin favicon from: https://www.freefavicon.com/freefavicons/objects/iconinfo/map-pin-152-195874.html -->
29+
<link href="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABILAAASCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP74zAv++Mwn/vjMMf74zDH++Mwm//jMCQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD++c0d/vnNROPLnGDw4bRX/vnNQ/75zRkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACFKwBThSsAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACFLQABhSwAvIUsAKyGLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhS0AYYUtAP+FLQD+hS0AUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACGLgAAhi4AYYUtAPmFLQD/hS0A/4UtAPWGLgBVhi4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACHLwABhi4AkoUuAP+MMQD/uEQA/7ZDAP+LMAD/hS4A/oYuAIONNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhzAAWoYvAP/DTQD//8Ay///mSP//5Uj//7ov/7dHAP+FLwD+hi8ASgAAAAAAAAAAAAAAAAAAAAAAAAAAiC0AAIYwAM2UNgD//888///pS///6Uv//+lL///pS///xjf/jTMA/4UwAL0AAAAAAAAAAAAAAAAAAAAAAAAAAIYxAAmGMAD66WQN///qTP//6Uz//+lM///pTP//6Uz//+pM/9NYCP+FMADxhTAAAwAAAAAAAAAAAAAAAAAAAACFMQALhTEA/PduE///6k3//+pN///qTf//6k3//+pN///qTf/iYg7/hTEA84MxAAMAAAAAAAAAAAAAAAAAAAAAhDEAAYQxANemQwH//+RK///qTf//6k3//+pN///qTf//30j/mjwA/4UxAMcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEMgBshDEA//93Gf//50z//+tO///rTv//5Ev/8W0V/4QxAP+EMgBbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgzIAA4MyAK+CMQD/tEwH//+AH///fh7/rUgF/4IxAP+BMQCggDEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDMgAEgjIAc4MyAOCDMgD+gzIA/oEyANyCMgBqgDEAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+MAACgTIAFn4xABV/MQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+B8AAPgfAAD+fwAA/D8AAPw/AADwDwAA4AcAAOAHAADABwAAwAMAAMADAADABwAA4AcAAOAHAADwDwAA/D8AAA==" rel="icon" type="image/x-icon">
30+
31+
<link type="text/css" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700">
32+
33+
<link type="text/css" rel="stylesheet" href="dist/stylesheet.css" />
34+
35+
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.4.0/dist/leaflet.css"
36+
integrity="sha512-puBpdR0798OZvTTbP4A8Ix/l+A4dHDD0DGqYW6RQ+9jxkRFclaxxQb/SJAWZfWAkuyeQUytO7+7N4QKrDh+drA=="
37+
crossorigin=""/>
38+
39+
<script src="https://unpkg.com/leaflet@1.4.0/dist/leaflet.js"
40+
integrity="sha512-QVftwZFqvtRNi0ZyCtsznlKSWOStnDORoefr1enyq5mVL4tmKB3S/EnC3rRJcxCPavG10IcrVGSmPh6Qw5lwrg=="
41+
crossorigin=""></script>
42+
43+
<script src="dist/first-bundle.js"></script>
44+
45+
</head>
46+
<body>
47+
48+
<nav class="navbar navbar-dark navbar-expand-md">
49+
<!-- At some point, I'll add more stuff here. For the time being, it'll just be the site logo -->
50+
<div class="container">
51+
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
52+
<span class="navbar-toggler-icon"></span>
53+
</button>
54+
<a class="navbar-brand" href="https://github.com/TGRHavoc/">
55+
<img src="https://avatars1.githubusercontent.com/u/1770893?s=460&v=4" style="max-height: 30px" >
56+
Live Map v<span id="livemap_version">2.0.0</span>
57+
</a>
58+
59+
<div class="collapse navbar-collapse" id="navbarNav">
60+
<ul class="navbar-nav">
61+
<!-- Servers -->
62+
<li class="nav-item dropdown">
63+
<a class="nav-link dropdown-toggle" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
64+
Select a server
65+
</a>
66+
<div id="server_menu" class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
67+
</div>
68+
</li>
69+
70+
<li class="nav-item">
71+
<a class="nav-link" role="button" id="sidebarTooggle" data-toggle="collapse" data-target="#sidebar" aria-controls="sidebar" aria-label="Toggle sidebar" aria-expanded="false">
72+
Hide/Show Controls
73+
</a>
74+
</li>
75+
76+
77+
<li class="nv-item">
78+
<a class="nav-link" role="button" id="blipToggle" data-toggle="collapse" data-target="#blip-filter-dropdown" aria-controls="blip-filter-dropdown" aria-label="Toggle blip controls" aria-expanded="false">
79+
Blip controls
80+
</a>
81+
</li>
82+
83+
</ul>
84+
</div>
85+
</div>
86+
87+
</nav>
88+
89+
<div id="wrapper" class="container-fluid">
90+
<div id="control-wrapper" >
91+
<div id="sidebar" class="custom-menu col-md-2 col-sm-6 col-xs-12 float-left collapse">
92+
<div class="list-group border-0 card text-center text-md-left" style="padding: 8px 0;">
93+
94+
<a class="nav-header">Controls</a>
95+
96+
<a class="list-group-item d-inline-block collapsed" id="refreshBlips" href="#">
97+
<span class="d-md-inline">Refresh Blips</span>
98+
</a>
99+
100+
<a id="showBlips" href="#" class="list-group-item d-inline-block collapsed">
101+
<span class="d-md-inline">Show Blips</span>
102+
<span id="blips_enabled" class="badge badge-pill badge-success pull-right">on</span>
103+
</a>
104+
105+
<!--
106+
<li>
107+
<a id="toggleLive" href="#">Live update <span id="live_enabled" class="badge badge-danger pull-right">off</span></a>
108+
</li>
109+
-->
110+
<a id="reconnect" href="#" class="list-group-item d-inline-block collapsed">
111+
<span class="d-md-inline">Connect</span>
112+
<span id="connection" class="badge badge-pill badge-danger pull-right">disconnected</span>
113+
</a>
114+
115+
<a class="list-group-item d-inline-block collapsed">
116+
<span class="d-md-inline">Track Player</span>
117+
118+
<select id="playerSelect" class="input-large form-control pull-right">
119+
<option></option>
120+
</select>
121+
</a>
122+
</div>
123+
124+
<div class="list-group border-0 card text-center text-md-left" >
125+
<a class="nav-header">Information</a>
126+
127+
<a class="list-group-item d-inline-block collapsed">Currently viewing:
128+
<p id="server_name" style="white-space: normal; color: #17A2B8">
129+
</p>
130+
</a>
131+
132+
<a class="list-group-item d-inline-block collapsed">Blips loaded
133+
<span id="blip_count" class="badge badge-pill badge-info pull-right">0</span>
134+
</a>
135+
136+
<a class="list-group-item d-inline-block collapsed">Online players
137+
<span id="player_count" class="badge badge-pill badge-info pull-right">0</span>
138+
</a>
139+
</div>
140+
141+
<div class="list-group border-0 card text-center text-md-left" style="margin-top: 10px;">
142+
<p style="text-align: center;">This was originaly created by <a href="https://github.com/TGRHavoc">Havoc</a></p>
143+
</div>
144+
</div>
145+
146+
<div id="blip-filter-dropdown" class="custom-menu col-sm-0 col-xs-0 col-md-12 collapse">
147+
<div class="list-group border-0 card text-center text-md-left" style="padding: 8px 0;">
148+
149+
<a class="nav-header">Blip Controls <small id="toggle-all-blips" class="btn btn-sm btn-info">Toggle all</small></a>
150+
151+
<div id="blip-control-container" class="row">
152+
153+
</div>
154+
155+
</div>
156+
</div>
157+
</div>
158+
159+
<main id="map-holder" class="col-12 main" >
160+
<div id="map-canvas" style="position: relative; overflow: hidden; background-color: rgb(15, 168, 210);"></div>
161+
</main>
162+
</div>
163+
164+
<script src="dist/last-bundle.js"></script>
165+
166+
<script>
167+
var greenIcon = L.icon({
168+
iconUrl: 'images/icons/debug.png',
169+
170+
iconSize: [23, 32], // size of the icon
171+
iconAnchor: [23, 32/2], // point of the icon which will correspond to marker's location
172+
popupAnchor: [-3, -76] // point from which the popup should open relative to the iconAnchor
173+
});
174+
var normalIcon = L.icon({
175+
iconUrl: 'images/icons/normal.png',
176+
177+
iconSize: [23, 32], // size of the icon
178+
iconAnchor: [23, 32/2], // point of the icon which will correspond to marker's location
179+
popupAnchor: [-3, -76] // point from which the popup should open relative to the iconAnchor
180+
});
181+
</script>
182+
</body>
183+
184+
</html>

0 commit comments

Comments
 (0)