From 27d966f52b26b71c4a7d2b177fd3d72413d56edb Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 5 May 2020 10:25:46 +0530 Subject: [PATCH 1/5] remove unnecessary console --- .../SignupEventHistoryLeftPanel.js | 7 ------- .../SignupEventInvitationLeftPanel.js | 7 ------- 2 files changed, 14 deletions(-) diff --git a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryLeftPanel/SignupEventHistoryLeftPanel.js b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryLeftPanel/SignupEventHistoryLeftPanel.js index 5a564ed27..a4713abfb 100644 --- a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryLeftPanel/SignupEventHistoryLeftPanel.js +++ b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryLeftPanel/SignupEventHistoryLeftPanel.js @@ -71,13 +71,6 @@ class SignupEventHistoryLeftPanel extends React.Component { const { time, key, elapsed } = convertFormat(event.eventProfile[this.state.sortingField] * 1000); - console.log("event time"); - console.log(event.eventProfile[this.state.sortingField] * 1000); - console.log("time ", time); - console.log("key ", key); - console.log("elapsed ", elapsed); - console.log(""); - return (
  • this.showActiveEvent(true, event, index)}> diff --git a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationLeftPanel/SignupEventInvitationLeftPanel.js b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationLeftPanel/SignupEventInvitationLeftPanel.js index 3f641d119..6f2a7597d 100644 --- a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationLeftPanel/SignupEventInvitationLeftPanel.js +++ b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationLeftPanel/SignupEventInvitationLeftPanel.js @@ -49,13 +49,6 @@ class SignupEventInvitationLeftPanel extends React.Component { renderInvitation = (classes, t, index, invitation, showInvitation) => { const { time, key, elapsed } = convertFormat(invitation.createdTs * 1000); - console.log("invitation time"); - console.log(invitation.createdTs * 1000); - console.log("time ", time); - console.log("key ", key); - console.log("elapsed ", elapsed); - console.log(""); - return (
  • this.showActiveInvitation(true, invitation, index)}> -- GitLab From 1b2184c8e021915aa46d95ac79a3e6b32df53817 Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 5 May 2020 10:26:24 +0530 Subject: [PATCH 2/5] removed unnecessary console --- src/core/resource/signupevent/SignupEventSagas.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/core/resource/signupevent/SignupEventSagas.js b/src/core/resource/signupevent/SignupEventSagas.js index c6e187f3b..666ec2e11 100644 --- a/src/core/resource/signupevent/SignupEventSagas.js +++ b/src/core/resource/signupevent/SignupEventSagas.js @@ -195,7 +195,7 @@ function* handleGetEventProfileRequest(payload) { try { const res = yield call(SignupEventService.getEventProfile, eventSignupManager, accountId, eventId, isParticipants, accessToken); - + console.log('eventProfileRes', res); if (res && res.error) { @@ -226,7 +226,7 @@ function* handleGetEventProfileRequest(payload) { yield put(actions.getEventProfileSuccess({ eventProfileDetail, participantsList })); } - } catch(error){ + } catch (error) { yield put(actions.getEventProfileError(error)); } } @@ -455,7 +455,7 @@ function* handleUpdateEventInvitationRequest(payload) { console.log("calling invation update") console.log(""); - console.log(eventSignupManager); + //console.log(eventSignupManager); console.log(eventId2); console.log(isGoogleCalendar2); console.log(note2); @@ -467,12 +467,6 @@ function* handleUpdateEventInvitationRequest(payload) { console.log(accessToken); console.log(""); - // const verifyToken = yield call(authService.generateAuthToken, authManager); - - // console.log("verfiy token"); - // console.log(verifyToken.data.tokenresponsedetails.token); - // yield put(profileInitActions.initializingProfile({ initializing: false })); - const res = yield call(SignupEventService.updateSignupInvitation, eventSignupManager, eventId2, isGoogleCalendar2, note2, rsvp2, userType2, accountId, slots2, name2, accessToken); console.log("[RESPONSE] -> UPDATE INVITATION", res); -- GitLab From 0fe39efbc9db12e41623b6bb8714b7b59be3368f Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 5 May 2020 10:28:38 +0530 Subject: [PATCH 3/5] added to resolve conflict --- package-lock.json | 72 +++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5943a5230..18e6b20b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -278,7 +278,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -299,12 +300,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -325,12 +328,14 @@ "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -475,6 +480,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -482,12 +488,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -506,6 +514,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -599,6 +608,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -740,6 +750,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -9095,8 +9106,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -9139,8 +9149,7 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", @@ -9151,8 +9160,7 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -9269,8 +9277,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -9282,7 +9289,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9312,7 +9318,6 @@ "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -9331,7 +9336,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -9425,7 +9429,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -9511,8 +9514,7 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -9548,7 +9550,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -9568,7 +9569,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -9612,14 +9612,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -20000,6 +19998,7 @@ "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -20018,6 +20017,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -20111,6 +20111,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -21672,8 +21673,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -21716,8 +21716,7 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", @@ -21728,8 +21727,7 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -21846,8 +21844,7 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -21859,7 +21856,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -21882,8 +21878,7 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.9.0", @@ -21996,8 +21991,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -22130,7 +22124,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -22150,7 +22143,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } -- GitLab From 977364bda644b17be7ce5035b345bb77b3da5360 Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 5 May 2020 11:12:33 +0530 Subject: [PATCH 4/5] replaced from dev branch --- package-lock.json | 53 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 33789912c..05adea393 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9141,7 +9141,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -9184,7 +9185,8 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -9195,7 +9197,8 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -9312,7 +9315,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -9324,6 +9328,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9353,6 +9358,7 @@ "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -9371,6 +9377,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -9464,6 +9471,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -9549,7 +9557,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -9585,6 +9594,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -9604,6 +9614,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -9647,12 +9658,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -16599,6 +16612,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "reselect": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz", + "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==" + }, "resolve": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", @@ -21712,7 +21730,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -21755,7 +21774,8 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -21766,7 +21786,8 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -21883,7 +21904,8 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -21895,6 +21917,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -21917,7 +21940,8 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.9.0", @@ -22032,7 +22056,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -22167,6 +22192,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -22186,6 +22212,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } -- GitLab