Merge branch 'master' of github.com:CodeForPhilly/paws-data-pipeline into 494-logging

Author: Osman

src/client/package-lock.json

@@ -3,6 +3,7 @@
     "version": "0.1.0",
     "private": true,
     "dependencies": {
+        "@hookform/resolvers": "^3.1.0",
         "@material-ui/core": "^4.9.14",
         "@material-ui/icons": "^4.9.1",
         "@material-ui/lab": "^4.0.0-alpha.53",
@@ -15,8 +16,10 @@
         "moment": "^2.29.1",
         "react": "^16.13.1",
         "react-dom": "^16.13.1",
+        "react-hook-form": "^7.43.9",
         "react-router-dom": "^5.2.0",
-        "react-scripts": "3.4.1"
+        "react-scripts": "3.4.1",
+        "yup": "^1.1.1"
     },
     "scripts": {
         "start": "IS_LOCAL=false react-scripts start",

src/client/package.json

@@ -18,6 +18,7 @@ import Refresh from './components/Refresh';
 import useToken from './pages/Login/useToken';
 import Box from "@material-ui/core/Box";
 import {RFM} from "./pages/RFM/RFM";
+import UserManagement from './pages/UserManagement/UserManagement';
 
 let jwt = require('jsonwebtoken');
 
@@ -157,6 +158,11 @@ function AuthenticatedApp() {
                             <Refresh/>
                         </Route>
 
+                        <Route path="/users">
+                            <UserManagement access_token={access_token}/>
+                        </Route>
+
+
                     </Switch>
             }
 

src/client/src/App.js

@@ -26,6 +26,9 @@ class Header extends Component {
                             {this.props.headerType === 'Admin' &&
                             <Button size="large" component={RouterLink} to="/admin">Admin</Button>}
 
+                            {this.props.headerType === 'Admin' &&
+                            <Button size="large" component={RouterLink} to="/users">Users</Button>}
+
                             {this.props.headerType !== 'Login' && <Button size="large" component={RouterLink} to="/360view/search">360
                                 DataView</Button>
                             }

src/client/src/components/Header.js

@@ -18,6 +18,13 @@ const DEVELOPERS = [
     "Andrew Bishop",
     "Akshat Vas",
     "Dan Kelley",
+    "Osman Sabahat",
+    "Stephen Carroll",
+    "Diego Delgado",
+    "Carlos Dominguez",
+    "Benjamin Deck",
+    "Sam Lufi",
+    "Ruthie Fields",
 ]
 
 const PROJECT_MANAGERS = [
@@ -37,7 +44,8 @@ const EXTERNAL_COLLABORATORS = [
     "Tan Tan Chen",
     "Faith Benamy",
     "Jesse",
-    "Chris Alfano"
+    "Chris Alfano",
+    "Josephine Dru",
 ]
 
 const SUPPORTERS = [
@@ -89,7 +97,7 @@ export default function About() {
                 </Grid>
                 <Grid item>
                     <Typography>{_.size(DEVELOPERS) + _.size(PROJECT_MANAGERS) + _.size(PROJECT_LEADS) + _.size(EXTERNAL_COLLABORATORS)} individuals and {_.size(SUPPORTERS)} organisations supported and contributed to the PDP between
-                        2019/11/24 and 2021/05/01:</Typography>
+                        2019/11/24 and 2023/06/13:</Typography>
                 </Grid>
                 <Grid item>
                     <Typography variant={"h3"}>Developers</Typography>