Merge b69d3703d5 into be62f56782

frontend/src/components/Sidebar.vue

@@ -1,5 +1,9 @@
 <template>
   <nav :class="{ active }">
+    <button v-if="user.username" @click="toAccountSettings" class="action">
+      <i class="material-icons">person</i>
+      <span>{{ user.username }}</span>
+    </button>
     <template v-if="isLoggedIn">
       <button
         class="action"
@@ -33,7 +37,7 @@
         </button>
       </div>
 
-      <div>
+      <div v-if="user.perm.admin">
         <button
           class="action"
           @click="toSettings"
@@ -43,19 +47,18 @@
           <i class="material-icons">settings_applications</i>
           <span>{{ $t("sidebar.settings") }}</span>
         </button>
-
-        <button
-          v-if="canLogout"
-          @click="logout"
-          class="action"
-          id="logout"
-          :aria-label="$t('sidebar.logout')"
-          :title="$t('sidebar.logout')"
-        >
-          <i class="material-icons">exit_to_app</i>
-          <span>{{ $t("sidebar.logout") }}</span>
-        </button>
       </div>
+      <button
+        v-if="canLogout"
+        @click="logout"
+        class="action"
+        id="logout"
+        :aria-label="$t('sidebar.logout')"
+        :title="$t('sidebar.logout')"
+      >
+        <i class="material-icons">exit_to_app</i>
+        <span>{{ $t("sidebar.logout") }}</span>
+      </button>
     </template>
     <template v-else>
       <router-link
@@ -180,8 +183,12 @@ export default {
       this.$router.push({ path: "/files" });
       this.closeHovers();
     },
+    toAccountSettings() {
+      this.$router.push({ path: "/settings/profile" });
+      this.$store.commit("closeHovers");
+    },
     toSettings() {
-      this.$router.push({ path: "/settings" });
+      this.$router.push({ path: "/settings/global" });
       this.closeHovers();
     },
     help() {

http/auth.go

@@ -30,6 +30,7 @@ type userInfo struct {
 	LockPassword bool              `json:"lockPassword"`
 	HideDotfiles bool              `json:"hideDotfiles"`
 	DateFormat   bool              `json:"dateFormat"`
+	Username     string            `json:"username"`
 }
 
 type authToken struct {
@@ -195,6 +196,7 @@ func printToken(w http.ResponseWriter, _ *http.Request, d *data, user *users.Use
 			Commands:     user.Commands,
 			HideDotfiles: user.HideDotfiles,
 			DateFormat:   user.DateFormat,
+			Username:     user.Username,
 		},
 		RegisteredClaims: jwt.RegisteredClaims{
 			IssuedAt:  jwt.NewNumericDate(time.Now()),