Merge branch 'social-login-text-fix' of WrenchBoard/Users-Wrench into master
This commit is contained in:
Gogs
@@ -39,7 +39,7 @@ function AddJob({ popUpHandler, categories }) {
|
||||
|
||||
try {
|
||||
const res = await ApiCall.jobManagerCreateJob(reqData);
|
||||
if (res.data.internal_return < 1) {
|
||||
if (res?.data?.internal_return < 1) {
|
||||
setRequestStatus({
|
||||
loading: false,
|
||||
status: false,
|
||||
@@ -75,7 +75,7 @@ function AddJob({ popUpHandler, categories }) {
|
||||
// For form initial values
|
||||
const initialValues = {
|
||||
// initial values for formik
|
||||
country: walletDetails.data.length === 1 ? walletDetails.data[0].country : '',
|
||||
country: walletDetails?.data?.length === 1 ? walletDetails.data[0].country : '',
|
||||
price: "",
|
||||
title: "",
|
||||
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`}
|
||||
onChange={props.handleChange}
|
||||
onBlur={props.handleBlur}
|
||||
disabled={walletDetails.data.length === 1}
|
||||
disabled={walletDetails?.data?.length === 1}
|
||||
>
|
||||
{walletDetails?.loading ? (
|
||||
<option className="text-slate-500 text-lg" value="">
|
||||
Loading...
|
||||
</option>
|
||||
) : walletDetails.data.length > 1 ? (
|
||||
) : walletDetails?.data?.length > 1 ? (
|
||||
<>
|
||||
<option className="text-slate-500 text-lg" value="">
|
||||
Select a currency
|
||||
</option>
|
||||
{walletDetails.data?.map((item, index) => (
|
||||
{walletDetails?.data?.map((item, index) => (
|
||||
<option
|
||||
key={index}
|
||||
className="text-slate-500 text-lg"
|
||||
@@ -138,9 +138,9 @@ function AddJob({ popUpHandler, categories }) {
|
||||
</option>
|
||||
))}
|
||||
</>
|
||||
) : walletDetails.data.length === 1 ?
|
||||
) : walletDetails?.data?.length === 1 ?
|
||||
<>
|
||||
{walletDetails.data?.map((item, index) => (
|
||||
{walletDetails?.data?.map((item, index) => (
|
||||
<option
|
||||
key={index}
|
||||
className="text-slate-500 text-lg"
|
||||
|
||||
@@ -526,8 +526,8 @@ export default function Login() {
|
||||
)
|
||||
// END of family login compoenent
|
||||
}
|
||||
<div className='w-full text-center'>
|
||||
<Link className='text-center block font-semibold text-lg pt-3 tracking-wide' to='/login'>Return</Link>
|
||||
<div className='mt-4 w-full flex justify-center items-center text-center'>
|
||||
<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>
|
||||
{/* 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"
|
||||
>
|
||||
<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}
|
||||
</span>
|
||||
</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"
|
||||
>
|
||||
<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}
|
||||
</span>
|
||||
</button>
|
||||
|
||||
@@ -282,16 +282,17 @@ export default function SignUp({refer_link, details}) {
|
||||
)}
|
||||
</button>
|
||||
<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"
|
||||
>
|
||||
I agree with all
|
||||
<Link
|
||||
href="#"
|
||||
<a
|
||||
target='_blank'
|
||||
href={process.env.REACT_APP_TERMS_LINK}
|
||||
className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition mx-1 inline-block"
|
||||
>
|
||||
terms and condition
|
||||
</Link>
|
||||
</a>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -66,17 +66,17 @@ export default function LearnMore() {
|
||||
})
|
||||
|
||||
//FUNCTION TO GET LEARN MORE TOPIC
|
||||
|
||||
useEffect(()=>{
|
||||
apiCall.getLearnmoreTopics().then((res)=>{
|
||||
if(res.data.internal_return < 0){ // success but no data
|
||||
setTopics(prev => ({...prev, loading: false}))
|
||||
return
|
||||
}
|
||||
const resData = res?.data?.result_list
|
||||
const resData = res?.data?.result_list || []
|
||||
console.log('resData', resData)
|
||||
setTopics(prev => ({...prev, loading: false, data: resData}))
|
||||
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)
|
||||
// console.log('RES', resData)
|
||||
@@ -130,7 +130,7 @@ export default function LearnMore() {
|
||||
<>
|
||||
{(topics?.data && topics?.data?.length > 0) ?
|
||||
<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'
|
||||
>
|
||||
{/* {topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents} */}
|
||||
|
||||
Reference in New Issue
Block a user