From 2c586aee32118b427597516aaf021245ea8ec8d7 Mon Sep 17 00:00:00 2001 From: Toby Chui Date: Sat, 15 Apr 2023 23:30:34 +0800 Subject: [PATCH] Added blacklist ip table, uptime monitor interface --- src/web/components/blacklist.html | 120 +++++++++++++++++++++- src/web/components/status.html | 126 ++++++++++++++++++++--- src/web/components/subd.html | 2 +- src/web/components/uptime.html | 165 ++++++++++++++++++++++++++++++ src/web/components/vdir.html | 2 +- src/web/hosterror.html | 2 +- src/web/index.html | 21 +++- src/web/main.css | 61 ++++++++++- src/web/rperror.html | 2 +- 9 files changed, 473 insertions(+), 28 deletions(-) create mode 100644 src/web/components/uptime.html diff --git a/src/web/components/blacklist.html b/src/web/components/blacklist.html index ac5d864..3874afe 100644 --- a/src/web/components/blacklist.html +++ b/src/web/components/blacklist.html @@ -315,6 +315,24 @@ +
+

Visitor IP list

+ +

Observe strange traffic on your sites? Ban them in the list below.

+ + + + + + + + + + + +
IPAccess CountBlacklist
+ + \ No newline at end of file diff --git a/src/web/components/status.html b/src/web/components/status.html index 77c9c3e..0071817 100644 --- a/src/web/components/status.html +++ b/src/web/components/status.html @@ -25,23 +25,27 @@
-
+

- +
- -
+ +
+ +

-
+

- +
- -
+ +
+ +

@@ -81,35 +85,39 @@

Visitor Counts

- +
- + - - + + + +
Country ISO CodeVisitor CountUnique Visitors
No Data

Proxy Request Types

- +
- - + + + +
Proxy Type Count
No Data

- + \ No newline at end of file diff --git a/src/web/components/vdir.html b/src/web/components/vdir.html index 6dee483..62e45a1 100644 --- a/src/web/components/vdir.html +++ b/src/web/components/vdir.html @@ -38,7 +38,7 @@ $("#vdirList").append(` ${vdir.Root} ${vdir.Domain} ${tlsIcon} - + `); }); } diff --git a/src/web/hosterror.html b/src/web/hosterror.html index a81fd6b..c86519a 100644 --- a/src/web/hosterror.html +++ b/src/web/hosterror.html @@ -145,7 +145,7 @@
-

Reverse Proxy by imuslab, Licensed under MIT

+

Powered by Zoraxy



diff --git a/src/web/index.html b/src/web/index.html index 4d27d42..e4cceee 100644 --- a/src/web/index.html +++ b/src/web/index.html @@ -20,6 +20,9 @@
+
@@ -63,8 +66,8 @@ HTTP over Websocket - - Uptime Monitor + + Uptime Monitor Network Tools @@ -105,6 +108,9 @@
+ +
+
@@ -207,6 +213,11 @@ alert("Invalid tabid given"); return; } + if (window.innerWidth < 750){ + //RWD mode, hide toolbar + $(".toolbar").fadeOut('fast'); + } + $("#mainmenu").find(".item").removeClass("active"); $(targetBtn).addClass("active"); $(".functiontab").hide(); @@ -215,6 +226,12 @@ window.location.hash = tabID; } + $(window).on("resize", function(){ + if (window.innerWidth >= 750 && $(".toolbar").is(":visible") == false){ + $(".toolbar").show(); + } + }); + diff --git a/src/web/main.css b/src/web/main.css index 0cd643d..79aa063 100644 --- a/src/web/main.css +++ b/src/web/main.css @@ -41,6 +41,7 @@ body{ .toolbar{ width: 240px; + min-width: 240px; } .contentWindow{ @@ -48,11 +49,28 @@ body{ flex: 1; } +.menutoggle{ + display: none !important; +} + @media screen and (max-width: 750px) { .toolbar { + position: fixed; display: inline-block; - width: 100%; + width: 50%; + background-color: white; + top: 3.6em; + right: 0; + height: 100%; margin-bottom: 1em; + z-index: 9; + padding: 1em; + display:none; + border-left: 1px solid rgb(206, 206, 206); + } + + .menutoggle{ + display: inline-block !important; } #mainmenu{ @@ -63,6 +81,8 @@ body{ display: inline-block; width: 100%; } + + } .menudivider{ @@ -95,7 +115,7 @@ body{ } .statustab{ - min-height: 5em; + min-height: 5.5em; } #summaryTotalCount{ @@ -111,3 +131,40 @@ body{ .statustab.summary span, .statustab.summary i{ color: rgb(37, 37, 37); } + +/* + Uptime Monitor +*/ +#utm{ + background-color: white; + border-radius: 1em; +} + + +.domain{ + margin-bottom: 1em; + position: relative; +} + +.statusDot{ + height: 1.8em; + border-radius: 0.4em; + width: 0.4em; + background-color: #e8e8e8; + display:inline-block; + cursor: pointer; + margin-left: 0.1em; +} + +.online.statusDot{ + background-color: #3bd671; +} +.error.statusDot{ + background-color: #f29030; +} +.offline.statusDot{ + background-color: #df484a; +} +.padding.statusDot{ + cursor: auto; +} \ No newline at end of file diff --git a/src/web/rperror.html b/src/web/rperror.html index d43fcbe..8a1da25 100644 --- a/src/web/rperror.html +++ b/src/web/rperror.html @@ -146,7 +146,7 @@
-

Reverse Proxy by imuslab, Licensed under MIT

+

Powered by Zoraxy