diff --git a/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx b/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx index 32fe6e0..2fe5dee 100644 --- a/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx +++ b/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx @@ -315,7 +315,7 @@ const AssignTaskPopout = ({ checked={taskType == "select"} onChange={switchTaskType} /> - Select Task + Previous Task
: null} + {/* {userDetails.account_type === "FULL" ? : null} */} {/*
*/}
-
-

+
+

Confirm

-
-
+
diff --git a/src/components/Partials/RightSideBar.jsx b/src/components/Partials/RightSideBar.jsx index 84650de..576fbf2 100644 --- a/src/components/Partials/RightSideBar.jsx +++ b/src/components/Partials/RightSideBar.jsx @@ -40,7 +40,7 @@ export default function RightSideBar({ myJobList }) { return ( <>
-
+
{/* heading */}

@@ -49,10 +49,10 @@ export default function RightSideBar({ myJobList }) {

-
+
{userDetails && userDetails?.account_type !== "FAMILY" && ( <> -
+
{/* image */}
-
+
{/* image */}
@@ -95,7 +95,7 @@ export default function RightSideBar({ myJobList }) {
{/* action */}
-
+
{/* image */}
+
+ {/* image */} +
+ + + +
+ {/* name */} +
+

+ My Page +

+
+
)} -
+
{/* image */}
{darkMode.theme === "light" ? ( @@ -270,8 +289,8 @@ export default function RightSideBar({ myJobList }) {
-
-
+
+
{/* image */}
-
+
{/* image */}
-
+
{/* image */}
-
+
{/* image */}
-
+
{/* image */}
{ toast.success(message, { @@ -184,12 +185,12 @@ function PendingJobsPopout({ details, onClose, situation }) {
{/* INPUT SECTION */} -
+ {/*
-
+
*/}
@@ -198,12 +199,13 @@ function PendingJobsPopout({ details, onClose, situation }) {
diff --git a/src/lib/NewDateTimeFormatter.js b/src/lib/NewDateTimeFormatter.js new file mode 100644 index 0000000..56de4d9 --- /dev/null +++ b/src/lib/NewDateTimeFormatter.js @@ -0,0 +1,17 @@ +export function NewDateTimeFormatter(isoDateString, addHour = true) { + const date = new Date(isoDateString); + if (addHour) { + date.setTime(date.getTime() + 1 * 60 * 60 * 1000); + } + const formattedDate = date.toLocaleDateString("en-US", { + year: "numeric", + month: "numeric", + day: "numeric", + hour: "2-digit", + minute: "2-digit", + // second: "2-digit", + hour12: true, + timeZone: "UTC", + }); + return formattedDate; + } \ No newline at end of file