WrenchBoard/Users-Wrench
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'home-banners-dashboard' of WrenchBoard/Users-Wrench into master

Browse Source
This commit is contained in:
Olusesan Ameye
2024-03-09 18:18:42 +00:00
committed by Gogs
parent c44f456cc1 b769e4a4ba
commit 11ee1195c2
5 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/FamilyAcc/FamilyActivities.jsx
+1 -1
View File
@@ -23,7 +23,7 @@ export default function FamilyActivities() {
<span className={``}>Tasks & Chores</span> <span className={``}>Tasks & Chores</span>
</h1> </h1>
</div> </div>
<Link className="item-content relative text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium dark:text-white h-12 px-2 flex items-center gap-2 rounded-md shadow-sm justify-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)]" to="/acc-family"> <Link className="item-content relative text-[18px] transition-all duration-300 ease-in-out bg-[#3887c6] text-white font-medium dark:text-white h-12 px-2 flex items-center gap-2 rounded-md shadow-sm justify-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)]" to="/acc-family">
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
fill="none" fill="none"
src/components/FamilyAcc/FamilyTableNew.jsx
+10 -23
View File
@@ -122,36 +122,23 @@ export default function FamilyTableNew({
// const { family_uid } = accountDetails; // const { family_uid } = accountDetails;
// const reqData = { family_uid }; // const reqData = { family_uid };
const [familyTasksData, restOfFamilyData] = await Promise.all([ const [familyTasksData, familyWaitingRes, familyPendingRes] =
apiCall.getMyActiveTaskList(), await Promise.all([
apiCall.ManageFamilyNewWaitlist(), apiCall.getMyActiveTaskList(),
]); apiCall.ManageFamilyNewWaitlist(),
apiCall.ManageFamilyPending(),
]);
let tasksData = familyTasksData?.data?.result_list; let tasksData = familyTasksData?.data?.result_list;
let familyData = restOfFamilyData?.data?.result_list; let _familyWaitData = familyWaitingRes?.data?.result_list;
let familyPendingData = familyPendingRes?.data?.result_list;
// const familyData = familyRes.data;
// const tasksData = tasksRes.data;
let familyWaitingData = familyData?.filter(
(item) => item.status_text === "Waiting"
);
let familyPendingData = familyData?.filter(
(item) => item.status_text !== "Waiting"
);
console.log({
Waitings: familyWaitingData,
Pending: familyPendingData,
Tasks: tasksData,
});
// Function to check for errors in data // Function to check for errors in data
const checkDataError = (data) => data?.internal_return < 0; const checkDataError = (data) => data?.internal_return < 0;
if ( if (
checkDataError(tasksData) || checkDataError(tasksData) ||
checkDataError(familyWaitingData) || checkDataError(_familyWaitData) ||
checkDataError(familyPendingData) checkDataError(familyPendingData)
) { ) {
return; return;
@@ -159,7 +146,7 @@ export default function FamilyTableNew({
setDetails({ setDetails({
familyTasks: { loading: false, data: tasksData }, familyTasks: { loading: false, data: tasksData },
familyWaitList: { loading: false, data: familyWaitingData }, familyWaitList: { loading: false, data: _familyWaitData },
familyPending: { loading: false, data: familyPendingData }, familyPending: { loading: false, data: familyPendingData },
}); });
} catch (error) { } catch (error) {
src/components/FamilyAcc/Tabs/FamilyNewPending.jsx
+1 -1
View File
@@ -111,7 +111,7 @@ export default function FamilyPending({
</div> </div>
</td> </td>
<td className="text-right py-4 px-2"> <td className="text-right py-4 px-2 flex justify-end items-center">
<button <button
type="button" type="button"
onClick={() => { onClick={() => {
src/components/FamilyAcc/Tabs/FamilyNewWaitlist.jsx
+4 -4
View File
@@ -43,7 +43,7 @@ const FamilyNewWaitlist = ({
setContinueTaskPopup({ show: false, data: {} }); setContinueTaskPopup({ show: false, data: {} });
}; };
console.log("Check this >>",currentTask) // console.log("Check this >>",currentTask)
return ( return (
<div <div
@@ -57,7 +57,7 @@ const FamilyNewWaitlist = ({
</div> </div>
) : ( ) : (
<> <>
{currentTask && ( {familyData && (
<div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full"> <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400"> <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
<tbody> <tbody>
@@ -66,7 +66,7 @@ const FamilyNewWaitlist = ({
const selectedImage = require(`../../../assets/images/family/${ const selectedImage = require(`../../../assets/images/family/${
value?.banner || "default.jpg" value?.banner || "default.jpg"
}`); }`);
console.log("VALUE", value); // console.log("VALUE", value);
// let image = `${familyData.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}` // let image = `${familyData.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
return ( return (
<tr <tr
@@ -119,7 +119,7 @@ const FamilyNewWaitlist = ({
onClick={handlePagination} onClick={handlePagination}
prev={currentPage === 0} prev={currentPage === 0}
next={currentPage + itemsPerPage >= familyData?.length} next={currentPage + itemsPerPage >= familyData?.length}
data={currentTask} data={familyData}
start={indexOfFirstItem} start={indexOfFirstItem}
stop={indexOfLastItem} stop={indexOfLastItem}
/> />
src/components/FamilyAcc/index.jsx
+3 -3
View File
@@ -165,12 +165,12 @@ export default function FamilyAcc() {
</div> </div>
<div className="flex gap-4 items-center"> <div className="flex gap-4 items-center">
<Link to="/acc-family/activities" className={`nav-item flex items-center rounded-md shadow-sm justify-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)]`}> <Link to="/acc-family/activities" className={`nav-item flex items-center rounded-md shadow-sm justify-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)] bg-[#3887c6] text-white px-2 gap-2`}>
<span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out bg-light-purple dark:bg-dark-light-purple rounded-full text-dark-gray dark:text-white dark:text-lighter-gray"> <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out bg-light-purple dark:bg-dark-light-purple rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
<Icons name="pending-job" /> <Icons name="pending-job" />
</span> </span>
<span <span
className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium dark:text-white h-12 px-2 flex items-center`} className={`item-content relative text-[18px] transition-all duration-300 ease-in-out font-medium dark:text-white h-12 flex items-center`}
> >
Activities Activities
</span> </span>
@@ -178,7 +178,7 @@ export default function FamilyAcc() {
<Link <Link
to={`/familysettings`} to={`/familysettings`}
state={{ imageServer: familyList?.session_image_server }} state={{ imageServer: familyList?.session_image_server }}
className="slider-btns flex space-x-4 w-12 h-12 rounded-md shadow-sm justify-center items-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)]" className="slider-btns flex space-x-4 w-12 h-12 rounded-md shadow-sm justify-center items-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)] bg-[#3887c6] text-white"
> >
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"