Commit fc3eb755 authored by 神楽坂玲奈's avatar 神楽坂玲奈

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/models/auth.js
#	src/routes/Index.js
parent a27d9604
...@@ -124,12 +124,12 @@ const particleConfig = { ...@@ -124,12 +124,12 @@ const particleConfig = {
function Index({ children, messages, dispatch }) { function Index({ children, messages, dispatch }) {
return ( return (
<div style={{ height: '100%'}}> <div style={{ display: 'flex', flexDirection: 'column', flexGrow: 1, minHeight: '100%' }}>
<DocumentTitle title={messages.title || 'Moe Cube'} /> <DocumentTitle title={messages.title || 'Moe Cube'}/>
<Header style={{ display: 'flex', alignItems: 'center' }}> <Header style={{ display: 'flex', alignItems: 'center' }}>
<Link to="/" style={{ marginTop: '20px' }}> <Link to="/" style={{ marginTop: '20px' }}>
<img src={logo} style={{ width: '140px', height: '44px' }}/> <img alt="logo" src={logo} style={{ width: '140px', height: '44px' }}/>
</Link> </Link>
<Menu <Menu
...@@ -152,10 +152,14 @@ function Index({ children, messages, dispatch }) { ...@@ -152,10 +152,14 @@ function Index({ children, messages, dispatch }) {
style={{ lineHeight: '64px', position: 'absolute', right: '50px' }} style={{ lineHeight: '64px', position: 'absolute', right: '50px' }}
> >
{localStorage.getItem('token') ? (<Menu.Item key="1"> {localStorage.getItem('token') ? (<Menu.Item key="1">
<div onClick={() => { dispatch({ type : 'auth/signOut' }) }}> <div
onClick={() => {
dispatch({ type: 'auth/signOut' });
}}
>
<Format id="sign-out"/> <Format id="sign-out"/>
</div> </div>
</Menu.Item>):('') </Menu.Item>) : ('')
} }
</Menu> </Menu>
</Header> </Header>
...@@ -168,7 +172,7 @@ function Index({ children, messages, dispatch }) { ...@@ -168,7 +172,7 @@ function Index({ children, messages, dispatch }) {
/> />
{children} {children}
<Footer style={{ position: 'absolute', width: '100%'}}> <Footer style={{ width: '100%' }}>
<div>© MoeCube 2017 all right reserved.</div> <div>© MoeCube 2017 all right reserved.</div>
</Footer> </Footer>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment