Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 13 additions & 10 deletions web-conexs-client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ import {
} from "@mui/material";
import Header from "./components/Header";
import WelcomePage from "./components/WelcomePage";
import MoleculePage from "./components/MoleculePage";
import MoleculePage from "./components/molecules/MoleculePage";
import { Route, Routes } from "react-router-dom";
import SimulationReviewPage from "./components/SimulationReviewPage";
import OrcaSubmitPage from "./components/OrcaSubmitPage";
import CrystalPage from "./components/CrystalPage";
import CreateMoleculePage from "./components/CreateMoleculePage";
import FdmnesSubmitPage from "./components/FdmnesSubmitPage";
import CreateCystalPage from "./components/CreateCrystalPage";
import OrcaSubmitPage from "./components/orca/OrcaSubmitPage";
import CrystalPage from "./components/crystals/CrystalPage";
import CreateMoleculePage from "./components/molecules/CreateMoleculePage";
import FdmnesSubmitPage from "./components/fdmnes/FdmnesSubmitPage";
import CreateCystalPage from "./components/crystals/CreateCrystalPage";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import SimulationReviewPage from "./components/SimulationReviewPage";

const queryClient = new QueryClient();

function App() {
const prefersDarkMode = useMediaQuery("(prefers-color-scheme: dark)");
const [mode, setMode] = useState<"light" | "dark">(
prefersDarkMode ? "light" : "dark"
prefersDarkMode ? "dark" : "light"
);

useMemo(
const colorMode = useMemo(
() => ({
toggleColorMode: () => {
setMode((prevMode) => (prevMode === "light" ? "dark" : "light"));
Expand All @@ -50,7 +50,10 @@ function App() {
<CssBaseline />
<QueryClientProvider client={queryClient}>
<Stack height="100vh" width="100vw" spacing={1}>
<Header />
<Header
colorMode={mode}
toggleColorMode={colorMode.toggleColorMode}
/>
<Routes>
<Route path="/" element={<WelcomePage />} />
<Route path="/molecule" element={<MoleculePage />} />
Expand Down
63 changes: 0 additions & 63 deletions web-conexs-client/src/components/CreateCrystalPage.tsx

This file was deleted.

58 changes: 0 additions & 58 deletions web-conexs-client/src/components/CreateMoleculePage.tsx

This file was deleted.

59 changes: 0 additions & 59 deletions web-conexs-client/src/components/CrystalPage.tsx

This file was deleted.

26 changes: 0 additions & 26 deletions web-conexs-client/src/components/FdmnesResults.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion web-conexs-client/src/components/Header.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Header from "./Header";

describe("App", () => {
it("renders the App component", () => {
render(<Header />);
render(<Header colorMode="light" toggleColorMode={()=>{}} />);

expect(screen.getByText("Web-CONEXS")).toBeDefined();
// screen.debug(); // prints out the jsx in the App component unto the command line
Expand Down
19 changes: 16 additions & 3 deletions web-conexs-client/src/components/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
import { AppBar, Toolbar, Typography } from "@mui/material";
import { AppBar, Checkbox, Stack, Toolbar, Typography } from "@mui/material";
import SideDrawer from "./SideDrawer";

export default function Header() {
import { LightMode, DarkMode } from "@mui/icons-material";

export default function Header(props: {
colorMode: string;
toggleColorMode: () => void;
}) {
return (
<AppBar style={{ position: "static" }}>
<Toolbar sx={{ justifyContent: "space-between", alignItems: "center" }}>
<SideDrawer />
<Typography variant="h4" component="div" sx={{ flexGrow: 1 }}>
<Typography variant="h2" component="div" sx={{ flexGrow: 1 }}>
Web-CONEXS
</Typography>
<Stack direction="row" alignItems={"center"}>
<Checkbox
icon={<LightMode />}
checkedIcon={<DarkMode />}
checked={props.colorMode === "dark"}
onChange={props.toggleColorMode}
></Checkbox>
</Stack>
</Toolbar>
</AppBar>
);
Expand Down
54 changes: 0 additions & 54 deletions web-conexs-client/src/components/MoleculePage.tsx

This file was deleted.

10 changes: 0 additions & 10 deletions web-conexs-client/src/components/OrcaSubmitPage.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion web-conexs-client/src/components/React3dMol.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default function React3dMol(props: Molecule3DProps) {
return (
<div
ref={moleculeViewer}
style={{ height: "200px", width: "300px", position: "relative" }}
style={{ height: "100%", width: "100%", position: "relative" }}
/>
);
}
4 changes: 2 additions & 2 deletions web-conexs-client/src/components/SideDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ export default function SideDrawer() {

return (
<>
<IconButton aria-label="add an alarm" onClick={toggleDrawer(true)}>
<MenuIcon />
<IconButton size="large" onClick={toggleDrawer(true)}>
<MenuIcon fontSize="large" />
</IconButton>
<Drawer open={open} onClose={toggleDrawer(false)}>
{DrawerList}
Expand Down
Loading