client/src/App.vue

@@ -27,17 +27,10 @@ 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
@@ -48,20 +41,16 @@ export default {
 			this.$store.commit('toggleNightMode')
 		}
 
-		//Put user data into global store on load
+		//Puts token into state on page load
+		let token = localStorage.getItem('loginToken')
+		let username = localStorage.getItem('username')
+
 		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 () {

client/src/components/AnimatedCounterComponent.vue

@@ -1,113 +0,0 @@
-<style type="text/css" scoped>
-
-	.numtainer {
-		height: 1.1em;
-		font-size: 1em;
-		overflow: hidden;
-
-		display: inline-block;
-		box-sizing: border-box;
-	}
-	
-	.start-high {
-		color: #4dc86a;
-		animation: startHigh 0.5s forwards;
-	}
-
-	.start-low {
-		color: #4dc86a;
-		animation: startLow 0.5s forwards;
-	}
-
-	@keyframes startLow {
-		0% {
-			margin-top: 0;
-		}
-		100% {
-			margin-top: -1.2em;
-		}
-	}
-
-	@keyframes startHigh {
-		0% {
-			margin-top: -1.2em;
-		}
-		100% {
-			margin-top: 0;
-		}
-	}
-
-</style>
-
-<template>
-	<div class="numtainer">
-
-		<div v-if="animateUp">
-			<div class="start-high">{{ newNumber }}</div>
-			<div>{{ oldNumber }}</div>
-		</div>
-
-		<div v-if="animateDown">
-			<div class="start-low">{{ oldNumber }}</div>
-			<div>{{ newNumber }}</div>
-		</div>
-
-
-		<div v-if="totals">{{ totals[numberId] }}</div>
-	</div>
-</template>
-
-<script>
-
-	import { mapGetters } from 'vuex'
-
-	export default {
-		name: 'AnimatedCounterComponent',
-		props: [ 'numberId' ],
-		data () {
-			return {
-				oldNumber: 100,
-				newNumber: 99,
-				animateUp: false,
-				animateDown: false,
-			}
-		},
-		computed: {
-			...mapGetters(['totals'])
-		},
-		watch:{
-			totals(newVal, oldVal){
-				if(oldVal && newVal && newVal[this.numberId] != oldVal[this.numberId]){
-
-					console.log('New number ', newVal[this.numberId])
-
-					this.oldNumber = oldVal[this.numberId]
-					this.newNumber = newVal[this.numberId]
-
-					if(this.oldNumber > this.newNumber){
-						this.animateDown = true
-					} else {
-						this.animateUp = true
-					}
-					
-
-					setTimeout( () => {
-						this.animateUp = false
-						this.animateDown = false
-					}, 550)
-
-				}
-			}
-		},
-		beforeMount(){
-			
-		},
-		mounted(){
-		},
-		methods: {
-			onFileClick(file){
-
-			},
-		}
-	}
-</script>

client/src/components/GlobalSiteMenu.vue

@@ -21,7 +21,7 @@
 
 		.menu-item {
 			color: #fff;
-			padding: 0.8em 10px 0.8em 10px;
+			padding: 0.8em 0px 0.8em 10px;
 			display: inline-block;
 			width: 100%;
 			font-size: 1.15em;
@@ -111,7 +111,7 @@
 				</div>
 				<div class="six wide center aligned column">
 					<img v-if="!loggedIn" src="/api/static/assets/favicon.ico" alt="logo" />
-					<search-input v-if="loggedIn && mobile"></search-input>
+					<search-input v-if="loggedIn"></search-input>
 				</div>
 				<div class="three wide right aligned column">
 
@@ -154,7 +154,7 @@
 			<div class="menu-section" v-if="loggedIn">
 				<router-link exact-active-class="active" class="menu-item menu-button" to="/notes" v-on:click.native="emitReloadEvent()">
 					<i class="file outline icon"></i>Notes
-					<counter class="float-right" number-id="totalNotes" />
+					<!-- <span v-if="$store.getters.totals">{{ $store.getters.totals['totalNotes'] }}</span> -->
 				</router-link>
 				<div>
 					<!-- <div class="menu-item sub">Show Only <i class="caret down icon"></i></div> -->
@@ -167,7 +167,7 @@
 			<div class="menu-section" v-if="loggedIn && $store.getters.totals && $store.getters.totals['totalFiles']">
 				<router-link class="menu-item menu-button" exact-active-class="active" to="/attachments">
 					<i class="folder open outline icon"></i>Files
-					<counter class="float-right" number-id="totalFiles" />
+					<!-- <span>{{ $store.getters.totals['totalFiles'] }}</span> -->
 				</router-link>
 			</div>
 
@@ -196,7 +196,7 @@
 				</div>
 			</div>
 
-			<div class="menu-section" v-if="loggedIn" data-tooltip="Click to log out" data-inverted="" data-position="right center">
+			<div class="menu-section" v-if="loggedIn">
 				<div v-if="loggedIn" v-on:click="destroyLoginToken" class="menu-item menu-button">
 					<i class="user outline icon"></i>{{ucWords($store.getters.getUsername)}}
 				</div>
@@ -216,7 +216,6 @@
 	export default {
 		components: {
 			'search-input': require('@/components/SearchInput.vue').default,
-			'counter':require('@/components/AnimatedCounterComponent.vue').default,
 		},
 		data: function(){ 
 			return {

client/src/components/NoteTitleDisplayCard.vue

@@ -15,10 +15,6 @@
 
 				<div class="sixteen wide column overflow-hidden note-card-text" @click="e => onClick(note.id, e)">
 
-					<div class="subtext" v-if="note.shareUsername">Shared by {{ note.shareUsername }}</div>
-					<div class="subtext" v-if="note.shared == 2">You Shared</div>
-
-
 					<!-- Title display  -->
 					<div v-if="note.title.length > 0" 
 						data-test-id="title"

client/src/pages/NotesPage.vue

@@ -3,22 +3,19 @@
 		
 		<div class="ui grid" :class="{ 'mush-it-up':showOneColumn() }" ref="content">
 
-			<div class="sixteen wide column">
+			<div v-if="!$store.getters.getIsUserOnMobile" class="sixteen wide column">
 				<!-- :class="{ 'sixteen wide column':showOneColumn(), 'sixteen wide column':!showOneColumn() }" -->
 				
 				<div class="ui grid">
 
-					<div class="six wide column" v-if="!$store.getters.getIsUserOnMobile">
+					<div class="eight wide column">
 						<search-input></search-input>
 					</div>
 					
-					<div class="ten wide column" :class="{ 'sixteen wide column':$store.getters.getIsUserOnMobile }">
+					<div class="eight wide column">
 
-						<div class="ui basic button" 
+						<div class="ui basic button" v-on:click="updateFastFilters(3)" v-if="$store.getters.totals && $store.getters.totals['sharedToNotes'] > 0" style="position: relative;">
-						v-on:click="updateFastFilters(3)" 
+							<i class="green mail icon"></i>Inbox
-						v-if="$store.getters.totals && ($store.getters.totals['sharedToNotes'] > 0 || $store.getters.totals['sharedFromNotes'] > 0)" 
-						style="position: relative;">
-							<i class="green mail icon"></i>Shared Notes
 							<span class="floating ui green label" v-if="$store.getters.totals['unreadNotes'] > 0">
 								{{ $store.getters.totals['unreadNotes'] }}
 							</span>
@@ -43,11 +40,14 @@
 
 			</div>
 
-			<h2 v-if="fastFilters['withLinks'] == 1">Notes with Links</h2>
-			<h2 v-if="fastFilters['withTags'] == 1">Notes with Tags</h2>
-			<h2 v-if="fastFilters['onlyArchived'] == 1">Archived Notes</h2>
-			<h2 v-if="fastFilters['onlyShowSharedNotes'] == 1">Shared Notes</h2>
 
+			<div v-if="$store.getters.getIsUserOnMobile && showClear" class="row">
+				<div class="sixteen wide column">
+					<span class="ui fluid green button" @click="reset">
+						<i class="arrow circle left icon"></i>Back to All Notes
+					</span>
+				</div>
+			</div>
 
 			<div v-if="commonTags.length > 0" class="sixteen wide column">
 				<h4><i class="green tags icon"></i>Tags</h4>
@@ -58,17 +58,19 @@
 				</span>
 			</div>
 
+			<h2 v-if="fastFilters['withLinks'] == 1">Only showing notes containing Links</h2>
+			<h2 v-if="fastFilters['withTags'] == 1">Only showing notse with Tags</h2>
+			<h2 v-if="fastFilters['onlyArchived'] == 1">Only showing Archived notes.</h2>
+
 			<!-- Note title card display  -->
 			<div class="sixteen wide column">
 				<h3 v-if="searchTerm.length > 0 && notes.length == 0">No notes found. Check your spelling, try completing the word or using a different phrase.</h3>
 
-				<h3 v-if="$store.getters.totals && $store.getters.totals['totalNotes'] == 0">
+				<h3 v-if="searchTerm.length == 0 && notes.length == 0">Create your first note. Click the "New Note" button.</h3>
-					No Notes Yet. Create one when you feel ready.
-				</h3>
 
-<!-- 				<div v-if="working">
+				<div v-if="working">
 					<div class="ui active inline loader"></div> Working...
-				</div> -->
+				</div>
 
 				<!-- Go to one wide column, do not do this on mobile interface -->
 				<div v-if="notes !== null && notes.length > 0" 
@@ -161,7 +163,6 @@
 			'fast-filters': require('@/components/FastFilters.vue').default,
 			'search-input': require('@/components/SearchInput.vue').default,
 			'attachment-display': require('@/components/AttachmentDisplayCard').default,
-			'counter':require('@/components/AnimatedCounterComponent.vue').default
 		},
 		data () {
 			return {
@@ -203,16 +204,7 @@
 
 				lastVisibilityState: null,
 
-				foundAttachments: [],
+				foundAttachments: []
-
-				noteSections: {
-					'pinned': {},
-					'archived': {},
-					'recieved': {},
-					'sent':{},
-					'notes':{},
-					'textMatch':{}
-				}
 
 			}
 		},
@@ -662,14 +654,7 @@
 			},
 			fetchUserTags(){
 				return new Promise((resolve, reject) => {
-
+					axios.post('/api/tag/usertags')
-					let postData = {
-						searchQuery: this.searchTerm,
-						searchTags: this.searchTags,
-						fastFilters: this.fastFilters,
-					}
-
-					axios.post('/api/tag/usertags', postData)
 					.then( ({data}) => {
 						this.commonTags = data
 						resolve(data)

server/index.js

@@ -22,18 +22,6 @@ io.on('connection', function(socket){
 
 	// console.log('New user ', socket.id)
 
-	//When a user connects, add them to their own room
-	// This allows the server to emit events to that specific user
-	// access socket.io in the controller with req.io
-	socket.on('user_connect', token => {
-		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)

server/models/Attachment.js

@@ -226,7 +226,7 @@ Attachment.generateThumbnail = (fileName) => {
 }
 
 //Scans text for websites, returns all attachments
-Attachment.scanTextForWebsites = (io, userId, noteId, noteText) => {
+Attachment.scanTextForWebsites = (userId, noteId, noteText) => {
 	return new Promise((resolve, reject) => {
 
 		let solrAttachmentText = '' //Final searchable scrape text for note
@@ -244,7 +244,7 @@ Attachment.scanTextForWebsites = (io, userId, noteId, noteText) => {
 				allUrls = []
 			}
 
-			//Every URL needs HTTPS!!!
+			//Every URL needs HTTPS
 			let foundUrls = []
 			allUrls.forEach( (item, index) => {
 				//Every URL should have HTTPS
@@ -279,17 +279,12 @@ Attachment.scanTextForWebsites = (io, userId, noteId, noteText) => {
 
 			//No newly scraped URLs, resolve with looked up attachment text
 			if(foundUrls == null || foundUrls.length == 0){
-				return resolve(solrAttachmentText)
+				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)
 			})

server/models/Note.js

@@ -2,7 +2,6 @@ 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')
 
@@ -158,7 +157,7 @@ Note.reindex = (userId, noteId) => {
 	})
 }
 
-Note.update = (io, userId, noteId, noteText, color, pinned, archived) => {
+Note.update = (userId, noteId, noteText, color, pinned, archived) => {
 	return new Promise((resolve, reject) => {
 
 		//Prevent note loss if it saves with empty text
@@ -193,7 +192,7 @@ Note.update = (io, userId, noteId, noteText, color, pinned, archived) => {
 			Note.reindex(userId, noteId)
 
 			//Async attachment reindex
-			Attachment.scanTextForWebsites(io, userId, noteId, noteText)
+			Attachment.scanTextForWebsites(userId, noteId, noteText)
 			
 			//Send back updated response
 			resolve(rows[0])
@@ -259,15 +258,6 @@ 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)
 		})
 	})
@@ -335,7 +325,8 @@ Note.get = (userId, noteId) => {
 				note.archived,
 				note.color,
 				count(distinct attachment.id) as attachment_count,
-				note.note_raw_text_id as rawTextId
+				note.note_raw_text_id as rawTextId,
+				user.username as shareUsername
 			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)
@@ -459,8 +450,7 @@ 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 shareUsername,
+					shareUser.username as username
-					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)
@@ -472,10 +462,7 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => {
 			
 			//Show shared notes
 			if(fastFilters.onlyShowSharedNotes == 1){
-				//share_user_id means your shared them, a note with a shared user id filled in means it was shared
+				noteSearchQuery += ' AND note.share_user_id IS NOT NULL' //Show Archived
-				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'
 			}

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(null, userId, d.id, newText, d.color, d.pinned, d.archived)
+				Note.update(userId, d.id, newText, d.color, d.pinned, d.archived)
 				.then( saveResults => {
 					resolve({
 						id:d.id,

server/models/ShareNote.js

@@ -15,10 +15,9 @@ 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 LOWER(username) = ?`, [cleanUser])
+		db.promise().query(`SELECT id FROM user WHERE username = ?`, [username])
 		.then((rows, fields) => {
 
 			if(rows[0].length == 0){
@@ -70,17 +69,11 @@ 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({'success':true, shareUserId})
+			return resolve(true)
 		})
 		.catch(error => {
-			console.log(error)
+			// console.log(error)
 			resolve(false)
 		})
 	})
@@ -110,37 +103,24 @@ ShareNote.getUsers = (userId, rawTextId) => {
 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 note_raw_text_id, user_id FROM note WHERE id = ? AND share_user_id = ?', [noteId, userId])
+		.query('SELECT user_id FROM note WHERE id = ? AND share_user_id = ?', [noteId, userId])
 		.then( (rows, fields) => {
 
-			rawTextId = rows[0][0]['note_raw_text_id']
+			//User has shared this note, with this user
-			removeUserId = rows[0][0]['user_id']
+			if(rows[0].length == 1 && Number.isInteger(rows[0][0]['user_id'])){
 
-			//Delete note entry for other user - remove users access
+				Note.delete(rows[0][0]['user_id'], noteId)
-			if(removeUserId && Number.isInteger(removeUserId)){
+				.then( result => {
-				//Delete this users access to the note
+					resolve(result)
-				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)
-		})
 
 
 	})

server/models/Tag.js

@@ -2,40 +2,16 @@ let db = require('@config/database')
 
 let Tag = module.exports = {}
 
-Tag.userTags = (userId, searchQuery, searchTags, fastFilters) => {
+Tag.userTags = (userId) => {
 	return new Promise((resolve, reject) => {
-
-		let query = `
-			SELECT 
-				tag.id, 
-				text, 
-				COUNT(note_tag.note_id) as usages
-			FROM tag
-			JOIN note_tag ON tag.id = note_tag.tag_id
-			JOIN note On note.id = note_tag.note_id
-			WHERE note_tag.user_id = ?
-		`
-
-		//Show shared notes
-		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 && 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 usages DESC, text ASC`
-
-
 		db.promise()
-		.query(query, [userId])
+		.query(`
+			SELECT tag.id, text, COUNT(note_tag.note_id) as usages FROM tag
+			JOIN note_tag ON tag.id = note_tag.tag_id
+			WHERE note_tag.user_id = ?
+			GROUP BY tag.id
+			ORDER BY id DESC
+		`, [userId])
 		.then( (rows, fields) => {
 			resolve(rows[0])
 		})

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(archived = 1 && share_user_id IS NULL) AS archivedNotes,
+				SUM(pinned = 0 && 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

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) )
 	})
 
 })

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(req.io, userId, req.body.noteId, req.body.text, req.body.color, req.body.pinned, req.body.archived)
+	Notes.update(userId, req.body.noteId, req.body.text, req.body.color, req.body.pinned, req.body.archived)
 	.then( id => res.send({id}) )
 })
 
@@ -72,13 +72,7 @@ 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( ({success, shareUserId}) => {
+	.then(results => res.send(results))
-
-		//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) {

server/routes/tagController.js

@@ -44,7 +44,7 @@ router.post('/get', function (req, res) {
 
 //Get all the tags for this user in order of usage
 router.post('/usertags', function (req, res) {
-	Tags.userTags(userId, req.body.searchQuery, req.body.searchTags, req.body.fastFilters)
+	Tags.userTags(userId)
 	.then( data => res.send(data) )
 })