From 4cd1ad45308b8996fccaa1b2d3e6e4f02570fadc Mon Sep 17 00:00:00 2001
From: SnippetsX <snippetsx@lcsa.ru>
Date: Sun, 24 Nov 2024 01:13:20 +0300
Subject: [PATCH] Fixed setting wrong switching in menu list Added bump for
 database settings

---
 src/App.js                             |  2 +-
 src/Maintenance/SystemUpdates.js       |  0
 src/Settings/SettingsDatabaseConfig.js | 28 ++++++++++++++++++++++++++
 src/core/configEdit.js                 |  6 ++++++
 src/metadata.json                      |  2 +-
 src/widgets/Sidebar.js                 | 22 +++++++++++---------
 6 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 src/Maintenance/SystemUpdates.js
 create mode 100644 src/Settings/SettingsDatabaseConfig.js

diff --git a/src/App.js b/src/App.js
index f51a1d5..b8e5c62 100644
--- a/src/App.js
+++ b/src/App.js
@@ -27,7 +27,7 @@ function App() {
         <Route path="/dashboard" element={<Dashboard/>} />
         <Route path="/dashboard/users" element={<DashboardUsers />} />
         {/* <Route path="/dashboard/configuration" element={<Settings />} />
-        <Route path="/dashboard/reports" element={<Reports />} /> */}
+        <Route path="/dashboard/reports" element={<Reports />} /> */} 
         <Route path="/dashboard/console" element={<Terminal/>} />
         <Route path="/settings" element={<SettingsMain/>} />
         <Route path="/settings/info" element={<SettingsInfo/>} />
diff --git a/src/Maintenance/SystemUpdates.js b/src/Maintenance/SystemUpdates.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/Settings/SettingsDatabaseConfig.js b/src/Settings/SettingsDatabaseConfig.js
new file mode 100644
index 0000000..7900c16
--- /dev/null
+++ b/src/Settings/SettingsDatabaseConfig.js
@@ -0,0 +1,28 @@
+import React from "react";
+import { ThemeProvider, Box, Typography } from "@mui/material";
+import { theme } from "../theme";
+
+
+const SettingsDatabaseConfig = () => {
+    return (
+        <ThemeProvider theme={theme}>
+          <Box sx={{ display: 'flex' }}>
+            <CssBaseline />
+            <AppBarFull />
+            <SidebarSettings />
+            <Box
+              component="main"
+              sx={{ flexGrow: 1, bgcolor: 'background.default', p: 3 }}
+            >
+              <Toolbar />
+              <Typography variant="h5" sx={{ mb: 3, color: 'primary.main' }}>
+                Database Configuration
+              </Typography>
+              
+            </Box>
+          </Box>
+        </ThemeProvider>
+      );
+};
+
+export default SettingsDatabaseConfig;
diff --git a/src/core/configEdit.js b/src/core/configEdit.js
index 07f247c..01c39b2 100644
--- a/src/core/configEdit.js
+++ b/src/core/configEdit.js
@@ -65,3 +65,9 @@ export function getDeveloperMode() {
       throw error;
     });
 }
+
+export function getDatabaseConfig() {
+  return getConfig().then(config => config.database);
+}
+
+
diff --git a/src/metadata.json b/src/metadata.json
index 4b30c57..104804c 100644
--- a/src/metadata.json
+++ b/src/metadata.json
@@ -1 +1 @@
-{"buildMajor":1,"buildMinor":0,"buildRevision":18,"buildTag":"DEV"}
\ No newline at end of file
+{"buildMajor":1,"buildMinor":0,"buildRevision":19,"buildTag":"DEV"}
\ No newline at end of file
diff --git a/src/widgets/Sidebar.js b/src/widgets/Sidebar.js
index 0146d6b..eb70825 100644
--- a/src/widgets/Sidebar.js
+++ b/src/widgets/Sidebar.js
@@ -31,24 +31,28 @@ export const SidebarSettings = () => {
         >
           <Divider />
           <List>
-            <ListItem button key="Database Configuration" selected={window.location.pathname === '/settings'}>
+          <ListItem button key="Main Settings" onClick={() => window.location.href = '/settings'}>
+                <DashboardIcon sx={{ marginRight: 2, color: '#FFFFFF'}}/>
+              <ListItemText primary="Main Settings" sx={{ color: '#FFFFFF' }} />
+            </ListItem>
+            <ListItem button key="Database Configuration" onClick={() => window.location.href = '/settings/database'}>
                 <DashboardIcon sx={{ marginRight: 2, color: '#FFFFFF'}}/>
               <ListItemText primary="Database Configuration" sx={{ color: '#FFFFFF' }} />
             </ListItem>
-            <ListItem button key="Access lists" selected={window.location.pathname === '/settings/access'}>
+            <ListItem button key="Access lists" onClick={() => window.location.href = '/settings/access'}>
                 <PeopleIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/>
               <ListItemText primary="Access lists" sx={{ color: '#FFFFFF' }} />
             </ListItem>
-            <ListItem button key="Update" selected={window.location.pathname === '/settings/update'}>
+            <ListItem button key="Update" onClick={() => window.location.href = '/settings/update'}>
                 <UpdateIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/>
               <ListItemText primary="Update" sx={{ color: '#FFFFFF' }} />
             </ListItem>
-            <ListItem button key="Info" selected={window.location.pathname === '/settings/info'}>
+            <ListItem button key="Info" onClick={() => window.location.href = '/settings/info'}>
                 <InfoIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/>
-              <ListItemText primary="Info" sx={{ color: '#FFFFFF' }} onClick={() => { window.location.href = '/settings/info'; }}/>
+              <ListItemText primary="Info" sx={{ color: '#FFFFFF' }} />
             </ListItem>
             {getDeveloperMode() && (
-              <ListItem button key="Debug" selected={window.location.pathname === '/settings/debug'}>
+              <ListItem button key="Debug" onClick={() => window.location.href = '/settings/debug'}>
                   <BarChartIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/>
                 <ListItemText primary="Debug" sx={{ color: '#FFFFFF' }} />
               </ListItem>
@@ -82,15 +86,15 @@ export const SidebarMain = () => {
                 <DashboardIcon sx={{ marginRight: 2, color: '#FFFFFF'}}/>
               <ListItemText primary="Dashboard" sx={{ color: '#FFFFFF' }} />
             </ListItem>
-            <ListItem button key="Users">
+            <ListItem button key="Users" onClick={() => window.location.href = '/dashboard/users'}>
                 <PeopleIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/>
               <ListItemText primary="Users" sx={{ color: '#FFFFFF' }} />
             </ListItem>
-            <ListItem button key="Reports">
+            <ListItem button key="Reports" onClick={() => window.location.href = '/dashboard/reports'}>
                 <BarChartIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/>
               <ListItemText primary="Reports" sx={{ color: '#FFFFFF' }} />
             </ListItem>
-            <ListItem button key="Server Configuration">
+            <ListItem button key="Server Configuration" onClick={() => window.location.href = '/dashboard/configuration'}>
                 <ConstructionOutlinedIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/>
               <ListItemText primary="Server Configuration" sx={{ color: '#FFFFFF' }} />
             </ListItem>