public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-24 23:23:09 +00:00
Code Issues Releases Wiki Activity

prepare alpha.5 (remain work: MD preview, keybind)

Browse Source
This commit is contained in:
Rokt33r
2015-10-31 13:05:22 +09:00
parent d9442aa23c
commit 3d0b79f674
18 changed files with 427 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
browser/main/HomePage/ArticleDetail.js
View File

@@ -101,8 +101,8 @@ export default class ArticleDetail extends React.Component {
<div className='left'>
<div className='info'>
<FolderMark color={folder.color}/> {folder.name}&nbsp;
Created {moment(activeArticle.createdAt).format('YYYY/MM/DD')}&nbsp;
Updated {moment(activeArticle.updatedAt).format('YYYY/MM/DD')}
Created : {moment(activeArticle.createdAt).format('YYYY/MM/DD')}&nbsp;
Updated : {moment(activeArticle.updatedAt).format('YYYY/MM/DD')}
</div>
<div className='tags'><i className='fa fa-fw fa-tags'/>{tags}</div>
</div>
@@ -183,7 +183,6 @@ export default class ArticleDetail extends React.Component {
<option key={folder.key} value={folder.key}>{folder.name}</option>
)
})
console.log('edit rendered')
return (
<div className='ArticleDetail edit'>

7
browser/main/HomePage/ArticleNavigator.js
View File

@@ -1,5 +1,4 @@
import React, { PropTypes } from 'react'
import ProfileImage from 'boost/components/ProfileImage'
import { findWhere } from 'lodash'
import { setSearchFilter, switchFolder, switchMode, CREATE_MODE } from 'boost/actions'
import { openModal } from 'boost/modal'
@@ -7,6 +6,8 @@ import FolderMark from 'boost/components/FolderMark'
import Preferences from 'boost/components/modal/Preferences'
import CreateNewFolder from 'boost/components/modal/CreateNewFolder'
import remote from 'remote'
export default class ArticleNavigator extends React.Component {
handlePreferencesButtonClick (e) {
openModal(Preferences)
@@ -50,10 +51,12 @@ export default class ArticleNavigator extends React.Component {
)
})
let userName = remote.getGlobal('process').env.USER
return (
<div className='ArticleNavigator'>
<div className='userInfo'>
<div className='userProfileName'>{process.env.USER}</div>
<div className='userProfileName'>{userName}</div>
<div className='userName'>local</div>
<button onClick={e => this.handlePreferencesButtonClick(e)} className='settingBtn'><i className='fa fa-fw fa-chevron-down'/></button>
</div>

14
browser/main/HomePage/ArticleTopBar.js
View File

@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react'
import ReactDOM from 'react-dom'
import ExternalLink from 'boost/components/ExternalLink'
import { setSearchFilter } from 'boost/actions'
@@ -8,6 +9,12 @@ export default class ArticleTopBar extends React.Component {
dispatch(setSearchFilter(e.target.value))
}
handleSearchClearButton (e) {
let { dispatch } = this.props
dispatch(setSearchFilter(''))
ReactDOM.findDOMNode(this.refs.searchInput).focus()
}
render () {
return (
@@ -15,7 +22,12 @@ export default class ArticleTopBar extends React.Component {
<div className='left'>
<div className='search'>
<i className='fa fa-search fa-fw' />
<input value={this.props.status.search} onChange={e => this.handleSearchChange(e)} placeholder='Search' type='text'/>
<input ref='searchInput' value={this.props.status.search} onChange={e => this.handleSearchChange(e)} placeholder='Search' type='text'/>
{
this.props.status.search != null && this.props.status.search.length > 0
? <button onClick={e => this.handleSearchClearButton(e)} className='searchClearBtn'><i className='fa fa-times'/></button>
: null
}
</div>
</div>
<div className='right'>