From e742253cf8c90ff9e406349ff6ef2e233509c616 Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Wed, 29 Nov 2023 15:52:37 +1100 Subject: [PATCH] Reorganise imports --- adapter-iron-harvest/src/core/maps.ts | 2 +- client/src/layers/trace/index.tsx | 18 +++++++++--------- client/src/pages/AboutPage.tsx | 6 +++--- client/src/pages/index.tsx | 1 - .../traces/v1.0.5/aurora-polyanya.trace.json | 3 ++- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/adapter-iron-harvest/src/core/maps.ts b/adapter-iron-harvest/src/core/maps.ts index ba673b26..5b59c6c8 100644 --- a/adapter-iron-harvest/src/core/maps.ts +++ b/adapter-iron-harvest/src/core/maps.ts @@ -10,7 +10,7 @@ export function mapIsSupported(path: string) { } export async function getMapDescriptor(path: string) { - const { maps: mapsPath } = await getConfig(); + const { maps: mapsPath } = getConfig(); const file = parse(path); return { id: relative(resolve(mapsPath), path), diff --git a/client/src/layers/trace/index.tsx b/client/src/layers/trace/index.tsx index 71d04b2a..142d9c59 100644 --- a/client/src/layers/trace/index.tsx +++ b/client/src/layers/trace/index.tsx @@ -1,13 +1,21 @@ import { ArrowOutwardRounded } from "@mui/icons-material"; -import { Box, Typography, useTheme } from "@mui/material"; +import { Box, useTheme } from "@mui/material"; import { FeaturePicker } from "components/app-bar/FeaturePicker"; import { TracePicker } from "components/app-bar/Input"; +import { + PlaybackLayerData, + PlaybackService, +} from "components/app-bar/Playback"; import { PropertyList } from "components/inspector/PropertyList"; +import { Heading, Option } from "components/layer-editor/Option"; +import { TracePreview } from "components/layer-editor/TracePreview"; import { LazyNodeList, NodeList } from "components/renderer/NodeList"; import { colorsHex, getColorHex } from "components/renderer/colors"; import { parseString } from "components/renderer/parser/parseString"; import { useTraceParser } from "components/renderer/parser/parseTrace"; +import { ParseTraceWorkerReturnType } from "components/renderer/parser/parseTraceSlave.worker"; import { useEffectWhen } from "hooks/useEffectWhen"; +import { LayerController, inferLayerName } from "layers"; import { chain, constant, @@ -30,14 +38,6 @@ import { useEffect, useMemo } from "react"; import { useThrottle } from "react-use"; import { UploadedTrace } from "slices/UIState"; import { Layer, useLayer } from "slices/layers"; -import { LayerController, inferLayerName } from "layers"; -import { Heading, Option } from "components/layer-editor/Option"; -import { TracePreview } from "components/layer-editor/TracePreview"; -import { - PlaybackLayerData, - PlaybackService, -} from "components/app-bar/Playback"; -import { ParseTraceWorkerReturnType } from "components/renderer/parser/parseTraceSlave.worker"; const isNullish = (x: KeyRef): x is Exclude => x === undefined || x === null; diff --git a/client/src/pages/AboutPage.tsx b/client/src/pages/AboutPage.tsx index 567ff317..fe683ca6 100644 --- a/client/src/pages/AboutPage.tsx +++ b/client/src/pages/AboutPage.tsx @@ -9,14 +9,14 @@ import { ListItemText, Typography as Type, } from "@mui/material"; -import { head } from "lodash"; -import { ReactNode } from "react"; import { Flex } from "components/generic/Flex"; import { Scroll } from "components/generic/Scrollbars"; import { useViewTreeContext } from "components/inspector/ViewTree"; +import { head } from "lodash"; import { Page } from "pages/Page"; import logo from "public/logo512.png"; -import { version_name, name } from "public/manifest.json"; +import { name, version_name } from "public/manifest.json"; +import { ReactNode } from "react"; const contacts = [ { name: "Dr Daniel Harabor", email: "daniel.harabor@monash.edu" }, diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx index 465d5f98..ad70b674 100644 --- a/client/src/pages/index.tsx +++ b/client/src/pages/index.tsx @@ -4,7 +4,6 @@ import { InfoOutlined, LayersOutlined, ListOutlined, - SettingsInputComponentOutlined, SettingsOutlined, SortOutlined as StepsIcon, ViewInArOutlined, diff --git a/resources/traces/v1.0.5/aurora-polyanya.trace.json b/resources/traces/v1.0.5/aurora-polyanya.trace.json index 86e8718f..277d117b 100644 --- a/resources/traces/v1.0.5/aurora-polyanya.trace.json +++ b/resources/traces/v1.0.5/aurora-polyanya.trace.json @@ -24,7 +24,8 @@ { "x": "{{$.event.x2}}", "y": "{{$.event.y2}}" } ], "lineWidth": 0.25, - "fill": "{{$.color[$.event.type]}}" + "fill": "{{$.color[$.event.type]}}", + "display": "transient" } ], "triangle": [