From a8b597a27f7ce5f696b6c4216d0cf04e0453c5dd Mon Sep 17 00:00:00 2001 From: merelendor Date: Wed, 18 Oct 2023 13:32:15 +0300 Subject: [PATCH] udpate for EDO operators/invites --- css/main/style.css | 2 +- css/main/style.less | 2 +- pages/settings/digital.js | 9 +++++---- reducers/edoReducer.js | 15 +++++++++++++++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/css/main/style.css b/css/main/style.css index 9209038..16ebc53 100644 --- a/css/main/style.css +++ b/css/main/style.css @@ -6302,7 +6302,7 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block .block_body .fines_ .edo_operators_settings_list { display: flex; flex-direction: column; - align-content: flex-start; + align-items: flex-start; gap: 15px 0px; } .edo_operators_settings_list_item { diff --git a/css/main/style.less b/css/main/style.less index d7ca3d4..72d1042 100644 --- a/css/main/style.less +++ b/css/main/style.less @@ -7272,7 +7272,7 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block { .edo_operators_settings_list { display: flex; flex-direction: column; - align-content: flex-start; + align-items: flex-start; gap: 15px 0px; } diff --git a/pages/settings/digital.js b/pages/settings/digital.js index 8696aef..8d1c18a 100644 --- a/pages/settings/digital.js +++ b/pages/settings/digital.js @@ -40,12 +40,12 @@ class IndexPage extends React.Component static getDerivedStateFromProps(nextProps, prevState) { - console.log("getDerivedStateFromProps", "edo", "operators", nextProps.operators); + console.log("getDerivedStateFromProps", "edo", nextProps); return { observer: nextProps.observer, user: nextProps.user, operators: nextProps.operators, - invites: nextProps.operators, + invites: nextProps.invites, }; } @@ -87,7 +87,7 @@ class IndexPage extends React.Component var list = operators !== null && invites !== null ? [ ...operators, ...invites ] : null; - console.log({ operators }); + console.log({ operators, invites }); return ( @@ -118,7 +118,7 @@ class IndexPage extends React.Component


{ message === undefined ? (
{if (e.key === 'Enter') e.preventDefault() }}> -
+
{ list.length > 0 ? <> { operators.map((operator, index) => ( @@ -186,6 +186,7 @@ function mapStateToProps(state, ownProps) observer: state.auth.observer, user: state.user, operators: state.edo.operators, + invites: state.edo.invites, } } diff --git a/reducers/edoReducer.js b/reducers/edoReducer.js index 2c26555..bafaa84 100644 --- a/reducers/edoReducer.js +++ b/reducers/edoReducer.js @@ -29,11 +29,26 @@ const edoReducer = (state = initialState.edo, action) => }; } + case actionTypes.EDO_INVITES_LIST: + { + console.log("actionTypes.EDO_INVITES_LIST", actionTypes.EDO_INVITES_LIST, { action }); + console.log({ + ...state, + invites: action.data.invites, + }); + + return { + ...state, + invites: action.data.invites, + }; + } + case actionTypes.EDO_RESET: { return { loaded: false, operators: null, + invites: null, }; }