Skip to content
Snippets Groups Projects
Commit c50c4928 authored by James D'Alton's avatar James D'Alton
Browse files

putting a pin in this for now

parent 83b827d6
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 1094 deletions
compforge/src/App.js
+ 3
− 6
View file @ c50c4928
......@@ -3,16 +3,15 @@ import './App.css';
import firebase from './firebase'
import SignIn from './pages/SignIn'
import SignUp from './pages/SignUp'
import Dashboard from './pages/Dashboard';
import CreateForm from './pages/CreateForm';
import AddPartner from './pages/AddPartner';
import Dashboard from './pages/Dashboard/Dashboard';
import CreateForm from './pages/CreateForm/CreateForm';
import AddPartner from './pages/AddPartner/AddPartner';
import PageNotFound from './pages/PageNotFound';
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
function App() {
var user = firebase.auth().currentUser;
console.log(user);
return (
<div className="App">
<header className="App-header">
......@@ -22,8 +21,6 @@ function App() {
<Route exact path='/CreateForm' component={CreateForm} />
<Route exact path='/AddPartner' component={AddPartner} />
<Route path='/' component={PageNotFound} />
<Route exact path="/signin" component={SignIn} />
<Route exact path='/signup' component={SignUp} />
</Switch>
</Router>
</header>
......
compforge/src/components/Common/Header.js deleted 100644 → 0
+ 0
− 19
View file @ 83b827d6
import React from 'react'
import { Grid, AppBar, Toolbar, Typography, Button } from '@material-ui/core';
function Header() {
return (
<Grid item xs={12}>
<AppBar position="static">
<Toolbar>
<Typography variant="h6" flexGrow={1}>
Compforge
</Typography>
<Button color="inherit">Login</Button>
</Toolbar>
</AppBar>
</Grid>
)
}
export default Header
\ No newline at end of file
compforge/src/components/Common/Navigation.js deleted 100644 → 0
+ 0
− 33
View file @ 83b827d6
import React from 'react';
import { Grid, Button } from '@material-ui/core';
function Navigation({ menuItems }) {
return (
<Grid
container
direction="column"
justify="space-evenly"
alignItems="stretch"
spacing={3}
>
<Grid item xs={3}>
<Button variant="contained" color="primary">Dashboard</Button>
</Grid>
<Grid item xs={3}>
<Button variant="contained" color="primary">New Form</Button>
</Grid>
<Grid item xs={3}>
<Button variant="contained" color="primary">Add Partner</Button>
</Grid>
<Grid item xs={3}>
<Button variant="contained" color="primary">My Account</Button>
</Grid>
<Grid item xs={3}>
<Button variant="contained" color="secondary">Sign Out</Button>
</Grid>
</Grid >
)
}
export default Navigation
\ No newline at end of file
compforge/src/components/Other/Forms.js deleted 100644 → 0
+ 0
− 47
View file @ 83b827d6
import React from 'react';
import Table from '@material-ui/core/Table';
import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';
import Title from './Title';
// Generate Order Data
function createData(id, formName, authorName, sharedWith, created, modified) {
return { id, formName, authorName, sharedWith, created, modified };
}
const rows = [
createData(0, 'My First Form', 'Me', 'N/A', '30/03/2020, 12:04', '30/03/2020, 12:54'),
createData(1, 'ISO 27001', 'Me', 'SomeCompany', '30/03/2020, 13:46', '30/03/2020, 13:46'),
];
export default function Forms() {
return (
<React.Fragment>
<Title>My Forms</Title>
<Table size="small">
<TableHead>
<TableRow>
<TableCell>Form Name</TableCell>
<TableCell>Author</TableCell>
<TableCell>Shared With</TableCell>
<TableCell>Created</TableCell>
<TableCell align="right">Modified</TableCell>
</TableRow>
</TableHead>
<TableBody>
{rows.map((row) => (
<TableRow key={row.id}>
<TableCell>{row.formName}</TableCell>
<TableCell>{row.authorName}</TableCell>
<TableCell>{row.sharedWith}</TableCell>
<TableCell>{row.created}</TableCell>
<TableCell align="right">{row.modified}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</React.Fragment>
);
}
\ No newline at end of file
compforge/src/components/Other/NewPartnerSearch.js deleted 100644 → 0
+ 0
− 0
View file @ 83b827d6
compforge/src/components/Other/Partners.js deleted 100644 → 0
+ 0
− 51
View file @ 83b827d6
import React from 'react';
import Link from '@material-ui/core/Link';
import ListItem from '@material-ui/core/ListItem';
import ListItemText from '@material-ui/core/ListItemText';
import Table from '@material-ui/core/Table';
import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';
import Title from './Title';
// Generate Order Data
function createData(id, partner, dateAdded) {
return { id, partner, dateAdded };
}
const rows = [
createData(0, 'SomeCompany', '30/03/2020'),
createData(1, 'SomeOtherCompany', '30/03/2020'),
];
export default function Partners() {
return (
<React.Fragment>
<Title>My Partners</Title>
<Table size="small">
<TableHead>
<TableRow>
<TableCell>Partner</TableCell>
<TableCell align="right">Date Added</TableCell>
</TableRow>
</TableHead>
<TableBody>
{rows.map((row) => (
<TableRow key={row.id}>
<TableCell>{row.partner}</TableCell>
<TableCell align="right">{row.dateAdded}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
<div>
<Link href="/AddPartner">
<ListItem button>
<ListItemText align="center" primary="Add a partner" />
</ListItem>
</Link>
</div>
</React.Fragment>
);
}
\ No newline at end of file
compforge/src/components/Other/Title.js deleted 100644 → 0
+ 0
− 15
View file @ 83b827d6
import React from 'react';
import PropTypes from 'prop-types';
import Typography from '@material-ui/core/Typography';
export default function Title(props) {
return (
<Typography component="h2" variant="h6" color="primary" gutterBottom>
{props.children}
</Typography>
);
}
Title.propTypes = {
children: PropTypes.node,
};
\ No newline at end of file
compforge/src/components/Other/UserFormsTable.js deleted 100644 → 0
+ 0
− 40
View file @ 83b827d6
import React from 'react';
import { Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Paper, makeStyles } from '@material-ui/core';
const useStyles = makeStyles({
table: {
minWidth: 650,
},
});
const UserFormsTable = ({ formItems }) => {
const classes = useStyles();
return (
<div>
<TableContainer component={Paper}>
<Table className={classes.table} aria-label="simple table">
<TableHead>
<TableRow>
<TableCell>Form name</TableCell>
<TableCell align="right">Owner</TableCell>
<TableCell align="right">Date modified</TableCell>
</TableRow>
</TableHead>
<TableBody>
{formItems.map(formItem => (
<TableRow key={formItem.name}>
<TableCell component="th" scope="row">
{formItem.name}
</TableCell>
<TableCell align="right">{formItem.owner}</TableCell>
<TableCell align="right">{formItem.dateModified}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</TableContainer>
</div>
)
}
export default UserFormsTable
\ No newline at end of file
compforge/src/components/Other/listItems.js deleted 100644 → 0
+ 0
− 72
View file @ 83b827d6
import React from 'react';
import Link from '@material-ui/core/Link';
import ListItem from '@material-ui/core/ListItem';
import ListItemIcon from '@material-ui/core/ListItemIcon';
import ListItemText from '@material-ui/core/ListItemText';
import ListSubheader from '@material-ui/core/ListSubheader';
import DashboardIcon from '@material-ui/icons/Dashboard';
import AccountCircleIcon from '@material-ui/icons/AccountCircle';
import PowerSettingsNewIcon from '@material-ui/icons/PowerSettingsNew';
import PeopleIcon from '@material-ui/icons/People';
import AssignmentIcon from '@material-ui/icons/Assignment';
import firebase from '../../firebase';
export const mainListItems = (
<div>
<ListSubheader>Home</ListSubheader>
<Link href="/">
<ListItem button>
<ListItemIcon>
<DashboardIcon />
</ListItemIcon>
<ListItemText primary="Dashboard" />
</ListItem>
</Link>
<Link href="/CreateForm">
<ListItem button>
<ListItemIcon>
<AssignmentIcon />
</ListItemIcon>
<ListItemText primary="Create New Form" />
</ListItem>
</Link>
<Link href="/AddPartner">
<ListItem button>
<ListItemIcon>
<PeopleIcon />
</ListItemIcon>
<ListItemText primary="Add a partner" />
</ListItem>
</Link>
</div>
);
export const secondaryListItems = (
<div>
<ListSubheader>Account</ListSubheader>
<Link href="/Account">
<ListItem button>
<ListItemIcon>
<AccountCircleIcon />
</ListItemIcon>
<ListItemText primary="My Account" />
</ListItem>
</Link>
<Link href='/signin' onClick={signOut}>
<ListItem button>
<ListItemIcon>
<PowerSettingsNewIcon />
</ListItemIcon>
<ListItemText primary="Sign Out" />
</ListItem>
</Link>
</div>
);
function signOut() {
firebase.auth().signOut().then(function() {
console.log("Sign out successful");
}).catch(function(error) {
console.log(error);
});
}
\ No newline at end of file
compforge/src/pages/AddPartner.js deleted 100644 → 0
+ 0
− 208
View file @ 83b827d6
import React from 'react';
import clsx from 'clsx';
import { makeStyles } from '@material-ui/core/styles';
import CssBaseline from '@material-ui/core/CssBaseline';
import Drawer from '@material-ui/core/Drawer';
import Box from '@material-ui/core/Box';
import AppBar from '@material-ui/core/AppBar';
import Toolbar from '@material-ui/core/Toolbar';
import List from '@material-ui/core/List';
import Typography from '@material-ui/core/Typography';
import Divider from '@material-ui/core/Divider';
import IconButton from '@material-ui/core/IconButton';
import Badge from '@material-ui/core/Badge';
import Container from '@material-ui/core/Container';
import Grid from '@material-ui/core/Grid';
import Paper from '@material-ui/core/Paper';
import Link from '@material-ui/core/Link';
import MenuIcon from '@material-ui/icons/Menu';
import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
import NotificationsIcon from '@material-ui/icons/Notifications';
import { mainListItems, secondaryListItems } from '../components/Other/listItems';
import Partners from '../components/Other/Partners';
import Forms from '../components/Other/Forms';
import firebase from '../firebase';
function Copyright() {
return (
<Typography variant="body2" color="textSecondary" align="center">
{'Copyright © '}
<Link color="inherit" href="https://material-ui.com/">
CompForge
</Link>{' '}
{new Date().getFullYear()}
{'.'}
</Typography>
);
}
const drawerWidth = 240;
const useStyles = makeStyles((theme) => ({
root: {
display: 'flex',
},
toolbar: {
paddingRight: 24, // keep right padding when drawer closed
},
toolbarIcon: {
display: 'flex',
alignItems: 'center',
justifyContent: 'flex-end',
padding: '0 8px',
...theme.mixins.toolbar,
},
appBar: {
zIndex: theme.zIndex.drawer + 1,
transition: theme.transitions.create(['width', 'margin'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
},
appBarShift: {
// Space for menu 'drawer' from side. Removed for now because button has gone AWOL.
// marginLeft: drawerWidth,
// width: `calc(100% - ${drawerWidth}px)`,
transition: theme.transitions.create(['width', 'margin'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
},
menuButton: {
marginRight: 36,
},
menuButtonHidden: {
display: 'none',
},
title: {
flexGrow: 1,
},
drawerPaper: {
align: 'left',
position: 'relative',
whiteSpace: 'nowrap',
width: drawerWidth,
transition: theme.transitions.create('width', {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
},
drawerPaperClose: {
overflowX: 'hidden',
transition: theme.transitions.create('width', {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
width: theme.spacing(7),
[theme.breakpoints.up('sm')]: {
width: theme.spacing(9),
},
},
appBarSpacer: theme.mixins.toolbar,
content: {
flexGrow: 1,
height: '100vh',
overflow: 'auto',
},
container: {
paddingTop: theme.spacing(4),
paddingBottom: theme.spacing(4),
},
paper: {
padding: theme.spacing(2),
display: 'flex',
overflow: 'auto',
flexDirection: 'column',
},
fixedHeight: {
height: 240,
},
}));
export default function AddPartner() {
var user = firebase.auth().currentUser;
// var name, email, uid, emailVerified;
if (user != null) {
// name = user.displayName;
// email = user.email;
// emailVerified = user.emailVerified;
// uid = user.uid;
}
const classes = useStyles();
const [open, setOpen] = React.useState(true);
const handleDrawerOpen = () => {
setOpen(true);
};
const handleDrawerClose = () => {
setOpen(false);
};
const fixedHeightPaper = clsx(classes.paper, classes.fixedHeight);
return (
<div className={classes.root}>
<CssBaseline />
<AppBar position="absolute" className={clsx(classes.appBar, open && classes.appBarShift)}>
<Toolbar className={classes.toolbar}>
<IconButton
edge="start"
color="inherit"
aria-label="open drawer"
onClick={handleDrawerOpen}
className={clsx(classes.menuButton, open && classes.menuButtonHidden)}
>
<MenuIcon />
</IconButton>
<Typography component="h1" variant="h6" color="inherit" noWrap className={classes.title}>
CompForge
</Typography>
<IconButton color="inherit">
<Badge badgeContent={4} color="secondary">
<NotificationsIcon />
</Badge>
</IconButton>
</Toolbar>
</AppBar>
<Drawer
variant="permanent"
classes={{
paper: clsx(classes.drawerPaper, !open && classes.drawerPaperClose),
}}
open={open}
>
<div className={classes.toolbarIcon}>
<IconButton onClick={handleDrawerClose}>
<ChevronLeftIcon />
</IconButton>
</div>
<Divider />
<List>{mainListItems}</List>
<Divider />
<List>{secondaryListItems}</List>
</Drawer>
<main className={classes.content}>
<div className={classes.appBarSpacer} />
<Container maxWidth="lg" className={classes.container}>
<Grid container spacing={3}>
{/* Forms */}
<Grid item xs={12}>
<Paper className={classes.paper}>
<Forms />
</Paper>
</Grid>
{/* Partners */}
<Grid item xs={12} md={4} lg={6}>
<Paper className={fixedHeightPaper}>
<Partners />
</Paper>
</Grid>
</Grid>
<Box pt={4}>
<Copyright />
</Box>
</Container>
</main>
</div>
);
}
\ No newline at end of file
compforge/src/pages/CreateForm.js deleted 100644 → 0
+ 0
− 208
View file @ 83b827d6
import React from 'react';
import clsx from 'clsx';
import { makeStyles } from '@material-ui/core/styles';
import CssBaseline from '@material-ui/core/CssBaseline';
import Drawer from '@material-ui/core/Drawer';
import Box from '@material-ui/core/Box';
import AppBar from '@material-ui/core/AppBar';
import Toolbar from '@material-ui/core/Toolbar';
import List from '@material-ui/core/List';
import Typography from '@material-ui/core/Typography';
import Divider from '@material-ui/core/Divider';
import IconButton from '@material-ui/core/IconButton';
import Badge from '@material-ui/core/Badge';
import Container from '@material-ui/core/Container';
import Grid from '@material-ui/core/Grid';
import Paper from '@material-ui/core/Paper';
import Link from '@material-ui/core/Link';
import MenuIcon from '@material-ui/icons/Menu';
import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
import NotificationsIcon from '@material-ui/icons/Notifications';
import { mainListItems, secondaryListItems } from '../components/Other/listItems';
import Partners from '../components/Other/Partners';
import Forms from '../components/Other/Forms';
import firebase from '../firebase';
function Copyright() {
return (
<Typography variant="body2" color="textSecondary" align="center">
{'Copyright © '}
<Link color="inherit" href="https://material-ui.com/">
CompForge
</Link>{' '}
{new Date().getFullYear()}
{'.'}
</Typography>
);
}
const drawerWidth = 240;
const useStyles = makeStyles((theme) => ({
root: {
display: 'flex',
},
toolbar: {
paddingRight: 24, // keep right padding when drawer closed
},
toolbarIcon: {
display: 'flex',
alignItems: 'center',
justifyContent: 'flex-end',
padding: '0 8px',
...theme.mixins.toolbar,
},
appBar: {
zIndex: theme.zIndex.drawer + 1,
transition: theme.transitions.create(['width', 'margin'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
},
appBarShift: {
// Space for menu 'drawer' from side. Removed for now because button has gone AWOL.
// marginLeft: drawerWidth,
// width: `calc(100% - ${drawerWidth}px)`,
transition: theme.transitions.create(['width', 'margin'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
},
menuButton: {
marginRight: 36,
},
menuButtonHidden: {
display: 'none',
},
title: {
flexGrow: 1,
},
drawerPaper: {
align: 'left',
position: 'relative',
whiteSpace: 'nowrap',
width: drawerWidth,
transition: theme.transitions.create('width', {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
},
drawerPaperClose: {
overflowX: 'hidden',
transition: theme.transitions.create('width', {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
width: theme.spacing(7),
[theme.breakpoints.up('sm')]: {
width: theme.spacing(9),
},
},
appBarSpacer: theme.mixins.toolbar,
content: {
flexGrow: 1,
height: '100vh',
overflow: 'auto',
},
container: {
paddingTop: theme.spacing(4),
paddingBottom: theme.spacing(4),
},
paper: {
padding: theme.spacing(2),
display: 'flex',
overflow: 'auto',
flexDirection: 'column',
},
fixedHeight: {
height: 240,
},
}));
export default function CreateForm() {
var user = firebase.auth().currentUser;
// var name, email, uid, emailVerified;
if (user != null) {
// name = user.displayName;
// email = user.email;
// emailVerified = user.emailVerified;
// uid = user.uid;
}
const classes = useStyles();
const [open, setOpen] = React.useState(true);
const handleDrawerOpen = () => {
setOpen(true);
};
const handleDrawerClose = () => {
setOpen(false);
};
const fixedHeightPaper = clsx(classes.paper, classes.fixedHeight);
return (
<div className={classes.root}>
<CssBaseline />
<AppBar position="absolute" className={clsx(classes.appBar, open && classes.appBarShift)}>
<Toolbar className={classes.toolbar}>
<IconButton
edge="start"
color="inherit"
aria-label="open drawer"
onClick={handleDrawerOpen}
className={clsx(classes.menuButton, open && classes.menuButtonHidden)}
>
<MenuIcon />
</IconButton>
<Typography component="h1" variant="h6" color="inherit" noWrap className={classes.title}>
CompForge
</Typography>
<IconButton color="inherit">
<Badge badgeContent={4} color="secondary">
<NotificationsIcon />
</Badge>
</IconButton>
</Toolbar>
</AppBar>
<Drawer
variant="permanent"
classes={{
paper: clsx(classes.drawerPaper, !open && classes.drawerPaperClose),
}}
open={open}
>
<div className={classes.toolbarIcon}>
<IconButton onClick={handleDrawerClose}>
<ChevronLeftIcon />
</IconButton>
</div>
<Divider />
<List>{mainListItems}</List>
<Divider />
<List>{secondaryListItems}</List>
</Drawer>
<main className={classes.content}>
<div className={classes.appBarSpacer} />
<Container maxWidth="lg" className={classes.container}>
<Grid container spacing={3}>
{/* Forms */}
<Grid item xs={12}>
<Paper className={classes.paper}>
<Forms />
</Paper>
</Grid>
{/* Partners */}
<Grid item xs={12} md={4} lg={6}>
<Paper className={fixedHeightPaper}>
<Partners />
</Paper>
</Grid>
</Grid>
<Box pt={4}>
<Copyright />
</Box>
</Container>
</main>
</div>
);
}
\ No newline at end of file
compforge/src/pages/Dashboard.js deleted 100644 → 0
+ 0
− 208
View file @ 83b827d6
import React from 'react';
import clsx from 'clsx';
import { makeStyles } from '@material-ui/core/styles';
import CssBaseline from '@material-ui/core/CssBaseline';
import Drawer from '@material-ui/core/Drawer';
import Box from '@material-ui/core/Box';
import AppBar from '@material-ui/core/AppBar';
import Toolbar from '@material-ui/core/Toolbar';
import List from '@material-ui/core/List';
import Typography from '@material-ui/core/Typography';
import Divider from '@material-ui/core/Divider';
import IconButton from '@material-ui/core/IconButton';
import Badge from '@material-ui/core/Badge';
import Container from '@material-ui/core/Container';
import Grid from '@material-ui/core/Grid';
import Paper from '@material-ui/core/Paper';
import Link from '@material-ui/core/Link';
import MenuIcon from '@material-ui/icons/Menu';
import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
import NotificationsIcon from '@material-ui/icons/Notifications';
import { mainListItems, secondaryListItems } from '../components/Other/listItems';
import Partners from '../components/Other/Partners';
import Forms from '../components/Other/Forms';
import firebase from '../firebase';
function Copyright() {
return (
<Typography variant="body2" color="textSecondary" align="center">
{'Copyright © '}
<Link color="inherit" href="https://material-ui.com/">
CompForge
</Link>{' '}
{new Date().getFullYear()}
{'.'}
</Typography>
);
}
const drawerWidth = 240;
const useStyles = makeStyles((theme) => ({
root: {
display: 'flex',
},
toolbar: {
paddingRight: 24, // keep right padding when drawer closed
},
toolbarIcon: {
display: 'flex',
alignItems: 'center',
justifyContent: 'flex-end',
padding: '0 8px',
...theme.mixins.toolbar,
},
appBar: {
zIndex: theme.zIndex.drawer + 1,
transition: theme.transitions.create(['width', 'margin'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
},
appBarShift: {
// Space for menu 'drawer' from side. Removed for now because button has gone AWOL.
// marginLeft: drawerWidth,
// width: `calc(100% - ${drawerWidth}px)`,
transition: theme.transitions.create(['width', 'margin'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
},
menuButton: {
marginRight: 36,
},
menuButtonHidden: {
display: 'none',
},
title: {
flexGrow: 1,
},
drawerPaper: {
align: 'left',
position: 'relative',
whiteSpace: 'nowrap',
width: drawerWidth,
transition: theme.transitions.create('width', {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
},
drawerPaperClose: {
overflowX: 'hidden',
transition: theme.transitions.create('width', {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
width: theme.spacing(7),
[theme.breakpoints.up('sm')]: {
width: theme.spacing(9),
},
},
appBarSpacer: theme.mixins.toolbar,
content: {
flexGrow: 1,
height: '100vh',
overflow: 'auto',
},
container: {
paddingTop: theme.spacing(4),
paddingBottom: theme.spacing(4),
},
paper: {
padding: theme.spacing(2),
display: 'flex',
overflow: 'auto',
flexDirection: 'column',
},
fixedHeight: {
height: 240,
},
}));
export default function Dashboard() {
var user = firebase.auth().currentUser;
// var name, email, uid, emailVerified;
if (user != null) {
// name = user.displayName;
// email = user.email;
// emailVerified = user.emailVerified;
// uid = user.uid;
}
const classes = useStyles();
const [open, setOpen] = React.useState(true);
const handleDrawerOpen = () => {
setOpen(true);
};
const handleDrawerClose = () => {
setOpen(false);
};
const fixedHeightPaper = clsx(classes.paper, classes.fixedHeight);
return (
<div className={classes.root}>
<CssBaseline />
<AppBar position="absolute" className={clsx(classes.appBar, open && classes.appBarShift)}>
<Toolbar className={classes.toolbar}>
<IconButton
edge="start"
color="inherit"
aria-label="open drawer"
onClick={handleDrawerOpen}
className={clsx(classes.menuButton, open && classes.menuButtonHidden)}
>
<MenuIcon />
</IconButton>
<Typography component="h1" variant="h6" color="inherit" noWrap className={classes.title}>
CompForge
</Typography>
<IconButton color="inherit">
<Badge badgeContent={4} color="secondary">
<NotificationsIcon />
</Badge>
</IconButton>
</Toolbar>
</AppBar>
<Drawer
variant="permanent"
classes={{
paper: clsx(classes.drawerPaper, !open && classes.drawerPaperClose),
}}
open={open}
>
<div className={classes.toolbarIcon}>
<IconButton onClick={handleDrawerClose}>
<ChevronLeftIcon />
</IconButton>
</div>
<Divider />
<List>{mainListItems}</List>
<Divider />
<List>{secondaryListItems}</List>
</Drawer>
<main className={classes.content}>
<div className={classes.appBarSpacer} />
<Container maxWidth="lg" className={classes.container}>
<Grid container spacing={3}>
{/* Forms */}
<Grid item xs={12}>
<Paper className={classes.paper}>
<Forms />
</Paper>
</Grid>
{/* Partners */}
<Grid item xs={12} md={4} lg={6}>
<Paper className={fixedHeightPaper}>
<Partners />
</Paper>
</Grid>
</Grid>
<Box pt={4}>
<Copyright />
</Box>
</Container>
</main>
</div>
);
}
\ No newline at end of file
compforge/src/pages/PageNotFound.js
+ 9
− 187
View file @ c50c4928
import React from 'react';
import clsx from 'clsx';
import { makeStyles } from '@material-ui/core/styles';
import CssBaseline from '@material-ui/core/CssBaseline';
import Drawer from '@material-ui/core/Drawer';
import Box from '@material-ui/core/Box';
import AppBar from '@material-ui/core/AppBar';
import Toolbar from '@material-ui/core/Toolbar';
import List from '@material-ui/core/List';
import Typography from '@material-ui/core/Typography';
import Divider from '@material-ui/core/Divider';
import IconButton from '@material-ui/core/IconButton';
import Badge from '@material-ui/core/Badge';
import Container from '@material-ui/core/Container';
import Grid from '@material-ui/core/Grid';
import Paper from '@material-ui/core/Paper';
import Link from '@material-ui/core/Link';
import MenuIcon from '@material-ui/icons/Menu';
import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
import NotificationsIcon from '@material-ui/icons/Notifications';
import { mainListItems, secondaryListItems } from '../components/Other/listItems';
import Partners from '../components/Other/Partners';
import Forms from '../components/Other/Forms';
import firebase from '../firebase';
function Copyright() {
return (
<Typography variant="body2" color="textSecondary" align="center">
{'Copyright © '}
<Link color="inherit" href="https://material-ui.com/">
<Link color="inherit" href="/">
CompForge
</Link>{' '}
{new Date().getFullYear()}
......@@ -36,173 +16,15 @@ function Copyright() {
);
}
const drawerWidth = 240;
const useStyles = makeStyles((theme) => ({
root: {
display: 'flex',
},
toolbar: {
paddingRight: 24, // keep right padding when drawer closed
},
toolbarIcon: {
display: 'flex',
alignItems: 'center',
justifyContent: 'flex-end',
padding: '0 8px',
...theme.mixins.toolbar,
},
appBar: {
zIndex: theme.zIndex.drawer + 1,
transition: theme.transitions.create(['width', 'margin'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
},
appBarShift: {
// Space for menu 'drawer' from side. Removed for now because button has gone AWOL.
// marginLeft: drawerWidth,
// width: `calc(100% - ${drawerWidth}px)`,
transition: theme.transitions.create(['width', 'margin'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
},
menuButton: {
marginRight: 36,
},
menuButtonHidden: {
display: 'none',
},
title: {
flexGrow: 1,
},
drawerPaper: {
align: 'left',
position: 'relative',
whiteSpace: 'nowrap',
width: drawerWidth,
transition: theme.transitions.create('width', {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
},
drawerPaperClose: {
overflowX: 'hidden',
transition: theme.transitions.create('width', {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
width: theme.spacing(7),
[theme.breakpoints.up('sm')]: {
width: theme.spacing(9),
},
},
appBarSpacer: theme.mixins.toolbar,
content: {
flexGrow: 1,
height: '100vh',
overflow: 'auto',
},
container: {
paddingTop: theme.spacing(4),
paddingBottom: theme.spacing(4),
},
paper: {
padding: theme.spacing(2),
display: 'flex',
overflow: 'auto',
flexDirection: 'column',
},
fixedHeight: {
height: 240,
},
}));
export default function PageNotFound() {
var user = firebase.auth().currentUser;
// var name, email, uid, emailVerified;
if (user != null) {
// name = user.displayName;
// email = user.email;
// emailVerified = user.emailVerified;
// uid = user.uid;
}
const classes = useStyles();
const [open, setOpen] = React.useState(true);
const handleDrawerOpen = () => {
setOpen(true);
};
const handleDrawerClose = () => {
setOpen(false);
};
const fixedHeightPaper = clsx(classes.paper, classes.fixedHeight);
return (
<div className={classes.root}>
<CssBaseline />
<AppBar position="absolute" className={clsx(classes.appBar, open && classes.appBarShift)}>
<Toolbar className={classes.toolbar}>
<IconButton
edge="start"
color="inherit"
aria-label="open drawer"
onClick={handleDrawerOpen}
className={clsx(classes.menuButton, open && classes.menuButtonHidden)}
>
<MenuIcon />
</IconButton>
<Typography component="h1" variant="h6" color="inherit" noWrap className={classes.title}>
CompForge
</Typography>
<IconButton color="inherit">
<Badge badgeContent={4} color="secondary">
<NotificationsIcon />
</Badge>
</IconButton>
</Toolbar>
</AppBar>
<Drawer
variant="permanent"
classes={{
paper: clsx(classes.drawerPaper, !open && classes.drawerPaperClose),
}}
open={open}
>
<div className={classes.toolbarIcon}>
<IconButton onClick={handleDrawerClose}>
<ChevronLeftIcon />
</IconButton>
</div>
<Divider />
<List>{mainListItems}</List>
<Divider />
<List>{secondaryListItems}</List>
</Drawer>
<main className={classes.content}>
<div className={classes.appBarSpacer} />
<Container maxWidth="lg" className={classes.container}>
<Grid container spacing={3}>
{/* Forms */}
<Grid item xs={12}>
<Paper className={classes.paper}>
<Forms />
</Paper>
</Grid>
{/* Partners */}
<Grid item xs={12} md={4} lg={6}>
<Paper className={fixedHeightPaper}>
<Partners />
</Paper>
</Grid>
</Grid>
<Box pt={4}>
<Copyright />
</Box>
</Container>
</main>
</div>
<div>
<h1>Page not found</h1>
<Link href="/">
Click here to return to the dashboard
</Link>
<p></p>
<Copyright />
</div>
);
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment