diff --git a/openrouter/src/web/css/header.css b/openrouter/src/web/css/header.css index bd86c4f..783f6b1 100644 --- a/openrouter/src/web/css/header.css +++ b/openrouter/src/web/css/header.css @@ -2,12 +2,14 @@ header { width: 100vw; height: 50px; padding: 10px; - display: flex; + display: grid; + grid-template-columns: 32% 32% 32%; align-items: center; justify-content: space-between; } .links { + justify-self: start; display: flex; align-items: center; gap: 10px; @@ -26,11 +28,16 @@ header { } .userbuttons { + justify-self: end; display: flex; align-items: center; gap: 10px; } +header>h1 { + justify-self: center; +} + @media screen and (max-width: 400px) { header>h1 { font-size: 15px; diff --git a/openrouter/src/web/css/index.css b/openrouter/src/web/css/index.css index 39be9e0..65e1f04 100644 --- a/openrouter/src/web/css/index.css +++ b/openrouter/src/web/css/index.css @@ -29,4 +29,6 @@ body { .section { position: relative; + overflow: hidden; + height: calc(100vh - 50px); } diff --git a/openrouter/src/web/css/settings.css b/openrouter/src/web/css/settings.css index e3ee9f6..5827a21 100644 --- a/openrouter/src/web/css/settings.css +++ b/openrouter/src/web/css/settings.css @@ -70,14 +70,16 @@ top: 0; left: 0; width: 100%; - height: 100%; + height: calc(100vh - 50px); padding: 10px; display: flex; - /* flex-direction: column; */ + flex-wrap: wrap; + justify-content: center; gap: 10px; transition: 0.3s; opacity: 0; pointer-events: none; + overflow-y: auto; } .settingssection.active { @@ -86,7 +88,7 @@ } .settingrect { - width: 25%; + width: 24%; height: max-content; background-color: gray; padding: 20px; @@ -105,6 +107,7 @@ } .settingrectbody { + position: relative; width: 100%; max-height: 0; overflow: auto; @@ -151,7 +154,7 @@ padding: 10px; } -table { +.settingrectbody>table { position: relative; width: 100%; border: 2px solid ; @@ -205,8 +208,8 @@ tbody>tr>th { width: 50%; } .settingssection { - flex-direction: column; - align-items: center; + /* flex-direction: column; */ + /* align-items: center; */ } } diff --git a/openrouter/src/web/index.html b/openrouter/src/web/index.html index 0867abb..5d40597 100644 --- a/openrouter/src/web/index.html +++ b/openrouter/src/web/index.html @@ -32,9 +32,9 @@
-
+
-
+

Telnet

@@ -54,7 +54,7 @@
-
+

DNS

@@ -90,7 +90,7 @@
-
+

Ftp

@@ -104,7 +104,7 @@
-
+

SSH

@@ -130,6 +130,20 @@
+ +
+
+

WIFI

+
+ +
+
+
+ + +
+
+
diff --git a/openrouter/src/web/js/routes.js b/openrouter/src/web/js/routes.js index abe0845..5d7a5c0 100644 --- a/openrouter/src/web/js/routes.js +++ b/openrouter/src/web/js/routes.js @@ -1,10 +1,9 @@ -const authhost = window.location.origin const host = window.location.origin const prefix = 'api' const routes = { - login: () => [authhost, prefix, 'token'].join('/'), - user: () => [authhost, prefix, 'users', 'user'].join('/'), + login: () => [host, prefix, 'token'].join('/'), + user: () => [host, prefix, 'users', 'user'].join('/'), telnet_status: () => [host, prefix, 'settings', 'telnet', 'get'].join('/'), telnet_status_set: () => [host, prefix, 'settings', 'telnet', 'set'].join('/'), diff --git a/rootfs/usr/conf/nginx.conf b/rootfs/usr/conf/nginx.conf index 58c4812..cccd965 100644 --- a/rootfs/usr/conf/nginx.conf +++ b/rootfs/usr/conf/nginx.conf @@ -38,8 +38,8 @@ http { proxy_pass http://127.0.0.1:43244/api/reboot; } - location /auth/admin { - proxy_pass http://127.0.0.1:43243/auth/admin; + location /auth { + proxy_pass http://127.0.0.1:43243/auth; } location /api {