nestiq-component-library 1.1.57 → 1.1.59

package/src/components/MessagePopup/MessagePopUp.tsx

@@ -1,46 +1,36 @@
 import React, { useEffect, useState } from "react";
 import x from "../../assets/Images/icon_close_2.png";
 import mail_icon from "../../assets/Images/mail-icon.png";
-import SuccessPopUp from "../MessagePopup/SuccessPopup";
-import ErrorPopUp from "../MessagePopup/ErrorPopup";
 import "../MessagePopup/MessagePopUp.css";
-import showToast from "../ToastWrapper/ToastWrapper";
+import { MessageModel } from "../../models/message.model";
 
 interface PopupProps {
-  firstname: string;
-  lastname: string;
-  handleSendMessage: any;
-  onClick: any;
+  sellerFirstName: string;
+  sellerLastName: string;
+  onCloseClick: () => void;
   themesList: any;
-  sendDataToParent: any;
+  onSubmit: (formValues: MessageModel) => void;
 }
 
 export default function MessagePopUp(props: PopupProps) {
-  const [showMessagePopUp, setshowMessagePopUp] = useState();
-  const [showSuccessPopUp, setShowSuccessPopUp] = useState(false);
-  const [showErrorPopUp, setShowErrorPopUp] = useState(false);
   const [themeId, setThemeId] = useState("");
   const [subject, setSubject] = useState("");
   const [messageText, setMessageText] = useState("");
   const [firstName, setFirstName] = useState("");
   const [lastName, setLastName] = useState("");
 
-
   const handleClose = () => {
-    props.onClick();
+    props.onCloseClick();
   };
   function handleSendMessage() {
-    props.sendDataToParent(themeId, subject, messageText, firstName, lastName);
-    console.log("message sent", themeId, subject, messageText, firstName, lastName);
-  };
-  
+    props.onSubmit({ themeId, subject, messageText, firstName, lastName });
+  }
+
   useEffect(() => {
     const user = JSON.parse(localStorage.getItem("user") || "{}");
     if (user) {
       setFirstName(user.firstname || "");
       setLastName(user.lastname || "");
-    } else if (!user) {
-      console.log("no user");
     }
   }, []);
   return (
@@ -70,7 +60,7 @@ export default function MessagePopUp(props: PopupProps) {
                 />
               </div>
               <div className="popUpHeader d-flex flex-column  text-wrap mb-md-1 ">
-                Nachricht senden {firstName} {lastName}
+                Nachricht senden {props.sellerFirstName} {props.sellerLastName}
               </div>
             </div>
 
@@ -92,7 +82,7 @@ export default function MessagePopUp(props: PopupProps) {
                         <option key={theme.id} value={theme.id}>
                           {theme.name}
                         </option>
-                      )
+                      ),
                     )}
                   </select>
                 </div>
@@ -161,13 +151,6 @@ export default function MessagePopUp(props: PopupProps) {
           </div>
         </div>
       </div>
-
-      {showSuccessPopUp && (
-        <SuccessPopUp onClick={() => setShowSuccessPopUp(false)} />
-      )}
-      {showErrorPopUp && (
-        <ErrorPopUp onClick={() => setShowErrorPopUp(false)} />
-      )}
     </div>
   );
 }

package/src/components/NewPropertyCard/NewPropertyCard.tsx

@@ -12,6 +12,7 @@ import iconLayers from "../../assets/Images/layer_icon.svg";
 import FloorPlanPopup from "../FloorPlanPopup/FloorPlanPopup";
 import MessagePopUp from "../MessagePopup/MessagePopUp";
 import SharePopup from "../SharePopup/SharePopup";
+import { MessageModel } from "../../models/message.model";
 
 interface PopupProps {
   property: {
@@ -35,18 +36,15 @@ interface PopupProps {
     };
     pictures: { contentUrl: string }[];
   };
-  onClick: any;
   baseUrl: string;
-  title: string;
   userData: {
     firstname: string;
     lastname: string;
   };
-  handleSendMessage: any;
-  firstname: any;
-  lastname: any;
   themesList: any;
-  sendData: any;
+  floorPlanUrl: string;
+  onMessagePopupSubmitClick: (formValues: MessageModel) => void;
+  messageOnClick: () => void;
 }
 export default function PropertyCard(props: PopupProps) {
   const [liked, setLiked] = useState(false);
@@ -56,16 +54,11 @@ export default function PropertyCard(props: PopupProps) {
   const [floorPlan, setFloorPlan] = useState(false);
   const [messagePopUp, setMessagPopUp] = useState(false);
   const [sharePopUp, setSharePopUp] = useState(false);
-  const [themeId, setThemeId] = useState("");
-  const [subject, setSubject] = useState("");
-  const [messageText, setMessageText] = useState("");
-  const [firstName, setFirstName] = useState("");
-  const [lastName, setLastName] = useState("");
 
   const pictureUrls =
     props.property?.pictures?.length > 0
       ? props.property.pictures.map(
-          (picture) => `${props.baseUrl}${picture.contentUrl}`
+          (picture) => `${props.baseUrl}${picture.contentUrl}`,
         )
       : [noImageIcon];
 
@@ -74,39 +67,17 @@ export default function PropertyCard(props: PopupProps) {
     setLiked(!liked);
   };
   const floorPlanOnClick = () => {
-    setFloorPlan(true);
+    if (props.floorPlanUrl) {
+      setFloorPlan(true);
+    }
   };
   const handleMessagPopUp = () => {
-    setMessagPopUp(true);
-    console.log("messagePopUp", messagePopUp);
+    // setMessagPopUp(true);
+    props.messageOnClick();
   };
   const handleSharePopUp = () => {
     setSharePopUp(true);
-    console.log("sharePopUp", sharePopUp);
-  };
-  const handleClosePopup = () => {
-    setFloorPlan(false);
-    setMessagPopUp(false);
-  };
-  const messagePopupClose = () => {
-    setMessagPopUp(false);
   };
-  function handleDataFromChild(
-    firstName: string,
-    lastName: string,
-    themeId: string,
-    subject: string,
-    messageText: string
-  ) {
-    setFirstName(firstName);
-    setLastName(lastName);
-    setThemeId(themeId);
-    setSubject(subject);
-    setMessageText(messageText);
-  }
-  function handleSendMessage() {
-    props.sendData(themeId, subject, messageText, firstName, lastName);
-  }
 
   const handleArrowClickInMainImage = (direction: string) => {
     if (!props.property || pictureUrls.length === 0) return;
@@ -295,21 +266,20 @@ export default function PropertyCard(props: PopupProps) {
       </div>
       {floorPlan && (
         <FloorPlanPopup
-          contentUrl={props.property.pictures[0]?.contentUrl || noImageIcon}
+          contentUrl={props.floorPlanUrl}
           onCloseClick={() => setFloorPlan(false)}
         />
       )}
-      {messagePopUp && (
+      {/* {messagePopUp && (
         <MessagePopUp
-          onClick={() => setMessagPopUp(false)}
-          handleSendMessage={props.handleSendMessage}
-          firstname={props.firstname}
-          lastname={props.lastname}
+          onCloseClick={() => setMessagPopUp(false)}
+          sellerFirstName={props.userData?.firstname}
+          sellerLastName={props.userData?.lastname}
           themesList={props.themesList}
-          sendDataToParent={handleDataFromChild}
+          onSubmit={props.onMessagePopupSubmitClick}
         />
       )}
-      {sharePopUp && <SharePopup onClick={() => setSharePopUp(false)} />}
+      {sharePopUp && <SharePopup onClick={() => setSharePopUp(false)} />} */}
     </div>
   );
 }

package/src/index.tsx

@@ -11,7 +11,7 @@ export { default as SharePopup } from "./components/SharePopup/SharePopup";
 export { default as FloorPlanPopup } from "./components/FloorPlanPopup/FloorPlanPopup";
 export { default as NewPropertyCard } from "./components/NewPropertyCard/NewPropertyCard";
 export { default as MessagePopUp } from "./components/MessagePopup/MessagePopUp";
-
+export { default as SuccessPopup } from "./components/MessagePopup/SuccessPopup";
 // TOASTER WRAPPER AND FUNCTION
 export {
   default as ToastWrapper,

package/src/models/message.model.ts

@@ -0,0 +1,7 @@
+export interface MessageModel {
+  themeId: string;
+  subject: string;
+  messageText: string;
+  firstName: string;
+  lastName: string;
+}