Merge branch 'dev'

* dev:
  alert fix
  debug missing argument
  bump version
  rollback: setVisibleOnAllWorkspaces(true)
  FinderのActivity logをちゃんと取ってくる
  FinderのInputにLato fontが使われていない問題修正
  Search inputにRegExp operatorが入ると使えなかった問題改善
  User name change and modify style

Conflicts:
	package.json

atom-lib/finder-window.js

@@ -1,5 +1,6 @@
-var BrowserWindow = require('browser-window')
-var path = require('path')
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
+const path = require('path')
 
 var finderWindow = new BrowserWindow({
   width: 640,
@@ -18,7 +19,7 @@ var finderWindow = new BrowserWindow({
 
 var url = path.resolve(__dirname, '../browser/finder/index.html')
 
-finderWindow.loadUrl('file://' + url)
+finderWindow.loadURL('file://' + url)
 
 finderWindow.on('blur', function () {
   finderWindow.hide()

atom-lib/main-window.js

@@ -1,5 +1,6 @@
-var BrowserWindow = require('browser-window')
-var path = require('path')
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
+const path = require('path')
 
 var mainWindow = new BrowserWindow({
   width: 1080,
@@ -11,11 +12,9 @@ var mainWindow = new BrowserWindow({
   'standard-window': false
 })
 
-var url = path.resolve(__dirname, '../browser/main/index.html')
+const url = path.resolve(__dirname, '../browser/main/index.html')
 
-mainWindow.loadUrl('file://' + url)
-
-mainWindow.setVisibleOnAllWorkspaces(true)
+mainWindow.loadURL('file://' + url)
 
 mainWindow.webContents.on('new-window', function (e) {
   e.preventDefault()

atom-lib/menu-template.js

@@ -1,4 +1,5 @@
-var BrowserWindow = require('browser-window')
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
 
 module.exports = [
   {

browser/finder/actions.js

@@ -16,11 +16,8 @@ export function searchArticle (input) {
   }
 }
 
-export function refreshData () {
+export function refreshData (data) {
   console.log('refreshing data')
-  let data = JSON.parse(localStorage.getItem('local'))
-  if (data == null) return null
-
   let { folders, articles } = data
 
   return {
@@ -31,3 +28,12 @@ export function refreshData () {
     }
   }
 }
+
+export default {
+  SELECT_ARTICLE,
+  SEARCH_ARTICLE,
+  REFRESH_DATA,
+  selectArticle,
+  searchArticle,
+  refreshData
+}

browser/finder/index.html

@@ -9,6 +9,7 @@
 
   <link rel="stylesheet" href="../../node_modules/font-awesome/css/font-awesome.min.css" media="screen" charset="utf-8">
   <link rel="stylesheet" href="../../node_modules/devicon/devicon.min.css">
+  <link rel="stylesheet" href="../../node_modules/highlight.js/styles/xcode.css">
   <link rel="shortcut icon" href="favicon.ico">
 
   <style>
@@ -27,7 +28,8 @@
   <div id="content"></div>
   <script src="../../submodules/ace/src-min/ace.js"></script>
   <script>
-    require('web-frame').setZoomLevelLimits(1, 1)
+    const electron = require('electron')
+    electron.webFrame.setZoomLevelLimits(1, 1)
     var scriptUrl = process.env.BOOST_ENV === 'development'
       ? 'http://localhost:8080/assets/finder.js'
       : '../../compiled/finder.js'

browser/finder/index.js

@@ -6,13 +6,14 @@ import { createStore } from 'redux'
 import FinderInput from './FinderInput'
 import FinderList from './FinderList'
 import FinderDetail from './FinderDetail'
-import { selectArticle, searchArticle, refreshData } from './actions'
+import actions, { selectArticle, searchArticle } from './actions'
 import _ from 'lodash'
-import activityRecord from 'boost/activityRecord'
+import dataStore from 'boost/dataStore'
+
+const electron = require('electron')
+const { remote, clipboard, ipcRenderer } = electron
 
-import remote from 'remote'
 var hideFinder = remote.getGlobal('hideFinder')
-import clipboard from 'clipboard'
 
 function notify (...args) {
   return new window.Notification(...args)
@@ -62,8 +63,8 @@ class FinderMain extends React.Component {
   saveToClipboard () {
     let { activeArticle } = this.props
     clipboard.writeText(activeArticle.content)
-    activityRecord.emit('FINDER_COPY')
 
+    ipcRenderer.send('copy-finder')
     notify('Saved to Clipboard!', {
       body: 'Paste it wherever you want!'
     })
@@ -152,6 +153,14 @@ function buildFilter (key) {
   return {type: TEXT_FILTER, value: key}
 }
 
+function isContaining (target, needle) {
+  return target.match(new RegExp(_.escapeRegExp(needle)))
+}
+
+function startsWith (target, needle) {
+  return target.match(new RegExp('^' + _.escapeRegExp(needle)))
+}
+
 function remap (state) {
   let { articles, folders, status } = state
 
@@ -168,10 +177,10 @@ function remap (state) {
   let targetFolders
   if (folders != null) {
     let exactTargetFolders = folders.filter(folder => {
-      return _.find(folderExactFilters, filter => folder.name.match(new RegExp(`^${filter.value}$`)))
+      return _.find(folderExactFilters, filter => isContaining(folder.name, filter.value))
     })
     let fuzzyTargetFolders = folders.filter(folder => {
-      return _.find(folderFilters, filter => folder.name.match(new RegExp(`^${filter.value}`)))
+      return _.find(folderFilters, filter => startsWith(folder.name, filter.value))
     })
     targetFolders = status.targetFolders = exactTargetFolders.concat(fuzzyTargetFolders)
 
@@ -184,7 +193,7 @@ function remap (state) {
     if (textFilters.length > 0) {
       articles = textFilters.reduce((articles, textFilter) => {
         return articles.filter(article => {
-          return article.title.match(new RegExp(textFilter.value, 'i')) || article.content.match(new RegExp(textFilter.value, 'i'))
+          return isContaining(article.title, textFilter.value) || isContaining(article.content, textFilter.value)
         })
       }, articles)
     }
@@ -192,7 +201,7 @@ function remap (state) {
     if (tagFilters.length > 0) {
       articles = tagFilters.reduce((articles, tagFilter) => {
         return articles.filter(article => {
-          return _.find(article.tags, tag => tag.match(new RegExp(tagFilter.value, 'i')))
+          return _.find(article.tags, tag => isContaining(tag, tagFilter.value))
         })
       }, articles)
     }
@@ -201,7 +210,6 @@ function remap (state) {
   let activeArticle = _.findWhere(articles, {key: status.articleKey})
   if (activeArticle == null) activeArticle = articles[0]
 
-  console.log(status.search)
   return {
     articles,
     activeArticle,
@@ -212,13 +220,19 @@ function remap (state) {
 var Finder = connect(remap)(FinderMain)
 var store = createStore(reducer)
 
+function refreshData () {
+  let data = dataStore.getData()
+  store.dispatch(actions.refreshData(data))
+}
+
 window.onfocus = e => {
-  store.dispatch(refreshData())
-  activityRecord.emit('FINDER_OPEN')
+  refreshData()
 }
 
 ReactDOM.render((
   <Provider store={store}>
     <Finder/>
   </Provider>
-), document.getElementById('content'))
+), document.getElementById('content'), function () {
+  refreshData()
+})

browser/finder/reducer.js

@@ -1,10 +1,8 @@
 import { combineReducers } from 'redux'
 import { SELECT_ARTICLE, SEARCH_ARTICLE, REFRESH_DATA } from './actions'
 
-let data = JSON.parse(localStorage.getItem('local'))
-
-let initialArticles = data != null ? data.articles : []
-let initialFolders = data != null ? data.folders : []
+let initialArticles = []
+let initialFolders = []
 let initialStatus = {
   articleKey: null,
   search: ''

browser/main/HomePage.js

@@ -1,15 +1,16 @@
 import React, { PropTypes} from 'react'
 import { connect } from 'react-redux'
-import { CREATE_MODE, EDIT_MODE, IDLE_MODE, NEW, toggleTutorial } from 'boost/actions'
-// import UserNavigator from './HomePage/UserNavigator'
+import { EDIT_MODE, IDLE_MODE, toggleTutorial } from 'boost/actions'
 import ArticleNavigator from './HomePage/ArticleNavigator'
 import ArticleTopBar from './HomePage/ArticleTopBar'
 import ArticleList from './HomePage/ArticleList'
 import ArticleDetail from './HomePage/ArticleDetail'
 import _ from 'lodash'
-import keygen from 'boost/keygen'
 import { isModalOpen, closeModal } from 'boost/modal'
 
+const electron = require('electron')
+const BrowserWindow = electron.remote.BrowserWindow
+
 const TEXT_FILTER = 'TEXT_FILTER'
 const FOLDER_FILTER = 'FOLDER_FILTER'
 const FOLDER_EXACT_FILTER = 'FOLDER_EXACT_FILTER'
@@ -31,7 +32,7 @@ class HomePage extends React.Component {
     if (process.env.BOOST_ENV === 'development' && e.keyCode === 73 && e.metaKey && e.altKey) {
       e.preventDefault()
       e.stopPropagation()
-      require('remote').require('browser-window').getFocusedWindow().toggleDevTools()
+      BrowserWindow.getFocusedWindow().toggleDevTools()
       return
     }
 
@@ -56,7 +57,7 @@ class HomePage extends React.Component {
     }
 
     switch (status.mode) {
-      case CREATE_MODE:
+
       case EDIT_MODE:
         if (e.keyCode === 27) {
           detail.handleCancelButtonClick()
@@ -64,6 +65,13 @@ class HomePage extends React.Component {
         if ((e.keyCode === 13 && e.metaKey) || (e.keyCode === 83 && e.metaKey)) {
           detail.handleSaveButtonClick()
         }
+        if (e.keyCode === 80 && e.metaKey) {
+          detail.handleTogglePreviewButtonClick()
+        }
+        if (e.keyCode === 78 && e.metaKey) {
+          nav.handleNewPostButtonClick()
+          e.preventDefault()
+        }
         break
       case IDLE_MODE:
         if (e.keyCode === 69) {
@@ -98,7 +106,7 @@ class HomePage extends React.Component {
           list.selectNextArticle()
         }
 
-        if (e.keyCode === 65 || e.keyCode === 13 && e.metaKey) {
+        if (e.keyCode === 65 || (e.keyCode === 13 && e.metaKey) || (e.keyCode === 78 && e.metaKey)) {
           nav.handleNewPostButtonClick()
           e.preventDefault()
         }
@@ -106,13 +114,14 @@ class HomePage extends React.Component {
   }
 
   render () {
-    let { dispatch, status, articles, allArticles, activeArticle, folders, tags, filters } = this.props
+    let { dispatch, status, user, articles, allArticles, activeArticle, folders, tags, filters } = this.props
 
     return (
       <div className='HomePage'>
         <ArticleNavigator
           ref='nav'
           dispatch={dispatch}
+          user={user}
           folders={folders}
           status={status}
           allArticles={allArticles}
@@ -163,8 +172,16 @@ function buildFilter (key) {
   return {type: TEXT_FILTER, value: key}
 }
 
+function isContaining (target, needle) {
+  return target.match(new RegExp(_.escapeRegExp(needle)))
+}
+
+function startsWith (target, needle) {
+  return target.match(new RegExp('^' + _.escapeRegExp(needle)))
+}
+
 function remap (state) {
-  let { folders, articles, status } = state
+  let { user, folders, articles, status } = state
 
   if (articles == null) articles = []
   articles.sort((a, b) => {
@@ -191,10 +208,10 @@ function remap (state) {
   let targetFolders
   if (folders != null) {
     let exactTargetFolders = folders.filter(folder => {
-      return _.find(folderExactFilters, filter => folder.name.match(new RegExp(`^${filter.value}$`)))
+      return _.findWhere(folderExactFilters, {value: folder.name})
     })
     let fuzzyTargetFolders = folders.filter(folder => {
-      return _.find(folderFilters, filter => folder.name.match(new RegExp(`^${filter.value}`)))
+      return _.find(folderFilters, filter => startsWith(folder.name, filter.value))
     })
     targetFolders = status.targetFolders = exactTargetFolders.concat(fuzzyTargetFolders)
 
@@ -207,7 +224,7 @@ function remap (state) {
     if (textFilters.length > 0) {
       articles = textFilters.reduce((articles, textFilter) => {
         return articles.filter(article => {
-          return article.title.match(new RegExp(textFilter.value, 'i')) || article.content.match(new RegExp(textFilter.value, 'i'))
+          return isContaining(article.title, textFilter.value) || isContaining(article.content, textFilter.value)
         })
       }, articles)
     }
@@ -215,7 +232,7 @@ function remap (state) {
     if (tagFilters.length > 0) {
       articles = tagFilters.reduce((articles, tagFilter) => {
         return articles.filter(article => {
-          return _.find(article.tags, tag => tag.match(new RegExp(tagFilter.value, 'i')))
+          return _.find(article.tags, tag => isContaining(tag, tagFilter.value))
         })
       }, articles)
     }
@@ -226,6 +243,7 @@ function remap (state) {
   if (activeArticle == null) activeArticle = articles[0]
 
   return {
+    user,
     folders,
     status,
     allArticles,
@@ -241,11 +259,9 @@ function remap (state) {
 }
 
 HomePage.propTypes = {
-  params: PropTypes.shape({
-    userId: PropTypes.string
-  }),
-  status: PropTypes.shape({
-    userId: PropTypes.string
+  status: PropTypes.shape(),
+  user: PropTypes.shape({
+    name: PropTypes.string
   }),
   articles: PropTypes.array,
   allArticles: PropTypes.array,
@@ -256,7 +272,8 @@ HomePage.propTypes = {
     folder: PropTypes.array,
     tag: PropTypes.array,
     text: PropTypes.array
-  })
+  }),
+  tags: PropTypes.array
 }
 
 export default connect(remap)(HomePage)

browser/main/HomePage/ArticleDetail.js

@@ -14,7 +14,6 @@ import {
   clearSearch,
   lockStatus,
   unlockStatus,
-  clearNewArticle,
   updateArticle,
   destroyArticle,
   NEW
@@ -26,6 +25,9 @@ import TagSelect from 'boost/components/TagSelect'
 import ModeSelect from 'boost/components/ModeSelect'
 import activityRecord from 'boost/activityRecord'
 
+const electron = require('electron')
+const clipboard = electron.clipboard
+
 const BRAND_COLOR = '#18AF90'
 
 const editDeleteTutorialElement = (
@@ -85,6 +87,10 @@ const modeSelectTutorialElement = (
   </svg>
 )
 
+function notify (...args) {
+  return new window.Notification(...args)
+}
+
 function makeInstantArticle (article) {
   return Object.assign({}, article)
 }
@@ -155,6 +161,13 @@ export default class ArticleDetail extends React.Component {
     )
   }
 
+  handleClipboardButtonClick (e) {
+    clipboard.writeText(this.props.activeArticle.content)
+    notify('Saved to Clipboard!', {
+      body: 'Paste it wherever you want!'
+    })
+  }
+
   handleEditButtonClick (e) {
     let { dispatch } = this.props
     dispatch(switchMode(EDIT_MODE))
@@ -186,8 +199,13 @@ export default class ArticleDetail extends React.Component {
       : (
         <span className='noTags'>Not tagged yet</span>
       ) : null
+
     let folder = _.findWhere(folders, {key: activeArticle.FolderKey})
 
+    let title = activeArticle.title.trim().length === 0
+      ? <small>(Untitled)</small>
+      : activeArticle.title
+
     return (
       <div className='ArticleDetail idle'>
         {this.state.openDeleteConfirmMenu
@@ -215,6 +233,9 @@ export default class ArticleDetail extends React.Component {
                 <div className='tags'><i className='fa fa-fw fa-tags'/>{tags}</div>
               </div>
               <div className='right'>
+                <button onClick={e => this.handleClipboardButtonClick(e)} className='editBtn'>
+                  <i className='fa fa-fw fa-clipboard'/><span className='tooltip'>Copy to clipboard</span>
+                </button>
                 <button onClick={e => this.handleEditButtonClick(e)} className='editBtn'>
                   <i className='fa fa-fw fa-edit'/><span className='tooltip'>Edit (e)</span>
                 </button>
@@ -233,7 +254,7 @@ export default class ArticleDetail extends React.Component {
           <div className='detailPanel'>
             <div className='header'>
               <ModeIcon className='mode' mode={activeArticle.mode}/>
-              <div className='title'>{activeArticle.title}</div>
+              <div className='title'>{title}</div>
             </div>
             {activeArticle.mode === 'markdown'
               ? <MarkdownPreview content={activeArticle.content}/>
@@ -248,9 +269,7 @@ export default class ArticleDetail extends React.Component {
   handleCancelButtonClick (e) {
     let { activeArticle, dispatch } = this.props
 
-    dispatch(unlockStatus())
     if (activeArticle.status === NEW) {
-      dispatch(clearNewArticle())
       dispatch(switchArticle(null))
     }
     dispatch(switchMode(IDLE_MODE))
@@ -268,8 +287,12 @@ export default class ArticleDetail extends React.Component {
 
     delete newArticle.status
     newArticle.updatedAt = new Date()
+    newArticle.title = newArticle.title.trim()
     if (newArticle.createdAt == null) {
       newArticle.createdAt = new Date()
+      if (newArticle.title.length === 0) {
+        newArticle.title = `Created at ${moment(newArticle.createdAt).format('YYYY/MM/DD HH:mm')}`
+      }
       activityRecord.emit('ARTICLE_CREATE')
     } else {
       activityRecord.emit('ARTICLE_UPDATE')
@@ -411,8 +434,10 @@ export default class ArticleDetail extends React.Component {
   }
 
   handleTogglePreviewButtonClick (e) {
+    if (this.state.article.mode === 'markdown') {
       this.setState({previewMode: !this.state.previewMode})
     }
+  }
 
   handleTitleKeyDown (e) {
     if (e.keyCode === 9 && !e.shiftKey) {
@@ -456,18 +481,36 @@ export default class ArticleDetail extends React.Component {
           <div className='right'>
             {
               this.state.article.mode === 'markdown'
-                ? (<button className='preview' onClick={e => this.handleTogglePreviewButtonClick(e)}>{!this.state.previewMode ? 'Preview' : 'Edit'}</button>)
+                ? (<button className='preview' onClick={e => this.handleTogglePreviewButtonClick(e)}>
+                    {
+                      !this.state.previewMode
+                      ? 'Preview'
+                      : 'Edit'
+                    }
+                  </button>)
                 : null
             }
-            <button onClick={e => this.handleCancelButtonClick(e)}>Cancel</button>
-            <button onClick={e => this.handleSaveButtonClick(e)} className='primary'>Save</button>
+            <button onClick={e => this.handleCancelButtonClick(e)}>
+              Cancel
+            </button>
+            <button onClick={e => this.handleSaveButtonClick(e)} className='primary'>
+              Save
+            </button>
           </div>
         </div>
         <div className='detailBody'>
           <div className='detailPanel'>
             <div className='header'>
               <div className='title'>
-                <input onKeyDown={e => this.handleTitleKeyDown(e)} placeholder='Title' ref='title' value={this.state.article.title} onChange={e => this.handleTitleChange(e)}/>
+                <input
+                  onKeyDown={e => this.handleTitleKeyDown(e)}
+                  placeholder={this.state.article.createdAt == null
+                    ? `Created at ${moment().format('YYYY/MM/DD HH:mm')}`
+                    : 'Title'}
+                  ref='title'
+                  value={this.state.article.title}
+                  onChange={e => this.handleTitleChange(e)}
+                />
               </div>
               <ModeSelect
                 ref='mode'

browser/main/HomePage/ArticleList.js

@@ -80,6 +80,12 @@ export default class ArticleList extends React.Component {
         : (<span>Not tagged yet</span>)
       let folder = _.findWhere(folders, {key: article.FolderKey})
 
+      let title = article.status !== NEW
+        ? article.title.trim().length === 0
+        ? <small>(Untitled)</small>
+        : article.title
+        : '(New article)'
+
       return (
         <div key={'article-' + article.key}>
           <div onClick={e => this.handleArticleClick(article)(e)} className={'articleItem' + (activeArticle.key === article.key ? ' active' : '')}>
@@ -91,7 +97,7 @@ export default class ArticleList extends React.Component {
             <span className='updatedAt'>{article.status != null ? article.status : moment(article.updatedAt).fromNow()}</span>
             </div>
             <div className='middle'>
-              <ModeIcon className='mode' mode={article.mode}/> <div className='title'>{article.status !== NEW ? article.title : '(New article)'}</div>
+              <ModeIcon className='mode' mode={article.mode}/> <div className='title'>{title}</div>
             </div>
             <div className='bottom'>
               <div className='tags'><i className='fa fa-fw fa-tags'/>{tagElements}</div>

browser/main/HomePage/ArticleNavigator.js

@@ -1,15 +1,12 @@
 import React, { PropTypes } from 'react'
 import { findWhere } from 'lodash'
-import { setSearchFilter, switchFolder, switchMode, switchArticle, updateArticle, EDIT_MODE } from 'boost/actions'
+import { setSearchFilter, switchFolder, switchMode, switchArticle, updateArticle, clearNewArticle, EDIT_MODE } from 'boost/actions'
 import { openModal } from 'boost/modal'
 import FolderMark from 'boost/components/FolderMark'
 import Preferences from 'boost/components/modal/Preferences'
 import CreateNewFolder from 'boost/components/modal/CreateNewFolder'
 import keygen from 'boost/keygen'
 
-import remote from 'remote'
-let userName = remote.getGlobal('process').env.USER
-
 const BRAND_COLOR = '#18AF90'
 
 const preferenceTutorialElement = (
@@ -84,6 +81,7 @@ export default class ArticleNavigator extends React.Component {
       status: 'NEW'
     }
 
+    dispatch(clearNewArticle())
     dispatch(updateArticle(newArticle))
     dispatch(switchArticle(newArticle.key, true))
     dispatch(switchMode(EDIT_MODE))
@@ -107,7 +105,7 @@ export default class ArticleNavigator extends React.Component {
   }
 
   render () {
-    let { status, folders, allArticles } = this.props
+    let { status, user, folders, allArticles } = this.props
     let { targetFolders } = status
     if (targetFolders == null) targetFolders = []
 
@@ -125,7 +123,7 @@ export default class ArticleNavigator extends React.Component {
     return (
       <div className='ArticleNavigator'>
         <div className='userInfo'>
-          <div className='userProfileName'>{userName}</div>
+          <div className='userProfileName'>{user.name}</div>
           <div className='userName'>localStorage</div>
           <button onClick={e => this.handlePreferencesButtonClick(e)} className='settingBtn'>
             <i className='fa fa-fw fa-chevron-down'/>

browser/main/HomePage/ArticleTopBar.js

@@ -35,18 +35,33 @@ export default class ArticleTopBar extends React.Component {
     super(props)
 
     this.state = {
-      isTooltipHidden: true
+      isTooltipHidden: true,
+      isLinksDropdownOpen: false
     }
   }
 
   componentDidMount () {
     this.searchInput = ReactDOM.findDOMNode(this.refs.searchInput)
+    this.linksButton = ReactDOM.findDOMNode(this.refs.links)
+    this.showLinksDropdown = e => {
+      e.preventDefault()
+      e.stopPropagation()
+      if (!this.state.isLinksDropdownOpen) {
+        this.setState({isLinksDropdownOpen: true})
+      }
+    }
+    this.linksButton.addEventListener('click', this.showLinksDropdown)
+    this.hideLinksDropdown = e => {
+      if (this.state.isLinksDropdownOpen) {
+        this.setState({isLinksDropdownOpen: false})
+      }
+    }
+    document.addEventListener('click', this.hideLinksDropdown)
   }
 
   componentWillUnmount () {
-    this.searchInput.removeEventListener('keydown', this.showTooltip)
-    this.searchInput.removeEventListener('focus', this.showTooltip)
-    this.searchInput.removeEventListener('blur', this.showTooltip)
+    document.removeEventListener('click', this.hideLinksDropdown)
+    this.linksButton.removeEventListener('click', this.showLinksDropdown())
   }
 
   handleTooltipRequest (e) {
@@ -118,8 +133,11 @@ export default class ArticleTopBar extends React.Component {
                 : null
             }
             <div className={'tooltip' + (this.state.isTooltipHidden ? ' hide' : '')}>
-              - Search by tag : #{'{string}'}<br/>
-              - Search by folder : /{'{folder_name}'}
+              <ul>
+                <li>- Search by tag : #{'{string}'}</li>
+                <li>- Search by folder : /{'{folder_name}'}</li>
+                <li><small>exact match : //{'{folder_name}'}</small></li>
+              </ul>
             </div>
           </div>
 
@@ -129,10 +147,23 @@ export default class ArticleTopBar extends React.Component {
         <div className='right'>
           <button onClick={e => this.handleTutorialButtonClick(e)}>?<span className='tooltip'>How to use</span>
           </button>
-          <ExternalLink className='logo' href='http://b00st.io'>
+          <a ref='links' className='linksBtn' href>
             <img src='../../resources/favicon-230x230.png' width='44' height='44'/>
-            <span className='tooltip'>Boost official page</span>
+          </a>
+          {
+            this.state.isLinksDropdownOpen
+              ? (
+                <div className='links-dropdown'>
+                  <ExternalLink className='links-item' href='https://b00st.io'>
+                    <i className='fa fa-fw fa-home'/>Boost official page
                   </ExternalLink>
+                  <ExternalLink className='links-item' href='https://github.com/BoostIO/boost-app-discussions/issues'>
+                    <i className='fa fa-fw fa-bullhorn'/> Discuss
+                  </ExternalLink>
+                </div>
+              )
+              : null
+          }
         </div>
 
         {status.isTutorialOpen ? (

browser/main/MainPage.js

@@ -1,4 +1,5 @@
-import ipc from 'ipc'
+const electron = require('electron')
+const ipc = electron.ipcRenderer
 import React, { PropTypes } from 'react'
 
 var ContactModal = require('boost/components/modal/ContactModal')

browser/main/index.html

@@ -6,6 +6,7 @@
 
   <link rel="stylesheet" href="../../node_modules/font-awesome/css/font-awesome.min.css" media="screen" charset="utf-8">
   <link rel="stylesheet" href="../../node_modules/devicon/devicon.min.css">
+  <link rel="stylesheet" href="../../node_modules/highlight.js/styles/xcode.css">
   <link rel="shortcut icon" href="favicon.ico">
 
   <style>
@@ -53,8 +54,9 @@
 
   <script src="../../submodules/ace/src-min/ace.js"></script>
   <script type='text/javascript'>
-    require('web-frame').setZoomLevelLimits(1, 1)
-    var version = require('remote').require('app').getVersion()
+    const electron = require('electron')
+    electron.webFrame.setZoomLevelLimits(1, 1)
+    var version = electron.remote.app.getVersion()
     document.title = 'Boost' + ((version == null || version.length === 0) ? ' DEV' : '')
     var scriptUrl = process.env.BOOST_ENV === 'development'
       ? 'http://localhost:8080/assets/main.js'

browser/main/index.js

@@ -11,7 +11,8 @@ require('../styles/main/index.styl')
 import { openModal } from 'boost/modal'
 import Tutorial from 'boost/components/modal/Tutorial'
 import activityRecord from 'boost/activityRecord'
-import ipc from 'ipc'
+const electron = require('electron')
+const ipc = electron.ipcRenderer
 
 activityRecord.init()
 window.addEventListener('online', function () {
@@ -22,12 +23,19 @@ function notify (...args) {
   return new window.Notification(...args)
 }
 
-ipc.on('notify', function (title, message) {
-  notify(title, {
-    body: message
+ipc.on('notify', function (e, payload) {
+  notify(payload.title, {
+    body: payload.body
   })
 })
 
+ipc.on('copy-finder', function () {
+  activityRecord.emit('FINDER_COPY')
+})
+ipc.on('open-finder', function () {
+  activityRecord.emit('FINDER_OPEN')
+})
+
 let routes = (
   <Route path='/' component={MainPage}>
     <IndexRoute name='home' component={HomePage}/>

browser/styles/finder/index.styl

@@ -14,6 +14,8 @@ body
   width 100%
   height 100%
   overflow hidden
+button, input
+  font-family "Lato"
 
 .Finder
   absolute top bottom left right

browser/styles/main/HomeContainer/components/ArticleDetail.styl

@@ -323,7 +323,8 @@ iptFocusBorderColor = #369DCD
             right 15px
             font-size 24px
             line-height 60px
-
             white-space nowrap
             overflow-x auto
             overflow-y hidden
+            small
+              color #AAA

browser/styles/main/HomeContainer/components/ArticleList.styl

@@ -48,6 +48,8 @@ articleItemColor = #777
           left 19px
           right 0
           overflow ellipsis
+          small
+            color #AAA
       .bottom
         padding 5px 0
         overflow-x auto

browser/styles/main/HomeContainer/components/ArticleNavigator.styl

@@ -14,7 +14,7 @@ articleCount = #999
     .userProfileName
       color brandColor
       font-size 28px
-      padding 6px 0 0 10px
+      padding 6px 37px 0 10px
       white-space nowrap
       text-overflow ellipsis
       overflow hidden

browser/styles/main/HomeContainer/components/ArticleTopBar.styl

@@ -62,6 +62,13 @@ infoBtnActiveBgColor = #3A3A3A
         opacity 1
         &.hide
           opacity 0
+        ul
+          li:last-child
+            line-height 10px
+            margin-bottom 3px
+        small
+          font-size 10px
+          margin-left 15px
       input
         absolute top left
         width 350px
@@ -140,17 +147,33 @@ infoBtnActiveBgColor = #3A3A3A
         .tooltip
           opacity 1
 
-    &>.logo
+    &>.linksBtn
       display block
       position absolute
       top 8px
       right 15px
       opacity 0.7
-      .tooltip
-        tooltip()
-        margin-top 44px
-        margin-left -120px
       &:hover
         opacity 1
         .tooltip
           opacity 1
+    &>.links-dropdown
+      position fixed
+      z-index 50
+      right 10px
+      top 40px
+      background-color transparentify(invBackgroundColor, 80%)
+      padding 5px 0
+      .links-item
+        padding 0 10px
+        height 33px
+        width 100%
+        display block
+        line-height 33px
+        text-decoration none
+        color white
+        &:hover
+          background-color transparentify(lighten(invBackgroundColor, 30%), 80%)
+
+
+

browser/styles/mixins/marked.styl

@@ -62,7 +62,7 @@ marked()
       display list-item
       line-height 1.8em
   code
-    font-family monospace
+    font-family Monaco, Menlo, 'Ubuntu Mono', Consolas, source-code-pro, monospace;
     padding 2px 4px
     border solid 1px borderColor
     border-radius 4px
@@ -77,6 +77,7 @@ marked()
     overflow-x auto
     margin 15px 0 25px
     background-color #F6F6F6
+    line-height 1.35em
     &>code
       padding 0
       border none

finder.js

@@ -0,0 +1,77 @@
+const electron = require('electron')
+const app = electron.app
+const Tray = electron.Tray
+const Menu = electron.Menu
+const MenuItem = electron.MenuItem
+const ipcMain = electron.ipcMain
+
+process.stdin.setEncoding('utf8')
+
+console.log = function () {
+  process.stdout.write(JSON.stringify({
+    type: 'log',
+    data: JSON.stringify(Array.prototype.slice.call(arguments).join(' '))
+  }), 'utf-8')
+}
+
+function emit (type, data) {
+  process.stdout.write(JSON.stringify({
+    type: type,
+    data: JSON.stringify(data)
+  }), 'utf-8')
+}
+
+var finderWindow
+app.on('ready', function () {
+  app.dock.hide()
+  var appIcon = new Tray(__dirname + '/resources/tray-icon.png')
+  appIcon.setToolTip('Boost')
+
+  finderWindow = require('./atom-lib/finder-window')
+  finderWindow.webContents.on('did-finish-load', function () {
+    var trayMenu = new Menu()
+    trayMenu.append(new MenuItem({
+      label: 'Open Main window',
+      click: function () {
+        emit('show-main-window')
+      }
+    }))
+    trayMenu.append(new MenuItem({
+      label: 'Open Finder window',
+      click: function () {
+        finderWindow.show()
+      }
+    }))
+    trayMenu.append(new MenuItem({
+      label: 'Quit',
+      click: function () {
+        emit('quit-app')
+      }
+    }))
+    appIcon.setContextMenu(trayMenu)
+
+    process.stdin.on('data', function (payload) {
+      try {
+        payload = JSON.parse(payload)
+      } catch (e) {
+        console.log('Not parsable payload : ', payload)
+        return
+      }
+      console.log('from main >> ', payload.type)
+      switch (payload.type) {
+        case 'open-finder':
+          finderWindow.show()
+          break
+      }
+    })
+
+    ipcMain.on('copy-finder', function () {
+      emit('copy-finder')
+    })
+  })
+
+  global.hideFinder = function () {
+    Menu.sendActionToFirstResponder('hide:')
+  }
+})
+

index.js

@@ -0,0 +1,10 @@
+function isFinderCalled () {
+  var argv = process.argv.slice(1)
+  return argv.some(arg => arg.match(/--finder/))
+}
+
+if (isFinderCalled()) {
+  require('./finder.js')
+} else {
+  require('./main.js')
+}

lib/actions.js

@@ -1,4 +1,6 @@
 // Action types
+export const USER_UPDATE = 'USER_UPDATE'
+
 export const CLEAR_NEW_ARTICLE = 'CLEAR_NEW_ARTICLE'
 export const ARTICLE_UPDATE = 'ARTICLE_UPDATE'
 export const ARTICLE_DESTROY = 'ARTICLE_DESTROY'
@@ -24,6 +26,13 @@ export const EDIT_MODE = 'EDIT_MODE'
 // Article status
 export const NEW = 'NEW'
 
+export function updateUser (input) {
+  return {
+    type: USER_UPDATE,
+    data: input
+  }
+}
+
 // DB
 export function clearNewArticle () {
   return {

lib/components/ExternalLink.js

@@ -1,5 +1,6 @@
 import React, { PropTypes } from 'react'
-import shell from 'shell'
+const electron = require('electron')
+const shell = electron.shell
 
 export default class ExternalLink extends React.Component {
   handleClick (e) {

lib/components/MarkdownPreview.js

@@ -1,9 +1,11 @@
-import shell from 'shell'
 var React = require('react')
 var { PropTypes } = React
 import markdown from 'boost/markdown'
 var ReactDOM = require('react-dom')
 
+const electron = require('electron')
+const shell = electron.shell
+
 function handleAnchorClick (e) {
   shell.openExternal(e.target.href)
   e.preventDefault()

lib/components/modal/CreateNewFolder.js

@@ -1,4 +1,5 @@
 import React, { PropTypes } from 'react'
+import ReactDOM from 'react-dom'
 import linkState from 'boost/linkState'
 import { createFolder } from 'boost/actions'
 import store from 'boost/store'
@@ -15,6 +16,10 @@ export default class CreateNewFolder extends React.Component {
     }
   }
 
+  componentDidMount () {
+    ReactDOM.findDOMNode(this.refs.folderName).focus()
+  }
+
   handleCloseButton (e) {
     this.props.close()
   }
@@ -84,7 +89,7 @@ export default class CreateNewFolder extends React.Component {
 
         <div className='title'>Create new folder</div>
 
-        <input onKeyDown={e => this.handleKeyDown(e)} className='ipt' type='text' valueLink={this.linkState('name')} placeholder='Enter folder name'/>
+        <input ref='folderName' onKeyDown={e => this.handleKeyDown(e)} className='ipt' type='text' valueLink={this.linkState('name')} placeholder='Enter folder name'/>
         <div className='colorSelect'>
           {colorElements}
         </div>

lib/components/modal/EditedAlert.js

@@ -1,8 +1,13 @@
 import React, { PropTypes } from 'react'
+import ReactDOM from 'react-dom'
 import store from 'boost/store'
 import { unlockStatus, clearNewArticle } from 'boost/actions'
 
 export default class EditedAlert extends React.Component {
+  componentDidMount () {
+    ReactDOM.findDOMNode(this.refs.no).focus()
+  }
+
   handleNoButtonClick (e) {
     this.props.close()
   }
@@ -22,8 +27,8 @@ export default class EditedAlert extends React.Component {
         <div className='message'>Do you really want to leave without finishing?</div>
 
         <div className='control'>
-          <button onClick={e => this.handleNoButtonClick(e)}><i className='fa fa-fw fa-close'/> No</button>
-          <button onClick={e => this.handleYesButtonClick(e)} className='primary'><i className='fa fa-fw fa-check'/> Yes</button>
+          <button ref='no' onClick={e => this.handleNoButtonClick(e)}><i className='fa fa-fw fa-close'/> No</button>
+          <button ref='yes' onClick={e => this.handleYesButtonClick(e)} className='primary'><i className='fa fa-fw fa-check'/> Yes</button>
         </div>
       </div>
     )

lib/components/modal/Preference/AppSettingTab.js

@@ -1,30 +1,41 @@
-import React from 'react'
+import React, { PropTypes } from 'react'
 import linkState from 'boost/linkState'
-import remote from 'remote'
-import ipc from 'ipc'
+import { updateUser } from 'boost/actions'
+
+const electron = require('electron')
+const ipc = electron.ipcRenderer
+const remote = electron.remote
 
 export default class AppSettingTab extends React.Component {
   constructor (props) {
     super(props)
     let keymap = remote.getGlobal('keymap')
+    let userName = props.user != null ? props.user.name : null
 
     this.state = {
-      toggleFinder: keymap.toggleFinder,
+      user: {
+        name: userName,
         alert: null
+      },
+      userAlert: null,
+      keymap: {
+        toggleFinder: keymap.toggleFinder
+      },
+      keymapAlert: null
     }
   }
 
   componentDidMount () {
     this.handleSettingDone = () => {
-      this.setState({alert: {
+      this.setState({keymapAlert: {
         type: 'success',
         message: 'Successfully done!'
       }})
     }
     this.handleSettingError = err => {
-      this.setState({alert: {
+      this.setState({keymapAlert: {
         type: 'error',
-        message: err.message
+        message: err.message != null ? err.message : 'Error occurs!'
       }})
     }
     ipc.addListener('APP_SETTING_DONE', this.handleSettingDone)
@@ -38,7 +49,7 @@ export default class AppSettingTab extends React.Component {
 
   submitHotKey () {
     ipc.send('hotkeyUpdated', {
-      toggleFinder: this.state.toggleFinder
+      toggleFinder: this.state.keymap.toggleFinder
     })
   }
 
@@ -47,28 +58,61 @@ export default class AppSettingTab extends React.Component {
   }
 
   handleKeyDown (e) {
+    if (e.keyCode === 13) {
       this.submitHotKey()
     }
+  }
+
+  handleNameSaveButtonClick (e) {
+    let { dispatch } = this.props
+
+    dispatch(updateUser({name: this.state.user.name}))
+    this.setState({
+      userAlert: {
+        type: 'success',
+        message: 'Successfully done!'
+      }
+    })
+  }
 
   render () {
-    let alert = this.state.alert
-    let alertElement = alert != null ? (
-        <p className={`alert ${alert.type}`}>
-          {alert.message}
+    let keymapAlert = this.state.keymapAlert
+    let keymapAlertElement = keymapAlert != null
+      ? (
+        <p className={`alert ${keymapAlert.type}`}>
+          {keymapAlert.message}
+        </p>
+      ) : null
+    let userAlert = this.state.userAlert
+    let userAlertElement = userAlert != null
+      ? (
+        <p className={`alert ${userAlert.type}`}>
+          {userAlert.message}
         </p>
       ) : null
 
     return (
       <div className='AppSettingTab content'>
+        <div className='section'>
+          <div className='sectionTitle'>User's info</div>
+          <div className='sectionInput'>
+            <label>User name</label>
+            <input valueLink={this.linkState('user.name')} type='text'/>
+          </div>
+          <div className='sectionConfirm'>
+            <button onClick={e => this.handleNameSaveButtonClick(e)}>Save</button>
+            {userAlertElement}
+          </div>
+        </div>
         <div className='section'>
           <div className='sectionTitle'>Hotkey</div>
           <div className='sectionInput'>
             <label>Toggle Finder(popup)</label>
-            <input onKeyDown={e => this.handleKeyDown(e)} valueLink={this.linkState('toggleFinder')} type='text'/>
+            <input onKeyDown={e => this.handleKeyDown(e)} valueLink={this.linkState('keymap.toggleFinder')} type='text'/>
           </div>
           <div className='sectionConfirm'>
             <button onClick={e => this.handleSaveButtonClick(e)}>Save</button>
-            {alertElement}
+            {keymapAlertElement}
           </div>
           <div className='description'>
             <ul>
@@ -97,3 +141,6 @@ export default class AppSettingTab extends React.Component {
 }
 
 AppSettingTab.prototype.linkState = linkState
+AppSettingTab.propTypes = {
+  dispatch: PropTypes.func
+}

lib/components/modal/Preferences.js

@@ -62,7 +62,7 @@ class Preferences extends React.Component {
   }
 
   renderContent () {
-    let { folders, dispatch } = this.props
+    let { user, folders, dispatch } = this.props
 
     switch (this.state.currentTab) {
       case HELP:
@@ -80,164 +80,20 @@ class Preferences extends React.Component {
         )
       case APP:
       default:
-        return (<AppSettingTab/>)
+        return (
+          <AppSettingTab
+            user={user}
+            dispatch={dispatch}
+          />
+        )
     }
   }
-
-  // handleProfileSaveButtonClick (e) {
-  //   let profileState = this.state.profile
-  //   profileState.userInfo.alert = {
-  //     type: 'info',
-  //     message: 'Sending...'
-  //   }
-  //   this.setState({profile: profileState}, () => {
-  //     let input = {
-  //       profileName: profileState.userInfo.profileName,
-  //       email: profileState.userInfo.email
-  //     }
-  //     api.updateUserInfo(input)
-  //       .then(res => {
-  //         let profileState = this.state.profile
-  //         profileState.userInfo.alert = {
-  //           type: 'success',
-  //           message: 'Successfully done!'
-  //         }
-  //         this.setState({profile: profileState})
-  //       })
-  //       .catch(err => {
-  //         var message
-  //         if (err.status != null) {
-  //           message = err.response.body.message
-  //         } else if (err.code === 'ECONNREFUSED') {
-  //           message = 'Can\'t connect to API server.'
-  //         } else throw err
-
-  //         let profileState = this.state.profile
-  //         profileState.userInfo.alert = {
-  //           type: 'error',
-  //           message: message
-  //         }
-
-  //         this.setState({profile: profileState})
-  //       })
-  //   })
-  // }
-
-  // handlePasswordSaveButton (e) {
-  //   let profileState = this.state.profile
-
-  //   if (profileState.password.newPassword !== profileState.password.confirmation) {
-  //     profileState.password.alert = {
-  //       type: 'error',
-  //       message: 'Confirmation doesn\'t match'
-  //     }
-  //     this.setState({profile: profileState})
-  //     return
-  //   }
-
-  //   profileState.password.alert = {
-  //     type: 'info',
-  //     message: 'Sending...'
-  //   }
-
-  //   this.setState({profile: profileState}, () => {
-  //     let input = {
-  //       password: profileState.password.currentPassword,
-  //       newPassword: profileState.password.newPassword
-  //     }
-  //     api.updatePassword(input)
-  //       .then(res => {
-  //         let profileState = this.state.profile
-  //         profileState.password.alert = {
-  //           type: 'success',
-  //           message: 'Successfully done!'
-  //         }
-  //         profileState.password.currentPassword = ''
-  //         profileState.password.newPassword = ''
-  //         profileState.password.confirmation = ''
-
-  //         this.setState({profile: profileState})
-  //       })
-  //       .catch(err => {
-  //         var message
-  //         if (err.status != null) {
-  //           message = err.response.body.message
-  //         } else if (err.code === 'ECONNREFUSED') {
-  //           message = 'Can\'t connect to API server.'
-  //         } else throw err
-
-  //         let profileState = this.state.profile
-  //         profileState.password.alert = {
-  //           type: 'error',
-  //           message: message
-  //         }
-  //         profileState.password.currentPassword = ''
-  //         profileState.password.newPassword = ''
-  //         profileState.password.confirmation = ''
-
-  //         this.setState({profile: profileState}, () => {
-  //           if (this.refs.currentPassword != null) findDOMNode(this.refs.currentPassword).focus()
-  //         })
-  //       })
-  //   })
-  // }
-
-  // renderProfile () {
-  //   let profileState = this.state.profile
-  //   return (
-  //     <div className='content profile'>
-  //       <div className='section userSection'>
-  //         <div className='sectionTitle'>User Info</div>
-  //         <div className='sectionInput'>
-  //           <label>Profile Name</label>
-  //           <input valueLink={this.linkState('profile.userInfo.profileName')} type='text'/>
-  //         </div>
-  //         <div className='sectionInput'>
-  //           <label>E-mail</label>
-  //           <input valueLink={this.linkState('profile.userInfo.email')} type='text'/>
-  //         </div>
-  //         <div className='sectionConfirm'>
-  //           <button onClick={e => this.handleProfileSaveButtonClick(e)}>Save</button>
-
-  //           {this.state.profile.userInfo.alert != null
-  //             ? (
-  //               <div className={'alert ' + profileState.userInfo.alert.type}>{profileState.userInfo.alert.message}</div>
-  //             )
-  //             : null}
-  //         </div>
-  //       </div>
-
-  //       <div className='section passwordSection'>
-  //         <div className='sectionTitle'>Password</div>
-  //         <div className='sectionInput'>
-  //           <label>Current Password</label>
-  //           <input ref='currentPassword' valueLink={this.linkState('profile.password.currentPassword')} type='password' placeholder='Current Password'/>
-  //         </div>
-  //         <div className='sectionInput'>
-  //           <label>New Password</label>
-  //           <input valueLink={this.linkState('profile.password.newPassword')} type='password' placeholder='New Password'/>
-  //         </div>
-  //         <div className='sectionInput'>
-  //           <label>Confirmation</label>
-  //           <input valueLink={this.linkState('profile.password.confirmation')} type='password' placeholder='Confirmation'/>
-  //         </div>
-  //         <div className='sectionConfirm'>
-  //           <button onClick={e => this.handlePasswordSaveButton(e)}>Save</button>
-
-  //           {profileState.password.alert != null
-  //             ? (
-  //               <div className={'alert ' + profileState.password.alert.type}>{profileState.password.alert.message}</div>
-  //             )
-  //             : null}
-  //         </div>
-  //       </div>
-  //     </div>
-  //   )
-  // }
-
 }
 
 Preferences.propTypes = {
+  user: PropTypes.shape({
+    name: PropTypes.string
+  }),
   folders: PropTypes.array,
   dispatch: PropTypes.func
 }
@@ -245,9 +101,10 @@ Preferences.propTypes = {
 Preferences.prototype.linkState = linkState
 
 function remap (state) {
-  let { folders, status } = state
+  let { user, folders, status } = state
 
   return {
+    user,
     folders,
     status
   }

lib/dataStore.js

@@ -1,11 +1,80 @@
 import keygen from 'boost/keygen'
+import _ from 'lodash'
+
+const electron = require('electron')
+const remote = electron.remote
+const jetpack = require('fs-jetpack')
+const path = require('path')
 
 let defaultContent = 'Boost is a brand new note App for programmers.\n\n> 下に日本語版があります。\n\n# \u25CEfeature\n\nBoost has some preponderant functions for efficient engineer\'s task.See some part of it.\n\n1. classify information by\u300CFolders\u300D\n2. deal with great variety of syntax\n3. Finder function\n\n\uFF0A\u3000\uFF0A\u3000\uFF0A\u3000\uFF0A\n\n# 1. classify information by \u300CFolders\u300D- access the information you needed easily.\n\n\u300CFolders\u300D which on the left side bar. Press plus button now. flexible way of classification.\n- Create Folder every language or flamework\n- Make Folder for your own casual memos\n\n# 2. Deal with a great variety of syntax \u2013 instead of your brain\nSave handy all information related with programming\n- Use markdown and gather api specification\n- Well using module and snippet\n\nSave them on Boost, you don\'t need to rewrite or re-search same code again.\n\n# 3. Load Finder function \u2013 now you don\'t need to spell command by hand typing.\n\n**Shift +ctrl+tab** press buttons at same time.\nThen, the window will show up for search Boost contents that instant.\n\nUsing cursor key to chose, press enter, cmd+v to paste and\u2026 please check it out by your own eye.\n\n- Such command spl or linux which programmers often use but troublesome to hand type\n\n- (Phrases commonly used for e-mail or customer support)\n\nWe support preponderant efficiency\n\n\uFF0A\u3000\uFF0A\u3000\uFF0A\u3000\uFF0A\n\n## \u25CEfor more information\nFrequently updated with this blog ( http:\/\/blog-jp.b00st.io )\n\nHave wonderful programmer life!\n\n## Hack your memory**\n\n\n\n# 日本語版\n\n**Boost**は全く新しいエンジニアライクのノートアプリです。\n\n# ◎特徴\nBoostはエンジニアの仕事を圧倒的に効率化するいくつかの機能を備えています。\nその一部をご紹介します。\n1. Folderで情報を分類\n2. 豊富なsyantaxに対応\n3. Finder機能\n\n\n＊　＊　＊　＊\n\n# 1. Folderで情報を分類、欲しい情報にすぐアクセス。\n左側のバーに存在する「Folders」。\n今すぐプラスボタンを押しましょう。\n分類の仕方も自由自在です。\n- 言語やフレームワークごとにFolderを作成\n- 自分用のカジュアルなメモをまとめる場としてFolderを作成\n\n\n# 2. 豊富なsyntaxに対応、自分の脳の代わりに。\nプログラミングに関する情報を全て、手軽に保存しましょう。\n- mdで、apiの仕様をまとめる\n- よく使うモジュールやスニペット\n\nBoostに保存しておくことで、何度も同じコードを書いたり調べたりする必要がなくなります。\n\n# 3. Finder機能を搭載、もうコマンドを手打ちする必要はありません。\n**「shift+ctrl+tab」** を同時に押してみてください。\nここでは、一瞬でBoostの中身を検索するウィンドウを表示させることができます。\n\n矢印キーで選択、Enterを押し、cmd+vでペーストすると…続きはご自身の目でお確かめください。\n- sqlやlinux等の、よく使うが手打ちが面倒なコマンド\n- （メールやカスタマーサポート等でよく使うフレーズ）\n\n私たちは、圧倒的な効率性を支援します。\n\＊　＊　＊　＊\n\n\n## ◎詳しくは\nこちらのブログ( http://blog-jp.b00st.io )にて随時更新しています。\n\nそれでは素晴らしいエンジニアライフを！\n\n## Hack your memory＊＊'
 
+function getLocalPath () {
+  return path.join(remote.app.getPath('userData'), 'local.json')
+}
+
+function forgeInitialRepositories () {
+  return [{
+    key: keygen(),
+    name: 'local',
+    type: 'userData',
+    user: {
+      name: remote.getGlobal('process').env.USER
+    }
+  }]
+}
+
+function getRepositories () {
+  let raw = localStorage.getItem('repositories')
+  try {
+    let parsed = JSON.parse(raw)
+    if (!_.isArray(parsed)) {
+      throw new Error('repositories data is currupte. re-init data.')
+    }
+    return parsed
+  } catch (e) {
+    console.log(e)
+    let newRepos = forgeInitialRepositories()
+    saveRepositories(newRepos)
+    return newRepos
+  }
+}
+
+function saveRepositories (repos) {
+  localStorage.setItem('repositories', JSON.stringify(repos))
+}
+
+export function getUser (repoName) {
+  if (repoName == null) {
+    return getRepositories()[0]
+  }
+  return null
+}
+
+export function saveUser (repoName, user) {
+  let repos = getRepositories()
+  if (repoName == null) {
+    Object.assign(repos[0].user, user)
+  }
+  saveRepositories(repos)
+}
+
 export function init () {
-  console.log('initialize data store')
-  let data = JSON.parse(localStorage.getItem('local'))
+  // set repositories info
+  getRepositories()
+
+  // set local.json
+  let data = jetpack.read(getLocalPath(), 'json')
+
   if (data == null) {
+    // for 0.4.1 -> 0.4.2
+    if (localStorage.getItem('local') != null) {
+      data = JSON.parse(localStorage.getItem('local'))
+      jetpack.write(getLocalPath(), data)
+      localStorage.removeItem('local')
+      console.log('update 0.4.1 => 0.4.2')
+      return
+    }
+
     let defaultFolder = {
       name: 'default',
       key: keygen()
@@ -24,38 +93,38 @@ export function init () {
       folders: [defaultFolder],
       version: '0.4'
     }
-    localStorage.setItem('local', JSON.stringify(data))
+    jetpack.write(getLocalPath(), data)
   }
 }
 
-function getKey (teamId) {
-  return teamId == null
-    ? 'local'
-    : `team-${teamId}`
+export function getData () {
+  return jetpack.read(getLocalPath(), 'json')
 }
 
-export function getData (teamId) {
-  let key = getKey(teamId)
-  return JSON.parse(localStorage.getItem(key))
-}
-
-export function setArticles (teamId, articles) {
-  let key = getKey(teamId)
-  let data = JSON.parse(localStorage.getItem(key))
+export function setArticles (articles) {
+  let data = getData()
   data.articles = articles
-  localStorage.setItem(key, JSON.stringify(data))
+  jetpack.write(getLocalPath(), data)
 }
 
-export function setFolders (teamId, folders) {
-  let key = getKey(teamId)
-  let data = JSON.parse(localStorage.getItem(key))
+export function setFolders (folders) {
+  let data = getData()
   data.folders = folders
-  localStorage.setItem(key, JSON.stringify(data))
+  jetpack.write(getLocalPath(), data)
+}
+
+function isFinderCalled () {
+  var argv = process.argv.slice(1)
+  return argv.some(arg => arg.match(/--finder/))
 }
 
 export default (function () {
+  if (!isFinderCalled()) {
     init()
+  }
   return {
+    getUser,
+    saveUser,
     init,
     getData,
     setArticles,

lib/keygen.js

@@ -2,6 +2,6 @@ var crypto = require('crypto')
 
 module.exports = function () {
   var shasum = crypto.createHash('sha1')
-  shasum.update(((new Date()).getTime()).toString())
+  shasum.update(((new Date()).getTime() + Math.round(Math.random()*1000)).toString())
   return shasum.digest('hex')
 }

lib/markdown.js

@@ -1,9 +1,25 @@
 import markdownit from 'markdown-it'
+import hljs from 'highlight.js'
+import emoji from 'markdown-it-emoji'
 
 var md = markdownit({
   typographer: true,
-  linkify: true
+  linkify: true,
+  highlight: function (str, lang) {
+    if (lang && hljs.getLanguage(lang)) {
+      try {
+        return hljs.highlight(lang, str).value;
+      } catch (__) {}
+    }
+
+    try {
+      return hljs.highlightAuto(str).value;
+    } catch (__) {}
+
+    return ''; // use external default escaping
+  }
 })
+md.use(emoji)
 
 export default function markdown (content) {
   if (content == null) content = ''

lib/openExternal.js

@@ -1,4 +1,5 @@
-var shell = require('shell')
+const electron = require('electron')
+const shell = electron.shell
 
 export default function (e) {
   shell.openExternal(e.currentTarget.href)

lib/reducer.js

@@ -12,6 +12,9 @@ import {
   UNLOCK_STATUS,
   TOGGLE_TUTORIAL,
 
+  // user
+  USER_UPDATE,
+
   // Article action type
   ARTICLE_UPDATE,
   ARTICLE_DESTROY,
@@ -42,10 +45,22 @@ const initialStatus = {
 let data = dataStore.getData()
 let initialArticles = data.articles
 let initialFolders = data.folders
+let initialUser = dataStore.getUser().user
 
 let isStatusLocked = false
 let isCreatingNew = false
 
+function user (state = initialUser, action) {
+  switch (action.type) {
+    case USER_UPDATE:
+      let updated = Object.assign(state, action.data)
+      dataStore.saveUser(null, updated)
+      return updated
+    default:
+      return state
+  }
+}
+
 function folders (state = initialFolders, action) {
   state = state.slice()
   switch (action.type) {
@@ -67,7 +82,7 @@ function folders (state = initialFolders, action) {
         if (conflictFolder != null) throw new Error(`${newFolder.name} already exists!`)
         state.push(newFolder)
 
-        dataStore.setFolders(null, state)
+        dataStore.setFolders(state)
         activityRecord.emit('FOLDER_CREATE')
         return state
       }
@@ -94,7 +109,7 @@ function folders (state = initialFolders, action) {
           updatedAt: new Date()
         })
 
-        dataStore.setFolders(null, state)
+        dataStore.setFolders(state)
         activityRecord.emit('FOLDER_UPDATE')
         return state
       }
@@ -107,7 +122,7 @@ function folders (state = initialFolders, action) {
         if (targetIndex >= 0) {
           state.splice(targetIndex, 1)
         }
-        dataStore.setFolders(null, state)
+        dataStore.setFolders(state)
         activityRecord.emit('FOLDER_DESTROY')
         return state
       }
@@ -167,7 +182,7 @@ function articles (state = initialArticles, action) {
         if (targetIndex < 0) state.unshift(article)
         else state.splice(targetIndex, 1, article)
 
-        if (article.status !== 'NEW') dataStore.setArticles(null, state)
+        if (article.status !== 'NEW') dataStore.setArticles(state)
           else isCreatingNew = true
         return state
       }
@@ -178,7 +193,7 @@ function articles (state = initialArticles, action) {
         let targetIndex = _.findIndex(state, _article => articleKey === _article.key)
         if (targetIndex >= 0) state.splice(targetIndex, 1)
 
-        dataStore.setArticles(null, state)
+        dataStore.setArticles(state)
         return state
       }
     case FOLDER_DESTROY:
@@ -187,7 +202,7 @@ function articles (state = initialArticles, action) {
 
         state = state.filter(article => article.FolderKey !== folderKey)
 
-        dataStore.setArticles(null, state)
+        dataStore.setArticles(state)
         return state
       }
     default:
@@ -250,6 +265,7 @@ function status (state = initialStatus, action) {
 }
 
 export default combineReducers({
+  user,
   folders,
   articles,
   status

main.js

@@ -1,43 +1,50 @@
-var app = require('app')
-var Menu = require('menu')
-var MenuItem = require('menu-item')
-var Tray = require('tray')
-var ipc = require('ipc')
-var jetpack = require('fs-jetpack')
-
-require('crash-reporter').start()
+const electron = require('electron')
+const app = electron.app
+const Menu = electron.Menu
+const ipc = electron.ipcMain
+const globalShortcut = electron.globalShortcut
+const autoUpdater = electron.autoUpdater
+const jetpack = require('fs-jetpack')
+const path = require('path')
+const ChildProcess = require('child_process')
+electron.crashReporter.start()
 
 var mainWindow = null
-var appIcon = null
-var menu = null
-var finderWindow = null
-
+var finderProcess
 var update = null
 
 // app.on('window-all-closed', function () {
 //   if (process.platform !== 'darwin') app.quit()
 // })
 
-var autoUpdater = require('auto-updater')
-
 var appQuit = false
 
 var version = app.getVersion()
 var versionText = (version == null || version.length === 0) ? 'DEV version' : 'v' + version
 var versionNotified = false
+
+function notify (title, body) {
+  if (mainWindow != null) {
+    mainWindow.webContents.send('notify', {
+      title: title,
+      body: body
+    })
+  }
+}
+
 autoUpdater
   .on('update-downloaded', function (event, releaseNotes, releaseName, releaseDate, updateUrl, quitAndUpdate) {
     update = quitAndUpdate
 
     if (mainWindow != null) {
-      mainWindow.webContents.send('notify', 'Ready to Update! ' + releaseName, 'Click update button on Main window.')
+      notify('Ready to Update! ' + releaseName, 'Click update button on Main window.')
       mainWindow.webContents.send('update-available', 'Update available!')
     }
   })
   .on('error', function (err, message) {
     console.error(err)
-    if (mainWindow != null && !versionNotified) {
-      mainWindow.webContents.send('notify', 'Updater error!', message)
+    if (!versionNotified) {
+      notify('Updater error!', message)
     }
   })
   // .on('checking-for-update', function () {
@@ -45,27 +52,25 @@ autoUpdater
   //   console.log('checking...')
   // })
   .on('update-available', function () {
-    if (mainWindow != null) {
-      mainWindow.webContents.send('notify', 'Update is available!', 'Download started.. wait for the update ready.')
-    }
+    notify('Update is available!', 'Download started.. wait for the update ready.')
   })
   .on('update-not-available', function () {
     if (mainWindow != null && !versionNotified) {
       versionNotified = true
-      mainWindow.webContents.send('notify', 'Latest Build!! ' + versionText, 'Hope you to enjoy our app :D')
+      notify('Latest Build!! ' + versionText, 'Hope you to enjoy our app :D')
     }
   })
 
 app.on('ready', function () {
   app.on('before-quit', function () {
+    if (finderProcess) finderProcess.kill()
     appQuit = true
   })
-  console.log('Version ' + version)
-  autoUpdater.setFeedUrl('http://orbital.b00st.io/rokt33r/boost-app/latest?version=' + version)
-  autoUpdater.checkForUpdates()
+  autoUpdater.setFeedURL('https://orbital.b00st.io/rokt33r/boost-app/latest?version=' + version)
 
-  // menu start
   var template = require('./atom-lib/menu-template')
+  var menu = Menu.buildFromTemplate(template)
+  Menu.setApplicationMenu(menu)
 
   setInterval(function () {
     if (update == null) autoUpdater.checkForUpdates()
@@ -82,28 +87,6 @@ app.on('ready', function () {
     }
   })
 
-  menu = Menu.buildFromTemplate(template)
-
-  Menu.setApplicationMenu(menu)
-  // menu end
-  appIcon = new Tray(__dirname + '/resources/tray-icon.png')
-  appIcon.setToolTip('Boost')
-
-  var trayMenu = new Menu()
-  trayMenu.append(new MenuItem({
-    label: 'Open main window',
-    click: function () {
-      if (mainWindow != null) mainWindow.show()
-    }
-  }))
-  trayMenu.append(new MenuItem({
-    label: 'Quit',
-    click: function () {
-      app.quit()
-    }
-  }))
-  appIcon.setContextMenu(trayMenu)
-
   mainWindow = require('./atom-lib/main-window')
   mainWindow.on('close', function (e) {
     if (appQuit) return true
@@ -111,6 +94,15 @@ app.on('ready', function () {
     mainWindow.hide()
   })
   mainWindow.webContents.on('did-finish-load', function () {
+    if (finderProcess == null) {
+      finderProcess = ChildProcess
+        .execFile(process.execPath, [path.resolve(__dirname, 'finder.js'), '--finder'])
+      finderProcess.stdout.setEncoding('utf8')
+      finderProcess.stderr.setEncoding('utf8')
+      finderProcess.stdout.on('data', format)
+      finderProcess.stderr.on('data', errorFormat)
+    }
+
     if (update != null) {
       mainWindow.webContents.send('update-available', 'whoooooooh!')
     } else {
@@ -118,14 +110,54 @@ app.on('ready', function () {
     }
   })
 
-  app.on('activate-with-no-open-windows', function () {
+  app.on('activate', function () {
     if (mainWindow == null) return null
     mainWindow.show()
   })
 
-  finderWindow = require('./atom-lib/finder-window')
+  function format (payload) {
+    // console.log('from finder >> ', payload)
+    try {
+      payload = JSON.parse(payload)
+    } catch (e) {
+      console.log('Not parsable payload : ', payload)
+      return
+    }
+    switch (payload.type) {
+      case 'log':
+        console.log('FINDER(stdout): ' + payload.data)
+        break
+      case 'show-main-window':
+        mainWindow.show()
+        break
+      case 'copy-finder':
+        mainWindow.webContents.send('copy-finder')
+        break
+      case 'request-data':
+        mainWindow.webContents.send('request-data')
+        break
+      case 'quit-app':
+        appQuit = true
+        app.quit()
+        break
+    }
+  }
+  function errorFormat (output) {
+    console.error('FINDER(stderr):' + output)
+  }
+
+  function emitToFinder (type, data) {
+    if (!finderProcess) {
+      console.log('finder process is not ready')
+      return
+    }
+    var payload = {
+      type: type,
+      data: data
+    }
+    finderProcess.stdin.write(JSON.stringify(payload), 'utf-8')
+  }
 
-  var globalShortcut = require('global-shortcut')
   var userDataPath = app.getPath('userData')
   if (!jetpack.cwd(userDataPath).exists('keymap.json')) {
     jetpack.cwd(userDataPath).file('keymap.json', {content: '{}'})
@@ -141,10 +173,8 @@ app.on('ready', function () {
 
   try {
     globalShortcut.register(toggleFinderKey, function () {
-      if (mainWindow != null && !mainWindow.isFocused()) {
-        mainWindow.hide()
-      }
-      finderWindow.show()
+      emitToFinder('open-finder')
+      mainWindow.webContents.send('open-finder', {})
     })
   } catch (err) {
     console.log(err.name)
@@ -160,10 +190,8 @@ app.on('ready', function () {
     var toggleFinderKey = global.keymap.toggleFinder != null ? global.keymap.toggleFinder : 'ctrl+tab+shift'
     try {
       globalShortcut.register(toggleFinderKey, function () {
-        if (mainWindow != null && !mainWindow.isFocused()) {
-          mainWindow.hide()
-        }
-        finderWindow.show()
+        emitToFinder('open-finder')
+        mainWindow.webContents.send('open-finder', {})
       })
       mainWindow.webContents.send('APP_SETTING_DONE', {})
     } catch (err) {
@@ -173,12 +201,4 @@ app.on('ready', function () {
       })
     }
   })
-
-  global.hideFinder = function () {
-    if (!mainWindow.isVisible()) {
-      Menu.sendActionToFirstResponder('hide:')
-    } else {
-      mainWindow.focus()
-    }
-  }
 })

package.json

@@ -1,8 +1,8 @@
 {
   "name": "boost",
-  "version": "0.4.1-beta.3",
+  "version": "0.4.4",
   "description": "Boost App",
-  "main": "main.js",
+  "main": "index.js",
   "scripts": {
     "start": "BOOST_ENV=development electron ./main.js",
     "webpack": "webpack-dev-server --hot --inline --config webpack.config.js",
@@ -11,7 +11,7 @@
     "codesign": "codesign --verbose --deep --force --sign \"MAISIN solutions Inc.\" Boost-darwin-x64/Boost.app"
   },
   "config": {
-    "version": "--version=0.34.0 --app-bundle-id=com.maisin.boost",
+    "version": "--version=0.35.1 --app-bundle-id=com.maisin.boost",
     "platform": "--platform=darwin --arch=x64 --prune --icon=resources/app.icns",
     "ignore": "--ignore=Boost-darwin-x64 --ignore=node_modules/devicon/icons --ignore=submodules/ace/(?!src-min)|submodules/ace/(?=src-min-noconflict)"
   },
@@ -40,8 +40,10 @@
     "devicon": "^2.0.0",
     "font-awesome": "^4.3.0",
     "fs-jetpack": "^0.7.0",
+    "highlight.js": "^8.9.1",
     "lodash": "^3.10.1",
     "markdown-it": "^4.3.1",
+    "markdown-it-emoji": "^1.1.0",
     "md5": "^2.0.0",
     "moment": "^2.10.3",
     "socket.io-client": "^1.3.6",
@@ -53,16 +55,15 @@
     "babel-plugin-react-transform": "^1.1.1",
     "css-loader": "^0.19.0",
     "electron-packager": "^5.1.0",
-    "electron-prebuilt": "^0.33.6",
+    "electron-prebuilt": "^0.35.1",
     "nib": "^1.1.0",
     "react": "^0.14.0",
     "react-dom": "^0.14.0",
     "react-redux": "^4.0.0",
     "react-router": "^1.0.0-rc1",
-    "react-select": "^0.8.1",
     "react-transform-catch-errors": "^1.0.0",
     "react-transform-hmr": "^1.0.1",
-    "redbox-react": "^1.1.1",
+    "redbox-react": "^1.2.0",
     "redux": "^3.0.2",
     "standard": "^5.3.1",
     "style-loader": "^0.12.4",

webpack.config.js

@@ -3,7 +3,6 @@ var path = require('path')
 var JsonpTemplatePlugin = webpack.JsonpTemplatePlugin
 var FunctionModulePlugin = require('webpack/lib/FunctionModulePlugin')
 var NodeTargetPlugin = require('webpack/lib/node/NodeTargetPlugin')
-var ExternalsPlugin = webpack.ExternalsPlugin
 var opt = {
   path: path.join(__dirname, 'compiled'),
   filename: '[name].js',
@@ -39,29 +38,10 @@ var config = {
   },
   plugins: [
     new webpack.NoErrorsPlugin(),
-    new ExternalsPlugin('commonjs', [
-      'app',
-      'auto-updater',
-      'browser-window',
-      'content-tracing',
-      'dialog',
-      'global-shortcut',
-      'ipc',
-      'menu',
-      'menu-item',
-      'power-monitor',
-      'protocol',
-      'tray',
-      'remote',
-      'web-frame',
-      'clipboard',
-      'crash-reporter',
-      'screen',
-      'shell'
-    ]),
     new NodeTargetPlugin()
   ],
   externals: [
+    'electron',
     'socket.io-client',
     'md5',
     'superagent',
@@ -69,7 +49,9 @@ var config = {
     'lodash',
     'markdown-it',
     'moment',
-    'node-notifier'
+    'highlight.js',
+    'markdown-it-emoji',
+    'fs-jetpack'
   ]
 }
 

webpack.config.production.js

@@ -38,6 +38,7 @@ module.exports = {
     })
   ],
   externals: [
+    'electron',
     'socket.io-client',
     'md5',
     'superagent',
@@ -45,10 +46,11 @@ module.exports = {
     'lodash',
     'markdown-it',
     'moment',
-    'node-notifier'
+    'highlight.js',
+    'markdown-it-emoji',
+    'fs-jetpack'
   ],
   resolve: {
     extensions: ['', '.js', '.jsx', 'styl']
-  },
-  target: 'atom'
+  }
 }