Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

new modification

This commit is contained in:
Noe 2023-07-04 14:38:30 +02:00
parent ce5ef9b77c
commit 1ef35479a7
14 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
typescript/Frontend/src/App.tsx
View File

@ -50,10 +50,10 @@ const App = () => {
<img
src={innovenergyLogo}
alt="innovenergy logo"
height="75"
height="100"
/>
</Grid>
<Grid item xs={9} container justifyContent="flex-end">
<Grid item xs={9} container justifyContent="flex-end" style={{ height: 30 }}>
<LanguageSelect language={language} setLanguage={setLanguage} />
<LogoutButton removeToken={removeToken} />
</Grid>

2
typescript/Frontend/src/components/Groups/Tree/GroupTree.tsx
View File

@ -54,7 +54,7 @@ const GroupTree = () => {
label={element.name}
onClick={() => setCurrentType(element.type)}
sx={{
".MuiTreeItem-content": { paddingY: "12px" },
".MuiTreeItem-content": { paddingY: "5px" },
bgcolor: colors.greyDark,
borderRadius: 2,
}}

1
typescript/Frontend/src/components/Installations/Installation.tsx
View File

@ -17,7 +17,6 @@ const Installation = (props: I_InstallationProps) => {
const [error, setError] = useState<AxiosError>();
const theme = useTheme();
useEffect(() => {
setLoading(true);
axiosConfig

1
typescript/Frontend/src/components/Installations/InstallationList.tsx
View File

@ -95,6 +95,7 @@ const InstallationList = (props: InstallationListProps) => {
selected={installation.id === Number(routeMatch?.params.id)}
disableRipple
sx={{
paddingY: 0.6,
mr: "1px",
borderStyle: "solid",
backgroundColor: theme.palette.primary.dark,

13
typescript/Frontend/src/components/Installations/InstallationTabs.tsx
View File

@ -75,13 +75,6 @@ const InstallationTabs = () => {
component={Link}
to={routes.liveView + id}
/>
<InnovenergyTab
sx={{
"&.Mui-selected": {
@ -100,12 +93,6 @@ const InstallationTabs = () => {
component={Link}
to={routes.log + id}
/>
</InnovenergyTabs>
</Box>
</Box>

3
typescript/Frontend/src/components/Installations/Log/CheckboxTree.tsx
View File

@ -69,6 +69,9 @@ const CheckboxTree = () => {
style ={{
color: theme.palette.text.primary ,
}}
sx={{
paddingY:0,
}}
/>
)}

2
typescript/Frontend/src/components/Installations/Log/TopologyView.tsx
View File

@ -15,7 +15,7 @@ import { colors } from "../../..";
import { error } from "console";
const TopologyView = () => {
const [values, setValues] = useState<TopologyValues | null>(null);
const [values, setValues] = useState<TopologyValues | null>(null);
useEffect(() => {
const interval = setInterval(() => {

3
typescript/Frontend/src/components/Layout/InnovenergyButton.tsx
View File

@ -19,7 +19,8 @@ const InnovenergyButton = (props: I_InnovenergyButtonProps) => {
variant="contained"
type={props.type}
onClick={props.onClick}
sx={{...props.sx,
sx={{...props.sx,
textTransform: "none",
bgcolor: theme.palette.secondary.main,
":hover":{
bgcolor: theme.palette.secondary.dark,

2
typescript/Frontend/src/components/Layout/InnovenergyTab.tsx
View File

@ -10,9 +10,9 @@ const InnovenergyTab = (props: any) => {
{...props}
disableRipple
sx={{
textTransform: "none",
...props.sx,
bottom: 0,
textTransform: "uppercase",
fontWeight: theme.typography.fontWeightRegular,
fontSize: theme.typography.pxToRem(14),
marginRight: theme.spacing(1),

3
typescript/Frontend/src/components/Layout/LogoutButton.tsx
View File

@ -19,7 +19,8 @@ const LogoutButton = (props: LogoutButtonProps) => {
props.removeToken();
});
}}
sx={{ mx: 1, bgcolor: colors.orangeSelected }}
sx={{ mx: 1, bgcolor: colors.orangeSelected, textTransform: "none"}}
>
<FormattedMessage id="logout" defaultMessage="Logout" />
</InnovenergyButton>

1
typescript/Frontend/src/components/Layout/NavigationButtons.tsx
View File

@ -17,6 +17,7 @@ const NavigationButtons = () => {
return (
<>
<InnovenergyTabs
sx={{paddingTop:0}}
id="navigation-buttons-tabs"
value={routeMatch?.pattern?.path}
>

2
typescript/Frontend/src/components/Layout/Search.tsx
View File

@ -75,7 +75,7 @@ const SearchSidebar = (props: SearchSidebarProps) => {
<SearchInputTextfield
sx={{
".MuiInputLabel-root" :{
color: "black"
color: colors.black
}}}
id={id}
variant="filled"

2
typescript/Frontend/src/components/Users/UserList.tsx
View File

@ -62,6 +62,8 @@ const UserList = (props: UserListProps) => {
<ListItemButton
selected={user.id === Number(routeMatch?.params.id)}
sx={{
paddingY: 0.6,
mr: "1px",
borderStyle: "solid",
backgroundColor: theme.palette.primary.dark,

4
typescript/Frontend/src/util/installation.util.tsx
View File

@ -6,7 +6,6 @@ export const StyledTab = styled((props: any) => (
<Tab disableRipple {...props} />
))(({ theme }) => ({
bottom: -1,
textTransform: "uppercase",
fontWeight: theme.typography.fontWeightRegular,
fontSize: theme.typography.pxToRem(14),
marginRight: theme.spacing(1),
@ -30,7 +29,6 @@ export const StyledTabBlue = styled((props: any) => (
<Tab disableRipple {...props} />
))(({ theme }) => ({
bottom: -1,
textTransform: "uppercase",
fontWeight: theme.typography.fontWeightRegular,
fontSize: theme.typography.pxToRem(14),
marginRight: theme.spacing(1),
@ -57,7 +55,6 @@ export const StyledTabBig = styled((props: any) => (
))(({ theme }) => ({
bottom: -2,
textTransform: "uppercase",
fontWeight: theme.typography.fontWeightRegular,
fontSize: theme.typography.pxToRem(14),
marginRight: theme.spacing(1),
@ -82,7 +79,6 @@ export const StyledTabWhite = styled((props: any) => (
<Tab disableRipple {...props} />
))(({ theme }) => ({
bottom: -1,
textTransform: "uppercase",
fontWeight: theme.typography.fontWeightRegular,
fontSize: theme.typography.pxToRem(14),
marginRight: theme.spacing(1),