From 684ba13175bcacb42a16f20b15a6da660ea44ec7 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sun, 14 May 2023 02:01:37 -0700
Subject: [PATCH] Re-order app menu

- Move version number to menu
- Add link to github
---
 .../settings/components/settings-header.tsx   |  2 -
 .../features/titlebar/components/app-menu.tsx | 86 +++++++++++--------
 2 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/src/renderer/features/settings/components/settings-header.tsx b/src/renderer/features/settings/components/settings-header.tsx
index 35347ffa..f6429800 100644
--- a/src/renderer/features/settings/components/settings-header.tsx
+++ b/src/renderer/features/settings/components/settings-header.tsx
@@ -3,7 +3,6 @@ import { closeAllModals, openModal } from '@mantine/modals';
 import { RiSettings2Fill } from 'react-icons/ri';
 import { Button, ConfirmModal, PageHeader } from '/@/renderer/components';
 import { LibraryHeaderBar } from '/@/renderer/features/shared';
-import packageJson from '../../../../../package.json';
 import { useSettingsStoreActions } from '../../../store/settings.store';
 
 export const SettingsHeader = () => {
@@ -33,7 +32,6 @@ export const SettingsHeader = () => {
             <Group noWrap>
               <RiSettings2Fill size="2rem" />
               <LibraryHeaderBar.Title>Settings</LibraryHeaderBar.Title>
-              <LibraryHeaderBar.Badge>v{packageJson.version}</LibraryHeaderBar.Badge>
             </Group>
             <Button
               compact
diff --git a/src/renderer/features/titlebar/components/app-menu.tsx b/src/renderer/features/titlebar/components/app-menu.tsx
index 30caa58d..2bd027ef 100644
--- a/src/renderer/features/titlebar/components/app-menu.tsx
+++ b/src/renderer/features/titlebar/components/app-menu.tsx
@@ -11,6 +11,8 @@ import {
   RiEdit2Line,
   RiSettings3Line,
   RiServerLine,
+  RiGithubLine,
+  RiExternalLinkLine,
 } from 'react-icons/ri';
 import { useNavigate } from 'react-router';
 import { Link } from 'react-router-dom';
@@ -26,6 +28,7 @@ import {
   useAppStoreActions,
 } from '/@/renderer/store';
 import { ServerListItem, ServerType } from '/@/renderer/types';
+import packageJson from '../../../../../package.json';
 
 const browser = isElectron() ? window.electron.browser : null;
 
@@ -79,42 +82,6 @@ export const AppMenu = () => {
 
   return (
     <>
-      <DropdownMenu.Label>Select a server</DropdownMenu.Label>
-      {Object.keys(serverList).map((serverId) => {
-        const server = serverList[serverId];
-        const isNavidromeExpired = server.type === ServerType.NAVIDROME && !server.ndCredential;
-        const isJellyfinExpired = false;
-        const isSessionExpired = isNavidromeExpired || isJellyfinExpired;
-
-        return (
-          <DropdownMenu.Item
-            key={`server-${server.id}`}
-            $isActive={server.id === currentServer?.id}
-            icon={isSessionExpired ? <RiLockLine color="var(--danger-color)" /> : <RiServerLine />}
-            onClick={() => {
-              if (!isSessionExpired) return handleSetCurrentServer(server);
-              return handleCredentialsModal(server);
-            }}
-          >
-            <Group>{server.name}</Group>
-          </DropdownMenu.Item>
-        );
-      })}
-      <DropdownMenu.Divider />
-      <DropdownMenu.Item
-        icon={<RiEdit2Line />}
-        onClick={handleManageServersModal}
-      >
-        Manage servers
-      </DropdownMenu.Item>
-      <DropdownMenu.Item
-        component={Link}
-        icon={<RiSettings3Line />}
-        to={AppRoute.SETTINGS}
-      >
-        Settings
-      </DropdownMenu.Item>
-      <DropdownMenu.Divider />
       <DropdownMenu.Item
         icon={<RiArrowLeftSLine />}
         onClick={() => navigate(-1)}
@@ -142,6 +109,53 @@ export const AppMenu = () => {
           Collapse sidebar
         </DropdownMenu.Item>
       )}
+      <DropdownMenu.Divider />
+      <DropdownMenu.Item
+        component={Link}
+        icon={<RiSettings3Line />}
+        to={AppRoute.SETTINGS}
+      >
+        Settings
+      </DropdownMenu.Item>
+      <DropdownMenu.Item
+        icon={<RiEdit2Line />}
+        onClick={handleManageServersModal}
+      >
+        Manage servers
+      </DropdownMenu.Item>
+
+      <DropdownMenu.Divider />
+      <DropdownMenu.Label>Select a server</DropdownMenu.Label>
+      {Object.keys(serverList).map((serverId) => {
+        const server = serverList[serverId];
+        const isNavidromeExpired = server.type === ServerType.NAVIDROME && !server.ndCredential;
+        const isJellyfinExpired = false;
+        const isSessionExpired = isNavidromeExpired || isJellyfinExpired;
+
+        return (
+          <DropdownMenu.Item
+            key={`server-${server.id}`}
+            $isActive={server.id === currentServer?.id}
+            icon={isSessionExpired ? <RiLockLine color="var(--danger-color)" /> : <RiServerLine />}
+            onClick={() => {
+              if (!isSessionExpired) return handleSetCurrentServer(server);
+              return handleCredentialsModal(server);
+            }}
+          >
+            <Group>{server.name}</Group>
+          </DropdownMenu.Item>
+        );
+      })}
+      <DropdownMenu.Divider />
+      <DropdownMenu.Item
+        component="a"
+        href="https://github.com/jeffvli/feishin/releases"
+        icon={<RiGithubLine />}
+        rightSection={<RiExternalLinkLine />}
+        target="_blank"
+      >
+        Version {packageJson.version}
+      </DropdownMenu.Item>
       {showBrowserDevToolsButton && (
         <>
           <DropdownMenu.Divider />