Skip to content

Start work on responsiveness with submission pages #54

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

Merged
jacobfilik merged 2 commits into from
Oct 17, 2025
Merged

Start work on responsiveness with submission pages #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
665fee4
Start work on responsiveness with submission pages
jacobfilik Oct 17, 2025
2570c30
add logo back in
jacobfilik Oct 17, 2025
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
6 changes: 4 additions & 2 deletions web-conexs-client/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CssBaseline, Stack } from "@mui/material";
import { CssBaseline, responsiveFontSizes, Stack } from "@mui/material";
import Header from "./components/Header";
import WelcomePage from "./components/WelcomePage";
import MoleculePage from "./components/molecules/MoleculePage";
Expand Down Expand Up @@ -27,9 +27,11 @@ import SimulationView from "./components/SimulationView";

const queryClient = new QueryClient();

const theme = responsiveFontSizes(DiamondTheme);

function App() {
return (
<ThemeProvider theme={DiamondTheme}>
<ThemeProvider theme={theme}>
<CssBaseline />
<QueryClientProvider client={queryClient}>
<UserProvider>
Expand Down
2 changes: 1 addition & 1 deletion web-conexs-client/src/components/Header.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ describe("App", () => {
it("renders the App component", () => {
render(<Header />, { wrapper: themeProvider });

expect(screen.getByText("Web-CONEXS")).toBeDefined();
expect(screen.getByText("Web‑CONEXS")).toBeDefined();
});
});
5 changes: 2 additions & 3 deletions web-conexs-client/src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,10 @@ export default function Header() {
<Typography
variant="h4"
color={theme.palette.primary.contrastText}
sx={{ padding: "10px 0px 2px 0px" }}
s
sx={{ padding: "10px 5px 2px 5px" }}
height="100%"
>
Web-CONEXS
Web&#8209;CONEXS
</Typography>
</Navbar>
);
Expand Down
8 changes: 7 additions & 1 deletion web-conexs-client/src/components/React3dMol.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,13 @@ export default function React3dMol(props: Molecule3DProps) {
return (
<div
ref={moleculeViewer}
style={{ height: "100%", width: "100%", position: "relative" }}
style={{
height: "100%",
width: "100%",
position: "relative",
minHeight: "100px",
minWidth: "100px",
}}
/>
);
}
131 changes: 1 addition & 130 deletions web-conexs-client/src/components/SideDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function ListItemStyled(props: {
sx={[
{
width: { drawerWidth },
minHeight: 48,
minHeight: 32,
px: 2.5,
},
open
Expand Down Expand Up @@ -252,129 +252,10 @@ export default function SideDrawer() {
</>
);

// return (
// <Drawer2
// variant="permanent"
// open={open}
// onMouseEnter={() => {
// setOpen(true);
// }}
// onMouseLeave={() => {
// setOpen(false);
// }}
// >
// <Divider />
// <List>
// {["Inbox", "Starred", "Send email", "Drafts"].map((text, index) => (
// <ListItem key={text} disablePadding sx={{ display: "block" }}>
// <ListItemButton
// sx={[
// {
// minHeight: 48,
// px: 2.5,
// },
// open
// ? {
// justifyContent: "initial",
// }
// : {
// justifyContent: "center",
// },
// ]}
// >
// <ListItemIcon
// sx={[
// {
// minWidth: 0,
// justifyContent: "center",
// },
// open
// ? {
// mr: 3,
// }
// : {
// mr: "auto",
// },
// ]}
// >
// <MenuIcon />
// </ListItemIcon>
// <ListItemText
// primary={text}
// sx={[
// open
// ? {
// opacity: 1,
// }
// : {
// opacity: 0,
// },
// ]}
// />
// </ListItemButton>
// </ListItem>
// ))}
// </List>
// <Divider />
// <List>
// {["All mail", "Trash", "Spam"].map((text, index) => (
// <ListItem key={text} disablePadding sx={{ display: "block" }}>
// <ListItemButton
// sx={[
// {
// minHeight: 48,
// px: 2.5,
// },
// open
// ? {
// justifyContent: "initial",
// }
// : {
// justifyContent: "center",
// },
// ]}
// >
// <ListItemIcon
// sx={[
// {
// minWidth: 0,
// justifyContent: "center",
// },
// open
// ? {
// mr: 3,
// }
// : {
// mr: "auto",
// },
// ]}
// >
// <MenuIcon />
// </ListItemIcon>
// <ListItemText
// primary={text}
// sx={[
// open
// ? {
// opacity: 1,
// }
// : {
// opacity: 0,
// },
// ]}
// />
// </ListItemButton>
// </ListItem>
// ))}
// </List>
// </Drawer2>
// );

return (
<Drawer2
variant="permanent"
open={open}
// onClose={toggleDrawer(false)}
onMouseEnter={() => {
setOpen(true);
}}
Expand All @@ -385,14 +266,4 @@ export default function SideDrawer() {
{DrawerList}
</Drawer2>
);

// return DrawerList;
// <>
// <IconButton size="large" onClick={toggleDrawer(true)}>
// <MenuIcon color="secondary" fontSize="large" />
// </IconButton>
// <Drawer open={open} onClose={toggleDrawer(false)}>
// {DrawerList}
// </Drawer>
// </>
}
11 changes: 9 additions & 2 deletions web-conexs-client/src/components/fdmnes/FdmnesForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,15 @@ export default function FdmnesForm(props: {
justifyContent="space-between"
margin="5px"
spacing="5px"
overflow="auto"
>
{props.hasData && props.data != null ? (
<Stack direction="row" flex={1} spacing={"5px"}>
<Stack
direction={{ sm: "column", md: "row" }}
flex={1}
spacing={"5px"}
align-content={"stretch"}
>
<Stack flex={1}>
<JsonForms
schema={props.schema}
Expand Down Expand Up @@ -98,11 +104,12 @@ export default function FdmnesForm(props: {
sx={{
margin: "20px",
flex: 1,
minHeight: 0,
minHeight: "auto",
alignItems: "stretch",
display: "flex",
flexDirection: "column",
spacing: "2px",
minWidth: "auto",
}}
elevation={3}
>
Expand Down
2 changes: 1 addition & 1 deletion web-conexs-client/src/components/fdmnes/FdmnesSubmitPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default function FdmnesSubmitPage(props: { isCrystal: boolean }) {
const theme = useTheme();
return (
<MainPanel>
<Stack flex={1}>
<Stack flex={1} overflow="hidden">
<Toolbar
sx={{
justifyContent: "space-between",
Expand Down
2 changes: 1 addition & 1 deletion web-conexs-client/src/components/molecules/MoleculePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function MoleculePage() {
Molecules
</Typography>
</Toolbar>
<Stack direction={"row"} spacing={3}>
<Stack spacing={3} direction={{ sm: "column", md: "row" }}>
<StructureTable
structures={query.data ? query.data : []}
selectedStructure={undefined}
Expand Down
11 changes: 9 additions & 2 deletions web-conexs-client/src/components/orca/OrcaForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,15 @@ export default function OrcaForm() {
justifyContent="space-between"
margin="5px"
spacing="5px"
overflow="auto"
>
{hasData && data != null ? (
<Stack direction="row" flex={1} spacing={"5px"}>
<Stack
flex={1}
spacing={"5px"}
direction={{ sm: "column", md: "row" }}
align-content={"stretch"}
>
<Stack flex={1}>
<JsonForms
schema={schema}
Expand Down Expand Up @@ -108,11 +114,12 @@ export default function OrcaForm() {
sx={{
margin: "20px",
flex: 1,
minHeight: 0,
minHeight: "auto",
alignItems: "stretch",
display: "flex",
flexDirection: "column",
spacing: "2px",
minWidth: "auto",
}}
elevation={3}
>
Expand Down
2 changes: 1 addition & 1 deletion web-conexs-client/src/components/orca/OrcaSubmitPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default function OrcaSubmitPage() {
const theme = useTheme();
return (
<MainPanel>
<Stack flex={1} overflow="auto">
<Stack flex={1} overflow="hidden">
<Toolbar
sx={{
justifyContent: "space-between",
Expand Down
11 changes: 9 additions & 2 deletions web-conexs-client/src/components/qe/QEForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,15 @@ export default function QEForm(props: {
justifyContent="space-between"
margin="5px"
spacing="5px"
overflow="auto"
>
{props.hasData && props.data != null ? (
<Stack direction="row" flex={1} spacing={"5px"}>
<Stack
direction={{ sm: "column", md: "row" }}
flex={1}
spacing={"5px"}
align-content={"stretch"}
>
<Stack flex={1}>
<JsonForms
schema={props.schema}
Expand Down Expand Up @@ -104,11 +110,12 @@ export default function QEForm(props: {
sx={{
margin: "20px",
flex: 1,
minHeight: 0,
minHeight: "auto",
alignItems: "stretch",
display: "flex",
flexDirection: "column",
spacing: "2px",
minWidth: "auto",
}}
elevation={3}
>
Expand Down
2 changes: 1 addition & 1 deletion web-conexs-client/src/components/qe/QESubmitPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function QeSubmitPage() {
const theme = useTheme();
return (
<MainPanel>
<Stack flex={1}>
<Stack flex={1} overflow="hidden">
<Toolbar
sx={{
justifyContent: "space-between",
Expand Down