Merge pull request #8 in NP/ncippe-front-end from NCIPPE-40--download…

…-document to master Squashed commit of the following: commit 496e2a34d2eb9ca9e366bd16c0db52462b9275e7 Author: alifr <[email protected]> Date: Thu Aug 8 11:54:53 2019 -0400 minor css adjustments commit ba7f45f0a3b9821b43ec925064f8aad26b7822d4 Author: alifr <[email protected]> Date: Wed Aug 7 16:52:30 2019 -0400 swap s3 link for real pdf for now commit dd64573b8f6448926ac035bd8707178b4c020320 Author: alifr <[email protected]> Date: Wed Aug 7 16:51:58 2019 -0400 remove react-router-dom references
CBIIT · Aug 8, 2019 · a11e5b1 · a11e5b1
1 parent 7ae0d80
commit a11e5b1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/src/App.js b/src/App.js
@@ -1,5 +1,4 @@
 import React from 'react'
-import { BrowserRouter } from 'react-router-dom'
 import { makeStyles } from '@material-ui/core/styles'
 import { Container, CssBaseline } from '@material-ui/core'
 
@@ -25,18 +24,16 @@ const App = () => {
   const classes = useStyles()
   return (
     <LoginProvider>
-      <BrowserRouter>
-        <CssBaseline />
-        <div className={classes.App}>
-          <Container>
-            <Header />
-          </Container>
-          <main className={classes.main}>
-            <Routes />
-          </main>
-          <Footer />
-        </div>
-      </BrowserRouter>
+      <CssBaseline />
+      <div className={classes.App}>
+        <Container>
+          <Header />
+        </Container>
+        <main className={classes.main}>
+          <Routes />
+        </main>
+        <Footer />
+      </div>
     </LoginProvider>
   );
 }

diff --git a/src/components/TestResults/TestResultsItem.js b/src/components/TestResults/TestResultsItem.js
@@ -43,10 +43,10 @@ const TestResultsItem = ({report}) => {
         <Typography>{moment(timestamp).format("MMM Do YYYY")}</Typography>
         </CardContent>
         <CardActions className={classes.cardAction}>
-          <Link href={s3Url} rel="noopener noreferrer" target="_blank" underline="none">
+          <Link href={`/assets/documents/important-document.pdf`} rel="noopener noreferrer" target="_blank" underline="none">
             <Button color="primary" variant="text"><LaunchIcon />View</Button>
           </Link>
-          <Link href={s3Url} rel="noopener noreferrer" target="_blank" underline="none">
+          <Link href={`/assets/documents/important-document.pdf`} download="important-document.pdf" underline="none">
             <Button color="primary" variant="text"><GetAppIcon />Download</Button>
           </Link>
         </CardActions>

diff --git a/src/components/region/Header/Header.js b/src/components/region/Header/Header.js
@@ -5,8 +5,6 @@ import {
   Typography, 
 } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles'
-
-// import { Link as RouterLink } from 'react-router-dom'
 import { Link as RouterLink } from "@reach/router"
 
 import LoginButton from '../../login/SharedLogin/LoginButton'

diff --git a/src/index.css b/src/index.css
@@ -61,12 +61,13 @@ main {
 .zoom-enter,
 .zoom-enter-done {
   z-index: 2;
+  background-color: #fafafa;
   position: fixed;
   top: 0;
   right: 0;
   left: 0;
   height: 100vh;
-  background-color: #fafafa;
+  overflow: auto;
 }
 
 .zoom-exit {

diff --git a/src/pages/MockRoles.js b/src/pages/MockRoles.js
@@ -10,7 +10,6 @@ const useStyles = makeStyles(theme => ({
   root: {
     display: 'flex',
     flexDirection: 'column',
-    height: '80vh',
     alignItems: 'center',
     marginTop: '4vw'