From 06a140e0d46466da5d64b4cb9a5335e9fda4f2e7 Mon Sep 17 00:00:00 2001 From: Max G Date: Wed, 20 May 2020 07:57:15 +0000 Subject: [PATCH] * Fixed cursor clicking ToDo lists clicking to early * Added login form to home page with focus on load * Tags update after editing tags from title card * Fixed uploading of images/files * Fixed images not appearing when opening images tab * Search hits all categories on search, like archived * Got rid of brand icons to reduce size * Got rid of DiffPatchMatch and Crypto from note input panel to reduce size * Disabled animation on io events so they don't annoy the shit out of people on other computers --- client/src/components/GlobalSiteMenu.vue | 4 +- client/src/components/LoginFormComponent.vue | 112 ++++++++++ client/src/components/NoteInputPanel.vue | 194 ++---------------- .../src/components/NoteTitleDisplayCard.vue | 2 +- .../SimpleAttachmentNoteComponent.vue | 30 +-- client/src/components/TagDisplayComponent.vue | 9 +- client/src/main.js | 2 +- client/src/pages/HomePage.vue | 29 ++- client/src/pages/LoginPage.vue | 30 +-- client/src/pages/NotesPage.vue | 33 ++- server/models/Tag.js | 2 + server/routes/attachmentController.js | 5 +- 12 files changed, 210 insertions(+), 242 deletions(-) create mode 100644 client/src/components/LoginFormComponent.vue diff --git a/client/src/components/GlobalSiteMenu.vue b/client/src/components/GlobalSiteMenu.vue index 64b6b06..5795cd3 100644 --- a/client/src/components/GlobalSiteMenu.vue +++ b/client/src/components/GlobalSiteMenu.vue @@ -178,10 +178,10 @@ -
+
Notes - +
diff --git a/client/src/components/LoginFormComponent.vue b/client/src/components/LoginFormComponent.vue new file mode 100644 index 0000000..379f1fe --- /dev/null +++ b/client/src/components/LoginFormComponent.vue @@ -0,0 +1,112 @@ + + + \ No newline at end of file diff --git a/client/src/components/NoteInputPanel.vue b/client/src/components/NoteInputPanel.vue index 4b6c103..0ad7245 100644 --- a/client/src/components/NoteInputPanel.vue +++ b/client/src/components/NoteInputPanel.vue @@ -153,7 +153,7 @@ /> - + - +
- +
import axios from 'axios' - const crypto = require('crypto') - const DiffMatchPatch = require('../../../server/helpers/DiffMatchPatch') + // const crypto = require('crypto') + // const DiffMatchPatch = require('../../../server/helpers/DiffMatchPatch') export default { name: 'InputNotes', @@ -443,19 +443,14 @@ let el = e.target - //Adjust ofset by 40 px - let correction = 40 - - //Determine if element was clicked or area before it, before means checkbox was clicked - if (e.offsetX > e.target.offsetLeft - correction) { - //Element was clicked - } else { - - //Will hide keyboard if clicked, much better for mobile - this.editor.blur() + //If the offset is triggered with a negative offset, it means the before element was clicked + if(e.offsetX < -5){ + //Will hide keyboard if clicked on mobile + if(this.$store.getters.getIsUserOnMobile){ + this.editor.blur() + } //Area before element was clicked, they clicked the checkbox - this.onKeyup() if (el.className === 'active'){ el.className = 'inactive'; } else { @@ -869,171 +864,6 @@ console.log('Could not fetch note') } }, - diffText(){ - - return - - // dont emit to one user - if(this.usersOnNote <= 1){ - return - } - - //Post latest diff to server, server will emit change event to all connected clients - // clearTimeout(this.emitChangeDebounce) - this.emitChangeDebounce = setTimeout(i => { - - //caldulate text diff - let oldText = this.diffNoteText - let newText = this.getText() - - if(oldText == newText){ - return - } - - const dmp = new DiffMatchPatch.diff_match_patch() - const diff = dmp.diff_main(oldText, newText) - // dmp.diff_cleanupSemantic(diff) - const patch_list = dmp.patch_make(oldText, newText, diff); - const patch_text = dmp.patch_toText(patch_list); - - - var patches = dmp.patch_fromText(patch_text); - var results = dmp.patch_apply(patches, oldText); - - const computedText = results[0] - - //Save computed diff text - this.noteText = computedText - this.diffNoteText = computedText - - if(patch_text == ''){ - return - } - - // console.log(patch_text) - this.$io.emit('note_diff', { - id: this.rawTextId, - diff: patch_text - }) - - - }, 5) - }, - patchText(patch_text){ - - return - - // - // Capture x,y of caret and position into string - // - - let currentSelection = this.editor.getSelection() - let lineText = currentSelection.startContainer.textContent - // console.log(lineText) - let cursorOffset = parseInt(currentSelection.startOffset) //number of characters in - let path = this.xpath(currentSelection.commonAncestorContainer.parentElement) - // console.log(path) - - - // - //Set up text to process diff - // - - let currentText = this.editor._getHTML() - const startingLines = (currentText.match(/
/g) || '').length + 1 - // console.log('1') - - const dmp = new DiffMatchPatch.diff_match_patch() - var patches = dmp.patch_fromText(patch_text); - var results = dmp.patch_apply(patches, currentText); - let newText = results[0] - // console.log('2') - - this.noteText = newText - this.diffNoteText = newText - // console.log('3') - // this.editor._setHTML(newText) - this.editor.setHTML(newText) - - // console.log('4') - - // - // I user hasn't selected the document, we are done here - // @TODO add code to halt execution - // - - const endingLines = (newText.match(/
/g) || '').length + 1 - - // if(this.pastFocusedNode != null || true){ - setTimeout( ()=>{ - - var root = this.editor.getRoot() - //Get node under current x,y on dom (may break on scroll) - // let node = document.elementFromPoint(mouse.x, mouse.y) - let node = this.getElementByXPath(path) - - if(node.firstChild){ - node = node.firstChild - } - - //If the number of lines changed - if(startingLines != endingLines){ - - //Line diff may be +1 or -1 - let lineDiff = endingLines - startingLines - console.log('Line Diff => ', lineDiff) - - //Pull out node number from path - var nodeNumber = path.match(/\d+/) - let modifyNode = null - if(nodeNumber.length == 1){ - modifyNode = parseInt(nodeNumber[0]) - } - - path = path.replace(modifyNode, modifyNode + lineDiff ) - console.log(path) - let maybeNext = this.getElementByXPath(path) - if(maybeNext && maybeNext.firstChild){ - maybeNext = maybeNext.firstChild - } - - if(maybeNext && maybeNext.textContent == lineText){ - node = maybeNext - console.log('The Node Moved!') - } - } - - // console.log('Targeting Node') - // console.log(node) - - //Create and set range - let squireRange = this.editor.createRange(node, cursorOffset) - squireRange.collapse(true) - this.editor.setSelection(squireRange) - // console.log('cursor set') - - }, 20) - // } - }, - xpath(el) { - //Skip things we can't use - if (typeof el == "string") return document.evaluate(el, document, null, 0, null) - if (!el || el.nodeType != 1) return '' - - //Anchor xpath using Ids or test-ids - const testId = el.getAttribute('test-id') - if (el.id) return "//*[@id='" + el.id + "']" - - //Continue to build path - const sames = [].filter.call(el.parentNode.children, function (x) { return x.tagName == el.tagName }) - return this.xpath(el.parentNode) + '/' + el.tagName.toLowerCase() + (sames.length > 1 ? '['+([].indexOf.call(sames, el)+1)+']' : '') - }, - getElementByXPath(xpath){ - - return new XPathEvaluator() - .createExpression(xpath) - .evaluate(document, XPathResult.FIRST_ORDERED_NODE_TYPE) .singleNodeValue - }, onKeyup(){ this.statusText = 'modified' @@ -1198,7 +1028,7 @@ //Server will hand deliver diffs from other notes to this one this.$io.on('incoming_diff', incomingDiffData => { - this.patchText(incomingDiffData) + // this.patchText(incomingDiffData) }) }, titleResize(){ diff --git a/client/src/components/NoteTitleDisplayCard.vue b/client/src/components/NoteTitleDisplayCard.vue index 99930f3..d4d9071 100644 --- a/client/src/components/NoteTitleDisplayCard.vue +++ b/client/src/components/NoteTitleDisplayCard.vue @@ -235,7 +235,7 @@ this.showTagSlideMenu = state if(state == false){ - // this.$bus.$emit('update_single_note', this.note.id) + this.$bus.$emit('update_single_note', this.note.id) } }, diff --git a/client/src/components/SimpleAttachmentNoteComponent.vue b/client/src/components/SimpleAttachmentNoteComponent.vue index 6205e05..af68f73 100644 --- a/client/src/components/SimpleAttachmentNoteComponent.vue +++ b/client/src/components/SimpleAttachmentNoteComponent.vue @@ -87,22 +87,24 @@ }, mounted(){ - - axios.post('/api/attachment/search', {'attachmentType':'files', 'setSize':1000}) - .then( ({data}) => { - - //Sort files into two categories - data.forEach(file => { - if(file['note_id'] == this.noteId){ - this.uploadedToNote.push(file) - } else { - this.files.push(file) - } - }) - }) - .catch(error => { this.$bus.$emit('notification', 'Failed to Load Attachments') }) + this.loadImages() }, methods: { + loadImages(){ + axios.post('/api/attachment/search', {'attachmentType':'files', 'setSize':1000}) + .then( ({data}) => { + + //Sort files into two categories + data.forEach(file => { + if(file['note_id'] == this.noteId){ + this.uploadedToNote.push(file) + } else { + this.files.push(file) + } + }) + }) + .catch(error => { this.$bus.$emit('notification', 'Failed to Load Attachments') }) + }, onFileClick(file){ const imageCode = `image` diff --git a/client/src/components/TagDisplayComponent.vue b/client/src/components/TagDisplayComponent.vue index 0f154cd..07dea4c 100644 --- a/client/src/components/TagDisplayComponent.vue +++ b/client/src/components/TagDisplayComponent.vue @@ -22,8 +22,8 @@

Tags

-
- +
+
Tags added to Notes will appear here. @@ -44,7 +44,7 @@
-
+
@@ -63,6 +63,9 @@ components: { }, methods:{ + closeMenu(){ + this.menuOpen = false + }, openMenu(){ this.menuOpen = true axios.post('/api/tag/usertags') diff --git a/client/src/main.js b/client/src/main.js index aceaeb5..7b60098 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -23,7 +23,7 @@ import 'fomantic-ui-css/components/container.css' import 'fomantic-ui-css/components/form.css' import 'fomantic-ui-css/components/grid.css' import 'fomantic-ui-css/components/header.css' -import 'fomantic-ui-css/components/icon.css' +import 'fomantic-ui-css/components/icon.css' //Modified to remove brand icons import 'fomantic-ui-css/components/input.css' import 'fomantic-ui-css/components/segment.css' import 'fomantic-ui-css/components/label.css' diff --git a/client/src/pages/HomePage.vue b/client/src/pages/HomePage.vue index e155ffa..56e388e 100644 --- a/client/src/pages/HomePage.vue +++ b/client/src/pages/HomePage.vue @@ -120,7 +120,7 @@

- An easy, encrypted Note App + An easy, free, secure Note App

@@ -131,14 +131,24 @@
-
-
- - Sign Up + +
+
+ + Go to Notes
-
-

Only a Username and Password are required.

+
+ + +
+
+
+

+ + Sign Up Now - Only a Username and Password are required.

+ +
@@ -310,6 +320,9 @@