diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-07-14 10:49:37 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-07-14 10:49:37 -0400 |
commit | cce492977bcb455bb22c2b42e1d2f3b99550db97 (patch) | |
tree | f10635a41d55394d5eb35bc6ec4acc628d474b03 /web/react | |
parent | b31327f072aa575d5ff97cc5e0786e50510ab456 (diff) | |
parent | d1cb7d35fb178916c9aecef8ecc703f2a364197b (diff) | |
download | chat-cce492977bcb455bb22c2b42e1d2f3b99550db97.tar.gz chat-cce492977bcb455bb22c2b42e1d2f3b99550db97.tar.bz2 chat-cce492977bcb455bb22c2b42e1d2f3b99550db97.zip |
Merge pull request #178 from asaadmahmoodspin/master
mm-1302 - Adding profile pick in LHS Header
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/sidebar_header.jsx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx index 0b59d2036..54858a04d 100644 --- a/web/react/components/sidebar_header.jsx +++ b/web/react/components/sidebar_header.jsx @@ -77,7 +77,7 @@ var NavbarDropdown = React.createClass({ for (var i = 0; i < this.state.teams.length; i++) { var domain = this.state.teams[i]; - if (domain == utils.getSubDomain()) + if (domain == utils.getSubDomain()) continue; if (teams.length == 0) @@ -121,10 +121,15 @@ module.exports = React.createClass({ }, render: function() { var teamName = this.props.teamName ? this.props.teamName : config.SiteName; + var me = UserStore.getCurrentUser() return ( <div className="team__header theme"> - <a className="team__name" href="/channels/town-square">{ teamName }</a> + <img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} /> + <div className="header__info"> + <div className="user__name">@{me.username}</div> + <a className="team__name" href="/channels/town-square">{ teamName }</a> + </div> <NavbarDropdown teamType={this.props.teamType} /> </div> ); |