Final bug fixes and updates for release

package.json

@@ -1,12 +1,13 @@
 {
   "name": "resumebook",
-  "version": "0.1.0",
+  "version": "1.22.10",
   "private": true,
   "dependencies": {
     "@material-ui/core": "^4.9.14",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.56",
     "@reduxjs/toolkit": "^1.3.6",
+    "file-saver": "^2.0.5",
     "query-string": "^6.13.6",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",

src/App.js

@@ -13,6 +13,7 @@ import Logout from './routes/logout/index'
 import Upload from './routes/upload/index'
 import Officer from './routes/officer/index'
 import OfficerVerification from './routes/officer/verify'
+import Cart from './routes/cart/index'
 import NoMatch from './routes/404'
 import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles'
 import { green } from '@material-ui/core/colors'
@@ -191,11 +192,16 @@ function App() {
             path="/logout"
             render={(routerProps) => <Logout {...routerProps} classes={classes} />}
           />
-          <LoggedInRoute
+          <Route
             exact
             path="/upload"
             render={(routerProps) => <Upload {...routerProps} classes={classes} />}
           />
+          <Route
+            exact
+            path="/cart"
+            render={(routeProps) => <Cart {...routeProps} classes={classes} />}
+          />
           <Route
             render={(routerProps) => <NoMatch {...routerProps} classes={classes} />}
           />

src/AuthWrapper.js

@@ -3,6 +3,9 @@ import { connect } from 'react-redux'
 import PropTypes from 'prop-types'
 import App from './App'
 import React from 'react'
+import LoadingIndicator from './components/LoadingIndicator'
+import { ENDPOINT } from './utils/config'
+
 // Parent
 class AuthWrapper extends React.Component {
   constructor(props) {
@@ -13,21 +16,20 @@ class AuthWrapper extends React.Component {
   }
 
   async componentDidMount() {
-    if (JSON.parse(localStorage.getItem('isLoggedIn')) === true) {
-      const verificationStatus =
-        JSON.parse(localStorage.getItem('verified')) === true ? true : false
-      const officerStatus =
-        JSON.parse(localStorage.getItem('officer')) === true ? true : false
-      await this.props.loginSuccess(verificationStatus, officerStatus)
-    }
+    await fetch(`${ENDPOINT}/auth/loginStatus`).then(async (res) => {
+      if (res.status === 200) {
+        res = await res.json()
+        await this.props.loginSuccess(res.verified, res.officer)
+      }
+    })
     this.setState({ authVerified: true })
   }
 
   render() {
     if (this.state.authVerified) {
       return <App />
     } else {
-      return null
+      return <LoadingIndicator />
     }
   }
 }

src/components/CartNavBar.js

@@ -3,6 +3,8 @@ import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import PersonIcon from '@material-ui/icons/Person'
 import Typography from '@material-ui/core/Typography'
+import './styles/NavBar.sass'
+import { withRouter } from 'react-router-dom'
 
 class Cart extends React.Component {
   constructor() {
@@ -12,7 +14,7 @@ class Cart extends React.Component {
 
   render() {
     return (
-      <div id="cart-navbar">
+      <div id="cart-navbar" onClick={() => this.props.history.push('/cart')}>
         <Typography className={this.props.classes.cartText}>
           {this.props.numInCart}
         </Typography>
@@ -25,11 +27,12 @@ class Cart extends React.Component {
 Cart.propTypes = {
   classes: PropTypes.object.isRequired,
   numInCart: PropTypes.number.isRequired,
+  history: PropTypes.any.isRequired,
 }
 
 const mapStateToProps = (state) => {
   const { numInCart } = state.cart
   return { numInCart: numInCart }
 }
 
-export default connect(mapStateToProps)(Cart)
+export default connect(mapStateToProps)(withRouter(Cart))

src/components/CartRow.js

@@ -0,0 +1,97 @@
+import React, { useState } from 'react'
+import PropTypes from 'prop-types'
+import Collapse from '@material-ui/core/Collapse'
+import TableCell from '@material-ui/core/TableCell'
+import TableRow from '@material-ui/core/TableRow'
+import Button from '@material-ui/core/Button'
+import DownloadButton from '../components/DownloadButton'
+import RemoveButton from '../components/RemoveButton'
+import { PDFObject } from 'react-pdfobject'
+
+import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles'
+import './Row.css'
+
+const greenTheme = createMuiTheme({
+  palette: { primary: { 500: '#28a745' } },
+})
+
+function ApprovalRow(props) {
+  const [expanded, setExpanded] = useState(false)
+
+  const details = expanded ? (
+    <TableRow>
+      <TableCell colSpan={4} id={`u${props.data._id}`}>
+        <Collapse in={expanded} unmountOnExit={true}>
+          <PDFObject
+            url={props.data.resume}
+            height="500px"
+            containerId={`u${props.data._id}`}
+          />
+        </Collapse>
+      </TableCell>
+    </TableRow>
+  ) : (
+    <React.Fragment />
+  )
+
+  return (
+    <React.Fragment>
+      <TableRow>
+        <TableCell component="th" scope="row">
+          {props.data.linkedin ? (
+            <a
+              style={{
+                textDecoration: 'none',
+                color: 'inherit',
+                display: 'inline',
+              }}
+              target="_blank"
+              rel="noopener noreferrer"
+              href={props.data.linkedin}
+            >
+              <i
+                className="fa fa-linkedin-square mr-1"
+                aria-hidden="true"
+                style={{
+                  fontSize: '20px',
+                  color: '#0077B5',
+                }}
+              ></i>{' '}
+              <p>{props.data.name}</p>
+            </a>
+          ) : (
+            <p>{props.data.name}</p>
+          )}
+        </TableCell>
+        <TableCell align="left">
+          <p>{props.data.major}</p>
+        </TableCell>
+        <TableCell align="left">
+          <p>{props.data.standing}</p>
+        </TableCell>
+        <TableCell align="left">
+          <Button
+            variant="outlined"
+            size="medium"
+            style={{ marginRight: '8px' }}
+            onClick={() => setExpanded(!expanded)}
+            color="primary"
+          >
+            View
+          </Button>
+          <MuiThemeProvider theme={greenTheme}>
+            <DownloadButton candidate={props.data} />
+            <RemoveButton candidate={`${props.data}`} />
+          </MuiThemeProvider>
+        </TableCell>
+      </TableRow>
+      {details}
+    </React.Fragment>
+  )
+}
+
+ApprovalRow.propTypes = {
+  data: PropTypes.object.isRequired,
+}
+
+export default ApprovalRow

src/components/CartSearchBar.js

@@ -0,0 +1,33 @@
+import React from 'react'
+import TextField from '@material-ui/core/TextField'
+import { filterNameAdd, filterNameDel } from '../redux/actions'
+import { useDispatch, useSelector } from 'react-redux'
+import PropTypes from 'prop-types'
+
+function CartSearchBar(props) {
+  const search = useSelector((state) => state.data.search)
+  const dispatch = useDispatch()
+
+  return (
+    <TextField
+      id="outlined-basic"
+      label="Search"
+      variant="outlined"
+      value={search}
+      margin="dense"
+      className={props.classes.searchBar}
+      onChange={(e) => {
+        const updatedSearch = e.target.value
+        updatedSearch.length > search.length
+          ? dispatch(filterNameAdd(updatedSearch))
+          : dispatch(filterNameDel(updatedSearch))
+      }}
+    />
+  )
+}
+
+CartSearchBar.propTypes = {
+  classes: PropTypes.object.isRequired,
+}
+
+export default CartSearchBar