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

Merge branch 'social-login-text-fix' of WrenchBoard/Users-Wrench into master

Browse Source
This commit is contained in:
Olusesan Ameye
2025-06-14 01:51:34 +00:00
committed by Gogs
parent e3399d4b95 ab8320a846
commit a3320724de
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/AddJob/AddJob.jsx
+7 -7
View File
@@ -39,7 +39,7 @@ function AddJob({ popUpHandler, categories }) {
try { try {
const res = await ApiCall.jobManagerCreateJob(reqData); const res = await ApiCall.jobManagerCreateJob(reqData);
if (res.data.internal_return < 1) { if (res?.data?.internal_return < 1) {
setRequestStatus({ setRequestStatus({
loading: false, loading: false,
status: false, status: false,
@@ -75,7 +75,7 @@ function AddJob({ popUpHandler, categories }) {
// For form initial values // For form initial values
const initialValues = { const initialValues = {
// initial values for formik // initial values for formik
country: walletDetails.data.length === 1 ? walletDetails.data[0].country : '', country: walletDetails?.data?.length === 1 ? walletDetails.data[0].country : '',
price: "", price: "",
title: "", title: "",
description: "", description: "",
@@ -117,18 +117,18 @@ function AddJob({ popUpHandler, categories }) {
className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`} className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
onChange={props.handleChange} onChange={props.handleChange}
onBlur={props.handleBlur} onBlur={props.handleBlur}
disabled={walletDetails.data.length === 1} disabled={walletDetails?.data?.length === 1}
> >
{walletDetails?.loading ? ( {walletDetails?.loading ? (
<option className="text-slate-500 text-lg" value=""> <option className="text-slate-500 text-lg" value="">
Loading... Loading...
</option> </option>
) : walletDetails.data.length > 1 ? ( ) : walletDetails?.data?.length > 1 ? (
<> <>
<option className="text-slate-500 text-lg" value=""> <option className="text-slate-500 text-lg" value="">
Select a currency Select a currency
</option> </option>
{walletDetails.data?.map((item, index) => ( {walletDetails?.data?.map((item, index) => (
<option <option
key={index} key={index}
className="text-slate-500 text-lg" className="text-slate-500 text-lg"
@@ -138,9 +138,9 @@ function AddJob({ popUpHandler, categories }) {
</option> </option>
))} ))}
</> </>
) : walletDetails.data.length === 1 ? ) : walletDetails?.data?.length === 1 ?
<> <>
{walletDetails.data?.map((item, index) => ( {walletDetails?.data?.map((item, index) => (
<option <option
key={index} key={index}
className="text-slate-500 text-lg" className="text-slate-500 text-lg"
src/components/AuthPages/Login/index2.jsx
+4 -4
View File
@@ -526,8 +526,8 @@ export default function Login() {
) )
// END of family login compoenent // END of family login compoenent
} }
<div className='w-full text-center'> <div className='mt-4 w-full flex justify-center items-center text-center'>
<Link className='text-center block font-semibold text-lg pt-3 tracking-wide' to='/login'>Return</Link> <Link className='px-4 py-2 rounded-full text-xl text-white bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]' to='/login'>Return</Link>
</div> </div>
{/* END of login component */} {/* END of login component */}
@@ -621,7 +621,7 @@ const BrandBtn = ({
className="w-full border border-light-purple rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 items-center font-medium cursor-pointer" className="w-full border border-light-purple rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 items-center font-medium cursor-pointer"
> >
<img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" /> <img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" />
<span className="text-lg text-thin-light-gray font-normal text-[15px]"> <span className="text-thin-light-gray font-normal text-sm">
Continue with {brand} Continue with {brand}
</span> </span>
</a> </a>
@@ -632,7 +632,7 @@ const BrandBtn = ({
className="w-full border border-light-purple rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 items-center font-medium cursor-pointer" className="w-full border border-light-purple rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 items-center font-medium cursor-pointer"
> >
<img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" /> <img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" />
<span className="text-lg text-thin-light-gray font-normal text-[15px]"> <span className="text-thin-light-gray font-normal text-sm">
Continue with {brand} Continue with {brand}
</span> </span>
</button> </button>
src/components/AuthPages/SignUp/index2.jsx
+5 -4
View File
@@ -282,16 +282,17 @@ export default function SignUp({refer_link, details}) {
)} )}
</button> </button>
<span <span
onClick={rememberMe} // onClick={rememberMe}
className="cursor-default text-gray-400 font-medium text-[16.25px] leading-[24.375px] group-checked:text-white transition-all duration-200 group-checked:cursor-default" className="cursor-default text-gray-400 font-medium text-[16.25px] leading-[24.375px] group-checked:text-white transition-all duration-200 group-checked:cursor-default"
> >
I agree with all I agree with all
<Link <a
href="#" target='_blank'
href={process.env.REACT_APP_TERMS_LINK}
className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition mx-1 inline-block" className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition mx-1 inline-block"
> >
terms and condition terms and condition
</Link> </a>
</span> </span>
</div> </div>
</div> </div>
src/components/LearnMore/LearnMore.jsx
+4 -4
View File
@@ -66,17 +66,17 @@ export default function LearnMore() {
}) })
//FUNCTION TO GET LEARN MORE TOPIC //FUNCTION TO GET LEARN MORE TOPIC
useEffect(()=>{ useEffect(()=>{
apiCall.getLearnmoreTopics().then((res)=>{ apiCall.getLearnmoreTopics().then((res)=>{
if(res.data.internal_return < 0){ // success but no data if(res.data.internal_return < 0){ // success but no data
setTopics(prev => ({...prev, loading: false})) setTopics(prev => ({...prev, loading: false}))
return return
} }
const resData = res?.data?.result_list const resData = res?.data?.result_list || []
console.log('resData', resData)
setTopics(prev => ({...prev, loading: false, data: resData})) setTopics(prev => ({...prev, loading: false, data: resData}))
setTabs(prev => { setTabs(prev => {
return prev.map((item, index) => ({...item, title:resData[index].topic})) return prev?.map((item, index) => ({...item, title:resData[index]?.topic}))
}) })
setSelectedTab(resData[0].topic) setSelectedTab(resData[0].topic)
// console.log('RES', resData) // console.log('RES', resData)
@@ -130,7 +130,7 @@ export default function LearnMore() {
<> <>
{(topics?.data && topics?.data?.length > 0) ? {(topics?.data && topics?.data?.length > 0) ?
<div dangerouslySetInnerHTML={{ <div dangerouslySetInnerHTML={{
__html: topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents, __html: topics?.data?.filter(item => item?.topic == selectedTab)[0]?.contents,
}} className='prose dark:text-white dark:bg-dark-white' }} className='prose dark:text-white dark:bg-dark-white'
> >
{/* {topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents} */} {/* {topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents} */}