Remove bare switcher & update Devcontainer files

.devcontainer/Dockerfile

@@ -1,14 +1,12 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
+FROM node:18
 
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
+# Install basic development tools
+RUN apt update && apt install -y less man-db sudo
 
-# [Optional] Uncomment if you want to install an additional version of node using nvm
-# ARG EXTRA_NODE_VERSION=10
-# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
+# Ensure default `node` user has access to `sudo`
+ARG USERNAME=node
+RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME
 
-# [Optional] Uncomment if you want to install more global node modules
-# RUN su node -c "npm install -g <your-package-list-here>"
+# Set `DEVCONTAINER` environment variable to help with orientation
+ENV DEVCONTAINER=true

.devcontainer/devcontainer.json

@@ -1,32 +1,9 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/javascript-node
+// See https://containers.dev/implementors/json_reference/ for configuration reference
 {
-	"name": "Node.js",
+	"name": "Nebula",
 	"build": {
-		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick a Node version: 18, 16, 14.
-		// Append -bullseye or -buster to pin to an OS version.
-		// Use -bullseye variants on local arm64/Apple Silicon.
-		"args": { "VARIANT": "16-bullseye" }
+		"dockerfile": "Dockerfile"
 	},
-
-	// Configure tool-specific properties.
-	"customizations": {
-		// Configure properties specific to VS Code.
-		"vscode": {
-			// Add the IDs of extensions you want installed when the container is created.
-			"extensions": [
-				"dbaeumer.vscode-eslint"
-			]
-		}
-	},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "npm install",
-
-	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "node"
+  "remoteUser": "node",
+	"postCreateCommand": "npm install"
 }

static/options/index.html

@@ -12,7 +12,6 @@
       <!-- Embed -->
 
       <script src="../uv/uv.bundle.js"></script>
-      <script src="../resources/appModules/BareSwitcher.js"></script>
       <script src="../resources/options.js"></script>
       <meta name="theme-color" content="#5a189a">
       <meta property=og:title content=Nebula>
@@ -141,13 +140,6 @@ <h1 class="nebHeader" style='margin-left: .5%; font-family: "Roboto"; color: #4d
             <label disabled for="ssuggestion" style="background: grey;">
             </label>
          </div>
-         <div class="settings-cont">
-            <p class="name" style="font-size: 24px;"> Bare location </p>
-            <p class="description">Choose the location where a bare server is hosted. </p>
-            <input id="bareLocationInput" class="bareLocationInput" type="url">
-          <p id="validIndicator" class="bareValidSignal" > </p>
-            </label>
-         </div>
          <div class="settings-cont">
             <p class="name"> Misc </p>
             <p class="description"></p>
@@ -187,11 +179,6 @@ <h1 class="nebHeader" style='margin-left: .5%; font-family: "Roboto"; color: #4d
 }
 themeSelector.value = themeStored
 proxySel.value = proxyStored
-
-getBareLocation().then(bareLocation => {
-document.getElementById("bareLocationInput").value = bareLocation;
-});
-
       </script>
    </body>
 </html>

static/resources/nebulamain.js

@@ -40,26 +40,6 @@ window.addEventListener('load', () => {
     }
   }
 
-  function getBareLocation () {
-    return dbPromise
-      .then(db => db.get('keyval', 'bareLocation'))
-      .then(value => value || '')
-  }
-
-  getBareLocation().then(bareLocation => {
-
-    console.log('Bare Location: ' + bareLocation)
-    if (bareLocation === '') {
-      console.log('No bare location found, automatically setting to default')
-      storage.set('bareLocation', '/bare/')
-
-    }
-
-    // if bare location is not only whitespace
-   // if (bareLocation.trim() !== '') {
-
-  })
-
   navigator.serviceWorker.register('./sw.js', {
     scope: '/service/'
   })

static/uv/uv.config.js

@@ -1,6 +1,6 @@
 self.__uv$config = {
     prefix: '/service/go/',
-    bare: '',
+    bare: '/bare/',
     encodeUrl: Ultraviolet.codec.xor.encode,
     decodeUrl: Ultraviolet.codec.xor.decode,
     handler: '/uv/uv.handler.js',