Rename users path and fix bug scroll event

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: {

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')
     },

assets/src/views/GlobalSettings.vue

@@ -4,7 +4,7 @@
 
     <ul>
       <li><router-link to="/settings/profile">{{ $t('settings.goTo') }} {{ $t('settings.profileSettings') }}</router-link></li>
-      <li><router-link to="/settings/users">{{ $t('settings.goTo') }} {{ $t('settings.userManagement') }}</router-link></li>
+      <li><router-link to="/users">{{ $t('settings.goTo') }} {{ $t('settings.userManagement') }}</router-link></li>
     </ul>
 
     <form @submit="savePlugin" v-if="plugins.length > 0">

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'))

assets/src/views/Users.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="dashboard">
-    <h1>{{ $t('settings.users') }} <router-link to="/settings/users/new"><button>{{ $t('buttons.new') }}</button></router-link></h1>
+    <h1>{{ $t('settings.users') }} <router-link to="/users/new"><button>{{ $t('buttons.new') }}</button></router-link></h1>
 
     <table>
       <tr>
@@ -14,7 +14,7 @@
         <td>{{ user.username }}</td>
         <td><i v-if="user.admin" class="material-icons">done</i><i v-else class="material-icons">close</i></td>
         <td>{{ user.filesystem }}</td>
-        <td><router-link :to="'/settings/users/' + user.ID"><i class="material-icons">mode_edit</i></router-link></td>
+        <td><router-link :to="'/users/' + user.ID"><i class="material-icons">mode_edit</i></router-link></td>
       </tr>
 
     </table>

users.go

@@ -197,7 +197,7 @@ func usersPostHandler(c *RequestContext, w http.ResponseWriter, r *http.Request)
 	c.FM.Users[u.Username] = u
 
 	// Set the Location header and return.
-	w.Header().Set("Location", "/settings/users/"+strconv.Itoa(u.ID))
+	w.Header().Set("Location", "/users/"+strconv.Itoa(u.ID))
 	w.WriteHeader(http.StatusCreated)
 	return 0, nil
 }