From ef76047a108a501e3a1f4bccc5edb77aaff5bf0a Mon Sep 17 00:00:00 2001
From: Anirban Pratihar <82874704+Anirban-1490@users.noreply.github.com>
Date: Wed, 18 May 2022 12:39:40 +0530
Subject: [PATCH] Integrated user's name in dashboard with email (#154)

* integrated User name in dashboard with email

* changed brand name in dashboard

* changed username to name in state in reg.jsx
---
 backend/controllers/user.js                 | 4 ++--
 backend/models/user.js                      | 1 +
 frontend/components/Dashboard/Dashboard.jsx | 9 ++++++---
 frontend/components/Reg/Reg.jsx             | 6 +++---
 frontend/helpers/user/userState.js          | 3 ++-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/backend/controllers/user.js b/backend/controllers/user.js
index efb762b..ca40bb8 100644
--- a/backend/controllers/user.js
+++ b/backend/controllers/user.js
@@ -2,14 +2,14 @@ const User = require('../models/user')
 const { customAlphabet } = require('nanoid')
 const nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz', 25)
 
-module.exports.register = async ({ body: { email, password } }, res) => {
+module.exports.register = async ({ body: { email, password,name } }, res) => {
    try {
       if (!email || !password) return res.sendStatus(400)
       let oldUser = await User.findOne({ email }).catch((err) => {
          console.error(err)
       })
       if (oldUser) return res.status(400).send('Already Exists')
-      let user = new User({ email })
+      let user = new User({ email,name })
       user.setPassword(password)
       let validationError = false
       await user.save().catch((err) => {
diff --git a/backend/models/user.js b/backend/models/user.js
index 26680d7..f82161f 100644
--- a/backend/models/user.js
+++ b/backend/models/user.js
@@ -51,6 +51,7 @@ UsersSchema.methods.generateJWT = function () {
 
    return jwt.sign(
       {
+        name : this.name,
          email: this.email,
          hash: this.hash,
          id: this._id,
diff --git a/frontend/components/Dashboard/Dashboard.jsx b/frontend/components/Dashboard/Dashboard.jsx
index 0769ec1..b0ffaba 100644
--- a/frontend/components/Dashboard/Dashboard.jsx
+++ b/frontend/components/Dashboard/Dashboard.jsx
@@ -27,20 +27,23 @@ function changePageContent(e){
 }
 
 function Sidebar1() {
+
+    const {user:{name,email}} = useContext(UserAuth)
+    
   return (
     <div className="sidebar">
       <CloseIcon className="close_icon" onClick={toggleSidebar1} />
 
       <ul>
         <div className="nav-item mb-2 brand-name">
-          <h1>Brand Name</h1>
+          <h1>URL Minify</h1>
         </div>
         <div className="profile">
           <div className="profile-image">
             <img src="https://png.pngtree.com/png-vector/20190307/ourlarge/pngtree-vector-edit-profile-icon-png-image_760869.jpg" />
           </div>
-          <p className="name">Hayat</p>
-          <p className="profession">Product Designer</p>
+          <p className="name">{name}</p>
+          <p className="profession">{email}</p>
         </div>
         <div className="creatButton">
           <button>Create Link</button>
diff --git a/frontend/components/Reg/Reg.jsx b/frontend/components/Reg/Reg.jsx
index 182fa1b..e08d9b6 100644
--- a/frontend/components/Reg/Reg.jsx
+++ b/frontend/components/Reg/Reg.jsx
@@ -11,7 +11,7 @@ function Reg() {
   const router = useRouter()
   const context = useContext(UserAuth)
   const [userData, setUserData] = useState({
-    username: '',
+    name: '',
     email: '',
     password: '',
     repassword: '',
@@ -45,10 +45,10 @@ function Reg() {
           </div>
           <input
             className="reg-input"
-            name="username"
+            name="name"
             autoComplete="off"
             type="text"
-            value={userData.username}
+            value={userData.name}
             onChange={handleInput}
             placeholder="Full Name"
           />
diff --git a/frontend/helpers/user/userState.js b/frontend/helpers/user/userState.js
index 6325811..a48f974 100644
--- a/frontend/helpers/user/userState.js
+++ b/frontend/helpers/user/userState.js
@@ -80,6 +80,7 @@ const UserAuthProvider = ({ children }) => {
       url: '/user/me',
     })
       .then((user) => {
+          console.log(user);
         setUser(user.data)
       })
       .catch((err) => {
@@ -94,7 +95,7 @@ const UserAuthProvider = ({ children }) => {
     setJwt(null)
     storeJWT(null)
   }
-  const context = { jwt, user, mode, login, logout, createAcc, handleLightMode, handleDarkMode }
+  const context = { jwt, user, mode, login, logout, createAcc, handleLightMode, handleDarkMode,fetchUser }
   useEffect(() => {
     let jwt = fetchJWT()
     if (jwt) {