mirror of
https://github.com/muerwre/vault-frontend.git
synced 2025-04-24 20:36:40 +07:00
fixed error handling
This commit is contained in:
parent
988a069d57
commit
b45ecadd20
3 changed files with 44 additions and 35 deletions
|
@ -1,4 +1,4 @@
|
|||
import * as React from 'react';
|
||||
import React, { FC, useCallback } from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import { push as historyPush } from 'connected-react-router';
|
||||
import { Link } from 'react-router-dom';
|
||||
|
@ -6,49 +6,57 @@ import { Logo } from '~/components/main/Logo';
|
|||
|
||||
import * as style from './style.scss';
|
||||
import { Filler } from '~/components/containers/Filler';
|
||||
import { selectUser, selectAuthLogin } from '~/redux/auth/selectors';
|
||||
import { selectUser } from '~/redux/auth/selectors';
|
||||
import { Group } from '~/components/containers/Group';
|
||||
import * as MODAL_ACTIONS from '~/redux/modal/actions';
|
||||
import { DIALOGS } from '~/redux/modal/constants';
|
||||
|
||||
const mapStateToProps = selectUser;
|
||||
|
||||
const mapDispatchToProps = {
|
||||
push: historyPush
|
||||
push: historyPush,
|
||||
showDialog: MODAL_ACTIONS.modalShowDialog,
|
||||
};
|
||||
|
||||
type IProps = ReturnType<typeof mapStateToProps> & typeof mapDispatchToProps & {};
|
||||
|
||||
const HeaderUnconnected: React.FunctionComponent<IProps> = ({ username, is_user }) => (
|
||||
<div className="default_container head_container">
|
||||
<div className={style.container}>
|
||||
<Logo />
|
||||
const HeaderUnconnected: FC<IProps> = ({ username, is_user, showDialog }) => {
|
||||
const onLogin = useCallback(() => {
|
||||
showDialog(DIALOGS.LOGIN);
|
||||
}, [showDialog]);
|
||||
|
||||
<Filler />
|
||||
return (
|
||||
<div className="default_container head_container">
|
||||
<div className={style.container}>
|
||||
<Logo />
|
||||
|
||||
<div className={style.plugs}>
|
||||
<Link to="/">flow</Link>
|
||||
<Link to="/examples/image">image</Link>
|
||||
<Link to="/examples/edit">editor</Link>
|
||||
<Link to="/examples/horizontal">horizontal</Link>
|
||||
<Filler />
|
||||
|
||||
<div className={style.plugs}>
|
||||
<Link to="/">flow</Link>
|
||||
<Link to="/examples/image">image</Link>
|
||||
<Link to="/examples/edit">editor</Link>
|
||||
<Link to="/examples/horizontal">horizontal</Link>
|
||||
</div>
|
||||
|
||||
<Filler />
|
||||
|
||||
{is_user && (
|
||||
<Group horizontal className={style.user_button}>
|
||||
<div>{username}</div>
|
||||
<div className={style.user_avatar} />
|
||||
</Group>
|
||||
)}
|
||||
|
||||
{!is_user && (
|
||||
<Group horizontal className={style.user_button} onClick={onLogin}>
|
||||
<div>ВДОХ</div>
|
||||
</Group>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<Filler />
|
||||
|
||||
{is_user && (
|
||||
<Group horizontal className={style.user_button}>
|
||||
<div>{username}</div>
|
||||
<div className={style.user_avatar} />
|
||||
</Group>
|
||||
)}
|
||||
|
||||
{!is_user && (
|
||||
<Group horizontal className={style.user_button}>
|
||||
<div>ВДОХНУТЬ</div>
|
||||
<div className={style.user_avatar} />
|
||||
</Group>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
);
|
||||
};
|
||||
|
||||
const Header = connect(
|
||||
mapStateToProps,
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
height: 96px;
|
||||
}
|
||||
|
||||
|
||||
.spacer {
|
||||
flex: 1;
|
||||
}
|
||||
|
@ -49,9 +48,10 @@
|
|||
&:last-child {
|
||||
padding-right: 0;
|
||||
|
||||
&::after { display: none; }
|
||||
&::after {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -68,6 +68,7 @@
|
|||
text-transform: uppercase;
|
||||
flex: 0 !important;
|
||||
opacity: 0.3;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.user_avatar {
|
||||
|
|
|
@ -35,7 +35,7 @@ const LoginDialogUnconnected: FC<IProps> = ({
|
|||
|
||||
useEffect(() => {
|
||||
if (error) userSetLoginError(null);
|
||||
}, [username, password, error, userSetLoginError]);
|
||||
}, [username, password]);
|
||||
|
||||
const buttons = (
|
||||
<Padder>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue