Compare commits

..

No commits in common. "5b50fc362e7e61dc24e8bba81b664cb94c271d1b" and "1b0557f0764c765676bd0d0faa77621fecfacbc3" have entirely different histories.

3 changed files with 6 additions and 15 deletions

View File

@ -24,7 +24,6 @@ import SettingsIcon from '@mui/icons-material/SettingsOutlined';
import LogoutIcon from '@mui/icons-material/LogoutOutlined'; import LogoutIcon from '@mui/icons-material/LogoutOutlined';
import AccountCircleIcon from '@mui/icons-material/AccountCircleOutlined'; import AccountCircleIcon from '@mui/icons-material/AccountCircleOutlined';
import InfoIcon from '@mui/icons-material/InfoOutlined'; import InfoIcon from '@mui/icons-material/InfoOutlined';
import UpdateIcon from '@mui/icons-material/SystemUpdateAltOutlined';
import { ThemeProvider } from '@mui/material/styles'; import { ThemeProvider } from '@mui/material/styles';
import theme from '../theme'; import theme from '../theme';
import deleteToken from '../core/deleteToken'; import deleteToken from '../core/deleteToken';
@ -116,24 +115,20 @@ export default function SettingsMain() {
> >
<Divider /> <Divider />
<List> <List>
<ListItem button key="Database Configuration" selected={window.location.pathname === '/settings'}> <ListItem button key="Database Configuration">
<DashboardIcon sx={{ marginRight: 2, color: '#FFFFFF'}}/> <DashboardIcon sx={{ marginRight: 2, color: '#FFFFFF'}}/>
<ListItemText primary="Database Configuration" sx={{ color: '#FFFFFF' }} /> <ListItemText primary="Database Configuration" sx={{ color: '#FFFFFF' }} />
</ListItem> </ListItem>
<ListItem button key="Access lists" selected={window.location.pathname === '/settings/access'}> <ListItem button key="Access lists">
<PeopleIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/> <PeopleIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/>
<ListItemText primary="Access lists" sx={{ color: '#FFFFFF' }} /> <ListItemText primary="Access lists" sx={{ color: '#FFFFFF' }} />
</ListItem> </ListItem>
<ListItem button key="Update" selected={window.location.pathname === '/settings/update'}> <ListItem button key="Info">
<UpdateIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/>
<ListItemText primary="Update" sx={{ color: '#FFFFFF' }} />
</ListItem>
<ListItem button key="Info" selected={window.location.pathname === '/settings/info'}>
<InfoIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/> <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> </ListItem>
{getDeveloperMode() && ( {getDeveloperMode() && (
<ListItem button key="Debug" selected={window.location.pathname === '/settings/debug'}> <ListItem button key="Debug">
<BarChartIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/> <BarChartIcon sx={{ marginRight: 2, color: '#FFFFFF' }}/>
<ListItemText primary="Debug" sx={{ color: '#FFFFFF' }} /> <ListItemText primary="Debug" sx={{ color: '#FFFFFF' }} />
</ListItem> </ListItem>

View File

@ -1 +1 @@
{"buildMajor":1,"buildMinor":0,"buildRevision":15,"buildTag":"DEV"} {"buildMajor":1,"buildMinor":0,"buildRevision":14,"buildTag":"DEV"}

View File

@ -11,10 +11,6 @@ const theme = createTheme({
warning: { warning: {
main: '#520013' main: '#520013'
} }
,
action: {
hover: '#00271e'
}
}, },
}); });