From 0b0bec15e24a5e4c4a85008fac3c19ac42b4db47 Mon Sep 17 00:00:00 2001 From: Benoit Schweblin Date: Sun, 17 Sep 2017 16:32:39 +0100 Subject: [PATCH] Added keystrokes and shortcuts. Added templates --- build/webpack.base.conf.js | 2 +- package.json | 8 +- src/assets/logo.png | Bin 6849 -> 0 bytes src/assets/logo.svg | 55 +----- src/components/App.vue | 10 +- src/components/CodeEditor.vue | 52 +++++ src/components/Editor.vue | 13 +- src/components/ExplorerNode.vue | 7 - src/components/FilePropertiesModal.vue | 84 ++++++++ src/components/GooglePhotoModal.vue | 73 +++++++ src/components/HtmlExportModal.vue | 87 +++++++++ src/components/ImageModal.vue | 79 ++++++++ src/components/LinkModal.vue | 43 ++++ .../{SideBarItem.vue => MenuEntry.vue} | 12 +- src/components/Modal.vue | 112 ++++++++--- src/components/NavigationBar.vue | 19 +- src/components/SettingsModal.vue | 84 ++++++++ src/components/SideBar.vue | 183 +++++++++++++++--- src/components/TemplatesModal.vue | 156 +++++++++++++++ src/components/Toc.vue | 3 +- src/components/common/app.scss | 115 ++++++++++- src/components/common/variables.scss | 2 +- src/data/defaultFileProperties.yml | 25 +++ src/data/defaultLocalSettings.js | 2 + src/data/defaultSettings.yml | 81 ++++++++ src/data/emptySyncLocation.js | 1 + src/data/emptyTemplateHelpers.js | 10 + src/data/emptyTemplateValue.html | 24 +++ src/data/plainHtmlTemplate.html | 1 + src/data/styledHtmlTemplate.html | 16 ++ src/extensions/katexExt.js | 2 +- src/extensions/markdownExt.js | 15 +- src/icons/CodeTags.vue | 5 + src/icons/Download.vue | 5 + src/icons/FileMultiple.vue | 5 + src/icons/GoogleDrive.vue | 9 + src/icons/GooglePhotos.vue | 12 ++ src/icons/HardDisk.vue | 5 + src/icons/Logout.vue | 5 + src/icons/Menu.vue | 5 - src/icons/Stackedit.vue | 19 ++ src/icons/Upload.vue | 5 + src/icons/ViewList.vue | 5 + src/icons/index.js | 28 ++- src/libs/cleditSelectionMgr.js | 2 + src/services/animationSvc.js | 8 +- src/services/editorSvc.js | 165 ++++------------ src/services/exportSvc.js | 121 ++++++++++++ src/services/extensionSvc.js | 4 +- src/services/localDbSvc.js | 40 ++-- src/services/markdownConversionSvc.js | 4 +- src/services/markdownGrammarSvc.js | 7 - src/services/optional/index.js | 2 + src/services/optional/keystrokes.js | 174 +++++++++++++++++ src/services/optional/scrollSync.js | 4 +- src/services/optional/shortcuts.js | 48 +++++ src/services/providers/gdriveProvider.js | 30 --- ...vider.js => googleDriveAppDataProvider.js} | 36 ++-- src/services/providers/googleDriveProvider.js | 85 ++++++++ .../providers/helpers/googleHelper.js | 165 +++++++++++----- src/services/providers/providerUtils.js | 3 +- src/services/syncSvc.js | 39 ++-- src/services/templateWorker.js | 98 ++++++++++ src/services/utils.js | 58 ++++-- src/store/index.js | 2 - src/store/modules/content.js | 2 + src/store/modules/data.js | 62 +++++- src/store/modules/editor.js | 16 -- src/store/modules/layout.js | 21 +- src/store/modules/modal.js | 67 ++++--- yarn.lock | 93 ++++++++- 71 files changed, 2349 insertions(+), 491 deletions(-) delete mode 100644 src/assets/logo.png create mode 100644 src/components/CodeEditor.vue create mode 100644 src/components/FilePropertiesModal.vue create mode 100644 src/components/GooglePhotoModal.vue create mode 100644 src/components/HtmlExportModal.vue create mode 100644 src/components/ImageModal.vue create mode 100644 src/components/LinkModal.vue rename src/components/{SideBarItem.vue => MenuEntry.vue} (66%) create mode 100644 src/components/SettingsModal.vue create mode 100644 src/components/TemplatesModal.vue create mode 100644 src/data/defaultFileProperties.yml create mode 100644 src/data/defaultSettings.yml create mode 100644 src/data/emptyTemplateHelpers.js create mode 100644 src/data/emptyTemplateValue.html create mode 100644 src/data/plainHtmlTemplate.html create mode 100644 src/data/styledHtmlTemplate.html create mode 100644 src/icons/CodeTags.vue create mode 100644 src/icons/Download.vue create mode 100644 src/icons/FileMultiple.vue create mode 100644 src/icons/GoogleDrive.vue create mode 100644 src/icons/GooglePhotos.vue create mode 100644 src/icons/HardDisk.vue create mode 100644 src/icons/Logout.vue delete mode 100644 src/icons/Menu.vue create mode 100644 src/icons/Stackedit.vue create mode 100644 src/icons/Upload.vue create mode 100644 src/icons/ViewList.vue create mode 100644 src/services/exportSvc.js create mode 100644 src/services/optional/keystrokes.js create mode 100644 src/services/optional/shortcuts.js delete mode 100644 src/services/providers/gdriveProvider.js rename src/services/providers/{gdriveAppDataProvider.js => googleDriveAppDataProvider.js} (86%) create mode 100644 src/services/providers/googleDriveProvider.js create mode 100644 src/services/templateWorker.js delete mode 100644 src/store/modules/editor.js diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 57dbb5fa..b048df9b 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -63,7 +63,7 @@ module.exports = { } }, { - test: /\.md$/, + test: /\.(md|yml|html)$/, loader: 'raw-loader' } ] diff --git a/package.json b/package.json index 95fcf712..b8c958ad 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,13 @@ }, "dependencies": { "bezier-easing": "^1.1.0", + "clipboard": "^1.7.1", "clunderscore": "^1.0.3", "diff-match-patch": "^1.0.0", + "file-saver": "^1.3.3", + "handlebars": "^4.0.10", "indexeddbshim": "^3.0.4", + "js-yaml": "^3.9.1", "katex": "^0.7.1", "markdown-it": "^8.3.1", "markdown-it-abbr": "^1.0.4", @@ -24,6 +28,7 @@ "markdown-it-pandoc-renderer": "1.1.3", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", + "mousetrap": "^1.6.1", "normalize-scss": "^7.0.0", "prismjs": "^1.6.0", "raw-loader": "^0.5.1", @@ -79,7 +84,8 @@ "webpack-bundle-analyzer": "^2.2.1", "webpack-dev-middleware": "^1.10.0", "webpack-hot-middleware": "^2.18.0", - "webpack-merge": "^4.1.0" + "webpack-merge": "^4.1.0", + "worker-loader": "^0.8.1" }, "engines": { "node": ">= 4.0.0", diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/components/App.vue b/src/components/App.vue index 56b9d064..ab64f559 100644 --- a/src/components/App.vue +++ b/src/components/App.vue @@ -7,10 +7,18 @@ + + diff --git a/src/components/Editor.vue b/src/components/Editor.vue index c5c56e77..efb078ac 100644 --- a/src/components/Editor.vue +++ b/src/components/Editor.vue @@ -1,6 +1,6 @@ @@ -9,9 +9,14 @@ import { mapGetters } from 'vuex'; export default { - computed: mapGetters('layout', [ - 'styles', - ]), + computed: { + ...mapGetters('layout', [ + 'styles', + ]), + ...mapGetters('data', [ + 'computedSettings', + ]), + }, }; diff --git a/src/components/ExplorerNode.vue b/src/components/ExplorerNode.vue index 42a8d675..b14879c6 100644 --- a/src/components/ExplorerNode.vue +++ b/src/components/ExplorerNode.vue @@ -24,13 +24,6 @@ import defaultContent from '../data/defaultContent.md'; export default { name: 'explorer-node', props: ['node', 'depth'], - directives: { - focus: { - inserted(el) { - el.focus(); - }, - }, - }, data: () => ({ editingValue: '', }), diff --git a/src/components/FilePropertiesModal.vue b/src/components/FilePropertiesModal.vue new file mode 100644 index 00000000..ff5bd7cb --- /dev/null +++ b/src/components/FilePropertiesModal.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/src/components/GooglePhotoModal.vue b/src/components/GooglePhotoModal.vue new file mode 100644 index 00000000..3b58af12 --- /dev/null +++ b/src/components/GooglePhotoModal.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/src/components/HtmlExportModal.vue b/src/components/HtmlExportModal.vue new file mode 100644 index 00000000..dd175782 --- /dev/null +++ b/src/components/HtmlExportModal.vue @@ -0,0 +1,87 @@ + + + diff --git a/src/components/ImageModal.vue b/src/components/ImageModal.vue new file mode 100644 index 00000000..a6b28d83 --- /dev/null +++ b/src/components/ImageModal.vue @@ -0,0 +1,79 @@ + + + diff --git a/src/components/LinkModal.vue b/src/components/LinkModal.vue new file mode 100644 index 00000000..423e0a27 --- /dev/null +++ b/src/components/LinkModal.vue @@ -0,0 +1,43 @@ + + + diff --git a/src/components/SideBarItem.vue b/src/components/MenuEntry.vue similarity index 66% rename from src/components/SideBarItem.vue rename to src/components/MenuEntry.vue index c59f183f..cc986afb 100644 --- a/src/components/SideBarItem.vue +++ b/src/components/MenuEntry.vue @@ -1,18 +1,18 @@ diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue index 311ff9e7..fd37537b 100644 --- a/src/components/SideBar.vue +++ b/src/components/SideBar.vue @@ -1,7 +1,7 @@