diff --git a/bun.lockb b/bun.lockb index 6938ce0..bc194f8 100644 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/client/package.json b/client/package.json index 6a5a9cd..e1c5aa4 100644 --- a/client/package.json +++ b/client/package.json @@ -9,6 +9,8 @@ "@emotion/styled": "^11.13.5", "@hello-pangea/dnd": "^17.0.0", "@monaco-editor/react": "^4.6.0", + "@mui-symbols-material/w300": "^0.3.3", + "@mui-symbols-material/w400": "^0.3.3", "@mui/icons-material": "^6.1.8", "@mui/lab": "^6.0.0-beta.16", "@mui/material": "^6.1.8", diff --git a/client/src/Sidebar.tsx b/client/src/Sidebar.tsx index 3bd0d9d..3c050b3 100644 --- a/client/src/Sidebar.tsx +++ b/client/src/Sidebar.tsx @@ -180,12 +180,12 @@ export function Sidebar({ children }: { children?: ReactNode }) { alignItems: "center", display: "flex", "> svg > path": { - strokeWidth: 0.5, + strokeWidth: 1, stroke: bgcolor, }, }} > - {c.icon} + {c.iconThin ?? c.icon} } diff --git a/client/src/components/app-bar/FeaturePickerButton.tsx b/client/src/components/app-bar/FeaturePickerButton.tsx index ed522c7..c61266f 100644 --- a/client/src/components/app-bar/FeaturePickerButton.tsx +++ b/client/src/components/app-bar/FeaturePickerButton.tsx @@ -1,4 +1,4 @@ -import { KeyboardArrowDownOutlined } from "@mui/icons-material"; +import { KeyboardArrowDownOutlined } from "@mui-symbols-material/w400"; import { Box, Button, ButtonProps } from "@mui/material"; import { Props } from "./FeaturePicker"; diff --git a/client/src/components/app-bar/Input.tsx b/client/src/components/app-bar/Input.tsx index 647a319..d58a067 100644 --- a/client/src/components/app-bar/Input.tsx +++ b/client/src/components/app-bar/Input.tsx @@ -1,4 +1,4 @@ -import { FileOpenOutlined } from "@mui/icons-material"; +import { FileOpenOutlined } from "@mui-symbols-material/w400"; import { useSnackbar } from "components/generic/Snackbar"; import { find, get, startCase } from "lodash"; import { Map, UploadedTrace } from "slices/UIState"; diff --git a/client/src/components/app-bar/Playback.tsx b/client/src/components/app-bar/Playback.tsx index 85b3fe4..2a815d3 100644 --- a/client/src/components/app-bar/Playback.tsx +++ b/client/src/components/app-bar/Playback.tsx @@ -7,7 +7,7 @@ import { ChevronLeftOutlined as PreviousIcon, SkipNextOutlined as SkipIcon, SkipPreviousOutlined as StopIcon, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w300"; import { Button, Collapse, @@ -98,113 +98,115 @@ export function Playback({ layer }: { layer?: Layer }) { const [stepInput, setStepInput] = useState(""); const parsedStepInput = parseInt(stepInput); const parsedStepInputValid = !isNaN(parsedStepInput); - return (<> - } - onClick={() => { - stepTo(findBreakpoint(-1)); - }} - disabled={!canStop || !canStepBackward} - /> - } - onClick={stepBackward} - disabled={!canStepBackward} - /> - , - onClick: () => pause(), - disabled: !canPause, - } - : { - label: "play", - icon: , - onClick: () => play(), - disabled: !canPlay, - color: "primary", - })} - /> - } - onClick={stepForward} - disabled={!canStepForward} - /> - } - onClick={() => { - stepTo(findBreakpoint()); - }} - disabled={!canStepForward} - /> - {divider} - - {(state) => ( - <> - + - {step} - - - - setStepInput(e.target.value)} - defaultValue={step} - placeholder="0" - sx={{ width: 180, border: "none" }} - slotProps={{ - input: { - sx: { fontSize: "0.875rem" }, - startAdornment: ( - Step - ), - endAdornment: ( - - } - label="Go" - size="small" - color="inherit" - disabled={ - !parsedStepInputValid || parsedStepInput === step - } - onClick={() => { - stepTo(parsedStepInput); - state.close(); - }} - /> - - ), - } - }} - /> - - - )} - - ); + setStepInput(e.target.value)} + defaultValue={step} + placeholder="0" + sx={{ width: 180, border: "none" }} + slotProps={{ + input: { + sx: { fontSize: "0.875rem" }, + startAdornment: ( + Step + ), + endAdornment: ( + + } + label="Go" + size="small" + color="inherit" + disabled={ + !parsedStepInputValid || parsedStepInput === step + } + onClick={() => { + stepTo(parsedStepInput); + state.close(); + }} + /> + + ), + }, + }} + /> + + + )} + + + ); } export function MinimisedPlaybackControls({ layer, diff --git a/client/src/components/generic/ListEditor.tsx b/client/src/components/generic/ListEditor.tsx index e44ca3f..041c8d8 100644 --- a/client/src/components/generic/ListEditor.tsx +++ b/client/src/components/generic/ListEditor.tsx @@ -1,9 +1,9 @@ import { - Add, - ClearOutlined as DeleteIcon, + AddOutlined as Add, + CloseOutlined as DeleteIcon, DragHandleOutlined, EditOutlined as EditIcon, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; import { Box, Button, diff --git a/client/src/components/generic/Modal.tsx b/client/src/components/generic/Modal.tsx index a879219..0de7bba 100644 --- a/client/src/components/generic/Modal.tsx +++ b/client/src/components/generic/Modal.tsx @@ -1,4 +1,4 @@ -import { ArrowBack } from "@mui/icons-material"; +import { ArrowBackOutlined as ArrowBack } from "@mui-symbols-material/w400"; import { AppBar, Box, diff --git a/client/src/components/generic/Overline.tsx b/client/src/components/generic/Overline.tsx index 976212d..91894d2 100644 --- a/client/src/components/generic/Overline.tsx +++ b/client/src/components/generic/Overline.tsx @@ -1,4 +1,4 @@ -import { FiberManualRecord as Dot } from "@mui/icons-material"; +import { FiberManualRecordOutlined as Dot } from "@mui-symbols-material/w400"; import { Typography as Type, TypographyProps } from "@mui/material"; import { ComponentProps, ReactNode } from "react"; diff --git a/client/src/components/generic/Snackbar.tsx b/client/src/components/generic/Snackbar.tsx index 02f9030..d51c5bf 100644 --- a/client/src/components/generic/Snackbar.tsx +++ b/client/src/components/generic/Snackbar.tsx @@ -1,4 +1,4 @@ -import { CloseOutlined as CloseIcon } from "@mui/icons-material"; +import { CloseOutlined as CloseIcon } from "@mui-symbols-material/w400"; import { Button, IconButton, Snackbar } from "@mui/material"; import { filter, noop } from "lodash"; import { Label } from "./Label"; diff --git a/client/src/components/inspector/EventInspector.tsx b/client/src/components/inspector/EventInspector.tsx index d587ed7..08a3d48 100644 --- a/client/src/components/inspector/EventInspector.tsx +++ b/client/src/components/inspector/EventInspector.tsx @@ -1,4 +1,7 @@ -import { DataObjectOutlined, FiberManualRecord } from "@mui/icons-material"; +import { + DataObjectOutlined, + FiberManualRecordFilledOutlined as FiberManualRecord, +} from "@mui-symbols-material/w400"; import { Box, Divider, diff --git a/client/src/components/inspector/FileDropZone.tsx b/client/src/components/inspector/FileDropZone.tsx index 6c23fc3..40db19a 100644 --- a/client/src/components/inspector/FileDropZone.tsx +++ b/client/src/components/inspector/FileDropZone.tsx @@ -1,4 +1,4 @@ -import { WorkspacesOutlined } from "@mui/icons-material"; +import { WorkspacesOutlined } from "@mui-symbols-material/w400"; import { Backdrop, Stack, Typography as Type } from "@mui/material"; import { useSnackbar } from "components/generic/Snackbar"; import { ORIGIN_FILESYSTEM, useWorkspace } from "hooks/useWorkspace"; diff --git a/client/src/components/inspector/Placeholder.tsx b/client/src/components/inspector/Placeholder.tsx index 2a1e0ab..deb4edb 100644 --- a/client/src/components/inspector/Placeholder.tsx +++ b/client/src/components/inspector/Placeholder.tsx @@ -1,4 +1,4 @@ -import { WidgetsOutlined } from "@mui/icons-material"; +import { WidgetsOutlined } from "@mui-symbols-material/w400"; import { Box, Typography as Type } from "@mui/material"; import { Flex, FlexProps } from "components/generic/Flex"; import { ReactElement, ReactNode } from "react"; diff --git a/client/src/components/inspector/TraceRenderer.tsx b/client/src/components/inspector/TraceRenderer.tsx index 05445cf..27ebdfe 100644 --- a/client/src/components/inspector/TraceRenderer.tsx +++ b/client/src/components/inspector/TraceRenderer.tsx @@ -1,7 +1,7 @@ import { BlurOnOutlined as DisabledIcon, ViewInArOutlined, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; import { Box, CircularProgress, useTheme } from "@mui/material"; import { RendererProps, SelectEvent } from "components/renderer/Renderer"; import { usePlaybackState } from "hooks/usePlaybackState"; diff --git a/client/src/components/inspector/TrustedContent.tsx b/client/src/components/inspector/TrustedContent.tsx index d80fe24..a6739ca 100644 --- a/client/src/components/inspector/TrustedContent.tsx +++ b/client/src/components/inspector/TrustedContent.tsx @@ -2,7 +2,7 @@ import { CheckOutlined, DoneAllOutlined, ShieldOutlined, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; import { Link, Stack } from "@mui/material"; import { ReactNode } from "react"; import { Placeholder } from "./Placeholder"; diff --git a/client/src/components/inspector/ViewControls.tsx b/client/src/components/inspector/ViewControls.tsx index 025cdb6..5f8392a 100644 --- a/client/src/components/inspector/ViewControls.tsx +++ b/client/src/components/inspector/ViewControls.tsx @@ -4,7 +4,7 @@ import { MoreVertOutlined as MoreIcon, OpenInNewOutlined as PopOutIcon, ViewAgendaOutlined as SplitIcon, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; import { Box, Divider, diff --git a/client/src/components/inspector/ViewTree.tsx b/client/src/components/inspector/ViewTree.tsx index c0cab00..bf250f6 100644 --- a/client/src/components/inspector/ViewTree.tsx +++ b/client/src/components/inspector/ViewTree.tsx @@ -1,5 +1,5 @@ import Split, { SplitDirection } from "@devbookhq/splitter"; -import { DragIndicatorOutlined } from "@mui/icons-material"; +import { DragIndicatorOutlined } from "@mui-symbols-material/w400"; import { Box, useTheme } from "@mui/material"; import { Flex } from "components/generic/Flex"; import { diff --git a/client/src/components/layer-editor/LayerListEditor.tsx b/client/src/components/layer-editor/LayerListEditor.tsx index 2e88be0..bf3596d 100644 --- a/client/src/components/layer-editor/LayerListEditor.tsx +++ b/client/src/components/layer-editor/LayerListEditor.tsx @@ -1,4 +1,4 @@ -import { MoreVertOutlined } from "@mui/icons-material"; +import { MoreVertOutlined } from "@mui-symbols-material/w400"; import { Box, IconButton, Menu, MenuItem, MenuList } from "@mui/material"; import { ListEditor } from "components/generic/ListEditor"; import { head, map } from "lodash"; diff --git a/client/src/components/settings-editor/RendererEditor.tsx b/client/src/components/settings-editor/RendererEditor.tsx index 6f590e5..7c754d0 100644 --- a/client/src/components/settings-editor/RendererEditor.tsx +++ b/client/src/components/settings-editor/RendererEditor.tsx @@ -1,4 +1,4 @@ -import { EditOutlined as EditIcon } from "@mui/icons-material"; +import { EditOutlined as EditIcon } from "@mui-symbols-material/w400"; import { Box, Chip, diff --git a/client/src/components/settings-editor/RendererListEditor.tsx b/client/src/components/settings-editor/RendererListEditor.tsx index 9414795..dca588a 100644 --- a/client/src/components/settings-editor/RendererListEditor.tsx +++ b/client/src/components/settings-editor/RendererListEditor.tsx @@ -1,4 +1,4 @@ -import { ReplayOutlined as ResetIcon } from "@mui/icons-material"; +import { ReplayOutlined as ResetIcon } from "@mui-symbols-material/w400"; import { Box } from "@mui/material"; import { defaultTransport } from "client"; import { FeaturePickerButton } from "components/app-bar/FeaturePickerButton"; diff --git a/client/src/components/settings-editor/ServerListEditor.tsx b/client/src/components/settings-editor/ServerListEditor.tsx index 4c6a0de..ecddd4f 100644 --- a/client/src/components/settings-editor/ServerListEditor.tsx +++ b/client/src/components/settings-editor/ServerListEditor.tsx @@ -1,4 +1,4 @@ -import { ReplayOutlined as ResetIcon } from "@mui/icons-material"; +import { ReplayOutlined as ResetIcon } from "@mui-symbols-material/w400"; import { Box } from "@mui/material"; import { defaultTransport } from "client"; import { FeaturePickerButton } from "components/app-bar/FeaturePickerButton"; diff --git a/client/src/components/title-bar/ExportWorkspaceModal.tsx b/client/src/components/title-bar/ExportWorkspaceModal.tsx index 986eab5..d232c42 100644 --- a/client/src/components/title-bar/ExportWorkspaceModal.tsx +++ b/client/src/components/title-bar/ExportWorkspaceModal.tsx @@ -1,4 +1,4 @@ -import { DownloadOutlined } from "@mui/icons-material"; +import { DownloadOutlined } from "@mui-symbols-material/w400"; import { Box, Stack, TextField, Typography } from "@mui/material"; import { Button } from "components/generic/Button"; import Modal, { ModalAppBar } from "components/generic/Modal"; diff --git a/client/src/components/title-bar/TitleBar.tsx b/client/src/components/title-bar/TitleBar.tsx index 487a4b9..0aac766 100644 --- a/client/src/components/title-bar/TitleBar.tsx +++ b/client/src/components/title-bar/TitleBar.tsx @@ -2,7 +2,7 @@ import { OpenInNewOutlined, SearchOutlined, WorkspacesOutlined, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; import { Box, ButtonBase, @@ -183,195 +183,197 @@ export const TitleBar = () => { }); } - return (<> - `1px solid ${t.palette.background.default}`, - minHeight: 36, - paddingLeft: "env(titlebar-area-x, 0px)", - height: visible ? "env(titlebar-area-height, 50px)" : 0, - width: "env(titlebar-area-width, 100%)", - WebkitAppRegion: "drag", - overflowX: "auto", - }} - > - - - - {(!visible || rect.x === 0) && ( - // Hide for macos style windows - ( - - ) - )} - {} - {[ - { - key: "view", - items: [ - { - disabled: !canOpenWindows, - key: "panel-new-window", - type: "action", - name: "New window", - action: () => openWindow(), - }, - { type: "divider" }, - { - type: "action", - key: `panel-new-right`, - name: "Add view to the right", - action: () => handleOpenPanel("horizontal"), - }, - { - type: "action", - key: `panel-new-bottom`, - name: "Add view below", - action: () => handleOpenPanel("vertical"), - }, - { type: "divider" }, - { - type: "action", - name: "Reset layout", - key: "panel-reset", - action: () => setView(getDefaultViewTree), - }, - { - type: "action", - name: "Reload window", - key: "panel-reload", - action: () => location.reload(), - }, - // { - // type: "action", - // name: "New workspace", - // action: () => - // openWindow({ linked: false, minimal: false }), - // }, - ], - }, - { - key: "workspace", - items: [ - { - type: "action", - name: "Open workspace", - key: "workspace-load", - action: load, - }, - { - type: "action", - name: "Save workspace", - key: "workspace-save", - action: save, - }, - { type: "divider" }, - { - type: "action", - name: ( - } - /> - ), - key: "workspace-save-metadata", - action: () => setExportModalOpen(true), - }, - ], - }, - { - key: "help", - items: [ - { - type: "action", - name: "Open repository in GitHub", - key: "github", - action: () => open(repository, "_blank"), - }, - { - type: "action", - name: "Changelog", - key: "changelog", - action: () => open(`${changelog}/${version}`, "_blank"), - }, - { - type: "action", - name: "Documentation", - key: "documentation", - action: () => open(docs, "_blank"), - }, - ], - }, - ].map(({ key, items }) => ( - - {(state) => ( - <> - - - {items.map((item, i) => { - if (item.type === "action") { - const { name, key, action } = item; - return ( - { - action?.(); - state.close(); - }} - > - {name} - - ); - } else { - return ; - } - })} - - - - {startCase(key)} - - - )} - - ))} - {/* + return ( + <> + `1px solid ${t.palette.background.default}`, + minHeight: 36, + paddingLeft: "env(titlebar-area-x, 0px)", + height: visible ? "env(titlebar-area-height, 50px)" : 0, + width: "env(titlebar-area-width, 100%)", + WebkitAppRegion: "drag", + overflowX: "auto", + }} + > + + + + {(!visible || rect.x === 0) && ( + // Hide for macos style windows + + + + )} + {} + {[ + { + key: "view", + items: [ + { + disabled: !canOpenWindows, + key: "panel-new-window", + type: "action", + name: "New window", + action: () => openWindow(), + }, + { type: "divider" }, + { + type: "action", + key: `panel-new-right`, + name: "Add view to the right", + action: () => handleOpenPanel("horizontal"), + }, + { + type: "action", + key: `panel-new-bottom`, + name: "Add view below", + action: () => handleOpenPanel("vertical"), + }, + { type: "divider" }, + { + type: "action", + name: "Reset layout", + key: "panel-reset", + action: () => setView(getDefaultViewTree), + }, + { + type: "action", + name: "Reload window", + key: "panel-reload", + action: () => location.reload(), + }, + // { + // type: "action", + // name: "New workspace", + // action: () => + // openWindow({ linked: false, minimal: false }), + // }, + ], + }, + { + key: "workspace", + items: [ + { + type: "action", + name: "Open workspace", + key: "workspace-load", + action: load, + }, + { + type: "action", + name: "Save workspace", + key: "workspace-save", + action: save, + }, + { type: "divider" }, + { + type: "action", + name: ( + } + /> + ), + key: "workspace-save-metadata", + action: () => setExportModalOpen(true), + }, + ], + }, + { + key: "help", + items: [ + { + type: "action", + name: "Open repository in GitHub", + key: "github", + action: () => open(repository, "_blank"), + }, + { + type: "action", + name: "Changelog", + key: "changelog", + action: () => open(`${changelog}/${version}`, "_blank"), + }, + { + type: "action", + name: "Documentation", + key: "documentation", + action: () => open(docs, "_blank"), + }, + ], + }, + ].map(({ key, items }) => ( + + {(state) => ( + <> + + + {items.map((item, i) => { + if (item.type === "action") { + const { name, key, action } = item; + return ( + { + action?.(); + state.close(); + }} + > + {name} + + ); + } else { + return ; + } + })} + + + + {startCase(key)} + + + )} + + ))} + {/* */} - - - - - setExportModalOpen(false)} - /> - ); + + + + + setExportModalOpen(false)} + /> + + ); }; export function CommandsButton() { diff --git a/client/src/layers/map/index.tsx b/client/src/layers/map/index.tsx index 2274c3a..08cd9a3 100644 --- a/client/src/layers/map/index.tsx +++ b/client/src/layers/map/index.tsx @@ -1,4 +1,4 @@ -import { MapTwoTone } from "@mui/icons-material"; +import { MapOutlined } from "@mui-symbols-material/w400"; import { CircularProgress, Typography } from "@mui/material"; import { MapPicker } from "components/app-bar/Input"; import { custom, readUploadedMap } from "components/app-bar/upload"; @@ -40,7 +40,7 @@ export type MapLayer = Layer; export const controller = { key: "map", - icon: , + icon: , inferName: (layer) => layer?.source?.map ? `${layer.source.map.name} (${startCase(layer.source.map.format)})` diff --git a/client/src/layers/query/index.tsx b/client/src/layers/query/index.tsx index 28d0e2b..c6d916b 100644 --- a/client/src/layers/query/index.tsx +++ b/client/src/layers/query/index.tsx @@ -1,10 +1,10 @@ import { CodeOutlined, - PlaceOutlined as DestinationIcon, + LocationOnOutlined as DestinationIcon, LayersOutlined, - RouteTwoTone, + RouteOutlined, TripOriginOutlined as StartIcon, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; import { Box, Typography as Type } from "@mui/material"; import { FeaturePicker } from "components/app-bar/FeaturePicker"; import { useSnackbar } from "components/generic/Snackbar"; @@ -70,7 +70,7 @@ const maxStringPropLength = 40; export const controller = { ...omit(traceController, "claimImportedFile"), key: "query", - icon: , + icon: , compress: (layer) => pick(layer, [ "mapLayerKey", diff --git a/client/src/layers/trace/index.tsx b/client/src/layers/trace/index.tsx index e2a8592..3cff2ff 100644 --- a/client/src/layers/trace/index.tsx +++ b/client/src/layers/trace/index.tsx @@ -1,8 +1,8 @@ import { ArrowOutwardRounded, DataObjectOutlined, - RouteTwoTone, -} from "@mui/icons-material"; + RouteOutlined, +} from "@mui-symbols-material/w400"; import { Box, ListItemIcon, @@ -165,7 +165,7 @@ export type TraceLayer = Layer; export const controller = { key: "trace", - icon: , + icon: , inferName: (layer) => layer.source?.trace?.name ?? "Untitled Trace", error: (layer) => layer?.source?.trace?.error || layer?.source?.parsedTrace?.error, diff --git a/client/src/pages/DebugPage.tsx b/client/src/pages/DebugPage.tsx index d7ae490..cf8c11a 100644 --- a/client/src/pages/DebugPage.tsx +++ b/client/src/pages/DebugPage.tsx @@ -1,7 +1,7 @@ import { BugReportOutlined, LayersOutlined as LayersIcon, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; import { TabContext, TabList, TabPanel } from "@mui/lab"; import { Box, Divider, Tab, Typography as Type } from "@mui/material"; import { FeaturePicker } from "components/app-bar/FeaturePicker"; diff --git a/client/src/pages/ExplorePage.tsx b/client/src/pages/ExplorePage.tsx index 58a5a0f..0738132 100644 --- a/client/src/pages/ExplorePage.tsx +++ b/client/src/pages/ExplorePage.tsx @@ -1,8 +1,8 @@ import { - LaunchOutlined, + RocketLaunchOutlined as LaunchOutlined, SearchOutlined, WorkspacesOutlined, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; import { TabContext, TabList, TabPanel } from "@mui/lab"; import { Avatar, @@ -373,7 +373,7 @@ export function ExplorePage({ template: Page }: PageContentProps) { } return ( - ( + Explore explore @@ -436,7 +436,7 @@ export function ExplorePage({ template: Page }: PageContentProps) { ), - } + }, }} /> @@ -521,6 +521,6 @@ export function ExplorePage({ template: Page }: PageContentProps) { {controls} - ) + ); } diff --git a/client/src/pages/InfoPage.tsx b/client/src/pages/InfoPage.tsx index b76433a..7b5595f 100644 --- a/client/src/pages/InfoPage.tsx +++ b/client/src/pages/InfoPage.tsx @@ -1,4 +1,4 @@ -import { CloseOutlined, ListOutlined } from "@mui/icons-material"; +import { CloseOutlined, ListOutlined } from "@mui-symbols-material/w400"; import { Divider, List, ListItem, ListItemText } from "@mui/material"; import { FeaturePickerButton } from "components/app-bar/FeaturePickerButton"; import { Flex } from "components/generic/Flex"; diff --git a/client/src/pages/Page.tsx b/client/src/pages/Page.tsx index 1591f74..c88723a 100644 --- a/client/src/pages/Page.tsx +++ b/client/src/pages/Page.tsx @@ -1,20 +1,15 @@ -import { - ErrorOutlineOutlined, - SentimentDissatisfiedOutlined, - WidgetsOutlined, -} from "@mui/icons-material"; +import { ErrorOutlined, WidgetsOutlined } from "@mui-symbols-material/w400"; import { Box, Divider, Stack } from "@mui/material"; import { FeaturePicker } from "components/app-bar/FeaturePicker"; -import { Button } from "components/generic/Button"; import { Flex } from "components/generic/Flex"; import { Scroll } from "components/generic/Scrollbars"; import { Space } from "components/generic/Space"; import { Placeholder } from "components/inspector/Placeholder"; +import { withSlots } from "components/withSlots"; import { values } from "lodash"; import { pages } from "pages"; import React, { ReactNode } from "react"; import { ErrorBoundary } from "react-error-boundary"; -import { withSlots } from "components/withSlots"; import { PanelState } from "slices/view"; import { useAcrylic } from "theme"; @@ -96,7 +91,7 @@ export const Page = withSlots( } + icon={} /> )} diff --git a/client/src/pages/PageMeta.tsx b/client/src/pages/PageMeta.tsx index fcc24d6..d988671 100644 --- a/client/src/pages/PageMeta.tsx +++ b/client/src/pages/PageMeta.tsx @@ -11,6 +11,7 @@ export type PageMeta = { id: string; name: string; icon: ReactElement; + iconThin?: ReactElement; color?: AccentColor; description?: string; content: (props: PageContentProps) => ReactNode; diff --git a/client/src/pages/RecipesPage.tsx b/client/src/pages/RecipesPage.tsx index c05d9bf..f39c85f 100644 --- a/client/src/pages/RecipesPage.tsx +++ b/client/src/pages/RecipesPage.tsx @@ -1,4 +1,4 @@ -import { WorkspacesOutlined } from "@mui/icons-material"; +import { WorkspacesOutlined } from "@mui-symbols-material/w400"; import { Box, CircularProgress, diff --git a/client/src/pages/SettingsPage.tsx b/client/src/pages/SettingsPage.tsx index 4a5f772..ed1581b 100644 --- a/client/src/pages/SettingsPage.tsx +++ b/client/src/pages/SettingsPage.tsx @@ -1,4 +1,4 @@ -import { RestartAltOutlined } from "@mui/icons-material"; +import { RestartAltOutlined } from "@mui-symbols-material/w400"; import { TabContext, TabList, TabPanel } from "@mui/lab"; import { Box, @@ -338,7 +338,7 @@ export function TrustedOriginListEditor() { // // ))} // - ( + - ) + ); } export function MapParserListEditor() { @@ -374,7 +374,7 @@ export function MapParserListEditor() { // // ))} // - ( + button={false} sortable @@ -395,6 +395,6 @@ export function MapParserListEditor() { key: "", })} /> - ) + ); } diff --git a/client/src/pages/SidebarPage.tsx b/client/src/pages/SidebarPage.tsx index d132de1..10ad5a1 100644 --- a/client/src/pages/SidebarPage.tsx +++ b/client/src/pages/SidebarPage.tsx @@ -1,4 +1,4 @@ -import { FullscreenOutlined } from "@mui/icons-material"; +import { FullscreenOutlined } from "@mui-symbols-material/w400"; import { Box, Typography } from "@mui/material"; import { useSidebarBackground } from "Sidebar"; import { Flex } from "components/generic/Flex"; diff --git a/client/src/pages/SourcePage.tsx b/client/src/pages/SourcePage.tsx index 50f7e44..90b7192 100644 --- a/client/src/pages/SourcePage.tsx +++ b/client/src/pages/SourcePage.tsx @@ -1,5 +1,5 @@ import { Editor } from "@monaco-editor/react"; -import { CodeOutlined } from "@mui/icons-material"; +import { CodeOutlined } from "@mui-symbols-material/w400"; import { CircularProgress, Tab, Tabs, useTheme } from "@mui/material"; import { Flex } from "components/generic/Flex"; import { Placeholder } from "components/inspector/Placeholder"; diff --git a/client/src/pages/StepsPage.tsx b/client/src/pages/StepsPage.tsx index 74c78dd..e7f78ce 100644 --- a/client/src/pages/StepsPage.tsx +++ b/client/src/pages/StepsPage.tsx @@ -2,7 +2,7 @@ import { FiberManualRecordOutlined, LayersOutlined as LayersIcon, SegmentOutlined, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; import { Box, Divider, Stack, SxProps, Theme, useTheme } from "@mui/material"; import { grey } from "@mui/material/colors"; import { FeaturePicker } from "components/app-bar/FeaturePicker"; diff --git a/client/src/pages/TreePage.tsx b/client/src/pages/TreePage.tsx index 4a45c82..5dd6729 100644 --- a/client/src/pages/TreePage.tsx +++ b/client/src/pages/TreePage.tsx @@ -1,12 +1,14 @@ import { AccountTreeOutlined, - CenterFocusWeakOutlined, DataObjectOutlined, LayersOutlined as LayersIcon, ModeStandbyOutlined, - FlipCameraAndroidOutlined as RotateIcon, TimelineOutlined, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; +import { + CenterFocusWeakOutlined, + FlipCameraAndroidOutlined as RotateIcon, +} from "@mui-symbols-material/w300"; import { Box, CircularProgress, diff --git a/client/src/pages/ViewportPage.tsx b/client/src/pages/ViewportPage.tsx index 402fb29..19127f4 100644 --- a/client/src/pages/ViewportPage.tsx +++ b/client/src/pages/ViewportPage.tsx @@ -1,10 +1,12 @@ import { BlurCircularOutlined, + LayersOutlined, +} from "@mui-symbols-material/w400"; +import { CameraOutlined, CenterFocusWeakOutlined, - LayersOutlined, TimesOneMobiledataOutlined, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w300"; import { Box, Divider, Stack, SxProps, Theme } from "@mui/material"; import { FeaturePicker } from "components/app-bar/FeaturePicker"; import { FeaturePickerMulti } from "components/app-bar/FeaturePickerMulti"; diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx index 3bde5d7..08c5782 100644 --- a/client/src/pages/index.tsx +++ b/client/src/pages/index.tsx @@ -1,15 +1,25 @@ +import { + CodeOutlined as CodeOutlinedThin, + BugReportOutlined as DebuggerIconThin, + LayersOutlined as LayersIconThin, + ListOutlined as ListOutlinedThin, + RocketLaunchOutlined as RocketIconThin, + SettingsOutlined as SettingsIconThin, + SegmentOutlined as StepsIconThin, + AccountTreeOutlined as TreeIconThin, + ViewInArOutlined as ViewportIconThin, +} from "@mui-symbols-material/w300"; import { CodeOutlined, BugReportOutlined as DebuggerIcon, LayersOutlined as LayersIcon, ListOutlined, - CodeOutlined as LogsIcon, RocketLaunchOutlined as RocketIcon, SettingsOutlined as SettingsIcon, SegmentOutlined as StepsIcon, AccountTreeOutlined as TreeIcon, ViewInArOutlined as ViewportIcon, -} from "@mui/icons-material"; +} from "@mui-symbols-material/w400"; import { Dictionary } from "lodash"; import { DebugPage } from "./DebugPage"; import { ExplorePage } from "./ExplorePage"; @@ -17,10 +27,10 @@ import { InfoPage } from "./InfoPage"; import { LayersPage } from "./LayersPage"; import { PageMeta } from "./PageMeta"; import { SettingsPage } from "./SettingsPage"; +import { SourcePage } from "./SourcePage"; import { StepsPage } from "./StepsPage"; import { TreePage } from "./TreePage"; import { ViewportPage } from "./ViewportPage"; -import { SourcePage } from "./SourcePage"; export const pages: Dictionary = { explore: { @@ -29,6 +39,7 @@ export const pages: Dictionary = { color: "deepOrange", description: "Browse examples and guides", icon: , + iconThin: , content: ExplorePage, allowFullscreen: true, showInSidebar: "always", @@ -39,6 +50,7 @@ export const pages: Dictionary = { description: "", color: "pink", icon: , + iconThin: , content: LayersPage, allowFullscreen: true, showInSidebar: "mobile-only", @@ -49,6 +61,7 @@ export const pages: Dictionary = { description: "", color: "pink", icon: , + iconThin: , content: StepsPage, allowFullscreen: true, }, @@ -58,6 +71,7 @@ export const pages: Dictionary = { description: "", color: "deepPurple", icon: , + iconThin: , content: ViewportPage, allowFullscreen: true, }, @@ -67,6 +81,7 @@ export const pages: Dictionary = { description: "", color: "deepPurple", icon: , + iconThin: , content: TreePage, allowFullscreen: true, }, @@ -76,6 +91,7 @@ export const pages: Dictionary = { description: "", color: "deepPurple", icon: , + iconThin: , content: SourcePage, allowFullscreen: true, showInSidebar: "mobile-only", @@ -86,6 +102,7 @@ export const pages: Dictionary = { description: "", color: "indigo", icon: , + iconThin: , content: DebugPage, allowFullscreen: true, showInSidebar: "mobile-only", @@ -96,6 +113,7 @@ export const pages: Dictionary = { description: "", color: "grey", icon: , + iconThin: , content: InfoPage, allowFullscreen: true, }, @@ -105,6 +123,7 @@ export const pages: Dictionary = { description: "", color: "grey", icon: , + iconThin: , content: SettingsPage, allowFullscreen: true, showInSidebar: "always", diff --git a/client/src/public/manifest.json b/client/src/public/manifest.json index adfdb3c..380a826 100644 --- a/client/src/public/manifest.json +++ b/client/src/public/manifest.json @@ -1,9 +1,9 @@ { "short_name": "Posthoc", "name": "Posthoc", - "version": "1.2.5-4", + "version": "1.2.5-5", "description": "Understand sequential decision-making through visualisation.", - "version_name": "1.2.5-4; mid November 2024", + "version_name": "1.2.5-5; mid November 2024", "repository": "https://github.com/ShortestPathLab/posthoc-app", "changelog": "http://posthoc.pathfinding.ai/blog", "docs": "https://posthoc.pathfinding.ai/docs/overview",