this.handleScroll(e)}
- ref='root'
- >
- {notesList}
-
- )
- }
-}
-
-NoteList.propTypes = {
-}
-
-export default NoteList
diff --git a/browser/finder/StorageSection.js b/browser/finder/StorageSection.js
deleted file mode 100644
index e775743e..00000000
--- a/browser/finder/StorageSection.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import React from 'react'
-import CSSModules from 'browser/lib/CSSModules'
-import styles from './StorageSection.styl'
-import StorageItem from 'browser/components/StorageItem'
-
-class StorageSection extends React.Component {
- constructor (props) {
- super(props)
-
- this.state = {
- isOpen: true
- }
- }
-
- handleToggleButtonClick (e) {
- this.setState({
- isOpen: !this.state.isOpen
- })
- }
-
- handleHeaderClick (e) {
- const { storage } = this.props
- this.props.handleStorageButtonClick(e, storage.key)
- }
-
- handleFolderClick (e, folder) {
- const { storage } = this.props
- this.props.handleFolderButtonClick(e, storage.key, folder.key)
- }
-
- render () {
- const { storage, filter } = this.props
- const folderList = storage.folders
- .map(folder => (
-
-
- )
- }
-}
-
-StorageSection.propTypes = {
-}
-
-export default CSSModules(StorageSection, styles)
diff --git a/browser/finder/StorageSection.styl b/browser/finder/StorageSection.styl
deleted file mode 100644
index df5d792e..00000000
--- a/browser/finder/StorageSection.styl
+++ /dev/null
@@ -1,85 +0,0 @@
-.root
- position relative
-
-.header
- height 26px
-.header-toggleButton
- absolute top left
- width 25px
- height 26px
- navButtonColor()
- border none
- outline none
-.header-name
- display block
- height 26px
- navButtonColor()
- padding 0 10px 0 25px
- font-size 14px
- width 100%
- text-align left
- line-height 26px
- box-sizing border-box
- cursor pointer
- outline none
-
-.header-name--active
- @extend .header-name
- background-color $ui-button--active-backgroundColor
- color $ui-button--active-color
- &:hover
- background-color $ui-button--active-backgroundColor
-
-.folderList-item
- display block
- width 100%
- height 26px
- navButtonColor()
- padding 0 10px 0 25px
- font-size 14px
- width 100%
- text-align left
- line-height 26px
- box-sizing border-box
- cursor pointer
- outline none
- padding 0 10px
- margin 2px 0
- height 26px
- line-height 26px
- border-width 0 0 0 6px
- border-style solid
- border-color transparent
-
-.folderList-item--active
- @extend .folderList-item
- background-color $ui-button--active-backgroundColor
- color $ui-button--active-color
- &:hover
- background-color $ui-button--active-backgroundColor
-
-body[data-theme="dark"]
- .header-toggleButton
- navDarkButtonColor()
- .header-name
- navDarkButtonColor()
-
- .header-name--active
- @extend .header-name
- background-color $ui-button--active-backgroundColor
- color $ui-button--active-color
- &:hover
- background-color $ui-button--active-backgroundColor
-
- .folderList-item
- navDarkButtonColor()
- border-width 0 0 0 6px
- border-style solid
- border-color transparent
-
- .folderList-item--active
- @extend .folderList-item
- background-color $ui-button--active-backgroundColor
- color $ui-button--active-color
- &:hover
- background-color $ui-button--active-backgroundColor
diff --git a/browser/finder/index.js b/browser/finder/index.js
deleted file mode 100644
index af89147b..00000000
--- a/browser/finder/index.js
+++ /dev/null
@@ -1,357 +0,0 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-import ReactDOM from 'react-dom'
-import { connect, Provider } from 'react-redux'
-import _ from 'lodash'
-import store from './store'
-import CSSModules from 'browser/lib/CSSModules'
-import styles from './FinderMain.styl'
-import StorageSection from './StorageSection'
-import NoteList from './NoteList'
-import NoteDetail from './NoteDetail'
-import SideNavFilter from 'browser/components/SideNavFilter'
-import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
-require('!!style!css!stylus?sourceMap!../main/global.styl')
-require('../lib/customMeta')
-require('./ipcClient.js')
-
-const electron = require('electron')
-const { remote } = electron
-const { Menu } = remote
-
-function hideFinder () {
- const finderWindow = remote.getCurrentWindow()
- if (global.process.platform === 'win32') {
- finderWindow.blur()
- finderWindow.hide()
- }
- if (global.process.platform === 'darwin') {
- Menu.sendActionToFirstResponder('hide:')
- }
- remote.getCurrentWindow().hide()
-}
-
-require('!!style!css!stylus?sourceMap!../styles/finder/index.styl')
-
-class FinderMain extends React.Component {
- constructor (props) {
- super(props)
-
- this.state = {
- search: '',
- index: 0,
- filter: {
- includeSnippet: true,
- includeMarkdown: false,
- type: 'ALL',
- storage: null,
- folder: null
- }
- }
-
- this.focusHandler = (e) => this.handleWindowFocus(e)
- this.blurHandler = (e) => this.handleWindowBlur(e)
- }
-
- componentDidMount () {
- this.refs.search.focus()
- window.addEventListener('focus', this.focusHandler)
- window.addEventListener('blur', this.blurHandler)
- }
-
- componentWillUnmount () {
- window.removeEventListener('focus', this.focusHandler)
- window.removeEventListener('blur', this.blurHandler)
- }
-
- handleWindowFocus (e) {
- this.refs.search.focus()
- }
-
- handleWindowBlur (e) {
- this.setState({
- search: ''
- })
- }
-
- handleKeyDown (e) {
- this.refs.search.focus()
- if (e.keyCode === 9) {
- if (e.shiftKey) {
- this.refs.detail.selectPriorSnippet()
- } else {
- this.refs.detail.selectNextSnippet()
- }
- e.preventDefault()
- }
- if (e.keyCode === 38) {
- this.selectPrevious()
- e.preventDefault()
- }
-
- if (e.keyCode === 40) {
- this.selectNext()
- e.preventDefault()
- }
-
- if (e.keyCode === 13) {
- this.refs.detail.saveToClipboard()
- AwsMobileAnalyticsConfig.recordDynamicCustomEvent('COPY_FINDER')
- hideFinder()
- e.preventDefault()
- }
- if (e.keyCode === 27) {
- hideFinder()
- e.preventDefault()
- }
- if (e.keyCode === 91 || e.metaKey) {
- return
- }
- }
-
- handleSearchChange (e) {
- this.setState({
- search: e.target.value,
- index: 0
- })
- }
-
- selectArticle (article) {
- this.setState({currentArticle: article})
- }
-
- selectPrevious () {
- if (this.state.index > 0) {
- this.setState({
- index: this.state.index - 1
- })
- }
- }
-
- selectNext () {
- if (this.state.index < this.noteCount - 1) {
- this.setState({
- index: this.state.index + 1
- })
- }
- }
-
- handleOnlySnippetCheckboxChange (e) {
- const { filter } = this.state
- filter.includeSnippet = e.target.checked
- this.setState({
- filter: filter,
- index: 0
- }, () => {
- this.refs.search.focus()
- })
- }
-
- handleOnlyMarkdownCheckboxChange (e) {
- const { filter } = this.state
- filter.includeMarkdown = e.target.checked
- this.refs.list.resetScroll()
- this.setState({
- filter: filter,
- index: 0
- }, () => {
- this.refs.search.focus()
- })
- }
-
- handleAllNotesButtonClick (e) {
- const { filter } = this.state
- filter.type = 'ALL'
- this.refs.list.resetScroll()
- this.setState({
- filter,
- index: 0
- }, () => {
- this.refs.search.focus()
- })
- }
-
- handleStarredButtonClick (e) {
- const { filter } = this.state
- filter.type = 'STARRED'
- this.refs.list.resetScroll()
- this.setState({
- filter,
- index: 0
- }, () => {
- this.refs.search.focus()
- })
- }
-
- handleStorageButtonClick (e, storage) {
- const { filter } = this.state
- filter.type = 'STORAGE'
- filter.storage = storage
- this.refs.list.resetScroll()
- this.setState({
- filter,
- index: 0
- }, () => {
- this.refs.search.focus()
- })
- }
-
- handleFolderButtonClick (e, storage, folder) {
- const { filter } = this.state
- filter.type = 'FOLDER'
- filter.storage = storage
- filter.folder = folder
- this.refs.list.resetScroll()
- this.setState({
- filter,
- index: 0
- }, () => {
- this.refs.search.focus()
- })
- }
-
- handleNoteClick (e, index) {
- this.setState({
- index
- }, () => {
- this.refs.search.focus()
- })
- }
-
- render () {
- const { data, config } = this.props
- const { filter, search } = this.state
- const storageList = []
- for (const key in data.storageMap) {
- const storage = data.storageMap[key]
- const item = (
-
-
-
-
- {this.state.isOpen &&
-
- {folderList}
-
- }
- this.handleKeyDown(e)}
- >
-
- )
- }
-}
-
-FinderMain.propTypes = {
- dispatch: PropTypes.func
-}
-
-var Finder = connect((x) => x)(CSSModules(FinderMain, styles))
-
-function refreshData () {
- // let data = dataStore.getData(true)
-}
-
-ReactDOM.render((
-
- this.handleSearchChange(e)}
- />
-
-
- this.handleNoteClick(e, _index)}
- />
-
-
- this.handleAllNotesButtonClick(e)}
- isStarredActive={filter.type === 'STARRED'}
- handleStarredButtonClick={(e) => this.handleStarredButtonClick(e)}
- />
-
-
-
-
-
-
-
-
-
-
- {storageList}
-
-
-
- ${str}`
}
return '' +
- createGutter(str) +
- '' +
- str +
- ''
+ createGutter(str) +
+ '' +
+ str +
+ ''
}
})
md.use(emoji, {
@@ -57,7 +57,7 @@ md.use(math, {
blockRenderer: function (str) {
let output = ''
try {
- output = katex.renderToString(str.trim(), {displayMode: true})
+ output = katex.renderToString(str.trim(), { displayMode: true })
} catch (err) {
output = `${err.message}
`
}
@@ -76,7 +76,17 @@ md.use(require('markdown-it-named-headers'), {
}
})
md.use(require('markdown-it-kbd'))
-md.use(require('markdown-it-plantuml'))
+
+const deflate = require('markdown-it-plantuml/lib/deflate')
+md.use(require('markdown-it-plantuml'), '', {
+ generateSource: function (umlCode) {
+ const s = unescape(encodeURIComponent(umlCode))
+ const zippedCode = deflate.encode64(
+ deflate.zip_deflate(`@startuml\n${s}\n@enduml`, 9)
+ )
+ return `http://www.plantuml.com/plantuml/svg/${zippedCode}`
+ }
+})
// Override task item
md.block.ruler.at('paragraph', function (state, startLine/*, endLine */) {
@@ -110,7 +120,7 @@ md.block.ruler.at('paragraph', function (state, startLine/*, endLine */) {
state.line = nextLine
token = state.push('paragraph_open', 'p', 1)
- token.map = [ startLine, state.line ]
+ token.map = [startLine, state.line]
if (state.parentType === 'list') {
const match = content.match(/^\[( |x)\] ?(.+)/i)
@@ -121,7 +131,7 @@ md.block.ruler.at('paragraph', function (state, startLine/*, endLine */) {
token = state.push('inline', '', 0)
token.content = content
- token.map = [ startLine, state.line ]
+ token.map = [startLine, state.line]
token.children = []
token = state.push('paragraph_close', 'p', -1)
diff --git a/browser/main/Detail/Detail.styl b/browser/main/Detail/Detail.styl
index 4f4ebf12..d4c4100c 100644
--- a/browser/main/Detail/Detail.styl
+++ b/browser/main/Detail/Detail.styl
@@ -20,11 +20,13 @@
body[data-theme="dark"]
.root
background-color $ui-dark-backgroundColor
+ border-left 1px solid $ui-dark-borderColor
.empty-message
color $ui-dark-inactive-text-color
body[data-theme="solarized-dark"]
.root
background-color $ui-solarized-dark-noteDetail-backgroundColor
+ border-left 1px solid $ui-solarized-dark-borderColor
.empty-message
color $ui-solarized-dark-text-color
diff --git a/browser/main/Detail/FolderSelect.styl b/browser/main/Detail/FolderSelect.styl
index 22b7b9b7..31930fe6 100644
--- a/browser/main/Detail/FolderSelect.styl
+++ b/browser/main/Detail/FolderSelect.styl
@@ -3,20 +3,14 @@
border solid 1px transparent
vertical-align middle
border-radius 2px
+ height 30px
transition 0.15s
user-select none
margin-right 10px
- &:hover
- background-color $ui-button--hover-backgroundColor
.root--search, .root--focus
@extend .root
- background-color $ui-noteDetail-backgroundColor = #fff
border-color $ui-input--focus-borderColor
- width 154px
- height 30px
- &:hover
- border-color $ui-input--focus-borderColor = #fff
.idle
position relative
diff --git a/browser/main/Detail/FullscreenButton.styl b/browser/main/Detail/FullscreenButton.styl
index 7cee4faa..cc1a8dff 100644
--- a/browser/main/Detail/FullscreenButton.styl
+++ b/browser/main/Detail/FullscreenButton.styl
@@ -8,8 +8,8 @@
tooltip()
position absolute
pointer-events none
- top 26px
- right 0
+ top 50px
+ right 70px
z-index 200
padding 5px
line-height normal
diff --git a/browser/main/Detail/InfoButton.styl b/browser/main/Detail/InfoButton.styl
index a1c302f0..d2a84708 100644
--- a/browser/main/Detail/InfoButton.styl
+++ b/browser/main/Detail/InfoButton.styl
@@ -8,8 +8,8 @@
tooltip()
position absolute
pointer-events none
- top 26px
- right 0
+ top 50px
+ right 20px
z-index 200
padding 5px
line-height normal
diff --git a/browser/main/Detail/InfoPanel.js b/browser/main/Detail/InfoPanel.js
index a5202e71..44b9f09a 100644
--- a/browser/main/Detail/InfoPanel.js
+++ b/browser/main/Detail/InfoPanel.js
@@ -2,82 +2,97 @@ import PropTypes from 'prop-types'
import React from 'react'
import CSSModules from 'browser/lib/CSSModules'
import styles from './InfoPanel.styl'
+import copy from 'copy-to-clipboard'
-const InfoPanel = ({
- storageName, folderName, noteLink, updatedAt, createdAt, exportAsMd, exportAsTxt, exportAsHtml, wordCount, letterCount, type, print
-}) => (
-
-
- - {type === 'SNIPPET_NOTE' - ? '' - :
-
+class InfoPanel extends React.Component {
+ copyNoteLink () {
+ const {noteLink} = this.props
+ this.refs.noteLink.select()
+ copy(noteLink)
+ }
- {updatedAt}
-MODIFICATION DATE
-- - {type === 'SNIPPET_NOTE' - ? '' - :
- this.handleCloseButtonClick(e)} />
-
{wordCount}
-Words
+ render () { + const { + storageName, folderName, noteLink, updatedAt, createdAt, exportAsMd, exportAsTxt, exportAsHtml, wordCount, letterCount, type, print + } = this.props + return ( +
+
- } - -
- -
-)
+ )
+ }
+}
InfoPanel.propTypes = {
storageName: PropTypes.string.isRequired,
diff --git a/browser/main/Detail/InfoPanel.styl b/browser/main/Detail/InfoPanel.styl
index 72b07c87..d90dea49 100644
--- a/browser/main/Detail/InfoPanel.styl
+++ b/browser/main/Detail/InfoPanel.styl
@@ -11,11 +11,10 @@
.control-infoButton-panel
z-index 200
margin-top 0px
- right 0
+ right 25px
position absolute
padding 20px 25px 0 25px
width 300px
- height 350px
overflow auto
background-color $ui-noteList-backgroundColor
box-shadow 2px 12px 15px 2px rgba(0, 0, 0, 0.1), 2px 1px 50px 2px rgba(0, 0, 0, 0.1)
@@ -70,15 +69,30 @@
color $ui-text-color
.infoPanel-sub
- font-size 14px
+ font-size 12px
+ font-weight 600
color $ui-inactive-text-color
padding-bottom 8px
.infoPanel-noteLink
padding-right 5px
- width 200px
+ width 210px
height 25px
- margin-bottom 6px
+ margin 6px 0
+
+.infoPanel-copyButton
+ outline none
+ font-size 16px
+ color #A0A0A0
+ background-color transparent
+ border none
+ margin 0 5px
+ border-radius 5px
+ cursor pointer
+ &:hover
+ transition 0.2s
+ background-color alpha($ui-button--hover-backgroundColor, 30%)
+ color $ui-inactive-text-color
.infoPanel-trash
color #EA4447
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index 21c9a53f..2dac51a6 100644
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -367,10 +367,6 @@ class MarkdownNoteDetail extends React.Component {
+
- {updatedAt}
+MODIFICATION DATE
-
+ + {type === 'SNIPPET_NOTE' + ? '' + :
+ } + +
+ +
- }
-
- {type === 'SNIPPET_NOTE'
- ? ''
- : {letterCount}
-Letters
+ ++ + {type === 'SNIPPET_NOTE' + ? '' + :
+
+ }
+
+ {type === 'SNIPPET_NOTE'
+ ? ''
+ :
+
+ {wordCount}
+Words
+
+
+ {letterCount}
+Letters
++ } + +
+
+
+ {storageName}
+STORAGE
+
+
+
+ {folderName}
+FOLDER
+
+
+
+ {createdAt}
+CREATION DATE
+
+ { e.target.select() }} />
+
+
+
+ NOTE LINK
++ +
+
+
+
+
+
+
+
- } - -
-
-
- {storageName}
-STORAGE
-
-
-
- {folderName}
-FOLDER
-
-
-
- {createdAt}
-CREATION DATE
-
- { e.target.select() }} />
-
-
- NOTE LINK
-- -
-
-
-
-
-
-
-
-
-
- this.handleInfoButtonClick(e)}
- />
-
this.handleStarButtonClick(e)}
isActive={note.isStarred}
@@ -384,6 +380,7 @@ class MarkdownNoteDetail extends React.Component {
onMouseDown={(e) => this.handleLockButtonMouseDown(e)}
>
+ {this.state.isLocked ? Unlock : Lock}
return (
@@ -395,6 +392,10 @@ class MarkdownNoteDetail extends React.Component {
this.handleTrashButtonClick(e)} />
+ this.handleInfoButtonClick(e)}
+ />
+
this.handleCodeChange(index)(e)}
@@ -626,10 +627,6 @@ class SnippetNoteDetail extends React.Component {
/>
- this.handleInfoButtonClick(e)}
- />
-
this.handleStarButtonClick(e)}
isActive={note.isStarred}
@@ -637,10 +634,16 @@ class SnippetNoteDetail extends React.Component {
this.handleTrashButtonClick(e)} />
+
+ this.handleInfoButtonClick(e)}
+ />
+
(
diff --git a/browser/main/Detail/ToggleModeButton.styl b/browser/main/Detail/ToggleModeButton.styl
index b9d3cc6c..c69401f8 100644
--- a/browser/main/Detail/ToggleModeButton.styl
+++ b/browser/main/Detail/ToggleModeButton.styl
@@ -1,24 +1,28 @@
.control-toggleModeButton
- border 1px solid #eee
- height 34px
+ height 25px
+ border-radius 50px
+ background-color #F4F4F4
+ width 52px
display flex
align-items center
+ position absolute
+ right 165px
+ .active
+ background-color #1EC38B
+ width 33px
+ height 24px
+ box-shadow 2px 0px 7px #eee
+ z-index 1
div
width 40px
height 100%
- background-color #f9f9f9
+ border-radius 50%
display flex
align-items center
justify-content center
cursor pointer
- &:first-child
- border-right 1px solid #eee
- .active
- background-color #fff
- box-shadow 2px 0px 7px #eee
- z-index 1
&:hover .tooltip
opacity 1
@@ -26,9 +30,10 @@
tooltip()
position absolute
pointer-events none
- top 47px
- right 11px
+ top 33px
+ left -10px
z-index 200
+ width 80px
padding 5px
line-height normal
border-radius 2px
@@ -40,22 +45,14 @@ body[data-theme="dark"]
topBarButtonDark()
.control-toggleModeButton
- border 1px solid #444444
- div
- background-color $ui-dark-noteDetail-backgroundColor
- &:first-child
- border-right 1px solid #444444
- .active
background-color #3A404C
+ .active
+ background-color #1EC38B
box-shadow 2px 0px 7px #444444
body[data-theme="solarized-dark"]
.control-toggleModeButton
- border 1px solid #586E75
- div
- background-color $ui-solarized-dark-noteDetail-backgroundColor
- &:first-child
- border-right 1px solid #586E75
- .active
background-color #002B36
+ .active
+ background-color #1EC38B
box-shadow 2px 0px 7px #222222
\ No newline at end of file
diff --git a/browser/main/Detail/TrashButton.styl b/browser/main/Detail/TrashButton.styl
index 455d36a6..7c7af878 100644
--- a/browser/main/Detail/TrashButton.styl
+++ b/browser/main/Detail/TrashButton.styl
@@ -8,8 +8,8 @@
tooltip()
position absolute
pointer-events none
- top 26px
- right 0
+ top 50px
+ right 50px
z-index 200
padding 5px
line-height normal
diff --git a/browser/main/NewNoteButton/index.js b/browser/main/NewNoteButton/index.js
index 3adf3369..633433df 100644
--- a/browser/main/NewNoteButton/index.js
+++ b/browser/main/NewNoteButton/index.js
@@ -86,7 +86,7 @@ class NewNoteButton extends React.Component {
onClick={(e) => this.handleNewNoteButtonClick(e)}>
- Make a Note {OSX ? '⌘' : '^'} + n
+ Make a note {OSX ? '⌘' : 'Ctrl'} + N
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 083eb75f..30317095 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -11,10 +11,8 @@ import NoteItem from 'browser/components/NoteItem'
import NoteItemSimple from 'browser/components/NoteItemSimple'
import searchFromNotes from 'browser/lib/search'
import fs from 'fs'
+import path from 'path'
import { hashHistory } from 'react-router'
-import markdown from 'browser/lib/markdownTextHelper'
-import { findNoteTitle } from 'browser/lib/findNoteTitle'
-import store from 'browser/main/store'
import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
const { remote } = require('electron')
@@ -171,9 +169,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()
@@ -199,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()
const isTargetLastNote = targetIndex === this.notes.length - 1
@@ -242,7 +238,6 @@ class NoteList extends React.Component {
}
handleNoteListKeyDown (e) {
- const { shiftKeyDown } = this.state
if (e.metaKey || e.ctrlKey) return true
if (e.keyCode === 65 && !e.shiftKey) {
@@ -284,7 +279,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
@@ -355,9 +350,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)
@@ -443,6 +439,7 @@ class NoteList extends React.Component {
const pinLabel = note.isPinned ? 'Remove pin' : 'Pin to Top'
const deleteLabel = 'Delete Note'
+ const cloneNote = 'Clone Note'
const menu = new Menu()
if (!location.pathname.match(/\/home|\/starred|\/trash/)) {
@@ -455,6 +452,10 @@ class NoteList extends React.Component {
label: deleteLabel,
click: this.deleteNote
}))
+ menu.append(new MenuItem({
+ label: cloneNote,
+ click: this.cloneNote.bind(this)
+ }))
menu.popup()
}
@@ -545,6 +546,42 @@ 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 + ' copy',
+ content: firstNote.content
+ })
+ .then((note) => {
+ const uniqueKey = note.storage + '-' + note.key
+ dispatch({
+ type: 'UPDATE_NOTE',
+ note: note
+ })
+
+ this.setState({
+ selectedNoteKeys: [uniqueKey]
+ })
+
+ hashHistory.push({
+ pathname: location.pathname,
+ query: {key: uniqueKey}
+ })
+ })
+ }
+
importFromFile () {
const options = {
filters: [
@@ -582,7 +619,7 @@ class NoteList extends React.Component {
const newNote = {
content: content,
folder: folder.key,
- title: markdown.strip(findNoteTitle(content)),
+ title: path.basename(filepath, path.extname(filepath)),
type: 'MARKDOWN_NOTE',
createdAt: birthtime,
updatedAt: mtime
@@ -642,9 +679,10 @@ class NoteList extends React.Component {
}
render () {
- let { location, notes, config, dispatch } = this.props
- let { selectedNoteKeys } = this.state
- let sortFunc = config.sortBy === 'CREATED_AT'
+ const { location, config } = this.props
+ let { notes } = this.props
+ const { selectedNoteKeys } = this.state
+ const sortFunc = config.sortBy === 'CREATED_AT'
? sortByCreatedAt
: config.sortBy === 'ALPHABETICAL'
? sortByAlphabetical
@@ -689,7 +727,6 @@ class NoteList extends React.Component {
config.sortBy === 'CREATED_AT'
? note.createdAt : note.updatedAt
).fromNow('D')
- const key = `${note.storage}-${note.key}`
if (isDefault) {
return (
diff --git a/browser/main/SideNav/StorageItem.js b/browser/main/SideNav/StorageItem.js
index bbf87306..5d7e6005 100644
--- a/browser/main/SideNav/StorageItem.js
+++ b/browser/main/SideNav/StorageItem.js
@@ -8,12 +8,10 @@ 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'
const { remote } = require('electron')
-const { Menu, MenuItem, dialog } = remote
+const { Menu, dialog } = remote
class StorageItem extends React.Component {
constructor (props) {
diff --git a/browser/main/StatusBar/StatusBar.styl b/browser/main/StatusBar/StatusBar.styl
index 9f189fec..e055dc0d 100644
--- a/browser/main/StatusBar/StatusBar.styl
+++ b/browser/main/StatusBar/StatusBar.styl
@@ -21,19 +21,20 @@
color white
.zoom
- navButtonColor()
- color rgba(0,0,0,.54)
- height 20px
- display flex
- padding 0
- align-items center
- background-color transparent
- &:hover
- color $ui-active-color
- &:active
- color $ui-active-color
- span
- margin-left 5px
+ display none
+ // navButtonColor()
+ // color rgba(0,0,0,.54)
+ // height 20px
+ // display flex
+ // padding 0
+ // align-items center
+ // background-color transparent
+ // &:hover
+ // color $ui-active-color
+ // &:active
+ // color $ui-active-color
+ // span
+ // margin-left 5px
.update
navButtonColor()
diff --git a/browser/main/global.styl b/browser/main/global.styl
index 27d1ae73..1b40587c 100644
--- a/browser/main/global.styl
+++ b/browser/main/global.styl
@@ -97,7 +97,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
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 3d70a7a3..fde7dafd 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -18,7 +18,6 @@ export const DEFAULT_CONFIG = {
listStyle: 'DEFAULT', // 'DEFAULT', 'SMALL'
amaEnabled: true,
hotkey: {
- toggleFinder: OSX ? 'Cmd + Alt + S' : 'Super + Alt + S',
toggleMain: OSX ? 'Cmd + Alt + L' : 'Super + Alt + E'
},
ui: {
@@ -34,6 +33,7 @@ export const DEFAULT_CONFIG = {
fontFamily: win ? 'Segoe UI' : 'Monaco, Consolas',
indentType: 'space',
indentSize: '2',
+ displayLineNumbers: true,
switchPreview: 'BLUR', // Available value: RIGHTCLICK, BLUR
scrollPastEnd: false,
type: 'SPLIT'
@@ -46,7 +46,8 @@ export const DEFAULT_CONFIG = {
latexInlineOpen: '$',
latexInlineClose: '$',
latexBlockOpen: '$$',
- latexBlockClose: '$$'
+ latexBlockClose: '$$',
+ scrollPastEnd: false
}
}
diff --git a/browser/main/lib/ipcClient.js b/browser/main/lib/ipcClient.js
index 12acfed2..dc45c65d 100644
--- a/browser/main/lib/ipcClient.js
+++ b/browser/main/lib/ipcClient.js
@@ -24,20 +24,6 @@ nodeIpc.connectTo(
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/modals/NewNoteModal.js b/browser/main/modals/NewNoteModal.js
index 346fe920..24b150cb 100644
--- a/browser/main/modals/NewNoteModal.js
+++ b/browser/main/modals/NewNoteModal.js
@@ -106,7 +106,7 @@ class NewNoteModal extends React.Component {
onKeyDown={(e) => this.handleKeyDown(e)}
>
onClick('SPLIT')}>
- 
+
onClick('EDITOR_PREVIEW')}>
-
+
Toggle Mode
- Make a Note {OSX ? '⌘' : '^'} + n
+ Make a note {OSX ? '⌘' : 'Ctrl'} + N
-
Make a Note
+ Make a note
diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl
index ea26af08..f6f7ace9 100644
--- a/browser/main/modals/PreferencesModal/ConfigTab.styl
+++ b/browser/main/modals/PreferencesModal/ConfigTab.styl
@@ -89,9 +89,9 @@
margin-right 10px
.group-control-rightButton
- position absolute
- top 10px
- right 20px
+ position fixed
+ top 80px
+ right 100px
colorPrimaryButton()
border none
border-radius 2px
diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.js b/browser/main/modals/PreferencesModal/Crowdfunding.js
index 3dccd27b..048520b0 100644
--- a/browser/main/modals/PreferencesModal/Crowdfunding.js
+++ b/browser/main/modals/PreferencesModal/Crowdfunding.js
@@ -22,18 +22,18 @@ class Crowdfunding extends React.Component {
return (
-
-
Crowdfunding
- Dear all,
+Dear everyone,
-
Thanks for your using!
-Boostnote is used in about 200 countries and regions, it is a awesome developer community.
+Thank you for using Boostnote!
+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.
+we would like to invest more time and resources in this project.
-
If you like this project and see its potential, you can help!
+If you like this project and see its potential, you can help by supporting us on OpenCollective!
Thanks,
-Boostnote maintainers.
+Boostnote maintainers