Merge branch 'master' into hot-fix

.gitignore

@@ -6,4 +6,4 @@ socket/node_modules
 
 npm-debug.log*
 yarn-debug.log*
-yarn-error.log*
+yarn-error.log*

README.md

@@ -1,46 +1,44 @@
-## RoyalLands - MERN Stack Real Estate Website
+# RoyalLands - MERN Stack Real Estate Website
 
-RoyalLands is a full-stack web test application built using the MERN (MongoDB, Express, React, Node.js) stack. This web application allows property agents to list their properties, and users or investors can view listings, request to rent a property, or contact the agent through a live chat service. The web application is designed to simplify the process of finding and renting properties, making it easier for users to browse through available properties and connect with agents.
-Installation
+RoyalLands is a full-stack web application built using the MERN (MongoDB, Express, React, Node.js) stack. This web application allows property agents to list their properties, and users or investors can view listings, request to rent a property, or contact the agent through a live chat service. The web application is designed to simplify the process of finding and renting properties, making it easier for users to browse through available properties and connect with agents. 
 
-To install RoyalLands, follow these steps:
+RoyalLands is designed to be user-friendly, with a clean and intuitive interface. Users can browse through the listings and filter them by various criteria, such as location, price, and property type. Each property listing includes detailed information about the property, including images, price, and description. Users can also request to rent a property directly from the listing page or use the live chat service to contact the agent in real-time.
+
+Property agents can use the agent dashboard to add new property listings, update existing listings, and manage requests from potential renters. The dashboard also includes analytics and insights about the performance of their listings.
+
+## Installation
 
-    Clone the repository onto your local machine.
-    Navigate to the root directory of the project in your terminal.
-    Run npm install to install the dependencies.
-    Create a .env file in the root directory and add your MongoDB database URL.
-    Run npm start to start the server and client
+To install RoyalLands, follow these steps
 
-Features
+```bash
+Clone the repository onto your local machine.
+Navigate to the root directory of the project in your terminal.
+Run npm install to install the dependencies.
+Run npm start to start the server and client
+```
+
+## Features
 
 The key features of the RoyalLands web application include:
 
-    Property listings page with filters for search
-    Individual property pages with detailed information and images
-    Request to rent a property functionality
-    Live chat service to connect with agents in real-time
-    Agent dashboard to list and manage properties
+- Property listings page with filters for search
+- Individual property pages with detailed information and images
+- Request to rent a property functionality
+- Live chat service to connect with agents in real-time
+- Agent dashboard to list and manage properties
 
-Usage
 
-RoyalLands is designed to be user-friendly, with a clean and intuitive interface. Users can browse through the listings and filter them by various criteria, such as location, price, and property type. Each property listing includes detailed information about the property, including images, price, and description. Users can also request to rent a property directly from the listing page or use the live chat service to contact the agent in real-time.
+## Authors
 
-Property agents can use the agent dashboard to add new property listings, update existing listings, and manage requests from potential renters. The dashboard also includes analytics and insights about the performance of their listings.
-Contributing
+- [@IT21112300 Chandrasiri G.K.N.N](https://www.github.com/NirmalNaveen20)
+
+- [@T21138072 Karunarathna W. P. D. B](https://www.github.com/T21138072)
 
-If you wish to contribute to RoyalLands, please follow these steps:
+- [@IT21112300 Shashikala W. A. A.](https://www.github.com/IT21112300)
 
-    Fork the repository onto your GitHub account.
-    Clone the forked repository onto your local machine.
-    Create a new branch for your changes.
-    Make your changes and commit them to the new branch.
-    Push the new branch to your forked repository.
-    Create a pull request to merge your changes into the main repository.
+- [@IT21128554 Weerasooriya K.A.M](https://www.github.com/IT21128554)
 
-License
 
-RoyalLands is licensed under the MIT license. See the LICENSE file for more details.
-Contact
+## Support
 
-If you have any questions or suggestions, please feel free to contact us at 
-[email protected]
+If you have any questions or suggestions, please feel free to contact us at [email protected]

frontend/src/components/Admin/AdminDashboardMain.jsx

@@ -10,6 +10,7 @@ import { getAllOrdersOfAdmin } from "../../redux/actions/order";
 import Loader from "../Layout/Loader";
 import { getAllSellers } from "../../redux/actions/sellers";
 
+{/* Agent management section */}
 const AdminDashboardMain = () => {
   const dispatch = useDispatch();
 

frontend/src/components/Admin/AllSellers.jsx

@@ -8,9 +8,10 @@ import { RxCross1 } from "react-icons/rx";
 import axios from "axios";
 import { server } from "../../server";
 import { toast } from "react-toastify";
-import { getAllSellers } from "../../redux/actions/sellers";
+import { getAllSellers } from "../../redux/actions/sellers";s
 import { Link } from "react-router-dom";
 
+{/* List of agents */}
 const AllSellers = () => {
   const dispatch = useDispatch();
   const { sellers } = useSelector((state) => state.seller);
@@ -49,7 +50,7 @@ const AllSellers = () => {
     },
     {
       field: "address",
-      headerName: "Seller Address",
+      headerName: "Agent Address",
       type: "text",
       minWidth: 130,
       flex: 0.7,
@@ -66,7 +67,7 @@ const AllSellers = () => {
         field: "  ",
         flex: 1,
         minWidth: 150,
-        headerName: "Preview Shop",
+        headerName: "Preview Agent",
         type: "number",
         sortable: false,
         renderCell: (params) => {

frontend/src/components/Admin/Layout/AdminSideBar.jsx

@@ -9,6 +9,7 @@ import { BsHandbag } from "react-icons/bs";
 import { MdOutlineLocalOffer } from "react-icons/md";
 import { AiOutlineSetting } from "react-icons/ai";
 import homelogo from "../../../Images/logo.svg"
+import Assests from "../../../Assests";
 
 const AdminSideBar = ({ active }) => {
   return (
@@ -57,7 +58,7 @@ const AdminSideBar = ({ active }) => {
               active === 3 ? "text-[crimson]" : "text-[#555]"
             }`}
           >
-            All Sellers
+            All Agents
           </h5>
         </Link>
       </div>

frontend/src/components/Products/ProductDetails.jsx

@@ -109,7 +109,7 @@ const ProductDetails = ({ data }) => {
           toast.error(error.response.data.message);
         });
     } else {
-      toast.error("Please login to create a conversation");
+      toast.error("Please login to create a Booking");
     }
   };
 

frontend/src/components/Products/Ratings.jsx

@@ -2,6 +2,7 @@ import React from "react";
 import { AiFillStar, AiOutlineStar } from "react-icons/ai";
 import { BsStarHalf } from "react-icons/bs";
 
+//Agent flow feedback
 const Ratings = ({ rating }) => {
   const stars = [];
 

frontend/src/components/Profile/ProfileContent.jsx

@@ -66,7 +66,7 @@ const ProfileContent = ({ active }) => {
       })
       .then((response) => {
          dispatch(loadUser());
-         toast.success("avatar updated successfully!");
+         toast.success("Profile updated successfully!");
       })
       .catch((error) => {
         toast.error(error);
@@ -222,7 +222,7 @@ const AllOrders = () => {
     },
     {
       field: "itemsQty",
-      headerName: "Items Qty",
+      headerName: "Days",
       type: "number",
       minWidth: 130,
       flex: 0.7,
@@ -309,7 +309,7 @@ const AllRefundOrders = () => {
     },
     {
       field: "itemsQty",
-      headerName: "Items Qty",
+      headerName: "Days",
       type: "number",
       minWidth: 130,
       flex: 0.7,
@@ -394,7 +394,7 @@ const TrackOrder = () => {
     },
     {
       field: "itemsQty",
-      headerName: "Items Qty",
+      headerName: "Days",
       type: "number",
       minWidth: 130,
       flex: 0.7,