From c903bcbcd1912cf718600f3bcbb332279fc811ee Mon Sep 17 00:00:00 2001 From: Max G Date: Tue, 11 Feb 2020 06:05:28 +0000 Subject: [PATCH] Fixing quick notes Updating all the icons making search bar thinner --- .../src/components/AttachmentDisplayCard.vue | 6 +-- client/src/components/GlobalSiteMenu.vue | 12 +++--- client/src/components/NoteTagEdit.vue | 1 + client/src/components/SearchInput.vue | 6 +-- client/src/pages/AttachmentsPage.vue | 4 +- client/src/pages/NotesPage.vue | 39 +++++++++---------- client/src/pages/QuickPage.vue | 13 +++++-- server/models/Note.js | 2 +- server/models/QuickNote.js | 26 ++++--------- 9 files changed, 49 insertions(+), 60 deletions(-) diff --git a/client/src/components/AttachmentDisplayCard.vue b/client/src/components/AttachmentDisplayCard.vue index cfa4faa..37854b4 100644 --- a/client/src/components/AttachmentDisplayCard.vue +++ b/client/src/components/AttachmentDisplayCard.vue @@ -105,13 +105,13 @@
- + Open Note
- - Note Attachments + + Note Files
diff --git a/client/src/components/GlobalSiteMenu.vue b/client/src/components/GlobalSiteMenu.vue index 4d03c55..a0b13e5 100644 --- a/client/src/components/GlobalSiteMenu.vue +++ b/client/src/components/GlobalSiteMenu.vue @@ -153,7 +153,7 @@
- Notes + Notes
@@ -165,25 +165,25 @@
- Inbox + Inbox
- Archived + Archived
- Files + Files
- Quick + Quick
@@ -208,7 +208,7 @@
- {{ucWords($store.getters.getUsername)}} + {{ucWords($store.getters.getUsername)}}
diff --git a/client/src/components/NoteTagEdit.vue b/client/src/components/NoteTagEdit.vue index 5dc63c0..0dcc7f8 100644 --- a/client/src/components/NoteTagEdit.vue +++ b/client/src/components/NoteTagEdit.vue @@ -12,6 +12,7 @@

All Tags

+

No tags yet, add a tag.

{{ ucWords(tag.text) }} diff --git a/client/src/components/SearchInput.vue b/client/src/components/SearchInput.vue index 1870583..16ef289 100644 --- a/client/src/components/SearchInput.vue +++ b/client/src/components/SearchInput.vue @@ -1,10 +1,6 @@ diff --git a/client/src/pages/AttachmentsPage.vue b/client/src/pages/AttachmentsPage.vue index 2c6a320..9bee76d 100644 --- a/client/src/pages/AttachmentsPage.vue +++ b/client/src/pages/AttachmentsPage.vue @@ -4,7 +4,7 @@

- +
Files
Uploaded Files and Websites from notes.
@@ -18,7 +18,7 @@ Show All Attachments
- + Open Note

diff --git a/client/src/pages/NotesPage.vue b/client/src/pages/NotesPage.vue index 602615d..b75b790 100644 --- a/client/src/pages/NotesPage.vue +++ b/client/src/pages/NotesPage.vue @@ -3,33 +3,30 @@
- -
+
-
-
-
-
- -
-
- - Back to All Notes - - -
-
+
+
+ +
+
+ + + Back to All Notes +
+
+
- - Reset Filters + + Back to All Notes
@@ -118,7 +115,7 @@
-

Found in Files ({{ foundAttachments.length }})

+

Found in Files ({{ foundAttachments.length }})

- +
Quick
Add new information with great speed
@@ -26,7 +26,14 @@
Save (CRTL + Enter)
-
Edit
+
+ + Quick Files + Links +
+
+ + Edit +

@@ -98,7 +105,7 @@ //Don't submit empty note if(this.newText.trim() == ''){ return } - axios.post('/api/quick-note/update', { 'pushText':this.newText } ) + axios.post('/api/quick-note/update', { 'pushText':this.newText.trim() } ) .then( results => { this.newText = '' //Clear text area diff --git a/server/models/Note.js b/server/models/Note.js index e574b82..3f827ff 100644 --- a/server/models/Note.js +++ b/server/models/Note.js @@ -105,7 +105,7 @@ Note.create = (userId, noteText, quickNote = 0) => { const created = Math.round((+new Date)/1000) db.promise() - .query(`INSERT INTO note_raw_text (text) VALUE ('')`) + .query(`INSERT INTO note_raw_text (text) VALUE (?)`, [noteText]) .then( (rows, fields) => { const rawTextId = rows[0].insertId diff --git a/server/models/QuickNote.js b/server/models/QuickNote.js index 4641723..8a60b69 100644 --- a/server/models/QuickNote.js +++ b/server/models/QuickNote.js @@ -10,7 +10,9 @@ QuickNote.get = (userId) => { db.promise() .query(` - SELECT id, text FROM note WHERE quick_note = 1 AND user_id = ? LIMIT 1 + SELECT note.id, text FROM note + JOIN note_raw_text ON (note_raw_text.id = note.note_raw_text_id) + WHERE quick_note = 1 AND user_id = ? LIMIT 1 `, [userId]) .then((rows, fields) => { @@ -53,8 +55,10 @@ QuickNote.update = (userId, pushText) => { db.promise() .query(` - SELECT id, text, color, pinned, archived - FROM note WHERE quick_note = 1 AND user_id = ? LIMIT 1 + SELECT note.id, text, color, pinned, archived + FROM note + JOIN note_raw_text ON (note_raw_text.id = note.note_raw_text_id) + WHERE quick_note = 1 AND user_id = ? LIMIT 1 `, [userId]) .then((rows, fields) => { @@ -94,20 +98,4 @@ QuickNote.update = (userId, pushText) => { //Note.create(userId, 'Quick Note', 1) -} - -QuickNote.create = (userId, noteText) => { - return new Promise((resolve, reject) => { - - if(userId == null || userId < 10){ reject('User Id required to create note') } - - const created = Math.round((+new Date)/1000) - - db.promise() - .query('INSERT INTO note (user_id, text, created) VALUES (?,?,?)', [userId, noteText, created]) - .then((rows, fields) => { - resolve(rows[0].insertId) //Only return the new note ID when creating a new note - }) - .catch(console.log) - }) } \ No newline at end of file