diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index d7b16001..71843161 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -7,7 +7,9 @@ import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement' import convertModeName from 'browser/lib/convertModeName' import eventEmitter from 'browser/main/lib/eventEmitter' import iconv from 'iconv-lite' - +import crypto from 'crypto' +import consts from 'browser/lib/consts' +import fs from 'fs' const { ipcRenderer } = require('electron') CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js' @@ -81,8 +83,21 @@ export default class CodeEditor extends React.Component { componentDidMount () { const { rulers, enableRulers } = this.props - this.value = this.props.value + const expandSnippet = this.expandSnippet.bind(this) + const defaultSnippet = [ + { + id: crypto.randomBytes(16).toString('hex'), + name: 'Dummy text', + prefix: ['lorem', 'ipsum'], + content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.' + } + ] + if (!fs.existsSync(consts.SNIPPET_FILE)) { + fs.writeFileSync(consts.SNIPPET_FILE, JSON.stringify(defaultSnippet, null, 4), 'utf8') + } + + this.value = this.props.value this.editor = CodeMirror(this.refs.root, { rulers: buildCMRulers(rulers, enableRulers), value: this.props.value, @@ -103,6 +118,8 @@ export default class CodeEditor extends React.Component { Tab: function (cm) { const cursor = cm.getCursor() const line = cm.getLine(cursor.line) + const cursorPosition = cursor.ch + const charBeforeCursor = line.substr(cursorPosition - 1, 1) if (cm.somethingSelected()) cm.indentSelection('add') else { const tabs = cm.getOption('indentWithTabs') @@ -114,6 +131,16 @@ export default class CodeEditor extends React.Component { cm.execCommand('insertSoftTab') } cm.execCommand('goLineEnd') + } else if (!charBeforeCursor.match(/\t|\s|\r|\n/) && cursor.ch > 1) { + // text expansion on tab key if the char before is alphabet + const snippets = JSON.parse(fs.readFileSync(consts.SNIPPET_FILE, 'utf8')) + if (expandSnippet(line, cursor, cm, snippets) === false) { + if (tabs) { + cm.execCommand('insertTab') + } else { + cm.execCommand('insertSoftTab') + } + } } else { if (tabs) { cm.execCommand('insertTab') @@ -157,6 +184,73 @@ export default class CodeEditor extends React.Component { CodeMirror.Vim.map('ZZ', ':q', 'normal') } + expandSnippet (line, cursor, cm, snippets) { + const wordBeforeCursor = this.getWordBeforeCursor(line, cursor.line, cursor.ch) + const templateCursorString = ':{}' + for (let i = 0; i < snippets.length; i++) { + if (snippets[i].prefix.indexOf(wordBeforeCursor.text) !== -1) { + if (snippets[i].content.indexOf(templateCursorString) !== -1) { + const snippetLines = snippets[i].content.split('\n') + let cursorLineNumber = 0 + let cursorLinePosition = 0 + for (let j = 0; j < snippetLines.length; j++) { + const cursorIndex = snippetLines[j].indexOf(templateCursorString) + if (cursorIndex !== -1) { + cursorLineNumber = j + cursorLinePosition = cursorIndex + cm.replaceRange( + snippets[i].content.replace(templateCursorString, ''), + wordBeforeCursor.range.from, + wordBeforeCursor.range.to + ) + cm.setCursor({ line: cursor.line + cursorLineNumber, ch: cursorLinePosition }) + } + } + } else { + cm.replaceRange( + snippets[i].content, + wordBeforeCursor.range.from, + wordBeforeCursor.range.to + ) + } + return true + } + } + + return false + } + + getWordBeforeCursor (line, lineNumber, cursorPosition) { + let wordBeforeCursor = '' + const originCursorPosition = cursorPosition + const emptyChars = /\t|\s|\r|\n/ + + // to prevent the word to expand is long that will crash the whole app + // the safeStop is there to stop user to expand words that longer than 20 chars + const safeStop = 20 + + while (cursorPosition > 0) { + const currentChar = line.substr(cursorPosition - 1, 1) + // if char is not an empty char + if (!emptyChars.test(currentChar)) { + wordBeforeCursor = currentChar + wordBeforeCursor + } else if (wordBeforeCursor.length >= safeStop) { + throw new Error('Your snippet trigger is too long !') + } else { + break + } + cursorPosition-- + } + + return { + text: wordBeforeCursor, + range: { + from: {line: lineNumber, ch: originCursorPosition}, + to: {line: lineNumber, ch: cursorPosition} + } + } + } + quitEditor () { document.querySelector('textarea').blur() } diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index 69340ae5..4fa3841a 100755 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -402,7 +402,7 @@ export default class MarkdownPreview extends React.Component { value = value.replace(codeBlock, htmlTextHelper.encodeEntities(codeBlock)) }) } - let renderedHTML = this.markdown.render(value) + const renderedHTML = this.markdown.render(value) this.refs.root.contentWindow.document.body.innerHTML = attachmentManagement.fixLocalURLS(renderedHTML, storagePath) _.forEach(this.refs.root.contentWindow.document.querySelectorAll('input[type="checkbox"]'), (el) => { diff --git a/browser/lib/consts.js b/browser/lib/consts.js index c6b2ea5b..e744e87a 100644 --- a/browser/lib/consts.js +++ b/browser/lib/consts.js @@ -12,6 +12,10 @@ const themes = fs.readdirSync(themePath) }) themes.splice(themes.indexOf('solarized'), 1, 'solarized dark', 'solarized light') +const snippetFile = process.env.NODE_ENV !== 'test' + ? path.join(app.getPath('appData'), 'Boostnote', 'snippets.json') + : '' // return nothing as we specified different path to snippets.json in test + const consts = { FOLDER_COLORS: [ '#E10051', @@ -31,7 +35,8 @@ const consts = { 'Dodger Blue', 'Violet Eggplant' ], - THEMES: ['default'].concat(themes) + THEMES: ['default'].concat(themes), + SNIPPET_FILE: snippetFile } module.exports = consts diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js index 0159293a..67adf700 100644 --- a/browser/main/SideNav/index.js +++ b/browser/main/SideNav/index.js @@ -185,7 +185,7 @@ class SideNav extends React.Component { ).filter( note => activeTags.every(tag => note.tags.includes(tag)) ) - let relatedTags = new Set() + const relatedTags = new Set() relatedNotes.forEach(note => note.tags.map(tag => relatedTags.add(tag))) return relatedTags } @@ -224,7 +224,7 @@ class SideNav extends React.Component { handleClickNarrowToTag (tag) { const { router } = this.context const { location } = this.props - let listOfTags = this.getActiveTags(location.pathname) + const listOfTags = this.getActiveTags(location.pathname) const indexOfTag = listOfTags.indexOf(tag) if (indexOfTag > -1) { listOfTags.splice(indexOfTag, 1) 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/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/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..7c57e016 100644 --- a/browser/main/lib/dataApi/index.js +++ b/browser/main/lib/dataApi/index.js @@ -13,6 +13,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/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/modals/PreferencesModal/SnippetEditor.js b/browser/main/modals/PreferencesModal/SnippetEditor.js new file mode 100644 index 00000000..f0e93dec --- /dev/null +++ b/browser/main/modals/PreferencesModal/SnippetEditor.js @@ -0,0 +1,90 @@ +import CodeMirror from 'codemirror' +import React from 'react' +import _ from 'lodash' +import styles from './SnippetTab.styl' +import CSSModules from 'browser/lib/CSSModules' +import dataApi from 'browser/main/lib/dataApi' + +const defaultEditorFontFamily = ['Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'monospace'] +const buildCMRulers = (rulers, enableRulers) => + enableRulers ? rulers.map(ruler => ({ column: ruler })) : [] + +class SnippetEditor extends React.Component { + + componentDidMount () { + this.props.onRef(this) + const { rulers, enableRulers } = this.props + this.cm = CodeMirror(this.refs.root, { + rulers: buildCMRulers(rulers, enableRulers), + lineNumbers: this.props.displayLineNumbers, + lineWrapping: true, + theme: this.props.theme, + indentUnit: this.props.indentSize, + tabSize: this.props.indentSize, + indentWithTabs: this.props.indentType !== 'space', + keyMap: this.props.keyMap, + scrollPastEnd: this.props.scrollPastEnd, + dragDrop: false, + foldGutter: true, + gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'], + autoCloseBrackets: true, + mode: 'null' + }) + this.cm.setSize('100%', '100%') + let changeDelay = null + + this.cm.on('change', () => { + this.snippet.content = this.cm.getValue() + + clearTimeout(changeDelay) + changeDelay = setTimeout(() => { + this.saveSnippet() + }, 500) + }) + } + + componentWillUnmount () { + this.props.onRef(undefined) + } + + onSnippetChanged (newSnippet) { + this.snippet = newSnippet + this.cm.setValue(this.snippet.content) + } + + onSnippetNameOrPrefixChanged (newSnippet) { + this.snippet.name = newSnippet.name + this.snippet.prefix = newSnippet.prefix.toString().replace(/\s/g, '').split(',') + this.saveSnippet() + } + + saveSnippet () { + dataApi.updateSnippet(this.snippet).catch((err) => { throw err }) + } + + render () { + const { fontSize } = this.props + let fontFamily = this.props.fontFamily + fontFamily = _.isString(fontFamily) && fontFamily.length > 0 + ? [fontFamily].concat(defaultEditorFontFamily) + : defaultEditorFontFamily + return ( +
+ ) + } +} + +SnippetEditor.defaultProps = { + readOnly: false, + theme: 'xcode', + keyMap: 'sublime', + fontSize: 14, + fontFamily: 'Monaco, Consolas', + indentSize: 4, + indentType: 'space' +} + +export default CSSModules(SnippetEditor, styles) diff --git a/browser/main/modals/PreferencesModal/SnippetList.js b/browser/main/modals/PreferencesModal/SnippetList.js new file mode 100644 index 00000000..3cf28cf6 --- /dev/null +++ b/browser/main/modals/PreferencesModal/SnippetList.js @@ -0,0 +1,87 @@ +import React from 'react' +import styles from './SnippetTab.styl' +import CSSModules from 'browser/lib/CSSModules' +import dataApi from 'browser/main/lib/dataApi' +import i18n from 'browser/lib/i18n' +import eventEmitter from 'browser/main/lib/eventEmitter' +const { remote } = require('electron') +const { Menu, MenuItem } = remote + +class SnippetList extends React.Component { + constructor (props) { + super(props) + this.state = { + snippets: [] + } + } + + componentDidMount () { + this.reloadSnippetList() + eventEmitter.on('snippetList:reload', this.reloadSnippetList.bind(this)) + } + + reloadSnippetList () { + dataApi.fetchSnippet().then(snippets => this.setState({snippets})) + } + + handleSnippetContextMenu (snippet) { + const menu = new Menu() + menu.append(new MenuItem({ + label: i18n.__('Delete snippet'), + click: () => { + this.deleteSnippet(snippet) + } + })) + menu.popup() + } + + deleteSnippet (snippet) { + dataApi.deleteSnippet(snippet).then(() => { + this.reloadSnippetList() + this.props.onSnippetDeleted(snippet) + }).catch(err => { throw err }) + } + + handleSnippetClick (snippet) { + this.props.onSnippetClick(snippet) + } + + createSnippet () { + dataApi.createSnippet().then(() => { + this.reloadSnippetList() + // scroll to end of list when added new snippet + const snippetList = document.getElementById('snippets') + snippetList.scrollTop = snippetList.scrollHeight + }).catch(err => { throw err }) + } + + render () { + const { snippets } = this.state + return ( +
+
+
+ +
+
+
    + { + snippets.map((snippet) => ( +
  • this.handleSnippetContextMenu(snippet)} + onClick={() => this.handleSnippetClick(snippet)}> + {snippet.name} +
    • + )) + } +
+
+ ) + } +} + +export default CSSModules(SnippetList, styles) diff --git a/browser/main/modals/PreferencesModal/SnippetTab.js b/browser/main/modals/PreferencesModal/SnippetTab.js new file mode 100644 index 00000000..67e9ace6 --- /dev/null +++ b/browser/main/modals/PreferencesModal/SnippetTab.js @@ -0,0 +1,116 @@ +import React from 'react' +import CSSModules from 'browser/lib/CSSModules' +import styles from './SnippetTab.styl' +import SnippetEditor from './SnippetEditor' +import i18n from 'browser/lib/i18n' +import dataApi from 'browser/main/lib/dataApi' +import SnippetList from './SnippetList' +import eventEmitter from 'browser/main/lib/eventEmitter' + +class SnippetTab extends React.Component { + constructor (props) { + super(props) + this.state = { + currentSnippet: null + } + this.changeDelay = null + } + + handleSnippetNameOrPrefixChange () { + clearTimeout(this.changeDelay) + this.changeDelay = setTimeout(() => { + // notify the snippet editor that the name or prefix of snippet has been changed + this.snippetEditor.onSnippetNameOrPrefixChanged(this.state.currentSnippet) + eventEmitter.emit('snippetList:reload') + }, 500) + } + + handleSnippetClick (snippet) { + const { currentSnippet } = this.state + if (currentSnippet === null || currentSnippet.id !== snippet.id) { + dataApi.fetchSnippet(snippet.id).then(changedSnippet => { + // notify the snippet editor to load the content of the new snippet + this.snippetEditor.onSnippetChanged(changedSnippet) + this.setState({currentSnippet: changedSnippet}) + }) + } + } + + onSnippetNameOrPrefixChanged (e, type) { + const newSnippet = Object.assign({}, this.state.currentSnippet) + if (type === 'name') { + newSnippet.name = e.target.value + } else { + newSnippet.prefix = e.target.value + } + this.setState({ currentSnippet: newSnippet }) + this.handleSnippetNameOrPrefixChange() + } + + handleDeleteSnippet (snippet) { + // prevent old snippet still display when deleted + if (snippet.id === this.state.currentSnippet.id) { + this.setState({currentSnippet: null}) + } + } + + render () { + const { config, storageKey } = this.props + const { currentSnippet } = this.state + + let editorFontSize = parseInt(config.editor.fontSize, 10) + if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14 + let editorIndentSize = parseInt(config.editor.indentSize, 10) + if (!(editorFontSize > 0 && editorFontSize < 132)) editorIndentSize = 4 + return ( +
+
{i18n.__('Snippets')}
+ +
+
+
{i18n.__('Snippet name')}
+
+ { this.onSnippetNameOrPrefixChanged(e, 'name') }} + type='text' /> +
+
+
+
{i18n.__('Snippet prefix')}
+
+ { this.onSnippetNameOrPrefixChanged(e, 'prefix') }} + type='text' /> +
+
+
+ { this.snippetEditor = ref }} /> +
+
+
+ ) + } +} + +SnippetTab.PropTypes = { +} + +export default CSSModules(SnippetTab, styles) diff --git a/browser/main/modals/PreferencesModal/SnippetTab.styl b/browser/main/modals/PreferencesModal/SnippetTab.styl new file mode 100644 index 00000000..118c56ed --- /dev/null +++ b/browser/main/modals/PreferencesModal/SnippetTab.styl @@ -0,0 +1,180 @@ +@import('./Tab') +@import('./ConfigTab') + +.root + padding 15px + white-space pre + line-height 1.4 + color alpha($ui-text-color, 90%) + width 100% + font-size 14px + +.group + margin-bottom 45px + +.group-header + @extend .header + color $ui-text-color + +.group-header2 + font-size 20px + color $ui-text-color + margin-bottom 15px + margin-top 30px + +.group-section + margin-bottom 20px + display flex + line-height 30px + +.group-section-label + width 150px + text-align left + margin-right 10px + font-size 14px + +.group-section-control + flex 1 + margin-left 5px + +.group-section-control select + outline none + border 1px solid $ui-borderColor + font-size 16px + height 30px + width 250px + margin-bottom 5px + background-color transparent + +.group-section-control-input + height 30px + vertical-align middle + width 400px + font-size $tab--button-font-size + border solid 1px $border-color + border-radius 2px + padding 0 5px + outline none + &:disabled + background-color $ui-input--disabled-backgroundColor + +.group-control-button + height 30px + border none + border-top-right-radius 2px + border-bottom-right-radius 2px + colorPrimaryButton() + vertical-align middle + padding 0 20px + +.group-checkBoxSection + margin-bottom 15px + display flex + line-height 30px + padding-left 15px + +.group-control + padding-top 10px + box-sizing border-box + height 40px + text-align right + :global + .alert + display inline-block + position absolute + top 60px + right 15px + font-size 14px + .success + color #1EC38B + .error + color red + .warning + color #FFA500 + +.snippet-list + width 30% + height calc(100% - 200px) + position absolute + + .snippets + height calc(100% - 8px) + overflow scroll + background: #f5f5f5 + + .snippet-item + height 50px + font-size 15px + line-height 50px + padding 0 5% + cursor pointer + position relative + + &::after + width 90% + height 1px + background rgba(0, 0, 0, 0.1) + position absolute + top 100% + left 5% + content '' + + &:hover + background darken(#f5f5f5, 5) + +.snippet-detail + width 70% + height calc(100% - 200px) + position absolute + left 33% + +.SnippetEditor + position absolute + width 100% + height 90% + +body[data-theme="default"], body[data-theme="white"] + .snippets + background $ui-backgroundColor + .snippet-item + color black + &::after + background $ui-borderColor + &:hover + background darken($ui-backgroundColor, 5) + +body[data-theme="dark"] + .snippets + background $ui-dark-backgroundColor + .snippet-item + color white + &::after + background $ui-dark-borderColor + &:hover + background darken($ui-dark-backgroundColor, 5) + .snippet-detail + color white + +body[data-theme="solarized-dark"] + .snippets + background $ui-solarized-dark-backgroundColor + .snippet-item + color white + &::after + background $ui-solarized-dark-borderColor + &:hover + background darken($ui-solarized-dark-backgroundColor, 5) + .snippet-detail + color white + +body[data-theme="monokai"] + .snippets + background $ui-monokai-backgroundColor + .snippet-item + color White + &::after + background $ui-monokai-borderColor + &:hover + background darken($ui-monokai-backgroundColor, 5) + .snippet-detail + color white diff --git a/browser/main/modals/PreferencesModal/index.js b/browser/main/modals/PreferencesModal/index.js index 70e25a88..f3fc3751 100644 --- a/browser/main/modals/PreferencesModal/index.js +++ b/browser/main/modals/PreferencesModal/index.js @@ -6,6 +6,7 @@ import UiTab from './UiTab' import InfoTab from './InfoTab' import Crowdfunding from './Crowdfunding' import StoragesTab from './StoragesTab' +import SnippetTab from './SnippetTab' import Blog from './Blog' import ModalEscButton from 'browser/components/ModalEscButton' import CSSModules from 'browser/lib/CSSModules' @@ -86,6 +87,14 @@ class Preferences extends React.Component { haveToSave={alert => this.setState({BlogAlert: alert})} /> ) + case 'SNIPPET': + return ( + + ) case 'STORAGES': default: return ( @@ -123,7 +132,8 @@ class Preferences extends React.Component { {target: 'UI', label: i18n.__('Interface'), UI: this.state.UIAlert}, {target: 'INFO', label: i18n.__('About')}, {target: 'CROWDFUNDING', label: i18n.__('Crowdfunding')}, - {target: 'BLOG', label: i18n.__('Blog'), Blog: this.state.BlogAlert} + {target: 'BLOG', label: i18n.__('Blog'), Blog: this.state.BlogAlert}, + {target: 'SNIPPET', label: i18n.__('Snippets')} ] const navButtons = tabs.map((tab) => { diff --git a/package.json b/package.json index d0368702..ed392272 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "compile": "grunt compile", "test": "PWD=$(pwd) NODE_ENV=test ava --serial", "jest": "jest", - "fix": "npm run lint --fix", + "fix": "eslint . --fix", "lint": "eslint .", "dev-start": "concurrently --kill-others \"npm run webpack\" \"npm run hot\"" }, @@ -123,7 +123,7 @@ "eslint": "^3.13.1", "eslint-config-standard": "^6.2.1", "eslint-config-standard-jsx": "^3.2.0", - "eslint-plugin-react": "^7.2.0", + "eslint-plugin-react": "^7.8.2", "eslint-plugin-standard": "^3.0.1", "faker": "^3.1.0", "grunt": "^0.4.5", diff --git a/tests/dataApi/createSnippet-test.js b/tests/dataApi/createSnippet-test.js new file mode 100644 index 00000000..f06cf861 --- /dev/null +++ b/tests/dataApi/createSnippet-test.js @@ -0,0 +1,34 @@ +const test = require('ava') +const createSnippet = require('browser/main/lib/dataApi/createSnippet') +const sander = require('sander') +const os = require('os') +const path = require('path') + +const snippetFilePath = path.join(os.tmpdir(), 'test', 'create-snippet') +const snippetFile = path.join(snippetFilePath, 'snippets.json') + +test.beforeEach((t) => { + sander.writeFileSync(snippetFile, '[]') +}) + +test.serial('Create a snippet', (t) => { + return Promise.resolve() + .then(function doTest () { + return Promise.all([ + createSnippet(snippetFile) + ]) + }) + .then(function assert (data) { + data = data[0] + const snippets = JSON.parse(sander.readFileSync(snippetFile)) + const snippet = snippets.find(currentSnippet => currentSnippet.id === data.id) + t.not(snippet, undefined) + t.is(snippet.name, data.name) + t.deepEqual(snippet.prefix, data.prefix) + t.is(snippet.content, data.content) + }) +}) + +test.after.always(() => { + sander.rimrafSync(snippetFilePath) +}) diff --git a/tests/dataApi/deleteSnippet-test.js b/tests/dataApi/deleteSnippet-test.js new file mode 100644 index 00000000..9d13249b --- /dev/null +++ b/tests/dataApi/deleteSnippet-test.js @@ -0,0 +1,37 @@ +const test = require('ava') +const deleteSnippet = require('browser/main/lib/dataApi/deleteSnippet') +const sander = require('sander') +const os = require('os') +const path = require('path') +const crypto = require('crypto') + +const snippetFilePath = path.join(os.tmpdir(), 'test', 'delete-snippet') +const snippetFile = path.join(snippetFilePath, 'snippets.json') +const newSnippet = { + id: crypto.randomBytes(16).toString('hex'), + name: 'Unnamed snippet', + prefix: [], + content: '' +} + +test.beforeEach((t) => { + sander.writeFileSync(snippetFile, JSON.stringify([newSnippet])) +}) + +test.serial('Delete a snippet', (t) => { + return Promise.resolve() + .then(function doTest () { + return Promise.all([ + deleteSnippet(newSnippet, snippetFile) + ]) + }) + .then(function assert (data) { + data = data[0] + const snippets = JSON.parse(sander.readFileSync(snippetFile)) + t.is(snippets.length, 0) + }) +}) + +test.after.always(() => { + sander.rimrafSync(snippetFilePath) +}) diff --git a/tests/dataApi/updateSnippet-test.js b/tests/dataApi/updateSnippet-test.js new file mode 100644 index 00000000..662548bd --- /dev/null +++ b/tests/dataApi/updateSnippet-test.js @@ -0,0 +1,47 @@ +const test = require('ava') +const updateSnippet = require('browser/main/lib/dataApi/updateSnippet') +const sander = require('sander') +const os = require('os') +const path = require('path') +const crypto = require('crypto') + +const snippetFilePath = path.join(os.tmpdir(), 'test', 'update-snippet') +const snippetFile = path.join(snippetFilePath, 'snippets.json') +const oldSnippet = { + id: crypto.randomBytes(16).toString('hex'), + name: 'Initial snippet', + prefix: [], + content: '' +} + +const newSnippet = { + id: oldSnippet.id, + name: 'new name', + prefix: ['prefix'], + content: 'new content' +} + +test.beforeEach((t) => { + sander.writeFileSync(snippetFile, JSON.stringify([oldSnippet])) +}) + +test.serial('Update a snippet', (t) => { + return Promise.resolve() + .then(function doTest () { + return Promise.all([ + updateSnippet(newSnippet, snippetFile) + ]) + }) + .then(function assert () { + const snippets = JSON.parse(sander.readFileSync(snippetFile)) + const snippet = snippets.find(currentSnippet => currentSnippet.id === newSnippet.id) + t.not(snippet, undefined) + t.is(snippet.name, newSnippet.name) + t.deepEqual(snippet.prefix, newSnippet.prefix) + t.is(snippet.content, newSnippet.content) + }) +}) + +test.after.always(() => { + sander.rimrafSync(snippetFilePath) +}) diff --git a/yarn.lock b/yarn.lock index fcf87c4a..a0d630dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2382,6 +2382,12 @@ doctrine@^2.0.0, doctrine@^2.0.2: dependencies: esutils "^2.0.2" +doctrine@^2.0.2: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + dependencies: + esutils "^2.0.2" + dom-serializer@0: version "0.1.0" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" @@ -2771,7 +2777,11 @@ eslint-plugin-promise@~3.4.0: version "3.4.2" resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz#1be2793eafe2d18b5b123b8136c269f804fe7122" +<<<<<<< HEAD +eslint-plugin-react@^7.8.2: +======= eslint-plugin-react@^7.2.0: +>>>>>>> ca0b03e97ce59824c9730f08c15590c5f31ebfb0 version "7.8.2" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.8.2.tgz#e95c9c47fece55d2303d1a67c9d01b930b88a51d" dependencies: