Merge pull request #4 from AttorneyOnline/master

i'm sure there is a way to do this correctly

1 files changed, 66 insertions, 87 deletions

diff --git a/webAO/ui.js b/webAO/ui.js
index f5c3f3a..b44b425 100644
--- a/webAO/ui.js
+++ b/webAO/ui.js
@@ -1,96 +1,75 @@
-import GoldenLayout from "./golden/js/goldenlayout.js";
+/* eslint indent: ["error", 2] */
 
-var config = {
-    settings: {
-        showPopoutIcon: false,
-        showCloseIcon: false
-    },
-    dimensions: {
-        minItemHeight: 40
+// import GoldenLayout from "./golden/js/goldenlayout.js";
+import GoldenLayout from "golden-layout";
+
+const config = {
+  settings: {
+    showPopoutIcon: false,
+    showCloseIcon: false
+  },
+  dimensions: {
+    minItemHeight: 40
+  },
+  content: [{
+    type: "row",
+    content: [{
+      type: "column",
+      width: 40,
+      content: [{
+        type: "component",
+        componentName: "template",
+        title: "Game",
+        componentState: { id: "client_wrapper" }
+      }]
     },
-    content: [
     {
+      type: "column",
+      content: [{
         type: "row",
-        content: [
-            {
-                type: "column",
-                width: 40,
-                content: [
-                    {
-                        type: "component",
-                        componentName: "template",
-                        title: "Game",
-                        componentState: { id: "client_wrapper" }
-                    },
-                    {
-                        type: "component",
-                        title: "Miscellaneous",
-                        height: 5,
-                        componentName: "template",
-                        componentState: { id: "misc" }
-                    },
-                ]
-            },
-            {
-                type: "column",
-                content: [
-                    {
-                        type: "stack",
-                        height: 60,
-                        content: [
-                            {
-                                type: "component",
-                                title: "Server chat",
-                                componentName: "template",
-                                componentState: { id: "ooc" }
-                            },
-                            {
-                                type: "component",
-                                title: "Log",
-                                componentName: "template",
-                                componentState: { id: "log" }
-                            }
-                        ]
-                    },
-                    {
-                        type: "row",
-                        content: [
-                            {
-                                type: "component",
-                                title: "Music",
-                                componentName: "template",
-                                componentState: { id: "music" }
-                            },
-                            {
-                                type: "stack",
-                                content: [
-                                    {
-                                        type: "component",
-                                        title: "Settings",
-                                        componentName: "template",
-                                        componentState: { id: "client_settings" }
-                                    },
-                                    {
-                                        type: "component",
-                                        title: "About",
-                                        componentName: "template",
-                                        componentState: { id: "about" }
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
+        height: 65,
+        content: [{
+          type: "stack",
+          content: [{
+            type: "component",
+            title: "Main",
+            componentName: "template",
+            componentState: { id: "mainmenu" }
+          },
+          {
+            type: "component",
+            title: "Log",
+            componentName: "template",
+            componentState: { id: "log" }
+          }]
+        },
+        {
+          type: "component",
+          title: "Music",
+          width: 30,
+          componentName: "template",
+          componentState: { id: "music" }
+        }]
+      },
+      {
+        type: "row",
+        content: [{
+          type: "component",
+          title: "Server chat",
+          componentName: "template",
+          componentState: { id: "ooc" }
+        }]
+      }]
     }]
+  }]
 };
 
-var golden = new GoldenLayout(config);
-golden.registerComponent("template", function(container, componentState) {
-    let template = document.querySelector(`#${componentState.id}`);
-    container.getElement().html(template.content);
-    // TODO: support multiple locales
-    // container.setTitle(document.querySelector(`#${componentState.id} meta[name='frame-title']`).getAttribute("content"));
+const golden = new GoldenLayout(config);
+golden.registerComponent("template", function (container, componentState) {
+  const template = document.querySelector(`#${componentState.id}`);
+  container.getElement().html(template.content);
+  // TODO: support multiple locales
+  // container.setTitle(document.querySelector(`#${componentState.id} meta[name='frame-title']`).getAttribute("content"));
 });
+
 golden.init();
\ No newline at end of file