this.handleRightSlideMouseDown(e)}
+ x)(CSSModules(Main, styles))
+export default connect(x => x)(CSSModules(Main, styles))
diff --git a/browser/main/NewNoteButton/NewNoteButton.styl b/browser/main/NewNoteButton/NewNoteButton.styl
index 81ff7e8d..e8e4b5f0 100644
--- a/browser/main/NewNoteButton/NewNoteButton.styl
+++ b/browser/main/NewNoteButton/NewNoteButton.styl
@@ -74,4 +74,8 @@ body[data-theme="dark"]
body[data-theme="solarized-dark"]
.root, .root--expanded
- background-color $ui-solarized-dark-noteList-backgroundColor
\ No newline at end of file
+ background-color $ui-solarized-dark-noteList-backgroundColor
+
+body[data-theme="monokai"]
+ .root, .root--expanded
+ background-color $ui-monokai-noteList-backgroundColor
diff --git a/browser/main/NewNoteButton/index.js b/browser/main/NewNoteButton/index.js
index 633433df..85dc7f40 100644
--- a/browser/main/NewNoteButton/index.js
+++ b/browser/main/NewNoteButton/index.js
@@ -6,6 +6,7 @@ import _ from 'lodash'
import modal from 'browser/main/lib/modal'
import NewNoteModal from 'browser/main/modals/NewNoteModal'
import eventEmitter from 'browser/main/lib/eventEmitter'
+import i18n from 'browser/lib/i18n'
const { remote } = require('electron')
const { dialog } = remote
@@ -33,14 +34,15 @@ class NewNoteButton extends React.Component {
}
handleNewNoteButtonClick (e) {
- const { location, dispatch } = this.props
+ const { location, dispatch, config } = this.props
const { storage, folder } = this.resolveTargetFolder()
modal.open(NewNoteModal, {
storage: storage.key,
folder: folder.key,
dispatch,
- location
+ location,
+ config
})
}
@@ -56,9 +58,9 @@ class NewNoteButton extends React.Component {
}
}
- if (storage == null) this.showMessageBox('No storage to create a note')
+ if (storage == null) this.showMessageBox(i18n.__('No storage to create a note'))
const folder = _.find(storage.folders, {key: params.folderKey}) || storage.folders[0]
- if (folder == null) this.showMessageBox('No folder to create a note')
+ if (folder == null) this.showMessageBox(i18n.__('No folder to create a note'))
return {
storage,
@@ -86,7 +88,7 @@ class NewNoteButton extends React.Component {
onClick={(e) => this.handleNewNoteButtonClick(e)}>
- Make a note {OSX ? '⌘' : 'Ctrl'} + N
+ {i18n.__('Make a note')} {OSX ? '⌘' : i18n.__('Ctrl')} + N
diff --git a/browser/main/NoteList/NoteList.styl b/browser/main/NoteList/NoteList.styl
index 312f5143..ea261208 100644
--- a/browser/main/NoteList/NoteList.styl
+++ b/browser/main/NoteList/NoteList.styl
@@ -113,4 +113,28 @@ body[data-theme="solarized-dark"]
.control-button--active
color $ui-solarized-dark-text-color
&:active
- color $ui-solarized-dark-text-color
\ No newline at end of file
+ color $ui-solarized-dark-text-color
+
+body[data-theme="monokai"]
+ .root
+ border-color $ui-monokai-borderColor
+ background-color $ui-monokai-noteList-backgroundColor
+
+ .control
+ background-color $ui-monokai-noteList-backgroundColor
+ border-color $ui-monokai-borderColor
+
+ .control-sortBy-select
+ &:hover
+ transition 0.2s
+ color $ui-monokai-text-color
+
+ .control-button
+ color $ui-monokai-inactive-text-color
+ &:hover
+ color $ui-monokai-text-color
+
+ .control-button--active
+ color $ui-monokai-text-color
+ &:active
+ color $ui-monokai-text-color
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 8adaf1a0..f7dd0764 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -1,11 +1,14 @@
+/* global electron */
import PropTypes from 'prop-types'
import React from 'react'
import CSSModules from 'browser/lib/CSSModules'
+import debounceRender from 'react-debounce-render'
import styles from './NoteList.styl'
import moment from 'moment'
import _ from 'lodash'
import ee from 'browser/main/lib/eventEmitter'
import dataApi from 'browser/main/lib/dataApi'
+import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
import ConfigManager from 'browser/main/lib/ConfigManager'
import NoteItem from 'browser/components/NoteItem'
import NoteItemSimple from 'browser/components/NoteItemSimple'
@@ -13,10 +16,16 @@ import searchFromNotes from 'browser/lib/search'
import fs from 'fs'
import path from 'path'
import { hashHistory } from 'react-router'
+import copy from 'copy-to-clipboard'
import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
+import Markdown from '../../lib/markdown'
+import i18n from 'browser/lib/i18n'
+import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
+import context from 'browser/lib/context'
const { remote } = require('electron')
-const { Menu, MenuItem, dialog } = remote
+const { dialog } = remote
+const WP_POST_PATH = '/wp/v2/posts'
function sortByCreatedAt (a, b) {
return new Date(b.createdAt) - new Date(a.createdAt)
@@ -31,7 +40,7 @@ function sortByUpdatedAt (a, b) {
}
function findNoteByKey (notes, noteKey) {
- return notes.find((note) => `${note.storage}-${note.key}` === noteKey)
+ return notes.find((note) => note.key === noteKey)
}
function findNotesByKeys (notes, noteKeys) {
@@ -39,7 +48,7 @@ function findNotesByKeys (notes, noteKeys) {
}
function getNoteKey (note) {
- return `${note.storage}-${note.key}`
+ return note.key
}
class NoteList extends React.Component {
@@ -66,6 +75,11 @@ class NoteList extends React.Component {
this.deleteNote = this.deleteNote.bind(this)
this.focusNote = this.focusNote.bind(this)
this.pinToTop = this.pinToTop.bind(this)
+ this.getNoteStorage = this.getNoteStorage.bind(this)
+ this.getNoteFolder = this.getNoteFolder.bind(this)
+ this.getViewType = this.getViewType.bind(this)
+ this.restoreNote = this.restoreNote.bind(this)
+ this.copyNoteLink = this.copyNoteLink.bind(this)
// TODO: not Selected noteKeys but SelectedNote(for reusing)
this.state = {
@@ -109,14 +123,27 @@ class NoteList extends React.Component {
componentDidUpdate (prevProps) {
const { location } = this.props
+ const { selectedNoteKeys } = this.state
+ const visibleNoteKeys = this.notes.map(note => note.key)
+ const note = this.notes[0]
+ const prevKey = prevProps.location.query.key
+ const noteKey = visibleNoteKeys.includes(prevKey) ? prevKey : note && note.key
- if (this.notes.length > 0 && location.query.key == null) {
+ if (note && location.query.key == null) {
const { router } = this.context
if (!location.pathname.match(/\/searched/)) this.contextNotes = this.getContextNotes()
+
+ // A visible note is an active note
+ if (!selectedNoteKeys.includes(noteKey)) {
+ if (selectedNoteKeys.length === 1) selectedNoteKeys.pop()
+ selectedNoteKeys.push(noteKey)
+ ee.emit('list:moved')
+ }
+
router.replace({
pathname: location.pathname,
query: {
- key: this.notes[0].storage + '-' + this.notes[0].key
+ key: noteKey
}
})
return
@@ -169,9 +196,8 @@ class NoteList extends React.Component {
if (this.notes == null || this.notes.length === 0) {
return
}
- let { router } = this.context
- let { location } = this.props
- let { selectedNoteKeys, shiftKeyDown } = this.state
+ let { selectedNoteKeys } = this.state
+ const { shiftKeyDown } = this.state
let targetIndex = this.getTargetIndex()
@@ -197,9 +223,8 @@ class NoteList extends React.Component {
if (this.notes == null || this.notes.length === 0) {
return
}
- let { router } = this.context
- let { location } = this.props
- let { selectedNoteKeys, shiftKeyDown } = this.state
+ let { selectedNoteKeys } = this.state
+ const { shiftKeyDown } = this.state
let targetIndex = this.getTargetIndex()
const isTargetLastNote = targetIndex === this.notes.length - 1
@@ -240,30 +265,40 @@ class NoteList extends React.Component {
}
handleNoteListKeyDown (e) {
- const { shiftKeyDown } = this.state
if (e.metaKey || e.ctrlKey) return true
+ // A key
if (e.keyCode === 65 && !e.shiftKey) {
e.preventDefault()
ee.emit('top:new-note')
}
+ // D key
if (e.keyCode === 68) {
e.preventDefault()
this.deleteNote()
}
+ // E key
if (e.keyCode === 69) {
e.preventDefault()
ee.emit('detail:focus')
}
- if (e.keyCode === 38) {
+ // L or S key
+ if (e.keyCode === 76 || e.keyCode === 83) {
+ e.preventDefault()
+ ee.emit('top:focus-search')
+ }
+
+ // UP or K key
+ if (e.keyCode === 38 || e.keyCode === 75) {
e.preventDefault()
this.selectPriorNote()
}
- if (e.keyCode === 40) {
+ // DOWN or J key
+ if (e.keyCode === 40 || e.keyCode === 74) {
e.preventDefault()
this.selectNextNote()
}
@@ -282,7 +317,7 @@ class NoteList extends React.Component {
getNotes () {
const { data, params, location } = this.props
- if (location.pathname.match(/\/home/) || location.pathname.match(/\alltags/)) {
+ if (location.pathname.match(/\/home/) || location.pathname.match(/alltags/)) {
const allNotes = data.noteMap.map((note) => note)
this.contextNotes = allNotes
return allNotes
@@ -295,8 +330,10 @@ class NoteList extends React.Component {
}
if (location.pathname.match(/\/searched/)) {
- const searchInputText = document.getElementsByClassName('searchInput')[0].value
- if (searchInputText === '') {
+ const searchInputText = params.searchword
+ const allNotes = data.noteMap.map((note) => note)
+ this.contextNotes = allNotes
+ if (searchInputText === undefined || searchInputText === '') {
return this.sortByPin(this.contextNotes)
}
return searchFromNotes(this.contextNotes, searchInputText)
@@ -309,11 +346,10 @@ class NoteList extends React.Component {
}
if (location.pathname.match(/\/tags/)) {
+ const listOfTags = params.tagname.split(' ')
return data.noteMap.map(note => {
return note
- }).filter(note => {
- return note.tags.includes(params.tagname)
- })
+ }).filter(note => listOfTags.every(tag => note.tags.includes(tag)))
}
return this.getContextNotes()
@@ -353,9 +389,10 @@ class NoteList extends React.Component {
}
handleNoteClick (e, uniqueKey) {
- let { router } = this.context
- let { location } = this.props
- let { shiftKeyDown, selectedNoteKeys } = this.state
+ const { router } = this.context
+ const { location } = this.props
+ let { selectedNoteKeys } = this.state
+ const { shiftKeyDown } = this.state
if (shiftKeyDown && selectedNoteKeys.includes(uniqueKey)) {
const newSelectedNoteKeys = selectedNoteKeys.filter((noteKey) => noteKey !== uniqueKey)
@@ -381,10 +418,10 @@ class NoteList extends React.Component {
}
handleSortByChange (e) {
- const { dispatch } = this.props
+ const { dispatch, params: { folderKey } } = this.props
const config = {
- sortBy: e.target.value
+ [folderKey]: { sortBy: e.target.value }
}
ConfigManager.set(config)
@@ -413,20 +450,27 @@ class NoteList extends React.Component {
if (this.notes[targetIndex].type === 'SNIPPET_NOTE') {
dialog.showMessageBox(remote.getCurrentWindow(), {
type: 'warning',
- message: 'Sorry!',
- detail: 'md/text import is available only a markdown note.',
- buttons: ['OK', 'Cancel']
+ message: i18n.__('Sorry!'),
+ detail: i18n.__('md/text import is available only a markdown note.'),
+ buttons: [i18n.__('OK'), i18n.__('Cancel')]
})
}
}
handleDragStart (e, note) {
- const { selectedNoteKeys } = this.state
+ let { selectedNoteKeys } = this.state
+ const noteKey = getNoteKey(note)
+
+ if (!selectedNoteKeys.includes(noteKey)) {
+ selectedNoteKeys = []
+ selectedNoteKeys.push(noteKey)
+ }
+
const notes = this.notes.map((note) => Object.assign({}, note))
const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)
const noteData = JSON.stringify(selectedNotes)
e.dataTransfer.setData('note', noteData)
- this.setState({ selectedNoteKeys: [] })
+ this.selectNextNote()
}
handleNoteContextMenu (e, uniqueKey) {
@@ -439,45 +483,106 @@ class NoteList extends React.Component {
this.handleNoteClick(e, uniqueKey)
}
- const pinLabel = note.isPinned ? 'Remove pin' : 'Pin to Top'
- const deleteLabel = 'Delete Note'
+ const pinLabel = note.isPinned ? i18n.__('Remove pin') : i18n.__('Pin to Top')
+ const deleteLabel = i18n.__('Delete Note')
+ const cloneNote = i18n.__('Clone Note')
+ const restoreNote = i18n.__('Restore Note')
+ const copyNoteLink = i18n.__('Copy Note Link')
+ const publishLabel = i18n.__('Publish Blog')
+ const updateLabel = i18n.__('Update Blog')
+ const openBlogLabel = i18n.__('Open Blog')
- const menu = new Menu()
- if (!location.pathname.match(/\/home|\/starred|\/trash/)) {
- menu.append(new MenuItem({
- label: pinLabel,
- click: this.pinToTop
- }))
+ const templates = []
+
+ if (location.pathname.match(/\/trash/)) {
+ templates.push({
+ label: restoreNote,
+ click: this.restoreNote
+ }, {
+ label: deleteLabel,
+ click: this.deleteNote
+ })
+ } else {
+ if (!location.pathname.match(/\/starred/)) {
+ templates.push({
+ label: pinLabel,
+ click: this.pinToTop
+ })
+ }
+ templates.push({
+ label: deleteLabel,
+ click: this.deleteNote
+ }, {
+ label: cloneNote,
+ click: this.cloneNote.bind(this)
+ }, {
+ label: copyNoteLink,
+ click: this.copyNoteLink(note)
+ })
+ if (note.type === 'MARKDOWN_NOTE') {
+ if (note.blog && note.blog.blogLink && note.blog.blogId) {
+ templates.push({
+ label: updateLabel,
+ click: this.publishMarkdown.bind(this)
+ }, {
+ label: openBlogLabel,
+ click: () => this.openBlog.bind(this)(note)
+ })
+ } else {
+ templates.push({
+ label: publishLabel,
+ click: this.publishMarkdown.bind(this)
+ })
+ }
+ }
}
- menu.append(new MenuItem({
- label: deleteLabel,
- click: this.deleteNote
- }))
- menu.popup()
+ context.popup(templates)
}
- pinToTop () {
+ updateSelectedNotes (updateFunc, cleanSelection = true) {
const { selectedNoteKeys } = this.state
const { dispatch } = this.props
const notes = this.notes.map((note) => Object.assign({}, note))
const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)
+ if (!_.isFunction(updateFunc)) {
+ console.warn('Update function is not defined. No update will happen')
+ updateFunc = (note) => { return note }
+ }
+
Promise.all(
- selectedNotes.map((note) => {
- note.isPinned = !note.isPinned
- return dataApi
- .updateNote(note.storage, note.key, note)
- })
- )
- .then((updatedNotes) => {
- updatedNotes.forEach((note) => {
- dispatch({
- type: 'UPDATE_NOTE',
- note
+ selectedNotes.map((note) => {
+ note = updateFunc(note)
+ return dataApi
+ .updateNote(note.storage, note.key, note)
})
- })
+ )
+ .then((updatedNotes) => {
+ updatedNotes.forEach((note) => {
+ dispatch({
+ type: 'UPDATE_NOTE',
+ note
+ })
+ })
+ })
+
+ if (cleanSelection) {
+ this.selectNextNote()
+ }
+ }
+
+ pinToTop () {
+ this.updateSelectedNotes((note) => {
+ note.isPinned = !note.isPinned
+ return note
+ })
+ }
+
+ restoreNote () {
+ this.updateSelectedNotes((note) => {
+ note.isTrashed = false
+ return note
})
- this.setState({ selectedNoteKeys: [] })
}
deleteNote () {
@@ -486,22 +591,15 @@ class NoteList extends React.Component {
const notes = this.notes.map((note) => Object.assign({}, note))
const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)
const firstNote = selectedNotes[0]
+ const { confirmDeletion } = this.props.config.ui
if (firstNote.isTrashed) {
- const noteExp = selectedNotes.length > 1 ? 'notes' : 'note'
- const dialogueButtonIndex = dialog.showMessageBox(remote.getCurrentWindow(), {
- type: 'warning',
- message: 'Confirm note deletion',
- detail: `This will permanently remove ${selectedNotes.length} ${noteExp}.`,
- buttons: ['Confirm', 'Cancel']
- })
- if (dialogueButtonIndex === 1) return
+ if (!confirmDeleteNote(confirmDeletion, true)) return
+
Promise.all(
- selectedNoteKeys.map((uniqueKey) => {
- const storageKey = uniqueKey.split('-')[0]
- const noteKey = uniqueKey.split('-')[1]
+ selectedNotes.map((note) => {
return dataApi
- .deleteNote(storageKey, noteKey)
+ .deleteNote(note.storage, note.key)
})
)
.then((data) => {
@@ -518,6 +616,8 @@ class NoteList extends React.Component {
})
console.log('Notes were all deleted')
} else {
+ if (!confirmDeleteNote(confirmDeletion, false)) return
+
Promise.all(
selectedNotes.map((note) => {
note.isTrashed = true
@@ -543,6 +643,157 @@ class NoteList extends React.Component {
this.setState({ selectedNoteKeys: [] })
}
+ cloneNote () {
+ const { selectedNoteKeys } = this.state
+ const { dispatch, location } = this.props
+ const { storage, folder } = this.resolveTargetFolder()
+ const notes = this.notes.map((note) => Object.assign({}, note))
+ const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)
+ const firstNote = selectedNotes[0]
+ const eventName = firstNote.type === 'MARKDOWN_NOTE' ? 'ADD_MARKDOWN' : 'ADD_SNIPPET'
+
+ AwsMobileAnalyticsConfig.recordDynamicCustomEvent(eventName)
+ AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
+ dataApi
+ .createNote(storage.key, {
+ type: firstNote.type,
+ folder: folder.key,
+ title: firstNote.title + ' ' + i18n.__('copy'),
+ content: firstNote.content
+ })
+ .then((note) => {
+ attachmentManagement.cloneAttachments(firstNote, note)
+ return note
+ })
+ .then((note) => {
+ dispatch({
+ type: 'UPDATE_NOTE',
+ note: note
+ })
+
+ this.setState({
+ selectedNoteKeys: [note.key]
+ })
+
+ hashHistory.push({
+ pathname: location.pathname,
+ query: {key: note.key}
+ })
+ })
+ }
+
+ copyNoteLink (note) {
+ const noteLink = `[${note.title}](:note:${note.key})`
+ return copy(noteLink)
+ }
+
+ save (note) {
+ const { dispatch } = this.props
+ dataApi
+ .updateNote(note.storage, note.key, note)
+ .then((note) => {
+ dispatch({
+ type: 'UPDATE_NOTE',
+ note: note
+ })
+ })
+ }
+
+ publishMarkdown () {
+ if (this.pendingPublish) {
+ clearTimeout(this.pendingPublish)
+ }
+ this.pendingPublish = setTimeout(() => {
+ this.publishMarkdownNow()
+ }, 1000)
+ }
+
+ publishMarkdownNow () {
+ const {selectedNoteKeys} = this.state
+ const notes = this.notes.map((note) => Object.assign({}, note))
+ const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)
+ const firstNote = selectedNotes[0]
+ const config = ConfigManager.get()
+ const {address, token, authMethod, username, password} = config.blog
+ let authToken = ''
+ if (authMethod === 'USER') {
+ authToken = `Basic ${window.btoa(`${username}:${password}`)}`
+ } else {
+ authToken = `Bearer ${token}`
+ }
+ const contentToRender = firstNote.content.replace(`# ${firstNote.title}`, '')
+ const markdown = new Markdown()
+ const data = {
+ title: firstNote.title,
+ content: markdown.render(contentToRender),
+ status: 'publish'
+ }
+
+ let url = ''
+ let method = ''
+ if (firstNote.blog && firstNote.blog.blogId) {
+ url = `${address}${WP_POST_PATH}/${firstNote.blog.blogId}`
+ method = 'PUT'
+ } else {
+ url = `${address}${WP_POST_PATH}`
+ method = 'POST'
+ }
+ // eslint-disable-next-line no-undef
+ fetch(url, {
+ method: method,
+ body: JSON.stringify(data),
+ headers: {
+ 'Authorization': authToken,
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => res.json())
+ .then(response => {
+ if (_.isNil(response.link) || _.isNil(response.id)) {
+ return Promise.reject()
+ }
+ firstNote.blog = {
+ blogLink: response.link,
+ blogId: response.id
+ }
+ this.save(firstNote)
+ this.confirmPublish(firstNote)
+ })
+ .catch((error) => {
+ console.error(error)
+ this.confirmPublishError()
+ })
+ }
+
+ confirmPublishError () {
+ const { remote } = electron
+ const { dialog } = remote
+ const alertError = {
+ type: 'warning',
+ message: i18n.__('Publish Failed'),
+ detail: i18n.__('Check and update your blog setting and try again.'),
+ buttons: [i18n.__('Confirm')]
+ }
+ dialog.showMessageBox(remote.getCurrentWindow(), alertError)
+ }
+
+ confirmPublish (note) {
+ const buttonIndex = dialog.showMessageBox(remote.getCurrentWindow(), {
+ type: 'warning',
+ message: i18n.__('Publish Succeeded'),
+ detail: `${note.title} is published at ${note.blog.blogLink}`,
+ buttons: [i18n.__('Confirm'), i18n.__('Open Blog')]
+ })
+
+ if (buttonIndex === 1) {
+ this.openBlog(note)
+ }
+ }
+
+ openBlog (note) {
+ const { shell } = electron
+ shell.openExternal(note.blog.blogLink)
+ }
+
importFromFile () {
const options = {
filters: [
@@ -635,19 +886,39 @@ class NoteList extends React.Component {
dialog.showMessageBox(remote.getCurrentWindow(), {
type: 'warning',
message: message,
- buttons: ['OK']
+ buttons: [i18n.__('OK')]
})
}
+ getNoteStorage (note) { // note.storage = storage key
+ return this.props.data.storageMap.toJS()[note.storage]
+ }
+
+ getNoteFolder (note) { // note.folder = folder key
+ return _.find(this.getNoteStorage(note).folders, ({ key }) => key === note.folder)
+ }
+
+ getViewType () {
+ const { pathname } = this.props.location
+ const folder = /\/folders\/[a-zA-Z0-9]+/.test(pathname)
+ const storage = /\/storages\/[a-zA-Z0-9]+/.test(pathname) && !folder
+ const allNotes = pathname === '/home'
+ if (allNotes) return 'ALL'
+ if (folder) return 'FOLDER'
+ if (storage) return 'STORAGE'
+ }
+
render () {
- let { location, notes, config, dispatch } = this.props
- let { selectedNoteKeys } = this.state
- let sortFunc = config.sortBy === 'CREATED_AT'
+ const { location, config, params: { folderKey } } = this.props
+ let { notes } = this.props
+ const { selectedNoteKeys } = this.state
+ const sortBy = _.get(config, [folderKey, 'sortBy'], config.sortBy.default)
+ const sortFunc = sortBy === 'CREATED_AT'
? sortByCreatedAt
- : config.sortBy === 'ALPHABETICAL'
+ : sortBy === 'ALPHABETICAL'
? sortByAlphabetical
: sortByUpdatedAt
- const sortedNotes = location.pathname.match(/\/home|\/starred|\/trash/)
+ const sortedNotes = location.pathname.match(/\/starred|\/trash/)
? this.getNotes().sort(sortFunc)
: this.sortByPin(this.getNotes().sort(sortFunc))
this.notes = notes = sortedNotes.filter((note) => {
@@ -655,7 +926,7 @@ class NoteList extends React.Component {
if (note.isTrashed !== true || location.pathname === '/trashed') return true
})
- moment.locale('en', {
+ moment.updateLocale('en', {
relativeTime: {
future: 'in %s',
past: '%s ago',
@@ -674,20 +945,30 @@ class NoteList extends React.Component {
}
})
+ const viewType = this.getViewType()
+
+ const autoSelectFirst =
+ notes.length === 1 ||
+ selectedNoteKeys.length === 0 ||
+ notes.every(note => !selectedNoteKeys.includes(note.key))
+
const noteList = notes
- .map(note => {
+ .map((note, index) => {
if (note == null) {
return null
}
const isDefault = config.listStyle === 'DEFAULT'
const uniqueKey = getNoteKey(note)
- const isActive = selectedNoteKeys.includes(uniqueKey)
+
+ const isActive =
+ selectedNoteKeys.includes(uniqueKey) ||
+ notes.length === 1 ||
+ (autoSelectFirst && index === 0)
const dateDisplay = moment(
- config.sortBy === 'CREATED_AT'
+ sortBy === 'CREATED_AT'
? note.createdAt : note.updatedAt
).fromNow('D')
- const key = `${note.storage}-${note.key}`
if (isDefault) {
return (
@@ -700,6 +981,9 @@ class NoteList extends React.Component {
handleNoteClick={this.handleNoteClick.bind(this)}
handleDragStart={this.handleDragStart.bind(this)}
pathname={location.pathname}
+ folderName={this.getNoteFolder(note).name}
+ storageName={this.getNoteStorage(note).name}
+ viewType={viewType}
/>
)
}
@@ -713,6 +997,9 @@ class NoteList extends React.Component {
handleNoteClick={this.handleNoteClick.bind(this)}
handleDragStart={this.handleDragStart.bind(this)}
pathname={location.pathname}
+ folderName={this.getNoteFolder(note).name}
+ storageName={this.getNoteStorage(note).name}
+ viewType={viewType}
/>
)
})
@@ -727,16 +1014,17 @@ class NoteList extends React.Component {
this.handleRightSlideMouseDown(e)}
draggable='false'
>
- Make a note {OSX ? '⌘' : 'Ctrl'} + N
+ {i18n.__('Make a note')} {OSX ? '⌘' : i18n.__('Ctrl')} + N
-
-
- Notes
+ {i18n.__('Notes')}
)
diff --git a/browser/main/SideNav/PreferenceButton.js b/browser/main/SideNav/PreferenceButton.js
index 9f483a28..187171f4 100644
--- a/browser/main/SideNav/PreferenceButton.js
+++ b/browser/main/SideNav/PreferenceButton.js
@@ -2,13 +2,14 @@ import PropTypes from 'prop-types'
import React from 'react'
import CSSModules from 'browser/lib/CSSModules'
import styles from './PreferenceButton.styl'
+import i18n from 'browser/lib/i18n'
const PreferenceButton = ({
onClick
}) => (
)
diff --git a/browser/main/SideNav/PreferenceButton.styl b/browser/main/SideNav/PreferenceButton.styl
index 97a48982..54513cb6 100644
--- a/browser/main/SideNav/PreferenceButton.styl
+++ b/browser/main/SideNav/PreferenceButton.styl
@@ -48,4 +48,5 @@ body[data-theme="dark"]
line-height normal
border-radius 2px
opacity 0
- transition 0.1s
\ No newline at end of file
+ transition 0.1s
+ white-space nowrap
diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl
index a0ffb2e7..ecab70d0 100644
--- a/browser/main/SideNav/SideNav.styl
+++ b/browser/main/SideNav/SideNav.styl
@@ -30,11 +30,33 @@
display flex
flex-direction column
-.tag-title
- padding-left 15px
- padding-bottom 13px
- p
- color $ui-button-default-color
+.tag-control
+ display flex
+ height 30px
+ line-height 25px
+ overflow hidden
+ .tag-control-title
+ padding-left 15px
+ padding-bottom 13px
+ flex 1
+ p
+ color $ui-button-default-color
+ .tag-control-sortTagsBy
+ user-select none
+ font-size 12px
+ color $ui-inactive-text-color
+ margin-left 12px
+ margin-right 12px
+ .tag-control-sortTagsBy-select
+ appearance: none;
+ margin-left 5px
+ color $ui-inactive-text-color
+ padding 0
+ border none
+ background-color transparent
+ outline none
+ cursor pointer
+ font-size 12px
.tagList
overflow-y auto
@@ -95,3 +117,8 @@ body[data-theme="solarized-dark"]
.root, .root--folded
background-color $ui-solarized-dark-backgroundColor
border-right 1px solid $ui-solarized-dark-borderColor
+
+body[data-theme="monokai"]
+ .root, .root--folded
+ background-color $ui-monokai-backgroundColor
+ border-right 1px solid $ui-monokai-borderColor
diff --git a/browser/main/SideNav/StorageItem.js b/browser/main/SideNav/StorageItem.js
index bbf87306..d72f0a8f 100644
--- a/browser/main/SideNav/StorageItem.js
+++ b/browser/main/SideNav/StorageItem.js
@@ -8,46 +8,49 @@ import CreateFolderModal from 'browser/main/modals/CreateFolderModal'
import RenameFolderModal from 'browser/main/modals/RenameFolderModal'
import dataApi from 'browser/main/lib/dataApi'
import StorageItemChild from 'browser/components/StorageItem'
-import eventEmitter from 'browser/main/lib/eventEmitter'
import _ from 'lodash'
-import * as path from 'path'
+import { SortableElement } from 'react-sortable-hoc'
+import i18n from 'browser/lib/i18n'
+import context from 'browser/lib/context'
const { remote } = require('electron')
-const { Menu, MenuItem, dialog } = remote
+const { dialog } = remote
+const escapeStringRegexp = require('escape-string-regexp')
+const path = require('path')
class StorageItem extends React.Component {
constructor (props) {
super(props)
+ const { storage } = this.props
+
this.state = {
- isOpen: true
+ isOpen: !!storage.isOpen
}
}
handleHeaderContextMenu (e) {
- const menu = Menu.buildFromTemplate([
+ context.popup([
{
- label: 'Add Folder',
+ label: i18n.__('Add Folder'),
click: (e) => this.handleAddFolderButtonClick(e)
},
{
type: 'separator'
},
{
- label: 'Unlink Storage',
+ label: i18n.__('Unlink Storage'),
click: (e) => this.handleUnlinkStorageClick(e)
}
])
-
- menu.popup()
}
handleUnlinkStorageClick (e) {
const index = dialog.showMessageBox(remote.getCurrentWindow(), {
type: 'warning',
- message: 'Unlink Storage',
- detail: 'This work will just detatches a storage from Boostnote. (Any data won\'t be deleted.)',
- buttons: ['Confirm', 'Cancel']
+ message: i18n.__('Unlink Storage'),
+ detail: i18n.__('This work will just detatches a storage from Boostnote. (Any data won\'t be deleted.)'),
+ buttons: [i18n.__('Confirm'), i18n.__('Cancel')]
})
if (index === 0) {
@@ -66,8 +69,18 @@ class StorageItem extends React.Component {
}
handleToggleButtonClick (e) {
+ const { storage, dispatch } = this.props
+ const isOpen = !this.state.isOpen
+ dataApi.toggleStorage(storage.key, isOpen)
+ .then((storage) => {
+ dispatch({
+ type: 'EXPAND_STORAGE',
+ storage,
+ isOpen
+ })
+ })
this.setState({
- isOpen: !this.state.isOpen
+ isOpen: isOpen
})
}
@@ -92,23 +105,23 @@ class StorageItem extends React.Component {
}
handleFolderButtonContextMenu (e, folder) {
- const menu = Menu.buildFromTemplate([
+ context.popup([
{
- label: 'Rename Folder',
+ label: i18n.__('Rename Folder'),
click: (e) => this.handleRenameFolderClick(e, folder)
},
{
type: 'separator'
},
{
- label: 'Export Folder',
+ label: i18n.__('Export Folder'),
submenu: [
{
- label: 'Export as txt',
+ label: i18n.__('Export as txt'),
click: (e) => this.handleExportFolderClick(e, folder, 'txt')
},
{
- label: 'Export as md',
+ label: i18n.__('Export as md'),
click: (e) => this.handleExportFolderClick(e, folder, 'md')
}
]
@@ -117,12 +130,10 @@ class StorageItem extends React.Component {
type: 'separator'
},
{
- label: 'Delete Folder',
+ label: i18n.__('Delete Folder'),
click: (e) => this.handleFolderDeleteClick(e, folder)
}
])
-
- menu.popup()
}
handleRenameFolderClick (e, folder) {
@@ -136,8 +147,8 @@ class StorageItem extends React.Component {
handleExportFolderClick (e, folder, fileType) {
const options = {
properties: ['openDirectory', 'createDirectory'],
- buttonLabel: 'Select directory',
- title: 'Select a folder to export the files to',
+ buttonLabel: i18n.__('Select directory'),
+ title: i18n.__('Select a folder to export the files to'),
multiSelections: false
}
dialog.showOpenDialog(remote.getCurrentWindow(), options,
@@ -161,9 +172,9 @@ class StorageItem extends React.Component {
handleFolderDeleteClick (e, folder) {
const index = dialog.showMessageBox(remote.getCurrentWindow(), {
type: 'warning',
- message: 'Delete Folder',
- detail: 'This will delete all notes in the folder and can not be undone.',
- buttons: ['Confirm', 'Cancel']
+ message: i18n.__('Delete Folder'),
+ detail: i18n.__('This will delete all notes in the folder and can not be undone.'),
+ buttons: [i18n.__('Confirm'), i18n.__('Cancel')]
})
if (index === 0) {
@@ -193,33 +204,16 @@ class StorageItem extends React.Component {
dropNote (storage, folder, dispatch, location, noteData) {
noteData = noteData.filter((note) => folder.key !== note.folder)
if (noteData.length === 0) return
- const newNoteData = noteData.map((note) => Object.assign({}, note, {storage: storage, folder: folder.key}))
Promise.all(
- newNoteData.map((note) => dataApi.createNote(storage.key, note))
+ noteData.map((note) => dataApi.moveNote(note.storage, note.key, storage.key, folder.key))
)
.then((createdNoteData) => {
- createdNoteData.forEach((note) => {
+ createdNoteData.forEach((newNote) => {
dispatch({
- type: 'UPDATE_NOTE',
- note: note
- })
- })
- })
- .catch((err) => {
- console.error(`error on create notes: ${err}`)
- })
- .then(() => {
- return Promise.all(
- noteData.map((note) => dataApi.deleteNote(note.storage, note.key))
- )
- })
- .then((deletedNoteData) => {
- deletedNoteData.forEach((note) => {
- dispatch({
- type: 'DELETE_NOTE',
- storageKey: note.storageKey,
- noteKey: note.noteKey
+ type: 'MOVE_NOTE',
+ originNote: noteData.find((note) => note.content === newNote.oldContent),
+ note: newNote
})
})
})
@@ -238,8 +232,10 @@ class StorageItem extends React.Component {
render () {
const { storage, location, isFolded, data, dispatch } = this.props
const { folderNoteMap, trashedSet } = data
- const folderList = storage.folders.map((folder) => {
- const isActive = !!(location.pathname.match(new RegExp('\/storages\/' + storage.key + '\/folders\/' + folder.key)))
+ const SortableStorageItemChild = SortableElement(StorageItemChild)
+ const folderList = storage.folders.map((folder, index) => {
+ let folderRegex = new RegExp(escapeStringRegexp(path.sep) + 'storages' + escapeStringRegexp(path.sep) + storage.key + escapeStringRegexp(path.sep) + 'folders' + escapeStringRegexp(path.sep) + folder.key)
+ const isActive = !!(location.pathname.match(folderRegex))
const noteSet = folderNoteMap.get(storage.key + '-' + folder.key)
let noteCount = 0
@@ -252,8 +248,9 @@ class StorageItem extends React.Component {
noteCount = noteSet.size - trashedNoteCount
}
return (
- this.handleFolderButtonClick(folder.key)(e)}
handleContextMenu={(e) => this.handleFolderButtonContextMenu(e, folder)}
@@ -268,16 +265,16 @@ class StorageItem extends React.Component {
)
})
- const isActive = location.pathname.match(new RegExp('\/storages\/' + storage.key + '$'))
+ const isActive = location.pathname.match(new RegExp(escapeStringRegexp(path.sep) + 'storages' + escapeStringRegexp(path.sep) + storage.key + '$'))
return (
+
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 3d70a7a3..434b0d22 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -1,5 +1,7 @@
import _ from 'lodash'
import RcParser from 'browser/lib/RcParser'
+import i18n from 'browser/lib/i18n'
+import ee from 'browser/main/lib/eventEmitter'
const OSX = global.process.platform === 'darwin'
const win = global.process.platform === 'win32'
@@ -14,14 +16,18 @@ export const DEFAULT_CONFIG = {
isSideNavFolded: false,
listWidth: 280,
navWidth: 200,
- sortBy: 'UPDATED_AT', // 'CREATED_AT', 'UPDATED_AT', 'APLHABETICAL'
+ sortBy: {
+ default: 'UPDATED_AT' // 'CREATED_AT', 'UPDATED_AT', 'APLHABETICAL'
+ },
+ sortTagsBy: 'ALPHABETICAL', // 'ALPHABETICAL', 'COUNTER'
listStyle: 'DEFAULT', // 'DEFAULT', 'SMALL'
amaEnabled: true,
hotkey: {
- toggleFinder: OSX ? 'Cmd + Alt + S' : 'Super + Alt + S',
- toggleMain: OSX ? 'Cmd + Alt + L' : 'Super + Alt + E'
+ toggleMain: OSX ? 'Command + Alt + L' : 'Super + Alt + E',
+ toggleMode: OSX ? 'Command + M' : 'Ctrl + M'
},
ui: {
+ language: 'en',
theme: 'default',
showCopyNotification: true,
disableDirectWrite: false,
@@ -34,9 +40,13 @@ export const DEFAULT_CONFIG = {
fontFamily: win ? 'Segoe UI' : 'Monaco, Consolas',
indentType: 'space',
indentSize: '2',
+ enableRulers: false,
+ rulers: [80, 120],
+ displayLineNumbers: true,
switchPreview: 'BLUR', // Available value: RIGHTCLICK, BLUR
scrollPastEnd: false,
- type: 'SPLIT'
+ type: 'SPLIT',
+ fetchUrlTitle: true
},
preview: {
fontSize: '14',
@@ -46,7 +56,23 @@ export const DEFAULT_CONFIG = {
latexInlineOpen: '$',
latexInlineClose: '$',
latexBlockOpen: '$$',
- latexBlockClose: '$$'
+ latexBlockClose: '$$',
+ plantUMLServerAddress: 'http://www.plantuml.com/plantuml',
+ scrollPastEnd: false,
+ smartQuotes: true,
+ breaks: true,
+ smartArrows: false,
+ allowCustomCSS: false,
+ customCSS: '',
+ sanitize: 'STRICT' // 'STRICT', 'ALLOW_STYLES', 'NONE'
+ },
+ blog: {
+ type: 'wordpress', // Available value: wordpress, add more types in the future plz
+ address: 'http://wordpress.com/wp-json',
+ authMethod: 'JWT', // Available value: JWT, USER
+ token: '',
+ username: '',
+ password: ''
}
}
@@ -118,10 +144,14 @@ function set (updates) {
document.body.setAttribute('data-theme', 'white')
} else if (newConfig.ui.theme === 'solarized-dark') {
document.body.setAttribute('data-theme', 'solarized-dark')
+ } else if (newConfig.ui.theme === 'monokai') {
+ document.body.setAttribute('data-theme', 'monokai')
} else {
document.body.setAttribute('data-theme', 'default')
}
+ i18n.setLocale(newConfig.ui.language)
+
let editorTheme = document.getElementById('editorTheme')
if (editorTheme == null) {
editorTheme = document.createElement('link')
@@ -144,14 +174,27 @@ function set (updates) {
ipcRenderer.send('config-renew', {
config: get()
})
+ ee.emit('config-renew')
}
function assignConfigValues (originalConfig, rcConfig) {
const config = Object.assign({}, DEFAULT_CONFIG, originalConfig, rcConfig)
config.hotkey = Object.assign({}, DEFAULT_CONFIG.hotkey, originalConfig.hotkey, rcConfig.hotkey)
+ config.blog = Object.assign({}, DEFAULT_CONFIG.blog, originalConfig.blog, rcConfig.blog)
config.ui = Object.assign({}, DEFAULT_CONFIG.ui, originalConfig.ui, rcConfig.ui)
config.editor = Object.assign({}, DEFAULT_CONFIG.editor, originalConfig.editor, rcConfig.editor)
config.preview = Object.assign({}, DEFAULT_CONFIG.preview, originalConfig.preview, rcConfig.preview)
+
+ rewriteHotkey(config)
+
+ return config
+}
+
+function rewriteHotkey (config) {
+ const keys = [...Object.keys(config.hotkey)]
+ keys.forEach(key => {
+ config.hotkey[key] = config.hotkey[key].replace(/Cmd/g, 'Command')
+ })
return config
}
diff --git a/browser/main/lib/dataApi/addStorage.js b/browser/main/lib/dataApi/addStorage.js
index 630c0bd3..bfd6698a 100644
--- a/browser/main/lib/dataApi/addStorage.js
+++ b/browser/main/lib/dataApi/addStorage.js
@@ -37,7 +37,8 @@ function addStorage (input) {
key,
name: input.name,
type: input.type,
- path: input.path
+ path: input.path,
+ isOpen: false
}
return Promise.resolve(newStorage)
@@ -48,7 +49,8 @@ function addStorage (input) {
key: newStorage.key,
type: newStorage.type,
name: newStorage.name,
- path: newStorage.path
+ path: newStorage.path,
+ isOpen: false
})
localStorage.setItem('storages', JSON.stringify(rawStorages))
diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
new file mode 100644
index 00000000..d1e0ab62
--- /dev/null
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -0,0 +1,429 @@
+const uniqueSlug = require('unique-slug')
+const fs = require('fs')
+const path = require('path')
+const findStorage = require('browser/lib/findStorage')
+const mdurl = require('mdurl')
+const fse = require('fs-extra')
+const escapeStringRegexp = require('escape-string-regexp')
+const sander = require('sander')
+import i18n from 'browser/lib/i18n'
+
+const STORAGE_FOLDER_PLACEHOLDER = ':storage'
+const DESTINATION_FOLDER = 'attachments'
+const PATH_SEPARATORS = escapeStringRegexp(path.posix.sep) + escapeStringRegexp(path.win32.sep)
+
+/**
+ * @description
+ * Copies a copy of an attachment to the storage folder specified by the given key and return the generated attachment name.
+ * Renames the file to match a unique file name.
+ *
+ * @param {String} sourceFilePath The source path of the attachment to be copied
+ * @param {String} storageKey Storage key of the destination storage
+ * @param {String} noteKey Key of the current note. Will be used as subfolder in :storage
+ * @param {boolean} useRandomName determines whether a random filename for the new file is used. If false the source file name is used
+ * @return {Promise} name (inclusive extension) of the generated file
+ */
+function copyAttachment (sourceFilePath, storageKey, noteKey, useRandomName = true) {
+ return new Promise((resolve, reject) => {
+ if (!sourceFilePath) {
+ reject('sourceFilePath has to be given')
+ }
+
+ if (!storageKey) {
+ reject('storageKey has to be given')
+ }
+
+ if (!noteKey) {
+ reject('noteKey has to be given')
+ }
+
+ try {
+ if (!fs.existsSync(sourceFilePath)) {
+ reject('source file does not exist')
+ }
+
+ const targetStorage = findStorage.findStorage(storageKey)
+
+ const inputFileStream = fs.createReadStream(sourceFilePath)
+ let destinationName
+ if (useRandomName) {
+ destinationName = `${uniqueSlug()}${path.extname(sourceFilePath)}`
+ } else {
+ destinationName = path.basename(sourceFilePath)
+ }
+ const destinationDir = path.join(targetStorage.path, DESTINATION_FOLDER, noteKey)
+ createAttachmentDestinationFolder(targetStorage.path, noteKey)
+ const outputFile = fs.createWriteStream(path.join(destinationDir, destinationName))
+ inputFileStream.pipe(outputFile)
+ inputFileStream.on('end', () => {
+ resolve(destinationName)
+ })
+ } catch (e) {
+ return reject(e)
+ }
+ })
+}
+
+function createAttachmentDestinationFolder (destinationStoragePath, noteKey) {
+ let destinationDir = path.join(destinationStoragePath, DESTINATION_FOLDER)
+ if (!fs.existsSync(destinationDir)) {
+ fs.mkdirSync(destinationDir)
+ }
+ destinationDir = path.join(destinationStoragePath, DESTINATION_FOLDER, noteKey)
+ if (!fs.existsSync(destinationDir)) {
+ fs.mkdirSync(destinationDir)
+ }
+}
+
+/**
+ * @description Moves attachments from the old location ('/images') to the new one ('/attachments/noteKey)
+ * @param markdownContent of the current note
+ * @param storagePath Storage path of the current note
+ * @param noteKey Key of the current note
+ */
+function migrateAttachments (markdownContent, storagePath, noteKey) {
+ if (noteKey !== undefined && sander.existsSync(path.join(storagePath, 'images'))) {
+ const attachments = getAttachmentsInMarkdownContent(markdownContent) || []
+ if (attachments.length) {
+ createAttachmentDestinationFolder(storagePath, noteKey)
+ }
+ for (const attachment of attachments) {
+ const attachmentBaseName = path.basename(attachment)
+ const possibleLegacyPath = path.join(storagePath, 'images', attachmentBaseName)
+ if (sander.existsSync(possibleLegacyPath)) {
+ const destinationPath = path.join(storagePath, DESTINATION_FOLDER, attachmentBaseName)
+ if (!sander.existsSync(destinationPath)) {
+ sander.copyFileSync(possibleLegacyPath).to(destinationPath)
+ }
+ }
+ }
+ }
+}
+
+/**
+ * @description Fixes the URLs embedded in the generated HTML so that they again refer actual local files.
+ * @param {String} renderedHTML HTML in that the links should be fixed
+ * @param {String} storagePath Path of the current storage
+ * @returns {String} postprocessed HTML in which all :storage references are mapped to the actual paths.
+ */
+function fixLocalURLS (renderedHTML, storagePath) {
+ return renderedHTML.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?"', 'g'), function (match) {
+ var encodedPathSeparators = new RegExp(mdurl.encode(path.win32.sep) + '|' + mdurl.encode(path.posix.sep), 'g')
+ return match.replace(encodedPathSeparators, path.sep).replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER, 'g'), 'file:///' + path.join(storagePath, DESTINATION_FOLDER))
+ })
+}
+
+/**
+ * @description Generates the markdown code for a given attachment
+ * @param {String} fileName Name of the attachment
+ * @param {String} path Path of the attachment
+ * @param {Boolean} showPreview Indicator whether the generated markdown should show a preview of the image. Note that at the moment only previews for images are supported
+ * @returns {String} Generated markdown code
+ */
+function generateAttachmentMarkdown (fileName, path, showPreview) {
+ return `${showPreview ? '!' : ''}[${fileName}](${path})`
+}
+
+/**
+ * @description Handles the drop-event of a file. Includes the necessary markdown code and copies the file to the corresponding storage folder.
+ * The method calls {CodeEditor#insertAttachmentMd()} to include the generated markdown at the needed place!
+ * @param {CodeEditor} codeEditor Markdown editor. Its insertAttachmentMd() method will be called to include the markdown code
+ * @param {String} storageKey Key of the current storage
+ * @param {String} noteKey Key of the current note
+ * @param {Event} dropEvent DropEvent
+ */
+function handleAttachmentDrop (codeEditor, storageKey, noteKey, dropEvent) {
+ const file = dropEvent.dataTransfer.files[0]
+ const filePath = file.path
+ const originalFileName = path.basename(filePath)
+ const fileType = file['type']
+
+ copyAttachment(filePath, storageKey, noteKey).then((fileName) => {
+ const showPreview = fileType.startsWith('image')
+ const imageMd = generateAttachmentMarkdown(originalFileName, path.join(STORAGE_FOLDER_PLACEHOLDER, noteKey, fileName), showPreview)
+ codeEditor.insertAttachmentMd(imageMd)
+ })
+}
+
+/**
+ * @description Creates a new file in the storage folder belonging to the current note and inserts the correct markdown code
+ * @param {CodeEditor} codeEditor Markdown editor. Its insertAttachmentMd() method will be called to include the markdown code
+ * @param {String} storageKey Key of the current storage
+ * @param {String} noteKey Key of the current note
+ * @param {DataTransferItem} dataTransferItem Part of the past-event
+ */
+function handlePastImageEvent (codeEditor, storageKey, noteKey, dataTransferItem) {
+ if (!codeEditor) {
+ throw new Error('codeEditor has to be given')
+ }
+ if (!storageKey) {
+ throw new Error('storageKey has to be given')
+ }
+
+ if (!noteKey) {
+ throw new Error('noteKey has to be given')
+ }
+ if (!dataTransferItem) {
+ throw new Error('dataTransferItem has to be given')
+ }
+
+ const blob = dataTransferItem.getAsFile()
+ const reader = new FileReader()
+ let base64data
+ const targetStorage = findStorage.findStorage(storageKey)
+ const destinationDir = path.join(targetStorage.path, DESTINATION_FOLDER, noteKey)
+ createAttachmentDestinationFolder(targetStorage.path, noteKey)
+
+ const imageName = `${uniqueSlug()}.png`
+ const imagePath = path.join(destinationDir, imageName)
+
+ reader.onloadend = function () {
+ base64data = reader.result.replace(/^data:image\/png;base64,/, '')
+ base64data += base64data.replace('+', ' ')
+ const binaryData = new Buffer(base64data, 'base64').toString('binary')
+ fs.writeFileSync(imagePath, binaryData, 'binary')
+ const imageReferencePath = path.join(STORAGE_FOLDER_PLACEHOLDER, noteKey, imageName)
+ const imageMd = generateAttachmentMarkdown(imageName, imageReferencePath, true)
+ codeEditor.insertAttachmentMd(imageMd)
+ }
+ reader.readAsDataURL(blob)
+}
+
+/**
+* @description Returns all attachment paths of the given markdown
+* @param {String} markdownContent content in which the attachment paths should be found
+* @returns {String[]} Array of the relative paths (starting with :storage) of the attachments of the given markdown
+*/
+function getAttachmentsInMarkdownContent (markdownContent) {
+ const preparedInput = markdownContent.replace(new RegExp('[' + PATH_SEPARATORS + ']', 'g'), path.sep)
+ const regexp = new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '(' + escapeStringRegexp(path.sep) + ')' + '?([a-zA-Z0-9]|-)*' + '(' + escapeStringRegexp(path.sep) + ')' + '([a-zA-Z0-9]|\\.)+(\\.[a-zA-Z0-9]+)?', 'g')
+ return preparedInput.match(regexp)
+}
+
+/**
+ * @description Returns an array of the absolute paths of the attachments referenced in the given markdown code
+ * @param {String} markdownContent content in which the attachment paths should be found
+ * @param {String} storagePath path of the current storage
+ * @returns {String[]} Absolute paths of the referenced attachments
+ */
+function getAbsolutePathsOfAttachmentsInContent (markdownContent, storagePath) {
+ const temp = getAttachmentsInMarkdownContent(markdownContent) || []
+ const result = []
+ for (const relativePath of temp) {
+ result.push(relativePath.replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER, 'g'), path.join(storagePath, DESTINATION_FOLDER)))
+ }
+ return result
+}
+
+/**
+ * @description Moves the attachments of the current note to the new location.
+ * Returns a modified version of the given content so that the links to the attachments point to the new note key.
+ * @param {String} oldPath Source of the note to be moved
+ * @param {String} newPath Destination of the note to be moved
+ * @param {String} noteKey Old note key
+ * @param {String} newNoteKey New note key
+ * @param {String} noteContent Content of the note to be moved
+ * @returns {String} Modified version of noteContent in which the paths of the attachments are fixed
+ */
+function moveAttachments (oldPath, newPath, noteKey, newNoteKey, noteContent) {
+ const src = path.join(oldPath, DESTINATION_FOLDER, noteKey)
+ const dest = path.join(newPath, DESTINATION_FOLDER, newNoteKey)
+ if (fse.existsSync(src)) {
+ fse.moveSync(src, dest)
+ }
+ return replaceNoteKeyWithNewNoteKey(noteContent, noteKey, newNoteKey)
+}
+
+/**
+ * Modifies the given content so that in all attachment references the oldNoteKey is replaced by the new one
+ * @param noteContent content that should be modified
+ * @param oldNoteKey note key to be replaced
+ * @param newNoteKey note key serving as a replacement
+ * @returns {String} modified note content
+ */
+function replaceNoteKeyWithNewNoteKey (noteContent, oldNoteKey, newNoteKey) {
+ if (noteContent) {
+ const preparedInput = noteContent.replace(new RegExp('[' + PATH_SEPARATORS + ']', 'g'), path.sep)
+ return preparedInput.replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER + escapeStringRegexp(path.sep) + oldNoteKey, 'g'), path.join(STORAGE_FOLDER_PLACEHOLDER, newNoteKey))
+ }
+ return noteContent
+}
+
+/**
+ * @description Deletes all :storage and noteKey references from the given input.
+ * @param input Input in which the references should be deleted
+ * @param noteKey Key of the current note
+ * @returns {String} Input without the references
+ */
+function removeStorageAndNoteReferences (input, noteKey) {
+ return input.replace(new RegExp(mdurl.encode(path.sep), 'g'), path.sep).replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER + '(' + escapeStringRegexp(path.sep) + noteKey + ')?', 'g'), DESTINATION_FOLDER)
+}
+
+/**
+ * @description Deletes the attachment folder specified by the given storageKey and noteKey
+ * @param storageKey Key of the storage of the note to be deleted
+ * @param noteKey Key of the note to be deleted
+ */
+function deleteAttachmentFolder (storageKey, noteKey) {
+ const storagePath = findStorage.findStorage(storageKey)
+ const noteAttachmentPath = path.join(storagePath.path, DESTINATION_FOLDER, noteKey)
+ sander.rimrafSync(noteAttachmentPath)
+}
+
+/**
+ * @description Deletes all attachments stored in the attachment folder of the give not that are not referenced in the markdownContent
+ * @param markdownContent Content of the note. All unreferenced notes will be deleted
+ * @param storageKey StorageKey of the current note. Is used to determine the belonging attachment folder.
+ * @param noteKey NoteKey of the current note. Is used to determine the belonging attachment folder.
+ */
+function deleteAttachmentsNotPresentInNote (markdownContent, storageKey, noteKey) {
+ if (storageKey == null || noteKey == null || markdownContent == null) {
+ return
+ }
+ const targetStorage = findStorage.findStorage(storageKey)
+ const attachmentFolder = path.join(targetStorage.path, DESTINATION_FOLDER, noteKey)
+ const attachmentsInNote = getAttachmentsInMarkdownContent(markdownContent)
+ const attachmentsInNoteOnlyFileNames = []
+ if (attachmentsInNote) {
+ for (let i = 0; i < attachmentsInNote.length; i++) {
+ attachmentsInNoteOnlyFileNames.push(attachmentsInNote[i].replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER + escapeStringRegexp(path.sep) + noteKey + escapeStringRegexp(path.sep), 'g'), ''))
+ }
+ }
+ if (fs.existsSync(attachmentFolder)) {
+ fs.readdir(attachmentFolder, (err, files) => {
+ if (err) {
+ console.error('Error reading directory "' + attachmentFolder + '". Error:')
+ console.error(err)
+ return
+ }
+ files.forEach(file => {
+ if (!attachmentsInNoteOnlyFileNames.includes(file)) {
+ const absolutePathOfFile = path.join(targetStorage.path, DESTINATION_FOLDER, noteKey, file)
+ fs.unlink(absolutePathOfFile, (err) => {
+ if (err) {
+ console.error('Could not delete "%s"', absolutePathOfFile)
+ console.error(err)
+ return
+ }
+ console.info('File "' + absolutePathOfFile + '" deleted because it was not included in the content of the note')
+ })
+ }
+ })
+ })
+ } else {
+ console.info('Attachment folder ("' + attachmentFolder + '") did not exist..')
+ }
+}
+
+/**
+ * Clones the attachments of a given note.
+ * Copies the attachments to their new destination and updates the content of the new note so that the attachment-links again point to the correct destination.
+ * @param oldNote Note that is being cloned
+ * @param newNote Clone of the note
+ */
+function cloneAttachments (oldNote, newNote) {
+ if (newNote.type === 'MARKDOWN_NOTE') {
+ const oldStorage = findStorage.findStorage(oldNote.storage)
+ const newStorage = findStorage.findStorage(newNote.storage)
+ const attachmentsPaths = getAbsolutePathsOfAttachmentsInContent(oldNote.content, oldStorage.path) || []
+
+ const destinationFolder = path.join(newStorage.path, DESTINATION_FOLDER, newNote.key)
+ if (!sander.existsSync(destinationFolder)) {
+ sander.mkdirSync(destinationFolder)
+ }
+
+ for (const attachment of attachmentsPaths) {
+ const destination = path.join(newStorage.path, DESTINATION_FOLDER, newNote.key, path.basename(attachment))
+ sander.copyFileSync(attachment).to(destination)
+ }
+ newNote.content = replaceNoteKeyWithNewNoteKey(newNote.content, oldNote.key, newNote.key)
+ } else {
+ console.debug('Cloning of the attachment was skipped since it only works for MARKDOWN_NOTEs')
+ }
+}
+
+function generateFileNotFoundMarkdown () {
+ return '**' + i18n.__('⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠') + '**'
+}
+
+/**
+ * Determines whether a given text is a link to an boostnote attachment
+ * @param text Text that might contain a attachment link
+ * @return {Boolean} Result of the test
+ */
+function isAttachmentLink (text) {
+ if (text) {
+ return text.match(new RegExp('.*\\[.*\\]\\( *' + escapeStringRegexp(STORAGE_FOLDER_PLACEHOLDER) + '[' + PATH_SEPARATORS + ']' + '.*\\).*', 'gi')) != null
+ }
+ return false
+}
+
+/**
+ * @description Handles the paste of an attachment link. Copies the referenced attachment to the location belonging to the new note.
+ * Returns a modified version of the pasted text so that it matches the copied attachment (resp. the new location)
+ * @param storageKey StorageKey of the current note
+ * @param noteKey NoteKey of the currentNote
+ * @param linkText Text that was pasted
+ * @return {Promise} Promise returning the modified text
+ */
+function handleAttachmentLinkPaste (storageKey, noteKey, linkText) {
+ if (storageKey != null && noteKey != null && linkText != null) {
+ const storagePath = findStorage.findStorage(storageKey).path
+ const attachments = getAttachmentsInMarkdownContent(linkText) || []
+ const replaceInstructions = []
+ const copies = []
+ for (const attachment of attachments) {
+ const absPathOfAttachment = attachment.replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER, 'g'), path.join(storagePath, DESTINATION_FOLDER))
+ copies.push(
+ sander.exists(absPathOfAttachment)
+ .then((fileExists) => {
+ if (!fileExists) {
+ const fileNotFoundRegexp = new RegExp('!?' + escapeStringRegexp('[') + '[\\w|\\d|\\s|\\.]*\\]\\(\\s*' + STORAGE_FOLDER_PLACEHOLDER + '[\\w|\\d|\\-|' + PATH_SEPARATORS + ']*' + escapeStringRegexp(path.basename(absPathOfAttachment)) + escapeStringRegexp(')'))
+ replaceInstructions.push({regexp: fileNotFoundRegexp, replacement: this.generateFileNotFoundMarkdown()})
+ return Promise.resolve()
+ }
+ return this.copyAttachment(absPathOfAttachment, storageKey, noteKey)
+ .then((fileName) => {
+ const replaceLinkRegExp = new RegExp(escapeStringRegexp('(') + ' *' + STORAGE_FOLDER_PLACEHOLDER + '[\\w|\\d|\\-|' + PATH_SEPARATORS + ']*' + escapeStringRegexp(path.basename(absPathOfAttachment)) + ' *' + escapeStringRegexp(')'))
+ replaceInstructions.push({
+ regexp: replaceLinkRegExp,
+ replacement: '(' + path.join(STORAGE_FOLDER_PLACEHOLDER, noteKey, fileName) + ')'
+ })
+ return Promise.resolve()
+ })
+ })
+ )
+ }
+ return Promise.all(copies).then(() => {
+ let modifiedLinkText = linkText
+ for (const replaceInstruction of replaceInstructions) {
+ modifiedLinkText = modifiedLinkText.replace(replaceInstruction.regexp, replaceInstruction.replacement)
+ }
+ return modifiedLinkText
+ })
+ } else {
+ console.log('One if the parameters was null -> Do nothing..')
+ return Promise.resolve(linkText)
+ }
+}
+
+module.exports = {
+ copyAttachment,
+ fixLocalURLS,
+ generateAttachmentMarkdown,
+ handleAttachmentDrop,
+ handlePastImageEvent,
+ getAttachmentsInMarkdownContent,
+ getAbsolutePathsOfAttachmentsInContent,
+ removeStorageAndNoteReferences,
+ deleteAttachmentFolder,
+ deleteAttachmentsNotPresentInNote,
+ moveAttachments,
+ cloneAttachments,
+ isAttachmentLink,
+ handleAttachmentLinkPaste,
+ generateFileNotFoundMarkdown,
+ migrateAttachments,
+ STORAGE_FOLDER_PLACEHOLDER,
+ DESTINATION_FOLDER
+}
diff --git a/browser/main/lib/dataApi/copyFile.js b/browser/main/lib/dataApi/copyFile.js
new file mode 100755
index 00000000..2dc66309
--- /dev/null
+++ b/browser/main/lib/dataApi/copyFile.js
@@ -0,0 +1,31 @@
+const fs = require('fs')
+const path = require('path')
+
+/**
+ * @description Copy a file from source to destination
+ * @param {String} srcPath
+ * @param {String} dstPath
+ * @return {Promise} an image path
+ */
+function copyFile (srcPath, dstPath) {
+ if (!path.extname(dstPath)) {
+ dstPath = path.join(dstPath, path.basename(srcPath))
+ }
+
+ return new Promise((resolve, reject) => {
+ const dstFolder = path.dirname(dstPath)
+ if (!fs.existsSync(dstFolder)) fs.mkdirSync(dstFolder)
+
+ const input = fs.createReadStream(srcPath)
+ const output = fs.createWriteStream(dstPath)
+
+ output.on('error', reject)
+ input.on('error', reject)
+ input.on('end', () => {
+ resolve(dstPath)
+ })
+ input.pipe(output)
+ })
+}
+
+module.exports = copyFile
diff --git a/browser/main/lib/dataApi/copyImage.js b/browser/main/lib/dataApi/copyImage.js
deleted file mode 100644
index ae79f8fb..00000000
--- a/browser/main/lib/dataApi/copyImage.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const { findStorage } = require('browser/lib/findStorage')
-
-/**
- * @description To copy an image and return the path.
- * @param {String} filePath
- * @param {String} storageKey
- * @return {String} an image path
- */
-function copyImage (filePath, storageKey) {
- return new Promise((resolve, reject) => {
- try {
- const targetStorage = findStorage(storageKey)
-
- const inputImage = fs.createReadStream(filePath)
- const imageExt = path.extname(filePath)
- const imageName = Math.random().toString(36).slice(-16)
- const basename = `${imageName}${imageExt}`
- const imageDir = path.join(targetStorage.path, 'images')
- if (!fs.existsSync(imageDir)) fs.mkdirSync(imageDir)
- const outputImage = fs.createWriteStream(path.join(imageDir, basename))
- inputImage.pipe(outputImage)
- resolve(basename)
- } catch (e) {
- return reject(e)
- }
- })
-}
-
-module.exports = copyImage
diff --git a/browser/main/lib/dataApi/createNote.js b/browser/main/lib/dataApi/createNote.js
index 4b667385..e5d44489 100644
--- a/browser/main/lib/dataApi/createNote.js
+++ b/browser/main/lib/dataApi/createNote.js
@@ -52,12 +52,12 @@ function createNote (storageKey, input) {
return storage
})
.then(function saveNote (storage) {
- let key = keygen()
+ let key = keygen(true)
let isUnique = false
while (!isUnique) {
try {
sander.statSync(path.join(storage.path, 'notes', key + '.cson'))
- key = keygen()
+ key = keygen(true)
} catch (err) {
if (err.code === 'ENOENT') {
isUnique = true
diff --git a/browser/main/lib/dataApi/createSnippet.js b/browser/main/lib/dataApi/createSnippet.js
new file mode 100644
index 00000000..5d189217
--- /dev/null
+++ b/browser/main/lib/dataApi/createSnippet.js
@@ -0,0 +1,26 @@
+import fs from 'fs'
+import crypto from 'crypto'
+import consts from 'browser/lib/consts'
+import fetchSnippet from 'browser/main/lib/dataApi/fetchSnippet'
+
+function createSnippet (snippetFile) {
+ return new Promise((resolve, reject) => {
+ const newSnippet = {
+ id: crypto.randomBytes(16).toString('hex'),
+ name: 'Unnamed snippet',
+ prefix: [],
+ content: ''
+ }
+ fetchSnippet(null, snippetFile).then((snippets) => {
+ snippets.push(newSnippet)
+ fs.writeFile(snippetFile || consts.SNIPPET_FILE, JSON.stringify(snippets, null, 4), (err) => {
+ if (err) reject(err)
+ resolve(newSnippet)
+ })
+ }).catch((err) => {
+ reject(err)
+ })
+ })
+}
+
+module.exports = createSnippet
diff --git a/browser/main/lib/dataApi/deleteFolder.js b/browser/main/lib/dataApi/deleteFolder.js
index 908677e1..0c7486f5 100644
--- a/browser/main/lib/dataApi/deleteFolder.js
+++ b/browser/main/lib/dataApi/deleteFolder.js
@@ -5,6 +5,7 @@ const resolveStorageNotes = require('./resolveStorageNotes')
const CSON = require('@rokt33r/season')
const sander = require('sander')
const { findStorage } = require('browser/lib/findStorage')
+const deleteSingleNote = require('./deleteNote')
/**
* @param {String} storageKey
@@ -49,11 +50,7 @@ function deleteFolder (storageKey, folderKey) {
const deleteAllNotes = targetNotes
.map(function deleteNote (note) {
- const notePath = path.join(storage.path, 'notes', note.key + '.cson')
- return sander.unlink(notePath)
- .catch(function (err) {
- console.warn('Failed to delete', notePath, err)
- })
+ return deleteSingleNote(storageKey, note.key)
})
return Promise.all(deleteAllNotes)
.then(() => storage)
diff --git a/browser/main/lib/dataApi/deleteNote.js b/browser/main/lib/dataApi/deleteNote.js
index 49498a30..46ec2b55 100644
--- a/browser/main/lib/dataApi/deleteNote.js
+++ b/browser/main/lib/dataApi/deleteNote.js
@@ -1,6 +1,7 @@
const resolveStorageData = require('./resolveStorageData')
const path = require('path')
const sander = require('sander')
+const attachmentManagement = require('./attachmentManagement')
const { findStorage } = require('browser/lib/findStorage')
function deleteNote (storageKey, noteKey) {
@@ -25,6 +26,10 @@ function deleteNote (storageKey, noteKey) {
storageKey
}
})
+ .then(function deleteAttachments (storageInfo) {
+ attachmentManagement.deleteAttachmentFolder(storageInfo.storageKey, storageInfo.noteKey)
+ return storageInfo
+ })
}
module.exports = deleteNote
diff --git a/browser/main/lib/dataApi/deleteSnippet.js b/browser/main/lib/dataApi/deleteSnippet.js
new file mode 100644
index 00000000..0e446886
--- /dev/null
+++ b/browser/main/lib/dataApi/deleteSnippet.js
@@ -0,0 +1,17 @@
+import fs from 'fs'
+import consts from 'browser/lib/consts'
+import fetchSnippet from 'browser/main/lib/dataApi/fetchSnippet'
+
+function deleteSnippet (snippet, snippetFile) {
+ return new Promise((resolve, reject) => {
+ fetchSnippet(null, snippetFile).then((snippets) => {
+ snippets = snippets.filter(currentSnippet => currentSnippet.id !== snippet.id)
+ fs.writeFile(snippetFile || consts.SNIPPET_FILE, JSON.stringify(snippets, null, 4), (err) => {
+ if (err) reject(err)
+ resolve(snippet)
+ })
+ })
+ })
+}
+
+module.exports = deleteSnippet
diff --git a/browser/main/lib/dataApi/exportFolder.js b/browser/main/lib/dataApi/exportFolder.js
index bb3b2834..3e998f15 100644
--- a/browser/main/lib/dataApi/exportFolder.js
+++ b/browser/main/lib/dataApi/exportFolder.js
@@ -1,6 +1,7 @@
import { findStorage } from 'browser/lib/findStorage'
import resolveStorageData from './resolveStorageData'
import resolveStorageNotes from './resolveStorageNotes'
+import filenamify from 'filenamify'
import * as path from 'path'
import * as fs from 'fs'
@@ -45,7 +46,7 @@ function exportFolder (storageKey, folderKey, fileType, exportDir) {
notes
.filter(note => note.folder === folderKey && note.isTrashed === false && note.type === 'MARKDOWN_NOTE')
.forEach(snippet => {
- const notePath = path.join(exportDir, `${snippet.title}.${fileType}`)
+ const notePath = path.join(exportDir, `${filenamify(snippet.title, {replacement: '_'})}.${fileType}`)
fs.writeFileSync(notePath, snippet.content)
})
diff --git a/browser/main/lib/dataApi/exportNote.js b/browser/main/lib/dataApi/exportNote.js
new file mode 100755
index 00000000..e4fec5f4
--- /dev/null
+++ b/browser/main/lib/dataApi/exportNote.js
@@ -0,0 +1,94 @@
+import copyFile from 'browser/main/lib/dataApi/copyFile'
+import { findStorage } from 'browser/lib/findStorage'
+
+const fs = require('fs')
+const path = require('path')
+
+/**
+ * Export note together with images
+ *
+ * If images is stored in the storage, creates 'images' subfolder in target directory
+ * and copies images to it. Changes links to images in the content of the note
+ *
+ * @param {String} storageKey or storage path
+ * @param {String} noteContent Content to export
+ * @param {String} targetPath Path to exported file
+ * @param {function} outputFormatter
+ * @return {Promise.<*[]>}
+ */
+function exportNote (storageKey, noteContent, targetPath, outputFormatter) {
+ const storagePath = path.isAbsolute(storageKey) ? storageKey : findStorage(storageKey).path
+ const exportTasks = []
+
+ if (!storagePath) {
+ throw new Error('Storage path is not found')
+ }
+
+ let exportedData = noteContent
+
+ if (outputFormatter) {
+ exportedData = outputFormatter(exportedData, exportTasks)
+ }
+
+ const tasks = prepareTasks(exportTasks, storagePath, path.dirname(targetPath))
+
+ return Promise.all(tasks.map((task) => copyFile(task.src, task.dst)))
+ .then(() => {
+ return saveToFile(exportedData, targetPath)
+ }).catch((err) => {
+ rollbackExport(tasks)
+ throw err
+ })
+}
+
+function prepareTasks (tasks, storagePath, targetPath) {
+ return tasks.map((task) => {
+ if (!path.isAbsolute(task.src)) {
+ task.src = path.join(storagePath, task.src)
+ }
+
+ if (!path.isAbsolute(task.dst)) {
+ task.dst = path.join(targetPath, task.dst)
+ }
+
+ return task
+ })
+}
+
+function saveToFile (data, filename) {
+ return new Promise((resolve, reject) => {
+ fs.writeFile(filename, data, (err) => {
+ if (err) return reject(err)
+
+ resolve(filename)
+ })
+ })
+}
+
+/**
+ * Remove exported files
+ * @param tasks Array of copy task objects. Object consists of two mandatory fields – `src` and `dst`
+ */
+function rollbackExport (tasks) {
+ const folders = new Set()
+ tasks.forEach((task) => {
+ let fullpath = task.dst
+
+ if (!path.extname(task.dst)) {
+ fullpath = path.join(task.dst, path.basename(task.src))
+ }
+
+ if (fs.existsSync(fullpath)) {
+ fs.unlink(fullpath)
+ folders.add(path.dirname(fullpath))
+ }
+ })
+
+ folders.forEach((folder) => {
+ if (fs.readdirSync(folder).length === 0) {
+ fs.rmdir(folder)
+ }
+ })
+}
+
+export default exportNote
diff --git a/browser/main/lib/dataApi/fetchSnippet.js b/browser/main/lib/dataApi/fetchSnippet.js
new file mode 100644
index 00000000..456a5090
--- /dev/null
+++ b/browser/main/lib/dataApi/fetchSnippet.js
@@ -0,0 +1,20 @@
+import fs from 'fs'
+import consts from 'browser/lib/consts'
+
+function fetchSnippet (id, snippetFile) {
+ return new Promise((resolve, reject) => {
+ fs.readFile(snippetFile || consts.SNIPPET_FILE, 'utf8', (err, data) => {
+ if (err) {
+ reject(err)
+ }
+ const snippets = JSON.parse(data)
+ if (id) {
+ const snippet = snippets.find(snippet => { return snippet.id === id })
+ resolve(snippet)
+ }
+ resolve(snippets)
+ })
+ })
+}
+
+module.exports = fetchSnippet
diff --git a/browser/main/lib/dataApi/index.js b/browser/main/lib/dataApi/index.js
index 311ca2f3..4e2f0061 100644
--- a/browser/main/lib/dataApi/index.js
+++ b/browser/main/lib/dataApi/index.js
@@ -1,5 +1,6 @@
const dataApi = {
init: require('./init'),
+ toggleStorage: require('./toggleStorage'),
addStorage: require('./addStorage'),
renameStorage: require('./renameStorage'),
removeStorage: require('./removeStorage'),
@@ -13,6 +14,10 @@ const dataApi = {
deleteNote: require('./deleteNote'),
moveNote: require('./moveNote'),
migrateFromV5Storage: require('./migrateFromV5Storage'),
+ createSnippet: require('./createSnippet'),
+ deleteSnippet: require('./deleteSnippet'),
+ updateSnippet: require('./updateSnippet'),
+ fetchSnippet: require('./fetchSnippet'),
_migrateFromV6Storage: require('./migrateFromV6Storage'),
_resolveStorageData: require('./resolveStorageData'),
diff --git a/browser/main/lib/dataApi/moveNote.js b/browser/main/lib/dataApi/moveNote.js
index 4580062e..2d306cdf 100644
--- a/browser/main/lib/dataApi/moveNote.js
+++ b/browser/main/lib/dataApi/moveNote.js
@@ -1,10 +1,12 @@
const resolveStorageData = require('./resolveStorageData')
const _ = require('lodash')
const path = require('path')
+const fs = require('fs')
const CSON = require('@rokt33r/season')
const keygen = require('browser/lib/keygen')
const sander = require('sander')
const { findStorage } = require('browser/lib/findStorage')
+const attachmentManagement = require('./attachmentManagement')
function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {
let oldStorage, newStorage
@@ -37,12 +39,12 @@ function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {
return resolveStorageData(newStorage)
.then(function findNewNoteKey (_newStorage) {
newStorage = _newStorage
- newNoteKey = keygen()
+ newNoteKey = keygen(true)
let isUnique = false
while (!isUnique) {
try {
sander.statSync(path.join(newStorage.path, 'notes', newNoteKey + '.cson'))
- newNoteKey = keygen()
+ newNoteKey = keygen(true)
} catch (err) {
if (err.code === 'ENOENT') {
isUnique = true
@@ -62,11 +64,20 @@ function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {
noteData.key = newNoteKey
noteData.storage = newStorageKey
noteData.updatedAt = new Date()
+ noteData.oldContent = noteData.content
return noteData
})
+ .then(function moveAttachments (noteData) {
+ if (oldStorage.path === newStorage.path) {
+ return noteData
+ }
+
+ noteData.content = attachmentManagement.moveAttachments(oldStorage.path, newStorage.path, noteKey, newNoteKey, noteData.content)
+ return noteData
+ })
.then(function writeAndReturn (noteData) {
- CSON.writeFileSync(path.join(newStorage.path, 'notes', noteData.key + '.cson'), _.omit(noteData, ['key', 'storage']))
+ CSON.writeFileSync(path.join(newStorage.path, 'notes', noteData.key + '.cson'), _.omit(noteData, ['key', 'storage', 'oldContent']))
return noteData
})
.then(function deleteOldNote (data) {
diff --git a/browser/main/lib/dataApi/resolveStorageData.js b/browser/main/lib/dataApi/resolveStorageData.js
index af040c5d..681a102e 100644
--- a/browser/main/lib/dataApi/resolveStorageData.js
+++ b/browser/main/lib/dataApi/resolveStorageData.js
@@ -8,7 +8,8 @@ function resolveStorageData (storageCache) {
key: storageCache.key,
name: storageCache.name,
type: storageCache.type,
- path: storageCache.path
+ path: storageCache.path,
+ isOpen: storageCache.isOpen
}
const boostnoteJSONPath = path.join(storageCache.path, 'boostnote.json')
diff --git a/browser/main/lib/dataApi/resolveStorageNotes.js b/browser/main/lib/dataApi/resolveStorageNotes.js
index 5684f06e..fa3f19ae 100644
--- a/browser/main/lib/dataApi/resolveStorageNotes.js
+++ b/browser/main/lib/dataApi/resolveStorageNotes.js
@@ -27,9 +27,12 @@ function resolveStorageNotes (storage) {
data.storage = storage.key
return data
} catch (err) {
- console.error(notePath)
+ console.error(`error on note path: ${notePath}, error: ${err}`)
}
})
+ .filter(function filterOnlyNoteObject (noteObj) {
+ return typeof noteObj === 'object'
+ })
return Promise.resolve(notes)
}
diff --git a/browser/main/lib/dataApi/toggleStorage.js b/browser/main/lib/dataApi/toggleStorage.js
new file mode 100644
index 00000000..dbb625c3
--- /dev/null
+++ b/browser/main/lib/dataApi/toggleStorage.js
@@ -0,0 +1,28 @@
+const _ = require('lodash')
+const resolveStorageData = require('./resolveStorageData')
+
+/**
+ * @param {String} key
+ * @param {Boolean} isOpen
+ * @return {Object} Storage meta data
+ */
+function toggleStorage (key, isOpen) {
+ let cachedStorageList
+ try {
+ cachedStorageList = JSON.parse(localStorage.getItem('storages'))
+ if (!_.isArray(cachedStorageList)) throw new Error('invalid storages')
+ } catch (err) {
+ console.log('error got')
+ console.error(err)
+ return Promise.reject(err)
+ }
+ const targetStorage = _.find(cachedStorageList, {key: key})
+ if (targetStorage == null) return Promise.reject('Storage')
+
+ targetStorage.isOpen = isOpen
+ localStorage.setItem('storages', JSON.stringify(cachedStorageList))
+
+ return resolveStorageData(targetStorage)
+}
+
+module.exports = toggleStorage
diff --git a/browser/main/lib/dataApi/updateNote.js b/browser/main/lib/dataApi/updateNote.js
index 2fbd52c2..147fbc06 100644
--- a/browser/main/lib/dataApi/updateNote.js
+++ b/browser/main/lib/dataApi/updateNote.js
@@ -30,6 +30,9 @@ function validateInput (input) {
validatedInput.isPinned = !!input.isPinned
}
+ if (!_.isNil(input.blog)) {
+ validatedInput.blog = input.blog
+ }
validatedInput.type = input.type
switch (input.type) {
case 'MARKDOWN_NOTE':
diff --git a/browser/main/lib/dataApi/updateSnippet.js b/browser/main/lib/dataApi/updateSnippet.js
new file mode 100644
index 00000000..f2310b8e
--- /dev/null
+++ b/browser/main/lib/dataApi/updateSnippet.js
@@ -0,0 +1,33 @@
+import fs from 'fs'
+import consts from 'browser/lib/consts'
+
+function updateSnippet (snippet, snippetFile) {
+ return new Promise((resolve, reject) => {
+ const snippets = JSON.parse(fs.readFileSync(snippetFile || consts.SNIPPET_FILE, 'utf-8'))
+
+ for (let i = 0; i < snippets.length; i++) {
+ const currentSnippet = snippets[i]
+
+ if (currentSnippet.id === snippet.id) {
+ if (
+ currentSnippet.name === snippet.name &&
+ currentSnippet.prefix === snippet.prefix &&
+ currentSnippet.content === snippet.content
+ ) {
+ // if everything is the same then don't write to disk
+ resolve(snippets)
+ } else {
+ currentSnippet.name = snippet.name
+ currentSnippet.prefix = snippet.prefix
+ currentSnippet.content = snippet.content
+ fs.writeFile(snippetFile || consts.SNIPPET_FILE, JSON.stringify(snippets, null, 4), (err) => {
+ if (err) reject(err)
+ resolve(snippets)
+ })
+ }
+ }
+ }
+ })
+}
+
+module.exports = updateSnippet
diff --git a/browser/main/lib/ipcClient.js b/browser/main/lib/ipcClient.js
index 12acfed2..0c916617 100644
--- a/browser/main/lib/ipcClient.js
+++ b/browser/main/lib/ipcClient.js
@@ -1,5 +1,4 @@
import ConfigManager from './ConfigManager'
-import store from 'browser/main/store'
const nodeIpc = require('node-ipc')
const { remote, ipcRenderer } = require('electron')
@@ -18,26 +17,12 @@ nodeIpc.connectTo(
console.log(err)
})
nodeIpc.of.node.on('connect', function () {
- console.log('Conncted successfully')
+ console.log('Connected successfully')
ipcRenderer.send('config-renew', {config: ConfigManager.get()})
})
nodeIpc.of.node.on('disconnect', function () {
console.log('disconnected')
})
-
- nodeIpc.of.node.on('request-data-from-finder', function () {
- console.log('throttle')
- var { data } = store.getState()
- console.log(data.starredSet.toJS())
- nodeIpc.of.node.emit('throttle-data', {
- storageMap: data.storageMap.toJS(),
- noteMap: data.noteMap.toJS(),
- starredSet: data.starredSet.toJS(),
- storageNoteMap: data.storageNoteMap.toJS(),
- folderNoteMap: data.folderNoteMap.toJS(),
- tagNoteMap: data.tagNoteMap.toJS()
- })
- })
}
)
diff --git a/browser/main/lib/shortcut.js b/browser/main/lib/shortcut.js
new file mode 100644
index 00000000..a6f33196
--- /dev/null
+++ b/browser/main/lib/shortcut.js
@@ -0,0 +1,7 @@
+import ee from 'browser/main/lib/eventEmitter'
+
+module.exports = {
+ 'toggleMode': () => {
+ ee.emit('topbar:togglemodebutton')
+ }
+}
diff --git a/browser/main/lib/shortcutManager.js b/browser/main/lib/shortcutManager.js
new file mode 100644
index 00000000..ac2a3a08
--- /dev/null
+++ b/browser/main/lib/shortcutManager.js
@@ -0,0 +1,40 @@
+import Mousetrap from 'mousetrap'
+import CM from 'browser/main/lib/ConfigManager'
+import ee from 'browser/main/lib/eventEmitter'
+import { isObjectEqual } from 'browser/lib/utils'
+require('mousetrap-global-bind')
+import functions from './shortcut'
+
+let shortcuts = CM.get().hotkey
+
+ee.on('config-renew', function () {
+ // only update if hotkey changed !
+ const newHotkey = CM.get().hotkey
+ if (!isObjectEqual(newHotkey, shortcuts)) {
+ updateShortcut(newHotkey)
+ }
+})
+
+function updateShortcut (newHotkey) {
+ Mousetrap.reset()
+ shortcuts = newHotkey
+ applyShortcuts(newHotkey)
+}
+
+function formatShortcut (shortcut) {
+ return shortcut.toLowerCase().replace(/ /g, '')
+}
+
+function applyShortcuts (shortcuts) {
+ for (const shortcut in shortcuts) {
+ const toggler = formatShortcut(shortcuts[shortcut])
+ // only bind if the function for that shortcut exists
+ if (functions[shortcut]) {
+ Mousetrap.bindGlobal(toggler, functions[shortcut])
+ }
+ }
+}
+
+applyShortcuts(CM.get().hotkey)
+
+module.exports = applyShortcuts
diff --git a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/CreateFolderModal.js
index e623ad8d..b061b0f3 100644
--- a/browser/main/modals/CreateFolderModal.js
+++ b/browser/main/modals/CreateFolderModal.js
@@ -7,6 +7,7 @@ import store from 'browser/main/store'
import consts from 'browser/lib/consts'
import ModalEscButton from 'browser/components/ModalEscButton'
import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
+import i18n from 'browser/lib/i18n'
class CreateFolderModal extends React.Component {
constructor (props) {
@@ -79,12 +80,12 @@ class CreateFolderModal extends React.Component {
onKeyDown={(e) => this.handleKeyDown(e)}
>
this.handleCloseButtonClick(e)} />
diff --git a/browser/main/modals/CreateFolderModal.styl b/browser/main/modals/CreateFolderModal.styl
index 45f2e852..1b96e123 100644
--- a/browser/main/modals/CreateFolderModal.styl
+++ b/browser/main/modals/CreateFolderModal.styl
@@ -102,3 +102,29 @@ body[data-theme="solarized-dark"]
.control-confirmButton
colorSolarizedDarkPrimaryButton()
+
+body[data-theme="monokai"]
+ .root
+ modalMonokai()
+ width 500px
+ height 270px
+ overflow hidden
+ position relative
+
+ .header
+ background-color transparent
+ border-color $ui-dark-borderColor
+ color $ui-monokai-text-color
+
+ .control-folder-label
+ color $ui-monokai-text-color
+
+ .control-folder-input
+ border 1px solid $ui-input--create-folder-modal
+ color white
+
+ .description
+ color $ui-inactive-text-color
+
+ .control-confirmButton
+ colorMonokaiPrimaryButton()
diff --git a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteModal.js
index 24b150cb..f6aa2c67 100644
--- a/browser/main/modals/NewNoteModal.js
+++ b/browser/main/modals/NewNoteModal.js
@@ -6,13 +6,13 @@ import { hashHistory } from 'react-router'
import ee from 'browser/main/lib/eventEmitter'
import ModalEscButton from 'browser/components/ModalEscButton'
import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
+import i18n from 'browser/lib/i18n'
class NewNoteModal extends React.Component {
constructor (props) {
super(props)
- this.state = {
- }
+ this.state = {}
}
componentDidMount () {
@@ -34,17 +34,20 @@ class NewNoteModal extends React.Component {
title: '',
content: ''
})
- .then((note) => {
+ .then(note => {
+ const noteHash = note.key
dispatch({
type: 'UPDATE_NOTE',
note: note
})
+
hashHistory.push({
pathname: location.pathname,
- query: {key: note.storage + '-' + note.key}
+ query: { key: noteHash }
})
+ ee.emit('list:jump', noteHash)
ee.emit('detail:focus')
- this.props.close()
+ setTimeout(this.props.close, 200)
})
}
@@ -58,7 +61,7 @@ class NewNoteModal extends React.Component {
handleSnippetNoteButtonClick (e) {
AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_SNIPPET')
AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
- const { storage, folder, dispatch, location } = this.props
+ const { storage, folder, dispatch, location, config } = this.props
dataApi
.createNote(storage, {
@@ -66,23 +69,27 @@ class NewNoteModal extends React.Component {
folder: folder,
title: '',
description: '',
- snippets: [{
- name: '',
- mode: 'text',
- content: ''
- }]
+ snippets: [
+ {
+ name: '',
+ mode: config.editor.snippetDefaultLanguage || 'text',
+ content: ''
+ }
+ ]
})
- .then((note) => {
+ .then(note => {
+ const noteHash = note.key
dispatch({
type: 'UPDATE_NOTE',
note: note
})
hashHistory.push({
pathname: location.pathname,
- query: {key: note.storage + '-' + note.key}
+ query: { key: noteHash }
})
+ ee.emit('list:jump', noteHash)
ee.emit('detail:focus')
- this.props.close()
+ setTimeout(this.props.close, 200)
})
}
@@ -101,49 +108,65 @@ class NewNoteModal extends React.Component {
render () {
return (
-
@@ -179,18 +180,18 @@ class FolderItem extends React.Component {
return (
this.handleHeaderContextMenu(e)}
>
diff --git a/browser/main/SideNav/StorageItem.styl b/browser/main/SideNav/StorageItem.styl
index 619498ec..a06ecb11 100644
--- a/browser/main/SideNav/StorageItem.styl
+++ b/browser/main/SideNav/StorageItem.styl
@@ -44,7 +44,7 @@
height 36px
padding-left 25px
padding-right 15px
- line-height 22px
+ line-height 36px
cursor pointer
font-size 14px
border none
@@ -147,7 +147,7 @@ body[data-theme="dark"]
background-color $ui-dark-button--active-backgroundColor
&:active
color $ui-dark-text-color
- background-color $ui-dark-button--active-backgroundColor
+ background-color $ui-dark-button--active-backgroundColor
.header--active
.header-addFolderButton
@@ -180,7 +180,7 @@ body[data-theme="dark"]
&:active, &:active:hover
color $ui-dark-text-color
background-color $ui-dark-button--active-backgroundColor
-
+
diff --git a/browser/main/SideNav/SwitchButton.styl b/browser/main/SideNav/SwitchButton.styl
index 54e21b03..36099140 100644
--- a/browser/main/SideNav/SwitchButton.styl
+++ b/browser/main/SideNav/SwitchButton.styl
@@ -29,6 +29,7 @@
border-radius 2px
opacity 0
transition 0.1s
+ white-space nowrap
body[data-theme="white"]
.non-active-button
diff --git a/browser/main/SideNav/TagButton.js b/browser/main/SideNav/TagButton.js
index 87d92c49..d91ae2c4 100644
--- a/browser/main/SideNav/TagButton.js
+++ b/browser/main/SideNav/TagButton.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types'
import React from 'react'
import CSSModules from 'browser/lib/CSSModules'
import styles from './SwitchButton.styl'
+import i18n from 'browser/lib/i18n'
const TagButton = ({
onClick, isTagActive
@@ -12,7 +13,7 @@ const TagButton = ({
: '../resources/icon/icon-tag.svg'
}
/>
- Tags
+ {i18n.__('Tags')}
)
diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js
index 4c162f1e..c4fa417b 100644
--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -1,6 +1,7 @@
import PropTypes from 'prop-types'
import React from 'react'
import CSSModules from 'browser/lib/CSSModules'
+import dataApi from 'browser/main/lib/dataApi'
import styles from './SideNav.styl'
import { openModal } from 'browser/main/lib/modal'
import PreferencesModal from '../modals/PreferencesModal'
@@ -14,6 +15,9 @@ import EventEmitter from 'browser/main/lib/eventEmitter'
import PreferenceButton from './PreferenceButton'
import ListButton from './ListButton'
import TagButton from './TagButton'
+import {SortableContainer} from 'react-sortable-hoc'
+import i18n from 'browser/lib/i18n'
+import context from 'browser/lib/context'
class SideNav extends React.Component {
// TODO: should not use electron stuff v0.7
@@ -65,8 +69,19 @@ class SideNav extends React.Component {
router.push('/alltags')
}
+ onSortEnd (storage) {
+ return ({oldIndex, newIndex}) => {
+ const { dispatch } = this.props
+ dataApi
+ .reorderFolder(storage.key, oldIndex, newIndex)
+ .then((data) => {
+ dispatch({ type: 'REORDER_FOLDER', storage: data.storage })
+ })
+ }
+ }
+
SideNavComponent (isFolded, storageList) {
- const { location, data } = this.props
+ const { location, data, config } = this.props
const isHomeActive = !!location.pathname.match(/^\/home$/)
const isStarredActive = !!location.pathname.match(/^\/starred$/)
@@ -86,20 +101,36 @@ class SideNav extends React.Component {
isTrashedActive={isTrashedActive}
handleStarredButtonClick={(e) => this.handleStarredButtonClick(e)}
handleTrashedButtonClick={(e) => this.handleTrashedButtonClick(e)}
- counterTotalNote={data.noteMap._map.size}
+ counterTotalNote={data.noteMap._map.size - data.trashedSet._set.size}
counterStarredNote={data.starredSet._set.size}
counterDelNote={data.trashedSet._set.size}
+ handleFilterButtonContextMenu={this.handleFilterButtonContextMenu.bind(this)}
/>
-
)
} else {
component = (
-
{location.pathname === '/trashed' ? ''
diff --git a/browser/main/global.styl b/browser/main/global.styl
index 27d1ae73..e4505a4e 100644
--- a/browser/main/global.styl
+++ b/browser/main/global.styl
@@ -15,6 +15,12 @@ body
font-weight 200
-webkit-font-smoothing antialiased
+::-webkit-scrollbar
+ width 12px
+
+::-webkit-scrollbar-thumb
+ background-color rgba(0, 0, 0, 0.15)
+
button, input, select, textarea
font-family DEFAULT_FONTS
@@ -85,9 +91,11 @@ modalBackColor = white
absolute top left bottom right
background-color modalBackColor
z-index modalZIndex + 1
-
+
body[data-theme="dark"]
+ ::-webkit-scrollbar-thumb
+ background-color rgba(0, 0, 0, 0.3)
.ModalBase
.modalBack
background-color $ui-dark-backgroundColor
@@ -97,7 +105,7 @@ body[data-theme="dark"]
.CodeMirror
font-family inherit !important
line-height 1.4em
- height 96%
+ height 100%
.CodeMirror > div > textarea
margin-bottom -1em
.CodeMirror-focused .CodeMirror-selected
@@ -108,15 +116,43 @@ body[data-theme="dark"]
background #B1D7FE
::selection
background #B1D7FE
+.CodeMirror-foldmarker
+ font-family: arial
+
+.CodeMirror-foldgutter
+ width: .7em
+
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded
+ cursor: pointer
+
+.CodeMirror-foldgutter-open:after
+ content: "\25BE"
+
+.CodeMirror-foldgutter-folded:after
+ content: "\25B8"
.sortableItemHelper
z-index modalZIndex + 5
body[data-theme="solarized-dark"]
+ ::-webkit-scrollbar-thumb
+ background-color rgba(0, 0, 0, 0.3)
.ModalBase
.modalBack
background-color $ui-solarized-dark-backgroundColor
.sortableItemHelper
color: $ui-solarized-dark-text-color
+body[data-theme="monokai"]
+ ::-webkit-scrollbar-thumb
+ background-color rgba(0, 0, 0, 0.3)
+ .ModalBase
+ .modalBack
+ background-color $ui-monokai-backgroundColor
+ .sortableItemHelper
+ color: $ui-monokai-text-color
+body[data-theme="default"]
+ .SideNav ::-webkit-scrollbar-thumb
+ background-color rgba(255, 255, 255, 0.3)
diff --git a/browser/main/index.js b/browser/main/index.js
index d7ed7bfd..6e8bdcc5 100644
--- a/browser/main/index.js
+++ b/browser/main/index.js
@@ -8,6 +8,7 @@ import { Router, Route, IndexRoute, IndexRedirect, hashHistory } from 'react-rou
import { syncHistoryWithStore } from 'react-router-redux'
require('./lib/ipcClient')
require('../lib/customMeta')
+import i18n from 'browser/lib/i18n'
const electron = require('electron')
@@ -23,6 +24,45 @@ document.addEventListener('dragover', function (e) {
e.stopPropagation()
})
+// prevent menu from popup when alt pressed
+// but still able to toggle menu when only alt is pressed
+let isAltPressing = false
+let isAltWithMouse = false
+let isAltWithOtherKey = false
+let isOtherKey = false
+
+document.addEventListener('keydown', function (e) {
+ if (e.key === 'Alt') {
+ isAltPressing = true
+ if (isOtherKey) {
+ isAltWithOtherKey = true
+ }
+ } else {
+ if (isAltPressing) {
+ isAltWithOtherKey = true
+ }
+ isOtherKey = true
+ }
+})
+
+document.addEventListener('mousedown', function (e) {
+ if (isAltPressing) {
+ isAltWithMouse = true
+ }
+})
+
+document.addEventListener('keyup', function (e) {
+ if (e.key === 'Alt') {
+ if (isAltWithMouse || isAltWithOtherKey) {
+ e.preventDefault()
+ }
+ isAltWithMouse = false
+ isAltWithOtherKey = false
+ isAltPressing = false
+ isOtherKey = false
+ }
+})
+
document.addEventListener('click', function (e) {
const className = e.target.className
if (!className && typeof (className) !== 'string') return
@@ -46,9 +86,9 @@ function notify (...args) {
function updateApp () {
const index = dialog.showMessageBox(remote.getCurrentWindow(), {
type: 'warning',
- message: 'Update Boostnote',
- detail: 'New Boostnote is ready to be installed.',
- buttons: ['Restart & Install', 'Not Now']
+ message: i18n.__('Update Boostnote'),
+ detail: i18n.__('New Boostnote is ready to be installed.'),
+ buttons: [i18n.__('Restart & Install'), i18n.__('Not Now')]
})
if (index === 0) {
@@ -63,7 +103,9 @@ ReactDOM.render((
-
Tags
+
+
+
+ {i18n.__('Tags')}
+
+
+
+
{this.tagListComponent(data)}
@@ -112,26 +143,62 @@ class SideNav extends React.Component {
}
tagListComponent () {
- const { data, location } = this.props
- const tagList = data.tagNoteMap.map((tag, key) => {
- return key
- })
+ const { data, location, config } = this.props
+ const relatedTags = this.getRelatedTags(this.getActiveTags(location.pathname), data.noteMap)
+ let tagList = _.sortBy(data.tagNoteMap.map(
+ (tag, name) => ({ name, size: tag.size, related: relatedTags.has(name) })
+ ), ['name']).filter(
+ tag => tag.size > 0
+ )
+ if (config.sortTagsBy === 'COUNTER') {
+ tagList = _.sortBy(tagList, item => (0 - item.size))
+ }
+ if (config.ui.showOnlyRelatedTags && (relatedTags.size > 0)) {
+ tagList = tagList.filter(
+ tag => tag.related
+ )
+ }
return (
- tagList.map(tag => (
-
- {this.state.search > 0 &&
-
- }
-
-
Create new folder
+ {i18n.__('Create new folder')}
-
Folder name
+ {i18n.__('Folder name')}
this.handleConfirmButtonClick(e)}
>
- Create
+ {i18n.__('Create')}
this.handleKeyDown(e)}
+ onKeyDown={e => this.handleKeyDown(e)}
>
this.handleCloseButtonClick(e)} />
+ this.handleCloseButtonClick(e)}
+ />
)
}
}
-NewNoteModal.propTypes = {
-}
+NewNoteModal.propTypes = {}
export default CSSModules(NewNoteModal, styles)
diff --git a/browser/main/modals/NewNoteModal.styl b/browser/main/modals/NewNoteModal.styl
index 748ab88c..db14133f 100644
--- a/browser/main/modals/NewNoteModal.styl
+++ b/browser/main/modals/NewNoteModal.styl
@@ -81,3 +81,19 @@ body[data-theme="solarized-dark"]
.description
color $ui-solarized-dark-text-color
+body[data-theme="monokai"]
+ .root
+ background-color transparent
+
+ .header
+ color $ui-monokai-text-color
+
+ .control-button
+ border-color $ui-monokai-borderColor
+ color $ui-monokai-text-color
+ background-color transparent
+ &:focus
+ colorDarkPrimaryButton()
+
+ .description
+ color $ui-monokai-text-color
diff --git a/browser/main/modals/PreferencesModal/Blog.js b/browser/main/modals/PreferencesModal/Blog.js
new file mode 100644
index 00000000..9f4d33f6
--- /dev/null
+++ b/browser/main/modals/PreferencesModal/Blog.js
@@ -0,0 +1,199 @@
+import React from 'react'
+import CSSModules from 'browser/lib/CSSModules'
+import styles from './ConfigTab.styl'
+import ConfigManager from 'browser/main/lib/ConfigManager'
+import store from 'browser/main/store'
+import PropTypes from 'prop-types'
+import _ from 'lodash'
+import i18n from 'browser/lib/i18n'
+
+const electron = require('electron')
+const { shell } = electron
+const ipc = electron.ipcRenderer
+class Blog extends React.Component {
+ constructor (props) {
+ super(props)
+
+ this.state = {
+ config: props.config,
+ BlogAlert: null
+ }
+ }
+
+ handleLinkClick (e) {
+ shell.openExternal(e.currentTarget.href)
+ e.preventDefault()
+ }
+
+ clearMessage () {
+ _.debounce(() => {
+ this.setState({
+ BlogAlert: null
+ })
+ }, 2000)()
+ }
+
+ componentDidMount () {
+ this.handleSettingDone = () => {
+ this.setState({BlogAlert: {
+ type: 'success',
+ message: i18n.__('Successfully applied!')
+ }})
+ }
+ this.handleSettingError = (err) => {
+ this.setState({BlogAlert: {
+ type: 'error',
+ message: err.message != null ? err.message : i18n.__('Error occurs!')
+ }})
+ }
+ this.oldBlog = this.state.config.blog
+ ipc.addListener('APP_SETTING_DONE', this.handleSettingDone)
+ ipc.addListener('APP_SETTING_ERROR', this.handleSettingError)
+ }
+
+ handleBlogChange (e) {
+ const { config } = this.state
+ config.blog = {
+ password: !_.isNil(this.refs.passwordInput) ? this.refs.passwordInput.value : config.blog.password,
+ username: !_.isNil(this.refs.usernameInput) ? this.refs.usernameInput.value : config.blog.username,
+ token: !_.isNil(this.refs.tokenInput) ? this.refs.tokenInput.value : config.blog.token,
+ authMethod: this.refs.authMethodDropdown.value,
+ address: this.refs.addressInput.value,
+ type: this.refs.typeDropdown.value
+ }
+ this.setState({
+ config
+ })
+ if (_.isEqual(this.oldBlog, config.blog)) {
+ this.props.haveToSave()
+ } else {
+ this.props.haveToSave({
+ tab: 'Blog',
+ type: 'warning',
+ message: i18n.__('You have to save!')
+ })
+ }
+ }
+
+ handleSaveButtonClick (e) {
+ const newConfig = {
+ blog: this.state.config.blog
+ }
+
+ ConfigManager.set(newConfig)
+
+ store.dispatch({
+ type: 'SET_UI',
+ config: newConfig
+ })
+ this.clearMessage()
+ this.props.haveToSave()
+ }
+
+ render () {
+ const {config, BlogAlert} = this.state
+ const blogAlertElement = BlogAlert != null
+ ?
-
- Make a note
+ {i18n.__('Make a note')}
-
- Tab to switch format
+
+ {i18n.__('Tab to switch format')}
+
+ {BlogAlert.message} +
+ : null + return ( +
+
+ )
+ }
+}
+
+Blog.propTypes = {
+ dispatch: PropTypes.func,
+ haveToSave: PropTypes.func
+}
+
+export default CSSModules(Blog, styles)
diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl
index f6f7ace9..31994d97 100644
--- a/browser/main/modals/PreferencesModal/ConfigTab.styl
+++ b/browser/main/modals/PreferencesModal/ConfigTab.styl
@@ -24,7 +24,7 @@
line-height 30px
.group-section-label
- width 150px
+ width 200px
text-align left
margin-right 10px
font-size 14px
@@ -133,6 +133,11 @@ colorSolarizedDarkControl()
background-color $ui-solarized-dark-button-backgroundColor
color $ui-solarized-dark-text-color
+colorMonokaiControl()
+ border none
+ background-color $ui-monokai-button-backgroundColor
+ color $ui-monokai-text-color
+
body[data-theme="dark"]
.root
@@ -189,4 +194,29 @@ body[data-theme="solarized-dark"]
select, .group-section-control-input
colorSolarizedDarkControl()
+body[data-theme="monokai"]
+ .root
+ color $ui-monokai-text-color
+ .group-header
+ color $ui-monokai-text-color
+ border-color $ui-monokai-borderColor
+
+ .group-header2
+ color $ui-monokai-text-color
+
+ .group-section-control-input
+ border-color $ui-monokai-borderColor
+
+ .group-control
+ border-color $ui-monokai-borderColor
+ .group-control-leftButton
+ colorDarkDefaultButton()
+ border-color $ui-monokai-borderColor
+ .group-control-rightButton
+ colorMonokaiPrimaryButton()
+ .group-hint
+ colorMonokaiControl()
+ .group-section-control
+ select, .group-section-control-input
+ colorMonokaiControl()
diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.js b/browser/main/modals/PreferencesModal/Crowdfunding.js
index 3dccd27b..196c1cb3 100644
--- a/browser/main/modals/PreferencesModal/Crowdfunding.js
+++ b/browser/main/modals/PreferencesModal/Crowdfunding.js
@@ -1,6 +1,7 @@
import React from 'react'
import CSSModules from 'browser/lib/CSSModules'
import styles from './Crowdfunding.styl'
+import i18n from 'browser/lib/i18n'
const electron = require('electron')
const { shell } = electron
@@ -21,22 +22,22 @@ class Crowdfunding extends React.Component {
render () {
return (
+
+ {i18n.__('Blog')}
+
+
+
+ {i18n.__('Blog Type')}
+
+
+
+
+
+
+ {i18n.__('Blog Address')}
+
+ this.handleBlogChange(e)}
+ ref='addressInput'
+ value={config.blog.address}
+ type='text'
+ />
+
+
+
+ {blogAlertElement}
+
+ {i18n.__('Auth')}
+
+
+
+ { config.blog.authMethod === 'JWT' &&
+
+ {i18n.__('Authentication Method')}
+
+
+
+
+
+
+ }
+ { config.blog.authMethod === 'USER' &&
+ {i18n.__('Token')}
+
+ this.handleBlogChange(e)}
+ ref='tokenInput'
+ value={config.blog.token}
+ type='text' />
+
+
+
+ }
+
+
+ {i18n.__('UserName')}
+
+ this.handleBlogChange(e)}
+ ref='usernameInput'
+ value={config.blog.username}
+ type='text' />
+
+
+
+ {i18n.__('Password')}
+
+ this.handleBlogChange(e)}
+ ref='passwordInput'
+ value={config.blog.password}
+ type='password' />
+
+
-
-
-
-
-
)
diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.styl b/browser/main/modals/PreferencesModal/Crowdfunding.styl
index 930c33f0..326867d3 100644
--- a/browser/main/modals/PreferencesModal/Crowdfunding.styl
+++ b/browser/main/modals/PreferencesModal/Crowdfunding.styl
@@ -11,11 +11,12 @@ p
font-size 16px
.cf-link
- width 250px
height 35px
border-radius 2px
border none
background-color alpha(#1EC38B, 90%)
+ padding-left 20px
+ padding-right 20px
&:hover
background-color #1EC38B
transition 0.2s
@@ -33,4 +34,10 @@ body[data-theme="solarized-dark"]
.root
color $ui-solarized-dark-text-color
p
- color $ui-solarized-dark-text-color
\ No newline at end of file
+ color $ui-solarized-dark-text-color
+
+body[data-theme="monokai"]
+ .root
+ color $ui-monokai-text-color
+ p
+ color $ui-monokai-text-color
diff --git a/browser/main/modals/PreferencesModal/FolderItem.js b/browser/main/modals/PreferencesModal/FolderItem.js
index 9d1cd08f..dc9082b9 100644
--- a/browser/main/modals/PreferencesModal/FolderItem.js
+++ b/browser/main/modals/PreferencesModal/FolderItem.js
@@ -7,6 +7,7 @@ import dataApi from 'browser/main/lib/dataApi'
import store from 'browser/main/store'
import { SketchPicker } from 'react-color'
import { SortableElement, SortableHandle } from 'react-sortable-hoc'
+import i18n from 'browser/lib/i18n'
class FolderItem extends React.Component {
constructor (props) {
@@ -150,12 +151,12 @@ class FolderItem extends React.Component {
Crowdfunding
- Dear all,
+{i18n.__('Crowdfunding')}
+ {i18n.__('Dear everyone,')}
-
Thanks for your using!
-Boostnote is used in about 200 countries and regions, it is a awesome developer community.
+{i18n.__('Thank you for using Boostnote!')}
+{i18n.__('Boostnote is used in about 200 different countries and regions by an awesome community of developers.')}
-
To continue supporting this growth, and to satisfy community expectations,
-we would like to invest more time in this project.
+{i18n.__('To continue supporting this growth, and to satisfy community expectations,')}
+{i18n.__('we would like to invest more time and resources in this project.')}
-
If you like this project and see its potential, you can help!
+{i18n.__('If you like this project and see its potential, you can help by supporting us on OpenCollective!')}
-
Thanks,
-Boostnote maintainers.
+{i18n.__('Thanks,')}
+{i18n.__('Boostnote maintainers')}
- Are you sure to delete this folder?
+ {i18n.__('Are you sure to ')} {i18n.__(' delete')} {i18n.__('this folder?')}
