Update parcel 2

Add do not use

.gitignore

@@ -3,4 +3,8 @@ users.json
 .vscode/
 frontend/node_modules/
 frontend/.cache/
-__pychache__
+__pychache__
+.parcel-cache/
+frontend/.parcel-cache/
+frontend/dist/
+package-lock.json

README.md

@@ -1,3 +1,8 @@
-# console
+# Minecraft Web Console
+
+Front end for starting, stopping, sending command and viewing logs
+
+Not for public use.
+
+This is currently be rewritten
 
-Front end for starting, stopping, sending command and viewing logs

docker-compose.yml

@@ -2,6 +2,7 @@ version: '3.7'
 
 services: 
     console:
+        build: ./
         container_name: console
         image: magmise/console
         volumes: 

frontend/package.json

@@ -2,24 +2,24 @@
   "name": "client",
   "version": "1.0.0",
   "dependencies": {
-    "console.js": "^2.0.1",
-    "parcel": "^1.12.4",
-    "xterm": "^4.9.0",
-    "xterm-addon-attach": "^0.6.0",
-    "xterm-addon-fit": "^0.4.0",
-    "xterm-addon-search": "^0.7.0"
+    "xterm": "latest",
+    "xterm-addon-attach": "latest",
+    "xterm-addon-fit": "latest",
+    "xterm-addon-search": "latest"
   },
   "devDependencies": {
-    "parcel-bundler": "latest"
+    "parcel": "^2.0.0"
   },
+  "source": "src/index.html",
   "scripts": {
-    "build": "parcel build src/index.html --out-dir ../public",
-    "watch": "parcel watch src/index.html --out-dir ../public"
+    "start": "parcel",
+    "build": "parcel build src/index.html --dist-dir ../public",
+    "watch": "parcel watch src/index.html --dist-dir ../public"
   },
   "browserslist": [
     "last 3 and_chr versions",
     "last 3 chrome versions",
-    "last 3 opera versions",
+    "last 3 opera versions", 
     "last 3 ios_saf versions",
     "last 3 safari versions"
   ]

frontend/src/index.html

@@ -17,10 +17,7 @@
         <input type="submit" value="Send">
         <input type="text" name="send" value="">
     </form>
-
-    <console-component></console-component>
     
-    <script src="main.js"></script>
-    <script src="console.js"></script>
+    <script type="module" src="main.js"></script>
 </body>
 </html>

frontend/src/main.js

@@ -2,7 +2,6 @@ import { Terminal } from 'xterm';
 import { AttachAddon } from 'xterm-addon-attach';
 import { FitAddon } from 'xterm-addon-fit';
 import { SearchAddon } from 'xterm-addon-search';
-import 'console.js';
 
 function main() {
     const urlParams = new URLSearchParams(window.location.search);
@@ -62,8 +61,17 @@ function main() {
     serverselect.addEventListener("click", (event) => {
         console.log(serverselect.value);
         window.location.hash = serverselect.value;
+        server = serverselect.value;
         socket.close();
-        location.reload();
+        try {
+            socket = new WebSocket(`wss://${host}/server/${server}/logs?token=${token}`);
+            const attachAddon = new AttachAddon(socket);
+            term.loadAddon(attachAddon);
+        } catch(err) {
+            alert("You are not allowed to use this server");
+            return;
+        }
+        //location.reload();
     })
    
     window.onbeforeunload = function() {
@@ -90,7 +98,15 @@ function main() {
                 return
             }
             socket.close();
-            location.reload();
+            try {
+                socket = new WebSocket(`wss://${host}/server/${server}/logs?token=${token}`);
+                const attachAddon = new AttachAddon(socket);
+                term.loadAddon(attachAddon);
+            } catch(err) {
+                alert("You are not allowed to use this server");
+                return;
+            }
+            //location.reload();
         } catch(err) {
             console.error(`Error: ${err}`);
         }

users.json.sample

@@ -0,0 +1,8 @@
+{
+    "users": {
+        "test": {
+            "name": "test",
+            "servers": ["test"]
+	    }
+    }
+}