From 1909312b8958dd37cc1440219243062d7369d518 Mon Sep 17 00:00:00 2001
From: Jonathan Bout <jonathanbout01@gmail.com>
Date: Mon, 9 Oct 2023 15:42:51 +0200
Subject: [PATCH 1/4] Add username in Sidebar

---
 frontend/src/components/Sidebar.vue | 35 +++++++++++++++++------------
 http/auth.go                        |  2 ++
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue
index 9a4c667d..e262ff7c 100644
--- a/frontend/src/components/Sidebar.vue
+++ b/frontend/src/components/Sidebar.vue
@@ -1,5 +1,20 @@
 <template>
   <nav :class="{ active }">
+    <button v-if="user.username" @click="toAccountSettings" class="action">
+      <i class="material-icons">person</i>
+      <span>{{ user.username }}</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>
     <template v-if="isLogged">
       <button
         class="action"
@@ -33,7 +48,7 @@
         </button>
       </div>
 
-      <div>
+      <div v-if="user.perm.admin">
         <button
           class="action"
           @click="toSettings"
@@ -43,18 +58,6 @@
           <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>
     </template>
     <template v-else>
@@ -176,8 +179,12 @@ export default {
       this.$router.push({ path: "/files/" }, () => {});
       this.$store.commit("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.$store.commit("closeHovers");
     },
     help() {
diff --git a/http/auth.go b/http/auth.go
index 4df68262..407ff696 100644
--- a/http/auth.go
+++ b/http/auth.go
@@ -29,6 +29,7 @@ type userInfo struct {
 	LockPassword bool              `json:"lockPassword"`
 	HideDotfiles bool              `json:"hideDotfiles"`
 	DateFormat   bool              `json:"dateFormat"`
+	Username     string            `json:"username"`
 }
 
 type authToken struct {
@@ -188,6 +189,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()),

From 18b624d9d794175bc751b3d3aef52446287d0bc3 Mon Sep 17 00:00:00 2001
From: Jonathan Bout <93737747+JonathanBout@users.noreply.github.com>
Date: Fri, 10 Nov 2023 21:37:26 +0100
Subject: [PATCH 2/4] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 23afecfc..7f27226a 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<!--I need to commit to trigger the workflow-->
 <p align="center">
   <img src="https://raw.githubusercontent.com/filebrowser/logo/master/banner.png" width="550"/>
 </p>

From b1c368177e46dc5b7b3339ba27ce4b9b4e99a6d3 Mon Sep 17 00:00:00 2001
From: Jonathan Bout <jonathanbout01@gmail.com>
Date: Thu, 25 Apr 2024 22:22:14 +0200
Subject: [PATCH 3/4] move logout button to the bottom of the sidebar

---
 frontend/src/components/Sidebar.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue
index 24711710..e293d942 100644
--- a/frontend/src/components/Sidebar.vue
+++ b/frontend/src/components/Sidebar.vue
@@ -4,17 +4,6 @@
       <i class="material-icons">person</i>
       <span>{{ user.username }}</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>
     <template v-if="isLoggedIn">
       <button
         class="action"
@@ -59,6 +48,17 @@
           <span>{{ $t("sidebar.settings") }}</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

From ab5a6e4bf4e7dbedcd391ad321d714dbcb9edd0d Mon Sep 17 00:00:00 2001
From: Jonathan Bout <jonathanbout01@gmail.com>
Date: Thu, 25 Apr 2024 22:25:14 +0200
Subject: [PATCH 4/4] Remove empty arrow functions that aren't needed

---
 README.md                           | 1 -
 frontend/src/components/Sidebar.vue | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7f27226a..23afecfc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<!--I need to commit to trigger the workflow-->
 <p align="center">
   <img src="https://raw.githubusercontent.com/filebrowser/logo/master/banner.png" width="550"/>
 </p>
diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue
index e293d942..82c5b88d 100644
--- a/frontend/src/components/Sidebar.vue
+++ b/frontend/src/components/Sidebar.vue
@@ -184,11 +184,11 @@ export default {
       this.closeHovers();
     },
     toAccountSettings() {
-      this.$router.push({ path: "/settings/profile" }, () => {});
+      this.$router.push({ path: "/settings/profile" });
       this.$store.commit("closeHovers");
     },
     toSettings() {
-      this.$router.push({ path: "/settings/global" }, () => {});
+      this.$router.push({ path: "/settings/global" });
       this.closeHovers();
     },
     help() {