diff --git a/client/src/App.vue b/client/src/App.vue index 4c6b7a8..ac34488 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -27,10 +27,17 @@ export default { }, beforeCreate: function(){ + //Puts token into state on page load + let token = localStorage.getItem('loginToken') + let username = localStorage.getItem('username') + // const socket = io({ path:'/socket' }); const socket = this.$io socket.on('connect', () => { + this.$store.commit('setSocketIoSocket', socket.id) + + this.$io.emit('user_connect', token) }) //Detect if user is on a mobile browser and set a flag in store @@ -41,16 +48,20 @@ export default { this.$store.commit('toggleNightMode') } - //Puts token into state on page load - let token = localStorage.getItem('loginToken') - let username = localStorage.getItem('username') - + //Put user data into global store on load if(token){ this.$store.commit('setLoginToken', {token, username}) } }, mounted: function(){ + + //Update totals for entire app on event + this.$io.on('update_counts', () => { + console.log('Got event, update totals') + this.$store.dispatch('fetchAndUpdateUserTotals') + }) + }, computed: { loggedIn () { diff --git a/client/src/components/AnimatedCounterComponent.vue b/client/src/components/AnimatedCounterComponent.vue new file mode 100644 index 0000000..276bd99 --- /dev/null +++ b/client/src/components/AnimatedCounterComponent.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/client/src/components/GlobalSiteMenu.vue b/client/src/components/GlobalSiteMenu.vue index 63c998f..6028eea 100644 --- a/client/src/components/GlobalSiteMenu.vue +++ b/client/src/components/GlobalSiteMenu.vue @@ -21,7 +21,7 @@ .menu-item { color: #fff; - padding: 0.8em 0px 0.8em 10px; + padding: 0.8em 10px 0.8em 10px; display: inline-block; width: 100%; font-size: 1.15em; @@ -154,7 +154,7 @@
Notes - +
@@ -167,7 +167,7 @@
Files - +
@@ -216,6 +216,7 @@ export default { components: { 'search-input': require('@/components/SearchInput.vue').default, + 'counter':require('@/components/AnimatedCounterComponent.vue').default, }, data: function(){ return { diff --git a/client/src/components/NoteTitleDisplayCard.vue b/client/src/components/NoteTitleDisplayCard.vue index 0028252..abac08e 100644 --- a/client/src/components/NoteTitleDisplayCard.vue +++ b/client/src/components/NoteTitleDisplayCard.vue @@ -15,6 +15,10 @@
+
Shared by {{ note.shareUsername }}
+
You Shared
+ +
-
- Inbox +
+ Shared Notes {{ $store.getters.totals['unreadNotes'] }} @@ -40,6 +43,11 @@
+

Notes with Links

+

Notes with Tags

+

Archived Notes

+

Shared Notes

+

Tags

@@ -50,19 +58,17 @@
-

Only showing notes containing Links

-

Only showing notse with Tags

-

Only showing Archived notes.

-

No notes found. Check your spelling, try completing the word or using a different phrase.

-

Create your first note. Click the "New Note" button.

+

+ No Notes Yet. Create one when you feel ready. +

-
+
{ + Auth.decodeToken(token) + .then(userData => { + socket.join(userData.id) + }).catch(error => { + console.log(error) + }) + }) + socket.on('join_room', roomId => { // console.log('Join room ', roomId) socket.join(roomId) diff --git a/server/models/Attachment.js b/server/models/Attachment.js index 0d8261a..ea6d42a 100644 --- a/server/models/Attachment.js +++ b/server/models/Attachment.js @@ -226,7 +226,7 @@ Attachment.generateThumbnail = (fileName) => { } //Scans text for websites, returns all attachments -Attachment.scanTextForWebsites = (userId, noteId, noteText) => { +Attachment.scanTextForWebsites = (io, userId, noteId, noteText) => { return new Promise((resolve, reject) => { let solrAttachmentText = '' //Final searchable scrape text for note @@ -244,7 +244,7 @@ Attachment.scanTextForWebsites = (userId, noteId, noteText) => { allUrls = [] } - //Every URL needs HTTPS + //Every URL needs HTTPS!!! let foundUrls = [] allUrls.forEach( (item, index) => { //Every URL should have HTTPS @@ -279,12 +279,17 @@ Attachment.scanTextForWebsites = (userId, noteId, noteText) => { //No newly scraped URLs, resolve with looked up attachment text if(foundUrls == null || foundUrls.length == 0){ - resolve(solrAttachmentText) + return resolve(solrAttachmentText) } //Process the remaining URLs into attachments Attachment.scrapeUrlsCreateAttachments(userId, noteId, foundUrls).then( freshlyScrapedText => { + //Once everything is done being scraped, emit new attachment events + if(io){ + io.to(userId).emit('update_counts') + } + solrAttachmentText += freshlyScrapedText resolve(solrAttachmentText) }) diff --git a/server/models/Note.js b/server/models/Note.js index 8668369..77d8b6a 100644 --- a/server/models/Note.js +++ b/server/models/Note.js @@ -2,6 +2,7 @@ let db = require('@config/database') let Tags = require('@models/Tag') let Attachment = require('@models/Attachment') +let ShareNote = require('@models/ShareNote') let ProcessText = require('@helpers/ProcessText') @@ -157,7 +158,7 @@ Note.reindex = (userId, noteId) => { }) } -Note.update = (userId, noteId, noteText, color, pinned, archived) => { +Note.update = (io, userId, noteId, noteText, color, pinned, archived) => { return new Promise((resolve, reject) => { //Prevent note loss if it saves with empty text @@ -192,7 +193,7 @@ Note.update = (userId, noteId, noteText, color, pinned, archived) => { Note.reindex(userId, noteId) //Async attachment reindex - Attachment.scanTextForWebsites(userId, noteId, noteText) + Attachment.scanTextForWebsites(io, userId, noteId, noteText) //Send back updated response resolve(rows[0]) @@ -258,6 +259,15 @@ Note.delete = (userId, noteId) => { .query('DELETE FROM note_tag WHERE note_tag.note_id = ? AND note_tag.user_id = ?', [noteId,userId]) }) .then((rows, fields) => { + + //IF there are nots with a matching raw text id, we want to under their share status + db.promise().query('SELECT id FROM note WHERE note_raw_text_id = ?',[rawTextId]) + .then((rows, fields) => { + if(rows[0].length == 1){ + db.promise().query('UPDATE note SET shared = 0 WHERE id = ?', [rows[0][0]['id']]) + } + }) + resolve(true) }) }) @@ -325,8 +335,7 @@ Note.get = (userId, noteId) => { note.archived, note.color, count(distinct attachment.id) as attachment_count, - note.note_raw_text_id as rawTextId, - user.username as shareUsername + note.note_raw_text_id as rawTextId FROM note JOIN note_raw_text ON (note_raw_text.id = note.note_raw_text_id) LEFT JOIN attachment ON (note.id = attachment.note_id) @@ -450,7 +459,8 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => { note.archived, GROUP_CONCAT(DISTINCT tag.text) as tags, GROUP_CONCAT(DISTINCT attachment.file_location) as thumbs, - shareUser.username as username + shareUser.username as shareUsername, + note.shared FROM note JOIN note_raw_text ON (note_raw_text.id = note.note_raw_text_id) LEFT JOIN note_tag ON (note.id = note_tag.note_id) @@ -462,7 +472,10 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => { //Show shared notes if(fastFilters.onlyShowSharedNotes == 1){ - noteSearchQuery += ' AND note.share_user_id IS NOT NULL' //Show Archived + //share_user_id means your shared them, a note with a shared user id filled in means it was shared + noteSearchQuery += ` AND share_user_id IS NOT NULL OR (note.shared = 2 AND note.user_id = ?)` + searchParams.push(userId) + //Show notes shared with you } else { noteSearchQuery += ' AND note.share_user_id IS NULL' } diff --git a/server/models/QuickNote.js b/server/models/QuickNote.js index 8a60b69..25be442 100644 --- a/server/models/QuickNote.js +++ b/server/models/QuickNote.js @@ -71,7 +71,7 @@ QuickNote.update = (userId, pushText) => { let newText = broken +''+ d.text //Save that, then return the new text - Note.update(userId, d.id, newText, d.color, d.pinned, d.archived) + Note.update(null, userId, d.id, newText, d.color, d.pinned, d.archived) .then( saveResults => { resolve({ id:d.id, diff --git a/server/models/ShareNote.js b/server/models/ShareNote.js index bf1f7f0..bfc6332 100644 --- a/server/models/ShareNote.js +++ b/server/models/ShareNote.js @@ -15,9 +15,10 @@ ShareNote.addUser = (userId, noteId, rawTextId, username) => { let shareUserId = null let newNoteShare = null + const cleanUser = username.toLowerCase().trim() //Check that user actually exists - db.promise().query(`SELECT id FROM user WHERE username = ?`, [username]) + db.promise().query(`SELECT id FROM user WHERE LOWER(username) = ?`, [cleanUser]) .then((rows, fields) => { if(rows[0].length == 0){ @@ -69,11 +70,17 @@ ShareNote.addUser = (userId, noteId, rawTextId, username) => { }) .then((rows, fields) => { + //Update note share status to 2 + return db.promise() + .query('UPDATE note SET shared = 2 WHERE id = ?', [noteId]) + + }) + .then((rows, fields) => { //Success! - return resolve(true) + return resolve({'success':true, shareUserId}) }) .catch(error => { - // console.log(error) + console.log(error) resolve(false) }) }) @@ -102,25 +109,38 @@ ShareNote.getUsers = (userId, rawTextId) => { // Remove a user from a shared note ShareNote.removeUser = (userId, noteId) => { return new Promise((resolve, reject) => { + + const Note = require('@models/Note') + + let rawTextId = null + let removeUserId = null //note.id = noteId, share_user_id = userId db.promise() - .query('SELECT user_id FROM note WHERE id = ? AND share_user_id = ?', [noteId, userId]) + .query('SELECT note_raw_text_id, user_id FROM note WHERE id = ? AND share_user_id = ?', [noteId, userId]) .then( (rows, fields) => { - //User has shared this note, with this user - if(rows[0].length == 1 && Number.isInteger(rows[0][0]['user_id'])){ + rawTextId = rows[0][0]['note_raw_text_id'] + removeUserId = rows[0][0]['user_id'] - Note.delete(rows[0][0]['user_id'], noteId) - .then( result => { - resolve(result) - }) + //Delete note entry for other user - remove users access + if(removeUserId && Number.isInteger(removeUserId)){ + //Delete this users access to the note + return Note.delete(removeUserId, noteId) } else { - return resolve(false) + + return new Promise((resolve, reject) => { resolve(true) }) } }) + .then(stuff => { + resolve(true) + }) + .catch(error => { + console.log(error) + resolve(false) + }) }) diff --git a/server/models/Tag.js b/server/models/Tag.js index 48f3aca..188ae99 100644 --- a/server/models/Tag.js +++ b/server/models/Tag.js @@ -17,21 +17,21 @@ Tag.userTags = (userId, searchQuery, searchTags, fastFilters) => { ` //Show shared notes - if(fastFilters.onlyShowSharedNotes == 1){ + if(fastFilters && fastFilters.onlyShowSharedNotes == 1){ query += ' AND note.share_user_id IS NOT NULL' //Show Archived } else { query += ' AND note.share_user_id IS NULL' } //Show archived notes, only if fast filter is set, default to not archived - if(fastFilters.onlyArchived == 1){ + if(fastFilters && fastFilters.onlyArchived == 1){ query += ' AND note.archived = 1' //Show Archived } else { query += ' AND note.archived = 0' //Exclude archived } query += ` GROUP BY tag.id - ORDER BY id DESC` + ORDER BY usages DESC, text ASC` db.promise() diff --git a/server/models/User.js b/server/models/User.js index b81ab43..3584cd0 100644 --- a/server/models/User.js +++ b/server/models/User.js @@ -123,7 +123,7 @@ User.getCounts = (userId) => { db.promise().query( `SELECT SUM(pinned = 1 && archived = 0 && share_user_id IS NULL) AS pinnedNotes, - SUM(pinned = 0 && archived = 1 && share_user_id IS NULL) AS archivedNotes, + SUM(archived = 1 && share_user_id IS NULL) AS archivedNotes, SUM(share_user_id IS NULL) AS totalNotes, SUM(share_user_id != ?) AS sharedToNotes, SUM( (share_user_id != ? && opened IS null) || (share_user_id != ? && updated > opened) ) AS unreadNotes diff --git a/server/routes/attachmentController.js b/server/routes/attachmentController.js index 819850f..015033a 100644 --- a/server/routes/attachmentController.js +++ b/server/routes/attachmentController.js @@ -54,7 +54,7 @@ router.post('/upload', upload.single('file'), function (req, res, next) { .then( uploadResults => { //Reindex note, attachment may have had text Note.reindex(userId, noteId) - .then( data => res.send(uploadResults) ) + .then( data => {res.send(uploadResults)}) }) }) diff --git a/server/routes/noteController.js b/server/routes/noteController.js index facd32f..07f1969 100644 --- a/server/routes/noteController.js +++ b/server/routes/noteController.js @@ -23,7 +23,7 @@ router.use(function setUserId (req, res, next) { // Note actions // router.post('/get', function (req, res) { - req.io.emit('welcome_homie', 'Welcome, dont poop from excitement') + // req.io.emit('welcome_homie', 'Welcome, dont poop from excitement') Notes.get(userId, req.body.noteId) .then( data => { //Join room when user opens note @@ -43,7 +43,7 @@ router.post('/create', function (req, res) { }) router.post('/update', function (req, res) { - Notes.update(userId, req.body.noteId, req.body.text, req.body.color, req.body.pinned, req.body.archived) + Notes.update(req.io, userId, req.body.noteId, req.body.text, req.body.color, req.body.pinned, req.body.archived) .then( id => res.send({id}) ) }) @@ -72,7 +72,13 @@ router.post('/getshareusers', function (req, res) { router.post('/shareadduser', function (req, res) { ShareNote.addUser(userId, req.body.noteId, req.body.rawTextId, req.body.username) - .then(results => res.send(results)) + .then( ({success, shareUserId}) => { + + //Emit update count event to user shared with - so they see the note in real time + req.io.to(shareUserId).emit('update_counts') + + res.send(success) + }) }) router.post('/shareremoveuser', function (req, res) {