From e3a5b19cc88e4d82855cd4e261847b7811ac47e4 Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Wed, 27 May 2020 14:31:39 +0530 Subject: [PATCH 1/2] fix some ui related issues --- .../EventInvitation/InvitationScreen.js | 38 +++++++++---------- .../EventInvitation/InvitationScreenStyle.js | 13 +++++-- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/containers/EventInvitation/InvitationScreen.js b/src/containers/EventInvitation/InvitationScreen.js index b9a11717a..334e9d1c8 100644 --- a/src/containers/EventInvitation/InvitationScreen.js +++ b/src/containers/EventInvitation/InvitationScreen.js @@ -110,6 +110,13 @@ class InvitationScreen extends PureComponent { }); } + let currentTime = (moment().valueOf()) / 1000; + currentTime = parseInt(currentTime); + + console.log("currentTime"); + console.log(currentTime); + console.log(""); + if (nextProps.eventProfileDetail.eventProfileDetail.savedPhase === 5) { let invitationCancelMsg = this.props.t("eventSignup.invitationCancelMsg").toString(); invitationCancelMsg = invitationCancelMsg.replace("event_name", nextProps.eventProfileDetail.eventProfileDetail.title); @@ -117,22 +124,15 @@ class InvitationScreen extends PureComponent { responseText: invitationCancelMsg, isEventSubmited: true }); - } - - let currentTime = (moment().valueOf()) / 1000; - currentTime = parseInt(currentTime); + } else if (currentTime > nextProps.eventProfileDetail.eventProfileDetail.startTs) { - console.log("currentTime"); - console.log(currentTime); - console.log(""); - - if (currentTime > nextProps.eventProfileDetail.eventProfileDetail.startTs) { let eventStartedMsg = this.props.t("eventSignup.eventStartedMsg").toString(); eventStartedMsg = eventStartedMsg.replace("event_name", nextProps.eventProfileDetail.eventProfileDetail.title); this.setState({ responseText: eventStartedMsg, isEventSubmited: true }); + } this.setState({ @@ -344,21 +344,21 @@ class InvitationScreen extends PureComponent {
  • {t('eventSignup.slotTable.eventName')} - : + : {eventProfileDetail.eventProfileDetail.title}
  • {t('eventSignup.slotTable.eventDec')} - : + : {eventProfileDetail.eventProfileDetail.description}
  • {t('eventSignup.slotTable.eventLocation')} - : + : {eventProfileDetail.eventProfileDetail.location.address}
  • @@ -367,25 +367,25 @@ class InvitationScreen extends PureComponent {
  • {t('eventSignup.timezone')} - : + : {eventProfileDetail.eventProfileDetail.timezone}
  • {t('eventSignup.slotTable.startTime')} - : - - {moment(eventProfileDetail.eventProfileDetail.eventSlotsList[0].startDate + " " + eventProfileDetail.eventProfileDetail.eventSlotsList[0].startTime).format("DD-MMM-YYYY hh:mm A")}
    -
    + : + + {moment(eventProfileDetail.eventProfileDetail.eventSlotsList[0].startDate + " " + eventProfileDetail.eventProfileDetail.eventSlotsList[0].startTime).format("DD-MMM-YYYY hh:mm A")}
    +
  • {t('eventSignup.slotTable.endTime')} - : + : - {moment(eventProfileDetail.eventProfileDetail.eventSlotsList[0].endDate + " " + eventProfileDetail.eventProfileDetail.eventSlotsList[0].endTime).format("DD-MMM-YYYY hh:mm A")} + {moment(eventProfileDetail.eventProfileDetail.eventSlotsList[0].endDate + " " + eventProfileDetail.eventProfileDetail.eventSlotsList[0].endTime).format("DD-MMM-YYYY hh:mm A")}
  • diff --git a/src/containers/EventInvitation/InvitationScreenStyle.js b/src/containers/EventInvitation/InvitationScreenStyle.js index c28547473..c728d61b2 100644 --- a/src/containers/EventInvitation/InvitationScreenStyle.js +++ b/src/containers/EventInvitation/InvitationScreenStyle.js @@ -130,7 +130,7 @@ export default ( border: '2px solid #c90010', background: 'none', fontSize: '18px', - height: '40px', + height: 'auto', borderRadius: '27px', width: '50%', display: ' inline-block', @@ -141,6 +141,14 @@ export default ( borderColor: '#ffffff', background: '#ffffff', boxShadow: '0 3px 8px 0 rgba(0, 0, 0, 0.4)', + }, + '@media (max-width: 646px)': { + fontSize: '12px', + width:'60%', + }, + '@media (max-width: 412px)': { + fontSize: '12px', + width:'80%', } }, storesInfo: { @@ -463,7 +471,6 @@ export default ( margin: "auto", top: 0, overflow: "hidden", - height: "90px", - transform: "translateY(35vh)", + transform: "translateY(33vh)", } }); -- GitLab From a2184f1f0a8d8d0d8aa51b9c4fdfc24603a0feb7 Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Wed, 27 May 2020 14:32:08 +0530 Subject: [PATCH 2/2] fix location selection issues --- src/layouts/EventSignupNew/EventSignupNew.js | 13 +++++++++---- .../EventSignupNew/subcomponents/LocationUpload.js | 10 ++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/layouts/EventSignupNew/EventSignupNew.js b/src/layouts/EventSignupNew/EventSignupNew.js index 71852673d..da9c48ea6 100644 --- a/src/layouts/EventSignupNew/EventSignupNew.js +++ b/src/layouts/EventSignupNew/EventSignupNew.js @@ -129,7 +129,8 @@ class EventSignupNew extends Component { inviteUsersTmp: [], timeSlotArr: [], accountsDetails: this.props.accountsDetails, - isGroupsMode: false + isGroupsMode: false, + remindMeArr: RemindMeSettings, }; } @@ -163,6 +164,10 @@ class EventSignupNew extends Component { //await this.props.navigateToSignupEvent( "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" ); } + + //filter RemindMeSettings arr + let remindMeArr = this.state.remindMeArr.filter(item => item.value != 'no'); + this.setState({ remindMeArr }); } UNSAFE_componentWillReceiveProps(newProps) { const editMode = this.state.editMode; @@ -1296,7 +1301,7 @@ class EventSignupNew extends Component { let reminderObj = { value: "", label: "", ms: 0 }; if (data.remindBefore > 0) { const reminderMs = data.remindBefore * 1000; - RemindMeSettings.map(function (v, k) { + this.state.remindMeArr.map(function (v, k) { if (reminderMs == v.ms) { reminderObj = v; } @@ -2290,8 +2295,8 @@ class EventSignupNew extends Component {