diff --git a/.vscode/settings.json b/.vscode/settings.json index 3d65345e..4b28d130 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,9 @@ { "eslint.enable": true, "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"], - "editor.rulers": [100], - "prettier.eslintIntegration": true, + "editor.rulers": [ + 100 + ], "editor.formatOnSave": true, "editor.formatOnSaveTimeout": 750, "[javascript]": { diff --git a/src/components/profile/ProfileSettings/index.tsx b/src/components/profile/ProfileSettings/index.tsx index 22b3af50..7a29ab30 100644 --- a/src/components/profile/ProfileSettings/index.tsx +++ b/src/components/profile/ProfileSettings/index.tsx @@ -1,46 +1,53 @@ -import React, { FC, useState, useEffect, useCallback } from 'react'; -import styles from './styles.scss'; -import { connect } from 'react-redux'; -import classNames from 'classnames'; -import { selectAuthUser, selectAuthProfile } from '~/redux/auth/selectors'; -import { Textarea } from '~/components/input/Textarea'; -import { Button } from '~/components/input/Button'; -import { Group } from '~/components/containers/Group'; -import { Filler } from '~/components/containers/Filler'; -import { TextInput } from '~/components/input/TextInput'; -import { InputText } from '~/components/input/InputText'; -import reject from 'ramda/es/reject'; -import * as AUTH_ACTIONS from '~/redux/auth/actions'; -import { ERROR_LITERAL } from '~/constants/errors'; +import React, { FC, useState, useEffect, useCallback } from "react"; +import styles from "./styles.scss"; +import { connect } from "react-redux"; +import classNames from "classnames"; +import { selectAuthUser, selectAuthProfile } from "~/redux/auth/selectors"; +import { Textarea } from "~/components/input/Textarea"; +import { Button } from "~/components/input/Button"; +import { Group } from "~/components/containers/Group"; +import { Filler } from "~/components/containers/Filler"; +import { TextInput } from "~/components/input/TextInput"; +import { InputText } from "~/components/input/InputText"; +import reject from "ramda/es/reject"; +import * as AUTH_ACTIONS from "~/redux/auth/actions"; +import { ERROR_LITERAL } from "~/constants/errors"; const mapStateToProps = state => ({ user: selectAuthUser(state), - profile: selectAuthProfile(state), + profile: selectAuthProfile(state) }); const mapDispatchToProps = { - authPatchUser: AUTH_ACTIONS.authPatchUser, + authPatchUser: AUTH_ACTIONS.authPatchUser }; -type IProps = ReturnType & typeof mapDispatchToProps & {}; +type IProps = ReturnType & + typeof mapDispatchToProps & {}; const ProfileSettingsUnconnected: FC = ({ user, authPatchUser, - profile: { patch_errors }, + profile: { patch_errors } }) => { - const [password, setPassword] = useState(''); - const [new_password, setNewPassword] = useState(''); + const [password, setPassword] = useState(""); + const [new_password, setNewPassword] = useState(""); const [data, setData] = useState(user); - const setDescription = useCallback(description => setData({ ...data, description }), [ - data, - setData, - ]); + const setDescription = useCallback( + description => setData({ ...data, description }), + [data, setData] + ); - const setEmail = useCallback(email => setData({ ...data, email }), [data, setData]); - const setUsername = useCallback(username => setData({ ...data, username }), [data, setData]); + const setEmail = useCallback(email => setData({ ...data, email }), [ + data, + setData + ]); + const setUsername = useCallback(username => setData({ ...data, username }), [ + data, + setData + ]); const onSubmit = useCallback( event => { @@ -51,7 +58,7 @@ const ProfileSettingsUnconnected: FC = ({ username: data.username !== user.username && data.username, password: password.length > 0 && password, new_password: new_password.length > 0 && new_password, - description: data.description !== user.description && data.description, + description: data.description !== user.description && data.description }); if (Object.values(fields).length === 0) return; @@ -64,11 +71,15 @@ const ProfileSettingsUnconnected: FC = ({ return (
-