From 305bff116706eed11d7c0c30ef9173a1b1bf93b6 Mon Sep 17 00:00:00 2001 From: Chief Bube Date: Mon, 23 Oct 2023 22:51:47 -0700 Subject: [PATCH] Job count increase - bug fixed --- package-lock.json | 74 ++++++++++++++++++++++ src/components/Partials/Sidebar.jsx | 1 + src/components/jobPopout/JobListPopout.jsx | 5 ++ src/middleware/AuthRoute.jsx | 3 +- 4 files changed, 82 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 5ebf231..29ecd64 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,13 +22,17 @@ "flutterwave-react-v3": "^1.3.0", "formik": "^2.2.9", "react": "^18.2.0", + "react-apple-login": "^1.1.6", "react-chartjs-2": "^4.1.0", "react-countup": "^6.2.0", "react-dom": "^18.2.0", + "react-google-recaptcha": "^3.1.0", + "react-qr-code": "^2.0.11", "react-redux": "^8.0.5", "react-router-dom": "^6.0.2", "react-scripts": "5.0.1", "react-slick": "^0.29.0", + "react-to-print": "^2.14.12", "react-toastify": "^9.0.1", "redux": "^4.2.0", "slick-carousel": "^1.8.1", @@ -14801,6 +14805,11 @@ "teleport": ">=0.2.0" } }, + "node_modules/qr.js": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz", + "integrity": "sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ==" + }, "node_modules/qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", @@ -14944,6 +14953,32 @@ "url": "https://opencollective.com/core-js" } }, + "node_modules/react-apple-login": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/react-apple-login/-/react-apple-login-1.1.6.tgz", + "integrity": "sha512-ySV6ax0aB+ksA7lKzhr4MvsgjwSH068VtdHJXS+7rL380IJnNQNl14SszR31k3UqB8q8C1H1oyjJFGq4MyO6tw==", + "engines": { + "node": ">=8", + "npm": ">=5" + }, + "peerDependencies": { + "prop-types": "^15.5.4", + "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/react-async-script": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/react-async-script/-/react-async-script-1.2.0.tgz", + "integrity": "sha512-bCpkbm9JiAuMGhkqoAiC0lLkb40DJ0HOEJIku+9JDjxX3Rcs+ztEOG13wbrOskt3n2DTrjshhaQ/iay+SnGg5Q==", + "dependencies": { + "hoist-non-react-statics": "^3.3.0", + "prop-types": "^15.5.0" + }, + "peerDependencies": { + "react": ">=16.4.1" + } + }, "node_modules/react-chartjs-2": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-4.3.1.tgz", @@ -15044,11 +15079,41 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, + "node_modules/react-google-recaptcha": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/react-google-recaptcha/-/react-google-recaptcha-3.1.0.tgz", + "integrity": "sha512-cYW2/DWas8nEKZGD7SCu9BSuVz8iOcOLHChHyi7upUuVhkpkhYG/6N3KDiTQ3XAiZ2UAZkfvYKMfAHOzBOcGEg==", + "dependencies": { + "prop-types": "^15.5.0", + "react-async-script": "^1.2.0" + }, + "peerDependencies": { + "react": ">=16.4.1" + } + }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "node_modules/react-qr-code": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/react-qr-code/-/react-qr-code-2.0.12.tgz", + "integrity": "sha512-k+pzP5CKLEGBRwZsDPp98/CAJeXlsYRHM2iZn1Sd5Th/HnKhIZCSg27PXO58zk8z02RaEryg+60xa4vyywMJwg==", + "dependencies": { + "prop-types": "^15.8.1", + "qr.js": "0.0.0" + }, + "peerDependencies": { + "react": "^16.x || ^17.x || ^18.x", + "react-native-svg": "*" + }, + "peerDependenciesMeta": { + "react-native-svg": { + "optional": true + } + } + }, "node_modules/react-redux": { "version": "8.0.5", "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.5.tgz", @@ -15218,6 +15283,15 @@ "react-dom": "^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0" } }, + "node_modules/react-to-print": { + "version": "2.14.15", + "resolved": "https://registry.npmjs.org/react-to-print/-/react-to-print-2.14.15.tgz", + "integrity": "sha512-SKnwOzU2cJ8eaAkoJO7+gNhvfEDmm+Y34IdcHsjtHioUevUPhprqbVtvNJlZ2JkGJ8ExK2QNWM9pXECTDR5D8w==", + "peerDependencies": { + "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/react-toastify": { "version": "9.1.1", "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-9.1.1.tgz", diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx index 64121fb..9030c30 100644 --- a/src/components/Partials/Sidebar.jsx +++ b/src/components/Partials/Sidebar.jsx @@ -8,6 +8,7 @@ import { import DarkModeContext from "../Contexts/DarkModeContext"; import Icons from "../Helpers/Icons"; + export default function Sidebar({ sidebar, action, diff --git a/src/components/jobPopout/JobListPopout.jsx b/src/components/jobPopout/JobListPopout.jsx index 527ec22..dd00adb 100644 --- a/src/components/jobPopout/JobListPopout.jsx +++ b/src/components/jobPopout/JobListPopout.jsx @@ -6,6 +6,8 @@ import InputCom from "../Helpers/Inputs/InputCom/index"; import ModalCom from "../Helpers/ModalCom"; import LoadingSpinner from "../Spinners/LoadingSpinner"; import Detail from "./popoutcomponent/Detail"; +import { tableReload } from "../../store/TableReloads"; +import { useDispatch } from "react-redux"; const validationSchema = Yup.object().shape({ family: Yup.string().required("This is required "), @@ -21,6 +23,8 @@ const validationSchema = Yup.object().shape({ }); function JobListPopout({ details, onClose, situation }) { +const dispatch = useDispatch() + const [familyList, setFamilyList] = useState([]); let [loader, setLoader] = useState({ member: false, @@ -159,6 +163,7 @@ function JobListPopout({ details, onClose, situation }) { const res = await apiCall.assignJobTask(reqData); let { data } = await res; setLoader({ jobFields: false }); + dispatch(tableReload({ type: "JOBTABLE" })); onClose(); throw new Response(data); } catch (error) { diff --git a/src/middleware/AuthRoute.jsx b/src/middleware/AuthRoute.jsx index 2c9654a..4444e99 100644 --- a/src/middleware/AuthRoute.jsx +++ b/src/middleware/AuthRoute.jsx @@ -11,6 +11,7 @@ import { updateNotifications } from "../store/notifications"; import { updateUserJobList } from "../store/userJobList"; import { updateWalletDetails } from "../store/walletDetails"; import { formattedDate } from "../lib"; +import { tableReload } from "../store/TableReloads"; const AuthRoute = ({ redirectPath = "/login", children }) => { const apiCall = useMemo(() => new usersService(), []); @@ -204,7 +205,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => { } }; getMarketActiveJobList(); - }, [apiCall, dispatch]); + }, [apiCall, dispatch, jobListTable]); //FUNCTION TO GET COMMON HEAD DATA useEffect(() => { -- 2.34.1