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 @@ - - - - - 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 @@ - - - - - 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 @@
Login -
-
- Email - - -
- -
- Password - - -
- -
- Forgot password? -
+
+

Login has moved.

+

OpenShock has a new website. Please head over there to sign in.

+

Once you're signed in you can come straight back here and keep using this site.

- -
- Or - Register -
-
-
- -
- Go Back -
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 @@ - - - - - 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 @@ - - - - - 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 @@ - - - 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 @@ - - - - - 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: '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 @@ - - - - - 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 @@ - - - - - - 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 @@ - - - - - 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 @@ - - - - - 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 @@ - - - - - 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 @@ - - - - - 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 @@ - - - - - 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 @@ - - - - - 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: 'Account' - }, - { - routerLink: '/profile/settings', - html: '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 @@ - - - - - \ No newline at end of file