From b5466da538de212e22300c974d9f39eb02340a9c Mon Sep 17 00:00:00 2001 From: VAN HAAREN Lucas Date: Sun, 15 Dec 2019 00:21:28 +0100 Subject: [PATCH 1/6] add github PAT getter --- src/renderer/store/modules/Settings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/store/modules/Settings.js b/src/renderer/store/modules/Settings.js index ecfabdc..95d238d 100644 --- a/src/renderer/store/modules/Settings.js +++ b/src/renderer/store/modules/Settings.js @@ -44,6 +44,7 @@ const actions = { const getters = { settings: state => state.settings, + githubToken: state => state.settings.githubPersonalAccessToken, }; export default { From 46a56c2f45042feaf2a79a573c2828556a14c67b Mon Sep 17 00:00:00 2001 From: VAN HAAREN Lucas Date: Sun, 15 Dec 2019 00:22:09 +0100 Subject: [PATCH 2/6] add 'convert to gist' button --- .../notes-list/note-card/NoteCard.html | 26 +++++++++---------- .../notes-list/note-card/NoteCard.scss | 8 ++++++ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/renderer/components/notes-list/note-card/NoteCard.html b/src/renderer/components/notes-list/note-card/NoteCard.html index e05b2fb..760f7f1 100644 --- a/src/renderer/components/notes-list/note-card/NoteCard.html +++ b/src/renderer/components/notes-list/note-card/NoteCard.html @@ -14,6 +14,11 @@

{{ note.name }}

+ + + + @@ -25,16 +30,14 @@

{{ note.name }}

{{note.description}}

- {{tag}} + {{tag}}

{{value.name}} ({{value.language}}) - + @@ -42,13 +45,8 @@

{{value.name}}

- +

@@ -57,4 +55,4 @@

{{value.name}} - + \ No newline at end of file diff --git a/src/renderer/components/notes-list/note-card/NoteCard.scss b/src/renderer/components/notes-list/note-card/NoteCard.scss index 6027457..8e791cb 100644 --- a/src/renderer/components/notes-list/note-card/NoteCard.scss +++ b/src/renderer/components/notes-list/note-card/NoteCard.scss @@ -40,6 +40,14 @@ color: lighten($dark, 20%); } } + + #convert-note { + color: $dark; + + &:hover { + color: lighten($dark, 20%); + } + } } } From 4f14bf07493dce63e3e524a2fffe10c14b4ae22f Mon Sep 17 00:00:00 2001 From: VAN HAAREN Lucas Date: Sun, 15 Dec 2019 00:23:40 +0100 Subject: [PATCH 3/6] add 'convertToGist' vuex action --- src/renderer/store/modules/Note.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/renderer/store/modules/Note.js b/src/renderer/store/modules/Note.js index 6832a44..3061aaa 100644 --- a/src/renderer/store/modules/Note.js +++ b/src/renderer/store/modules/Note.js @@ -97,7 +97,7 @@ const actions = { store.commit('SELECT_LOADING', true); const octokit = getOctokit(store.rootState.Settings.settings); - + if (store.state.gistsSelected) { octokit.gists.create(note).then(() => { store.dispatch('loadNotes'); @@ -112,6 +112,10 @@ const actions = { actions.writeFileToFS(note, false); } }, + convertToGist(store, note) { + const octokit = getOctokit(store.rootState.Settings.settings); + return octokit.gists.create(converter.noteToGist(note)); + }, updateNote(store, note) { if (store.state.gistsSelected) { const octokit = getOctokit(store.rootState.Settings.settings); From 259ba7b487a5b3a7fd6458e4d47de9c958701cb8 Mon Sep 17 00:00:00 2001 From: VAN HAAREN Lucas Date: Sun, 15 Dec 2019 00:24:13 +0100 Subject: [PATCH 4/6] fix 'noteToGist' in converter.js --- src/renderer/converter.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/renderer/converter.js b/src/renderer/converter.js index b144067..b263bf5 100644 --- a/src/renderer/converter.js +++ b/src/renderer/converter.js @@ -48,17 +48,16 @@ const converter = { }, noteToGist(note) { const files = {}; - - note.files.forEach((file) => { - files[`${file.name}.${this.languageToExtension(file.language)}`] = { - content: file.content, + Object.keys(note.files).forEach((key) => { + files[`${note.files[key].name}.${this.languageToExtension(note.files[key].language)}`] = { + content: note.files[key].content, }; }); return { id: note.id, public: note.public, - description: note.description, + description: `${note.name} - ${note.description}`, files, }; }, From 4d7531b776a55c425803751f9da6314bd63de101 Mon Sep 17 00:00:00 2001 From: VAN HAAREN Lucas Date: Sun, 15 Dec 2019 00:35:07 +0100 Subject: [PATCH 5/6] add 'convertToGist' to the Note component --- .../notes-list/note-card/NoteCard.vue | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/src/renderer/components/notes-list/note-card/NoteCard.vue b/src/renderer/components/notes-list/note-card/NoteCard.vue index cdb1899..8410a05 100644 --- a/src/renderer/components/notes-list/note-card/NoteCard.vue +++ b/src/renderer/components/notes-list/note-card/NoteCard.vue @@ -24,13 +24,13 @@ export default { }; }, computed: { - ...mapGetters(['notes', 'gistsSelected']), + ...mapGetters(['notes', 'gistsSelected', 'githubToken']), displayNoteName() { return this.note.name.split('-')[0]; }, }, methods: { - ...mapActions(['updateNote', 'deleteNote']), + ...mapActions(['updateNote', 'deleteNote', 'convertToGist', 'selectGists']), stringToColour(str) { const colorHash = new ColorHash({ lightness: 0.5, saturation: 0.6 }); return colorHash.hex(str); @@ -52,6 +52,37 @@ export default { }, }); }, + convertNoteToGist() { + this.convertToGist(this.note) + .then(() => { + this.$dialog.confirm({ + title: 'Sucessful', + message: + 'Note was converted to gist.
Do you want to delete local note ?', + confirmText: 'Delete', + cancelText: 'Keep', + type: 'is-success', + icon: 'check-circle', + hasIcon: true, + onConfirm: () => { + this.deleteNote(this.note); + this.selectGists(true); + }, + onCancel: () => { + this.selectGists(true); + } + }); + }) + .catch(err => { + this.$dialog.alert({ + title: 'Error', + message: 'Note was not converted to gist.
Please retry later', + type: 'is-danger', + hasIcon: true, + icon: 'times-circle', + }); + }); + }, onCopyClipboardSuccess() { this.$toast.open({ message: 'Copied', From 6d40d722fa95ec2803eecc100e6f16e91455777f Mon Sep 17 00:00:00 2001 From: VAN HAAREN Lucas Date: Sun, 15 Dec 2019 12:52:07 +0100 Subject: [PATCH 6/6] fix typos in dialogBox --- src/renderer/components/notes-list/note-card/NoteCard.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/components/notes-list/note-card/NoteCard.vue b/src/renderer/components/notes-list/note-card/NoteCard.vue index 8410a05..7e2ecd6 100644 --- a/src/renderer/components/notes-list/note-card/NoteCard.vue +++ b/src/renderer/components/notes-list/note-card/NoteCard.vue @@ -56,7 +56,7 @@ export default { this.convertToGist(this.note) .then(() => { this.$dialog.confirm({ - title: 'Sucessful', + title: 'Successful', message: 'Note was converted to gist.
Do you want to delete local note ?', confirmText: 'Delete', @@ -76,7 +76,7 @@ export default { .catch(err => { this.$dialog.alert({ title: 'Error', - message: 'Note was not converted to gist.
Please retry later', + message: 'Note was not converted to gist.
Please retry later.', type: 'is-danger', hasIcon: true, icon: 'times-circle',