From 7b09a72d5cafc783e70d6f407627a2273a6b2c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20K=C4=99dryna?= Date: Mon, 16 Jun 2025 12:05:39 +0200 Subject: [PATCH 1/6] feat(style.css): replace colors with var values --- judas_server/web/static/css/style.css | 37 ++++++++++++++++++++------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/judas_server/web/static/css/style.css b/judas_server/web/static/css/style.css index af91c05..bb8210c 100644 --- a/judas_server/web/static/css/style.css +++ b/judas_server/web/static/css/style.css @@ -1,3 +1,22 @@ +:root { + --nord-bg0: #2e3440; + --nord-bg1: #3b4252; + --nord-bg2: #434c5e; + --nord-bg3: #4c566a; + --nord-fg0: #eceff4; + --nord-fg1: #e5e9f0; + --nord-fg2: #d8dee9; + --nord-acc0: #8fbcbb; + --nord-acc1: #88c0d0; + --nord-acc2: #81a1c1; + --nord-acc3: #5e81ac; + --nord-aur0: #bf616a; + --nord-aur1: #d08770; + --nord-aur2: #ebcb8b; + --nord-aur3: #a3be8c; + --nord-aur4: #b48ead; +} + * { margin: 0; padding: 0; @@ -5,15 +24,15 @@ } body { - background-color: #b48ead; + background-color: var(--nord-aur4); font-family: monospace, sans-serif !important; - color: #eceff4; + color: var(--nord-fg0); } input { font-family: inherit; color: #eceff4; - background-color: #434c5e; + background-color: var(--nord-bg2); border: none; border-radius: 0.25rem; padding: 0.25rem; @@ -29,27 +48,27 @@ header { display: flex; justify-content: space-between; align-items: center; - background-color: #2e3440; - color: #eceff4; + background-color: var(--nord-bg0); + color: var(--nord-fg0); padding: 1rem; } main { padding: 1rem; - background-color: #3b4252; + background-color: var(--nord-bg1); flex-grow: 1; } header a { text-decoration: none; - color: #eceff4; + color: var(--nord-fg0); } .button { display: inline-block; padding: 0.5rem 1rem; background-color: #8fbcbb; - color: #2e3440; + color: var(--nord-bg0); border: none; border-radius: 0.25rem; text-decoration: none; @@ -57,7 +76,7 @@ header a { } .button:hover { - background-color: #81a1c1; + background-color: var(--nord-acc2); cursor: pointer; } From 3709a42e6416632daa9194d0346bbd7106686660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20K=C4=99dryna?= Date: Mon, 16 Jun 2025 12:06:42 +0200 Subject: [PATCH 2/6] feat(style.css): style panel table --- judas_server/web/static/css/style.css | 59 +++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/judas_server/web/static/css/style.css b/judas_server/web/static/css/style.css index bb8210c..47b155e 100644 --- a/judas_server/web/static/css/style.css +++ b/judas_server/web/static/css/style.css @@ -82,4 +82,63 @@ header a { .center { text-align: center; +} + +.center-table { + margin: 0 auto; + width: 100%; +} + +.select-table{ + border-collapse: collapse; + border: 2px solid var(--nord-fg0); +} + +.select-table thead { + position: sticky; + top: -1px; + z-index: 2; +} + +.select-table th, .select-table td { + padding: 0.5rem; + text-align: center; + border: 1px solid var(--nord-fg1); + border-collapse: collapse; +} + +.select-table th { + background-color: var(--nord-bg2); + color: var(--nord-fg0); +} + +.select-table a { + display: block; + color: var(--nord-acc0); + text-decoration: none; + transition: 0.1s ease-in-out; +} + +.select-table tr { + transition: 0.1s ease-in-out; +} + +.select-table tr:hover { + background-color: var(--nord-acc1); +} + +.select-table tr:hover a { + color: var(--nord-bg0); +} + +.red-bg { + background-color: var(--nord-aur0); +} + +.yellow-bg { + background-color: var(--nord-aur2); +} + +.green-bg { + background-color: var(--nord-aur3); } \ No newline at end of file From cde27d37e3319ccc6b370f0628c96437a42ace69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20K=C4=99dryna?= Date: Mon, 16 Jun 2025 12:07:29 +0200 Subject: [PATCH 3/6] refactor(web_server.py): make status lowercase --- judas_server/web/web_server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/judas_server/web/web_server.py b/judas_server/web/web_server.py index c0e258a..c0eeaab 100644 --- a/judas_server/web/web_server.py +++ b/judas_server/web/web_server.py @@ -17,12 +17,12 @@ login_manager.init_app(app) PC_DETAILS = { "PC1": { "id": "PC1", - "status": "Online", + "status": "online", "last_seen": "2023-10-01 12:00:00", }, "PC2": { "id": "PC2", - "status": "Offline", + "status": "offline", "last_seen": "2023-10-01 11:00:00", }, } From 06ea0246f51742060ce4051d609dbce7d716fdf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20K=C4=99dryna?= Date: Mon, 16 Jun 2025 12:08:21 +0200 Subject: [PATCH 4/6] chore(web_server.py): add more pc placeholders --- judas_server/web/web_server.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/judas_server/web/web_server.py b/judas_server/web/web_server.py index c0eeaab..586edaf 100644 --- a/judas_server/web/web_server.py +++ b/judas_server/web/web_server.py @@ -25,6 +25,31 @@ PC_DETAILS = { "status": "offline", "last_seen": "2023-10-01 11:00:00", }, + "PC3": { + "id": "PC3", + "status": "offline", + "last_seen": "2023-10-01 11:00:00", + }, + "PC4": { + "id": "PC4", + "status": "offline", + "last_seen": "2023-10-01 11:00:00", + }, + "PC5": { + "id": "PC5", + "status": "offline", + "last_seen": "2023-10-01 11:00:00", + }, + "PC6": { + "id": "PC6", + "status": "offline", + "last_seen": "2023-10-01 11:00:00", + }, + "PC7": { + "id": "PC7", + "status": "offline", + "last_seen": "2023-10-01 11:00:00", + } } From 7c98d16cc2391c0ab22a9727887fa66d29b19b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20K=C4=99dryna?= Date: Mon, 16 Jun 2025 12:09:40 +0200 Subject: [PATCH 5/6] feat(panel.html): add description and classes to table --- judas_server/web/templates/panel.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/judas_server/web/templates/panel.html b/judas_server/web/templates/panel.html index 1fc5921..9e55d67 100644 --- a/judas_server/web/templates/panel.html +++ b/judas_server/web/templates/panel.html @@ -13,7 +13,10 @@

Logout

- +

Select a PC to Control

+

Choose a PC from the list below to view details or send commands.

+
+
From 6872348375270906d39b7154b2571baa504575e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20K=C4=99dryna?= Date: Mon, 16 Jun 2025 12:10:39 +0200 Subject: [PATCH 6/6] feat(panel.html): change bg color based on status --- judas_server/web/templates/panel.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/judas_server/web/templates/panel.html b/judas_server/web/templates/panel.html index 9e55d67..1162ee3 100644 --- a/judas_server/web/templates/panel.html +++ b/judas_server/web/templates/panel.html @@ -28,8 +28,7 @@ {% for pc in pcs.values() %} - - + {% else %}
PC ID
{{ pc.id }}{{ pc.status if pc.status else 'Unknown' }}{{ pc.last_seen if pc.last_seen else 'Never' }}{{ pc.status if pc.status else 'Unknown' }} {{ pc.last_seen if pc.last_seen else 'Never' }}