Merge branch 'master' into minor-updates

.gitignore

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

README.md

@@ -9,6 +9,7 @@ RoyalLands is designed to be user-friendly, with a clean and intuitive interface
 
 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
 
 To install RoyalLands, follow these steps
@@ -43,7 +44,6 @@ The key features of the RoyalLands web application include:
 
 
 
-
 ## Screenshots
 
 ![App Screenshot](https://public-images-view.s3.amazonaws.com/Screenshot+2023-05-22+at+8.53.18+PM.png)
@@ -61,4 +61,4 @@ The key features of the RoyalLands web application include:
 
 ## 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/Events/EventCard.jsx

@@ -56,7 +56,7 @@ const EventCard = ({ active, data }) => {
           <Link to={`/product/${data._id}?isEvent=true`}>
             <div className={`${styles.button} text-[#fff]`}>See Details</div>
           </Link>
-          <div className={`${styles.button} text-[#fff] ml-5`} onClick={() => addToCartHandler(data)}>Add to cart</div>
+          {/* <div className={`${styles.button} text-[#fff] ml-5`} onClick={() => addToCartHandler(data)}>Add to cart</div> */}
         </div>
       </div>
     </div>

frontend/src/components/Layout/AdminHeader.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { AiOutlineGift } from 'react-icons/ai'
+import { AiOutlineGift, AiOutlineHome } from 'react-icons/ai'
 import { BiMessageSquareDetail } from 'react-icons/bi'
 import { FiPackage, FiShoppingBag } from 'react-icons/fi'
 import { MdOutlineLocalOffer } from 'react-icons/md'
@@ -23,7 +23,7 @@ const AdminHeader = () => {
       <div className="flex items-center">
         <div className="flex items-center mr-4">
           <Link to="/dashboard/cupouns" className="800px:block hidden">
-            <AiOutlineGift
+            <AiOutlineHome
               color="#555"
               size={30}
               className="mx-5 cursor-pointer"

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);
@@ -215,14 +215,14 @@ const AllOrders = () => {
       minWidth: 130,
       flex: 0.7,
       cellClassName: (params) => {
-        return params.getValue(params.id, "status") === "Delivered"
+        return params.getValue(params.id, "status") === "Booking Completed"
           ? "greenColor"
           : "redColor";
       },
     },
     {
       field: "itemsQty",
-      headerName: "Items Qty",
+      headerName: "Days",
       type: "number",
       minWidth: 130,
       flex: 0.7,
@@ -302,14 +302,14 @@ const AllRefundOrders = () => {
       minWidth: 130,
       flex: 0.7,
       cellClassName: (params) => {
-        return params.getValue(params.id, "status") === "Delivered"
+        return params.getValue(params.id, "status") === "Booking Completed"
           ? "greenColor"
           : "redColor";
       },
     },
     {
       field: "itemsQty",
-      headerName: "Items Qty",
+      headerName: "Days",
       type: "number",
       minWidth: 130,
       flex: 0.7,
@@ -387,14 +387,14 @@ const TrackOrder = () => {
       minWidth: 130,
       flex: 0.7,
       cellClassName: (params) => {
-        return params.getValue(params.id, "status") === "Delivered"
+        return params.getValue(params.id, "status") === "Booking Completed"
           ? "greenColor"
           : "redColor";
       },
     },
     {
       field: "itemsQty",
-      headerName: "Items Qty",
+      headerName: "Days",
       type: "number",
       minWidth: 130,
       flex: 0.7,
@@ -627,7 +627,7 @@ const Address = () => {
                         ))}
                     </select>
                   </div>
-                  
+
                   <div className="w-full pb-2">
                     <label className="block pb-2">Choose your City</label>
                     <select

frontend/src/components/Shop/OrderDetails.jsx

@@ -137,7 +137,7 @@ const OrderDetails = () => {
       </div>
       <br />
       <br />
-      <h4 className="pt-3 text-[20px] font-[600]">Refund Status:</h4>
+      <h4 className="pt-3 text-[20px] font-[600]">Booking Status:</h4>
       {data?.status !== "Processing refund" && data?.status !== "Refund Success" && (
         <select
           value={status}
@@ -155,8 +155,8 @@ const OrderDetails = () => {
             .slice(
               [
                 "Processing",
+                "Booking Received",
                 "Booking Pending Approval",
-                "Shipping",
                 "Booking Declined",
                 "Booking Ready for Check-in",
                 "Booking Completed",

frontend/src/components/UserOrderDetails.jsx

@@ -124,7 +124,7 @@ const UserOrderDetails = () => {
               />
             </div>
             <h2 className="text-[30px] font-[500] font-Poppins text-center">
-              Give a Review
+              Give a Review For Agent
             </h2>
             <br />
             <div className="w-full flex">
@@ -174,7 +174,6 @@ const UserOrderDetails = () => {
               <label className="block text-[20px] font-[500]">
                 Write a comment
                 <span className="ml-1 font-[400] text-[16px] text-[#00000052]">
-                  (optional)
                 </span>
               </label>
               <textarea
@@ -184,7 +183,7 @@ const UserOrderDetails = () => {
                 rows="5"
                 value={comment}
                 onChange={(e) => setComment(e.target.value)}
-                placeholder="How was your product? write your expresion about it!"
+                placeholder="How was your experience with the rental? write your expresion about it!"
                 className="mt-2 w-[95%] border p-2 outline-none"
               ></textarea>
             </div>