-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
5e779a2
commit f98d846
Showing
66 changed files
with
4,673 additions
and
4,679 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,119 +1,119 @@ | ||
| import { | ||
| CircularProgress, | ||
| CssBaseline, | ||
| Fade, | ||
| Stack, | ||
| ThemeProvider, | ||
| useTheme, | ||
| } from "@mui/material"; | ||
| import { Flex } from "components/generic/Flex"; | ||
| import { SnackbarProvider } from "components/generic/Snackbar"; | ||
| import { Inspector } from "components/inspector"; | ||
| import { Placeholder } from "components/inspector/Placeholder"; | ||
| import { TitleBar, TitleBarPlaceholder } from "components/title-bar/TitleBar"; | ||
| import { useTitleBar } from "hooks/useTitleBar"; | ||
| import { Image } from "pages/Image"; | ||
| import logo from "public/logo192.png"; | ||
| import { useMemo } from "react"; | ||
| import { BootstrapService } from "services/BootstrapService"; | ||
| import { ConnectionsService } from "services/ConnectionsService"; | ||
| import { FeaturesService } from "services/FeaturesService"; | ||
| import { LayerService } from "services/LayerService"; | ||
| import { LogCaptureService } from "services/LogCaptureService"; | ||
| import { RendererService } from "services/RendererService"; | ||
| import { SettingsService } from "services/SettingsService"; | ||
| import { minimal } from "services/SyncParticipant"; | ||
| import { SyncService, useSyncStatus } from "services/SyncService"; | ||
| import { SliceProvider as EnvironmentProvider } from "slices/SliceProvider"; | ||
| import { useSettings } from "slices/settings"; | ||
| import { makeTheme } from "theme"; | ||
|
|
||
| const services = [ | ||
| SyncService, | ||
| ConnectionsService, | ||
| FeaturesService, | ||
| RendererService, | ||
| LayerService, | ||
| LogCaptureService, | ||
| SettingsService, | ||
| BootstrapService, | ||
| ]; | ||
|
|
||
| function App() { | ||
| const { palette } = useTheme(); | ||
| const color = palette.background.default; | ||
| const { loading } = useSyncStatus(); | ||
|
|
||
| return ( | ||
| <Flex | ||
| vertical | ||
| sx={{ | ||
| bgcolor: color, | ||
| color: "text.primary", | ||
| WebkitAppRegion: "no-drag", | ||
| }} | ||
| > | ||
| {!loading ? ( | ||
| <> | ||
| <TitleBar /> | ||
| <Flex flex={1}> | ||
| <Inspector flex={1} /> | ||
| </Flex> | ||
| </> | ||
| ) : minimal ? ( | ||
| <Fade in> | ||
| <Stack | ||
| sx={{ | ||
| WebkitAppRegion: "drag", | ||
| background: (t) => t.palette.background.paper, | ||
| width: "100vw", | ||
| height: "100dvh", | ||
| }} | ||
| > | ||
| <TitleBarPlaceholder /> | ||
| <Placeholder icon={<CircularProgress />} /> | ||
| </Stack> | ||
| </Fade> | ||
| ) : ( | ||
| <Fade in> | ||
| <Stack | ||
| sx={{ | ||
| WebkitAppRegion: "drag", | ||
| width: "100vw", | ||
| height: "100dvh", | ||
| alignItems: "center", | ||
| justifyContent: "center", | ||
| gap: 6, | ||
| }} | ||
| > | ||
| <Image src={logo} style={{ height: 64, width: 64 }} /> | ||
| <CircularProgress /> | ||
| </Stack> | ||
| </Fade> | ||
| )} | ||
| </Flex> | ||
| ); | ||
| } | ||
|
|
||
| function ThemedApp() { | ||
| const [ | ||
| { | ||
| "appearance/theme": mode = "dark", | ||
| "appearance/accentColor": accent = "teal", | ||
| }, | ||
| ] = useSettings(); | ||
| const theme = useMemo(() => makeTheme(mode, accent), [mode, accent]); | ||
| return ( | ||
| <ThemeProvider theme={theme}> | ||
| <CssBaseline> | ||
| <SnackbarProvider> | ||
| <EnvironmentProvider services={services}> | ||
| <App /> | ||
| </EnvironmentProvider> | ||
| </SnackbarProvider> | ||
| </CssBaseline> | ||
| </ThemeProvider> | ||
| ); | ||
| } | ||
|
|
||
| export default ThemedApp; | ||
| import { | ||
| CircularProgress, | ||
| CssBaseline, | ||
| Fade, | ||
| Stack, | ||
| ThemeProvider, | ||
| useTheme, | ||
| } from "@mui/material"; | ||
| import { Flex } from "components/generic/Flex"; | ||
| import { SnackbarProvider } from "components/generic/Snackbar"; | ||
| import { Inspector } from "components/inspector"; | ||
| import { Placeholder } from "components/inspector/Placeholder"; | ||
| import { TitleBar, TitleBarPlaceholder } from "components/title-bar/TitleBar"; | ||
| import { useTitleBar } from "hooks/useTitleBar"; | ||
| import { Image } from "pages/Image"; | ||
| import logo from "public/logo192.png"; | ||
| import { useMemo } from "react"; | ||
| import { BootstrapService } from "services/BootstrapService"; | ||
| import { ConnectionsService } from "services/ConnectionsService"; | ||
| import { FeaturesService } from "services/FeaturesService"; | ||
| import { LayerService } from "services/LayerService"; | ||
| import { LogCaptureService } from "services/LogCaptureService"; | ||
| import { RendererService } from "services/RendererService"; | ||
| import { SettingsService } from "services/SettingsService"; | ||
| import { minimal } from "services/SyncParticipant"; | ||
| import { SyncService, useSyncStatus } from "services/SyncService"; | ||
| import { SliceProvider as EnvironmentProvider } from "slices/SliceProvider"; | ||
| import { useSettings } from "slices/settings"; | ||
| import { makeTheme } from "theme"; | ||
|
|
||
| const services = [ | ||
| SyncService, | ||
| ConnectionsService, | ||
| FeaturesService, | ||
| RendererService, | ||
| LayerService, | ||
| LogCaptureService, | ||
| SettingsService, | ||
| BootstrapService, | ||
| ]; | ||
|
|
||
| function App() { | ||
| const { palette } = useTheme(); | ||
| const color = palette.background.default; | ||
| const { loading } = useSyncStatus(); | ||
|
|
||
| return ( | ||
| <Flex | ||
| vertical | ||
| sx={{ | ||
| bgcolor: color, | ||
| color: "text.primary", | ||
| WebkitAppRegion: "no-drag", | ||
| }} | ||
| > | ||
| {!loading ? ( | ||
| <> | ||
| <TitleBar /> | ||
| <Flex flex={1}> | ||
| <Inspector flex={1} /> | ||
| </Flex> | ||
| </> | ||
| ) : minimal ? ( | ||
| <Fade in> | ||
| <Stack | ||
| sx={{ | ||
| WebkitAppRegion: "drag", | ||
| background: (t) => t.palette.background.paper, | ||
| width: "100vw", | ||
| height: "100dvh", | ||
| }} | ||
| > | ||
| <TitleBarPlaceholder /> | ||
| <Placeholder icon={<CircularProgress />} /> | ||
| </Stack> | ||
| </Fade> | ||
| ) : ( | ||
| <Fade in> | ||
| <Stack | ||
| sx={{ | ||
| WebkitAppRegion: "drag", | ||
| width: "100vw", | ||
| height: "100dvh", | ||
| alignItems: "center", | ||
| justifyContent: "center", | ||
| gap: 6, | ||
| }} | ||
| > | ||
| <Image src={logo} style={{ height: 64, width: 64 }} /> | ||
| <CircularProgress /> | ||
| </Stack> | ||
| </Fade> | ||
| )} | ||
| </Flex> | ||
| ); | ||
| } | ||
|
|
||
| function ThemedApp() { | ||
| const [ | ||
| { | ||
| "appearance/theme": mode = "dark", | ||
| "appearance/accentColor": accent = "teal", | ||
| }, | ||
| ] = useSettings(); | ||
| const theme = useMemo(() => makeTheme(mode, accent), [mode, accent]); | ||
| return ( | ||
| <ThemeProvider theme={theme}> | ||
| <CssBaseline> | ||
| <SnackbarProvider> | ||
| <EnvironmentProvider services={services}> | ||
| <App /> | ||
| </EnvironmentProvider> | ||
| </SnackbarProvider> | ||
| </CssBaseline> | ||
| </ThemeProvider> | ||
| ); | ||
| } | ||
|
|
||
| export default ThemedApp; |
Oops, something went wrong.