Initial Commit Adjustments

This commit is contained in:
Dunemask 2022-05-05 13:04:36 +00:00
parent d5524b7d55
commit 0ce2785b75
6 changed files with 75 additions and 50 deletions

3
.gitignore vendored
View file

@ -1,2 +1,3 @@
node_modules/ node_modules/
dist/
build/

15
Dockerfile Normal file
View file

@ -0,0 +1,15 @@
FROM node:16
WORKDIR /dunemask/net/cairo
# Copy dependencies
COPY package.json .
COPY package-lock.json .
RUN npm i
# Copy react build resources over
COPY public public
COPY src src
COPY lib lib
RUN npm run build:react
# Copy bin over
COPY bin bin
CMD ["npm","start"]

View file

@ -8,7 +8,7 @@ export default function Test() {
state: jobState, state: jobState,
dispatch: jobDispatch, dispatch: jobDispatch,
jobUpdate, jobUpdate,
jobCreate jobCreate,
} = useContext(JobContext); } = useContext(JobContext);
function onLog(d) { function onLog(d) {

View file

@ -9,6 +9,7 @@
"./web-clients": "./lib/sockets/clients/web.index.js" "./web-clients": "./lib/sockets/clients/web.index.js"
}, },
"scripts": { "scripts": {
"build:react": "BUILD_PATH='./dist' react-scripts build",
"start": "node bin/app.js", "start": "node bin/app.js",
"start:dev": "nodemon bin/app.js", "start:dev": "nodemon bin/app.js",
"start:dev:replit": "npm run start:dev & npm run start:react:replit", "start:dev:replit": "npm run start:dev & npm run start:react:replit",

View file

@ -4,5 +4,6 @@
pkgs.nodePackages.typescript-language-server pkgs.nodePackages.typescript-language-server
pkgs.nodePackages.yarn pkgs.nodePackages.yarn
pkgs.replitPackages.jest pkgs.replitPackages.jest
pkgs.vim
]; ];
} }

View file

@ -1,33 +1,39 @@
import { useContext, useState } from "react"; import { useContext, useState } from "react";
import ViewContext from "./ctx/ViewContext.jsx"; import ViewContext from "./ctx/ViewContext.jsx";
import * as React from 'react'; import * as React from "react";
import AppBar from '@mui/material/AppBar'; import AppBar from "@mui/material/AppBar";
import Box from '@mui/material/Box'; import Box from "@mui/material/Box";
import Toolbar from '@mui/material/Toolbar'; import Toolbar from "@mui/material/Toolbar";
import IconButton from '@mui/material/IconButton'; import IconButton from "@mui/material/IconButton";
import Typography from '@mui/material/Typography'; import Typography from "@mui/material/Typography";
import Menu from '@mui/material/Menu'; import Menu from "@mui/material/Menu";
import MenuIcon from '@mui/icons-material/Menu'; import MenuIcon from "@mui/icons-material/Menu";
import Container from '@mui/material/Container'; import Container from "@mui/material/Container";
import Avatar from '@mui/material/Avatar'; import Avatar from "@mui/material/Avatar";
import Button from '@mui/material/Button'; import Button from "@mui/material/Button";
import Tooltip from '@mui/material/Tooltip'; import Tooltip from "@mui/material/Tooltip";
import MenuItem from '@mui/material/MenuItem'; import MenuItem from "@mui/material/MenuItem";
import Drawer from '@mui/material/Drawer'; import Drawer from "@mui/material/Drawer";
import ListItem from '@mui/material/ListItem'; import ListItem from "@mui/material/ListItem";
import ListItemIcon from '@mui/material/ListItemIcon'; import ListItemIcon from "@mui/material/ListItemIcon";
import ListItemText from '@mui/material/ListItemText'; import ListItemText from "@mui/material/ListItemText";
import List from '@mui/material/List'; import List from "@mui/material/List";
import ListItemButton from '@mui/material/ListItemButton'; import ListItemButton from "@mui/material/ListItemButton";
import NotificationsIcon from '@mui/icons-material/Notifications'; import NotificationsIcon from "@mui/icons-material/Notifications";
import WorkIcon from '@mui/icons-material/Work'; import WorkIcon from "@mui/icons-material/Work";
import FormatListBulletedIcon from '@mui/icons-material/FormatListBulleted'; import FormatListBulletedIcon from "@mui/icons-material/FormatListBulleted";
import SettingsIcon from '@mui/icons-material/Settings'; import SettingsIcon from "@mui/icons-material/Settings";
import ErrorIcon from '@mui/icons-material/Error'; import ErrorIcon from "@mui/icons-material/Error";
const pages = ["failing", "alerting", "jobs", "tests", "settings"]; const pages = ["failing", "alerting", "jobs", "tests", "settings"];
const icons = [ErrorIcon , NotificationsIcon, WorkIcon,FormatListBulletedIcon, SettingsIcon]; const icons = [
ErrorIcon,
NotificationsIcon,
WorkIcon,
FormatListBulletedIcon,
SettingsIcon,
];
export default function Views() { export default function Views() {
const [view, setView] = useState(pages[0]); const [view, setView] = useState(pages[0]);
@ -41,23 +47,24 @@ export default function Views() {
<AppBar position="static" color="secondary"> <AppBar position="static" color="secondary">
<Container maxWidth="xl"> <Container maxWidth="xl">
<Toolbar disableGutters> <Toolbar disableGutters>
<Drawer <Drawer open={drawerOpen} onClose={closeDrawer}>
open={drawerOpen} {" "}
onClose={closeDrawer} <Box sx={{ width: 250 }} role="presentation">
> <Box
sx={{ width: 250 }}
role="presentation"
>
<List> <List>
{pages.map((text, index) => ( {pages.map((text, index) => (
<ListItemButton key={text} onClick={openPage} selected={view===text}> <ListItemButton
<ListItemIcon> key={text}
{/*icons[index]*/} onClick={openPage}
</ListItemIcon> selected={view === text}
<ListItemText primary={text.charAt(0).toUpperCase() + text.slice(1)} /> >
<ListItemIcon>{/*icons[index]*/}</ListItemIcon>
<ListItemText
primary={text.charAt(0).toUpperCase() + text.slice(1)}
/>
</ListItemButton> </ListItemButton>
))} ))}
</List></Box> </List>
</Box>
</Drawer> </Drawer>
<IconButton <IconButton
size="large" size="large"
@ -73,7 +80,7 @@ export default function Views() {
variant="h6" variant="h6"
noWrap noWrap
component="div" component="div"
sx={{ mr: 2, display: { xs: 'none', md: 'flex' } }} sx={{ mr: 2, display: { xs: "none", md: "flex" } }}
> >
{view.charAt(0).toUpperCase() + view.slice(1)} {view.charAt(0).toUpperCase() + view.slice(1)}
</Typography> </Typography>
@ -81,7 +88,7 @@ export default function Views() {
variant="h6" variant="h6"
noWrap noWrap
component="div" component="div"
sx={{ flexGrow: 1, display: { xs: 'flex', md: 'none' } }} sx={{ flexGrow: 1, display: { xs: "flex", md: "none" } }}
> >
{view.charAt(0).toUpperCase() + view.slice(1)} {view.charAt(0).toUpperCase() + view.slice(1)}
</Typography> </Typography>