+
@@ -19,7 +19,7 @@ function Users() {
- >
+
);
}
diff --git a/typescript/frontend-marios2/src/content/dashboards/Users/userForm.tsx b/typescript/frontend-marios2/src/content/dashboards/Users/userForm.tsx
index 4803a169a..23ef0361f 100644
--- a/typescript/frontend-marios2/src/content/dashboards/Users/userForm.tsx
+++ b/typescript/frontend-marios2/src/content/dashboards/Users/userForm.tsx
@@ -9,7 +9,9 @@ import {
MenuItem,
Modal,
Select,
+ Switch,
TextField,
+ Typography,
useTheme
} from '@mui/material';
import Button from '@mui/material/Button';
@@ -17,10 +19,9 @@ import { Close as CloseIcon } from '@mui/icons-material';
import { InnovEnergyUser } from 'src/interfaces/UserTypes';
import axiosConfig from 'src/Resources/axiosConfig';
import { TokenContext } from 'src/contexts/tokenContext';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import Checkbox from '@mui/material/Checkbox';
import { I_Folder, I_Installation } from 'src/interfaces/InstallationTypes';
import { FormattedMessage } from 'react-intl';
+import FormControlLabel from '@mui/material/FormControlLabel';
interface userFormProps {
cancel: () => void;
@@ -385,16 +386,22 @@ function userForm(props: userFormProps) {
}
- label="Admin"
- sx={{ marginTop: 1 }}
+ label={Admin}
+ sx={{
+ marginLeft: '10px',
+ marginTop: '9px'
+ }}
/>
diff --git a/typescript/frontend-marios2/src/content/pages/Status/Status404/index.tsx b/typescript/frontend-marios2/src/content/pages/Status/Status404/index.tsx
index d760d8703..4cd500aec 100644
--- a/typescript/frontend-marios2/src/content/pages/Status/Status404/index.tsx
+++ b/typescript/frontend-marios2/src/content/pages/Status/Status404/index.tsx
@@ -1,17 +1,12 @@
import {
Box,
- Card,
- Typography,
- Container,
- Divider,
Button,
- FormControl,
+ Container,
OutlinedInput,
- InputAdornment,
- styled
+ styled,
+ Typography
} from '@mui/material';
import { Helmet } from 'react-helmet-async';
-import SearchTwoToneIcon from '@mui/icons-material/SearchTwoTone';
const MainContent = styled(Box)(
({ theme }) => `
@@ -50,42 +45,14 @@ function Status404() {
The page you were looking for doesn't exist.
-
- It's on us, we moved the content to a different page. The search
- below should help!
-
+ Go to homepage
+
-
-
-
-
-
- Search
-
-
- }
- startAdornment={
-
-
-
- }
- />
-
- OR
-
-
-
>
diff --git a/typescript/frontend-marios2/src/interfaces/Chart.tsx b/typescript/frontend-marios2/src/interfaces/Chart.tsx
index cc4b4a63a..1c209eb69 100644
--- a/typescript/frontend-marios2/src/interfaces/Chart.tsx
+++ b/typescript/frontend-marios2/src/interfaces/Chart.tsx
@@ -110,7 +110,7 @@ export const transformInputToDailyData = async (
while (startUnixTime < endTimestamp) {
timestampPromises.push(fetchData(startUnixTime, s3Credentials));
- startUnixTime = UnixTime.fromTicks(startUnixTime.ticks + diff / 200);
+ startUnixTime = UnixTime.fromTicks(startUnixTime.ticks + diff / 100);
if (startUnixTime.ticks % 2 !== 0) {
startUnixTime = UnixTime.fromTicks(startUnixTime.ticks + 1);
}
@@ -436,12 +436,8 @@ export const transformInputToAggregatedData = async (
overviewData['/GridExportPower'].magnitude
),
unit: '(kWh)',
- min:
- overviewData['/GridImportPower'].min +
- overviewData['/GridExportPower'].min,
- max:
- overviewData['/GridImportPower'].max +
- overviewData['/GridExportPower'].max
+ min: overviewData['/GridExportPower'].min,
+ max: overviewData['/GridImportPower'].max
};
chartOverview.overview = {
diff --git a/typescript/frontend-marios2/src/layouts/SidebarLayout/Header/Menu/index.tsx b/typescript/frontend-marios2/src/layouts/SidebarLayout/Header/Menu/index.tsx
index 65c3784cd..743301461 100644
--- a/typescript/frontend-marios2/src/layouts/SidebarLayout/Header/Menu/index.tsx
+++ b/typescript/frontend-marios2/src/layouts/SidebarLayout/Header/Menu/index.tsx
@@ -11,6 +11,7 @@ import { styled } from '@mui/material/styles';
import ExpandMoreTwoToneIcon from '@mui/icons-material/ExpandMoreTwoTone';
import { ThemeContext } from '../../../../theme/ThemeProvider';
import { FormattedMessage } from 'react-intl';
+import '../../../../App.css';
interface HeaderButtonsProps {
language: string;
@@ -106,7 +107,7 @@ function HeaderMenu(props: HeaderButtonsProps) {
const isMobile = window.innerWidth <= 1280;
return (
- <>
+
-
- >
+
+
+
+
);
}
diff --git a/typescript/frontend-marios2/src/layouts/SidebarLayout/Header/Userbox/index.tsx b/typescript/frontend-marios2/src/layouts/SidebarLayout/Header/Userbox/index.tsx
index 04eb7cd32..cdfe96b9d 100644
--- a/typescript/frontend-marios2/src/layouts/SidebarLayout/Header/Userbox/index.tsx
+++ b/typescript/frontend-marios2/src/layouts/SidebarLayout/Header/Userbox/index.tsx
@@ -19,6 +19,7 @@ import { TokenContext } from 'src/contexts/tokenContext';
import { useNavigate } from 'react-router-dom';
import routes from 'src/Resources/routes.json';
import { WebSocketContext } from '../../../../contexts/WebSocketContextProvider';
+import '../../../../App.css';
const UserBoxButton = styled(Button)(
({ theme }) => `
@@ -86,8 +87,13 @@ function HeaderUserbox() {
};
return (
- <>
-
+
+
{currentUser?.name}
@@ -113,14 +119,16 @@ function HeaderUserbox() {
horizontal: 'right'
}}
>
-
-
- {currentUser?.name}
-
- {currentUser?.email}
-
-
-
+
+
+
+ {currentUser?.name}
+
+ {currentUser?.email}
+
+
+
+
@@ -130,7 +138,7 @@ function HeaderUserbox() {
- >
+
);
}
diff --git a/typescript/frontend-marios2/src/layouts/SidebarLayout/index.tsx b/typescript/frontend-marios2/src/layouts/SidebarLayout/index.tsx
index 4c9f3e7cf..bbcd07914 100644
--- a/typescript/frontend-marios2/src/layouts/SidebarLayout/index.tsx
+++ b/typescript/frontend-marios2/src/layouts/SidebarLayout/index.tsx
@@ -43,10 +43,12 @@ const SidebarLayout = (props: SidebarLayoutProps) => {
}
}}
>
-
+
+
+