Feature/wms 41 (#38)

* tileGrid page

* Updated: Tile component props

* TileBasic Component Changes

* Basic Tile Changes

* bug fix

* location form changes

* props pass to dropdown

* list users page

* user access changes

* user and access

* tabs changes

* Removed: Duplicate import

* Removed: extra tile component

* Resolved: Linter errors

* Undo: BasicTable conflict

* Resolved: PropTypes error

Co-authored-by: [Diksha] <[diksha39511@gmail.com]>
Co-authored-by: Llewellyn D'souza <lledsouza2209@gmail.com>
This commit is contained in:
Dikshajain39511
2022-02-01 13:07:31 +05:30
committed by GitHub
parent a99feeea7e
commit ab4aa065fd
4 changed files with 237 additions and 7 deletions

View File

@@ -28,6 +28,7 @@ const row = (x, i, header) => (
))}
</TableRow>
);
export default function BasicTable({ data, header, backgroundColor }) {
const classes = useStyles();
const TableContainer = styled('div')(

View File

@@ -0,0 +1,12 @@
import React from 'react';
import PropTypes from 'prop-types';
export default function TabPanel({ children, value, index }) {
return <div>{value === index && <h1>{children}</h1>}</div>;
}
TabPanel.propTypes = {
children: PropTypes.node,
value: PropTypes.number,
index: PropTypes.number
};

View File

@@ -0,0 +1,210 @@
import MDBox from 'components/MDBox';
import DashboardNavbar from 'components/DashboardNavbar';
import Footer from 'components/Footer';
import DashboardLayout from 'layouts/DashboardLayout';
import { makeStyles } from '@mui/styles';
import BasicTable from 'components/BasicTable';
import { Grid } from '@mui/material';
import SearchBar from 'components/SearchBar';
import MDButton from 'components/Button';
import { useState } from 'react';
import EditIcon from '@mui/icons-material/Edit';
import { Tabs, Tab } from '@mui/material';
import TabPanel from 'components/Tabs';
const useStyles = makeStyles({
iconSize: {
width: '50%',
height: '50%',
marginBottom: '10px'
},
margin: {
marginBottom: '20px'
},
wrap: {
display: 'flex'
},
marginTable: {
marginTop: '20px'
},
tabs: {
'& .MuiButtonBase-root.MuiTab-root': {
padding: '12px 0px',
borderRadius: '0px'
},
'& .Mui-selected': {
textDecoration: 'underline',
backgroundColor: '#017AFF'
}
}
});
function UserAccessScreen() {
const classes = useStyles();
const [value, setValue] = useState(0);
const handleTabs = (e, val) => {
setValue(val);
};
const header = [
{
name: '',
prop: 'icon'
},
{
name: 'User Name',
prop: 'username'
},
{
name: 'Phone Number',
prop: 'phonenumber'
},
{
name: 'Roles',
prop: 'roles'
},
{
name: 'Last Updated by & Date',
prop: 'lastupdated'
},
{
name: 'Created by & Date',
prop: 'Createdby'
},
{
name: 'Last Login',
prop: 'lastlogin'
},
{
name: 'Access',
prop: 'access'
}
];
const data = [
{
icon: <EditIcon />,
username: 'Floyd Miles',
phonenumber: '(704)555-0127',
roles: 'Administrator',
lastupdated: 'System| 1/1/2022 11:23:00 AM',
Createdby: 'System| 1/1/2022 11:23:00 AM',
lastlogin: 'System| 1/1/2022 11:23:00 AM',
access: 'Active'
},
{
icon: <EditIcon />,
username: 'Floyd Miles',
phonenumber: '(704)555-0127',
roles: 'Administrator',
lastupdated: 'System| 1/1/2022 11:23:00 AM',
Createdby: 'System| 1/1/2022 11:23:00 AM',
lastlogin: 'System| 1/1/2022 11:23:00 AM',
access: 'Active'
},
{
icon: <EditIcon />,
username: 'Floyd Miles',
phonenumber: '(704)555-0127',
roles: 'Administrator',
lastupdated: 'System| 1/1/2022 11:23:00 AM',
Createdby: 'System| 1/1/2022 11:23:00 AM',
lastlogin: 'System| 1/1/2022 11:23:00 AM',
access: 'Active'
},
{
icon: <EditIcon />,
username: 'Floyd Miles',
phonenumber: '(704)555-0127',
roles: 'Administrator',
lastupdated: 'System| 1/1/2022 11:23:00 AM',
Createdby: 'System| 1/1/2022 11:23:00 AM',
lastlogin: 'System| 1/1/2022 11:23:00 AM',
access: 'Active'
},
{
icon: <EditIcon />,
username: 'Floyd Miles',
phonenumber: '(704)555-0127',
roles: 'Administrator',
lastupdated: 'System| 1/1/2022 11:23:00 AM',
Createdby: 'System| 1/1/2022 11:23:00 AM',
lastlogin: 'System| 1/1/2022 11:23:00 AM',
access: 'Active'
},
{
icon: <EditIcon />,
username: 'Floyd Miles',
phonenumber: '(704)555-0127',
roles: 'Administrator',
lastupdated: 'System| 1/1/2022 11:23:00 AM',
Createdby: 'System| 1/1/2022 11:23:00 AM',
lastlogin: 'System| 1/1/2022 11:23:00 AM',
access: 'Active'
},
{
icon: <EditIcon />,
username: 'Floyd Miles',
phonenumber: '(704)555-0127',
roles: 'Administrator',
lastupdated: 'System| 1/1/2022 11:23:00 AM',
Createdby: 'System| 1/1/2022 11:23:00 AM',
lastlogin: 'System| 1/1/2022 11:23:00 AM',
access: 'Active'
},
{
icon: <EditIcon />,
username: 'Floyd Miles',
phonenumber: '(704)555-0127',
roles: 'Administrator',
lastupdated: 'System| 1/1/2022 11:23:00 AM',
Createdby: 'System| 1/1/2022 11:23:00 AM',
lastlogin: 'System| 1/1/2022 11:23:00 AM',
access: 'Active'
},
{
icon: <EditIcon />,
username: 'Floyd Miles',
phonenumber: '(704)555-0127',
roles: 'Administrator',
lastupdated: 'System| 1/1/2022 11:23:00 AM',
Createdby: 'System| 1/1/2022 11:23:00 AM',
lastlogin: 'System| 1/1/2022 11:23:00 AM',
access: 'Active'
}
];
return (
<DashboardLayout>
<DashboardNavbar />
<MDBox px={2} py={3}>
<Grid container spacing={2} className={classes.margin}>
<Grid item xs={12} sm={4} md={4}>
<Tabs value={value} className={classes.tabs} onChange={handleTabs}>
<Tab label="Roles" />
<Tab label="Users" />
</Tabs>
<TabPanel value={value} index={0}>
<div className={classes.marginTable}>
<BasicTable data={data} header={header} backgroundColor="#017AFF" />
</div>
</TabPanel>
<TabPanel value={value} index={1}>
Item2 Detail
</TabPanel>
</Grid>
<Grid item xs={12} sm={4} md={6}>
<SearchBar />
</Grid>
<Grid item xs={12} sm={4} md={2}>
<MDButton color="primary" size="medium">
{'+ CREATE USER'}
</MDButton>
</Grid>
</Grid>
</MDBox>
<Footer />
</DashboardLayout>
);
}
export default UserAccessScreen;

View File

@@ -45,9 +45,10 @@ import LoginScreen from 'pages/authentication';
// @mui icons
import Icon from '@mui/material/Icon';
import WarehouseScreen from 'pages/warehouse';
import LabelingScreen from 'pages/labeling';
import UserAccessScreen from 'pages/useraccess';
import NewWarehouseDetails from 'pages/newWarehouseDetails';
import SetupHome from 'pages/setup';
import LabelingScreen from 'pages/labeling';
// Images
// import profilePicture from 'assets/images/team-3.jpg';
@@ -109,17 +110,23 @@ const protectedRoutes = [
route: '/warehouse',
component: <WarehouseScreen />
},
{
name: 'New/Edit Warehouse Details',
key: 'warehouse-form',
route: '/warehouse-design-form',
component: <NewWarehouseDetails />
},
{
name: 'Labeling',
key: 'labeling',
route: '/labeling',
component: <LabelingScreen />
},
{
name: 'Users & Access',
key: 'users&access',
route: '/users&access',
component: <UserAccessScreen />
},
{
name: 'New/Edit Warehouse Details',
key: 'warehouse-form',
route: '/warehouse-design-form',
component: <NewWarehouseDetails />
}
]
}