Merge pull request #32 from michacurri/develop

Develop

api/controllers/profileController.js

@@ -6,6 +6,7 @@ const Profile = require("../models/profileModel");
 
 module.exports = {
   createProfile: async ({
+    admin,
     firstName,
     lastName,
     email,
@@ -14,6 +15,7 @@ module.exports = {
     workorders,
   }) => {
     const newProfile = new Profile({
+      admin,
       firstName,
       lastName,
       phone,
@@ -36,12 +38,11 @@ module.exports = {
   },
   findProfileById: async (id) => {
     try {
-      const profile = await Profile.findById(id)
-      .populate("workorders")
-      .exec();
+      const profile = await Profile.findById(id).populate("workorders").exec();
       //* return everything but password
       return {
         id: profile._id,
+        admin: profile.admin,
         firstName: profile.firstName,
         lastName: profile.lastName,
         email: profile.email,
@@ -51,4 +52,22 @@ module.exports = {
       throw err;
     }
   },
+  findProfileByAny: async (inputValue) => {
+    try {
+      const profileRes = await Profile.find({
+        $or: [
+          { firstName: inputValue },
+          { lastName: inputValue },
+          { email: inputValue },
+          // TODO - mongoose.js CastError: Cast to number failed for value
+          // { phone: inputValue },
+        ],
+      })
+        .populate("workorders")
+        .exec();
+      return profileRes;
+    } catch (err) {
+      throw err;
+    }
+  },
 };

api/models/profileModel.js

@@ -9,6 +9,11 @@ const { Schema } = mongoose;
 
 const profileSchema = new Schema(
   {
+    admin: {
+      type: Boolean,
+      required: true,
+      default: false,
+    },
     firstName: {
       type: String,
       required: true,
@@ -20,20 +25,28 @@ const profileSchema = new Schema(
     phone: {
       type: Number,
       required: true,
+      minlength: 10,
+      maxlength: 11,
+      match: /^\D?(\d{3})\D?\D?(\d{3})\D?(\d{4})$/,
     },
     email: {
       type: String,
-      required: true,   
+      required: true,
       unique: true,
+      match: /^.+@.+$/,
     },
     password: {
       type: String,
       required: true,
+      minlength: 8,
+      match: /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})/,
     },
-    workorders: [{
-      type: Schema.Types.ObjectId,
-      ref: 'Workorder'
-    }] 
+    workorders: [
+      {
+        type: Schema.Types.ObjectId,
+        ref: "Workorder",
+      },
+    ],
   },
   {
     timestamps: { createdAt: "created_at", updatedAt: "updated_at" },

api/routes/profileRoutes.js

@@ -3,12 +3,12 @@ const {
   createProfile,
   findProfileByEmail,
   findProfileById,
+  findProfileByAny,
 } = require("../controllers/profileController");
 const { verifyToken } = require("../middleware/verifyToken");
 const { createToken } = require("../tokens/tokenService");
 
 const router = express.Router();
-// router.get("/search/email/:email", findProfileByEmail);
 
 router.route("/create").post(async (req, res) => {
   const { firstName, lastName, email, phone, password } = req.body;
@@ -54,7 +54,6 @@ router.route("/create").post(async (req, res) => {
 });
 
 router.route("/login").post(async (req, res) => {
-  console.log("route: login");
   const { email, password } = req.body;
   if (!email || email === " ") {
     res.status(400).json({ message: "email must be provided" });
@@ -87,13 +86,34 @@ router.route("/login").post(async (req, res) => {
   }
 });
 
-// where workorder route used to be
+router
+.route("/search/:searchValue")
+.get(async (req, res) => {
+  const { searchValue } = req.params;
+  if (!searchValue || searchValue === "") {
+    res.status(400).json({ message: "nothing to search" });
+    return;
+  } else {
+    try {
+      const match = await findProfileByAny(searchValue);
+      if (!match) {
+        res
+          .status(400)
+          .json({ message: `Search for "${searchValue}" returned no results` });
+        return;
+      }
+      res.status(200).json(match);
+    } catch (err) {
+      console.log(err);
+      res.status(500).json({ message: "Internal server error" });
+    }
+  }
+});
 
 router
   .use(verifyToken)
   .route("/this-profile")
   .get(async (req, res) => {
-    // console.log(`/this-profile: ${req.profile.id}`);
     try {
       const profile = await findProfileById(req.profile.id);
       res.json({ data: profile });

package.json

@@ -21,10 +21,12 @@
     "object-path": "^0.11.5",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
+    "react-input-mask": "^2.0.4",
     "react-router-dom": "^5.2.0",
     "react-scripts": "^4.0.1",
     "react-virtualized": "^9.22.3"
   },
+  "proxy": "http://localhost:5000",
   "scripts": {
     "start:client": "react-scripts start",
     "start:server": "nodemon server.js --ignore src",

server.js

@@ -1,5 +1,4 @@
 const express = require("express");
-const app = express();
 const path = require("path");
 require("dotenv/config");
 const cors = require("cors");
@@ -9,12 +8,15 @@ const mongoose = require("mongoose");
 const DB_URI = process.env.DB_URI || "mongodb://localhost:27017/aero";
 const PORT = process.env.PORT || 5000;
 
-app.use(cookieParser());
-app.use(express.json());
+const app = express();
 app.use(express.urlencoded({ extended: true }));
+app.use(express.json());
+app.use(cookieParser());
 app.use(
   cors({
-    origin: "http://localhost:3000/" || "https://aero-workorder-management.herokuapp.com",
+    origin:
+      "http://localhost:3000/" ||
+      "https://aero-workorder-management.herokuapp.com",
     credentials: true,
     exposedHeaders: ["Set-Cookie"],
     allowedHeaders: ["Content-Type", "Authorization"],
@@ -27,30 +29,30 @@ const workorder = require("./api/routes/workorderRoutes");
 app.use("/api/profile", profile);
 app.use("/api/workorder", workorder);
 
-if (process.env.NODE_ENV === 'production') {
-  app.use(express.static('./build'));
+if (process.env.NODE_ENV === "production") {
+  app.use(express.static("./build"));
   // only add this part if you are using React Router
-  app.get('/*', (req,res) =>{
-      console.log(path.join(__dirname+'/build/index.html'));
-      res.sendFile(path.join(__dirname+'/build/index.html'));
+  app.get("/*", (req, res) => {
+    console.log(path.join(__dirname + "/build/index.html"));
+    res.sendFile(path.join(__dirname + "/build/index.html"));
   });
 }
 
+app.use(express.static("/"));
+
 mongoose
   .connect(DB_URI, {
     useNewUrlParser: true,
     useUnifiedTopology: true,
     useCreateIndex: true,
   })
   .then(() => {
+    app.listen(PORT, function () {
+      console.log(`Server is now listening on port ${PORT}!`);
+    });
     console.log(`Successfully connected to database server ${DB_URI}`);
   })
   .catch((err) => {
     console.log({ error: err });
   });
 
-app.use(express.static("/"));
-
-app.listen(PORT, function () {
-  console.log(`Server is now listening on port ${PORT}!`);
-});

src/backend/authorization/AuthContainer.js

@@ -39,8 +39,8 @@ const useStyles = makeStyles((theme) => ({
   grid: {
     maxWidth: "calc(50% - 16px)",
     flexGrow: "50%",
-    flexBasis: "200px"
-  }
+    flexBasis: "200px",
+  },
 }));
 
 const AuthContainer = ({ loadUserProfile }) => {
@@ -76,6 +76,7 @@ const AuthContainer = ({ loadUserProfile }) => {
       loadUserProfile();
     } catch (err) {
       setError(err.message);
+      console.log(error);
     }
   };
 
@@ -95,6 +96,8 @@ const AuthContainer = ({ loadUserProfile }) => {
               <Grid item className={classes.grid}>
                 <Paper className={classes.paperText}>
                   <TextField
+                    autoFocus
+                    type="email"
                     id="email"
                     label="Email Address"
                     name="email"
@@ -108,6 +111,7 @@ const AuthContainer = ({ loadUserProfile }) => {
               <Grid className={classes.grid}>
                 <Paper className={classes.paperText}>
                   <TextField
+                    type="password"
                     name="password"
                     label="Password"
                     id="password"
@@ -130,9 +134,6 @@ const AuthContainer = ({ loadUserProfile }) => {
       </Switch>
       {/* prettier-ignore */}
       <nav>
-        {/* <ul>
-          <li><Link to={`${link}`} onClick={changeLink}>{`${link}`}</Link></li>
-        </ul> */}
         <Button component={Link} to={`${link}`} onClick={changeLink} variant="outlined" color="primary" >{`${link}`}</Button>
       </nav>
     </Fragment>

src/components/root/Header.js

@@ -1,12 +1,12 @@
 import React, { Fragment, useContext } from "react";
 import { UserContext } from "../../backend/authorization/UserContext";
-import { makeStyles } from '@material-ui/core/styles';
-import Button from '@material-ui/core/Button'
+import { makeStyles } from "@material-ui/core/styles";
+import Button from "@material-ui/core/Button";
 // import theme from '../../styles/theme'
 
 const useStyles = makeStyles((theme) => ({
   root: {
-    '& > *': {
+    "& > *": {
       margin: theme.spacing(1),
     },
   },
@@ -35,17 +35,33 @@ function Header({ loginClick, setLoginClick }) {
       <Fragment>
         <h2>AERO</h2>
         {loginClick ? (
-          <Button variant="outlined" color="secondary" onClick={toggleLoginClick}>Close</Button>
+          <Button
+            className={classes.root}
+            variant="outlined"
+            color="secondary"
+            onClick={toggleLoginClick}
+          >
+            Close
+          </Button>
         ) : (
-          <Button variant="outlined" color="secondary" onClick={toggleLoginClick}>Login / Signup</Button>
+          <Button
+            className={classes.root}
+            variant="outlined"
+            color="secondary"
+            onClick={toggleLoginClick}
+          >
+            Login / Signup
+          </Button>
         )}
       </Fragment>
     );
   } else {
     content = (
       <Fragment>
         <h2>AERO</h2>
-        <Button variant="outlined" color="secondary" onClick={logout}>Logout</Button>
+        <Button variant="outlined" color="secondary" onClick={logout}>
+          Logout
+        </Button>
       </Fragment>
     );
   }