1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-17 11:41:44 +00:00

実装:PlanetNavigatorのUser iconを押すとそのUser pageに飛ぶ

改善:Profile Photoに影を追加
This commit is contained in:
Rokt33r
2015-07-29 13:17:55 +09:00
parent e5e6e2e1b8
commit 49057810fb
6 changed files with 22 additions and 7 deletions

View File

@@ -1,4 +1,6 @@
var React = require('react/addons') var React = require('react/addons')
var ReactRouter = require('react-router')
var Link = ReactRouter.Link
var ProfileImage = require('./ProfileImage') var ProfileImage = require('./ProfileImage')
@@ -27,8 +29,10 @@ var PlanetNavigator = React.createClass({
var users = this.props.currentPlanet.Users.map(function (user) { var users = this.props.currentPlanet.Users.map(function (user) {
return ( return (
<li key={'user-' + user.id}> <li key={'user-' + user.id}>
<ProfileImage size='44' email={user.email}/> <Link to='user' params={{userName: user.name}}>
<div className='userTooltip'>{user.profileName}</div> <ProfileImage className='userPhoto' size='44' email={user.email}/>
<div className='userTooltip'>{user.profileName}</div>
</Link>
</li> </li>
) )
}) })
@@ -62,7 +66,7 @@ var PlanetNavigator = React.createClass({
<div className='usersLabel'>Users</div> <div className='usersLabel'>Users</div>
<ul className='users'> <ul className='users'>
{users} {users}
<li onClick={this.props.openAddUserModal} className='btn-default'><i className='fa fa-plus'/></li> <li onClick={this.props.openAddUserModal} className='addUserButton btn-default'><i className='fa fa-plus'/></li>
</ul> </ul>
</div> </div>
) )

View File

@@ -6,6 +6,7 @@ var Link = ReactRouter.Link
var request = require('superagent') var request = require('superagent')
var UserNavigator = require('../Components/UserNavigator') var UserNavigator = require('../Components/UserNavigator')
var ProfileImage = require('../Components/ProfileImage')
var AuthStore = require('../Stores/AuthStore') var AuthStore = require('../Stores/AuthStore')
var PlanetStore = require('../Stores/PlanetStore') var PlanetStore = require('../Stores/PlanetStore')
@@ -130,7 +131,7 @@ module.exports = React.createClass({
<div className='UserHome'> <div className='UserHome'>
<h1>User Profile</h1> <h1>User Profile</h1>
<div className='userProfile'> <div className='userProfile'>
<img className='userPhoto' width='150' height='150' src='../vendor/dummy.jpg'/> <ProfileImage className='userPhoto' size='150' email={user.email}/>
<div className='userIntro'> <div className='userIntro'>
<div className='userProfileName'>{user.profileName}</div> <div className='userProfileName'>{user.profileName}</div>
<Link className='userName' to='user' params={{userName: user.name}}>{user.name}</Link> <Link className='userName' to='user' params={{userName: user.name}}>{user.name}</Link>

View File

@@ -132,9 +132,13 @@
width 44px width 44px
height 44px height 44px
float left float left
circle()
margin 3px margin 3px
line-height 44px line-height 44px
.userPhoto
circle()
width 44px
height 44px
box-shadow 1px 1px 4px 0px #C5C5C5
.userTooltip .userTooltip
position absolute position absolute
z-index 500 z-index 500
@@ -149,6 +153,8 @@
pointer-events none pointer-events none
&:hover .userTooltip &:hover .userTooltip
opacity 1 opacity 1
&.addUserButton
circle()
.PlanetArticleList .PlanetArticleList

View File

@@ -14,10 +14,10 @@
padding 0 padding 0
border none border none
cursor pointer cursor pointer
box-sizing border-box
img img
transition 0.1s transition 0.1s
opacity 0.8 opacity 0.9
box-sizing border-box
&.active, &:active, &.focus, &:focus, &.hover, &:hover &.active, &:active, &.focus, &:focus, &.hover, &:hover
img img
opacity 1 opacity 1

View File

@@ -246,6 +246,7 @@
.userPhoto .userPhoto
margin-bottom 25px margin-bottom 25px
circle() circle()
box-shadow 1px 1px 4px 0px #C5C5C5
.PlanetSettingModal.modal .PlanetSettingModal.modal
.settingBody .settingBody
@@ -295,6 +296,7 @@
width 44px width 44px
height 44px height 44px
circle() circle()
box-shadow 1px 1px 4px 0px #C5C5C5
.userName .userName
float left float left
height 44px height 44px

View File

@@ -15,6 +15,8 @@ textColor = #4D4D4D
backgroundColor= white backgroundColor= white
fontSize= 16px fontSize= 16px
shadowColor= #C5C5C5
invBackgroundColor = #4C4C4C invBackgroundColor = #4C4C4C
invTextColor = white invTextColor = white