Merge pull request #67 from vicheanath/update-property

Update property
vicheanath · Feb 8, 2024 · d73789e · d73789e
2 parents 2fc7e1e + df4cff0
commit d73789e
Show file tree

Hide file tree

Showing 7 changed files with 464 additions and 451 deletions.
diff --git a/backend/pms/src/main/resources/data.sql b/backend/pms/src/main/resources/data.sql
@@ -87,7 +87,7 @@ VALUES (
                 'House for Sell in Iowa',
                 'RENT',
                 '2024-02-07 00:29:48.576972',
-                3
+                2
         ),
         (
                 'Land',
@@ -106,7 +106,7 @@ VALUES (
                 'Great Building Site Right off Hwy 34',
                 'RENT',
                 '2024-02-07 00:44:43.55343',
-                3
+                2
         ),
         (
                 'House',
@@ -123,7 +123,7 @@ VALUES (
                 '1,000',
                 'RENT',
                 '2024-02-07 01:04:03.030894',
-                3
+                2
         );
 
 

diff --git a/frontend/src/components/Property.js b/frontend/src/components/Property.js
@@ -4,6 +4,7 @@ import { MdFavoriteBorder, MdOutlineFavorite } from "react-icons/md";
 import { Link } from "react-router-dom";
 import { formatMoney } from "../utils/money";
 import { api } from "../libs/api";
+import { FiEdit2, FiEye } from "react-icons/fi";
 const Property = ({
   price,
   numberOfRoom,
@@ -15,21 +16,23 @@ const Property = ({
   favorite,
   refetch,
   viewOffer,
+  updateProperty,
+  unFav,
 }) => {
   const addFavorite = async (id) => {
     api.post(`favorites/${id}`).then((res) => {
-      console.log(res);
+      refetch();
       setIsFav(true);
     });
   };
   const removeFavorite = (id) => {
     api.delete(`favorites/${id}`).then((res) => {
-      console.log(res);
+      refetch();
       setIsFav(false);
     });
   };
 
-  const [isFav, setIsFav] = useState(favorite);
+  const [isFav, setIsFav] = useState(favorite || unFav);
 
   return (
     <Card>
@@ -40,41 +43,48 @@ const Property = ({
         </Link>
         <Card.Text className="d-flex justify-content-between">
           <span>Location: {location} </span>
-
         </Card.Text>
         <div className="d-flex justify-content-between">
           <span>
-            <span className="me-3">
-             Rooms: {numberOfRoom}</span> 
-            <Badge bg={
-              offerStatus === "PENDING"
-                ? "warning"
-                : offerStatus === "APPROVED"
-                ? "success"
-                : "danger"
-            }>{offerStatus}</Badge>
+            <span className="me-3">Rooms: {numberOfRoom}</span>
+            <Badge
+              bg={
+                offerStatus === "PENDING"
+                  ? "warning"
+                  : offerStatus === "APPROVED"
+                  ? "success"
+                  : "danger"
+              }
+            >
+              {offerStatus}
+            </Badge>
           </span>
-
-
-        <Button
-          variant={isFav ? "danger" : "primary"}
-          onClick={() => {
-            isFav ? removeFavorite(id) : addFavorite(id);
-            refetch();
-          }}
-        >
-          {isFav ? <MdOutlineFavorite /> : <MdFavoriteBorder />}
-        </Button>
-        {
-          viewOffer && (
+          <div>
             <Button
-              variant="secondary"
-              onClick={() => viewOffer(id)}
+              className="me-2"
+              variant={isFav ? "danger" : "primary"}
+              onClick={() => {
+                isFav ? removeFavorite(id) : addFavorite(id);
+                refetch();
+              }}
             >
-              View Offer
+              {isFav ? <MdOutlineFavorite /> : <MdFavoriteBorder />}
             </Button>
-          )
-        }
+            {updateProperty && (
+
+              <Link to={`/update-property/${id}`} className="btn btn-warning me-2">
+                <FiEdit2 />
+              </Link>
+            )}
+            {viewOffer && (
+              <Button 
+                className="me-2"
+              variant="secondary" onClick={() => viewOffer(id)}>
+                <FiEye />   Offer
+              </Button>
+            )}
+
+          </div>
         </div>
       </Card.Body>
     </Card>

diff --git a/frontend/src/pages/Favorite.js b/frontend/src/pages/Favorite.js
@@ -15,7 +15,7 @@ const Favorite = () => {
         {data.map((property) => {
           return (
             <Col md={4} key={property.id} className="mb-4">
-              <Property key={property.id} {...property} refetch={refetch}/>
+              <Property key={property.id} {...property} refetch={refetch} unFav={true} />
             </Col>
           )
         })}

diff --git a/frontend/src/pages/MyProperty.js b/frontend/src/pages/MyProperty.js
@@ -41,6 +41,7 @@ const MyProperty = () => {
                 {...property}
                 refetch={refetch}
                 viewOffer={handleViewOffer}
+                updateProperty={true}
               />
             </div>
           );

diff --git a/frontend/src/pages/PropertyDetail.js b/frontend/src/pages/PropertyDetail.js
@@ -23,9 +23,7 @@ import { api } from "../libs/api";
 
 const PropertyDetail = () => {
   const { id } = useParams();
-  const { user } = useSelector((state) => state.auth);
-  const isOwner = user?.roles.map((role) => role.role).includes("Owner");
-  console.log(isOwner);
+
   const { data, isLoading, isError } = useQuery(`properties/${id}`);
   const navigate = useNavigate();
   const [show, setShow] = React.useState(false);
@@ -86,33 +84,27 @@ const PropertyDetail = () => {
             <h3>{formatMoney(data.price)}</h3>
             <p>{data.location}</p>
             <p> Rooms: {data.numberOfRoom}</p>
-            Status :<Badge bg={
-              data.offerStatus === "PENDING"
-                ? "warning"
-                : data.offerStatus === "APPROVED"
-                ? "success"
-                : "danger"
-            }>{data.offerStatus}</Badge>
-
-            <div className="mt-4">
-              {
-                isOwner ?  (
-                      <Link to={"/update-property"}>
-                  <Button className="w-25" variant="primary">
-                      Edit
-                    </Button>
-                  </Link>
-                ): (
-                  <Button
-                    variant="primary"
-                    onClick={() => {
-                      setShow(true);
-                    }}
-                  >
-                    <MdOutlineLocalOffer /> Request Offer
-                  </Button>
-                )
+            Status :
+            <Badge
+              bg={
+                data.offerStatus === "PENDING"
+                  ? "warning"
+                  : data.offerStatus === "APPROVED"
+                  ? "success"
+                  : "danger"
               }
+            >
+              {data.offerStatus}
+            </Badge>
+            <div className="mt-4">
+              <Button
+                variant="primary"
+                onClick={() => {
+                  setShow(true);
+                }}
+              >
+                <MdOutlineLocalOffer /> Request Offer
+              </Button>
             </div>
           </div>
         </Col>