diff --git a/CHANGELOG.md b/CHANGELOG.md index d011d9f..115cb17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ * Created Supporters page. * Ability to remove images, volumes, or networks. * Fixed list.js sorting. -* Updated templates.json. +* Removed stackfiles from templates.json and updated some icons. * New logo. ## v0.20 (Jan 20th 2024) - The rewrite. Jumping all the way to v0.20. diff --git a/components/containerCard.js b/components/containerCard.js index b3a9f1d..4515f57 100644 --- a/components/containerCard.js +++ b/components/containerCard.js @@ -83,8 +83,8 @@ export const containerCard = (data) => { diff --git a/components/permissions_modal.js b/components/permissions_modal.js index fd755c2..f7187a9 100644 --- a/components/permissions_modal.js +++ b/components/permissions_modal.js @@ -148,7 +148,7 @@ export const permissionsModal = (data) => { -
+
+
+ +
+
diff --git a/controllers/dashboard.js b/controllers/dashboard.js index 785049f..49efd66 100644 --- a/controllers/dashboard.js +++ b/controllers/dashboard.js @@ -1,14 +1,12 @@ -import { docker, event } from "../server.js"; import { Readable } from 'stream'; import { Permission, Container } from '../database/models.js'; import { modal } from '../components/modal.js'; import { permissionsModal } from '../components/permissions_modal.js'; -import { cpu, ram, tx, rx, disk } from '../server.js'; +import { setEvent, sse, cpu, ram, tx, rx, disk, docker } from '../server.js'; import { dockerContainerStats } from 'systeminformation'; import { containerCard } from '../components/containerCard.js'; - export const Dashboard = (req, res) => { res.render("dashboard", { name: req.session.user, @@ -201,16 +199,14 @@ export const Hide = async (req, res) => { } else { exists.update({ visibility: false }); } - event = true; - eventInfo = 'docker'; + setEvent(true, 'docker'); res.send("ok"); } export const Reset = async (req, res) => { Container.update({ visibility: true }, { where: {} }); - event = true; - eventInfo = 'docker'; + setEvent(true, 'docker'); res.send("ok"); } diff --git a/server.js b/server.js index bd4f337..517751a 100644 --- a/server.js +++ b/server.js @@ -9,7 +9,7 @@ import { currentLoad, mem, networkStats, fsSize } from 'systeminformation'; import { containerCard } from './components/containerCard.js'; export var docker = new Docker(); -export { event, sse, cpu, ram, tx, rx, disk } +export { setEvent, sse, cpu, ram, tx, rx, disk } const app = express(); const MemoryStore = memorystore(session); @@ -49,7 +49,7 @@ app.listen(port, async () => { () => { console.log('Synced Models: ✔️') }); } catch { console.log('Synced Models: ❌'); } } await init().then(() => { - console.log(`Listening on http://localhost:${port} ✔️`); + console.log(`Listening on http://localhost:${port}`); }); }); @@ -59,6 +59,11 @@ let event = false; let sse = false; let eventInfo = ''; +function setEvent(value, type) { + event = value; + eventInfo = type; +} + // Server metrics let serverMetrics = async () => { currentLoad().then(data => { @@ -128,6 +133,7 @@ let containerCards = async () => { cardList = list; } + // Docker events docker.getEvents((err, stream) => { if (err) throw err; diff --git a/views/login.html b/views/login.html index 84585b9..db41639 100644 --- a/views/login.html +++ b/views/login.html @@ -24,7 +24,7 @@

- DweebUI + DweebUI

diff --git a/views/navbar.html b/views/navbar.html index f56a73d..69befe3 100644 --- a/views/navbar.html +++ b/views/navbar.html @@ -33,9 +33,9 @@ aria-controls="navbar-menu" aria-expanded="false" aria-label="Toggle navigation"> -

+

- DweebUI + DweebUI DweebUI