* Made splash page dark and updated description

* Cleaned up unused things * Updated squire which had a comment typo update...thats it * Background color picker has matching colors and styles to text color picker * Added new black theme * Moved search to main page, show it on mobile and added options to push things to notes from search with experimental tag searching * Added active note menu buttons based on cursor location in text * Added more instant updating if app is open in two locations for the same user Scratch Pad and home page update with new notes and new text in real time
2020-05-15 23:12:09 +00:00
parent 67b218329b
commit e87e8513bc
20 changed files with 526 additions and 271 deletions
--- a/server/index.js
+++ b/server/index.js
@@ -139,8 +139,8 @@ app.use(function(req, res, next){

 // Test Area
 // ->  right here
-let UserTest = require('@models/User')
-let NoteTest = require('@models/Note')
+// let UserTest = require('@models/User')
+// let NoteTest = require('@models/Note')
 // UserTest.keyPairTest()
 // .then( ({testUserId, masterKey}) => NoteTest.test(testUserId, masterKey))
 // .then( message => { console.log(message) })
--- a/server/models/Note.js
+++ b/server/models/Note.js
@@ -24,7 +24,7 @@ Note.test = (userId, masterKey) => {

 		let testNoteId = 0

-		Note.create(userId, '','', masterKey)
+		Note.create(null, userId, '','', masterKey)
 		.then(newNoteId => {

 			console.log('Test: Create Note - Pass')
@@ -164,7 +164,7 @@ Note.encryptEveryNote = (userId, masterKey) => {
 }

 //Returns insertedId of new note
-Note.create = (userId, noteTitle, noteText, masterKey) => {
+Note.create = (io, userId, noteTitle = '', noteText = '', masterKey) => {
 	return new Promise((resolve, reject) => {

 		if(userId == null || userId < 10){ reject('User Id required to create note') }
@@ -173,6 +173,9 @@ Note.create = (userId, noteTitle, noteText, masterKey) => {
 		const salt = cs.createSmallSalt()
 		const snippetSalt = cs.createSmallSalt()

+		const snippetObj = JSON.stringify([noteTitle, noteText.substring(0, 500)])
+		const snippet = cs.encrypt(masterKey, snippetSalt, snippetObj)
+
 		const textObject = JSON.stringify([noteTitle, noteText])
 		const encryptedText = cs.encrypt(masterKey, salt, textObject)

@@ -183,10 +186,15 @@ Note.create = (userId, noteTitle, noteText, masterKey) => {
 			const rawTextId = rows[0].insertId

 			return db.promise()
-			.query('INSERT INTO note (user_id, note_raw_text_id, created, quick_note, snippet_salt) VALUES (?,?,?,?,?)', 
-			[userId, rawTextId, created, 0, snippetSalt])
+			.query('INSERT INTO note (user_id, note_raw_text_id, created, quick_note, snippet, snippet_salt) VALUES (?,?,?,?,?,?)', 
+			[userId, rawTextId, created, 0, snippet, snippetSalt])
 		})
 		.then((rows, fields) => {
+
+			if(io){
+				io.to(userId).emit('new_note_created', rows[0].insertId)
+			}
+
 			// Indexing is done on save
 			resolve(rows[0].insertId) //Only return the new note ID when creating a new note
 		})
--- a/server/models/QuickNote.js
+++ b/server/models/QuickNote.js
@@ -5,45 +5,76 @@ let Note = require('@models/Note')
 let QuickNote = module.exports = {}


-QuickNote.get = (userId) => {
+QuickNote.get = (userId, masterKey) => {
 	return new Promise((resolve, reject) => {

 		db.promise()
 		.query(`
-			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
+			SELECT note.id FROM note WHERE quick_note = 1 AND user_id = ? LIMIT 1
 			`, [userId])
 		.then((rows, fields) => {

 			//Quick Note is set, return note text
-			if(rows[0].length == 1){
-				resolve({
-					id: rows[0][0].id,
-					text: rows[0][0].text
+			if(rows[0][0] != undefined){
+				let noteId = rows[0][0].id
+				Note.get(userId, noteId, masterKey)
+				.then( noteObject => {
+					return resolve(noteObject)
 				})
+			} else {
+				return resolve(null)
 			}

-			resolve({
-				id: null,
-				text: 'Enter something to create a quick note.'
-			})
+			
 		})
 		.catch(console.log)
 	})
 }

-QuickNote.update = (userId, pushText) => {
+QuickNote.newNote = (userId) => {
+	return new Promise((resolve, reject) => {
+		db.promise().query('UPDATE note SET quick_note = 0 WHERE quick_note = 1 AND user_id = ?',[userId])
+		.then((rows, fields) => {
+			resolve(true)
+		})
+	})
+}
+
+QuickNote.makeUrlLink = (inputText) => {
+	var replacedText, replacePattern1, replacePattern2, replacePattern3;
+
+    //URLs starting with http://, https://, or ftp://
+    replacePattern1 = /(\b(https?|ftp):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gim;
+    replacedText = inputText.replace(replacePattern1, '<a href="$1" target="_blank">$1</a>');
+
+    //URLs starting with "www." (without // before it, or it'd re-link the ones done above).
+    replacePattern2 = /(^|[^\/])(www\.[\S]+(\b|$))/gim;
+    replacedText = replacedText.replace(replacePattern2, '$1<a href="http://$2" target="_blank">$2</a>');
+
+    //Change email addresses to mailto:: links.
+    replacePattern3 = /(([a-zA-Z0-9\-\_\.])+@[a-zA-Z\_]+?(\.[a-zA-Z]{2,6})+)/gim;
+    replacedText = replacedText.replace(replacePattern3, '<a href="mailto:$1">$1</a>');
+
+    return replacedText;
+}
+
+QuickNote.update = (io, userId, pushText, masterKey) => {
 	return new Promise((resolve, reject) => {

+		let finalId = null
+		let finalText = ''
+
 		//Process pushText, split at \n (new lines), put <p> tags around each new line
-		let broken = '<blockquote>' +
+		let broken = '<p>' +
 			pushText.split(/\r?\n/).map( (line, index) => {

 			let clean = line
 				.replace(/&[#A-Za-z0-9]+;/g,'') //Rip out all HTML entities
 				.replace(/<[^>]+>/g, '') //Rip out all HTML tags

+			//Turn links into actual linx
+			clean = QuickNote.makeUrlLink(clean)
+
 			if(clean == ''){ clean = '&nbsp;' }
 			let newLine = ''
 			if(index > 0){ newLine = '<br>' }
@@ -51,51 +82,31 @@ QuickNote.update = (userId, pushText) => {
 			//Return line wrapped in p tags
 			return `${newLine}<span>${clean}</span>`

-		}).join('') + '</blockquote>'
+		}).join('') + '</p><p><br></p>'

-		db.promise()
-		.query(`
-			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) => {
+		QuickNote.get(userId, masterKey)
+		.then(noteObject => {

-			//Quick Note is set, push it the front of existing note
-			if(rows[0].length == 1){
+			if(noteObject == null){

-				let d = rows[0][0] //Get row data
+				finalText += broken

-				//Push old text behind fresh new text
-				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)
-				.then( saveResults => {
-					resolve({
-						id:d.id,
-						text:newText
-					})
+				return Note.create(io, userId, 'Quick Note', finalText, masterKey)
+				.then(insertedId => {
+					finalId = insertedId
+					return db.promise().query('UPDATE note SET quick_note = 1 WHERE id = ? AND user_id = ?',[insertedId, userId])
 				})

 			} else {

-				//Create a new note with the quick text submitted.
-				Note.create(userId, broken, 1)
-				.then( insertId => {
-					resolve({
-						id:insertId,
-						text:broken
-					})
-				})
+				finalText += (broken + noteObject.text)
+				finalId = noteObject.id
+				return Note.update(io, userId, noteObject.id, finalText, noteObject.title, noteObject.color, noteObject.pinned, noteObject.archived, null, masterKey)
 			}
 		})
-		.catch(console.log)
+		.then( saveResults => {
+			return resolve(true)
+		})
 	})

-	//Lookup quick note, 
-
-	//Note.create(userId, 'Quick Note', 1)
-
 }
--- a/server/models/Tag.js
+++ b/server/models/Tag.js
@@ -176,16 +176,24 @@ Tag.suggest = (userId, noteId, tagText) => {
 	tagText += '%'

 	return new Promise((resolve, reject) => {
-		db.promise()
-		.query(`SELECT text FROM note_tag 
+
+		let params = [userId, tagText]
+		let query = `SELECT tag.id, text FROM note_tag 
 				JOIN tag ON note_tag.tag_id = tag.id
 				WHERE note_tag.user_id = ?
-				AND tag.text LIKE ?
-				AND note_tag.tag_id NOT IN (
-					SELECT note_tag.tag_id FROM note_tag WHERE note_tag.note_id = ?
-				)
-				GROUP BY text
-				LIMIT 6`, [userId, tagText, noteId])
+				AND tag.text LIKE ?`
+
+		if(noteId && noteId > 0){
+			params.push(noteId)
+			query += `AND note_tag.tag_id NOT IN 
+			(SELECT note_tag.tag_id FROM note_tag WHERE note_tag.note_id = ?)`
+		}
+
+		query += ` GROUP BY text, id LIMIT 6`
+
+
+		db.promise()
+		.query(query, params)
 		.then((rows, fields) => {
 			resolve(rows[0]) //Return new ID
 		})
--- a/server/routes/noteController.js
+++ b/server/routes/noteController.js
@@ -34,7 +34,7 @@ router.post('/delete', function (req, res) {
 })

 router.post('/create', function (req, res) {
-	Notes.create(userId, req.body.title, req.body.text, masterKey)
+	Notes.create(req.io, userId, req.body.title, req.body.text, masterKey)
 	.then( id => res.send({id}) )
 })

--- a/server/routes/quicknoteController.js
+++ b/server/routes/quicknoteController.js
@@ -2,12 +2,15 @@ var express = require('express')
 var router = express.Router()

 let QuickNote = require('@models/QuickNote');
+
 let userId = null
+let masterKey = null

 // middleware that is specific to this router
 router.use(function setUserId (req, res, next) {
 	if(userId = req.headers.userId){
 		userId = req.headers.userId
+		masterKey = req.headers.masterKey
 	}
 	
 	next()
@@ -15,19 +18,19 @@ router.use(function setUserId (req, res, next) {

 //Get quick note text
 router.post('/get', function (req, res) {
-	QuickNote.get(userId)
+	QuickNote.get(userId, masterKey)
 	.then( data => res.send(data) )
 })

 //Push text to quick note
 router.post('/update', function (req, res) {
-	QuickNote.update(userId, req.body.pushText)
+	QuickNote.update(req.io, userId, req.body.pushText, masterKey)
 	.then( data => res.send(data) )
 })

-//Change quick note to a new note
-router.post('/change', function (req, res) {
-	QuickNote.change(userId, req.body.noteId)
+//Push text to quick note
+router.post('/new', function (req, res) {
+	QuickNote.newNote(userId)
 	.then( data => res.send(data) )
 })