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

change absolute paths to relative paths

This commit is contained in:
Sina Blattmann 2023-07-06 07:51:38 +02:00
parent 9068f183d6
commit 393b06792a
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
typescript/Frontend/src/components/Groups/Folder.tsx
View File

@ -7,7 +7,7 @@ import { I_Folder } from "../../util/types";
import AddNewDialog from "./AddNewDialog"; import AddNewDialog from "./AddNewDialog";
import FolderForm from "./FolderForm"; import FolderForm from "./FolderForm";
import MoveDialog from "./Tree/MoveDialog"; import MoveDialog from "./Tree/MoveDialog";
import { colors } from "/home/ig/code/git_trunk/typescript/Frontend/src/index"; import { colors } from "index";
const Folder = () => { const Folder = () => {
const { id } = useParams(); const { id } = useParams();
@ -70,7 +70,7 @@ const Folder = () => {
<Box <Box
sx={{ width: 1 / 2, justifyContent: "center", display: "flex", mt: 10 }} sx={{ width: 1 / 2, justifyContent: "center", display: "flex", mt: 10 }}
> >
<CircularProgress sx={{ m: 2 ,color: theme.palette.secondary.main}} /> <CircularProgress sx={{ m: 2, color: theme.palette.secondary.main }} />
</Box> </Box>
); );
} else if (error) { } else if (error) {

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

@ -7,7 +7,7 @@ import ChevronRightIcon from "@mui/icons-material/ChevronRight";
import useRouteMatch from "../../../hooks/useRouteMatch"; import useRouteMatch from "../../../hooks/useRouteMatch";
import routes from "../../../routes.json"; import routes from "../../../routes.json";
import React from "react"; import React from "react";
import {colors} from "/home/ig/code/git_trunk/typescript/Frontend/src/index"; import { colors } from "index";
export interface ToggleElement { export interface ToggleElement {
[key: string]: boolean; [key: string]: boolean;
@ -66,13 +66,12 @@ const CheckboxTree = () => {
<Checkbox <Checkbox
checked={!!checked} checked={!!checked}
onClick={(e) => handleClick(e, element, checked)} onClick={(e) => handleClick(e, element, checked)}
style ={{ style={{
color: theme.palette.text.primary , color: theme.palette.text.primary,
}} }}
sx={{ sx={{
paddingY:0, paddingY: 0,
}} }}
/> />
)} )}
{splitName[splitName.length - 1]} {splitName[splitName.length - 1]}

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

@ -11,8 +11,6 @@ import { fetchData } from "./ScalarGraph";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { FetchResult } from "../../../dataCache/dataCache"; import { FetchResult } from "../../../dataCache/dataCache";
import { FormattedMessage } from "react-intl"; import { FormattedMessage } from "react-intl";
import { colors } from "../../..";
import { error } from "console";
const TopologyView = () => { const TopologyView = () => {
const [values, setValues] = useState<TopologyValues | null>(null); const [values, setValues] = useState<TopologyValues | null>(null);
@ -53,7 +51,7 @@ const TopologyView = () => {
bgcolor: "white", bgcolor: "white",
px: 3 / 8, px: 3 / 8,
border: 2, border: 2,
borderTop : 0, borderTop: 0,
borderBottomLeftRadius: 4, borderBottomLeftRadius: 4,
borderBottomRightRadius: 4, borderBottomRightRadius: 4,
borderColor: theme.palette.text.disabled, borderColor: theme.palette.text.disabled,
@ -224,7 +222,7 @@ const TopologyView = () => {
); );
} }
return ( return (
<Alert sx={{ mt: 1, }} severity="error"> <Alert sx={{ mt: 1 }} severity="error">
<FormattedMessage <FormattedMessage
id="noData" id="noData"
defaultMessage="Couldn't find any live data" defaultMessage="Couldn't find any live data"

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

@ -2,11 +2,12 @@ import { FormattedMessage } from "react-intl";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import axiosConfig from "../../config/axiosConfig"; import axiosConfig from "../../config/axiosConfig";
import InnovenergyButton from "./InnovenergyButton"; import InnovenergyButton from "./InnovenergyButton";
import {colors} from "/home/ig/code/git_trunk/typescript/Frontend/src/index" import { colors } from "index";
interface LogoutButtonProps { interface LogoutButtonProps {
removeToken: () => void; removeToken: () => void;
} }
const LogoutButton = (props: LogoutButtonProps) => { const LogoutButton = (props: LogoutButtonProps) => {
const navigate = useNavigate(); const navigate = useNavigate();
@ -19,8 +20,7 @@ const LogoutButton = (props: LogoutButtonProps) => {
props.removeToken(); props.removeToken();
}); });
}} }}
sx={{ mx: 1, bgcolor: colors.orangeSelected, textTransform: "none"}} sx={{ mx: 1, bgcolor: colors.orangeSelected, textTransform: "none" }}
> >
<FormattedMessage id="logout" defaultMessage="Logout" /> <FormattedMessage id="logout" defaultMessage="Logout" />
</InnovenergyButton> </InnovenergyButton>