Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/esckan 34 Legend UI update #16

Merged
merged 2 commits into from
Apr 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/connections/Details.tsx
Original file line number Diff line number Diff line change
@@ -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;

2 changes: 1 addition & 1 deletion src/components/connections/PopulationDisplay.tsx
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ const PopulationDisplay = () => {
</Tabs>
</Stack>
<CustomTabPanel value={value} index={0}>
<Box sx={{height: '800px', width: '100%'}}>
<Box sx={{height: '50rem', width: '100%', background: '#EDEFF2'}}>
<GraphDiagram origins={MOCKED_composerStatement.origins} vias={MOCKED_composerStatement.vias}
destinations={MOCKED_composerStatement.destinations}/>
</Box>
2 changes: 1 addition & 1 deletion src/components/connections/SummaryHeader.tsx
Original file line number Diff line number Diff line change
@@ -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;
69 changes: 40 additions & 29 deletions src/components/graphDiagram/InfoMenu.tsx
Original file line number Diff line number Diff line change
@@ -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 ? (
<Stack
direction="row"
spacing="1rem"
alignItems='center'
sx={{
borderRadius: "1.75rem",
border: "1px solid #F2F4F7",
background: "#FFFFFF7F",
backgroundFilter: "blur(4px)",
border: "0.0394rem solid #EDEFF2",
background: "rgba(255, 255, 255, 0.5)",
width: "fit-content",
boxShadow:
"0px 4px 6px -2px rgba(16, 24, 40, 0.03), 0px 12px 16px -4px rgba(16, 24, 40, 0.08)",
padding: "0.75rem 1.25rem",
"0rem 0.1567rem 0.235rem -0.0783rem rgba(16, 24, 40, 0.03), 0rem 0.47rem 0.6267rem -0.1567rem rgba(16, 24, 40, 0.08)",
padding: "0 1.25rem",
height: '3.625rem',
position: "absolute",
left: 8,
bottom: 8,
left: '1.25rem',
bottom: '1.25rem',
zIndex: 10,

"& .MuiSvgIcon-root": {
color: "#475467",
},

"& .MuiDivider-root": {
borderColor: "#EAECF0",
borderWidth: 0.5,
},
"& .MuiButtonBase-root": {
padding: 0,

"&:hover": {
backgroundColor: "transparent",
},
width: '0.0313rem',
height: '1.5rem',
background: '#D2D7DF'
},
}}
>
<Stack direction="row" alignItems="center">
<Stack direction="row" gap={1} alignItems="center">
<OriginInfoIcon/>
<Typography
sx={{
color: "#039855",
color: "#4A4C4F",
fontWeight: 500,
lineHeight: 1,
}}
>
Origins
</Typography>
</Stack>
<Stack direction="row" alignItems="center">
<Divider />
<Stack direction="row" gap={1} alignItems="center">
<ViaInfoIcon/>
<Typography
sx={{
color: "#0E9384",
color: "#4A4C4F",
fontWeight: 500,
lineHeight: 1,
}}
>
Via
</Typography>
</Stack>
<Stack direction="row" alignItems="center">
<Divider />
<Stack direction="row" gap={1} alignItems="center">
<DestinationInfoIcon/>
<Typography
sx={{
color: "#088AB2",
color: "#4A4C4F",
lineHeight: 1,
fontWeight: 500,
}}
>
Destination
</Typography>
</Stack>
{ forwardConnection && (<><Divider />
<Stack direction="row" gap={1} alignItems="center">
<ForwardConnectionIcon />
<Typography
sx={{
color: "#4A4C4F",
lineHeight: 1,
fontWeight: 500,
}}
>
Forward connection
</Typography>
</Stack></>) }
</Stack>
) : null;
};
Original file line number Diff line number Diff line change
@@ -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 {
2 changes: 1 addition & 1 deletion src/components/graphDiagram/widgets/OriginNodeWidget.tsx
Original file line number Diff line number Diff line change
@@ -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";
2 changes: 1 addition & 1 deletion src/components/graphDiagram/widgets/ViaNodeWidget.tsx
Original file line number Diff line number Diff line change
@@ -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";
552 changes: 497 additions & 55 deletions src/components/icons/index.tsx

Large diffs are not rendered by default.

405 changes: 0 additions & 405 deletions src/icons/index.tsx

This file was deleted.