diff --git a/src/pages/user/popups/modules/edit/choice.js b/src/pages/user/popups/modules/edit/choice.js index 83c4757..6d73d67 100644 --- a/src/pages/user/popups/modules/edit/choice.js +++ b/src/pages/user/popups/modules/edit/choice.js @@ -1,14 +1,17 @@ -import React from "react"; -import PropTypes from "prop-types"; -import Button from "components/shared/button/button"; +import React from 'react'; +import PropTypes from 'prop-types'; +import Button from 'components/shared/button/button'; const Choice = ({ setPath }) => { return (
- - +
@@ -16,7 +19,7 @@ const Choice = ({ setPath }) => { }; Choice.propTypes = { - setPath: PropTypes.func.isRequired + setPath: PropTypes.func.isRequired, }; export default Choice; diff --git a/src/pages/user/popups/modules/edit/edit.scss b/src/pages/user/popups/modules/edit/edit.scss index 947f19b..210e5f5 100644 --- a/src/pages/user/popups/modules/edit/edit.scss +++ b/src/pages/user/popups/modules/edit/edit.scss @@ -5,6 +5,8 @@ .wrapper { display: flex; + flex-direction: column; + gap: 15px; align-items: center; justify-content: space-between; margin: 10px 0; @@ -13,6 +15,10 @@ margin-right: 15px; cursor: pointer; } + + button + button { + margin: 0; + } } .input-field { diff --git a/src/pages/user/popups/modules/edit/removeCustom.js b/src/pages/user/popups/modules/edit/removeCustom.js index ab247b0..dff4dfb 100644 --- a/src/pages/user/popups/modules/edit/removeCustom.js +++ b/src/pages/user/popups/modules/edit/removeCustom.js @@ -1,13 +1,13 @@ -import React from "react"; -import PropTypes from "prop-types"; -import PopupForm from "../form"; +import React from 'react'; +import PropTypes from 'prop-types'; +import PopupForm from '../form'; const RemoveCustomCashValue = ({ setPath, onChange }) => { return ( setPath("remove")} - onChange={(count) => onChange("remove", count)} + onBack={() => setPath(null)} + onChange={(count) => onChange('remove', count)} title="Вычесть" /> ); diff --git a/src/pages/user/popups/modules/editCaptcha/index.js b/src/pages/user/popups/modules/editCaptcha/index.js deleted file mode 100644 index 683d0e2..0000000 --- a/src/pages/user/popups/modules/editCaptcha/index.js +++ /dev/null @@ -1,20 +0,0 @@ -import React, { useState } from "react"; -import AddDefaultValue from "./modules/addDefault"; -import AddCustomValue from "../edit/addCustom"; -import SetCustomValue from "../edit/setCustom"; -import Choice from "../edit/choice"; - -const CashPopup = ({ ...rest }) => { - const [path, setPath] = useState(null); - const components = { - add: AddDefaultValue, - edit: SetCustomValue, - addCustom: AddCustomValue, - default: Choice, - }; - const Component = components[path || "default"]; - - return ; -}; - -export default CashPopup; diff --git a/src/pages/user/popups/modules/editCaptcha/modules/addDefault.js b/src/pages/user/popups/modules/editCaptcha/modules/addDefault.js deleted file mode 100644 index e5893cd..0000000 --- a/src/pages/user/popups/modules/editCaptcha/modules/addDefault.js +++ /dev/null @@ -1,35 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import Button from 'components/shared/button/button'; - -const AddDefaultCaptcha = ({ setPath, onChange }) => { - const values = [100, 200, 300, 400, 500, 600, 700, 800, 900, 1000]; - const list = values.map((value) => { - const title = `+ ${value}`; - return ( - - ); - }); - - return ( - <> - setPath(null)}> - keyboard_backspace - -
{list}
- - - ); -}; - -AddDefaultCaptcha.propTypes = { - setPath: PropTypes.func.isRequired, - onChange: PropTypes.func.isRequired, - property: PropTypes.string.isRequired, -}; - -export default AddDefaultCaptcha; diff --git a/src/pages/user/popups/modules/editCash/index.js b/src/pages/user/popups/modules/editCash/index.js index 683d0e2..a3f259c 100644 --- a/src/pages/user/popups/modules/editCash/index.js +++ b/src/pages/user/popups/modules/editCash/index.js @@ -1,18 +1,20 @@ -import React, { useState } from "react"; -import AddDefaultValue from "./modules/addDefault"; -import AddCustomValue from "../edit/addCustom"; -import SetCustomValue from "../edit/setCustom"; -import Choice from "../edit/choice"; +import React, { useState } from 'react'; +import AddDefaultValue from './modules/addDefault'; +import AddCustomValue from '../edit/addCustom'; +import RemoveCustomValue from '../edit/removeCustom'; +import SetCustomValue from '../edit/setCustom'; +import Choice from '../edit/choice'; const CashPopup = ({ ...rest }) => { const [path, setPath] = useState(null); const components = { add: AddDefaultValue, + remove: RemoveCustomValue, edit: SetCustomValue, addCustom: AddCustomValue, default: Choice, }; - const Component = components[path || "default"]; + const Component = components[path || 'default']; return ; }; diff --git a/src/pages/users/modules/listItem.js b/src/pages/users/modules/listItem.js index 1ae8552..55053b5 100644 --- a/src/pages/users/modules/listItem.js +++ b/src/pages/users/modules/listItem.js @@ -1,7 +1,7 @@ -import React from "react"; -import { useHistory } from "react-router-dom"; -import PropTypes from "prop-types"; -import "./listItem.scss"; +import React from 'react'; +import { useHistory } from 'react-router-dom'; +import PropTypes from 'prop-types'; +import './listItem.scss'; const User = ({ user }) => { const history = useHistory(); @@ -12,16 +12,10 @@ const User = ({ user }) => { return (
- icon + icon
{user.name}
- {user.email ? ( -
({user.email})
- ) : null} + {user.email ?
({user.email})
: null}
{user.cash} руб.
@@ -32,10 +26,9 @@ User.propTypes = { user: PropTypes.shape({ id: PropTypes.number.isRequired, name: PropTypes.string.isRequired, - email: PropTypes.string.isRequired, network: PropTypes.string.isRequired, - cash: PropTypes.number.isRequired - }) + cash: PropTypes.number.isRequired, + }), }; export default User;