hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-05 09:31:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

UsersMenu: user: props -> currentUser: context

Browse source
This commit is contained in:
xavcz 2016-10-17 12:26:56 +02:00
parent 93545f2971
commit 21086fe18b
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/nova-base-components/lib/common/Header.jsx
View file

@ -21,7 +21,7 @@ const Header = (props, {currentUser}) => {
<div className="nav">
<div className="nav-user">
{currentUser ? <Telescope.components.UsersMenu user={currentUser}/> : <Telescope.components.UsersAccountMenu/>}
{currentUser ? <Telescope.components.UsersMenu/> : <Telescope.components.UsersAccountMenu/>}
</div>
<div className="nav-new-post">

18
packages/nova-base-components/lib/users/UsersMenu.jsx
View file

@ -3,8 +3,7 @@ import React, { PropTypes, Component } from 'react';
import { FormattedMessage } from 'react-intl';
import { Meteor } from 'meteor/meteor';
import { Accounts } from 'meteor/std:accounts-ui';
import { Modal, Dropdown, MenuItem } from 'react-bootstrap';
import { ContextPasser } from "meteor/nova:core";
import { Dropdown, MenuItem } from 'react-bootstrap';
import { LinkContainer } from 'react-router-bootstrap';
import Users from 'meteor/nova:users';
@ -12,20 +11,20 @@ class UsersMenu extends Component {
render() {
const user = this.props.user;
const {currentUser} = this.context;
return (
<div className="users-menu">
<Dropdown id="user-dropdown">
<Dropdown.Toggle>
<Telescope.components.UsersAvatar size="small" user={user} link={false} />
<div>{Users.getDisplayName(user)}</div>
<Telescope.components.UsersAvatar size="small" user={currentUser} link={false} />
<div>{Users.getDisplayName(currentUser)}</div>
</Dropdown.Toggle>
<Dropdown.Menu>
<LinkContainer to={`/users/${user.telescope.slug}`} /*to={{name: "users.single", params: {slug: user.telescope.slug}}}*/>
<LinkContainer to={`/users/${currentUser.telescope.slug}`}>
<MenuItem className="dropdown-item" eventKey="1"><FormattedMessage id="users.profile"/></MenuItem>
</LinkContainer>
<LinkContainer to={`/account`} /*to={{name: "account"}}*/>
<LinkContainer to={`/account`}>
<MenuItem className="dropdown-item" eventKey="2"><FormattedMessage id="users.edit_account"/></MenuItem>
</LinkContainer>
<MenuItem className="dropdown-item" eventKey="4" onClick={() => Meteor.logout(Accounts.ui._options.onSignedOutHook())}><FormattedMessage id="users.log_out"/></MenuItem>
@ -37,11 +36,8 @@ class UsersMenu extends Component {
}
UsersMenu.propTypes = {
user: React.PropTypes.object
}
UsersMenu.contextTypes = {
currentUser: React.PropTypes.object,
messages: React.PropTypes.object
}