this.handleClick(e)} onKeyDown={e => this.handleKeyDown(e)} className='Finder'>
this.selectArticle(article)}
/>
-
+
)
}
@@ -116,27 +137,47 @@ FinderMain.propTypes = {
dispatch: PropTypes.func
}
+// Ignore invalid key
+function ignoreInvalidKey (key) {
+ return key.length > 0 && !key.match(/^\/\/$/) && !key.match(/^\/$/) && !key.match(/^#$/)
+}
+
+// Build filter object by key
+function buildFilter (key) {
+ if (key.match(/^\/\/.+/)) {
+ return {type: FOLDER_EXACT_FILTER, value: key.match(/^\/\/(.+)$/)[1]}
+ }
+ if (key.match(/^\/.+/)) {
+ return {type: FOLDER_FILTER, value: key.match(/^\/(.+)$/)[1]}
+ }
+ if (key.match(/^#(.+)/)) {
+ return {type: TAG_FILTER, value: key.match(/^#(.+)$/)[1]}
+ }
+ return {type: TEXT_FILTER, value: key}
+}
+
function remap (state) {
let { articles, folders, status } = state
- let filters = status.search.split(' ').map(key => key.trim()).filter(key => key.length > 0 && !key.match(/^#$/)).map(key => {
- if (key.match(/^in:.+$/)) {
- return {type: FOLDER_FILTER, value: key.match(/^in:(.+)$/)[1]}
- }
- if (key.match(/^#(.+)/)) {
- return {type: TAG_FILTER, value: key.match(/^#(.+)$/)[1]}
- }
- return {type: TEXT_FILTER, value: key}
- })
+ let filters = status.search.split(' ')
+ .map(key => key.trim())
+ .filter(ignoreInvalidKey)
+ .map(buildFilter)
+
+ let folderExactFilters = filters.filter(filter => filter.type === FOLDER_EXACT_FILTER)
let folderFilters = filters.filter(filter => filter.type === FOLDER_FILTER)
let textFilters = filters.filter(filter => filter.type === TEXT_FILTER)
let tagFilters = filters.filter(filter => filter.type === TAG_FILTER)
+ let targetFolders
if (folders != null) {
- let targetFolders = folders.filter(folder => {
- return _.findWhere(folderFilters, {value: folder.name})
+ let exactTargetFolders = folders.filter(folder => {
+ return _.find(folderExactFilters, filter => folder.name.match(new RegExp(`^${filter.value}$`)))
})
- status.targetFolders = targetFolders
+ let fuzzyTargetFolders = folders.filter(folder => {
+ return _.find(folderFilters, filter => folder.name.match(new RegExp(`^${filter.value}`)))
+ })
+ targetFolders = status.targetFolders = exactTargetFolders.concat(fuzzyTargetFolders)
if (targetFolders.length > 0) {
articles = articles.filter(article => {
@@ -164,6 +205,7 @@ function remap (state) {
let activeArticle = _.findWhere(articles, {key: status.articleKey})
if (activeArticle == null) activeArticle = articles[0]
+ console.log(status.search)
return {
articles,
activeArticle,
diff --git a/browser/finder/reducer.js b/browser/finder/reducer.js
index 72b087c3..76ddde7f 100644
--- a/browser/finder/reducer.js
+++ b/browser/finder/reducer.js
@@ -14,10 +14,10 @@ function status (state = initialStatus, action) {
switch (action.type) {
case SELECT_ARTICLE:
state.articleKey = action.data.key
- return state
+ return Object.assign({}, state)
case SEARCH_ARTICLE:
state.search = action.data.input
- return state
+ return Object.assign({}, state)
default:
return state
}
diff --git a/browser/main/HomePage.js b/browser/main/HomePage.js
index 57094068..c40b4dfb 100644
--- a/browser/main/HomePage.js
+++ b/browser/main/HomePage.js
@@ -12,6 +12,7 @@ import { isModalOpen, closeModal } from 'boost/modal'
const TEXT_FILTER = 'TEXT_FILTER'
const FOLDER_FILTER = 'FOLDER_FILTER'
+const FOLDER_EXACT_FILTER = 'FOLDER_EXACT_FILTER'
const TAG_FILTER = 'TAG_FILTER'
class HomePage extends React.Component {
@@ -98,7 +99,7 @@ class HomePage extends React.Component {
}
render () {
- let { dispatch, status, articles, activeArticle, folders, filters } = this.props
+ let { dispatch, status, articles, allArticles, activeArticle, folders, tags, filters } = this.props
return (
@@ -107,6 +108,7 @@ class HomePage extends React.Component {
dispatch={dispatch}
folders={folders}
status={status}
+ allArticles={allArticles}
/>
@@ -134,6 +137,25 @@ class HomePage extends React.Component {
}
}
+// Ignore invalid key
+function ignoreInvalidKey (key) {
+ return key.length > 0 && !key.match(/^\/\/$/) && !key.match(/^\/$/) && !key.match(/^#$/)
+}
+
+// Build filter object by key
+function buildFilter (key) {
+ if (key.match(/^\/\/.+/)) {
+ return {type: FOLDER_EXACT_FILTER, value: key.match(/^\/\/(.+)$/)[1]}
+ }
+ if (key.match(/^\/.+/)) {
+ return {type: FOLDER_FILTER, value: key.match(/^\/(.+)$/)[1]}
+ }
+ if (key.match(/^#(.+)/)) {
+ return {type: TAG_FILTER, value: key.match(/^#(.+)$/)[1]}
+ }
+ return {type: TEXT_FILTER, value: key}
+}
+
function remap (state) {
let { folders, articles, status } = state
@@ -141,26 +163,33 @@ function remap (state) {
articles.sort((a, b) => {
return new Date(b.updatedAt) - new Date(a.updatedAt)
})
+ let allArticles = articles.slice()
+
+ let tags = _.uniq(allArticles.reduce((sum, article) => {
+ if (!_.isArray(article.tags)) return sum
+ return sum.concat(article.tags)
+ }, []))
// Filter articles
- let filters = status.search.split(' ').map(key => key.trim()).filter(key => key.length > 0 && !key.match(/^#$/)).map(key => {
- if (key.match(/^in:.+$/)) {
- return {type: FOLDER_FILTER, value: key.match(/^in:(.+)$/)[1]}
- }
- if (key.match(/^#(.+)/)) {
- return {type: TAG_FILTER, value: key.match(/^#(.+)$/)[1]}
- }
- return {type: TEXT_FILTER, value: key}
- })
+ let filters = status.search.split(' ')
+ .map(key => key.trim())
+ .filter(ignoreInvalidKey)
+ .map(buildFilter)
+
+ let folderExactFilters = filters.filter(filter => filter.type === FOLDER_EXACT_FILTER)
let folderFilters = filters.filter(filter => filter.type === FOLDER_FILTER)
let textFilters = filters.filter(filter => filter.type === TEXT_FILTER)
let tagFilters = filters.filter(filter => filter.type === TAG_FILTER)
+ let targetFolders
if (folders != null) {
- let targetFolders = folders.filter(folder => {
- return _.findWhere(folderFilters, {value: folder.name})
+ let exactTargetFolders = folders.filter(folder => {
+ return _.find(folderExactFilters, filter => folder.name.match(new RegExp(`^${filter.value}$`)))
})
- status.targetFolders = targetFolders
+ let fuzzyTargetFolders = folders.filter(folder => {
+ return _.find(folderFilters, filter => folder.name.match(new RegExp(`^${filter.value}`)))
+ })
+ targetFolders = status.targetFolders = exactTargetFolders.concat(fuzzyTargetFolders)
if (targetFolders.length > 0) {
articles = articles.filter(article => {
@@ -202,11 +231,10 @@ function remap (state) {
// or Change IDLE MODE
if (status.mode === CREATE_MODE) {
let newArticle = _.findWhere(articles, {status: 'NEW'})
- let FolderKey = folders[0].key
- if (folderFilters.length > 0) {
- let targetFolder = _.findWhere(folders, {name: folderFilters[0].value})
- if (targetFolder != null) FolderKey = targetFolder.key
- }
+ console.log('targetFolders')
+ let FolderKey = targetFolders.length > 0
+ ? targetFolders[0].key
+ : folders[0].key
if (newArticle == null) {
newArticle = {
@@ -229,8 +257,10 @@ function remap (state) {
return {
folders,
status,
+ allArticles,
articles,
activeArticle,
+ tags,
filters: {
folder: folderFilters,
tag: tagFilters,
@@ -247,6 +277,7 @@ HomePage.propTypes = {
userId: PropTypes.string
}),
articles: PropTypes.array,
+ allArticles: PropTypes.array,
activeArticle: PropTypes.shape(),
dispatch: PropTypes.func,
folders: PropTypes.array,
diff --git a/browser/main/HomePage/ArticleDetail.js b/browser/main/HomePage/ArticleDetail.js
index 10c702c5..12fbe9a2 100644
--- a/browser/main/HomePage/ArticleDetail.js
+++ b/browser/main/HomePage/ArticleDetail.js
@@ -5,7 +5,20 @@ import _ from 'lodash'
import ModeIcon from 'boost/components/ModeIcon'
import MarkdownPreview from 'boost/components/MarkdownPreview'
import CodeEditor from 'boost/components/CodeEditor'
-import { IDLE_MODE, CREATE_MODE, EDIT_MODE, switchMode, switchArticle, switchFolder, clearSearch, updateArticle, destroyArticle, NEW } from 'boost/actions'
+import {
+ IDLE_MODE,
+ CREATE_MODE,
+ EDIT_MODE,
+ switchMode,
+ switchArticle,
+ switchFolder,
+ clearSearch,
+ lockStatus,
+ unlockStatus,
+ updateArticle,
+ destroyArticle,
+ NEW
+} from 'boost/actions'
import linkState from 'boost/linkState'
import FolderMark from 'boost/components/FolderMark'
import TagLink from 'boost/components/TagLink'
@@ -82,7 +95,12 @@ export default class ArticleDetail extends React.Component {
this.state = {
article: makeInstantArticle(props.activeArticle),
- previewMode: false
+ previewMode: false,
+ isArticleEdited: false,
+ isTagChanged: false,
+ isTitleChanged: false,
+ isContentChanged: false,
+ isModeChanged: false
}
}
@@ -117,7 +135,11 @@ export default class ArticleDetail extends React.Component {
if (isModeChanged) {
Object.assign(nextState, {
openDeleteConfirmMenu: false,
- previewMode: false
+ previewMode: false,
+ isArticleEdited: false,
+ isTagChanged: false,
+ isTitleChanged: false,
+ isContentChanged: false
})
}
@@ -224,6 +246,8 @@ export default class ArticleDetail extends React.Component {
handleCancelButtonClick (e) {
let { activeArticle, dispatch } = this.props
+
+ dispatch(unlockStatus())
if (activeArticle.status === NEW) dispatch(switchArticle(null))
dispatch(switchMode(IDLE_MODE))
}
@@ -236,6 +260,8 @@ export default class ArticleDetail extends React.Component {
let folder = _.findWhere(folders, {key: article.FolderKey})
if (folder == null) return false
+ dispatch(unlockStatus())
+
delete newArticle.status
newArticle.updatedAt = new Date()
if (newArticle.createdAt == null) {
@@ -263,19 +289,85 @@ export default class ArticleDetail extends React.Component {
this.setState({article: article})
}
+ handleTitleChange (e) {
+ let { article } = this.state
+ article.title = e.target.value
+ let _isTitleChanged = article.title !== this.props.activeArticle.title
+
+ let { isTagChanged, isContentChanged, isArticleEdited, isModeChanged } = this.state
+ let _isArticleEdited = _isTitleChanged || isTagChanged || isContentChanged || isModeChanged
+
+ this.setState({
+ article,
+ isTitleChanged: _isTitleChanged,
+ isArticleEdited: _isArticleEdited
+ }, () => {
+ if (isArticleEdited !== _isArticleEdited) {
+ let { dispatch } = this.props
+ if (_isArticleEdited) {
+ console.log('lockit')
+ dispatch(lockStatus())
+ } else {
+ console.log('unlockit')
+ dispatch(unlockStatus())
+ }
+ }
+ })
+ }
+
handleTagsChange (newTag, tags) {
let article = this.state.article
article.tags = tags
this.setState({article: article})
+
+ let _isTagChanged = _.difference(article.tags, this.props.activeArticle.tags).length > 0 || _.difference(this.props.activeArticle.tags, article.tags).length > 0
+
+ let { isTitleChanged, isContentChanged, isArticleEdited, isModeChanged } = this.state
+ let _isArticleEdited = _isTagChanged || isTitleChanged || isContentChanged || isModeChanged
+
+ this.setState({
+ article,
+ isTagChanged: _isTagChanged,
+ isArticleEdited: _isArticleEdited
+ }, () => {
+ if (isArticleEdited !== _isArticleEdited) {
+ let { dispatch } = this.props
+ if (_isArticleEdited) {
+ console.log('lockit')
+ dispatch(lockStatus())
+ } else {
+ console.log('unlockit')
+ dispatch(unlockStatus())
+ }
+ }
+ })
}
handleModeChange (value) {
- let article = this.state.article
+ let { article } = this.state
article.mode = value
+ let _isModeChanged = article.mode !== this.props.activeArticle.mode
+
+ let { isTagChanged, isContentChanged, isArticleEdited, isTitleChanged } = this.state
+ let _isArticleEdited = _isModeChanged || isTagChanged || isContentChanged || isTitleChanged
+
this.setState({
- article: article,
- previewMode: false
+ article,
+ previewMode: false,
+ isModeChanged: _isModeChanged,
+ isArticleEdited: _isArticleEdited
+ }, () => {
+ if (isArticleEdited !== _isArticleEdited) {
+ let { dispatch } = this.props
+ if (_isArticleEdited) {
+ console.log('lockit')
+ dispatch(lockStatus())
+ } else {
+ console.log('unlockit')
+ dispatch(unlockStatus())
+ }
+ }
})
}
@@ -286,9 +378,29 @@ export default class ArticleDetail extends React.Component {
}
handleContentChange (e, value) {
- let article = this.state.article
+ let { article } = this.state
article.content = value
- this.setState({article: article})
+ let _isContentChanged = article.content !== this.props.activeArticle.content
+
+ let { isTagChanged, isModeChanged, isArticleEdited, isTitleChanged } = this.state
+ let _isArticleEdited = _isContentChanged || isTagChanged || isModeChanged || isTitleChanged
+
+ this.setState({
+ article,
+ isContentChanged: _isContentChanged,
+ isArticleEdited: _isArticleEdited
+ }, () => {
+ if (isArticleEdited !== _isArticleEdited) {
+ let { dispatch } = this.props
+ if (_isArticleEdited) {
+ console.log('lockit')
+ dispatch(lockStatus())
+ } else {
+ console.log('unlockit')
+ dispatch(unlockStatus())
+ }
+ }
+ })
}
handleTogglePreviewButtonClick (e) {
@@ -303,7 +415,7 @@ export default class ArticleDetail extends React.Component {
}
renderEdit () {
- let { folders, status } = this.props
+ let { folders, status, tags } = this.props
let folderOptions = folders.map(folder => {
return (
@@ -322,10 +434,12 @@ export default class ArticleDetail extends React.Component {
>
{folderOptions}
+ {this.state.isArticleEdited ? ' (edited)' : ''}
- this.handleTitleKeyDown(e)} placeholder='Title' ref='title' valueLink={this.linkState('article.title')}/>
+ this.handleTitleKeyDown(e)} placeholder='Title' ref='title' value={this.state.article.title} onChange={e => this.handleTitleChange(e)}/>
this.handleThisClick(e)}>
- {tagElements}
- this.handleKeyDown(e)}
- ref='tagInput'
- valueLink={this.linkState('input')}
- placeholder='Click here to add tags'
- className='tagInput'/>
+
)
}
@@ -76,7 +161,8 @@ export default class TagSelect extends React.Component {
TagSelect.propTypes = {
tags: PropTypes.arrayOf(PropTypes.string),
- onChange: PropTypes.func
+ onChange: PropTypes.func,
+ suggestTags: PropTypes.array
}
TagSelect.prototype.linkState = linkState
diff --git a/lib/components/modal/CreateNewFolder.js b/lib/components/modal/CreateNewFolder.js
index 0934e219..2686dafe 100644
--- a/lib/components/modal/CreateNewFolder.js
+++ b/lib/components/modal/CreateNewFolder.js
@@ -2,6 +2,7 @@ import React, { PropTypes } from 'react'
import linkState from 'boost/linkState'
import { createFolder } from 'boost/actions'
import store from 'boost/store'
+import FolderMark from 'boost/components/FolderMark'
export default class CreateNewFolder extends React.Component {
constructor (props) {
@@ -9,6 +10,7 @@ export default class CreateNewFolder extends React.Component {
this.state = {
name: '',
+ color: Math.round(Math.random() * 7),
alert: null
}
}
@@ -20,9 +22,11 @@ export default class CreateNewFolder extends React.Component {
handleConfirmButton (e) {
this.setState({alert: null}, () => {
let { close } = this.props
- let name = this.state.name
+ let { name, color } = this.state
+
let input = {
- name
+ name,
+ color
}
try {
@@ -38,6 +42,20 @@ export default class CreateNewFolder extends React.Component {
})
}
+ handleColorClick (colorIndex) {
+ return e => {
+ this.setState({
+ color: colorIndex
+ })
+ }
+ }
+
+ handleKeyDown (e) {
+ if (e.keyCode === 13) {
+ this.handleConfirmButton()
+ }
+ }
+
render () {
let alert = this.state.alert
let alertElement = alert != null ? (
@@ -45,6 +63,20 @@ export default class CreateNewFolder extends React.Component {
{alert.message}
) : null
+ let colorIndexes = []
+ for (let i = 0; i < 8; i++) {
+ colorIndexes.push(i)
+ }
+ let colorElements = colorIndexes.map(index => {
+ let className = 'option'
+ if (index === this.state.color) className += ' active'
+
+ return (
+ this.handleColorClick(index)(e)}>
+
+ {tagElements}
+ this.handleKeyDown(e)}
+ ref='tagInput'
+ valueLink={this.linkState('input')}
+ placeholder='Click here to add tags'
+ className='tagInput'
+ onFocus={e => this.handleInputFocus(e)}
+ />
+
+ {suggestElements != null && suggestElements.length > 0
+ ? (
+
+ {suggestElements}
+
+ )
+ : null
+ }
@@ -52,7 +84,10 @@ export default class CreateNewFolder extends React.Component {
Create new folder
-
+ this.handleKeyDown(e)} className='ipt' type='text' valueLink={this.linkState('name')} placeholder='Enter folder name'/>
+
+ {colorElements}
+
{alertElement}
diff --git a/lib/components/modal/EditedAlert.js b/lib/components/modal/EditedAlert.js
new file mode 100644
index 00000000..514e7d33
--- /dev/null
+++ b/lib/components/modal/EditedAlert.js
@@ -0,0 +1,35 @@
+import React, { PropTypes } from 'react'
+import store from 'boost/store'
+import { unlockStatus } from 'boost/actions'
+
+export default class EditedAlert extends React.Component {
+ handleNoButtonClick (e) {
+ this.props.close()
+ }
+
+ handleYesButtonClick (e) {
+ store.dispatch(unlockStatus())
+ store.dispatch(this.props.action)
+ this.props.close()
+ }
+
+ render () {
+ return (
+
+
+ )
+ }
+}
+
+EditedAlert.propTypes = {
+ action: PropTypes.object,
+ close: PropTypes.func
+}
diff --git a/lib/components/modal/Preference/AppSettingTab.js b/lib/components/modal/Preference/AppSettingTab.js
index 77bec059..fbf5cadc 100644
--- a/lib/components/modal/Preference/AppSettingTab.js
+++ b/lib/components/modal/Preference/AppSettingTab.js
@@ -36,12 +36,20 @@ export default class AppSettingTab extends React.Component {
ipc.removeListener('APP_SETTING_ERROR', this.handleSettingError)
}
- handleSaveButtonClick (e) {
+ submitHotKey () {
ipc.send('hotkeyUpdated', {
toggleFinder: this.state.toggleFinder
})
}
+ handleSaveButtonClick (e) {
+ this.submitHotKey()
+ }
+
+ handleKeyDown (e) {
+ this.submitHotKey()
+ }
+
render () {
let alert = this.state.alert
let alertElement = alert != null ? (
@@ -56,7 +64,7 @@ export default class AppSettingTab extends React.Component {
Your article is still editing!
+
+ Do you really want to leave without finishing?
+
+
+
+
+
+ Hotkey
-
+ this.handleKeyDown(e)} valueLink={this.linkState('toggleFinder')} type='text'/>
diff --git a/lib/components/modal/Preference/FolderRow.js b/lib/components/modal/Preference/FolderRow.js
index 336a0d6c..44e56b82 100644
--- a/lib/components/modal/Preference/FolderRow.js
+++ b/lib/components/modal/Preference/FolderRow.js
@@ -2,7 +2,7 @@ import React, { PropTypes } from 'react'
import linkState from 'boost/linkState'
import FolderMark from 'boost/components/FolderMark'
import store from 'boost/store'
-import { updateFolder, destroyFolder } from 'boost/actions'
+import { updateFolder, destroyFolder, replaceFolder } from 'boost/actions'
const IDLE = 'IDLE'
const EDIT = 'EDIT'
@@ -17,6 +17,20 @@ export default class FolderRow extends React.Component {
}
}
+ handleUpClick (e) {
+ let { index } = this.props
+ if (index > 0) {
+ store.dispatch(replaceFolder(index, index - 1))
+ }
+ }
+
+ handleDownClick (e) {
+ let { index, count } = this.props
+ if (index < count - 1) {
+ store.dispatch(replaceFolder(index, index + 1))
+ }
+ }
+
handleCancelButtonClick (e) {
this.setState({
mode: IDLE
@@ -26,7 +40,9 @@ export default class FolderRow extends React.Component {
handleEditButtonClick (e) {
this.setState({
mode: EDIT,
- name: this.props.folder.name
+ name: this.props.folder.name,
+ color: this.props.folder.color,
+ isColorEditing: false
})
}
@@ -34,12 +50,34 @@ export default class FolderRow extends React.Component {
this.setState({mode: DELETE})
}
+ handleNameInputKeyDown (e) {
+ if (e.keyCode === 13) {
+ this.handleSaveButtonClick()
+ }
+ }
+
+ handleColorSelectClick (e) {
+ this.setState({
+ isColorEditing: true
+ })
+ }
+
+ handleColorButtonClick (index) {
+ return e => {
+ this.setState({
+ color: index,
+ isColorEditing: false
+ })
+ }
+ }
+
handleSaveButtonClick (e) {
let { folder, setAlert } = this.props
setAlert(null, () => {
let input = {
- name: this.state.name
+ name: this.state.name,
+ color: this.state.color
}
folder = Object.assign({}, folder, input)
@@ -68,10 +106,40 @@ export default class FolderRow extends React.Component {
switch (this.state.mode) {
case EDIT:
+ let colorIndexes = []
+ for (let i = 0; i < 8; i++) {
+ colorIndexes.push(i)
+ }
+
+ let colorOptions = colorIndexes.map(index => {
+ let className = this.state.color === index
+ ? 'active'
+ : null
+ return (
+
+ )
+ })
+
return (
+
+
+ {this.state.isColorEditing
+ ? (
+
+
+ )
+ : null
+ }
+ Color select
+ {colorOptions}
+
-
+ this.handleNameInputKeyDown(e)} valueLink={this.linkState('name')} type='text'/>
@@ -93,7 +161,12 @@ export default class FolderRow extends React.Component {
default:
return (
- {folder.name}
+
+
+
+
+ {folder.name}
@@ -106,6 +179,8 @@ export default class FolderRow extends React.Component {
FolderRow.propTypes = {
folder: PropTypes.shape(),
+ index: PropTypes.number,
+ count: PropTypes.number,
setAlert: PropTypes.func
}
diff --git a/lib/components/modal/Preference/FolderSettingTab.js b/lib/components/modal/Preference/FolderSettingTab.js
index ff1e8229..09a8ba7d 100644
--- a/lib/components/modal/Preference/FolderSettingTab.js
+++ b/lib/components/modal/Preference/FolderSettingTab.js
@@ -12,6 +12,12 @@ export default class FolderSettingTab extends React.Component {
}
}
+ handleNewFolderNameKeyDown (e) {
+ if (e.keyCode === 13) {
+ this.handleSaveButtonClick()
+ }
+ }
+
handleSaveButtonClick (e) {
this.setState({alert: null}, () => {
if (this.state.name.trim().length === 0) return false
@@ -40,10 +46,16 @@ export default class FolderSettingTab extends React.Component {
render () {
let { folders } = this.props
- let folderElements = folders.map(folder => {
+ let folderElements = folders.map((folder, index) => {
return (
- this.setAlert(alert, cb)}/>
- )
+ this.setAlert(alert, cb)}
+ />
+ )
})
let alert = this.state.alert
@@ -59,13 +71,13 @@ export default class FolderSettingTab extends React.Component {
Manage folder
-
{folderElements}
Folder name
+ Folder
Edit/Delete
-
+ this.handleNewFolderNameKeyDown(e)} valueLink={this.linkState('name')} type='text' placeholder='New Folder'/>
diff --git a/lib/components/modal/Tutorial.js b/lib/components/modal/Tutorial.js
index cb2f2ed4..cc927d92 100644
--- a/lib/components/modal/Tutorial.js
+++ b/lib/components/modal/Tutorial.js
@@ -88,10 +88,11 @@ export default class Tutorial extends React.Component {
return (
Easy to access with Finder
- With Finder, You can search your articles faster.
- You can open Finder by pressing Control + shift + tab
- To put the content of an article in the clipboard, press Enter.
- So you can paste it with Cmd(⌘) + V + The Finder helps you organize all of the files and documents.
+ There is a short-cut key [control + shift + tab] to open the Finder.
+ It is available to save your articles on the Clipboard
+ by selecting your file with pressing Enter key,
+ and to paste the contents of the Clipboard with [Command-V]
diff --git a/lib/reducer.js b/lib/reducer.js
index 52cd5916..baff2d55 100644
--- a/lib/reducer.js
+++ b/lib/reducer.js
@@ -1,14 +1,42 @@
import { combineReducers } from 'redux'
import _ from 'lodash'
-import { SWITCH_FOLDER, SWITCH_MODE, SWITCH_ARTICLE, SET_SEARCH_FILTER, SET_TAG_FILTER, CLEAR_SEARCH, TOGGLE_TUTORIAL, ARTICLE_UPDATE, ARTICLE_DESTROY, FOLDER_CREATE, FOLDER_UPDATE, FOLDER_DESTROY, IDLE_MODE, CREATE_MODE } from './actions'
+import {
+ // Status action type
+ SWITCH_FOLDER,
+ SWITCH_MODE,
+ SWITCH_ARTICLE,
+ SET_SEARCH_FILTER,
+ SET_TAG_FILTER,
+ CLEAR_SEARCH,
+ LOCK_STATUS,
+ UNLOCK_STATUS,
+ TOGGLE_TUTORIAL,
+
+ // Article action type
+ ARTICLE_UPDATE,
+ ARTICLE_DESTROY,
+
+ // Folder action type
+ FOLDER_CREATE,
+ FOLDER_UPDATE,
+ FOLDER_DESTROY,
+ FOLDER_REPLACE,
+
+ // view mode
+ IDLE_MODE,
+ CREATE_MODE
+} from './actions'
import dataStore from 'boost/dataStore'
import keygen from 'boost/keygen'
import activityRecord from 'boost/activityRecord'
+import { openModal } from 'boost/modal'
+import EditedAlert from 'boost/components/modal/EditedAlert'
const initialStatus = {
mode: IDLE_MODE,
search: '',
- isTutorialOpen: false
+ isTutorialOpen: false,
+ isStatusLocked: false
}
let data = dataStore.getData()
@@ -26,12 +54,11 @@ function folders (state = initialFolders, action) {
Object.assign(newFolder, {
key: keygen(),
createdAt: new Date(),
- updatedAt: new Date(),
- // random number (0-7)
- color: Math.round(Math.random() * 7)
+ updatedAt: new Date()
})
- if (newFolder.length === 0) throw new Error('Folder name is required')
+ if (newFolder.name == null && newFolder.name.length === 0) throw new Error('Folder name is required')
+ if (newFolder.name.match(/\//)) throw new Error('`/` is not available for folder name')
let conflictFolder = _.findWhere(state, {name: newFolder.name})
if (conflictFolder != null) throw new Error(`${newFolder.name} already exists!`)
@@ -48,7 +75,8 @@ function folders (state = initialFolders, action) {
if (!_.isString(folder.name)) throw new Error('Folder name must be a string')
folder.name = folder.name.trim().replace(/\s/, '_')
- if (folder.length === 0) throw new Error('Folder name is required')
+ if (folder.name.length === 0) throw new Error('Folder name is required')
+ if (folder.name.match(/\//)) throw new Error('`/` is not available for folder name')
// Folder existence check
if (targetFolder == null) throw new Error('Folder doesnt exist')
@@ -80,6 +108,15 @@ function folders (state = initialFolders, action) {
activityRecord.emit('FOLDER_DESTROY')
return state
}
+ case FOLDER_REPLACE:
+ {
+ let { a, b } = action.data
+ let folderA = state[a]
+ let folderB = state[b]
+ state.splice(a, 1, folderB)
+ state.splice(b, 1, folderA)
+ }
+ return state
default:
return state
}
@@ -125,13 +162,28 @@ function articles (state = initialArticles, action) {
function status (state = initialStatus, action) {
state = Object.assign({}, state)
+
switch (action.type) {
case TOGGLE_TUTORIAL:
state.isTutorialOpen = !state.isTutorialOpen
return state
+ case LOCK_STATUS:
+ state.isStatusLocked = true
+ return state
+ case UNLOCK_STATUS:
+ state.isStatusLocked = false
+ return state
+ }
+
+ // if status locked, status become unmutable
+ if (state.isStatusLocked) {
+ openModal(EditedAlert, {action})
+ return state
+ }
+ switch (action.type) {
case SWITCH_FOLDER:
state.mode = IDLE_MODE
- state.search = `in:${action.data} `
+ state.search = `//${action.data} `
return state
case SWITCH_MODE:
diff --git a/main.js b/main.js
index f96acb1a..032ac349 100644
--- a/main.js
+++ b/main.js
@@ -30,8 +30,8 @@ updater
.on('update-downloaded', function (event, releaseNotes, releaseName, releaseDate, updateUrl, quitAndUpdate) {
nn.notify({
title: 'Ready to Update!! ' + versionText,
- icon: path.join(__dirname, 'browser/main/resources/favicon-230x230.png'),
- message: 'Click tray icon to update app: ' + releaseName
+ icon: path.join(__dirname, '/resources/favicon-230x230.png'),
+ message: 'Click update button on Main window: ' + releaseName
})
update = quitAndUpdate
@@ -50,6 +50,14 @@ app.on('ready', function () {
// menu start
var template = require('./atom-lib/menu-template')
+ setInterval(function () {
+ if (update == null) updater.checkForUpdates()
+ }, 1000 * 60 * 60 * 24)
+
+ ipc.on('check-update', function (event, msg) {
+ if (update == null) updater.checkForUpdates()
+ })
+
ipc.on('update-app', function (event, msg) {
if (update != null) {
appQuit = true
diff --git a/package.json b/package.json
index f3007e40..32ec18ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "boost",
- "version": "0.4.0-beta.2",
+ "version": "0.4.1-beta",
"description": "Boost App",
"main": "main.js",
"scripts": {
diff --git a/webpack.config.js b/webpack.config.js
index b9492ffb..ce7cdf5d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -68,7 +68,8 @@ var config = {
'superagent-promise',
'lodash',
'markdown-it',
- 'moment'
+ 'moment',
+ 'node-notifier'
]
}
diff --git a/webpack.config.production.js b/webpack.config.production.js
index 737e0d13..8eda4cc5 100644
--- a/webpack.config.production.js
+++ b/webpack.config.production.js
@@ -45,7 +45,8 @@ module.exports = {
'superagent-promise',
'lodash',
'markdown-it',
- 'moment'
+ 'moment',
+ 'node-notifier'
],
resolve: {
extensions: ['', '.js', '.jsx', 'styl']
- You can open Finder by pressing Control + shift + tab
- To put the content of an article in the clipboard, press Enter.
- So you can paste it with Cmd(⌘) + V + The Finder helps you organize all of the files and documents.
+ There is a short-cut key [control + shift + tab] to open the Finder.
+ It is available to save your articles on the Clipboard
+ by selecting your file with pressing Enter key,
+ and to paste the contents of the Clipboard with [Command-V]