From 4af3bc8c5219c82fa6faa0ff2d24ec7717e14a5b Mon Sep 17 00:00:00 2001
From: HeavenVR <github@heavenvr.tech>
Date: Wed, 24 Jun 2026 12:20:44 +0200
Subject: [PATCH] chore: retire legacy WebUI flows to unblock API endpoint
 removal

This frontend is being superseded by the new OpenShock website. Strip the
legacy flows from the old WebUI so the API can retire the endpoints behind
them, and specifically disable the old auth endpoints that predate Cloudflare
Turnstile (they accept captcha-less request bodies).

Pairs with OpenShock/API#322, which returns 410 Gone for the captcha-less v1
auth routes.

Disabling old (captcha-less) auth:
- Login page replaced with a "Login has moved" notice + Continue to OpenShock
  button; users return here once signed in.
- Removed Signup, Password Reset, Password Recover, and Account Activation
  pages + routes, freeing /1/account/{login,signup,reset}, /1/account/recover,
  and user/activate.

Removing other flows to unblock endpoint retirement:
- Profile > Settings and the dead Patreon connections routes (user/connections).
- Admin pages (users management + online-devices monitoring), freeing
  admin/users/*, admin/users/search, admin/users/create, and
  1/admin/monitoring/onlineDevices.

Cleanup: removed orphaned helpers (SanityChecks.js, Login LoadingView.vue),
the empty Login/Password dir, the unused .forgot-pw style, and the
Admin/Settings nav entries.
---
 src/router/index.js                           |  55 ------
 src/views/Login/Activate.vue                  |  99 -----------
 src/views/Login/LoadingView.vue               |  51 ------
 src/views/Login/Login.vue                     | 136 ++-------------
 src/views/Login/LoginStyle.scss               |  18 --
 src/views/Login/Password/Recover.vue          | 156 -----------------
 src/views/Login/Password/Reset.vue            | 104 ------------
 src/views/Login/Password/Root.vue             |   9 -
 src/views/Login/SanityChecks.js               |  54 ------
 src/views/Login/Signup.vue                    | 155 -----------------
 src/views/dashboard/Navigation/NavRoot.vue    |  16 --
 src/views/dashboard/admin/AdminRoot.vue       |  26 ---
 .../admin/online-devices/OnlineDevices.vue    |  79 ---------
 src/views/dashboard/admin/users/Search.vue    |  88 ----------
 src/views/dashboard/admin/users/Users.vue     |  18 --
 src/views/dashboard/admin/users/user/Edit.vue | 157 ------------------
 src/views/dashboard/admin/users/user/New.vue  |  79 ---------
 .../dashboard/admin/users/user/ReadOnly.vue   |  93 -----------
 src/views/dashboard/admin/users/user/User.vue | 111 -------------
 src/views/dashboard/profile/ProfileRoot.vue   |   4 -
 src/views/dashboard/profile/Settings.vue      |  73 --------
 21 files changed, 16 insertions(+), 1565 deletions(-)
 delete mode 100644 src/views/Login/Activate.vue
 delete mode 100644 src/views/Login/LoadingView.vue
 delete mode 100644 src/views/Login/Password/Recover.vue
 delete mode 100644 src/views/Login/Password/Reset.vue
 delete mode 100644 src/views/Login/Password/Root.vue
 delete mode 100644 src/views/Login/SanityChecks.js
 delete mode 100644 src/views/Login/Signup.vue
 delete mode 100644 src/views/dashboard/admin/AdminRoot.vue
 delete mode 100644 src/views/dashboard/admin/online-devices/OnlineDevices.vue
 delete mode 100644 src/views/dashboard/admin/users/Search.vue
 delete mode 100644 src/views/dashboard/admin/users/Users.vue
 delete mode 100644 src/views/dashboard/admin/users/user/Edit.vue
 delete mode 100644 src/views/dashboard/admin/users/user/New.vue
 delete mode 100644 src/views/dashboard/admin/users/user/ReadOnly.vue
 delete mode 100644 src/views/dashboard/admin/users/user/User.vue
 delete mode 100644 src/views/dashboard/profile/Settings.vue

diff --git a/src/router/index.js b/src/router/index.js
index 0a97e59..15a1dc6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -59,21 +59,6 @@ const routes = [
 					}
 				]
 			},
-			{
-				path: 'admin',
-				component: lazyLoad('dashboard/admin/AdminRoot'),
-				redirect: '/dashboard/admin/online-devices',
-				children: [
-					{
-						path: 'users',
-						component: lazyLoad('dashboard/admin/users/Users')
-					},
-					{
-						path: 'online-devices',
-						component: lazyLoad('dashboard/admin/online-devices/OnlineDevices')
-					}
-				]
-			},
 			{
 				path: 'profile',
 				component: lazyLoad('dashboard/profile/ProfileRoot'),
@@ -83,24 +68,9 @@ const routes = [
 						path: 'account',
 						component: lazyLoad('dashboard/profile/Account')
 					},
-					{
-						path: 'settings',
-						component: lazyLoad('dashboard/profile/Settings')
-					},
 					{
 						path: 'license',
 						component: lazyLoad('dashboard/profile/License')
-					},
-					{
-						path: "connections",
-						component: lazyLoad('dashboard/profile/connections/ConnectionsRoot'),
-						redirect: '/dashboard/profile/settings',
-						children: [
-							{
-								path: "patreon",
-								component: lazyLoad('dashboard/profile/connections/Patreon')
-							}
-						]
 					}
 				]
 			},
@@ -131,31 +101,6 @@ const routes = [
 			{
 				path: 'login',
 				component: lazyLoad('Login/Login')
-			},
-			{
-				path: 'signup',
-				component: lazyLoad('Login/Signup')
-			},
-			{
-				path: 'password',
-				component: lazyLoad('Login/Password/Root'),
-				redirect: '/account/password/reset',
-				children: [
-					{
-						path: 'reset',
-						component: lazyLoad('Login/Password/Reset')
-					},
-					{
-						path: 'recover/:uuid/:secret',
-						component: lazyLoad('Login/Password/Recover'),
-						props: true
-					}
-				]
-			},
-			{
-				path: 'activate/:uuid/:secret',
-				component: lazyLoad('Login/Activate'),
-				props: true
 			}
 		]
 	},
diff --git a/src/views/Login/Activate.vue b/src/views/Login/Activate.vue
deleted file mode 100644
index b33c8bb..0000000
--- a/src/views/Login/Activate.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-  <div class="login100-form">
-    <span class="login100-form-title">Account Activation</span>
-    <div v-if="loading">
-      <loading/>
-    </div>
-    <div v-else>
-      <div v-if="successful">
-        <checkmark/>
-        <div class="inner">
-          <p><b>Your account has been activated successfully!</b></p>
-          <p>You can now login with your credentials.</p>
-        </div>
-      </div>
-      <div v-else>
-        <checkmark :error="true"/>
-        <p><b>Could not find activation ticket.</b></p>
-        <p>Did you already activate your account?<br>Try to login below.</p>
-      </div>
-      <div class="sep-or">
-        <router-link :to="'/account/login'" class="txt2">Login</router-link>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import axios from 'axios';
-import Checkmark from '@/views/utils/Checkmark';
-import Loading from '@/views/utils/Loading';
-
-export default {
-  name: "Activate",
-  components: {
-    Checkmark,
-    Loading
-  },
-  props: ['uuid', 'secret'],
-  mounted() {
-    this.sendActivation();
-  },
-  methods: {
-    async sendActivation() {
-      const res = await axios({
-        method: 'POST',
-        url: config.apiUrl + 'user/activate',
-        data: {
-          uuid: this.uuid,
-          secret: this.secret
-        }
-      }).catch(err => {
-        this.loading = false;
-        this.successful = false;
-
-      });
-      if (this.loading) {
-        this.loading = false;
-        this.successful = true;
-      }
-    }
-  },
-  data() {
-    return {
-      loading: true,
-      successful: false
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.login100-form {
-  text-align: center;
-
-  .inner {
-    position: relative;
-    animation: slide 0.5s forwards;
-    left: 500px;
-
-    @keyframes slide {
-      100% {
-        left: 0;
-      }
-    }
-  }
-
-  p {
-    font-size: 20pt;
-    margin-bottom: 40px;
-  }
-
-  .checkmark {
-    margin-top: 10px;
-    margin-bottom: 50px;
-  }
-
-
-}
-</style>
diff --git a/src/views/Login/LoadingView.vue b/src/views/Login/LoadingView.vue
deleted file mode 100644
index 9f8f746..0000000
--- a/src/views/Login/LoadingView.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <div class="notice">
-    <loading v-if="loading"/>
-    <div v-else-if="!error">
-      <checkmark/>
-      <div v-html="successText"/>
-    </div>
-    <div v-else>
-      <checkmark :error="true"/>
-      <div v-html="errorText"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import Checkmark from '@/views/utils/Checkmark';
-import Loading from '@/views/utils/Loading';
-
-export default {
-  components: {
-    Checkmark, Loading
-  },
-  props: ['error', 'loading', 'successText', 'errorText']
-}
-</script>
-
-<style scoped lang="scss">
-
-.notice {
-  text-align: center;
-  position: relative;
-
-  left: 500px;
-  animation: slide 0.5s forwards;
-
-  :deep(p) {
-    font-size: 20pt;
-    margin-bottom: 40px;
-  }
-
-  .checkmark {
-    margin-top: 10px;
-    margin-bottom: 50px;
-  }
-
-  @keyframes slide {
-    100% { left: 0; }
-  }
-}
-
-</style>
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index af9d38d..5696592 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -2,148 +2,44 @@
   <form class="login100-form">
     <span class="login100-form-title">Login</span>
 
-    <div class="signup-form" :class="{'fadeout': fadeout}" v-if="!requestStarted">
-      <div class="wrap-input100 m-b-23 validate-input"
-           v-bind:class="{'alert-validate': username === '' && first.username}"
-           :data-validate="'Email is Required'">
-        <span class="label-input100">Email</span>
-        <input class="input100" @keydown="first.username = true" v-model="username" type="email" name="username"
-               placeholder="Type your email">
-        <span class="focus-input100 username" data-symbol="person_outline"></span>
-      </div>
-
-      <div class="wrap-input100 validate-input" v-bind:class="{'alert-validate': password === '' && first.password}"
-           :data-validate="'Password is Required'">
-        <span class="label-input100 ">Password</span>
-        <input class="input100" @keydown="first.password = true" v-model="password" type="password" name="pass"
-               placeholder="Type your password">
-        <span class="focus-input100 password" data-symbol="&#xf190;"></span>
-      </div>
-
-      <div class="forgot-pw">
-        <router-link :to="'/account/password/reset'">Forgot password?</router-link>
-      </div>
+    <div class="moved-notice">
+      <p><b>Login has moved.</b></p>
+      <p>OpenShock has a new website. Please head over there to sign in.</p>
+      <p>Once you're signed in you can come straight back here and keep using this site.</p>
 
       <div class="container-login100-form-btn">
         <div class="wrap-login100-form-btn">
           <div class="login100-form-bgbtn"></div>
-          <button v-on:click.prevent="sendLogin" class="login100-form-btn">Login</button>
+          <a :href="newFrontendUrl" class="login100-form-btn">Continue to OpenShock</a>
         </div>
       </div>
-
-      <div class="sep-or">
-        <span class="txt1">Or</span>
-        <router-link :to="'/account/signup'" class="txt2">Register</router-link>
-      </div>
-    </div>
-    <div v-else>
-      <loading-view :loading="!requestDone" :error="!successful"
-                    :successText="'<p><b>Successfully logged in!</b></p><p>Redirecting to <br><b><u>Dashboard</u></b></p>'"
-                    :errorText="errorMessage"/>
-      <div class="sep-or">
-        <a class="txt2" @click="resetAll">Go Back</a>
-      </div>
     </div>
   </form>
 </template>
 
 <script>
-import axios from 'axios';
-import LoadingView from './LoadingView';
-
+// The v1 account auth endpoints have been retired (OpenShock/API#322). Authentication
+// now lives on the new OpenShock website, so this page redirects users there instead.
 export default {
-  components: {
-    LoadingView
-  },
   data() {
     return {
-      username: "",
-      password: "",
-      errorMessage: "<p><b>Something went terribly wrong.</b></p><p>Please check your internet connection or contact our support.</p>",
-      fadeout: false,
-      requestStarted: false,
-      requestDone: false,
-      successful: false,
-      first: {
-        username: false,
-        password: false
-      }
-    }
-  },
-  methods: {
-    async sendLogin() {
-      if (this.username === "" || this.password === "") return;
-
-      this.fadeout = true;
-      setTimeout(() => {
-        this.requestStarted = true;
-      }, 300)
-      try {
-        const res = await axios({
-          method: 'POST',
-          url: config.apiUrl + '1/account/login',
-          data: {
-            email: this.username,
-            password: this.password
-          }
-        });
-
-        this.successful = true;
-        setTimeout(() => {
-          const returnUrl = this.$store.state.returnUrl;
-          if(returnUrl !== undefined) {
-            this.$store.dispatch('setReturnUrl', undefined);
-            this.$router.push(returnUrl);
-            return;
-          }
-          this.$router.push('/dashboard/');
-        }, 2500)
-      } catch (err) {
-        if (err.response !== undefined) {
-          switch (err.response.status) {
-            case 401:
-                this.errorMessage = '<p><b>Credentials did not match any account.</b></p>';
-              break;
-            case 403:
-              this.errorMessage = '<p><b>Account not activated</b></p>';
-              break;
-            default:
-              if(err.response.data.Message !== undefined && err.response.data.message !== "") {
-                this.errorMessage = '<p><b>Something went wrong.</b></p><p>' + err.response.data.message + '</p>';
-              } else {
-                toastr.error(err);
-              }
-              break;
-          }
-        } else {
-          toastr.error(err);
-        }
-      }
-      this.requestDone = true;
-    },
-    resetAll() {
-      this.successful = false;
-      this.fadeout = false;
-      this.requestStarted = false;
-      this.requestDone = false;
-      this.errorMessage = "<p><b>Something went terribly wrong.</b></p><p>Please check your internet connection or contact our support.</p>";
+      newFrontendUrl: 'https://openshock.app'
     }
   }
 }
 </script>
 
 <style scoped>
-.signup-form.fadeout {
-  position: relative;
-  height: calc(100% - 100px);
+.moved-notice {
+  text-align: center;
+}
 
-  left: 0;
-  animation: slide 0.3s forwards;
+.moved-notice p {
+  color: #555;
+  margin-bottom: 10px;
 }
 
-@keyframes slide {
-  100% {
-    left: -500px;
-  }
+.moved-notice .container-login100-form-btn {
+  margin-top: 30px;
 }
 </style>
diff --git a/src/views/Login/LoginStyle.scss b/src/views/Login/LoginStyle.scss
index 7b05120..bdbc137 100644
--- a/src/views/Login/LoginStyle.scss
+++ b/src/views/Login/LoginStyle.scss
@@ -140,24 +140,6 @@ $material-design-icons-font-directory-path: '~material-design-icons-iconfont/dis
     }
   }
 
-  .forgot-pw {
-    text-align: right;
-    padding: 8px 0 31px;
-    a {
-      font-family: Poppins, sans-serif;
-      font-weight: 700;
-      font-size: 14px;
-      line-height: 1.5;
-      color: #fff;
-      text-decoration: none;
-      transition: all 0.4s;
-
-      &:hover {
-        color: var(--main-color);
-      }
-    }
-  }
-
   /*------------------------------------------------------------------
   [ Form ]*/
 
diff --git a/src/views/Login/Password/Recover.vue b/src/views/Login/Password/Recover.vue
deleted file mode 100644
index 69c4db6..0000000
--- a/src/views/Login/Password/Recover.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-  <form class="login100-form">
-    <span class="login100-form-title">Recovery</span>
-
-    <loading v-if="!ticket.getRequestDone"/>
-    <div class="signup-form" :class="{'fadeout': fadeout}" v-else-if="ticket.found && !ticket.postRequestStarted">
-
-      <div class="wrap-input100" v-bind:class="{'alert-validate': passwordChecks.length > 0 && first.password}"
-           :data-validate="passwordChecks[0]">
-        <span class="label-input100 ">Password</span>
-        <input class="input100" @keydown="first.password = true" v-model="password" type="password" name="pass"
-               placeholder="Type your password">
-        <span class="focus-input100 password"></span>
-      </div>
-
-      <div class="wrap-input100" v-bind:class="{'alert-validate': password !== passwordConfirm && first.password}"
-           :data-validate="'Passwords do not match'">
-        <span class="label-input100 ">Password</span>
-        <input class="input100" @keydown="first.password = true" v-model="passwordConfirm" type="password" name="pass"
-               placeholder="Confirm your password">
-        <span class="focus-input100 password"></span>
-      </div>
-
-      <div class="forgot-pw">
-      </div>
-
-      <div class="container-login100-form-btn">
-        <div class="wrap-login100-form-btn">
-          <div class="login100-form-bgbtn"></div>
-          <button v-on:click.prevent="recover" class="login100-form-btn">Change Password</button>
-        </div>
-      </div>
-
-
-    </div>
-    <loading-view v-else :loading="!ticket.postRequestDone && ticket.found"
-                  :error="!ticket.postSuccessful || !ticket.found"
-                  :successText="'<p><b>Successfully changed your password.</b></p><p>You can login now, using your newly set password.</p>'"
-                  :errorText="'<p><b>Recovery ticket could not be found.</b></p><p>Have you already reset your password?</p>'"/>
-    <div class="sep-or">
-      <span class="txt1">Back</span>
-      <router-link :to="'/account/login'" class="txt2">Login</router-link>
-    </div>
-  </form>
-</template>
-
-<script>
-import axios from 'axios';
-import LoadingView from '../LoadingView';
-import SanityChecks from '../SanityChecks';
-import Loading from '@/views/utils/Loading';
-
-export default {
-  components: {
-    LoadingView, Loading
-  },
-  props: ["uuid", "secret"],
-  data() {
-    return {
-      password: "",
-      passwordConfirm: "",
-      ticket: {
-        getRequestDone: false,
-        found: false,
-        postRequestDone: false,
-        postRequestStarted: false,
-        postSuccessful: false
-      },
-      fadeout: false,
-      first: {
-        password: false
-      }
-    }
-  },
-  mounted() {
-    this.checkForRecovery();
-  },
-  methods: {
-    async checkForRecovery() {
-      try {
-        await axios({
-          method: 'HEAD',
-          url: this.recoveryUrl
-        });
-        this.ticket.found = true;
-      } catch (err) {
-        toastr.error(err);
-      }
-      this.ticket.getRequestDone = true;
-    },
-    async recover() {
-      this.first.password = true;
-      if (this.passwordChecks.length > 0 || this.password !== this.passwordConfirm) return;
-      this.fadeout = true;
-      setTimeout(() => {
-        this.ticket.postRequestStarted = true;
-      }, 500)
-      try {
-        await axios({
-          method: 'POST',
-          url: this.recoveryUrl,
-          data: {
-            Password: this.password
-          }
-        });
-        this.ticket.postSuccessful = true;
-        this.ticket.postRequestDone = true;
-      } catch (err) {
-        toastr.error(err);
-      }
-
-    }
-  },
-  computed: {
-    passwordChecks() {
-      return SanityChecks.checkPassword(this.password);
-    },
-    recoveryUrl() {
-      return config.apiUrl + '1/account/recover/' + this.uuid + "/" + this.secret;
-    }
-  }
-}
-</script>
-
-<style scoped>
-.signup-form {
-  opacity: 1;
-  animation-name: fadeInOpacity;
-  animation-iteration-count: 1;
-  animation-timing-function: ease-in;
-  animation-duration: 0.3s;
-}
-
-@keyframes fadeInOpacity {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-
-.signup-form.fadeout {
-  position: relative;
-  height: calc(100% - 100px);
-
-  left: 0;
-  animation: slide 0.5s forwards;
-}
-
-@keyframes slide {
-  100% {
-    left: -500px;
-  }
-}
-</style>
diff --git a/src/views/Login/Password/Reset.vue b/src/views/Login/Password/Reset.vue
deleted file mode 100644
index 56c1e58..0000000
--- a/src/views/Login/Password/Reset.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <form class="login100-form">
-    <span class="login100-form-title">Forgot Password</span>
-
-    <div class="signup-form" :class="{ 'fadeout': fadeout }" v-if="!requestStarted">
-
-      <div class="wrap-input100 validate-input" v-bind:class="{ 'alert-validate': emailChecks.length > 0 && first.email }"
-        :data-validate="emailChecks[0]">
-        <span class="label-input100 ">Email</span>
-        <input class="input100" @keydown="first.email = true" v-model="email" type="email" name="email"
-          placeholder="Type your email">
-        <span class="focus-input100 email"></span>
-      </div>
-
-      <div class="forgot-pw">
-      </div>
-
-      <div class="container-login100-form-btn">
-        <div class="wrap-login100-form-btn">
-          <div class="login100-form-bgbtn"></div>
-          <button v-on:click.prevent="reset" class="login100-form-btn">Send Reset Email</button>
-        </div>
-      </div>
-
-
-    </div>
-    <loading-view v-else :loading="!requestDone" :error="!successful"
-      :successText="'<p><b>If the mentioned email is linked to an account, a password reset email has been sent.</b></p>'"
-      :errorText="'<p><b>Something went terribly wrong.</b></p><p>Please check your internet connection or contact our support.</p>'" />
-    <div class="sep-or">
-      <span class="txt1">Back</span>
-      <router-link :to="'/account/login'" class="txt2">Login</router-link>
-    </div>
-  </form>
-</template>
-
-<script>
-import axios from 'axios';
-import SanityChecks from '../SanityChecks';
-import LoadingView from '../LoadingView';
-
-export default {
-  components: {
-    LoadingView
-  },
-  data() {
-    return {
-      email: "",
-      successful: false,
-      fadeout: false,
-      requestStarted: false,
-      requestDone: false,
-      first: {
-        email: false
-      }
-    }
-  },
-  methods: {
-    async reset() {
-      this.first.email = true;
-      if (this.emailChecks.length > 0) return;
-
-      this.fadeout = true;
-      setTimeout(() => {
-        this.requestStarted = true;
-      }, 500)
-      try {
-        const res = await axios({
-          method: 'POST',
-          url: config.apiUrl + '1/account/reset',
-          data: {
-            email: this.email
-          }
-        });
-        this.successful = true;
-      } catch (err) {
-        toastr.error(err);
-      }
-      this.requestDone = true;
-    }
-  },
-  computed: {
-    emailChecks() {
-      return SanityChecks.checkEmail(this.email);
-    }
-  }
-}
-</script>
-
-<style scoped>
-.signup-form.fadeout {
-  position: relative;
-  height: calc(100% - 100px);
-
-  left: 0;
-  animation: slide 0.5s forwards;
-}
-
-@keyframes slide {
-  100% {
-    left: -500px;
-  }
-}
-</style>
diff --git a/src/views/Login/Password/Root.vue b/src/views/Login/Password/Root.vue
deleted file mode 100644
index d3d7b37..0000000
--- a/src/views/Login/Password/Root.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-<router-view/>
-</template>
-
-<script>
-export default {
-  name: "PasswordRoot"
-}
-</script>
diff --git a/src/views/Login/SanityChecks.js b/src/views/Login/SanityChecks.js
deleted file mode 100644
index 578925a..0000000
--- a/src/views/Login/SanityChecks.js
+++ /dev/null
@@ -1,54 +0,0 @@
-class SanityChecks {
-
-	checkUsername(username) {
-		let arr = [];
-
-		if (username.length < 3) arr.push("Minimum length of 3 characters");
-		if (username.length > 32) arr.push("Maximum length of 32 characters");
-		if (!username.match(/^[a-zA-Z0-9/.!'_-]*$/)) arr.push("Illegal character used");
-
-		return arr;
-	}
-
-	checkEmail(email) {
-		let arr = [];
-
-		
-		if (email.length > 64) arr.push("Maximum length of 64 characters");
-		if (!email.toLowerCase().match(/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/)) arr.push("Email is not valid")
-		if (email.length < 5) arr.push("Minimum length of 5 characters");
-
-		return arr;
-	}
-
-	checkPassword(password) {
-		let arr = [];
-
-		if (password.length <= 12) arr.push("Minimum length of 12 characters");
-		if (password.length >= 256) arr.push("Maximum length of 256 characters");
-		if(!this.hasLowerCase(password)) arr.push("One lowercase character");
-		if(!this.hasUpperCase(password)) arr.push("One uppercase character");
-		if(!this.hasNumber(password)) arr.push("One number");
-		if(!this.hasSpecial(password)) arr.push("One special character");
-
-		return arr;
-	}
-
-	hasLowerCase(str) {
-		return (/[a-z]/.test(str));
-	}
-
-	hasUpperCase(str) {
-		return (/[A-Z]/.test(str));
-	}
-
-	hasNumber(str) {
-		return (/[0-9]/.test(str));
-	}
-
-	hasSpecial(str) {
-		return (/[@#$%/.!'_-]/.test(str));
-	}
-}
-
-export default new SanityChecks();
diff --git a/src/views/Login/Signup.vue b/src/views/Login/Signup.vue
deleted file mode 100644
index d29fc21..0000000
--- a/src/views/Login/Signup.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <form class="login100-form">
-    <span class="login100-form-title">Sign Up</span>
-
-    <div class="signup-form" :class="{'fadeout': fadeout}" v-if="!requestStarted">
-      <div class="wrap-input100 m-b-23 validate-input"
-           v-bind:class="{'alert-validate': usernameChecks.length > 0 && first.username}"
-           :data-validate="usernameChecks[0]">
-        <span class="label-input100">Username</span>
-        <input class="input100" @keydown="first.username = true" v-model="username" type="text" name="username"
-               placeholder="Type your username">
-        <span class="focus-input100 username"></span>
-      </div>
-
-      <div class="wrap-input100 m-b-23 validate-input" v-bind:class="{'alert-validate': emailChecks.length > 0 && first.email}"
-           :data-validate="emailChecks[0]">
-        <span class="label-input100 ">Email</span>
-        <input class="input100" @keydown="first.email = true" v-model="email" type="email" name="email"
-               placeholder="Type your email">
-        <span class="focus-input100 email"></span>
-      </div>
-
-      <div class="wrap-input100 validate-input" v-bind:class="{'alert-validate': passwordChecks.length > 0 && first.password}"
-           :data-validate="passwordChecks[0]">
-        <span class="label-input100 ">Password</span>
-        <input class="input100" @keydown="first.password = true" v-model="password" type="password" name="pass"
-               placeholder="Type your password">
-        <span class="focus-input100 password"></span>
-      </div>
-
-      <div class="forgot-pw">
-      </div>
-
-      <div class="container-login100-form-btn">
-        <div class="wrap-login100-form-btn">
-          <div class="login100-form-bgbtn"></div>
-          <button v-on:click.prevent="signup" class="login100-form-btn">Create Account</button>
-        </div>
-      </div>
-
-      <div class="sep-or">
-        <span class="txt1">Or</span>
-        <router-link :to="'/account/login'" class="txt2">Login</router-link>
-      </div>
-    </div>
-    <div v-else>
-      <!--
-        successText="<p><b>We have sent an account activation mail to your inbox.</b></p><p>Please click the provided button/link in the mail inorder to activate your account.</p>"
-      -->
-      <loading-view :loading="!requestDone" :error="!successful"
-                    successText="<p><b>Account successfully created!</b></p><p>You are now able to login!</p>"
-                    :errorText="errorMessage"/>
-     <div class="sep-or">
-        <button class="txt2" @click.prevent="resetAll">Go back</button>
-    </div>
-    </div>
-  </form>
-</template>
-
-<script>
-import axios from 'axios';
-import SanityChecks from './SanityChecks';
-import LoadingView from './LoadingView';
-
-export default {
-  components: {
-    LoadingView
-  },
-  data() {
-    return {
-      username: "",
-      password: "",
-      email: "",
-      successful: false,
-      fadeout: false,
-      requestStarted: false,
-      requestDone: false,
-      errorMessage: "<p><b>Something went terribly wrong.</b></p><p>Please check your internet connection or contact our support.</p>",
-      first: {
-        username: false,
-        password: false,
-        email: false
-      }
-    }
-  },
-  methods: {
-    async signup() {
-      this.first.username = true;
-      this.first.password = true;
-      this.first.email = true;
-      if (this.usernameChecks.length > 0 || this.emailChecks.length > 0 || this.passwordChecks.length > 0) {
-        toastr.error("Please make sure to fullfill all requirements, (!) in the corresponding field");
-        return;
-      }
-
-      this.fadeout = true;
-      setTimeout(() => {
-        this.requestStarted = true;
-      }, 500)
-      try {
-        await axios({
-          method: 'POST',
-          url: config.apiUrl + '1/account/signup',
-          data: {
-            username: this.username,
-            email: this.email,
-            password: this.password
-          }
-        });
-        this.successful = true;
-      } catch (err) {
-        if(err.response !== undefined && err.response.data.message !== undefined && err.response.data.message !== "") {
-          this.errorMessage = '<p><b>Something went wrong.</b></p><p>' + err.response.data.message + '</p>';
-        } else {
-          toastr.error(err);
-        }
-      }
-      this.requestDone = true;
-    },
-    resetAll() {
-      this.successful = false;
-      this.fadeout = false;
-      this.requestStarted = false;
-      this.requestDone = false;
-    }
-  },
-  computed: {
-    usernameChecks() {
-      return SanityChecks.checkUsername(this.username);
-    },
-    emailChecks() {
-      return SanityChecks.checkEmail(this.email);
-    },
-    passwordChecks() {
-      return SanityChecks.checkPassword(this.password);
-    }
-  }
-}
-</script>
-
-<style scoped>
-.signup-form.fadeout {
-  position: relative;
-  height: calc(100% - 100px);
-
-  left: 0;
-  animation: slide 0.5s forwards;
-}
-
-@keyframes slide {
-  100% {
-    left: -500px;
-  }
-}
-</style>
diff --git a/src/views/dashboard/Navigation/NavRoot.vue b/src/views/dashboard/Navigation/NavRoot.vue
index f24f684..77082d1 100644
--- a/src/views/dashboard/Navigation/NavRoot.vue
+++ b/src/views/dashboard/Navigation/NavRoot.vue
@@ -81,22 +81,6 @@ export default {
         height: this.hori.height + 'px'
       }
     }
-  },
-  beforeMount() {
-
-    if (this.$store.state.user.rank === 'Admin') {
-
-      const newElement = {
-        routerLink: '/admin',
-        html: '<i class="fas fa-user-shield"></i>Admin',
-        active: false
-      };
-
-      // Insert as second to last element
-      this.allElements.splice(this.allElements.length - 1, 0, newElement);
-    }
-
-
   },
   mounted() {
     this.initActive();
diff --git a/src/views/dashboard/admin/AdminRoot.vue b/src/views/dashboard/admin/AdminRoot.vue
deleted file mode 100644
index f9a281e..0000000
--- a/src/views/dashboard/admin/AdminRoot.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-<div class="base-wrap">
-  <router-view v-slot="{ Component }">
-    <transition name="component-fade" mode="out-in">
-      <component :is="Component"></component>
-    </transition>
-  </router-view>
-</div>
-</template>
-
-<script>
-export default {
-  mounted() {
-    this.$store.dispatch('setNewNav', [
-      {
-        routerLink: '/admin/online-devices',
-        html: '<i class="fas fa-search"></i>Online Hubs'
-      }
-    ]);
-  }
-}
-</script>
-
-<style scoped lang="scss">
-
-</style>
diff --git a/src/views/dashboard/admin/online-devices/OnlineDevices.vue b/src/views/dashboard/admin/online-devices/OnlineDevices.vue
deleted file mode 100644
index 7d411da..0000000
--- a/src/views/dashboard/admin/online-devices/OnlineDevices.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-    <b-container>
-        <b-row>
-            <h4>Online Hubs: <b>{{ devices.length }}</b></h4>
-        </b-row>
-        <b-row>
-        <b-table hover striped :items="devices" :fields="fields" class="devices-table">
-            <template #cell(owner)="row">
-                    <b-container>
-                        <b-row align-h="start" align-v="center">
-                            <b-col md="auto">
-                                <img class="user-image" :src="row.item.owner.image + '&s=128'" />
-                            </b-col>
-                            <b-col>
-                                <p class="mb-0">{{ row.item.owner.name }}</p>
-                            </b-col>
-                        </b-row>
-                    </b-container>
-                </template>
-        </b-table>
-        </b-row>
-    </b-container>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            devices: [],
-            fields: [
-                {
-                    key: "id",
-                    label: "ID"
-                },
-                {
-                    key: "name"
-                },
-                {
-                    key: "firmwareVersion"
-                },
-                {
-                    key: "gateway"
-                },
-                {
-                    key: 'owner'
-                }
-            ],
-        }
-    },
-    beforeMount() {
-        this.getOnlineDevices();
-    },
-    methods: {
-        async getOnlineDevices() {
-            const res = await apiCall.makeCall('GET', '1/admin/monitoring/onlineDevices');
-
-            this.devices = res.data.data;
-        }
-    }
-}
-</script>
-
-
-<style lang="scss" scoped>
-
-.devices-table {
-    .mr {
-        margin-right: 10px;
-
-        --bs-btn-color: #fff;
-        --bs-btn-hover-color: #fff;
-        --bs-btn-active-color: #fff;
-    }
-
-    :deep(td) {
-        vertical-align: middle;
-    }
-}
-</style>
diff --git a/src/views/dashboard/admin/users/Search.vue b/src/views/dashboard/admin/users/Search.vue
deleted file mode 100644
index e59e24b..0000000
--- a/src/views/dashboard/admin/users/Search.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<template>
-  <div class="col base-widget">
-    <div class="row" style="height: 100%;">
-      <form class="col">
-        <label for="searchTerm">Search Term</label>
-        <input type="search" class="form-control" id="searchTerm" placeholder="Enter search term"
-               v-model="options.term">
-      </form>
-      <button class="col btn btn-nano scuff" @click="search">
-        <span v-show="loading"><i class="fas fa-cog fa-spin"></i></span>
-        <span v-show="!loading"><i class="fas fa-search"></i></span>
-      </button>
-      <div class="col-8 table-div">
-        <table class="table">
-          <thead>
-          <tr>
-            <th scope="col">Username</th>
-            <th scope="col">Email</th>
-            <th scope="col">Created</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr v-for="item in searchResults" @click="clicked(item.Id)">
-            <td>{{ item.Username }}</td>
-            <td>{{ item.Email }}</td>
-            <td>{{ item.CreationDate }}</td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      searchResults: [],
-      options: {
-        term: "",
-        page: 1,
-        perPage: 18
-      },
-      loading: false
-    }
-  },
-  methods: {
-    async search() {
-      this.loading = true;
-      const res = await apiCall.makeCall('POST', `admin/users/search?offset=${this.start}&count=${this.options.perPage}`, {
-        "term": this.options.term
-      });
-      this.loading = false;
-      this.searchResults = res.data.Data.Results;
-    },
-    clicked(userId) {
-      this.emitter.emit('getUser', userId);
-    }
-  },
-  watch: {
-    'options.page': function (newV, oldV) {
-      this.getAll();
-    },
-  },
-  computed: {
-    start() {
-      return this.options.page * this.options.perPage - this.options.perPage;
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.scuff {
-  flex: 0 0 auto;
-  width: 39px;
-}
-
-.table-div {
-  height: 100%;
-  overflow: auto;
-
-  .table {
-    margin-bottom: 0;
-  }
-}
-</style>
diff --git a/src/views/dashboard/admin/users/Users.vue b/src/views/dashboard/admin/users/Users.vue
deleted file mode 100644
index 2da799c..0000000
--- a/src/views/dashboard/admin/users/Users.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-  <div class="row users g-5 justify-content-center">
-    <search/>
-    <user/>
-  </div>
-</template>
-
-<script>
-import Search from "./Search";
-import User from "./user/User";
-
-export default {
-  components: {User, Search}
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/views/dashboard/admin/users/user/Edit.vue b/src/views/dashboard/admin/users/user/Edit.vue
deleted file mode 100644
index 269b4ad..0000000
--- a/src/views/dashboard/admin/users/user/Edit.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-<template>
-  <div>
-    <div>
-      <div class="row input-uid">
-        <form class="col">
-          <label for="userId">User ID</label>
-          <input type="text" class="form-control" id="userId" v-model="userId" placeholder="Enter a user id to edit">
-        </form>
-        <button class="col btn btn-nano scuff" @click="get" :disabled="loading.search">
-          <span v-show="loading.search"><i class="fas fa-cog fa-spin"></i></span>
-          <span v-show="!loading.search"><i class="fas fa-search"></i></span>
-        </button>
-      </div>
-      <label for="username">Username</label>
-      <input type="text" class="form-control" id="username" v-model="form.Username" placeholder="Users username">
-
-      <label for="email">Email</label>
-      <input type="text" class="form-control" id="email" v-model="form.Email" placeholder="Users email">
-
-      <label for="permission">Permission</label>
-      <input type="text" class="form-control" id="permission" v-model="form.Permission" placeholder="Permission level">
-
-      <div class="row mb-2 mt-2">
-        <div class="col">
-          <div class="form-check form-switch">
-            <input class="form-check-input" type="checkbox" id="isEmailVerified" v-model="form.IsEmailVerified">
-            <label class="form-check-label" for="isEmailVerified">Is Email Verified</label>
-          </div>
-
-          <div class="form-check form-switch">
-            <input class="form-check-input" type="checkbox" id="isVerified" v-model="form.IsVerified">
-            <label class="form-check-label" for="isVerified">Is Verified</label>
-          </div>
-
-          <div class="form-check form-switch">
-            <input class="form-check-input" type="checkbox" id="isPremium" v-model="form.IsPremium">
-            <label class="form-check-label" for="isPremium">Is Premium</label>
-          </div>
-        </div>
-        <button class="col align-self-end btn btn-nano submit-btn" @click="update" :disabled="loading.update">
-          <span v-show="loading.update"><i class="fas fa-cog fa-spin"></i> Send</span>
-          <span v-show="!loading.update"><i class="fas fa-user-edit"></i> Send</span>
-        </button>
-      </div>
-    </div>
-
-    <div class="new-password row">
-
-
-      <form class="col">
-        <label for="password">New Password</label>
-        <input type="text" class="form-control" id="password" v-model="newPassword" placeholder="Enter a new password">
-      </form>
-      <button class="col btn btn-nano scuff" @click="updatePassword" :disabled="loading.password">
-        <span v-show="loading.password"><i class="fas fa-cog fa-spin"></i></span>
-        <span v-show="!loading.password"><i class="fas fa-user-edit"></i></span>
-      </button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: ['requestedUser'],
-  data() {
-    return {
-      userId: "",
-      form: {
-        "Username": "",
-        "Email": "",
-        "Permission": 0,
-        "IsEmailVerified": false,
-        "IsVerified": false,
-        "IsPremium": false
-      },
-      newPassword: "",
-      loading: {
-        search: false,
-        update: false,
-        password: false
-      }
-    }
-  },
-  mounted() {
-    if (this.requestedUser !== '') {
-      this.userId = this.requestedUser;
-      this.get();
-    }
-  },
-  methods: {
-    async get() {
-      if (this.userId === "") {
-        toastr.error("User ID must be non empty");
-        return;
-      }
-      this.loading.search = true;
-      const res = await apiCall.makeCall('GET', 'admin/users/' + this.userId, undefined);
-      this.loading.search = false;
-      this.form = res.data.Data;
-    },
-    async update() {
-      if (this.userId === "") {
-        toastr.error("User ID must be non empty");
-        return;
-      }
-      this.loading.update = true;
-      const res = await apiCall.makeCall('POST', 'admin/users/' + this.userId, this.form);
-      this.loading.update = false;
-      toastr.success('Successfully updated user', 'User Management');
-      this.form = {
-        "Username": "",
-        "Email": "",
-        "Permission": 0,
-        "IsEmailVerified": false,
-        "IsVerified": false,
-        "IsPremium": false
-      };
-      this.userId = "";
-
-    },
-    async updatePassword() {
-      if (this.userId === "") {
-        toastr.error("User ID must be non empty");
-        return;
-      }
-      if (this.newPassword === "") {
-        toastr.error("New Password must be non empty");
-        return;
-      }
-
-      this.loading.password = true;
-      const res = await apiCall.makeCall('POST', 'admin/users/' + this.userId + '/password', {
-        password: this.newPassword
-      });
-      this.loading.password = false;
-    }
-  },
-  watch: {
-    'requestedUser'(newA, old) {
-      this.userId = newA;
-      this.get();
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.submit-btn {
-  flex: 0 0 auto;
-  width: 150px;
-  height: 40px;
-}
-
-.new-password {
-  margin-top: 25px;
-}
-</style>
diff --git a/src/views/dashboard/admin/users/user/New.vue b/src/views/dashboard/admin/users/user/New.vue
deleted file mode 100644
index 895a97c..0000000
--- a/src/views/dashboard/admin/users/user/New.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <div>
-    <label for="username">Username</label>
-    <input type="text" class="form-control" id="username" v-model="form.Username" placeholder="Username">
-
-    <label for="email">Email</label>
-    <input type="text" class="form-control" id="email" v-model="form.Email" placeholder="Email">
-
-    <label for="password">Password</label>
-    <input type="text" class="form-control" id="password" v-model="form.Password" placeholder="Password">
-
-    <label for="permission">Permission</label>
-    <input type="text" class="form-control" id="permission" v-model="form.Permission" placeholder="Permission level">
-
-    <div class="form-check form-switch">
-      <input class="form-check-input" type="checkbox" id="isEmailVerified" v-model="form.IsEmailVerified">
-      <label class="form-check-label" for="isEmailVerified">Is Email Verified</label>
-    </div>
-
-    <div class="form-check form-switch">
-      <input class="form-check-input" type="checkbox" id="isVerified" v-model="form.IsVerified">
-      <label class="form-check-label" for="isVerified">Is Verified</label>
-    </div>
-
-    <div class="form-check form-switch">
-      <input class="form-check-input" type="checkbox" id="isPremium" v-model="form.IsPremium">
-      <label class="form-check-label" for="isPremium">Is Premium</label>
-    </div>
-
-    <button class="col align-self-end btn btn-nano submit-btn" @click="send" :disabled="loading">
-      <span v-show="loading"><i class="fas fa-cog fa-spin"></i> Create User</span>
-      <span v-show="!loading"><i class="fas fa-user-plus"></i> Create User</span>
-    </button>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      form: {
-        "Username": "",
-        "Email": "",
-        "Password": "",
-        "Permission": 0,
-        "IsEmailVerified": false,
-        "IsVerified": false,
-        "IsPremium": false
-      },
-      loading: false
-    }
-  },
-  methods: {
-    async send() {
-      if (this.form.Username === "" || this.form.Email === "" || this.form.Password === "" || this.form.Permission === undefined) {
-        toastr.error("All fields must be filled");
-        return;
-      }
-      this.loading = true;
-      const res = await apiCall.makeCall('POST', 'admin/users/create', this.form);
-      this.loading = false;
-      toastr.success('Successfully created user', 'User Management');
-      this.form = {
-        "Username": "",
-        "Email": "",
-        "Password": "",
-        "Permission": 0,
-        "IsEmailVerified": false,
-        "IsVerified": false,
-        "IsPremium": false
-      }
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-
-</style>
diff --git a/src/views/dashboard/admin/users/user/ReadOnly.vue b/src/views/dashboard/admin/users/user/ReadOnly.vue
deleted file mode 100644
index 4833b91..0000000
--- a/src/views/dashboard/admin/users/user/ReadOnly.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-  <div>
-    <div class="row input-uid">
-      <form class="col">
-        <label for="userId">User ID</label>
-        <input type="text" class="form-control" id="userId" v-model="userId" placeholder="Enter a user id">
-      </form>
-      <button class="col btn btn-nano scuff" @click="get" :disabled="loading">
-        <span v-show="loading"><i class="fas fa-cog fa-spin"></i></span>
-        <span v-show="!loading"><i class="fas fa-search"></i></span>
-      </button>
-    </div>
-    <label for="username">Username</label>
-    <input type="text" class="form-control" id="username" v-model="result.Username" readonly>
-
-    <label for="email">Email</label>
-    <input type="text" class="form-control" id="email" v-model="result.Email" readonly>
-
-    <label for="permission">Permission</label>
-    <input type="text" class="form-control" id="permission" v-model="result.Permission" readonly>
-
-    <label for="created">Creation Date</label>
-    <input type="text" class="form-control" id="created" v-model="result.CreationDate" readonly>
-
-    <label for="createdIp">Created IP</label>
-    <input type="text" class="form-control" id="createdIp" v-model="result.CreatedIp" readonly>
-
-    <div class="form-check form-switch">
-      <input class="form-check-input" type="checkbox" id="isEmailVerified" v-model="result.IsEmailVerified" readonly>
-      <label class="form-check-label" for="isEmailVerified">Is Email Verified</label>
-    </div>
-
-    <div class="form-check form-switch">
-      <input class="form-check-input" type="checkbox" id="isVerified" v-model="result.IsVerified" readonly>
-      <label class="form-check-label" for="isVerified">Is Verified</label>
-    </div>
-
-    <div class="form-check form-switch">
-      <input class="form-check-input" type="checkbox" id="isPremium" v-model="result.IsPremium" readonly>
-      <label class="form-check-label" for="isPremium">Is Premium</label>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: ['requestedUser'],
-  data() {
-    return {
-      userId: "",
-      result: {
-        "Username": "none",
-        "Email": "none",
-        "Permission": 0,
-        "CreationDate": "1970-01-01T00:00:00",
-        "CreatedIp": "0.0.0.0",
-        "IsEmailVerified": false,
-        "IsVerified": false,
-        "IsPremium": false
-      },
-      loading: false
-    }
-  },
-  mounted() {
-    if (this.requestedUser !== '') {
-      this.userId = this.requestedUser;
-      this.get();
-    }
-  },
-  methods: {
-    async get() {
-      if (this.userId === "") {
-        toastr.error("User ID must be non empty");
-        return;
-      }
-      this.loading = true;
-      const res = await apiCall.makeCall('GET', 'admin/users/' + this.userId, undefined);
-      this.loading = false;
-      this.result = res.data.Data;
-    }
-  },
-  watch: {
-    'requestedUser'(newA, old) {
-      this.userId = newA;
-      this.get();
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-
-</style>
diff --git a/src/views/dashboard/admin/users/user/User.vue b/src/views/dashboard/admin/users/user/User.vue
deleted file mode 100644
index 1227e8c..0000000
--- a/src/views/dashboard/admin/users/user/User.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-  <div class="col-4 base-widget">
-    <div class="row navi-wrap">
-      <div class="col row navi">
-        <div class="col-4" @click="view = 'read-only'">
-          <p :class="{ active: view === 'read-only' }">Read</p>
-        </div>
-        <div class="col-4" @click="view = 'edit'">
-          <p :class="{ active: view === 'edit' }">Edit</p>
-        </div>
-        <div class="col-4" @click="view = 'new'">
-          <p :class="{ active: view === 'new' }">New</p>
-        </div>
-      </div>
-      <transition name="component-fade" mode="out-in">
-        <component class="asdf" :is="view" :requestedUser="requestedUser"></component>
-      </transition>
-    </div>
-  </div>
-</template>
-
-<script>
-import ReadOnly from "./ReadOnly";
-import Edit from "./Edit";
-import New from "./New";
-
-export default {
-  components: {ReadOnly, Edit, New},
-  data() {
-    return {
-      view: 'read-only',
-      requestedUser: ''
-    }
-  },
-  mounted() {
-    this.emitter.on('getUser', userId => {
-      this.view = 'read-only';
-      this.requestedUser = userId;
-    });
-    this.emitter.on('editUser', userId => {
-      this.view = 'edit';
-      this.requestedUser = userId;
-    });
-  },
-}
-</script>
-
-<style scoped lang="scss">
-:deep(.scuff) {
-  flex: 0 0 auto;
-  width: 39px;
-}
-
-:deep(.input-uid) {
-  margin-bottom: 15px;
-}
-
-:deep(.form-user input) {
-  margin-bottom: 5px;
-}
-
-.asdf {
-  height: calc(100% - 50px)
-}
-
-.navi-wrap {
-  padding-top: 0 !important;
-  height: 100%;
-
-  .navi {
-    border-bottom: var(--third-background-color) solid 1px;
-    margin: 0 0 20px;
-    padding: 0;
-    height: 50px;
-
-    .col-4 {
-      cursor: pointer;
-      height: 50px;
-      transition: background-color 0.1s ease-in-out;
-      flex: 1 1 auto;
-
-      p {
-        text-align: center;
-        line-height: 50px;
-        transition: color 0.1s ease-in-out;
-
-        &.active {
-          color: var(--main-color);
-        }
-      }
-
-      &:hover {
-        background: var(--third-background-color);
-      }
-
-      & + .col-4 {
-
-        &:before {
-          transform: translateY(20%);
-          width: 2px;
-          height: 70%;
-          float: left;
-          background-color: var(--main-seperator-color);
-          margin-left: -13px;
-          content: '';
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/src/views/dashboard/profile/ProfileRoot.vue b/src/views/dashboard/profile/ProfileRoot.vue
index f032337..52ba4e5 100644
--- a/src/views/dashboard/profile/ProfileRoot.vue
+++ b/src/views/dashboard/profile/ProfileRoot.vue
@@ -15,10 +15,6 @@ export default {
       {
         routerLink: '/profile/account',
         html: '<i class="fas fa-user"></i>Account'
-      },
-      {
-        routerLink: '/profile/settings',
-        html: '<i class="fas fa-cog"></i>Settings'
       }
     ]);
   }
diff --git a/src/views/dashboard/profile/Settings.vue b/src/views/dashboard/profile/Settings.vue
deleted file mode 100644
index 387663c..0000000
--- a/src/views/dashboard/profile/Settings.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <div class="row g-5 justify-content-center">
-    <div class="col base-widget">
-      <div>
-        <h4>General Account Settings</h4>
-        <b-input-group prepend="@" class="mb-2 mr-sm-2 mb-sm-0">
-          <b-form-input id="inline-form-input-username" placeholder="Username"></b-form-input>
-        </b-input-group>
-      </div>
-    </div>
-
-    <div class="col base-widget">
-      <div>
-        <h4>Connections</h4>
-        <loading v-if="!connectionInfo.requestDone"/>
-        <div v-else>
-          
-        </div>
-      </div>
-    </div>
-
-    <div class="col base-widget">
-      <div>
-        <h4>Logout</h4>
-        <loading-button text="Logout" icon="fa-sign-out-alt" @click="logout"/>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import LoadingButton from "../../utils/LoadingButton";
-import apiCall from "../../../js/ApiCall";
-import Loading from "../../utils/Loading";
-
-export default {
-  components: {Loading, LoadingButton},
-  data() {
-    return {
-      connectionInfo: {
-        requestDone: true,
-        data: undefined
-      },
-      loading: {
-        patreonUnlink: false,
-        patreonUpdate: false
-      }
-    }
-  },
-  beforeMount() {
-    //this.getConnectionInfo();
-  },
-  methods: {
-    logout() {
-      this.$router.push('/account/login');
-      utils.setLogin("");
-    },
-    async getConnectionInfo() {
-      this.connectionInfo.requestDone = false;
-      const res = await apiCall.makeCall("GET", "user/connections");
-      this.connectionInfo.data = res.data.Data;
-      this.connectionInfo.requestDone = true;
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.base-widget {
-  min-width: 150px;
-  max-width: 500px;
-}
-</style>
\ No newline at end of file