bump up to v0.5.7

* master:
  add Link of Trello Kanban to readme.md

LICENSE

@@ -1,2 +1,16 @@
-本製品をインストール、または使用することによって、お客様は利用規約（
+Boostnote - the simplest note app
-https://b00st.io/regulations.html）より拘束されることに承諾されたものとします。利用規約に同意されない場合、Boostnoteは、お客様に本製品のインストール、使用のいずれも許諾できません。
+
+Copyright (C) 2016 MAISIN&CO.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

browser/components/CodeEditor.js

@@ -40,11 +40,22 @@ export default class CodeEditor extends React.Component {
     this.execHandler = (e) => {
       console.log(e.command.name)
       switch (e.command.name) {
+        case 'gotolinestart':
+          e.preventDefault()
+          {
+            let position = this.editor.getCursorPosition()
+            this.editor.navigateTo(position.row, 0)
+          }
+          break
         case 'gotolineend':
           e.preventDefault()
           let position = this.editor.getCursorPosition()
           this.editor.navigateTo(position.row, this.editor.getSession().getLine(position.row).length)
           break
+        case 'jumptomatching':
+          e.preventDefault()
+          this.editor.navigateUp()
+          break
         case 'removetolineend':
           e.preventDefault()
           let range = this.editor.getSelectionRange()

browser/finder/index.js

@@ -29,7 +29,6 @@ function hideFinder () {
 function notify (title, options) {
   if (process.platform === 'win32') {
     options.icon = path.join('file://', global.__dirname, '../../resources/app.png')
-    options.silent = false
   }
   return new window.Notification(title, options)
 }
@@ -96,7 +95,8 @@ class FinderMain extends React.Component {
 
     ipcRenderer.send('copy-finder')
     notify('Saved to Clipboard!', {
-      body: 'Paste it wherever you want!'
+      body: 'Paste it wherever you want!',
+      silent: true
     })
     hideFinder()
   }

browser/main/HomePage/ArticleDetail/index.js

@@ -15,6 +15,12 @@ import DeleteArticleModal from '../../modal/DeleteArticleModal'
 import ArticleEditor from './ArticleEditor'
 const electron = require('electron')
 const ipc = electron.ipcRenderer
+import fetchConfig from 'browser/lib/fetchConfig'
+
+let config = fetchConfig()
+ipc.on('config-apply', function (e, newConfig) {
+  config = newConfig
+})
 
 const BRAND_COLOR = '#18AF90'
 const OSX = global.process.platform === 'darwin'
@@ -83,10 +89,12 @@ export default class ArticleDetail extends React.Component {
       if (isModalOpen()) return true
       if (this.refs.editor) this.refs.editor.switchPreviewMode()
     }
+    this.configApplyHandler = (e, config) => this.handleConfigApply(e, config)
 
     this.state = {
       article: Object.assign({content: ''}, props.activeArticle),
-      openShareDropdown: false
+      openShareDropdown: false,
+      fontFamily: config['editor-font-family']
     }
   }
 
@@ -101,6 +109,7 @@ export default class ArticleDetail extends React.Component {
     ipc.on('detail-title', this.titleHandler)
     ipc.on('detail-edit', this.editHandler)
     ipc.on('detail-preview', this.previewHandler)
+    ipc.on('config-apply', this.configApplyHandler)
   }
 
   componentWillUnmount () {
@@ -123,6 +132,12 @@ export default class ArticleDetail extends React.Component {
     }
   }
 
+  handleConfigApply (e, config) {
+    this.setState({
+      fontFamily: config['editor-font-family']
+    })
+  }
+
   renderEmpty () {
     return (
       <div className='ArticleDetail empty'>
@@ -309,6 +324,9 @@ export default class ArticleDetail extends React.Component {
                 ref='title'
                 value={activeArticle.title}
                 onChange={e => this.handleTitleChange(e)}
+                style={{
+                  fontFamily: this.state.fontFamily
+                }}
               />
             </div>
             <ModeSelect

browser/main/HomePage/ArticleTopBar.js

@@ -231,8 +231,8 @@ export default class ArticleTopBar extends React.Component {
                   <ExternalLink className='ArticleTopBar-right-links-button-dropdown-item' href='https://b00st.io'>
                     <i className='fa fa-fw fa-home'/>Boost official page
                   </ExternalLink>
-                  <ExternalLink className='ArticleTopBar-right-links-button-dropdown-item' href='https://github.com/BoostIO/boost-app-discussions/issues'>
+                  <ExternalLink className='ArticleTopBar-right-links-button-dropdown-item' href='https://github.com/BoostIO/Boostnote/issues'>
-                    <i className='fa fa-fw fa-bullhorn'/> Discuss
+                    <i className='fa fa-fw fa-github'/> Issues
                   </ExternalLink>
                 </div>
               )

browser/main/MainPage.js

@@ -19,9 +19,27 @@ export default class MainContainer extends React.Component {
     ipc.send('update-app', 'Deal with it.')
   }
 
+  handleWheel (e) {
+    if (e.ctrlKey && global.process.platform !== 'darwin') {
+      if (window.document.body.style.zoom == null) {
+        window.document.body.style.zoom = 1
+      }
+
+      let zoom = Number(window.document.body.style.zoom)
+      if (e.deltaY > 0 && zoom < 4) {
+        document.body.style.zoom = zoom + 0.05
+      } else if (e.deltaY < 0 && zoom > 0.5) {
+        document.body.style.zoom = zoom - 0.05
+      }
+    }
+  }
+
   render () {
     return (
-      <div className='Main'>
+      <div
+        className='Main'
+        onWheel={(e) => this.handleWheel(e)}
+      >
         {this.state.updateAvailable ? (
         <button onClick={this.updateApp} className='appUpdateButton'><i className='fa fa-cloud-download'/> Update available!</button>
         ) : null}

browser/main/index.js

@@ -5,7 +5,7 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 require('../styles/main/index.styl')
 import { openModal } from 'browser/lib/modal'
-import Tutorial from './modal/Tutorial'
+import OSSAnnounceModal from './modal/OSSAnnounceModal'
 import activityRecord from 'browser/lib/activityRecord'
 const electron = require('electron')
 const ipc = electron.ipcRenderer
@@ -59,9 +59,10 @@ ReactDOM.render((
   loadingCover.parentNode.removeChild(loadingCover)
   let status = JSON.parse(localStorage.getItem('status'))
   if (status == null) status = {}
-  if (!status.introWatched) {
+
-    openModal(Tutorial)
+  if (!status.ossAnnounceWatched) {
-    status.introWatched = true
+    openModal(OSSAnnounceModal)
+    status.ossAnnounceWatched = true
     localStorage.setItem('status', JSON.stringify(status))
   }
 })

browser/main/modal/OSSAnnounceModal.js

@@ -0,0 +1,29 @@
+import React, { PropTypes } from 'react'
+import ExternalLink from 'browser/components/ExternalLink'
+
+export default class OSSAnnounceModal extends React.Component {
+  handleCloseBtnClick (e) {
+    this.props.close()
+  }
+  render () {
+    return (
+      <div className='OSSAnnounceModal modal'>
+
+        <div className='OSSAnnounceModal-title'>Boostnote has been Open-sourced</div>
+
+        <ExternalLink className='OSSAnnounceModal-link' href='https://github.com/BoostIO/Boostnote'>
+          https://github.com/BoostIO/Boostnote
+        </ExternalLink>
+
+        <button
+          className='OSSAnnounceModal-closeBtn'
+          onClick={(e) => this.handleCloseBtnClick(e)}
+        >Close</button>
+      </div>
+    )
+  }
+}
+
+OSSAnnounceModal.propTypes = {
+  close: PropTypes.func
+}

browser/main/modal/Preference/ContactTab.js

@@ -1,122 +1,23 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import clientKey from 'browser/lib/clientKey'
 import linkState from 'browser/lib/linkState'
-import _ from 'lodash'
+import ExternalLink from 'browser/components/ExternalLink'
-import { request, SERVER_URL } from 'browser/lib/api'
-
-const FORM_MODE = 'FORM_MODE'
-const DONE_MODE = 'DONE_MODE'
 
 export default class ContactTab extends React.Component {
-  constructor (props) {
-    super(props)
-
-    this.state = {
-      title: '',
-      content: '',
-      email: '',
-      mode: FORM_MODE,
-      alert: null
-    }
-  }
-
   componentDidMount () {
     let titleInput = ReactDOM.findDOMNode(this.refs.title)
     if (titleInput != null) titleInput.focus()
   }
 
-  handleBackButtonClick (e) {
-    this.setState({
-      mode: FORM_MODE
-    })
-  }
-
-  handleSendButtonClick (e) {
-    let input = _.pick(this.state, ['title', 'content', 'email'])
-    input.clientKey = clientKey.get()
-
-    this.setState({
-      alert: {
-        type: 'info',
-        message: 'Sending...'
-      }
-    }, () => {
-      request.post(SERVER_URL + 'apis/inquiry')
-        .send(input)
-        .then(res => {
-          console.log('sent')
-          this.setState({
-            title: '',
-            content: '',
-            mode: DONE_MODE,
-            alert: null
-          })
-        })
-        .catch(err => {
-          if (err.code === 'ECONNREFUSED') {
-            this.setState({
-              alert: {
-                type: 'error',
-                message: 'Can\'t connect to API server.'
-              }
-            })
-          } else {
-            console.error(err)
-            this.setState({
-              alert: {
-                type: 'error',
-                message: err.message
-              }
-            })
-          }
-        })
-    })
-  }
-
   render () {
-    switch (this.state.mode) {
-      case DONE_MODE:
     return (
-          <div className='ContactTab content done'>
+      <div className='ContactTab content'>
-            <div className='message'>
+        <div className='title'>Contact</div>
-              <i className='checkIcon fa fa-check-circle'/><br/>
+        <p>
-              Your message has been sent successfully!!
+          - Issues: <ExternalLink href='https://github.com/BoostIO/Boostnote/issues'>https://github.com/BoostIO/Boostnote/issues</ExternalLink>
-            </div>
+        </p>
-            <div className='control'>
-              <button onClick={e => this.handleBackButtonClick(e)}>Back to Contact form</button>
-            </div>
       </div>
     )
-      case FORM_MODE:
-      default:
-        let alertElement = this.state.alert != null
-          ? (
-            <div className={'alert ' + this.state.alert.type}>{this.state.alert.message}</div>
-          )
-          : null
-        return (
-          <div className='ContactTab content form'>
-            <div className='title'>Contact form</div>
-            <div className='description'>
-              Your feedback is highly appreciated and will help us to improve our app. :D
-            </div>
-            <div className='iptGroup'>
-              <input ref='title' valueLink={this.linkState('title')} placeholder='Title' type='text'/>
-            </div>
-            <div className='iptGroup'>
-              <textarea valueLink={this.linkState('content')} placeholder='Content'/>
-            </div>
-            <div className='iptGroup'>
-              <input valueLink={this.linkState('email')} placeholder='E-mail (Optional)' type='email'/>
-            </div>
-            <div className='formControl'>
-              <button onClick={e => this.handleSendButtonClick(e)} className='primary'>Send</button>
-              {alertElement}
-            </div>
-          </div>
-        )
-    }
   }
 }
 

browser/styles/main/ArticleDetail.styl

@@ -257,9 +257,10 @@ infoButton()
           width 150px
           max-height 150px
           background-color white
-          z-index 5
+          z-index 50
           border 1px solid borderColor
           border-radius 5px
+          overflow-y auto
           &>button
             width 100%
             display block

browser/styles/main/ArticleList.styl

@@ -16,7 +16,7 @@ articleItemColor = #777
     .ArticleList-item
       border solid 2px transparent
       position relative
-      height 110px
+      min-height 110px
       width 100%
       cursor pointer
       transition 0.1s
@@ -68,18 +68,27 @@ articleItemColor = #777
           code
             font-family Monaco, Menlo, 'Ubuntu Mono', Consolas, source-code-pro, monospace
       .ArticleList-item-bottom
-        overflow-x auto
+        padding-bottom 5px
-        white-space nowrap
-        padding-top 6px
         .tags
           color articleItemColor
+          line-height 18px
+          word-wrap break-word
+          clearfix()
+          i.fa-tags
+            display inline
+            float left
+            padding 2px 2px 0 0
             height 14px
+            line-height 13px
           a
             background-color brandColor
+            float left
             color white
             border-radius 2px
             padding 1px 5px
             margin 2px
+            height 14px
+            line-height 13px
             font-size 10px
             opacity 0.8
             &:hover

browser/styles/main/index.styl

@@ -126,3 +126,28 @@ textarea.block-input
       margin-left -107px
     &:hover .tooltip
       opacity 1
+
+.OSSAnnounceModal
+  height 250
+  text-align center
+  .OSSAnnounceModal-title
+    font-size 32px
+    padding 45px 0
+
+  .OSSAnnounceModal-link
+    display block
+    font-size 20px
+    margin 25px 0 65px
+  .OSSAnnounceModal-closeBtn
+    display block
+    margin 0 auto
+    border none
+    border-radius 5px
+    width 150px
+    height 33px
+    background-color brandColor
+    color white
+    opacity 0.7
+    &:hover
+      opacity 1
+      background-color lighten(brandColor, 10%)

browser/styles/main/modal/Preferences.styl

@@ -177,69 +177,14 @@ iptFocusBorderColor = #369DCD
         color errorTextColor
         background-color errorBackgroundColor
     &.ContactTab
-      &.done
-        .message
-          margin-top 75px
-          margin-bottom 15px
-          text-align center
-          font-size 22px
-          .checkIcon
-            margin-bottom 15px
-            font-size 144px
-            color brandColor
-            text-align center
-        .control
-          text-align center
-          button
-            border solid 1px borderColor
-            border-radius 5px
-            background-color white
-            padding 15px 15px
-            font-size 14px
-            &:hover
-              background-color darken(white, 10%)
-      &.form
       padding 10px
       .title
         font-size 18px
         color brandColor
         margin-top 10px
         margin-bottom 10px
-        .description
+      p
-          margin-bottom 15px
+        line-height 2
-        .iptGroup
-          margin-bottom 10px
-          input, textarea
-            border-radius 5px
-            border 1px solid borderColor
-            font-size 14px
-            outline none
-            padding 10px 15px
-            width 100%
-            &:focus
-              border-color iptFocusBorderColor
-          textarea
-            resize vertical
-            min-height 150px
-        .formControl
-          clearfix()
-          .alert
-            float right
-            padding 10px 15px
-            margin 0 5px 0
-            font-size 14px
-            line-height normal
-          button
-            padding 10px 15px
-            background-color brandColor
-            color white
-            font-size 14px
-            border-radius 5px
-            border none
-            float right
-            &:hover
-              background-color lighten(brandColor, 10%)
-
     &.AppSettingTab
       .description
         marked()

contributing.md

@@ -0,0 +1,35 @@
+# Contributing to Boostnote
+
+> English below.
+
+## About Pull Request
+
+### やり方
+
+現状特に`dev`ブランチを用意しないつもりなので、最新VersionのブランチにPullrequestを送ってください。
+
+### Pull requsetの著作権
+
+Pull requestをすることはその変化分のコードの著作権をMAISIN&CO.に譲渡することに同意することになります。
+
+アプリケーションのLicenseのをいつでも変える選択肢を残したいからです。
+しかし、これはいずれかBoostnoteが有料の商用アプリになる可能性がある話ではありません。
+もし、このアプリケーションで金を稼ごうとするならBoostnote専用のCloud storageの提供やMobile appとの連動、何か特殊なプレミアム機能の提供など形になると思います。
+現在考えられているのは、GPL v3の場合、他のライセンスとの互換が不可能であるため、もしより自由なLicense(BSD, MIT)に変える時に改めて著作権者としてライセンスし直す選択肢を残したいぐらいのイメージです。
+
+---
+
+# Contributing to Boostnote(ENG)
+
+## About Pull Request
+
+### How to
+
+Make a new PR to the branch named latest version. This is because there is no `dev` branch currently.
+
+### Copyright of Pull Request
+
+If you make a pull request, It means you agree to transfer the copyright of the code changes to MAISIN&CO.
+
+It doesn't mean Boostnote will become a paid app. If we want to earn some money, We will try other way, which is some kind of cloud storage, Mobile app integration or some SPECIAL features.
+Because GPL v3 is too strict to be compatible with any other License, We thought this is needed to replace the license with much freer one(like BSD, MIT) somewhen.

lib/finder-window.js

@@ -79,12 +79,12 @@ var config = {
   show: false,
   frame: false,
   resizable: false,
-  'zoom-factor': 1.0,
+  zoomFactor: 1.0,
-  'web-preferences': {
+  webPreferences: {
-    'overlay-scrollbars': true,
+    blinkFeatures: 'OverlayScrollbars'
-    'skip-taskbar': true
   },
-  'standard-window': false
+  skipTaskbar: true,
+  standardWindow: false
 }
 
 if (process.platform === 'darwin') {

lib/finder.html

@@ -39,7 +39,7 @@
     var scriptEl=document.createElement('script')
     scriptEl.setAttribute("type","text/javascript")
     scriptEl.setAttribute("src", scriptUrl)
-    document.getElementsByTagName("head")[0].appendChild(scriptEl)
+    document.body.appendChild(scriptEl)
   </script>
 </body>
 </html>

lib/hotkey.js

@@ -67,7 +67,7 @@ function toggleMain () {
       mainWindow.minimize()
       mainWindow.restore()
     }
-    mainWindow.webContents.send('list-focus')
+    mainWindow.webContents.send('top-focus-search')
   }
 }
 
@@ -114,4 +114,3 @@ ipc.on('hotkeyUpdated', function (event, newKeymap) {
   globalShortcut.unregisterAll()
   registerAllKeys()
 })
-

lib/main-window.js

@@ -6,11 +6,11 @@ const path = require('path')
 var mainWindow = new BrowserWindow({
   width: 1080,
   height: 720,
-  'zoom-factor': 1.0,
+  zoomFactor: 1.0,
-  'web-preferences': {
+  webPreferences: {
-    'overlay-scrollbars': true
+    blinkFeatures: 'OverlayScrollbars'
   },
-  'standard-window': false
+  standardWindow: false
 })
 
 const url = path.resolve(__dirname, './main.html')

lib/main.html

@@ -68,7 +68,7 @@
     var scriptEl = document.createElement('script')
     scriptEl.setAttribute("type","text/javascript")
     scriptEl.setAttribute("src", scriptUrl)
-    document.getElementsByTagName("head")[0].appendChild(scriptEl)
+    document.body.appendChild(scriptEl)
   </script>
 </body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "boost",
-  "version": "0.5.4",
+  "version": "0.5.7",
   "description": "Boostnote",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "webpack": "webpack-dev-server --hot --inline --config webpack.config.js"
   },
   "config": {
-    "electron-version": "0.35.4"
+    "electron-version": "0.36.11"
   },
   "repository": {
     "type": "git",
@@ -56,7 +56,7 @@
     "babel-preset-react-hmre": "^1.0.1",
     "css-loader": "^0.19.0",
     "electron-packager": "^5.1.0",
-    "electron-prebuilt": "^0.35.1",
+    "electron-prebuilt": "^0.36.11",
     "electron-release": "^2.2.0",
     "grunt": "^0.4.5",
     "grunt-electron-installer": "^1.2.0",

readme.md

@@ -1,8 +1,23 @@
 # Boostnote
 
-Hack your memory
+Simple note app
 
-## Develope
+## Progress Kanban
+
+https://trello.com/b/wJlinZJx/boostnote-todo-list
+
+This is a public Kanban board. Also everyone can comment here.
+
+If you want to join us, ask me to add you.
+
+## Live coding
+
+I've been broadcasting my work. You can check it from the below links. :smile:
+
+- [Live Stream](https://www.livecoding.tv/rokt33r/videos/)
+- [Recorded Videos](https://www.livecoding.tv/rokt33r/videos/)
+
+## Develop
 
 1. turn on HMR server
 
@@ -18,8 +33,12 @@ npm run hot
 
 > `npm start` is using compiled scripts. see [Build](#Build) to compile scripts.
 
+
 ## Build
 
+> '3. Codesign' and '4. Create' installer are needed to deploy this app.
+> You can skip these steps.
+
 1. Compile scripts
 
 compile all browser stuff(Javascript, Stylus).
@@ -78,15 +97,18 @@ grunt zip:osx
 - Webpack
 ... check [`package.json`](./package.json)
 
+
 ## Codestyle
 
 [![js-standard-style](https://cdn.rawgit.com/feross/standard/master/badge.svg)](https://github.com/feross/standard)
 
 ## Author
 
-[Rokt33r(Dick Choi)](https://github.com/rokt33r)
+[Rokt33r(Dick Choi of MAISIN&CO.)](https://github.com/rokt33r)
 
-## License
+## Copyright & License
+
+Copyright (C) 2016 MAISIN&CO.
 
 [Check here](./LICENSE).