Skip to content

Commit

Permalink
Showing 2 changed files with 12 additions and 3 deletions.
5 changes: 3 additions & 2 deletions client/src/core/client/admin/App/Main.tsx
Original file line number Diff line number Diff line change
@@ -18,17 +18,18 @@ import styles from "./Main.css";
interface Props {
viewer: PropTypesOf<typeof UserMenuContainer>["viewer"] &
PropTypesOf<typeof NavigationContainer>["viewer"];
settings: PropTypesOf<typeof NavigationContainer>["settings"];
children: React.ReactNode;
}

const Main: FunctionComponent<Props> = ({ children, viewer }) => (
const Main: FunctionComponent<Props> = ({ children, viewer, settings }) => (
<div className={styles.root}>
<AppBar gutterBegin gutterEnd>
<Begin itemGutter="double">
<div className={styles.logoContainer}>
<LogoHorizontal />
</div>
<NavigationContainer viewer={viewer} />
<NavigationContainer viewer={viewer} settings={settings} />
</Begin>
<End>
<DecisionHistoryButton />
10 changes: 9 additions & 1 deletion client/src/core/client/admin/App/MainRoute.tsx
Original file line number Diff line number Diff line change
@@ -20,7 +20,12 @@ const MainRoute: React.FunctionComponent<Props> = (props) => {
return (
<>
{ErrorReporterSetUser}
<Main viewer={props.data && props.data.viewer}>{props.children}</Main>
<Main
viewer={props.data && props.data.viewer}
settings={props.data && props.data.settings}
>
{props.children}
</Main>
</>
);
};
@@ -33,6 +38,9 @@ const enhanced = withRouteConfig<Props>({
...UserMenuContainer_viewer
...NavigationContainer_viewer
}
settings {
...NavigationContainer_settings
}
}
`,
})(MainRoute);

0 comments on commit cfe783c

Please sign in to comment.