diff --git a/database.sql b/database.sql index b6f6453..1315470 100644 --- a/database.sql +++ b/database.sql @@ -1,10 +1,11 @@ CREATE TABLE users ( id INT AUTO_INCREMENT PRIMARY KEY, + token VARCHAR(255) NOT NULL, username VARCHAR(50) NOT NULL UNIQUE, password_hash VARCHAR(255) NOT NULL, perms VARCHAR(255) NOT NULL ); -- Test user with admin permissions -INSERT INTO users (username, password_hash, perms) -VALUES ('admin', 'ecd71870d1963316a97e3ac3408c9835ad8cf0f3c1bc703527c30265534f75ae', 'admin'); +INSERT INTO users (token, username, password_hash, perms) +VALUES ('be01e88cc202593292d503e4ed9e51e9eb217093662efbb145030ba51b97c22a','admin', 'ecd71870d1963316a97e3ac3408c9835ad8cf0f3c1bc703527c30265534f75ae', 'admin'); diff --git a/src/App.js b/src/App.js index b8e5c62..7378abf 100644 --- a/src/App.js +++ b/src/App.js @@ -11,6 +11,7 @@ import metadata from './metadata.json'; import './App.css' import useToken from './core/useToken'; import Terminal from './Terminal/TerminalPage' +import DashboardReports from './Dashboard/DashboardReports'; function App() { @@ -26,8 +27,8 @@ function App() { } /> } /> } /> - {/* } /> - } /> */} + {/* } /> */} + } /> } /> } /> } /> diff --git a/src/Dashboard/DashboardReports.js b/src/Dashboard/DashboardReports.js new file mode 100644 index 0000000..30681f3 --- /dev/null +++ b/src/Dashboard/DashboardReports.js @@ -0,0 +1,33 @@ +import React from 'react'; +import { + Box, + CssBaseline, + Toolbar, +} from '@mui/material'; +import { ThemeProvider } from '@mui/material/styles'; +import theme from '../theme'; +import { SidebarMain } from '../widgets/Sidebar'; +import { AppBarFull } from '../widgets/AppBar'; +import WidgetReport from '../widgets/WidgetReport'; + +export default function DashboardReports() { + return ( + + + + + + + + {/* Hi {localStorage.getItem('token')} */} + + + + + + + ); +} \ No newline at end of file diff --git a/src/metadata.json b/src/metadata.json index 104804c..de45e7b 100644 --- a/src/metadata.json +++ b/src/metadata.json @@ -1 +1 @@ -{"buildMajor":1,"buildMinor":0,"buildRevision":19,"buildTag":"DEV"} \ No newline at end of file +{"buildMajor":1,"buildMinor":0,"buildRevision":21,"buildTag":"DEV"} \ No newline at end of file diff --git a/src/widgets/AppBar.js b/src/widgets/AppBar.js index eeed9b3..e8a15a0 100644 --- a/src/widgets/AppBar.js +++ b/src/widgets/AppBar.js @@ -9,6 +9,7 @@ import DashboardIcon from '@mui/icons-material/DashboardOutlined'; import SettingsIcon from '@mui/icons-material/SettingsOutlined'; import LogoutIcon from '@mui/icons-material/LogoutOutlined'; import deleteToken from "../core/deleteToken"; +import metadata from "../metadata.json"; const drawerWidth = 240; @@ -43,7 +44,10 @@ export const AppBarFull = () => { - Admin Dashboard + {['DEV', 'ALPHA', 'BETA'].includes(metadata.buildTag) ? + `Admin Dashboard ${metadata.buildTag}` : + 'Admin Dashboard' + } + + + + + + + + ); +} \ No newline at end of file