From 6e5d2a520f2c6a7b28acfd2d09124ff17b73c804 Mon Sep 17 00:00:00 2001 From: michacurri Date: Tue, 5 Jan 2021 15:11:51 -0500 Subject: [PATCH 1/2] removed log from verifyToken --- api/middleware/verifyToken.js | 1 - 1 file changed, 1 deletion(-) diff --git a/api/middleware/verifyToken.js b/api/middleware/verifyToken.js index 400779e..2a6f541 100644 --- a/api/middleware/verifyToken.js +++ b/api/middleware/verifyToken.js @@ -1,7 +1,6 @@ const { verifyToken } = require("../tokens/tokenService"); exports.verifyToken = async (req, res, next) => { - console.log(req.cookies); const { cookies } = req; try { if (!cookies || !cookies.token) { From ae0980c192fa4c4e78c595b4e06427c4b53c0999 Mon Sep 17 00:00:00 2001 From: michacurri Date: Sat, 9 Jan 2021 11:13:33 -0500 Subject: [PATCH 2/2] material-ui integration: login, signup, and workorderDisplay --- api/controllers/workorderController.js | 1 - api/routes/workorderRoutes.js | 4 +- src/App.js | 34 +- src/backend/authorization/AuthContainer.js | 138 +++++--- src/components/root/ContactEditor.js | 72 ++++ src/components/root/ExampleTable.jsx | 0 src/components/root/Header.js | 18 +- src/components/root/MainContentSection.js | 8 - src/components/root/ProfileCreate.js | 205 ++++++++++- src/components/root/Workorder.js | 6 +- src/components/root/WorkorderDisplay.js | 391 ++++++++++++++++++--- src/styles/theme.jsx | 30 ++ 12 files changed, 768 insertions(+), 139 deletions(-) create mode 100644 src/components/root/ExampleTable.jsx create mode 100644 src/styles/theme.jsx diff --git a/api/controllers/workorderController.js b/api/controllers/workorderController.js index a803e8e..4c5162d 100644 --- a/api/controllers/workorderController.js +++ b/api/controllers/workorderController.js @@ -1,5 +1,4 @@ const Workorder = require("../models/workorderModel"); -// const { findProfileById } = require("./profileController"); const Profile = require("../models/profileModel"); exports.createWorkorder = async ({ userId, brand, model, colour }) => { diff --git a/api/routes/workorderRoutes.js b/api/routes/workorderRoutes.js index b3b6613..2931a8d 100644 --- a/api/routes/workorderRoutes.js +++ b/api/routes/workorderRoutes.js @@ -2,9 +2,9 @@ const express = require("express"); const router = express.Router(); const Workorder = require("../models/workorderModel"); const { verifyToken } = require("../middleware/verifyToken"); -const { createToken } = require("../tokens/tokenService"); -const { findProfileById } = require("../controllers/profileController"); const { createWorkorder } = require("../controllers/workorderController"); +// const { createToken } = require("../tokens/tokenService"); +// const { findProfileById } = require("../controllers/profileController"); // TODO // @route GET/workorders diff --git a/src/App.js b/src/App.js index 8c48c6a..ff3c84f 100644 --- a/src/App.js +++ b/src/App.js @@ -5,26 +5,30 @@ import MainContentSection from "./components/root/MainContentSection"; import Footer from "./components/root/Footer"; import { ImpersonatorProvider } from "./backend/authorization/ImpersonatorContext"; import { UserProvider } from "./backend/authorization/UserContext"; +import { ThemeProvider } from "@material-ui/core"; +import theme from './styles/theme' const App = () => { const [loginClick, setLoginClick] = useState(false); return ( - - - -
-
-
-
- -
-