Compare commits

...

19 Commits

Author SHA1 Message Date
victorAnumudu 139f87c919 corrected wrong placeholders 2023-11-28 02:16:49 +01:00
ameye 1a817e723e Merge branch 'Server-path-added' of WrenchBoard/Users-Wrench into master 2023-11-27 11:31:03 +00:00
ebube c023911cd4 Fixed prev card issue 2023-11-27 03:19:39 -08:00
ameye 907dc298ab Merge branch 'file_link_update' of WrenchBoard/Users-Wrench into master 2023-11-27 10:32:02 +00:00
ameye 8095006386 Merge branch 'Server-path-added' of WrenchBoard/Users-Wrench into master 2023-11-27 10:31:57 +00:00
ebube d9d28791da Added and specified card_uid for prev and new card 2023-11-27 01:49:09 -08:00
ebube a98d967ba4 Fixed the credit issues 2023-11-27 01:12:24 -08:00
victorAnumudu 59a5e84ee2 uploaded link for file added 2023-11-27 07:00:58 +01:00
ameye 35ed1d48a3 Merge branch 'zero-bal-job-add' of WrenchBoard/Users-Wrench into master 2023-11-23 11:12:47 +00:00
victorAnumudu f9d385dfec made user to be able to add job even with zero wallet bal 2023-11-23 12:04:29 +01:00
ameye 033af03221 Merge branch 'Server-path-added' of WrenchBoard/Users-Wrench into master 2023-11-22 03:26:54 +00:00
ebube b3afb94030 Added family banner 2023-11-21 15:47:02 -08:00
ameye 0b1aa4e7d9 Merge branch 'Server-path-added' of WrenchBoard/Users-Wrench into master 2023-11-21 16:18:24 +00:00
ebube 18c4f31322 seen the issue 2023-11-21 08:02:11 -08:00
ebube 97e3344953 Added tabs as individual components 2023-11-21 07:32:36 -08:00
ebube 9565ca0d35 Fixed typo causing error displays in the console.log 2023-11-21 07:22:33 -08:00
ameye 51cc4edc1d Merge branch 'assign-task-message-bug' of WrenchBoard/Users-Wrench into master 2023-11-21 14:15:49 +00:00
ameye 21f1173e66 Merge branch 'Server-path-added' of WrenchBoard/Users-Wrench into master 2023-11-21 14:03:58 +00:00
ebube cf5ae81918 Added tabs for family settings 2023-11-21 05:58:57 -08:00
15 changed files with 371 additions and 79 deletions
+18 -18
View File
@@ -63,12 +63,12 @@ function AddJob({ popUpHandler, categories }) {
message: "",
}); // Holds state when submit button is pressed
const getWalletDetail = (country) => { // A FUNCTION TO GET USER BALANCE BASED ON COUNTRY SELECTED
const walletChecker = walletDetails?.data.find(
(item) => item.country === country
);
return walletChecker ? walletChecker.amount : 0;
};
// const getWalletDetail = (country) => { // A FUNCTION TO GET USER BALANCE BASED ON COUNTRY SELECTED
// const walletChecker = walletDetails?.data.find(
// (item) => item.country === country
// );
// return walletChecker ? walletChecker.amount : 0;
// };
const handleAddJob = async (values, helpers) => {
const reqData = {
@@ -81,20 +81,20 @@ function AddJob({ popUpHandler, categories }) {
category: values.category?.join("@"),
};
const walletAmount = getWalletDetail(reqData.country); // GETTING USER BALANCE BASED ON COUNTRY SELECTED
// const walletAmount = getWalletDetail(reqData.country); // GETTING USER BALANCE BASED ON COUNTRY SELECTED
if (reqData.price > walletAmount) {
setRequestStatus({
loading: false,
status: false,
message: "Insufficient Balance",
});
// if (reqData.price > walletAmount) {
// setRequestStatus({
// loading: false,
// status: false,
// message: "Insufficient Balance",
// });
setTimeout(() => {
setRequestStatus({ loading: false, status: false, message: "" });
}, 1500);
return;
}
// setTimeout(() => {
// setRequestStatus({ loading: false, status: false, message: "" });
// }, 1500);
// return;
// }
setRequestStatus({ loading: true, status: false, message: "" });
@@ -0,0 +1,9 @@
import React from 'react'
const AddFamily = () => {
return (
<div>Add Family</div>
)
}
export default AddFamily
@@ -0,0 +1,153 @@
import React, { useMemo, useRef, useState } from "react";
import usersService from "../../../../services/UsersService";
const FamilyBanner = ({ imageServer }) => {
const uploadedImage = `${imageServer}${localStorage.getItem(
"session_token"
)}/familybanner/${localStorage.getItem("uid")}`;
const familyBannerRef = useRef(null);
const jobApi = useMemo(() => new usersService(), []);
const [familyBannerImage, setFamilyBannerImage] = useState(uploadedImage);
const [uploadStatus, setUploadStatus] = useState({
loading: false,
status: false,
message: "",
});
/**
* Handles the change event of the family image input field.
* Checks if the selected file exceeds the maximum file size limit and displays an alert if it does.
* If the file is within the size limit, it reads the file using the FileReader API and sets the profile image state with the result.
*/
const familyBannerHandler = (e) => {
setUploadStatus({ loading: false, status: false, message: "" });
let acceptedFormat = ["jpeg", "jpg", "png", "bmp"]; // ARRAY OF SUPPORTED FORMATS
let uploadedFile = e.target.files[0]; //UPLOADED FILE
const fileFormat = uploadedFile?.type?.split("/")[1]?.toLowerCase();
if (!acceptedFormat.includes(fileFormat)) {
//CHECKING FOR CORRECT UPLOAD FORMAT
const msg = `Please select ${acceptedFormat
.slice(0, -1)
.join(", ")} or ${acceptedFormat.slice(-1)}`;
setUploadStatus({ loading: false, status: false, message: msg });
return setTimeout(() => {
// profileImgInput.current.value = '' // clear the input
setUploadStatus({ loading: false, status: false, message: "" });
}, 5000);
}
if (uploadedFile.size > 5 * 1048576) {
// CHECKING FOR CORRECT FILE SIZE
setUploadStatus({
loading: false,
status: false,
message: "File must not exceed 5MB",
});
return setTimeout(() => {
// profileImgInput.current.value = '' // clear the input
setUploadStatus({ loading: false, status: false, message: "" });
}, 5000);
}
if (e.target.value !== "") {
const imgReader = new FileReader();
imgReader.onload = (event) => {
let base64Img = imgReader.result.split(",")[1];
let reqData = {
// PAYLOAD FOR API CALL
job_uid: localStorage.getItem("uid"),
file_name: uploadedFile?.name.slice(0, 19),
file_size: uploadedFile?.size,
file_type: uploadedFile?.type?.split("/")[0]?.toLowerCase(),
file_data: base64Img,
msg_type: "FILE",
action: 11303,
};
setUploadStatus({
loading: true,
status: false,
message: "Loading...",
});
jobApi
.sendFiles(reqData)
.then((res) => {
if (res.status != 200 || res.data.internal_return < 0) {
return setUploadStatus({
loading: false,
status: false,
message: "Something went wrong, try again",
});
}
setUploadStatus({
loading: false,
status: true,
message: "Uploaded successfully",
});
setFamilyBannerImage(event.target.result);
})
.catch((error) => {
setUploadStatus({
loading: false,
status: false,
message: "Network error, try again",
});
})
.finally(() => {
setTimeout(() => {
setUploadStatus({ loading: false, status: false, message: "" });
}, 5000);
});
};
imgReader.readAsDataURL(e.target.files[0]);
}
};
return (
<div className="flex flex-col gap-4">
<div className="w-full lg:h-[400px] rounded-2xl">
<img
src={familyBannerImage}
alt="familyBanner"
className="w-full h-full object-cover rounded-2xl"
/>
</div>
<div className="flex justify-between w-full">
<div>
{uploadStatus.message && !uploadStatus.loading && (
<p
className={`text-center ${
uploadStatus.status ? "text-green-500" : "text-red-500"
}`}
>
{uploadStatus.message}
</p>
)}
{uploadStatus.loading && (
<p className="text-center">{uploadStatus.message}</p>
)}
</div>
<div>
<input
ref={familyBannerRef}
className="hidden"
type="file"
accept="image/*"
onChange={familyBannerHandler}
/>
<button
className="btn-gradient w-[153px] h-[46px] rounded-full text-white lg:flex hidden justify-center items-center"
onClick={() => familyBannerRef.current.click()}
>
Change Banner
</button>
</div>
</div>
</div>
);
};
export default FamilyBanner;
@@ -0,0 +1,9 @@
import React from 'react'
const Relatives = () => {
return (
<div>Relatives</div>
)
}
export default Relatives
@@ -0,0 +1,5 @@
import AddFamily from "./AddFamily";
import FamilyBanner from "./FamilyBanner";
import Relatives from "./Relatives";
export {AddFamily, FamilyBanner, Relatives}
@@ -1,8 +1,56 @@
import React from "react";
import React, { useEffect, useState } from "react";
import { Link, useLocation } from "react-router-dom";
import Icons from "../../Helpers/Icons";
import Layout from "../../Partials/Layout";
import { Link } from "react-router-dom";
import { AddFamily, FamilyBanner, Relatives } from "./Tabs";
const FamilySettings = () => {
let {state} = useLocation()
const tabs = [
{
id: 1,
name: "add_family",
title: "Add Family",
iconName: "new-family",
},
{
id: 2,
name: "relatives",
title: "Relatives",
iconName: "people-hover",
},
{
id: 3,
name: "family_banner",
title: "Family Banner",
iconName: "people-hover",
},
];
const [tab, setTab] = useState(() => {
// Retrieve the active tab from local storage or use the default tab
return localStorage.getItem("activeTab") || tabs[0].name;
});
const tabHandler = (value) => {
setTab(value);
};
// Update local storage when the tab changes
useEffect(() => {
localStorage.setItem("activeTab", tab);
}, [tab]);
const tabComponents = {
add_family: <AddFamily />,
relatives: <Relatives />,
family_banner: <FamilyBanner imageServer={state.imageServer} />,
};
const defaultTabComponent = Array(tabComponents)[0].add_family;
const selectedComponent = tabComponents[tab] || defaultTabComponent;
return (
<Layout>
<div className="notification-page w-full mb-10">
@@ -19,7 +67,32 @@ const FamilySettings = () => {
{/* Something Here */}
{/* <form className="logout-modal-body w-full flex flex-col items-center px-10 py-8 gap-4"></form> */}
<div className="w-full bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow h-full ">
<div className="update-table w-full h-full p-4 bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] flex flex-col justify-between "></div>
<div className="update-table w-full h-full p-4 bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] lg:flex lg:px-10 px-4 justify-between">
<div className="content-tab-items lg:w-[230px] w-full mr-2">
<ul className="overflow-hidden mb-10 lg:mb-0 py-8">
{tabs.map(({ name, id, title, iconName }) => (
<li
onClick={() => tabHandler(name)}
key={id}
className={`flex lg:space-x-4 space-x-2 hover:text-purple transition-all duration-300 ease-in-out items-center cursor-pointer lg:mb-11 mb-2 mr-6 lg:mr-0 float-left lg:float-none overflow-hidden ${
tab === name ? "text-purple" : " text-thin-light-gray"
}`}
>
<div>
<Icons name={iconName} />
</div>
<div>
<p className="text-18 tracking-wide">{title}</p>
</div>
</li>
))}
</ul>
</div>
<div className="w-[1px] bg-[#E3E4FE] dark:bg-[#a7a9b533] mr-10"></div>
<div className="flex-1">
<div className="tab-item">{selectedComponent}</div>
</div>
</div>
</div>
</div>
</div>
+1 -1
View File
@@ -149,7 +149,7 @@ export default function FamilyTable({
className="w-[0.7rem]"
>
<path
fill-rule="evenodd"
fillRule="evenodd"
d="M.366 19.708c.405.39 1.06.39 1.464 0l8.563-8.264a1.95 1.95 0 0 0 0-2.827L1.768.292A1.063 1.063 0 0 0 .314.282a.976.976 0 0 0-.011 1.425l7.894 7.617a.975.975 0 0 1 0 1.414L.366 18.295a.974.974 0 0 0 0 1.413"
// fill=""
className="color000000 svgShape fill-[#fff]"
+1
View File
@@ -158,6 +158,7 @@ export default function FamilyAcc() {
</div>
<Link
to={`/familysettings`}
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%)]"
>
<svg
@@ -30,21 +30,26 @@ export default function ActiveJobMessage({ activeJobMesList }) {
{activeJobMesList?.data?.length ?
(
<tbody>
{activeJobMesList.data.map((item, index) => (
<tr key={index} className='text-slate-500'>
<td>
<div className={`msg_box ${item.who}`}>
<div className="msg_header">{item.msg_date} {item.msg_firstname}</div>
{item.msg_type == 'FILE' ?
<a href='' className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></a>
:
<span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
}
</div>
</td>
</tr>
))}
{activeJobMesList.data.map((item, index) =>
{
let imageLink = `${activeJobMesList?.image}${localStorage.getItem('session_token')}/contrats/${item.msg_uid}`
return (
<tr key={index} className='text-slate-500'>
<td>
<div className={`msg_box ${item.who}`}>
<div className="msg_header">{item.msg_date} {item.msg_firstname}</div>
{item.msg_type == 'FILE' ?
<a href={imageLink} target="_blank" className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></a>
:
<span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
}
</div>
</td>
</tr>
)
}
)}
</tbody>
)
:
@@ -64,17 +64,21 @@ const initialValues = {
};
function AddFundDollars(props) {
let MaxNoOfCards = process.env.REACT_APP_MAX_CREDIT_CARDS // HOLDS THE VALUE OF THE MAX NUMBER OF CARDS USER CAN ADD
let MaxNoOfCards = process.env.REACT_APP_MAX_CREDIT_CARDS; // HOLDS THE VALUE OF THE MAX NUMBER OF CARDS USER CAN ADD
const apiCall = new usersService();
let countryWallet = props.walletItem.country;
const [tab, setTab] = useState("previous");
const [selectedOption, setSelectedOption] = useState("previous");
const { userDetails } = useSelector((state) => state?.userDetails);
const [prevCardDetails, setPrevCardDetails] = useState({});
const [payListCards, setPayListCards] = useState({ loading: true, data: [] });
const [cardIcons, setCardIcons] = useState("atm-card");
const [prevCardError, setPrevCardError] = useState("");
const handleOptionChange = (event) => {
setSelectedOption(event.target.value);
};
const { firstname, lastname } = userDetails;
// Handling Card Icons
@@ -144,7 +148,12 @@ function AddFundDollars(props) {
return;
}
if (tab === "previous") {
let stateData = {
amount: Number(props.input) * 100,
currency: props.walletItem?.code,
};
if (selectedOption === "previous") {
// To check if card is empty
if (Object.keys(prevCardDetails).length === 0) {
setPrevCardError("No card selected!");
@@ -158,10 +167,26 @@ function AddFundDollars(props) {
show: { awaitConfirm: { loader: true } },
}));
let stateData = {
amount: Number(props.input) * 100,
currency: props.walletItem?.code,
};
// Extracting card_uid from the previous card details
const paymentCardValue = prevCardDetails["payment-card"];
if (paymentCardValue) {
try {
const paymentCardObject = JSON.parse(paymentCardValue);
stateData = {
...stateData,
card_uid: paymentCardObject.card_uid,
};
} catch (error) {
console.error("Error parsing JSON:", error);
}
} else {
// For the new card details
stateData = {
...stateData,
card_uid: "",
};
}
try {
const res = await apiCall.getStartCredit(stateData);
@@ -171,12 +196,11 @@ function AddFundDollars(props) {
}
const _response = res.data;
stateData.amount = Number(props.input);
stateData.card =
tab === "previous"
selectedOption === "previous"
? prevCardDetails["payment-card"]
: { ...values, cvv: values.cvv };
stateData.cardType = tab === "previous" ? "prev" : "new";
stateData.cardType = selectedOption === "previous" ? "prev" : "new";
stateData = { ...stateData, ..._response };
setTimeout(() => {
@@ -224,36 +248,45 @@ function AddFundDollars(props) {
</h1>
<div className="my-1 flex items-center gap-2">
<label
onClick={() => setTab("previous")}
htmlFor="previous"
className="cursor-pointer flex items-center gap-1"
>
<input
type="radio"
id="previous"
value="previous"
name="card-option"
checked={tab === "previous"}
onChange={handleOptionChange}
checked={selectedOption === "previous"}
className={`p-2 text-lg font-bold text-slate-600 dark:text-white border pointer-events-none w-7 h-7 ${
tab == "previous" ? "" : ""
selectedOption == "previous" ? "" : ""
} tracking-wide transition duration-200`}
/>
Previous Cards
</label>
<label
onClick={() => setTab("new")}
htmlFor="new"
className={`cursor-pointer flex items-center gap-1 ${payListCards.data.length >= MaxNoOfCards ? 'pointer-events-none':''}`}
className={`cursor-pointer flex items-center gap-1 ${
payListCards.data.length >= MaxNoOfCards
? "pointer-events-none"
: ""
}`}
>
<input
id="new"
type="radio"
name="card-option"
checked={tab === "new"}
value="new"
onChange={handleOptionChange}
checked={selectedOption === "new"}
className={`p-2 text-lg font-bold text-slate-600 dark:text-white border pointer-events-none w-7 h-7 ${
tab == "new" ? "" : ""
selectedOption == "new" ? "" : ""
} tracking-wide transition duration-200`}
/>
Add New Card {payListCards.data.length >= MaxNoOfCards && <span className="text-[14px] text-red-500">Max Reached</span>}
Add New Card{" "}
{payListCards.data.length >= MaxNoOfCards && (
<span className="text-[14px] text-red-500">Max Reached</span>
)}
</label>
</div>
</form>
@@ -261,8 +294,8 @@ function AddFundDollars(props) {
<hr />
{/* END OF switch button */}
{/* previous tab */}
{tab === "previous" && (
{/* previous selectedOption */}
{selectedOption === "previous" && (
<div className="p-4 previous-details w-full min-h-[16.5rem] flex flex-col">
{payListCards.loading ? (
<LoadingSpinner size="10" color="sky-blue" />
@@ -278,10 +311,11 @@ function AddFundDollars(props) {
{currentPreviousCards.map((item, index) => (
<option
key={index}
className={index !== 0 && "border-t-2"}
className={index !== 0 ? "border-t-2" : undefined}
value={JSON.stringify(item)}
title={`${item.description} Card\nBank **************${item.digits}`}
>
<div className="my-2 flex items-center gap-5">
{/* <div className="my-2 flex items-center gap-5">
<div className="card-details">
<h1 className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">
{item.description} Card
@@ -290,7 +324,8 @@ function AddFundDollars(props) {
Bank **************{item.digits}
</p>
</div>
</div>
</div> */}
{item.description} Card - Bank **************{item.digits}
</option>
))}
</select>
@@ -300,7 +335,7 @@ function AddFundDollars(props) {
No Previous Card Found!
</p>
<button
onClick={() => setTab("new")}
onClick={() => setSelectedOption("new")}
type="button"
className="my-5 px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
>
@@ -314,13 +349,13 @@ function AddFundDollars(props) {
</div>
)}
{tab === "new" && (
{selectedOption === "new" && (
<div className="new-details w-full max-h-[22rem]">
{payListCards.loading ?
{payListCards.loading ? (
<div className="pt-10 flex w-full h-full justify-center items-center">
<LoadingSpinner size='10' color='sky-blue' />
<LoadingSpinner size="10" color="sky-blue" />
</div>
:payListCards.data.length < MaxNoOfCards ?
) : payListCards.data.length < MaxNoOfCards ? (
<div className="w-full flex flex-col justify-between">
<Formik
initialValues={initialValues}
@@ -379,7 +414,8 @@ function AddFundDollars(props) {
*
</span>
<span className="text-[12px] text-red-500 ml-1">
{props.errors.expirationMonth && "**"}
{props.errors.expirationMonth &&
"**"}
</span>
</label>
</div>
@@ -431,7 +467,8 @@ function AddFundDollars(props) {
*
</span>
<span className="text-[12px] text-red-500 italic">
{props.errors.expirationYear && "**"}
{props.errors.expirationYear &&
"**"}
</span>
</label>
</div>
@@ -560,14 +597,12 @@ function AddFundDollars(props) {
}}
</Formik>
</div>
:
null
}
) : null}
</div>
)}
</div>
{tab == "previous" && (
{selectedOption == "previous" && (
<div className="md:py-8 add-fund-btn flex justify-end items-center gap-2 py-4">
<button
className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center bg-[#f5a430] text-black items-center text-base rounded-full"
@@ -71,6 +71,7 @@ function AddFundPop({
// Prepare state data for API call
let stateData = {
amount: Number(input) * 100,
card_uid: "", //added card_uid as empty string
currency: walletItem?.code,
};
@@ -45,7 +45,7 @@ function ThePaymentText({ value, type }) {
* @returns {JSX.Element} - The rendered component.
*/
function AmountSection({ currency, amount, country }) {
const formattedAmount = amount?.toFixed(2);
const formattedAmount = (+amount * 0.01)?.toFixed(2);
const gapClassName = country === "US" ? "gap-14" : "gap-4";
return (
@@ -87,7 +87,7 @@ function TransactionFeeSection({ currency, fee, country }) {
*/
function TotalSection({ currency, amount, fee, country }) {
const total = Number(amount) + Number(fee);
const formattedTotal = total?.toFixed(2);
const formattedTotal = (total * 0.01)?.toFixed(2);
const gap = country === "US" ? "gap-[8rem]" : "gap-[6.3rem]";
@@ -224,7 +224,7 @@ function ConfirmAddFund({
// Create request data object with required parameters for making the payment
const reqData = {
amount: amount * 100,
amount: amount,
card_uid,
credit_reference,
currency,
@@ -289,7 +289,7 @@ function ConfirmAddFund({
// Prepare request data
const reqData = {
amount: amount * 100,
amount: amount,
cardnumber: cardNum.replace(/\s/g, ""),
credit_reference,
cvc: cvv,
@@ -157,7 +157,7 @@ export default function ProductUploadField({
fieldClass="px-6"
type="text"
name="name"
placeholder="RaidParty Fighters"
placeholder="Item Name"
inputHandler={inh}
value={datas.itemName}
/>
@@ -186,7 +186,7 @@ export default function ProductUploadField({
<textarea
value={datas.description}
onChange={(e) => dscrphn(e)}
placeholder="provide a detailed description of your item."
placeholder="Enter detail description"
rows="7"
className="w-full h-full px-7 py-4 border border-light-purple dark:border-[#5356fb29] rounded-[20px] text-dark-gray dark:text-white bg-[#FAFAFA] dark:bg-[#11131F] focus:ring-0 focus:outline-none"
/>
+1 -1
View File
@@ -358,7 +358,7 @@ const EditJobPopOut = ({
/>
{taskImage ?
<div className="w-full absolute -top-5">
<img src={taskImage} className="max-h-[150px] min-h-[150px] w-full object-cover" alt="uplaoded task image" />
<img src={taskImage} className="max-h-[150px] min-h-[150px] w-full object-cover" alt="uploaded task" />
<span onClick={()=>setTaskImage('')} className="p-2 absolute text-sm top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 bg-white/80 hover:bg-white hover:shadow-md transition-all duration-500 cursor-pointer text-slate-800">Remove Image</span>
</div>
:
+1
View File
@@ -39,6 +39,7 @@ function ManageActiveJobs() {
loading: false,
error: false,
data: res.data.result_list,
image: res.data.session_image_server
});
})
.catch((error) => {