Skip to content

Commit

Permalink
Merge pull request #88 from CBIIT/release2-prep
Browse files Browse the repository at this point in the history
remove mockUsers
  • Loading branch information
debosarkar authored Apr 27, 2020
2 parents 112c976 + 8df38cb commit 3953ad3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions src/pages/pageWrapper.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react';
import { Link as RouterLink } from "@reach/router"
import {
Button,
Container,
Link,
} from '@material-ui/core';
// import { Link as RouterLink } from "@reach/router"
// import {
// Button,
// Container,
// Link,
// } from '@material-ui/core';
import { makeStyles } from '@material-ui/core/styles'

import Header from '../components/region/Header/Header'
Expand Down Expand Up @@ -36,11 +36,11 @@ const pageWrapper = (Component) => ({children, ...props}) => {
<div className="siteWrapper"> {/* returning a fragment here does not work in ie11 */}
<Header />
<div id="main" className={classes.main} role="main">
<Container style={{position:"relative"}}>
{/* <Container style={{position:"relative"}}>
<Link component={RouterLink} to='/mock-users' className={classes.mockUsers}>
<Button variant="outlined" color="primary">Mock User</Button>
</Link>
</Container>
</Container> */}
<Component {...props} />
</div>
<Footer />
Expand Down
4 changes: 2 additions & 2 deletions src/routers/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Privacy from '../pages/participation/PrivacyPage'
import Activate from '../pages/participation/ActivatePage'

// imports for dashboard pages
import MockUsersPage from '../pages/MockUsersPage'
// import MockUsersPage from '../pages/MockUsersPage'
import Dashboard from '../pages/dashboard/DashboardPage'
import SignInCallback from '../pages/dashboard/SignInCallback'
import DashboardMocha from '../pages/dashboard/DashboardMochaPage'
Expand Down Expand Up @@ -111,7 +111,7 @@ export default () => (

<SignInCallbackPage path='/signin' />
<PrivateRoute path='/account' component={DashboardPage} />
<MockUsersPage path='/mock-users' />
{/* <MockUsersPage path='/mock-users' /> */}
<PrivateRoute path='/account-mocha' component={DashboardMochaPage} />
<PrivateRoute path='/account/notifications' component={NotificationsPage} />
<PrivateRoute path='/account/consent' component={ConsentPage} />
Expand Down

0 comments on commit 3953ad3

Please sign in to comment.