Skip to content

Commit 26b0a1b

Browse files
authored
Merge pull request #29 from DiamondLightSource/synoptic-page-banner
Synoptic page banner fix and rename MainPage to SynopticPage
2 parents 87467d6 + 820d05c commit 26b0a1b

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

src/App.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Provider } from "react-redux";
55
import { ThemeProvider } from "@mui/material/styles";
66
import { diamondTheme } from "./theme";
77
import { DemoPage } from "./routes/DemoPage";
8-
import { MainPage } from "./routes/MainPage";
8+
import { SynopticPage } from "./routes/SynopticPage";
99
import { EditorPage } from "./routes/EditorPage";
1010
import { LandingPage } from "./routes/LandingPage";
1111
import { DataBrowserPage } from "./routes/DataBrowserPage";
@@ -73,11 +73,11 @@ function App({}) {
7373
<Route path="/demo" element={<DemoPage />} />
7474
<Route path="/data-browser" element={<DataBrowserPage />} />
7575
<Route path="/editor" element={<EditorPage />} />
76-
<Route path="/synoptic" element={<MainPage />} />
77-
<Route path="/synoptic/:beamline" element={<MainPage />} />
76+
<Route path="/synoptic" element={<SynopticPage />} />
77+
<Route path="/synoptic/:beamline" element={<SynopticPage />} />
7878
<Route
7979
path="/synoptic/:beamline/:screenUrlId"
80-
element={<MainPage />}
80+
element={<SynopticPage />}
8181
/>
8282
<Route path="/" element={<LandingPage />} />
8383
</Routes>

src/components/MenuBar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import BeamlineSelect from "./BeamlineSelect";
1111
import ScreenTreeView from "./ScreenTreeView";
1212
import { useContext } from "react";
1313
import { DRAWER_WIDTH } from "../utils/helper";
14-
import { MenuContext } from "../routes/MainPage";
14+
import { MenuContext } from "../routes/SynopticPage";
1515

1616
const openedMixin = (theme: Theme): CSSObject => ({
1717
width: DRAWER_WIDTH,

src/components/ScreenDisplay.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
APP_BAR_HEIGHT
1818
} from "../utils/helper";
1919
import { BeamlineTreeStateContext } from "../App";
20-
import { MenuContext } from "../routes/MainPage";
20+
import { MenuContext } from "../routes/SynopticPage";
2121
import { useLocation, useNavigate } from "react-router-dom";
2222

2323
interface PaperProps extends MuiPaperProps {

src/components/ScreenTreeView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useContext, useEffect, useMemo, useState } from "react";
33
import { TreeViewBaseItem, TreeViewItemId } from "@mui/x-tree-view";
44
import { FileContext } from "@diamondlightsource/cs-web-lib";
55
import { BeamlineTreeStateContext } from "../App";
6-
import { MenuContext } from "../routes/MainPage";
6+
import { MenuContext } from "../routes/SynopticPage";
77
import { executeOpenPageActionWithFileGuid } from "../utils/csWebLibActions";
88

99
export default function ScreenTreeView() {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ export const MenuContext = createContext<{
2424
setMenuOpen: any;
2525
}>({ menuOpen: true, setMenuOpen: () => null });
2626

27-
export function MainPage() {
27+
export function SynopticPage() {
2828
const { state, dispatch } = useContext(BeamlineTreeStateContext);
2929
const params: { beamline?: string; screenUrlId?: string } = useParams();
3030
const fileContext = useContext(FileContext);
31-
const [menuOpen, setMenuOpen] = useState(false);
31+
const [menuOpen, setMenuOpen] = useState(true);
3232

3333
useEffect(() => {
3434
// Only trigger once

0 commit comments

Comments
 (0)