From d9703fc3ffcfba719ed850234908d478f3d57249 Mon Sep 17 00:00:00 2001 From: ShruthiMonika Date: Wed, 22 Feb 2023 15:34:27 +0530 Subject: [PATCH 01/20] edit costeward fixed --- src/Components/signup/OrgRightside.js | 2 +- src/Utils/Common.js | 2 +- src/Views/Participants/EditParticipants.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/signup/OrgRightside.js b/src/Components/signup/OrgRightside.js index 7d9665bba..868a98460 100644 --- a/src/Components/signup/OrgRightside.js +++ b/src/Components/signup/OrgRightside.js @@ -808,7 +808,7 @@ export default function OrgRightside(props) { Next */} {props.orgName && - props.validOrgNumber.length > 8 && + props.validOrgNumber.length == 15 && !props.isOrgnameerror && props.Orgemailbtn && !props.isOrgmailerror && diff --git a/src/Utils/Common.js b/src/Utils/Common.js index 8d4f8c3f8..d13e2971e 100644 --- a/src/Utils/Common.js +++ b/src/Utils/Common.js @@ -251,7 +251,7 @@ export const openLinkInNewTab = (url) => { }; export const mobileNumberMinimunLengthCheck = (number) => { - return number.length >= 10; + return number.length == 15; }; export function toTitleCase(str) { diff --git a/src/Views/Participants/EditParticipants.js b/src/Views/Participants/EditParticipants.js index d744a9589..fa25181c3 100644 --- a/src/Views/Participants/EditParticipants.js +++ b/src/Views/Participants/EditParticipants.js @@ -109,7 +109,7 @@ function EditParticipants(props) { bodyFormData.append('website', websitelink); bodyFormData.append('address', JSON.stringify({ "address": organisationaddress, "country": countryvalue, "pincode": pincode })); // bodyFormData.append('subscription', organisationlength); - bodyFormData.append('role', 3); + {props.coSteward ? bodyFormData.append('role', 6) : bodyFormData.append('role', 3)} bodyFormData.append('id', idorg); bodyFormData.append("approval_status", istrusted) console.log("dfdfdsf", bodyFormData) From 43775b4d62b0c7caebd2696b5672c70128520271 Mon Sep 17 00:00:00 2001 From: kanhaiya suthar Date: Wed, 22 Feb 2023 15:36:47 +0530 Subject: [PATCH 02/20] microsite cursor pointer fixed foir the card listed --- src/Components/GuestUser/GuestUserDatasetCard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/GuestUser/GuestUserDatasetCard.js b/src/Components/GuestUser/GuestUserDatasetCard.js index 4179c7777..00140e914 100644 --- a/src/Components/GuestUser/GuestUserDatasetCard.js +++ b/src/Components/GuestUser/GuestUserDatasetCard.js @@ -36,7 +36,7 @@ const useStyles = { cardcolor: { border: "1px solid #E4E4E4", "box-shadow": "none", - cursor: "pointer", + // cursor: "pointer", height: "355px", "border-radius": "2px", width: "346px", @@ -45,7 +45,7 @@ const useStyles = { togglecardcolor: { "box-shadow": "0px 4px 20px rgba(216, 175, 40, 0.28)", border: "1px solid #ebd79c", - cursor: "pointer", + // cursor: "pointer", height: "355px", width: "346px", "margin-left": "20px", From f3d38632368d0a908996ce3ade0677fee7d79990 Mon Sep 17 00:00:00 2001 From: kanhaiya suthar Date: Wed, 22 Feb 2023 19:20:55 +0530 Subject: [PATCH 03/20] image was not appended with the base url is fixed in this --- .../GuestUser/GuestUserMainPage/EachCardForDetails.jsx | 3 ++- src/Components/GuestUser/GuestUserMainPage/ViewDetail.jsx | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Components/GuestUser/GuestUserMainPage/EachCardForDetails.jsx b/src/Components/GuestUser/GuestUserMainPage/EachCardForDetails.jsx index 5a6c03389..71839c342 100644 --- a/src/Components/GuestUser/GuestUserMainPage/EachCardForDetails.jsx +++ b/src/Components/GuestUser/GuestUserMainPage/EachCardForDetails.jsx @@ -6,6 +6,7 @@ import LocationOnIcon from '@mui/icons-material/LocationOn'; import ConfirmationNumberIcon from '@mui/icons-material/ConfirmationNumber'; import StorageIcon from '@mui/icons-material/Storage'; import GroupsIcon from '@mui/icons-material/Groups'; +import UrlConstant from '../../../Constants/UrlConstants'; const EachCardForDetails = (props) => { const { heading, no, address, icon, eachData, setIsViewDetails, setViewDetailData } = props return ( @@ -13,7 +14,7 @@ const EachCardForDetails = (props) => {
{/* */} - {eachData?.organization?.logo ? : + {eachData?.organization?.logo ? : {eachData?.organization?.name?.charAt(0)}}

{eachData?.organization.name}

diff --git a/src/Components/GuestUser/GuestUserMainPage/ViewDetail.jsx b/src/Components/GuestUser/GuestUserMainPage/ViewDetail.jsx index 869fc82c0..f304b6e01 100644 --- a/src/Components/GuestUser/GuestUserMainPage/ViewDetail.jsx +++ b/src/Components/GuestUser/GuestUserMainPage/ViewDetail.jsx @@ -9,6 +9,7 @@ import { Zoom } from '@material-ui/core'; import labels from '../../../Constants/labels'; import { Container } from 'react-bootstrap'; import parse from "html-react-parser"; +import UrlConstant from '../../../Constants/UrlConstants'; // import Select from 'react-select' const useStyles = { @@ -59,7 +60,8 @@ export default function ViewDetail(props) {

{each ? each : ""}
{each == "logo" ?
- {props?.viewDetailData?.organization[each] ? : "NA"} + {console.log(UrlConstant.base_url_without_slash + props?.viewDetailData?.organization[each])} + {props?.viewDetailData?.organization[each] ? : "NA"}
:
{props?.viewDetailData?.organization[each] ? ` ${props?.viewDetailData?.organization[each]}` : "NA"} From c7f1dad7d7a3b7c3c5594025ea0653d0fb7c7e76 Mon Sep 17 00:00:00 2001 From: kanhaiya suthar Date: Thu, 23 Feb 2023 15:11:47 +0530 Subject: [PATCH 04/20] fixed onbaording issue caused due to props.isOrgWebsiteerror state was used as a setState method --- src/Components/signup/OrgRightside.js | 60 +++++++++++++-------------- src/Utils/Common.js | 32 +++++++------- src/Views/Login/Login.js | 21 +++++----- 3 files changed, 58 insertions(+), 55 deletions(-) diff --git a/src/Components/signup/OrgRightside.js b/src/Components/signup/OrgRightside.js index 868a98460..d164e2501 100644 --- a/src/Components/signup/OrgRightside.js +++ b/src/Components/signup/OrgRightside.js @@ -71,11 +71,11 @@ export default function OrgRightside(props) { HTTPService( "GET", UrlConstant.base_url + - ((isLoggedInUserParticipant() || isLoggedInUserCoSteward()) - ? UrlConstant.participant - : UrlConstant.org) + - id + - "/", + ((isLoggedInUserParticipant() || isLoggedInUserCoSteward()) + ? UrlConstant.participant + : UrlConstant.org) + + id + + "/", "", false, true, @@ -90,12 +90,12 @@ export default function OrgRightside(props) { props.setOrgMail(response?.data?.organization?.org_email); props.setOrgWebsite(response?.data?.organization?.website); props.setOrgAddress(response?.data?.organization?.address?.address || JSON.parse(response?.data?.organization?.address)?.address); - props.setCountryValue(response?.data?.organization?.address?.country || JSON.parse(response?.data?.organization?.address)?.country) - if(response?.data?.organization?.address?.country || JSON.parse(response?.data?.organization?.address)?.country){ + props.setCountryValue(response?.data?.organization?.address?.country || JSON.parse(response?.data?.organization?.address)?.country) + if (response?.data?.organization?.address?.country || JSON.parse(response?.data?.organization?.address)?.country) { props.setOrgcountrybtn(true); } props.setValidOrgnumber(response?.data?.user?.phone_number); - props.setOrgPincode(response?.data?.organization?.address?.pincode || JSON.parse(response?.data?.organization?.address)?.pincode) + props.setOrgPincode(response?.data?.organization?.address?.pincode || JSON.parse(response?.data?.organization?.address)?.pincode) if ( response?.data?.organization?.name && @@ -116,7 +116,7 @@ export default function OrgRightside(props) { response?.data?.organization?.website && response?.data?.organization?.website.trim().length > 0 ) { - props.isOrgWebsiteerror(false); + props.setisOrgWebsiteerror(false); } if (response.data.organization.address) { @@ -554,9 +554,9 @@ export default function OrgRightside(props) { onChange={props.handleOrgnumber} error={props.orgPhoneNumberErrorMessage ? true : false} helperText={props.orgPhoneNumberErrorMessage} - // inputRef={profilenumber} - // error={isOrgnumbererror} - // helperText={isOrgnumbererror ? "Enter Valid Number" : ""} + // inputRef={profilenumber} + // error={isOrgnumbererror} + // helperText={isOrgnumbererror ? "Enter Valid Number" : ""} />
@@ -721,8 +721,8 @@ export default function OrgRightside(props) { border: "1px solid black", zIndex: 4, }} - // error={props.orgDescriptionErrorMessage ? true : false} - // helperText={props.orgDescriptionErrorMessage} + // error={props.orgDescriptionErrorMessage ? true : false} + // helperText={props.orgDescriptionErrorMessage} /> } - // maxSize={2} + // maxSize={2} />

{props.orgfile @@ -808,20 +808,20 @@ export default function OrgRightside(props) { Next */} {props.orgName && - props.validOrgNumber.length == 15 && - !props.isOrgnameerror && - props.Orgemailbtn && - !props.isOrgmailerror && - props.orgAddress && - !props.isOrgAddresserror && - props.orgCity && - !props.isOrgcityerror && - props.Orgcountrybtn && - props.orgPincode.length >= 5 && - !props.ispincodeerror && - Orgdesbtn && - props.orgfile != null && - props.orgfile.size < 2097152 ? ( + props.validOrgNumber?.length == 15 && + !props.isOrgnameerror && + props.Orgemailbtn && + !props.isOrgmailerror && + props.orgAddress && + !props.isOrgAddresserror && + props.orgCity && + !props.isOrgcityerror && + props.Orgcountrybtn && + props.orgPincode?.length >= 5 && + !props.ispincodeerror && + Orgdesbtn && + props.orgfile != null && + props.orgfile?.size < 2097152 ? (

- {(isLoggedInUserParticipant() || isLoggedInUserCoSteward() ) && ( + {(isLoggedInUserParticipant() || isLoggedInUserCoSteward()) && (