Skip to content

Table branch #7

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

Open
aisalus wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Table branch #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c9ad5a
table commit - app css, app js and table jsx changed
aisalus Mar 30, 2021
a3e9048
title updates
aisalus Mar 30, 2021
ae05767
final commit
aisalus Mar 30, 2021
57a0f09
next
aisalus Mar 30, 2021
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
2 changes: 1 addition & 1 deletion web/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

.App-header {
background-color: #282c34;
background-color: #190036;
min-height: 100vh;
display: flex;
flex-direction: column;
Expand Down
18 changes: 11 additions & 7 deletions web/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import Grid from '@material-ui/core/Grid';
import Typography from '@material-ui/core/Typography';
import axios from 'axios';
import { makeStyles } from '@material-ui/core/styles';
import { SimpleAccordion } from './components/accordion';


function App() {
// const [data, setData] = useState([{"id": 1, "employee_id": 6298, "month": "January", "exercise_time": 224, "social_interaction_time": 60, "work_time": 2220, "sleep_time": 2100}, {"id": 2, "employee_id": 6299, "month": "January", "exercise_time": 224, "social_interaction_time": 60, "work_time": 2220, "sleep_time": 2100}]);
Expand All @@ -24,10 +26,9 @@ function App() {

const classes = useStyles();


const [data, setData] = useState([])
const [dataLoad, setDataLoad] = useState(false)
const url = 'http://localhost:5000/'
const url = 'http://localhost:5000/alldata'
useEffect(async () => {
const result = await axios({
url: url,
Expand All @@ -44,24 +45,27 @@ function App() {
setDataLoad(true);
},[dataLoad]);



return (
<div className="App">

<ButtonAppBar/>
<Grid container spacing={1}>
<Grid item xs={12} sm={6} className={classes.table}>
<Grid item xs={12} sm={12} className={classes.table}>
<Typography variant="h4">
Employee Metric Data
</Typography>
<BasicTable data={data}/>
</Grid>
<Grid item xs={12} sm={6}>
<Grid item xs={12} sm={12}>
<Typography variant="h4">
Progress Chart
Employee Data - January
</Typography>
<Example/>
</Grid>
</Grid>
<CustomizedTimeline/>
<SimpleAccordion/>
</div>
);
}
Expand Down
Loading