From c2db47cbb8eb10f300c6cb47286babe60b9dec9a Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Sun, 6 Jul 2025 07:46:21 +0100 Subject: [PATCH] contact endpoint fixed --- src/assets/img/profile-pic-circle.png | Bin 0 -> 2928 bytes src/component/contacts/Contacts.js | 82 +++++++++++------- src/component/layout/layoutcom/UserHeader.jsx | 2 +- src/component/product/ProductFactory.jsx | 6 +- src/css/mail/_mail.scss | 8 +- src/services/services.js | 18 ++-- 6 files changed, 72 insertions(+), 44 deletions(-) create mode 100644 src/assets/img/profile-pic-circle.png diff --git a/src/assets/img/profile-pic-circle.png b/src/assets/img/profile-pic-circle.png new file mode 100644 index 0000000000000000000000000000000000000000..fa60edbbce0113864a470d3a79f3bdd2dafa2139 GIT binary patch literal 2928 zcmbW2XHe5y8pi)2Kq%ot=pYgVgh&_ZN90#b;^N{^NvN`vl(OkAwOywFbMZR>nAk5-V2~yt z1OtI#Abt-32LOM zkb|R>v&-S*CprhT#QKZuKe%85E+JuIurTBo7f2{Uu)#24kzIR5WzlYsplCTw)5~J=2MZrI zbc$>3bEhf<$BaoRYMT*v(|)1-gY3TpyYhdL{RQ@Ku2}#I1_{gq!vGY(WFaatB=jCt z*7z)2V3M#=H|@%N3YH+3R`drrPBgz`ZxUL@j?H|gZ{7jxV;#7dc8KQ=h?fkvmvCu% zZGDBl#TgoEHJo6N56GuCU9;?wmgwjW^v*8i_9Vc!mdt-NtBcdTu4}VTK6@wpH*N*% zpk#Vd$hMaQq_gf(AU*G_^5@okp?QWTuIW4VHoeX((0IA52PJbrf4|7@!5SFm*eG_s z!*dnSE#su0Df^-%&Rwd4q7HA=@TC0p_&_DaWZ>)7oAU67<{tvLw0Z+}6s<;gYKd(t zDZ0yg&E=YKszq>JC&r8YQ~5wu8pt8BKa;0NRy1m6jh7Ck-;c@Ijaiy2Kr$%z;_>I| ze4LU(qKZ1WDww4->4pcSp6_Jh+?y9`eibw~oyeDj)%2pDXV&cH7J;S@G#E!pE0 ztsv)(R@kaftX~2jaC)%|-^m^??xtev0rn)! z)zy%Y-QV)!3`cHDnzwaCYQ)Vtnx-|lZh4VjPSF$7Hx5z8;!DWiIy zZ1z=Ag7C2|PJX13ELK8x~w)nOnzxKestD%<~IdI=mrpO};D=lWjmUhUSQjy4}hZ1*eIDY3g)=Yu;fylvfy~ zJ`t&Si58i{w#ySyR)fsGX?vz{4S?? z+J%Ij|3yg=S|T;%deRA1y}njTzG^rPjzF zG_&97K?M|nJEctOT>iuSb>^vosiL1-G0`j&crgeUFfHzRYYt0ULuORuEVlW~|BmW< zCUQH8`5f9Gkp)qIoFXA@RAxQ-hk?S(xM`;QW01QEdS}?pNuJ7A9K7e&*wZ+sW3_g&N0pd8sk%g)~0E9B|Tk+;LN=E*4xg21d%DOky&(j|> zI+WlgdsJy1ouZCejOyNeptr!FgssY#*R02SnG-Rp=XrV=kL@~Bl!r^!Vxq}})~6-7 zfg0D?g(35^NlJY_-GR#%+uM~nPFgeBaQ2?3^F)r0w9vA1w{YJGA4uD8$*9++HLwYg&SsLE=U?%>~~OC0FPs|gCTshX27ULR_2y1!^uzozY!E+6c&SN9u<(Z-&kbL||$ z6MdPzHaVSQr<-#NY+|hP(jYaq*C68vdzhmFO*LkHF?LQO)oS`xU6_|RuORerZy^(} zRsUUj(ILgwVzZ2~7&wYYg)kAz&g3w6MRL#f2g8;)1A9rK`hU;3@lEL=ccLeM!Z{EwvbB3;<{&~E9e zXOFh9M4wNMOVlga)-@a-*eOW#d6Q!Ex+8)_S3AH5R3h$TX6T_I5q&O01)~x_jX9B| za#@!@oqygIw^IDmt@!I|pEoa#62(DLA465l5?$bP34%YqK+dnZL@^$=9Up(wkH8Gd zMQ{-!xn1s4#fE}Nf0P8t contactData() - }) - - const contactsData = contacts?.data?.calendar_data?.contacts // LIST OF CONTACTS - const contactsCategory = contacts?.data?.calendar_data?.category // LIST OF CATEGORY + // const {data:contacts, isFetching, isError, error} = useQuery({ + // queryKey: queryKeys.contacts, + // queryFn: () => contactData() + // }) const [activeCategoryUID, setActiveCategoryUID] = useState('0') // HOLDS VALUE OF THE ACTIVE CATEGORY - const [activeContactUID, setActiveContactUID] = useState(null) - const [activeDetail, setActiveDetail] = useState(null) + const [activeContactUID, setActiveContactUID] = useState('') + const [activeDetail, setActiveDetail] = useState([]) - const [filteredContactData, setFiltererdContactData] = useState(null) + const [filteredContactData, setFiltererdContactData] = useState([]) + + + const getContactData = useMutation({ + mutationFn: (reqData) => { + return contactData(reqData) + }, + onError: (error) => { + console.log(error) + }, + onSuccess: (res) => { + if(res?.data?.resultCode != '0'){ + throw({message: 'Something went wrong'}) + } + setFiltererdContactData(res?.data?.contacts) + } + }) const changeActiveUID = (uid) => { setActiveContactUID(uid) @@ -42,10 +55,21 @@ export default function Contacts(){ changeActiveUID(filteredConData[0]?.uid) } + useEffect(()=>{ + let reqData = { + token: localStorage.getItem('token'), // USER TOKEN + uid: localStorage.getItem('uid') // USER UID + } + getContactData.mutate(reqData) + },[]) + + const contactsData = getContactData?.data?.data?.contacts // LIST OF CONTACTS + const contactsCategory = getContactData?.data?.data?.category // LIST OF CATEGORY + return( <> - {isFetching ? + {getContactData?.isPending ? <>
@@ -53,10 +77,10 @@ export default function Contacts(){
- : isError ? + : getContactData?.error ?
-

{error.message}

+

{getContactData?.error?.message}

: @@ -121,14 +145,14 @@ export default function Contacts(){ {contactsCategory && contactsCategory.map(item => ( -
  • changeActiveCategoryUID(item?.product_id)} style={{cursor: 'pointer'}}> +
  • changeActiveCategoryUID(`A00000${item?.cid}`)} style={{cursor: 'pointer'}}>
    - + - {item?.title} + {item?.description}
    @@ -177,10 +201,10 @@ export default function Contacts(){
    - {contactsData && (filteredContactData || contactsData).map((contact, index)=> { - const isActive = (contact.uid == activeContactUID) || (!activeContactUID && index == 0) + {contactsData && filteredContactData?.map((contact, index)=> { + const isActive = (contact?.uid == activeContactUID) || (!activeContactUID && index == 0) return ( -
    changeActiveUID(contact.uid)} className={`mail-msg-item ${isActive && 'bg-light'}`}> +
    changeActiveUID(contact?.uid)} className={`mail-msg-item ${isActive && 'bg-light'}`}>
    @@ -190,15 +214,15 @@ export default function Contacts(){
    -

    {contact.sender}

    +

    {contact?.sender}

    {/*

    06:59 PM

    */} -

    {new Date(contact.added).toDateString()}

    +

    {new Date(contact?.added).toDateString()}

    -
    {contact.title}
    -

    {contact.message.length < 100 ? contact.message : contact.message.substring(0,101) + ' ...' }

    +
    {contact?.title}
    +

    {contact?.message?.length < 100 ? contact?.message : contact?.message.substring(0,101) + ' ...' }

    - {new Date(contact.added).toDateString()} + {new Date(contact?.added).toDateString()} {/* {getCustomTime(contact.added)} */}

    @@ -219,13 +243,13 @@ export default function Contacts(){ user
    -

    {activeContactUID ? activeDetail[0].sender : contactsData[0].sender}

    -

    {activeContactUID ? new Date(activeDetail[0].added).toDateString() : new Date(contactsData[0].added).toDateString()}

    +

    {activeContactUID ? activeDetail[0]?.sender : filteredContactData[0]?.sender}

    +

    {activeContactUID ? new Date(activeDetail[0]?.added).toDateString() : new Date(filteredContactData[0]?.added).toDateString()}
    -

    {activeContactUID ? activeDetail[0].message : contactsData[0].message}

    +

    {activeContactUID ? activeDetail[0]?.message : filteredContactData[0]?.message}

    {/*

    hey adminjon...

    I truly believe Augustine’s words are true and if you look at history you know it is true. There are many people in the world with amazing talents who realize only a small percentage of their potential. We all know people who live this truth.

    We also know those epic stories, those modern-day legends surrounding the early failures of such supremely successful folks as Michael Jordan and Bill Gates. We can look a bit further back in time to Albert Einstein or even further back to Abraham Lincoln. What made each of these people so successful? Motivation.

    diff --git a/src/component/layout/layoutcom/UserHeader.jsx b/src/component/layout/layoutcom/UserHeader.jsx index 74bffca..8b7da0a 100644 --- a/src/component/layout/layoutcom/UserHeader.jsx +++ b/src/component/layout/layoutcom/UserHeader.jsx @@ -67,7 +67,7 @@ export default function UserHeader(){
    • - avtar-img + avtar-img
      diff --git a/src/component/product/ProductFactory.jsx b/src/component/product/ProductFactory.jsx index 3cd5419..021f779 100644 --- a/src/component/product/ProductFactory.jsx +++ b/src/component/product/ProductFactory.jsx @@ -39,9 +39,9 @@ export default function ProductFactory(){ getProductData.mutate(reqData) },[]) - const myproduct_data = getProductData?.data?.data?.myproduct?.myproudct // PRODUCT DETAILS - const product_name = myproduct_data?.product_name; - const product_status = myproduct_data?.status; + const myproduct_data = getProductData?.data?.data?.myproduct?.myproudct // PRODUCT DETAILS + const product_name = myproduct_data?.product_name; + const product_status = myproduct_data?.status; return( <> diff --git a/src/css/mail/_mail.scss b/src/css/mail/_mail.scss index 0f9a4dd..f030d92 100644 --- a/src/css/mail/_mail.scss +++ b/src/css/mail/_mail.scss @@ -85,7 +85,13 @@ } .mail-contant .mail-f{ - position: absolute; + position: relative; width: 100%; bottom: 0; + @include desktop { + position: absolute; + } + @include desktop-lg { + position: absolute; + } } diff --git a/src/services/services.js b/src/services/services.js index b6d4239..a492647 100644 --- a/src/services/services.js +++ b/src/services/services.js @@ -91,6 +91,14 @@ export const getCalendarEvents = (reqData) => { return postAuxEnd(`/panel/account/calendar`, postData, false) } +// FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION +export const contactData = (reqData) => { + let postData = { + ...reqData, + } + return postAuxEnd(`/panel/contacts`, postData, false) +} + // FUNCTION TO GET DASHBOARD RECENT ACTIONS SECTION export const recentActions = (reqData) => { let postData = { @@ -180,13 +188,3 @@ export const productProvision = (reqData) => { // return getAuxEnd(`/panel/myproduct/provision`, postData) } -// FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION -export const contactData = (reqData) => { - let postData = { - ...reqData, - token: localStorage.getItem('token'), // USER TOKEN - uid: localStorage.getItem('uid') // USER UID - } - return postAuxEnd(`/panel/contacts`, postData, false) - // return getAuxEnd(`/panel/contacts`) -} \ No newline at end of file