1
0
mirror of https://github.com/BoostIo/Boostnote synced 2026-01-30 09:07:21 +00:00

add redirect home -> user(current user), enhance UserNavigation style

This commit is contained in:
Rokt33r
2015-10-09 20:45:06 +09:00
parent 2e4fc557ea
commit acdf61f7ab
6 changed files with 47 additions and 40 deletions

View File

@@ -7,7 +7,7 @@ export default class UserNavigator extends Component {
renderUserList () {
var users = this.props.users.map((user, index) => (
<li key={'user-' + user.id}>
<Link to={'/users/' + user.id}>
<Link to={'/users/' + user.id} activeClassName='active'>
<ProfileImage email={user.email} size='44'/>
<div className='userTooltip'>{user.name}</div>
<div className='keyLabel'>{'⌘' + (index + 1)}</div>
@@ -26,6 +26,10 @@ export default class UserNavigator extends Component {
return (
<div className='UserNavigator'>
{this.renderUserList()}
<button className='createTeamBtn'>
+
<div className='tooltip'>Create a new team</div>
</button>
</div>
)
}

View File

@@ -14,11 +14,11 @@ require('../styles/main/index.styl')
function onlyUser (state, replaceState) {
var currentUser = JSON.parse(localStorage.getItem('currentUser'))
if (currentUser == null) replaceState('login', '/login')
if (state.location.pathname === '/') replaceState('user', '/users/' + currentUser.id)
}
let routes = (
<Route path='/' component={MainContainer}>
<Route name='login' path='login' component={LoginContainer}/>
<Route name='signup' path='signup' component={SignupContainer}/>
<IndexRoute name='home' component={HomeContainer} onEnter={onlyUser}/>
@@ -27,11 +27,11 @@ let routes = (
)
// with Dev
import { compose } from 'redux'
// Redux DevTools store enhancers
import { devTools, persistState } from 'redux-devtools'
// React components for Redux DevTools
import { DevTools, DebugPanel, LogMonitor } from 'redux-devtools/lib/react'
// import { compose } from 'redux'
// // Redux DevTools store enhancers
// import { devTools, persistState } from 'redux-devtools'
// // React components for Redux DevTools
// import { DevTools, DebugPanel, LogMonitor } from 'redux-devtools/lib/react'
// let finalCreateStore = compose(devTools(), persistState(window.location.href.match(/[?&]debug_session=([^&]+)\b/)))(createStore)
// let store = finalCreateStore(reducer)