diff --git a/config/jest-puppeteer.config.js b/config/jest-puppeteer.config.js index 07830ca..a34937c 100644 --- a/config/jest-puppeteer.config.js +++ b/config/jest-puppeteer.config.js @@ -2,5 +2,11 @@ module.exports = { "launch": { "headless": process.env.HEADLESS_TEST || false, "userDataDir": "./data/test-chrome-profile", + args: [ + "--no-sandbox", + "--disable-setuid-sandbox", + "--disable-gpu", + "--disable-dev-shm-usage" + ], } }; diff --git a/package.json b/package.json index c7ec3d8..83e7d25 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "build": "vite build --config ./config/vite.config.js", "test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test", "test-with-build": "npm run build && npm test", - "jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend && jest --config=./config/jest.config.js", + "jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend && jest --runInBand --config=./config/jest.config.js", "jest-frontend": "cross-env TEST_FRONTEND=1 jest --config=./config/jest-frontend.config.js", "jest-backend": "cross-env TEST_BACKEND=1 jest --config=./config/jest-backend.config.js", "tsc": "tsc", diff --git a/server/database.js b/server/database.js index 41d91e8..fbef40b 100644 --- a/server/database.js +++ b/server/database.js @@ -79,7 +79,7 @@ class Database { console.log(`Data Dir: ${Database.dataDir}`); } - static async connect() { + static async connect(testMode = false) { const acquireConnectionTimeout = 120 * 1000; const Dialect = require("knex/lib/dialects/sqlite3/index.js"); @@ -112,8 +112,13 @@ class Database { await R.autoloadModels("./server/model"); await R.exec("PRAGMA foreign_keys = ON"); - // Change to WAL - await R.exec("PRAGMA journal_mode = WAL"); + if (testMode) { + // Change to MEMORY + await R.exec("PRAGMA journal_mode = MEMORY"); + } else { + // Change to WAL + await R.exec("PRAGMA journal_mode = WAL"); + } await R.exec("PRAGMA cache_size = -12000"); await R.exec("PRAGMA auto_vacuum = FULL"); diff --git a/server/server.js b/server/server.js index d1fd7ff..709a54c 100644 --- a/server/server.js +++ b/server/server.js @@ -176,7 +176,7 @@ exports.entryPage = "dashboard"; (async () => { Database.init(args); - await initDatabase(); + await initDatabase(testMode); exports.entryPage = await setting("entryPage"); @@ -1417,14 +1417,14 @@ async function getMonitorJSONList(userID) { return result; } -async function initDatabase() { +async function initDatabase(testMode = false) { if (! fs.existsSync(Database.path)) { console.log("Copying Database"); fs.copyFileSync(Database.templatePath, Database.path); } console.log("Connecting to the Database"); - await Database.connect(); + await Database.connect(testMode); console.log("Connected"); // Patch the database diff --git a/src/assets/vars.scss b/src/assets/vars.scss index 2f43698..91ab917 100644 --- a/src/assets/vars.scss +++ b/src/assets/vars.scss @@ -12,6 +12,7 @@ $dark-font-color2: #020b05; $dark-bg: #0d1117; $dark-bg2: #070a10; $dark-border-color: #1d2634; +$dark-header-bg: #161b22; $easing-in: cubic-bezier(0.54, 0.78, 0.55, 0.97); $easing-out: cubic-bezier(0.25, 0.46, 0.45, 0.94); diff --git a/src/components/MonitorList.vue b/src/components/MonitorList.vue index bd771f8..ef51e89 100644 --- a/src/components/MonitorList.vue +++ b/src/components/MonitorList.vue @@ -137,7 +137,7 @@ export default { justify-content: space-between; .dark & { - background-color: #161b22; + background-color: $dark-header-bg; border-bottom: 0; } } diff --git a/src/components/settings/About.vue b/src/components/settings/About.vue new file mode 100644 index 0000000..baa72f3 --- /dev/null +++ b/src/components/settings/About.vue @@ -0,0 +1,25 @@ + + + + + diff --git a/src/components/settings/Appearance.vue b/src/components/settings/Appearance.vue new file mode 100644 index 0000000..e0a3d64 --- /dev/null +++ b/src/components/settings/Appearance.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/components/settings/Backup.vue b/src/components/settings/Backup.vue new file mode 100644 index 0000000..6ac28d4 --- /dev/null +++ b/src/components/settings/Backup.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/src/components/settings/General.vue b/src/components/settings/General.vue new file mode 100644 index 0000000..a1b42d8 --- /dev/null +++ b/src/components/settings/General.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/src/components/settings/MonitorHistory.vue b/src/components/settings/MonitorHistory.vue new file mode 100644 index 0000000..dc33db5 --- /dev/null +++ b/src/components/settings/MonitorHistory.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/components/settings/Notifications.vue b/src/components/settings/Notifications.vue new file mode 100644 index 0000000..b2cbcf4 --- /dev/null +++ b/src/components/settings/Notifications.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/components/settings/Security.vue b/src/components/settings/Security.vue new file mode 100644 index 0000000..4ef6b3d --- /dev/null +++ b/src/components/settings/Security.vue @@ -0,0 +1,323 @@ + + + + + diff --git a/src/languages/en.js b/src/languages/en.js index 15c3cd0..a503b52 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -307,4 +307,5 @@ export default { steamApiKeyDescription: "For monitoring a Steam Game Server you need a Steam Web-API key. You can register your API key here: ", "Current User": "Current User", recent: "Recent", + shrinkDatabaseDescription: "Trigger database VACCUM for SQLite. If your database is created after 1.10.0, AUTO_VACCUM is already enabled and this action is not needed.", }; diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue index 7228a46..75173e1 100644 --- a/src/layouts/Layout.vue +++ b/src/layouts/Layout.vue @@ -29,7 +29,7 @@ @@ -188,8 +188,8 @@ main { .dark { header { - background-color: #161b22; - border-bottom-color: #161b22 !important; + background-color: $dark-header-bg; + border-bottom-color: $dark-header-bg !important; span { color: #f0f6fc; diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 65c3dad..11be3ed 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -194,7 +194,7 @@
- +
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue index 9d50140..bacda3a 100644 --- a/src/pages/Settings.vue +++ b/src/pages/Settings.vue @@ -1,527 +1,91 @@ @@ -667,44 +121,69 @@ export default { .shadow-box { padding: 20px; + min-height: calc(100vh - 155px); } -.btn-check:active + .btn-outline-primary, -.btn-check:checked + .btn-outline-primary, -.btn-check:hover + .btn-outline-primary { - color: #fff; +footer { + color: #aaa; + font-size: 13px; + margin-top: 20px; + padding-bottom: 30px; + text-align: center; } -.dark { - .list-group-item { - background-color: $dark-bg2; - color: $dark-font-color; +.settings-menu { + flex: 0 0 auto; + width: 300px; + + a { + text-decoration: none !important; } - .btn-check:active + .btn-outline-primary, - .btn-check:checked + .btn-outline-primary, - .btn-check:hover + .btn-outline-primary { - color: #000; + .menu-item { + border-radius: 10px; + margin: 0.5em; + padding: 0.7em 1em; + cursor: pointer; } - #importBackup { - &::file-selector-button { - color: $primary; - background-color: $dark-bg; + .menu-item:hover { + background: $highlight-white; + + .dark & { + background: $dark-header-bg; } + } - &:hover:not(:disabled):not([readonly])::file-selector-button { - color: $dark-font-color2; - background-color: $primary; + .active .menu-item { + background: $highlight-white; + border-left: 4px solid $primary; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + + .dark & { + background: $dark-header-bg; } } } -footer { - color: #aaa; - font-size: 13px; - margin-top: 20px; - padding-bottom: 30px; - text-align: center; +.settings-content { + flex: 0 0 auto; + width: calc(100% - 300px); + + .settings-content-header { + width: calc(100% + 20px); + border-bottom: 1px solid #dee2e6; + border-radius: 0 10px 0 0; + margin-top: -20px; + margin-right: -20px; + padding: 12.5px 1em; + font-size: 26px; + + .dark & { + background: $dark-header-bg; + border-bottom: 0; + } + } } diff --git a/src/router.js b/src/router.js index 5c3fda9..a2414eb 100644 --- a/src/router.js +++ b/src/router.js @@ -11,6 +11,14 @@ import Setup from "./pages/Setup.vue"; const StatusPage = () => import("./pages/StatusPage.vue"); import Entry from "./pages/Entry.vue"; +import Appearance from "./components/settings/Appearance.vue"; +import General from "./components/settings/General.vue"; +import Notifications from "./components/settings/Notifications.vue"; +import MonitorHistory from "./components/settings/MonitorHistory.vue"; +import Security from "./components/settings/Security.vue"; +import Backup from "./components/settings/Backup.vue"; +import About from "./components/settings/About.vue"; + const routes = [ { path: "/", @@ -59,6 +67,37 @@ const routes = [ { path: "/settings", component: Settings, + children: [ + { + path: "general", + alias: "", + component: General, + }, + { + path: "appearance", + component: Appearance, + }, + { + path: "notifications", + component: Notifications, + }, + { + path: "monitor-history", + component: MonitorHistory, + }, + { + path: "security", + component: Security, + }, + { + path: "backup", + component: Backup, + }, + { + path: "about", + component: About, + }, + ] }, ], }, diff --git a/test/e2e.spec.js b/test/e2e.spec.js index 03920b3..488179e 100644 --- a/test/e2e.spec.js +++ b/test/e2e.spec.js @@ -59,18 +59,31 @@ describe("Init", () => { // Go to / await page.goto(baseURL); - await sleep(3000); + await page.waitForSelector("h1.mb-3"); pathname = await page.evaluate(() => location.pathname); expect(pathname).toEqual("/dashboard"); }); + it("should create monitor", async () => { + // Create monitor + await page.goto(baseURL + "/add"); + await page.waitForSelector("#name"); + + await page.type("#name", "Myself"); + await page.waitForSelector("#url"); + await page.click("#url", { clickCount: 3 }); + await page.keyboard.type(baseURL); + await page.keyboard.press("Enter"); + }); + // Settings Page describe("Settings", () => { - beforeAll(async () => { + beforeEach(async () => { await page.goto(baseURL + "/settings"); }); it("Change Language", async () => { + await page.goto(baseURL + "/settings/appearance"); await page.waitForSelector("#language"); await page.select("#language", "zh-HK"); @@ -83,20 +96,33 @@ describe("Init", () => { }); it("Change Theme", async () => { - await sleep(1000); + await page.goto(baseURL + "/settings/appearance"); // Dark await click(page, ".btn[for=btncheck2]"); await page.waitForSelector("div.dark"); - await sleep(1000); + await page.waitForSelector(".btn[for=btncheck1]"); // Light await click(page, ".btn[for=btncheck1]"); await page.waitForSelector("div.light"); }); - // TODO: Heartbeat Bar Style + it("Change Heartbeat Bar Style", async () => { + await page.goto(baseURL + "/settings/appearance"); + + // Bottom + await click(page, ".btn[for=btncheck5]"); + await page.waitForSelector("div.hp-bar-big"); + + // None + await click(page, ".btn[for=btncheck6]"); + await page.waitForSelector("div.hp-bar-big", { + hidden: true, + timeout: 1000 + }); + }); // TODO: Timezone @@ -108,14 +134,14 @@ describe("Init", () => { // Yes await click(page, "#searchEngineIndexYes"); await click(page, "form > div > .btn[type=submit]"); - await sleep(2000); + await sleep(1000); res = await axios.get(baseURL + "/robots.txt"); expect(res.data).not.toContain("Disallow: /"); // No await click(page, "#searchEngineIndexNo"); await click(page, "form > div > .btn[type=submit]"); - await sleep(2000); + await sleep(1000); res = await axios.get(baseURL + "/robots.txt"); expect(res.data).toContain("Disallow: /"); }); @@ -125,25 +151,25 @@ describe("Init", () => { // Default await newPage.goto(baseURL); - await sleep(3000); + await newPage.waitForSelector("h1.mb-3", { timeout: 3000 }); let pathname = await newPage.evaluate(() => location.pathname); expect(pathname).toEqual("/dashboard"); // Status Page await click(page, "#entryPageNo"); await click(page, "form > div > .btn[type=submit]"); - await sleep(4000); + await sleep(1000); await newPage.goto(baseURL); - await sleep(4000); + await newPage.waitForSelector("img.logo", { timeout: 3000 }); pathname = await newPage.evaluate(() => location.pathname); expect(pathname).toEqual("/status"); // Back to Dashboard await click(page, "#entryPageYes"); await click(page, "form > div > .btn[type=submit]"); - await sleep(4000); + await sleep(1000); await newPage.goto(baseURL); - await sleep(4000); + await newPage.waitForSelector("h1.mb-3", { timeout: 3000 }); pathname = await newPage.evaluate(() => location.pathname); expect(pathname).toEqual("/dashboard"); @@ -151,7 +177,7 @@ describe("Init", () => { }); it("Change Password (wrong current password)", async () => { - await page.goto(baseURL + "/settings"); + await page.goto(baseURL + "/settings/security"); await page.waitForSelector("#current-password"); await page.type("#current-password", "wrong_passw$$d"); @@ -159,10 +185,10 @@ describe("Init", () => { await page.type("#repeat-new-password", "new_password123"); // Save - await click(page, "form > div > .btn[type=submit]", 1); - await sleep(4000); + await click(page, "form > div > .btn[type=submit]", 0); + await sleep(1000); - await click(page, ".btn-danger.btn.me-2"); + await click(page, "#logout-btn"); await login("admin", "new_password123"); let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length); expect(elementCount).toEqual(1); @@ -171,24 +197,26 @@ describe("Init", () => { }); it("Change Password (wrong repeat)", async () => { - await page.goto(baseURL + "/settings"); + await page.goto(baseURL + "/settings/security"); await page.waitForSelector("#current-password"); await page.type("#current-password", "admin123"); await page.type("#new-password", "new_password123"); await page.type("#repeat-new-password", "new_password1234567898797898"); - await click(page, "form > div > .btn[type=submit]", 1); - await sleep(4000); + await click(page, "form > div > .btn[type=submit]", 0); + await sleep(1000); - await click(page, ".btn-danger.btn.me-2"); + await click(page, "#logout-btn"); await login("admin", "new_password123"); let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length); expect(elementCount).toEqual(1); await login("admin", "admin123"); - await sleep(3000); + await page.waitForSelector("#current-password"); + let pathname = await page.evaluate(() => location.pathname); + expect(pathname).toEqual("/settings/security"); }); // TODO: 2FA @@ -197,9 +225,35 @@ describe("Init", () => { // TODO: Import Backup - // TODO: Disable Auth + it("Should disable & enable auth", async () => { + await page.goto(baseURL + "/settings/security"); + await click(page, "#disableAuth-btn"); + await click(page, ".btn.btn-danger[data-bs-dismiss='modal']", 2); // Not a good way to do it + await page.waitForSelector("#enableAuth-btn", { timeout: 3000 }); + await page.waitForSelector("#logout-btn", { + hidden: true, + timeout: 3000 + }); - // TODO: Clear Stats + const newPage = await browser.newPage(); + await newPage.goto(baseURL); + await newPage.waitForSelector("span.badge", { timeout: 3000 }); + newPage.close(); + + await click(page, "#enableAuth-btn"); + await login("admin", "admin123"); + await page.waitForSelector("#disableAuth-btn", { timeout: 3000 }); + }); + + it("Should clear all statistics", async () => { + await page.goto(baseURL + "/settings/monitor-history"); + await click(page, "#clearAllStats-btn"); + await click(page, ".btn.btn-danger"); + await page.waitForFunction(() => { + const badge = document.querySelector("span.badge"); + return badge && badge.innerText == "0%"; + }, { timeout: 3000 }); + }); }); /*