Fix & connectors folder

This commit is contained in:
elforjani3
2020-06-01 19:21:47 +02:00
parent c1659d191f
commit e1f56c873b
51 changed files with 665 additions and 632 deletions

View File

@@ -1,8 +1,8 @@
import React from 'react';
import { Button, Intent } from '@blueprintjs/core';
import { compose } from 'utils';
import DialogConnect from 'connectors/Dialog.connector';
import CurrencyFromDialogConnect from 'connectors/CurrencyFromDialog.connect';
import withDialog from 'containers/Dialogs/withDialog';
function Currencies({ openDialog }) {
const onClickNewCurrency = () => {
openDialog('currency-form',{});
@@ -17,4 +17,4 @@ function Currencies({ openDialog }) {
);
}
export default compose(DialogConnect, CurrencyFromDialogConnect)(Currencies);
export default compose(withDialog)(Currencies);

View File

@@ -4,7 +4,7 @@ import {
Intent,
} from '@blueprintjs/core';
import Icon from 'components/Icon';
import DialogConnect from 'connectors/Dialog.connector';
import withDialog from 'containers/Dialogs/withDialog';
import {compose} from 'utils';
function CurrenciesActions({
@@ -27,5 +27,5 @@ function CurrenciesActions({
}
export default compose(
DialogConnect,
withDialog,
)(CurrenciesActions);

View File

@@ -12,13 +12,13 @@ import { useQuery } from 'react-query';
import Icon from 'components/Icon';
import { compose } from 'utils';
import DialogConnect from 'connectors/Dialog.connector';
import withDialog from 'containers/Dialogs/withDialog';
import LoadingIndicator from 'components/LoadingIndicator';
import DataTable from 'components/DataTable';
import AppToaster from 'components/AppToaster';
import withDashboard from 'connectors/Dashboard.connector';
import withDashboard from 'containers/Dashboard/withDashboard';
import withCurrencies from 'containers/Currencies/withCurrencies';
import withCurrenciesActions from 'containers/Currencies/withCurrenciesActions';
import { FormattedMessage as T, useIntl } from 'react-intl';
@@ -156,6 +156,6 @@ export default compose(
currenciesList,
})),
withCurrenciesActions,
DialogConnect,
withDialog,
withDashboard
)(CurrenciesList);

View File

@@ -1,7 +1,7 @@
import React from 'react';
import { Tabs, Tab } from '@blueprintjs/core';
import PreferencesSubContent from 'components/Preferences/PreferencesSubContent';
import connector from 'connectors/UsersPreferences.connector';
import withUserPreferences from 'containers/Preferences/Users/withUserPreferences'
function UsersPreferences({ openDialog }) {
const onChangeTabs = (currentTabId) => {};
@@ -19,4 +19,4 @@ function UsersPreferences({ openDialog }) {
);
}
export default connector(UsersPreferences);
export default withUserPreferences(UsersPreferences);

View File

@@ -4,7 +4,7 @@ import {
Intent,
} from '@blueprintjs/core';
import Icon from 'components/Icon';
import DialogConnect from 'connectors/Dialog.connector';
import withDialog from 'containers/Dialogs/withDialog';
import {compose} from 'utils';
function UsersActions({
@@ -34,5 +34,5 @@ function UsersActions({
}
export default compose(
DialogConnect,
withDialog,
)(UsersActions);

View File

@@ -24,11 +24,12 @@ import LoadingIndicator from 'components/LoadingIndicator';
import AppToaster from 'components/AppToaster';
import DialogConnect from 'connectors/Dialog.connector';
import withDialog from 'containers/Dialogs/withDialog';
import withDashboard from 'containers/Dashboard/withDashboard';
import withUsers from 'containers/Users/withUsers';
import withUsersActions from 'containers/Users/withUsersActions';
import { compose } from 'utils';
function UsersListPreferences({
@@ -239,7 +240,7 @@ function UsersListPreferences({
}
export default compose(
DialogConnect,
withDialog,
withDashboard,
withUsers,
withUsersActions,

View File

@@ -0,0 +1,13 @@
import {connect} from 'react-redux';
import t from 'store/types';
export const mapStateToProps = (state, props) => {
};
export const mapDispatchToProps = (dispatch) => ({
openDialog: (name, payload) => dispatch({ type: t.OPEN_DIALOG, name, payload }),
closeDialog: (name, payload) => dispatch({ type: t.CLOSE_DIALOG, name, payload }),
});
export default connect(null, mapDispatchToProps);