diff --git a/expressHandler.js b/expressHandler.js deleted file mode 100644 index 8e3dd47..0000000 --- a/expressHandler.js +++ /dev/null @@ -1,28 +0,0 @@ -const express = require("express"), -path = require("path") - -var app = express() - -const PORT = process.env.PORT || 8080 - -const cachePath = path.join(__dirname, 'cached') -const assetPath = path.join(__dirname, "assets") - -app.listen(PORT, () => { - console.log("Violet's Purgatory is now listening on port: " + PORT) -}) - -const pageUpdater = require("./pageUpdater.js") - -app.use("/fonts", express.static(path.join(assetPath, "fonts"))) -app.use("/cached", express.static(cachePath)) -app.use("/imgs", express.static(path.join(assetPath, "Images"))) -app.use("/snds", express.static(path.join(assetPath, "Sounds"))) - -app.use("/emojis", express.static(path.join(cachePath, "emojis"))) - -app.use(pageUpdater.middleWare) - -module.exports = { - app: app -} \ No newline at end of file diff --git a/index.js b/index.js index 4433575..df08653 100644 --- a/index.js +++ b/index.js @@ -1,8 +1,12 @@ -const express = require('./expressHandler.js'), +const express = require('express'), path = require('path'), fs = require('fs'), WebSocket = require("ws") +var app = express() + +const PORT = process.env.PORT || 8080 + const staticpath = path.join(__dirname, 'static') const cachePath = path.join(__dirname, 'cached') const assetPath = path.join(__dirname, "assets") @@ -23,8 +27,21 @@ if (!fs.existsSync(announcementFile)) { fs.writeFileSync(announcementFile, ``) } +const pageUpdater = require('./pageUpdater.js') + var constants = JSON.parse(fs.readFileSync(path.join(__dirname, 'constants.json'))) +app.listen(PORT, () => { + console.log("Violet's Purgatory is now listening on port: " + PORT) +}) + +app.use("/fonts", express.static(path.join(assetPath, "fonts"))) +app.use("/cached", express.static(cachePath)) +app.use("/imgs", express.static(path.join(assetPath, "Images"))) +app.use("/snds", express.static(path.join(assetPath, "Sounds"))) + +app.use("/emojis", express.static(path.join(cachePath, "emojis"))) + if (!fs.existsSync(cachePath)) { fs.mkdirSync(cachePath) } @@ -33,10 +50,12 @@ if (!fs.existsSync(path.join(cachePath, "emojis"))) { fs.mkdirSync(path.join(cachePath, "emojis")) } +app.use(pageUpdater.middleWare) + process.on('uncaughtException', (err, origin) => { fs.writeSync( - process.stderr.fd, - `Caught exception: ${err}\n` + - `Exception origin: ${origin}`, + process.stderr.fd, + `Caught exception: ${err}\n` + + `Exception origin: ${origin}`, ); -}); \ No newline at end of file + }); \ No newline at end of file diff --git a/static/themes/magic/style.css b/static/themes/magic/style.css index 1721029..05b8512 100644 --- a/static/themes/magic/style.css +++ b/static/themes/magic/style.css @@ -1,6 +1,6 @@ #card { - background-color: rgba(25, 0, 70, 1); + background-color: rgba(20, 5, 90, 0.5); /* backdrop-filter: blur(5px); */ } .magicStuff { diff --git a/static/themes/rain/style.css b/static/themes/rain/style.css index d10daae..3302382 100644 --- a/static/themes/rain/style.css +++ b/static/themes/rain/style.css @@ -1,6 +1,6 @@ #card { - background-color: rgba(25, 0, 70, 1); + background-color: rgba(50, 0, 90, 0.5); /* backdrop-filter: blur(5px); */ } .rainStuff {