Fix: Personal Settingボターンを右にする。写真からまっすぐProfile pageに入れるようにする

browser/main/Components/PlanetHeader.jsx

@@ -9,7 +9,8 @@ var PlanetHeader = React.createClass({
     openSettingModal: React.PropTypes.func,
     currentPlanet: React.PropTypes.object,
     onSearchChange: React.PropTypes.func,
-    search: React.PropTypes.string
+    search: React.PropTypes.string,
+    openPersonalSettingModal: React.PropTypes.func
   },
   getInitialState: function () {
     return {
@@ -45,7 +46,7 @@ var PlanetHeader = React.createClass({
             <input onChange={this.props.onSearchChange} value={this.props.search} ref='search' tabIndex='1' type='text' className='inline-input circleInput' placeholder='Search...'/>
           </div>
           <button onClick={this.refreshPlanet} className='refreshButton'><i className='fa fa-refresh'/></button>
-          <button className='settingButton'><i className='fa fa-gears'/></button>
+          <button onClick={this.props.openPersonalSettingModal} className='settingButton'><i className='fa fa-gears'/></button>
         </div>
       </div>
     )

browser/main/Components/UserNavigator.jsx

@@ -3,14 +3,13 @@ var ReactRouter = require('react-router')
 var Link = ReactRouter.Link
 
 var ModalBase = require('./ModalBase')
-var PersonalSettingModal = require('./PersonalSettingModal')
 var PlanetCreateModal = require('./PlanetCreateModal')
 var ProfileImage = require('./ProfileImage')
 
 var AuthStore = require('../Stores/AuthStore')
 
 module.exports = React.createClass({
-  mixins: [ReactRouter.Navigation],
+  mixins: [ReactRouter.Navigation, ReactRouter.State],
   propTypes: {
     currentPlanet: React.PropTypes.object,
     currentUser: React.PropTypes.object
@@ -73,18 +72,14 @@ module.exports = React.createClass({
 
     return (
       <div tabIndex='2' className='UserNavigator'>
-        <button onClick={this.openPersonalSettingModal} className='userButton'>
+        <Link to='userHome' params={{userName: this.props.currentUser.name}} className='userProfile'>
           <ProfileImage size='55' email={this.props.currentUser.email}/>
-        </button>
+        </Link>
         <ul className='planetList'>
           {planets}
         </ul>
         <button onClick={this.openPlanetCreateModal} className='newPlanet'><i className='fa fa-plus'/></button>
 
-        <ModalBase isOpen={this.state.isPersonalSettingModalOpen} close={this.closePersonalSettingModal}>
-          <PersonalSettingModal currentUser={this.props.currentUser} close={this.closePersonalSettingModal}/>
-        </ModalBase>
-
         <ModalBase isOpen={this.state.isPlanetCreateModalOpen} close={this.closePlanetCreateModal}>
           <PlanetCreateModal close={this.closePlanetCreateModal}/>
         </ModalBase>