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.

Sign up for GitHub

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

Jump to bottom

fix(web-ui): use theme colors in suspended loading screen #921

Merged
merged 1 commit into from
Jul 21, 2024
Merged

fix(web-ui): use theme colors in suspended loading screen #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions services/web-ui/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ import { QUERY_CLIENT } from "./queryQlient";

export function App(): ReactElement {
return (
<Suspense fallback={<LoadingView />}>
<QueryClientProvider client={QUERY_CLIENT}>
<ThemeProvider>
<QueryClientProvider client={QUERY_CLIENT}>
<ThemeProvider>
<Suspense fallback={<LoadingView />}>
<AuthenticationGuard>
<NotificationProvider>
<Router />
<SnackbarProvider dense />
</NotificationProvider>
</AuthenticationGuard>
</ThemeProvider>
</QueryClientProvider>
</Suspense>
</Suspense>
</ThemeProvider>
</QueryClientProvider>
);
}
2 changes: 1 addition & 1 deletion services/web-ui/src/pages/AuthenticationGuard/AuthenticationGuard.nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export interface AuthenticationGuardNavProps {
export function AuthenticationGuardNav({
children,
}: AuthenticationGuardNavProps): React.ReactElement {
return <Box sx={{ p: 3, height: "100vh" }}>{children}</Box>;
return <Box sx={{ height: "100vh" }}>{children}</Box>;
}
20 changes: 4 additions & 16 deletions services/web-ui/src/pages/ProfileGuard/ProfileGuard.nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
import React from "react";
import { ReactNode } from "react";

import { Box, Container, Toolbar } from "@mui/material";

import { AppBar } from "src/components/nav/AppBar";
import { Box } from "@mui/material";

interface ProfileGuardNavProps {
children: React.ReactNode;
children: ReactNode;
}

export function ProfileGuardNav({
children,
}: ProfileGuardNavProps): React.ReactElement {
return (
<Box sx={{ display: "flex", height: "100vh" }}>
<AppBar />
<Box component="main" sx={{ flexGrow: 1, p: 3, pt: 1, height: "100%" }}>
<Toolbar />
<Container maxWidth="md" sx={{ height: "100%" }}>
{children}
</Container>
</Box>
</Box>
);
return <Box sx={{ height: "100vh" }}>{children}</Box>;
}
Loading