mirror of
https://github.com/muerwre/orchidmap-front.git
synced 2025-04-25 11:06:40 +07:00
(bugfixes)
This commit is contained in:
parent
3d718b5a2c
commit
b8431abeeb
13 changed files with 1228 additions and 1057 deletions
|
@ -11,17 +11,24 @@ export const StickersDialog = ({ setActiveSticker }: Props) => (
|
|||
<div className="helper stickers-helper">
|
||||
{
|
||||
Object.keys(STICKERS).map(set => (
|
||||
Object.keys(STICKERS[set].layers).map(sticker => (
|
||||
<div
|
||||
style={{
|
||||
backgroundImage: `url(${STICKERS[set].url})`,
|
||||
backgroundPosition: `${-STICKERS[set].layers[sticker].off * 48}px 50%`,
|
||||
}}
|
||||
className="sticker-preview"
|
||||
key={`${set}-${sticker}`}
|
||||
onClick={() => setActiveSticker({ set, sticker })}
|
||||
/>
|
||||
))
|
||||
<div>
|
||||
<div className="stickers-set-title">{STICKERS[set].title || null}</div>
|
||||
<div className="stickers-grid">
|
||||
{
|
||||
Object.keys(STICKERS[set].layers).map(sticker => (
|
||||
<div
|
||||
style={{
|
||||
backgroundImage: `url(${STICKERS[set].url})`,
|
||||
backgroundPosition: `${-STICKERS[set].layers[sticker].off * 48}px 50%`,
|
||||
}}
|
||||
className="sticker-preview"
|
||||
key={`${set}-${sticker}`}
|
||||
onClick={() => setActiveSticker({ set, sticker })}
|
||||
/>
|
||||
))
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
}
|
||||
</div>
|
||||
|
|
|
@ -4,7 +4,7 @@ import { GuestButton } from '$components/user/GuestButton';
|
|||
import { DEFAULT_USER, ROLES } from '$constants/auth';
|
||||
import { UserButton } from '$components/user/UserButton';
|
||||
import { UserMenu } from '$components/user/UserMenu';
|
||||
import { setUser, userLogout, takeAShot, setDialog } from '$redux/user/actions';
|
||||
import { setUser, userLogout, takeAShot, setDialog, gotVkUser } from '$redux/user/actions';
|
||||
import { bindActionCreators } from 'redux';
|
||||
import { connect } from 'react-redux';
|
||||
import type { UserType } from '$constants/types';
|
||||
|
@ -19,7 +19,7 @@ type Props = {
|
|||
userLogout: Function,
|
||||
setUser: Function,
|
||||
setDialog: Function,
|
||||
dialog: String,
|
||||
gotVkUser: Function,
|
||||
};
|
||||
|
||||
export class Component extends React.PureComponent<Props, void> {
|
||||
|
@ -51,7 +51,7 @@ export class Component extends React.PureComponent<Props, void> {
|
|||
};
|
||||
|
||||
this.setState({ menuOpened: false });
|
||||
this.props.setUser(user);
|
||||
this.props.gotVkUser(user);
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -119,6 +119,7 @@ const mapDispatchToProps = dispatch => bindActionCreators({
|
|||
userLogout,
|
||||
takeAShot,
|
||||
setDialog,
|
||||
gotVkUser,
|
||||
}, dispatch);
|
||||
|
||||
export const UserPanel = connect(mapStateToProps, mapDispatchToProps)(Component);
|
||||
|
|
|
@ -14,7 +14,9 @@ export const UserButton = ({
|
|||
setMenuOpened,
|
||||
user: {
|
||||
id,
|
||||
userdata: { name, photo }
|
||||
// userdata: { name, photo },
|
||||
photo,
|
||||
name,
|
||||
}
|
||||
}: Props) => (
|
||||
<div className="control-bar user-bar">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue