diff --git a/.gitignore b/.gitignore index 793a671..9287d0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ node_modules/ -dist/*.js -dist/*.js.LICENSE.txt +dist/ +.parcel-cache/ \ No newline at end of file diff --git a/babel.config.json b/babel.config.json deleted file mode 100644 index 3f5cbe2..0000000 --- a/babel.config.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "presets": [ - [ - "@babel/preset-env", - { - "targets": { - "edge": "17", - "firefox": "60", - "chrome": "67", - "safari": "11.1" - }, - "useBuiltIns": "usage", - "corejs": "3.6.5" - } - ] - ] -} diff --git a/package.json b/package.json index fcbabfd..9a3462f 100644 --- a/package.json +++ b/package.json @@ -4,21 +4,22 @@ "description": "kill me", "private": true, "scripts": { - "build": "webpack --config webpack.config.js", - "serve": "serve dist/" + "build": "parcel build --dist-dir dist src/html/index.html", + "serve": "parcel src/html/index.html" }, "author": "Elijah R", "license": "GPL-3.0", "dependencies": { "@hcaptcha/types": "^1.0.3", - "nanoevents": "^7.0.1", - "serve": "^14.2.0", - "webpack": "^5.75.0", - "webpack-cli": "^5.0.1" + "@popperjs/core": "^2.11.8", + "bootstrap": "^5.3.2", + "nanoevents": "^7.0.1" + }, + "overrides": { + "@parcel/watcher": "~2.1.0" }, "devDependencies": { - "@babel/core": "^7.20.12", - "@babel/preset-env": "^7.20.2", - "babel-loader": "^9.1.2" + "parcel": "^2.11.0", + "typescript": "^5.3.3" } } diff --git a/dist/desktop.png b/src/assets/desktop.png similarity index 100% rename from dist/desktop.png rename to src/assets/desktop.png diff --git a/dist/favicon.ico b/src/assets/favicon.ico similarity index 100% rename from dist/favicon.ico rename to src/assets/favicon.ico diff --git a/src/captcha.js b/src/captcha.js deleted file mode 100644 index c6c8c92..0000000 --- a/src/captcha.js +++ /dev/null @@ -1,13 +0,0 @@ -export default function doCaptcha(sitekey) { - return new Promise((res, rej) => { - const modal = new bootstrap.Modal(document.getElementById('hcaptchaModal')); - modal.show(); - hcaptcha.render("captcha-box", { - sitekey: sitekey, - callback: (c) => { - modal.hide(); - res(c); - }, - }); - }) -} diff --git a/src/common.js b/src/common.js deleted file mode 100644 index 033f8f8..0000000 --- a/src/common.js +++ /dev/null @@ -1,21 +0,0 @@ -export const config = { - serverAddresses: [ - "wss://computernewb.com/collab-vm/vm0", - "wss://computernewb.com/collab-vm/vm1", - "wss://computernewb.com/collab-vm/vm2", - "wss://computernewb.com/collab-vm/vm3", - "wss://computernewb.com/collab-vm/vm4", - "wss://computernewb.com/collab-vm/vm5", - "wss://computernewb.com/collab-vm/vm6", - "wss://computernewb.com/collab-vm/vm7", - "wss://computernewb.com/collab-vm/vm8", - "wss://computernewb.com/collab-vm/vm9", - "wss://computernewb.com/collab-vm/eventvm", - ], - chatSound: "https://computernewb.com/collab-vm/notify.ogg", - // What XSS implementation the server uses - // 0: No XSS (cvm1.2.11) - // 1: Internal fork style (cvm1.ts, global opcode 21) - // 2: yellows111/collab-vm-server style (per-user opcode 21) - xssImplementation: 1, -} diff --git a/dist/style.css b/src/css/style.css similarity index 100% rename from dist/style.css rename to src/css/style.css diff --git a/dist/index.html b/src/html/index.html similarity index 84% rename from dist/index.html rename to src/html/index.html index c939567..74963dc 100644 --- a/dist/index.html +++ b/src/html/index.html @@ -4,10 +4,10 @@