From f306856ffdf8dc861c35de5cc604f8e8b338c21a Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 12 Nov 2024 05:54:44 +0100 Subject: [PATCH] added modal on kids login page --- src/components/Home/FamilyDash.jsx | 178 +++++++++++++++-------------- src/components/Home/HomeModal.jsx | 58 ++++++++++ 2 files changed, 153 insertions(+), 83 deletions(-) create mode 100644 src/components/Home/HomeModal.jsx diff --git a/src/components/Home/FamilyDash.jsx b/src/components/Home/FamilyDash.jsx index f4f081f..afb2b5a 100644 --- a/src/components/Home/FamilyDash.jsx +++ b/src/components/Home/FamilyDash.jsx @@ -6,11 +6,14 @@ import FamilyActiveLSlde from "./FamilyActiveLSlde"; import { useDispatch, useSelector } from "react-redux"; import { tableReload } from "../../store/TableReloads"; import LoadingSpinner from "../Spinners/LoadingSpinner"; +import HomeModal from "./HomeModal"; export default function FamilyDash({ MyActiveJobList=[], serverImg }) { // console.log("PROPS IN FAMILY DASH->", familyOffers?.result_list); const dispatch = useDispatch(); + + const [firstTimeModal, setFirstTimeModal] = useState(true) const userApi = new usersService(); @@ -39,104 +42,113 @@ export default function FamilyDash({ MyActiveJobList=[], serverImg }) { },[reloadBanner]) return ( -
-
- {/* Header */} -
-
-
-

Welcome

-
-

{`${userDetails?.firstname} ${userDetails?.lastname}`}

+ <> +
+
+ {/* Header */} +
+
+
+

Welcome

+
+

{`${userDetails?.firstname} ${userDetails?.lastname}`}

+
+
+

Last Login: {`${userDetails?.last_login.split(' ')[0]}`}

+
-
-

Last Login: {`${userDetails?.last_login.split(' ')[0]}`}

-
-
- {process.env.REACT_APP_SHOW_NEW_FAMILY_DASH == '1' && - <> - {familyBannersList?.loading ? -
- -
- : - familyBannersList?.result_list && Object.keys(familyBannersList?.result_list).length > 0 ? - // Loop for Family Banners -
- {Object.keys(familyBannersList?.result_list).map((item, index) => { - let content = familyBannersList?.result_list[item] - // let action = item == 'recommend' ? 'familymarket' : 'mytask' - return ( - -
- banner image -
-
-

{content.banner.text}

-

{content.banner.description}

-
-
-
- - ) - })} + {process.env.REACT_APP_SHOW_NEW_FAMILY_DASH == '1' && + <> + {familyBannersList?.loading ? +
+
: - null - } - - {tab_categories?.data && -
-

Resources

-
- {tab_categories.data.map((item) => { - // if(item.enabled){ - // } - return ( - -
-
- banner image -
-
-
-

{item?.content}

-
-
-
-
+ familyBannersList?.result_list && Object.keys(familyBannersList?.result_list).length > 0 ? + // Loop for Family Banners +
+ {Object.keys(familyBannersList?.result_list).map((item, index) => { + let content = familyBannersList?.result_list[item] + // let action = item == 'recommend' ? 'familymarket' : 'mytask' + return ( + +
+ banner image +
+
+

{content.banner.text}

+

{content.banner.description}

-
- + ) })} +
+ : + null + } + + {tab_categories?.data && +
+

Resources

+
+ {tab_categories.data.map((item) => { + // if(item.enabled){ + // } + return ( + +
+
+ banner image +
+
+
+

{item?.content}

+
+
+
+
+
+
+
+
+ + ) + })} +
-
+ } + } - - } - {/* {familyOffers?.result_list && familyOffers?.result_list.length > 0 && ( - - )} */} + {/* {familyOffers?.result_list && familyOffers?.result_list.length > 0 && ( + + )} */} - {/* {trending && trending.length > 0 && ( - - )} */} + {/* {trending && trending.length > 0 && ( + + )} */} +
-
+ + + {/* last_login */} + + {(!familyBannersList?.loading && firstTimeModal) && + setFirstTimeModal(prev => !prev)} situation={firstTimeModal} /> + } + ); } diff --git a/src/components/Home/HomeModal.jsx b/src/components/Home/HomeModal.jsx new file mode 100644 index 0000000..e8e833f --- /dev/null +++ b/src/components/Home/HomeModal.jsx @@ -0,0 +1,58 @@ +import React from 'react' +import ModalCom from '../Helpers/ModalCom' + +export default function HomeModal({action, situation}) { + const options = [ + 'Suggest Task to Parent', 'Suggest Task to Parent' + ] + + const onSelectOption = () => { + action() + } + + return ( + <> + +
+
+

+ What will you want to do? +

+ +
+
+
+ + + + + +
+
+ {options.map(item =>( +
+

+ {item} +

+
+ ))} +
+
+
+ + +
+
+
+ + ) +} -- 2.34.1