diff --git a/assets/src/router/index.js b/assets/src/router/index.js index b1565952..7f170bb5 100644 --- a/assets/src/router/index.js +++ b/assets/src/router/index.js @@ -82,7 +82,7 @@ const router = new Router({ component: error500 }, { - path: '/settings/users', + path: '/users', name: 'Users', component: Users, meta: { @@ -90,7 +90,7 @@ const router = new Router({ } }, { - path: '/settings/users/*', + path: '/users/*', name: 'User', component: User, meta: { diff --git a/assets/src/views/Files.vue b/assets/src/views/Files.vue index ea605b74..d1574a2c 100644 --- a/assets/src/views/Files.vue +++ b/assets/src/views/Files.vue @@ -116,20 +116,11 @@ export default { }, mounted () { window.addEventListener('keydown', this.keyEvent) - window.addEventListener('scroll', event => { - if (this.req.kind !== 'listing' || this.$store.state.req.display === 'mosaic') return - - let top = 112 - window.scrollY - - if (top < 64) { - top = 64 - } - - document.querySelector('#listing.list .item.header').style.top = top + 'px' - }) + window.addEventListener('scroll', this.scroll) }, beforeDestroy () { window.removeEventListener('keydown', this.keyEvent) + window.removeEventListener('scroll', this.scroll) }, destroyed () { this.$store.commit('updateRequest', {}) @@ -218,6 +209,17 @@ export default { } } }, + scroll (event) { + if (this.req.kind !== 'listing' || this.$store.state.req.display === 'mosaic') return + + let top = 112 - window.scrollY + + if (top < 64) { + top = 64 + } + + document.querySelector('#listing.list .item.header').style.top = top + 'px' + }, openSidebar () { this.$store.commit('showHover', 'sidebar') }, diff --git a/assets/src/views/GlobalSettings.vue b/assets/src/views/GlobalSettings.vue index 478dfd3a..5d0052a4 100644 --- a/assets/src/views/GlobalSettings.vue +++ b/assets/src/views/GlobalSettings.vue @@ -4,7 +4,7 @@
diff --git a/assets/src/views/User.vue b/assets/src/views/User.vue index a46efc08..92ae5286 100644 --- a/assets/src/views/User.vue +++ b/assets/src/views/User.vue @@ -90,7 +90,7 @@ export default { }, computed: { passwordPlaceholder () { - if (this.$route.path === '/settings/users/new') return '' + if (this.$route.path === '/users/new') return '' return this.$t('settings.avoidChanges') } }, @@ -114,7 +114,7 @@ export default { fetchData () { let user = this.$route.params[0] - if (this.$route.path === '/settings/users/new') { + if (this.$route.path === '/users/new') { user = 'base' } @@ -148,7 +148,7 @@ export default { this.rules = this.rules.trim() }).catch(() => { - this.$router.push({ path: '/settings/users/new' }) + this.$router.push({ path: '/users/new' }) }) }, capitalize (name) { @@ -192,7 +192,7 @@ export default { event.preventDefault() let user = this.parseForm() - if (this.$route.path === '/settings/users/new') { + if (this.$route.path === '/users/new') { newUser(user).then(location => { this.$router.push({ path: location }) this.$store.commit('showSuccess', this.$t('settings.userCreated')) diff --git a/assets/src/views/Users.vue b/assets/src/views/Users.vue index d098d25e..81081a2d 100644 --- a/assets/src/views/Users.vue +++ b/assets/src/views/Users.vue @@ -1,6 +1,6 @@