Modified

aadarsh012 · Sep 20, 2021 · 575b437 · 575b437
1 parent 60465c4
commit 575b437
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 34 deletions.
diff --git a/client/public/favicon.ico b/client/public/favicon.ico
diff --git a/client/public/github-logo.png b/client/public/github-logo.png
diff --git a/client/public/icon.png b/client/public/icon.png
diff --git a/client/public/index.html b/client/public/index.html
@@ -2,14 +2,16 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
+    <meta name="description" content="Web site created using create-react-app" />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Atkinson+Hyperlegible&display=swap"
+      rel="stylesheet"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="shortcut icon" href="icon.png" type="image/x-icon" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -24,7 +26,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Authentication</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/client/public/logo192.png b/client/public/logo192.png
diff --git a/client/public/logo512.png b/client/public/logo512.png
diff --git a/client/src/App.css b/client/src/App.css
@@ -5,6 +5,23 @@ body {
 .App {
   height: 100vh;
   display: flex;
+  flex-direction: column;
   justify-content: center;
   align-items: center;
 }
+
+footer {
+  display: flex;
+  position: absolute;
+  width: 100%;
+  background-color: #5cdb95;
+  height: 3.5em;
+  bottom: 0;
+  justify-content: center;
+  align-items: center;
+}
+
+footer img {
+  width: 2em;
+  height: 2em;
+}
diff --git a/client/src/App.js b/client/src/App.js
@@ -5,18 +5,27 @@ import Login from "./Components/Login/Login";
 import Register from "./Components/Register/Register";
 import ForgotPassword from "./Components/ForgotPassword/ForgotPassword";
 import ResetPassword from "./Components/ResetPassword/ResetPassword";
+import Aux from "./HOC/auxilliary";
 
 function App() {
   return (
-    <div className="App">
-      <Switch>
-        <Route path="/passwordreset/:resetToken" component={ResetPassword} />
-        <Route path="/forgotpassword" component={ForgotPassword} />
-        <Route exact path="/register" component={Register} />
-        <Route exact path="/login" component={Login} />
-        <PrivateRoute exact path="/" />
-      </Switch>
-    </div>
+    <Aux>
+      <div className="App">
+        <Switch>
+          <Route path="/passwordreset/:resetToken" component={ResetPassword} />
+          <Route path="/forgotpassword" component={ForgotPassword} />
+          <Route exact path="/register" component={Register} />
+          <Route exact path="/login" component={Login} />
+          <PrivateRoute exact path="/" />
+        </Switch>
+      </div>
+      <footer>
+        <p>Created By AADARSH SHAW | </p>
+        <a href="https://github.com/aadarsh012">
+          <img src="github-logo.png" />
+        </a>
+      </footer>
+    </Aux>
   );
 }
 

diff --git a/client/src/Components/ForgotPassword/ForgotPassword.js b/client/src/Components/ForgotPassword/ForgotPassword.js
@@ -1,4 +1,5 @@
 import axios from "axios";
+import crypto from "crypto";
 import { useState, useEffect } from "react";
 import classes from "./ForgotPassword.module.css";
 
@@ -8,13 +9,15 @@ const ForgotPassword = (props) => {
   const [error, setError] = useState("");
 
   useEffect(() => {
+    document.title = "Forgot Password";
     if (localStorage.getItem("authToken")) {
       props.history.push("/");
     }
   }, [props.history]);
 
   const sendEmailHandler = async (event) => {
     event.preventDefault();
+
     const config = {
       headers: {
         "Content-Type": "application/json"
@@ -23,8 +26,9 @@ const ForgotPassword = (props) => {
 
     try {
       const data = await axios.post("/api/auth/forgotpassword", { email }, config);
-      localStorage.setItem("resetToken", data.data.resetToken);
+      const resetToken = crypto.createHash("sha256").update(data.data.resetToken).digest("hex");
       setSuccess(data.data);
+      localStorage.setItem("resetToken", resetToken);
     } catch (error) {
       console.log(error.response.data.error);
       setSuccess(false);

diff --git a/client/src/Components/Login/Login.js b/client/src/Components/Login/Login.js
@@ -9,6 +9,7 @@ const Login = (props) => {
   const [error, setError] = useState("");
 
   useEffect(() => {
+    document.title = "Login";
     if (localStorage.getItem("authToken")) {
       props.history.push("/");
     }

diff --git a/client/src/Components/Register/Register.js b/client/src/Components/Register/Register.js
@@ -10,6 +10,7 @@ const Register = (props) => {
   const [error, setError] = useState("");
 
   useEffect(() => {
+    document.title = "Register";
     if (localStorage.getItem("authToken")) {
       props.history.push("/");
     }

diff --git a/client/src/Components/ResetPassword/ResetPassword.js b/client/src/Components/ResetPassword/ResetPassword.js
@@ -1,4 +1,5 @@
 import axios from "axios";
+import crypto from "crypto";
 import { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 import classes from "./ResetPassword.module.css";
@@ -10,9 +11,12 @@ const ResetPassword = (props) => {
   const [errorPage, setErrorPage] = useState(false);
 
   useEffect(() => {
-    const resetToken = localStorage.getItem("resetToken");
-    if (resetToken !== props.match.params.resetToken) {
-      localStorage.removeItem("resetToken");
+    document.title = "Reset Password";
+    const resetToken = crypto
+      .createHash("sha256")
+      .update(props.match.params.resetToken)
+      .digest("hex");
+    if (resetToken !== localStorage.getItem("resetToken")) {
       setErrorPage(true);
     }
   }, [props.match]);

diff --git a/client/src/HOC/auxilliary.js b/client/src/HOC/auxilliary.js
@@ -0,0 +1,4 @@
+const Aux = (props) => {
+  return <div>{props.children}</div>;
+};
+export default Aux;
diff --git a/client/src/index.css b/client/src/index.css
@@ -1,13 +1,4 @@
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
+  font-family: "Atkinson Hyperlegible", sans-serif;
 }
diff --git a/controllers/auth.js b/controllers/auth.js
@@ -84,10 +84,8 @@ exports.forgotPassword = async (req, res, next) => {
 };
 
 exports.resetPassword = async (req, res, next) => {
-  const resetPasswordToken = crypto
-    .createHash("sha256")
-    .update(req.params.resetToken)
-    .digest("hex");
+  const resetToken = req.params.resetToken;
+  const resetPasswordToken = crypto.createHash("sha256").update(resetToken).digest("hex");
 
   try {
     const user = await User.findOne({
@@ -105,7 +103,7 @@ exports.resetPassword = async (req, res, next) => {
 
     await user.save();
 
-    res.status(200).json({ success: true, data: "password Reset" });
+    res.status(200).json({ success: true, data: "Password Reset" });
   } catch (error) {
     next(error);
   }