From 3661eadc63e4d2a240f88c18c4d50d12956d7223 Mon Sep 17 00:00:00 2001 From: RaindropsSys Date: Thu, 20 Apr 2023 16:20:11 +0200 Subject: Updated 2 files and added 3 files (automated) --- build.sh | 4 +++ index.html | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- index.js | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- logo.svg | 15 ++++++++++ unlock.svg | 1 + 5 files changed, 202 insertions(+), 6 deletions(-) create mode 100644 build.sh create mode 100644 logo.svg create mode 100644 unlock.svg diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..de1ee86 --- /dev/null +++ b/build.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +electron-packager --overwrite --platform darwin --arch arm64 . +electron-packager --overwrite --platform linux --arch x64 . \ No newline at end of file diff --git a/index.html b/index.html index 02fe2bd..c191504 100644 --- a/index.html +++ b/index.html @@ -60,12 +60,83 @@ list-style: none; padding: 0; } + + #preload { + position: fixed; + z-index: 9999; + display: flex; + inset: 0; + background: black; + align-items: center; + justify-content: center; + cursor: none; + } + + #preload-icon { + width: 20%; + pointer-events: none; + } + +

Cliquez n'importe où pour commencer

@@ -88,7 +159,6 @@ const remote = require('@electron/remote'); const { ipcRenderer } = require('electron'); - let server = "http://192.168.1.121:8081/"; window.user = null; window.authTimeout = null; window.authApprovalInterval = null; @@ -97,6 +167,9 @@ window.browsingTimeout2 = null; (async () => { + window.serverVersion = await (await window.fetch("https://delta.equestria.dev/version")).text(); + document.getElementById("version").innerText = "v" + window.serverVersion; + let users = JSON.parse(await (await window.fetch(server + "/dev.equestria.delta.kiosk.GetUserList/")).text()); for (let user of users) { @@ -161,18 +234,29 @@ clearTimeout(window.authTimeout); window.browsingTimeout1 = setInterval(() => { - if (document.getElementById("webview").getURL().endsWith("/login/")) { + if (document.getElementById("webview").getURL().includes("/login/")) { end(); } if (document.getElementById("webview").getURL().endsWith("/_dev.equestria.delta.kiosk.ShutdownKiosk")) { window.close(); } + + if (document.getElementById("webview").getURL().endsWith("/_dev.equestria.delta.kiosk.DisableKiosk")) { + end(); + document.getElementById("preload").style.display = ""; + } + + if (document.getElementById("webview").getURL().endsWith("/_dev.equestria.delta.kiosk.SessionEnd")) { + end(); + } }); window.browsingTimeout2 = setTimeout(() => { end(); }, 300000); + } else if (data['token'] === false) { + end(); } }, 1000); } diff --git a/index.js b/index.js index 803f9a1..091ff58 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -const { app, BrowserWindow, Menu, ipcMain } = require('electron'); +const { app, BrowserWindow, Menu, ipcMain, MenuItem } = require('electron'); require('@electron/remote/main').initialize(); const createWindow = () => { @@ -21,8 +21,100 @@ const createWindow = () => { mainWindow.send('devtools'); }); - mainWindow.setMenu(Menu.buildFromTemplate([])); - Menu.setApplicationMenu(Menu.buildFromTemplate([])); + let menu = Menu.buildFromTemplate([ + new MenuItem({ + label: "Electron", + submenu: Menu.buildFromTemplate([ + new MenuItem({ + label: "quit", + role: "quit", + registerAccelerator: false, + accelerator: '' + }) + ]) + }), + new MenuItem({ + label: "devOptions", + submenu: Menu.buildFromTemplate([ + new MenuItem({ + label: "toggleDevTools", + role: "toggleDevTools", + registerAccelerator: false, + accelerator: '' + }), + new MenuItem({ + label: "forceReload", + role: "forceReload", + registerAccelerator: false, + accelerator: '' + }), + new MenuItem({ + label: "togglefullscreen", + role: "togglefullscreen", + registerAccelerator: false, + accelerator: '' + }), + new MenuItem({ + label: "minimize", + role: "minimize", + registerAccelerator: false, + accelerator: '' + }), + new MenuItem({ + label: "about", + role: "about", + registerAccelerator: false, + accelerator: '' + }), + new MenuItem({ + label: "quit", + role: "quit", + registerAccelerator: false, + accelerator: '' + }) + ]) + }), + new MenuItem({ + label: "editOptions", + submenu: Menu.buildFromTemplate([ + new MenuItem({ + label: "undo", + role: "undo" + }), + new MenuItem({ + label: "redo", + role: "redo" + }), + new MenuItem({ + label: "cut", + role: "cut" + }), + new MenuItem({ + label: "copy", + role: "copy" + }), + new MenuItem({ + label: "paste", + role: "paste" + }), + new MenuItem({ + label: "pasteAndMatchStyle", + role: "pasteAndMatchStyle" + }), + new MenuItem({ + label: "delete", + role: "delete" + }), + new MenuItem({ + label: "selectAll", + role: "selectAll" + }) + ]) + }) + ]); + + mainWindow.setMenu(menu); + Menu.setApplicationMenu(menu); mainWindow.loadFile('index.html'); } diff --git a/logo.svg b/logo.svg new file mode 100644 index 0000000..1019d73 --- /dev/null +++ b/logo.svg @@ -0,0 +1,15 @@ + + + diff --git a/unlock.svg b/unlock.svg new file mode 100644 index 0000000..e1e45b4 --- /dev/null +++ b/unlock.svg @@ -0,0 +1 @@ + \ No newline at end of file -- cgit