+
SELECTED INSTANCE
@@ -64,7 +64,7 @@ export const SelectedInstanceInfo = ({
return (
diff --git a/dashboard/src/components/UserMenu.tsx b/dashboard/src/components/UserMenu.tsx
index 1bb39526..958fca2e 100644
--- a/dashboard/src/components/UserMenu.tsx
+++ b/dashboard/src/components/UserMenu.tsx
@@ -120,7 +120,7 @@ const UserMenu = () => {
icon={faCog}
onClick={() => {
localStorage.setItem('lastVisitedRoute', location.pathname);
- setPathname('/settings/general');
+ setPathname('/settings/users');
}}
/>
diff --git a/dashboard/src/pages/settings.tsx b/dashboard/src/pages/settings.tsx
index 9d03dcc7..77661639 100644
--- a/dashboard/src/pages/settings.tsx
+++ b/dashboard/src/pages/settings.tsx
@@ -1,7 +1,6 @@
import { Tab } from '@headlessui/react';
import { useContext, useState } from 'react';
import { useUserInfo } from 'data/UserInfo';
-import CoreSettings from 'pages/settings/CoreSettings';
import UserSettings from 'pages/settings/UserSettings';
import { SettingsContext } from 'data/SettingsContext';
import { useDocumentTitle } from 'usehooks-ts';
@@ -11,10 +10,6 @@ const SettingsPage = () => {
const { tabIndex, setTabIndex, selectUser } = useContext(SettingsContext);
const tabList = [
- {
- title: 'General',
- content:
,
- },
{
title: 'Users',
content:
,
diff --git a/dashboard/src/pages/settings/GenericSettings.tsx b/dashboard/src/pages/settings/GenericSettings.tsx
new file mode 100644
index 00000000..0b0b6031
--- /dev/null
+++ b/dashboard/src/pages/settings/GenericSettings.tsx
@@ -0,0 +1,49 @@
+import { useCoreInfo } from 'data/SystemInfo';
+import { useDocumentTitle } from 'usehooks-ts';
+import packageJson from '../../../package.json';
+
+export const GenericSetting = () => {
+ useDocumentTitle('Lodestone Generic Settings - Lodestone');
+ const { data: coreInfo } = useCoreInfo();
+
+ return (
+ <>
+
+
+
Version Info
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {packageJson.version}
+
+
+
+ {coreInfo ? coreInfo.version : 'unavailable'}
+
+
+
+
+
+ >
+ );
+};
+
+export default GenericSetting;
diff --git a/dashboard/src/pages/settings/GlobalSettings.tsx b/dashboard/src/pages/settings/GlobalSettings.tsx
new file mode 100644
index 00000000..98df2894
--- /dev/null
+++ b/dashboard/src/pages/settings/GlobalSettings.tsx
@@ -0,0 +1,62 @@
+
+import { cn } from 'utils/util';
+import { CommandHistoryContextProvider } from 'data/CommandHistoryContext';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import {
+ faGears,
+ faJarWheat,
+} from '@fortawesome/free-solid-svg-icons';
+import CoreSettings from './CoreSettings';
+import GenericSetting from './GenericSettings';
+
+export const tabs = [
+ {
+ title: 'Core Settings',
+ displayTitle: null,
+ path: 'core-settings',
+ width: 'max-w-4xl',
+ icon:
,
+ content:
,
+ },
+ {
+ title: 'Verion Info',
+ displayTitle: null,
+ path: 'version',
+ width: 'max-w-4xl',
+ icon:
,
+ content:
,
+ }
+];
+
+const GlobalTabs = () => {
+ return (
+
+ {tabs.map((tab, index) => {
+ return (
+
+
+
+ {tab.displayTitle && (
+
+ {tab.displayTitle}
+
+ )}
+ {tab.content}
+
+
+
+ )
+ })}
+
+ );
+};
+
+export default GlobalTabs;