diff --git a/server/frontend/connect-router.js b/server/frontend/connect-router.js index e72597c..be83043 100644 --- a/server/frontend/connect-router.js +++ b/server/frontend/connect-router.js @@ -5,31 +5,31 @@ module.exports = function (req, res) { if (req.query.encrypted === undefined || req.query.server === undefined) return res.status(400).send(` - - Error - - - -

[400] Error

unuse required params

- + + Error + + + +

[400] Error

unuse required params

+ `); res.send(` - - Connection: ${serverAddress} - - - -
-

Error: Javascript off

-

Javascript is required for the site to work, enable it in your browser settings

-
- + + Connection: ${serverAddress} + + + +
+

Error: Javascript off

+

Javascript is required for the site to work, enable it in your browser settings

+
+ - + `); -} \ No newline at end of file +}; diff --git a/server/frontend/fldir-router.js b/server/frontend/fldir-router.js index 370b3ed..fbf57e5 100644 --- a/server/frontend/fldir-router.js +++ b/server/frontend/fldir-router.js @@ -4,17 +4,20 @@ const path = require("path"); const router = express.Router(); router.get("/", (req, res) => { - res.send( - fs.readFileSync(path.join(__dirname, "pages/index.html")).toString("utf-8") - ); + res.send( + fs.readFileSync(path.join(__dirname, "pages/index.html")).toString("utf-8"), + ); }); router.get("/connect", (req, res) => { - res.send( - fs.readFileSync(path.join(__dirname, "pages/connect.html")).toString("utf-8") - ); + res.send( + fs.readFileSync(path.join(__dirname, "pages/connect.html")) + .toString("utf-8"), + ); }); -router.get("/*", (req, res) => res.status(404).send("

404: Not finded.

")); +router.get("/*", (req, res) => + res.status(404).send("

404: Not finded.

"), +); module.exports = router; diff --git a/server/frontend/index.js b/server/frontend/index.js index 5d2563b..f1edf35 100644 --- a/server/frontend/index.js +++ b/server/frontend/index.js @@ -7,48 +7,51 @@ const connectArea = require("./connect-router"); const api = require("./web-api/api-router"); module.exports = (address, port) => { - const app = express(); - logger.log("Static in", path.join(__dirname, "public")); - + const app = express(); + logger.log("Static in", path.join(__dirname, "public")); + app.use((req, res, next) => { // logger.log("HTTP headers:", req.headers); + if (global.server.isLocked) { + res.set("Content-Type", "plain/text"); + return res.send("Server temporary on reload"); + } next(); }); - - app.use(express.static(path.join(__dirname, "public"))); - app.use("/fl_dir", flDir); - app.use("/api", api); - + app.use(express.static(path.join(__dirname, "public"))); + + app.use("/fl_dir", flDir); + app.use("/api", api); + app.get("/connect-area", connectArea); - - app.use("/*", (req, res) => { - res.send(` + + app.use("/*", (req, res) => { + res.send(` - - AI Adventure Labs - - - -
-

Error: Javascript off

-

Javascript is required for the site to work, enable it in your browser settings

-
- - + + AI Adventure Labs + + + +
+

Error: Javascript off

+

Javascript is required for the site to work, enable it in your browser settings

+
+ + - + `); - }); + }); - app.listen(port, address, (err) => { - if (err) - throw err; - logger.log(`HTTP page successful runned at port ${port}`); - }); + app.listen(port, address, (err) => { + if (err) throw err; + logger.log(`HTTP page successful runned at port ${port}`); + }); }; diff --git a/server/frontend/public/js/connect/api.js b/server/frontend/public/js/connect/api.js index c529f1f..51851a7 100644 --- a/server/frontend/public/js/connect/api.js +++ b/server/frontend/public/js/connect/api.js @@ -83,6 +83,12 @@ class ApiMethods extends ProtoApiMethods { gtf }); } + + async characters () { + return await super._protoMethod({ + method: "characters" + }); + } } class ApiHTML { @@ -102,6 +108,9 @@ class ApiHTML { document.getElementById("server.area").innerHTML = ''; $(document.getElementById("server.area")).append(ServerAuth.mainMenuForm); + // JS-Events + const charactersEvents = await this.api.methods.characters(); + console.debug({ charactersEvents }); } async renderAuth (authMode, bgUrl = null, favicon = null) { diff --git a/server/frontend/public/js/main.js b/server/frontend/public/js/main.js index 32ffb4d..e772283 100644 --- a/server/frontend/public/js/main.js +++ b/server/frontend/public/js/main.js @@ -1,26 +1,29 @@ // cookie parser function -function getCookies () { - return Object.fromEntries(document.cookie.split(/\s{0,};\s{0,}/gmiu).map(i => i.split(/\s{0,}=\s{0,}/gmiu))); +function getCookies() { + return Object.fromEntries( + document.cookie + .split(/\s{0,};\s{0,}/gimu) + .map((i) => i.split(/\s{0,}=\s{0,}/gimu)), + ); } // translate function -function translate (page) { - [...document.getElementsByClassName("translate")].forEach(translateEl => { +function translate(page) { + [...document.getElementsByClassName("translate")].forEach((translateEl) => { // console.log(translateEl.id); - const result = tr(page, translateEl.id); - // console.log(result); - if (result) - translateEl.innerHTML = result; + const result = tr(page, translateEl.id); + // console.log(result); + if (result) translateEl.innerHTML = result; }); - - [...document.getElementsByClassName("linked-btn")].forEach(el => { + + [...document.getElementsByClassName("linked-btn")].forEach((el) => { el.style.cursor = "pointer"; }); } // Get random integer number function function randint(min, max) { - return Math.ceil((Math.random() * (max - min)) + min); + return Math.ceil(Math.random() * (max - min) + min); } // Get traceId for requests to server @@ -32,10 +35,12 @@ function getTraceId() { } // load styles -document.head.innerHTML += '\\n '; +document.head.innerHTML += + '\\n '; document.head.innerHTML += '\\n '; -document.head.innerHTML += '\\n '; -document.head.innerHTML += '\\n ' +document.head.innerHTML += + '\\n '; +document.head.innerHTML += '\\n '; // load main page document.body.innerHTML = `