Compare commits

...

6 Commits

Author SHA1 Message Date
victorAnumudu 0526fdb572 renders job action based on owner status and status description 2023-06-07 22:08:26 +01:00
ameye 7352c30969 Merge branch 'job-actions-components' of WrenchBoard/Users-Wrench into master 2023-06-07 13:54:35 +00:00
victorAnumudu 7079ae963e added job action components 2023-06-07 14:30:25 +01:00
CHIEFSOFT\ameye 9bfe3ce642 Task actions 2023-06-07 08:17:07 -04:00
ameye ff862e72be Merge branch 'market-item-view-popup' of WrenchBoard/Users-Wrench into master 2023-06-07 01:09:25 +00:00
CHIEFSOFT\ameye a1dc63e958 blog item 2023-06-06 19:38:02 -04:00
11 changed files with 186 additions and 2 deletions
+4
View File
@@ -41,6 +41,7 @@ import FamilyManagePage from "./views/FamilyManagePage";
import MyCouponPage from "./views/MyCouponPage";
import AuthRedirect from "./views/AuthRedirect";
import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
import BlogPage from "./views/BlogPage";
export default function Routers() {
return (
@@ -93,6 +94,9 @@ export default function Routers() {
<Route exact path="/manage-family" element={<FamilyManagePage />} />
<Route exact path="/start-job" element={<StartJob />} />
<Route exact path="/manage-active-job" element={<ManageActiveJobs />} />
<Route exact path="/blog-page" element={<BlogPage />} />
<Route
exact
path="/my-collection/collection-item"
+40
View File
@@ -0,0 +1,40 @@
import React, { useState } from "react";
import { Link } from "react-router-dom";
import Layout from "../Partials/Layout";
import CommonHead from "../UserHeader/CommonHead";
export default function BlogItem(props) {
const [selectTab, setValue] = useState("today");
const filterHandler = (value) => {
setValue(value);
};
return (
<Layout>
<CommonHead
commonHeadData={props.commonHeadData}
/>
<div className="notification-page w-full mb-10">
<div className="notification-wrapper w-full">
{/* heading */}
<div className="sm:flex justify-between items-center mb-6">
<div className="mb-5 sm:mb-0">
<h1 className="text-26 font-bold text-dark-gray dark:text-white">
<span
className={`${selectTab === "today" ? "block" : "hidden"}`}
>
Title of this Blog Items
</span>
</h1>
</div>
<div className="slider-btns flex space-x-4">
</div>
</div>
<div>
Blog Items Details
</div>
</div>
</div>
</Layout>
);
}
+4 -2
View File
@@ -5,6 +5,7 @@ import { useNavigate } from "react-router-dom";
import ActiveJobMessage from "./ActiveJobMessage";
import LoadingSpinner from "../Spinners/LoadingSpinner";
import CountDown from "../Helpers/CountDown";
import IndexJobActions from "./JobActions/IndexJobActions";
import usersService from "../../services/UsersService";
@@ -261,9 +262,10 @@ function ActiveJobs(props) {
<div className="w-full lg:w-1/2">
<div className="">
<h1 className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">Actions</h1>
<p className="my-3 py-1 text-base">
{/* <p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve.
</p>
</p> */}
<IndexJobActions details={props.details} />
</div>
{/* TEXTAREA SECTION */}
@@ -0,0 +1,13 @@
import React from 'react'
function CurrentJobAction() {
return (
<div className=''>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Owner True & Active
</p>
</div>
)
}
export default CurrentJobAction
@@ -0,0 +1,13 @@
import React from 'react'
function CurrentTaskAction() {
return (
<div className=''>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Worker True & Active
</p>
</div>
)
}
export default CurrentTaskAction
@@ -0,0 +1,45 @@
import React from 'react'
import CurrentJobAction from './CurrentJobAction'
import CurrentTaskAction from './CurrentTaskAction'
import PastDueJobAction from './PastDueJobAction'
import PastDueTaskAction from './PastDueTaskAction'
import ReviewJobAction from './ReviewJobAction'
import ReviewTaskAction from './ReviewTaskAction'
function IndexJobActions({details}) { // FUNCTION TO RENDER SPECIFIC JOB ACTION DEPENDING ON OWNER STATUS & STATUS DESCRIPTION
let owner = details.owner_status
let description = details.status_description
switch(owner) {
case 'OWNER':
return (()=>{
if(description == 'ACTIVE'){
return <CurrentJobAction />
}else if(description == 'PASTDUE'){
return <PastDueJobAction />
}else if(description == 'REVIEW'){
return <ReviewJobAction />
} else {
return null
}
})()
case 'WORKER':
return (()=>{
if(description == 'ACTIVE'){
return <CurrentTaskAction />
}else if(description == 'PASTDUE'){
return <PastDueTaskAction />
}else if(description == 'REVIEW'){
return <ReviewTaskAction />
} else {
return null
}
})()
default:
return null
}
}
export default IndexJobActions
@@ -0,0 +1,13 @@
import React from 'react'
function PastDueJobAction() {
return (
<div className=''>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Owner True & PastDue
</p>
</div>
)
}
export default PastDueJobAction
@@ -0,0 +1,13 @@
import React from 'react'
function PastDueTaskAction() {
return (
<div className=''>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Worker True & PastDue
</p>
</div>
)
}
export default PastDueTaskAction
@@ -0,0 +1,13 @@
import React from 'react'
function ReviewJobAction() {
return (
<div className=''>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Owner True & Review Job
</p>
</div>
)
}
export default ReviewJobAction
@@ -0,0 +1,13 @@
import React from 'react'
function ReviewTaskAction() {
return (
<div className=''>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Worker True & Review Job
</p>
</div>
)
}
export default ReviewTaskAction
+15
View File
@@ -0,0 +1,15 @@
import React, { useContext, useState, useEffect } from "react";
import BlogItem from "../components/Blogs";
export default function BlogPage() {
const commonHeadData = () => {
console.log("COMMON HEAD DATA ----------------=====---------------------");
return 0;
};
return (
<>
<BlogItem commonHeadData={commonHeadData} />
</>
);
}