Skip to content

Commit

Permalink
Merge pull request #83 from jothamyelle/feature/dashboard-view-buttons
Browse files Browse the repository at this point in the history
Feature/dashboard view buttons
  • Loading branch information
j-dowell committed Oct 2, 2018
2 parents e37902f + 4acaace commit 343ff8b
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions src/App/pages/AdminDashboard.js
Expand Up @@ -16,6 +16,7 @@ import { orange300 } from 'material-ui/styles/colors';
import SimpleSlide from '../components/AdminDashboardSlide'
import SimpleGrow from '../components/AdminDashboardGrow'
import Header from './Header/Header';
import { Link } from 'react-router-dom';

import Grow from '@material-ui/core/Grow';

Expand Down Expand Up @@ -94,7 +95,7 @@ class AdminDashboard extends Component {
return(
<TableRow key={form.formId}>
<TableRowColumn>{form.type}</TableRowColumn>
<TableRowColumn><FlatButton backgroundColor={orange300}>View</FlatButton></TableRowColumn>
<TableRowColumn><Link style={{textDecoration: 'none'}} to={`/form_submissions/${form.formId}`}><FlatButton backgroundColor="orange">View</FlatButton></Link></TableRowColumn>
</TableRow>
)})
}
Expand Down Expand Up @@ -128,20 +129,7 @@ class AdminDashboard extends Component {
<div>
<Header />
<br/>

<SimpleGrow todaysForms={todaysForms} todaysJobs={todaysJobs} todaysFormsNumber={todaysFormsNumber} todaysJobsNumber={todaysJobsNumber}/>
{/* <SimpleSlide todaysFormsNumber={todaysFormsNumber} todaysJobsNumber={todaysJobsNumber}/> */}
{/* <Typography variant="display3" gutterBottom align="center">
Good Morning Ben. <br/>Currently {todaysFormsNumber} forms from {todaysJobsNumber} active jobs
</Typography> */}

{/* <Typography variant="display2" gutterBottom align="center">
Today's Forms
</Typography> */}

{/* <Typography variant="display2" gutterBottom align="center">
Today's Active Jobs
</Typography> */}
<SimpleGrow todaysForms={todaysForms} todaysJobs={todaysJobs} todaysFormsNumber={todaysFormsNumber} todaysJobsNumber={todaysJobsNumber}/>
</div>
)
}
Expand Down

0 comments on commit 343ff8b

Please sign in to comment.