evo/evoleasing-account
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/merelendor/evoleasing-account

Browse Source
This commit is contained in:
merelendor 2023-10-18 13:32:39 +03:00
commit 3cd70e996b
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/main/style.css
View File

@ -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 {

2
css/main/style.less
View File

@ -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;
}

9
pages/settings/digital.js
View File

@ -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 (
<React.Fragment>
<Head>
@ -118,7 +118,7 @@ class IndexPage extends React.Component
<p><br/></p>
{ message === undefined ? (
<form ref={ this.ref_form } onSubmit={ this._handle_onFormSubmit } onKeyDown={(e) => {if (e.key === 'Enter') e.preventDefault() }}>
<div className="form_field edo_operators_settings_list">
<div className="edo_operators_settings_list">
{ 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,
}
}

15
reducers/edoReducer.js
View File

@ -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,
};
}