Changeset ee05663

Timestamp:

09/08/22 17:46:49 (2 years ago)

Author:

Nace Gjorgjievski <nace.gorgievski123@…>

Branches:

master

Children:

55ed171

Parents:

16237c4

Message:

Added Profile Updating

Files:

• backend/routes/userRoutes.js (modified) (2 diffs)
• frontend/src/App.js (modified) (2 diffs)
• frontend/src/components/Header.js (modified) (3 diffs)
• frontend/src/screens/OrderHistoryScreen.js (modified) (1 diff)
• frontend/src/screens/ProfileScreen.js (added)

backend/routes/userRoutes.js

@@ -3 +3 @@
 import User from "../models/userModel.js";
 import bcrypt from "bcryptjs";
-import { generateToken } from "../utils.js";
+import { generateToken, isAuth } from "../utils.js";
 
 const userRouter = express.Router();
@@ -49 +49 @@
 );
 
+userRouter.put(
+  "/profile",
+  isAuth,
+  expressAsyncHandler(async (req, res) => {
+    const user = await User.findById(req.user._id);
+    if (user) {
+      user.name = req.body.name || user.name;
+      user.contact = req.body.contact || user.contact;
+      user.email = req.body.email || user.email;
+      if (req.body.password) {
+        user.password = bcrypt.hashSync(req.body.password, 8);
+      }
+
+      const updatedUser = await user.save();
+      res.send({
+        _id: updatedUser._id,
+        name: updatedUser.name,
+        contact: updatedUser.contact,
+        email: updatedUser.email,
+        isAdmin: updatedUser.isAdmin,
+        token: generateToken(updatedUser),
+      });
+    } else {
+      res.status(404).send({ message: "User Not Found" });
+    }
+  })
+);
+
 export default userRouter;

frontend/src/App.js

@@ -20 +20 @@
 import CardPaymentScreen from "./screens/CardPaymentScreen";
 import OrderHistoryScreen from "./screens/OrderHistoryScreen";
+import ProfileScreen from "./screens/ProfileScreen";
 
 function App() {
@@ -40 +41 @@
         <Route path="placeorder/payment" element={<CardPaymentScreen />} />
         <Route path="/orderhistory" element={<OrderHistoryScreen />} />
+        <Route path="/profile" element={<ProfileScreen />} />
         <Route path="/order/:id" element={<OrderScreen />} />
         <Route path="/products" element={<CategoryScreen />} />

frontend/src/components/Header.js

@@ -80 +80 @@
     localStorage.removeItem("shippingAddress");
     localStorage.removeItem("paymentMethod");
+    window.location.href = "/signin";
   };
 
@@ -547 +548 @@
 
               <NavDropdown.Divider />
-              <Link
+              <NavDropdown.Item
                 className="drowdown-item"
                 to="#signout"
@@ -553 +554 @@
               >
                 Одјави се
-              </Link>
+              </NavDropdown.Item>
             </NavDropdown>
           ) : (

frontend/src/screens/OrderHistoryScreen.js

@@ -75 +75 @@
             {orders.map((order) => (
               <tr key={order._id}>
-                <td>{order._id.substring(0, 6)}</td>
+                <td>{order._id.substring(0, 7)}</td>
                 <td>{order.createdAt.substring(0, 10)}</td>
                 <td>{order.totalPrice.toFixed(2)}</td>