3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-14 00:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

userinfo: fix logout button, add sign out confirm page (#3058)

Browse source 
* userinfo: fix logout button, add sign out confirm page

* fix test
This commit is contained in:
Caleb Doxsey 2022-02-23 08:15:00 -07:00 • committed by GitHub
parent 9300208e87
commit 38c7089642
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 251 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ui/src/App.tsx
View file

@ -2,16 +2,17 @@ import DeviceEnrolledPage from "./components/DeviceEnrolledPage";
import ErrorPage from "./components/ErrorPage";
import Footer from "./components/Footer";
import Header from "./components/Header";
import SignOutConfirmPage from "./components/SignOutConfirmPage";
import { ToolbarOffset } from "./components/ToolbarOffset";
import UserInfoPage from "./components/UserInfoPage";
import WebAuthnRegistrationPage from "./components/WebAuthnRegistrationPage";
import { SubpageContextProvider } from "./context/Subpage";
import { createTheme } from "./theme";
import { PageData } from "./types";
import Box from "@mui/material/Box";
import CssBaseline from "@mui/material/CssBaseline";
import { ThemeProvider } from "@mui/material/styles";
import React, { FC } from "react";
import {ToolbarOffset} from "./components/ToolbarOffset";
import Box from "@mui/material/Box";
import {SubpageContextProvider} from "./context/Subpage";
const theme = createTheme();
@ -25,6 +26,9 @@ const App: FC = () => {
case "Error":
body = <ErrorPage data={data} />;
break;
case "SignOutConfirm":
body = <SignOutConfirmPage data={data} />;
break;
case "UserInfo":
body = <UserInfoPage data={data} />;
break;
@ -36,15 +40,16 @@ const App: FC = () => {
<ThemeProvider theme={theme}>
<CssBaseline />
<SubpageContextProvider>
<Header
includeSidebar={data?.page === "UserInfo"}
data={data}
/>
<Header includeSidebar={data?.page === "UserInfo"} data={data} />
<ToolbarOffset />
<Box
sx={{overflow: 'hidden', height: 'calc(100vh - 120px)'}}
>
<Box sx={{overflow: 'auto', height: '100%', paddingTop: theme.spacing(5)}}>
<Box sx={{ overflow: "hidden", height: "calc(100vh - 120px)" }}>
<Box
sx={{
overflow: "auto",
height: "100%",
paddingTop: theme.spacing(5),
}}
>
{body}
<ToolbarOffset />
</Box>