diff --git a/src/components/connections/Details.tsx b/src/components/connections/Details.tsx index ba63973..9f08045 100644 --- a/src/components/connections/Details.tsx +++ b/src/components/connections/Details.tsx @@ -10,7 +10,7 @@ import { vars } from "../../theme/variables.ts"; import PopulationDisplay from "./PopulationDisplay.tsx"; import CommonAccordion from "../common/Accordion.tsx"; import CommonChip from "../common/CommonChip.tsx"; -import { ArrowOutward, HelpCircle } from "../../icons"; +import { ArrowOutward, HelpCircle } from "../icons"; const { gray500, gray700, gray800} = vars; diff --git a/src/components/connections/PopulationDisplay.tsx b/src/components/connections/PopulationDisplay.tsx index 1a0b627..7c3763d 100644 --- a/src/components/connections/PopulationDisplay.tsx +++ b/src/components/connections/PopulationDisplay.tsx @@ -64,7 +64,7 @@ const PopulationDisplay = () => { - + diff --git a/src/components/connections/SummaryHeader.tsx b/src/components/connections/SummaryHeader.tsx index 3731694..b104295 100644 --- a/src/components/connections/SummaryHeader.tsx +++ b/src/components/connections/SummaryHeader.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { Box, Button, ButtonGroup, Divider, Typography, Stack, Link } from "@mui/material"; import { vars } from "../../theme/variables"; import IconButton from "@mui/material/IconButton"; -import { ArrowDown, ArrowRight, ArrowUp, HelpCircle } from "../../icons"; +import { ArrowDown, ArrowRight, ArrowUp, HelpCircle } from "../icons"; import Breadcrumbs from "@mui/material/Breadcrumbs"; const { gray100, primaryPurple600, gray600A, gray500 } = vars; diff --git a/src/components/graphDiagram/InfoMenu.tsx b/src/components/graphDiagram/InfoMenu.tsx index 6e40147..ca83a91 100644 --- a/src/components/graphDiagram/InfoMenu.tsx +++ b/src/components/graphDiagram/InfoMenu.tsx @@ -1,85 +1,96 @@ -import {Stack, Typography} from "@mui/material"; +import {Divider, Stack, Typography} from "@mui/material"; import { DestinationInfoIcon, + ForwardConnectionIcon, OriginInfoIcon, ViaInfoIcon, -} from "../../icons"; +} from "../icons"; import {DiagramEngine} from "@projectstorm/react-diagrams-core"; interface InfoMenuProps { engine: DiagramEngine; + forwardConnection: boolean; } const InfoMenu = (props: InfoMenuProps) => { - const {engine} = props + const {engine, forwardConnection} = props return engine ? ( - + Origins - + + Via - + + Destination + { forwardConnection && (<> + + + + Forward connection + + ) } ) : null; }; diff --git a/src/components/graphDiagram/widgets/DestinationNodeWidget.tsx b/src/components/graphDiagram/widgets/DestinationNodeWidget.tsx index 27e4ea3..ee781a0 100644 --- a/src/components/graphDiagram/widgets/DestinationNodeWidget.tsx +++ b/src/components/graphDiagram/widgets/DestinationNodeWidget.tsx @@ -7,7 +7,7 @@ import Chip from "@mui/material/Chip"; import {CustomNodeModel} from "../models/CustomNodeModel.tsx"; import {DiagramEngine} from "@projectstorm/react-diagrams-core"; import {NodeTypes} from "../../../models/composer.ts"; -import {DestinationIcon, OriginIcon, ViaIcon} from "../../../icons"; +import {DestinationIcon, OriginIcon, ViaIcon} from "../../icons"; import {vars} from "../../../theme/variables.ts"; interface DestinationNodeProps { diff --git a/src/components/graphDiagram/widgets/OriginNodeWidget.tsx b/src/components/graphDiagram/widgets/OriginNodeWidget.tsx index 45a78bb..c711eb5 100644 --- a/src/components/graphDiagram/widgets/OriginNodeWidget.tsx +++ b/src/components/graphDiagram/widgets/OriginNodeWidget.tsx @@ -1,7 +1,7 @@ import React, {useState} from "react"; import {PortWidget} from "@projectstorm/react-diagrams"; import {Typography, Box} from "@mui/material"; -import {DestinationIcon, OriginIcon, ViaIcon} from "../../../icons"; +import {DestinationIcon, OriginIcon, ViaIcon} from "../../icons"; import Stack from "@mui/material/Stack"; import Divider from "@mui/material/Divider"; import {CustomNodeModel} from "../models/CustomNodeModel.tsx"; diff --git a/src/components/graphDiagram/widgets/ViaNodeWidget.tsx b/src/components/graphDiagram/widgets/ViaNodeWidget.tsx index 04b3a47..0b32d20 100644 --- a/src/components/graphDiagram/widgets/ViaNodeWidget.tsx +++ b/src/components/graphDiagram/widgets/ViaNodeWidget.tsx @@ -2,7 +2,7 @@ import React, {useState} from "react"; import {PortWidget} from "@projectstorm/react-diagrams"; import {Typography, Box} from "@mui/material"; import Stack from "@mui/material/Stack"; -import {DestinationIcon, OriginIcon, ViaIcon} from "../../../icons"; +import {DestinationIcon, OriginIcon, ViaIcon} from "../../icons"; import Divider from "@mui/material/Divider"; import Chip from "@mui/material/Chip"; import {CustomNodeModel} from "../models/CustomNodeModel.tsx"; diff --git a/src/components/icons/index.tsx b/src/components/icons/index.tsx index 3c6d6f4..405971d 100644 --- a/src/components/icons/index.tsx +++ b/src/components/icons/index.tsx @@ -1,56 +1,498 @@ -import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; -export const MinusIcon = () => ( - - - -) - -export const PlusIcon = () => ( - - - -) - -export const UncheckedItemIcon = (props: SvgIconProps) => ( - - - - -); - -export const CheckedItemIcon = (props: SvgIconProps) => ( - - - - - -); - -export const ArrowRightIcon = () => ( - - - +import { SvgIcon } from "@mui/material"; +import {SvgIconProps} from "@mui/material/SvgIcon"; + +export const ArrowUp = () => ( + + + + + +); + +export const ArrowDown = () => ( + + + + + +); + +export const ArrowRight = () => ( + + + + + +); +export const ArrowOutward = () => ( + + + + + +); +export const HelpCircle = () => ( + + + + + + + + + + + + +); + +export const ArrowDownwardIcon = (props: SvgIconProps) => ( + + + + + +); + +export const OriginInfoIcon = () => ( + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + + + + + +); +export const ViaInfoIcon = () => ( + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + + + + +); +export const DestinationInfoIcon = () => ( + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + // + + + + +); + +export const ForwardConnectionIcon = () => ( + + + + + + + + + + + + +) + +export const ViaIcon = (props: SvgIconProps) => ( + + + + + + + + + + + + + + + + +); +export const DestinationIcon = (props: SvgIconProps) => ( + + + + + +); + +export const ArrowRightIcon = () => ( + + + +); + +export const UncheckedItemIcon = (props: SvgIconProps) => ( + + + + +); + +export const CheckedItemIcon = (props: SvgIconProps) => ( + + + + + +); + +export const MinusIcon = () => ( + + + +) + +export const PlusIcon = () => ( + + + +) + +export const OriginIcon = (props: SvgIconProps) => ( + + + + ); \ No newline at end of file diff --git a/src/icons/index.tsx b/src/icons/index.tsx deleted file mode 100644 index 3d0c863..0000000 --- a/src/icons/index.tsx +++ /dev/null @@ -1,405 +0,0 @@ -import { SvgIcon } from "@mui/material"; -import {SvgIconProps} from "@mui/material/SvgIcon"; - -export const ArrowUp = () => ( - - - - - -); - -export const ArrowDown = () => ( - - - - - -); - -export const ArrowRight = () => ( - - - - - -); -export const ArrowOutward = () => ( - - - - - -); -export const HelpCircle = () => ( - - - - - - - - - - - - -); - -export const OriginInfoIcon = (props: SvgIconProps) => ( - - - - - - - - - - - - - - - - - - - - - - - - - -); -export const ViaInfoIcon = (props: SvgIconProps) => ( - - - - - - - - - - - - - - - - - - - - - - - - - -); -export const DestinationInfoIcon = (props: SvgIconProps) => ( - - - - - - - - - - - - - - - - - - - - - - - - - -); - -export const ViaIcon = (props: SvgIconProps) => ( - - - - - - - - - - - - - - - - -); -export const DestinationIcon = (props: SvgIconProps) => ( - - - - - -); -export const OriginIcon = (props: SvgIconProps) => ( - - - - -); \ No newline at end of file