+
{
this.closeNote(position)
})
-
+ this.$bus.$on('note_deleted', () => {
+ this.search()
+ })
},
mounted() {
@@ -223,6 +225,7 @@
},
destroyLoginToken() {
this.$store.commit('destroyLoginToken')
+ this.$router.push('/')
}
}
}
@@ -231,4 +234,8 @@
.detail {
float: right;
}
+ .note-card-display-area {
+ display: flex;
+ flex-wrap: wrap;
+ }
\ No newline at end of file
diff --git a/client/src/main.js b/client/src/main.js
index 40861e6..214cf37 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -9,6 +9,14 @@ import store from './stores/mainStore';
import App from './App'
import router from './router'
+// This callback runs before every route change, including on page load.
+// Sets the title of the page using vue router
+router.beforeEach((to, from, next) => {
+
+ document.title = to.meta.title;
+ next();
+});
+
//Attach event bus to main vue object, all components will inherit event bus
import EventBus from './EventBus'
import Helpers from './Helpers'
diff --git a/client/src/router/index.js b/client/src/router/index.js
index e91f060..16f99ca 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -13,21 +13,25 @@ export default new Router({
{
path: '/',
name: 'HelloWorld',
+ meta: {title:'Home'},
component: HelloWorld
},
{
path: '/login',
name: 'Login',
+ meta: {title:'Login'},
component: Login
},
{
path: '/notes',
name: 'Notes',
+ meta: {title:'Notes'},
component: Notes
},
{
path: '/help',
name: 'Help',
+ meta: {title:'Help'},
component: HelpPage
},
]
diff --git a/client/src/stores/mainStore.js b/client/src/stores/mainStore.js
index c92cdce..abf4a33 100644
--- a/client/src/stores/mainStore.js
+++ b/client/src/stores/mainStore.js
@@ -16,8 +16,6 @@ export default new Vuex.Store({
state.count++
},
setLoginToken(state, userData){
-
- console.log(userData)
const username = userData.username
const token = userData.token
diff --git a/server/models/Attachment.js b/server/models/Attachment.js
index 90112ef..808d91e 100644
--- a/server/models/Attachment.js
+++ b/server/models/Attachment.js
@@ -38,7 +38,10 @@ Attachment.scanTextForWebsites = (userId, noteId, noteText) => {
//Find all URLs in text
const urlPattern = /(?:(?:https?|ftp|file):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#/%=~_|$?!:,.]*\)|[A-Z0-9+&@#/%=~_|$])/igm
- let foundUrls = noteText.match(urlPattern)
+ let allUrls = noteText.match(urlPattern)
+
+ //Remove all duplicates
+ let foundUrls = [...new Set(allUrls)]
//Go through each attachment, check for existing URLs
attachments.forEach(attachment => {
@@ -54,7 +57,7 @@ Attachment.scanTextForWebsites = (userId, noteId, noteText) => {
})
//No newly scraped URLs, resolve with looked up attachment text
- if(foundUrls.length == 0){
+ if(foundUrls == null || foundUrls.length == 0){
resolve(solrAttachmentText)
}
@@ -166,12 +169,14 @@ Attachment.processUrl = (userId, noteId, url) => {
let finalWords = []
for(let i=0; i<15; i++){
- if(sortable[i][0]){
+ if(sortable[i] && sortable[i][0]){
finalWords.push(sortable[i][0])
}
}
desiredSearchText += finalWords.join(', ')
+ console.log('TexT Scraped')
+ console.log(desiredSearchText)
const created = Math.round((+new Date)/1000)
diff --git a/server/models/Notes.js b/server/models/Notes.js
index ee6f561..484892d 100644
--- a/server/models/Notes.js
+++ b/server/models/Notes.js
@@ -75,7 +75,20 @@ Notes.update = (userId, noteId, noteText, fancyInput, color) => {
Notes.delete = (userId, noteId) => {
return new Promise((resolve, reject) => {
- //Create new note, return created or finger your butt
+ // DELETE FROM notes WHERE notes.id = 290 AND notes.user = 61;
+ // DELETE FROM attachment WHERE attachment.note_id = 290 AND attachment.user_id = 61;
+ // DELETE FROM notes_tags WHERE notes_tags.note_id = 290 AND notes_tags.user_id = 61;
+ db.promise().query('DELETE FROM notes WHERE notes.id = ? AND notes.user = ?', [noteId,userId])
+ .then((rows, fields) => {
+ db.promise().query('DELETE FROM attachment WHERE attachment.note_id = ? AND attachment.user_id = ?', [noteId,userId])
+ .then((rows, fields)=> {
+ db.promise().query('DELETE FROM notes_tags WHERE notes_tags.note_id = ? AND notes_tags.user_id = ?', [noteId,userId])
+ .then((rows, fields)=> {
+ console.log('All Deleted')
+ resolve(true)
+ })
+ })
+ })
})
}
@@ -153,9 +166,10 @@ Notes.search = (userId, searchQuery, searchTags) => {
//Default note lookup gets all notes
let noteSearchQuery = `
- SELECT notes.id, SUBSTRING(text, 1, 200) as text, updated, color
+ SELECT notes.id, SUBSTRING(notes.text, 1, 400) as text, updated, color, count(distinct notes_tags.id) as tag_count, count(distinct attachment.id) as attachment_count
FROM notes
LEFT JOIN notes_tags ON (notes.id = notes_tags.note_id)
+ LEFT JOIN attachment ON (notes.id = attachment.note_id AND attachment.attachment_type = 1)
WHERE user = ?`
let searchParams = [userId]
@@ -193,16 +207,30 @@ Notes.search = (userId, searchQuery, searchTags) => {
noteIds.push(note.id)
//Attempt to pull string out of first tag in note
- let reg = note.text.match(/<([\w]+)[^>]*>(.*?)<\/\1>/)
- if(reg != null){
- note.text = reg[2]
+ let reg = note.text.match(/<([\w]+)[^>]*>(.*?)<\/\1>/g)
+
+ //Pull out first html tag contents, that is the title
+ if(reg != null && reg[0]){
+ note.title = reg[0] //First line from HTML
+ } else {
+ note.title = note.text //Entire note
}
- //Return all notes with HTML tags pulled out
- note.text = note.text
+ //Clean up html title
+ note.title = note.title
.replace(/&[#A-Za-z0-9]+;/g,'') //Rip out all HTML entities
.replace(/<[^>]+>/g, '') //Rip out all HTML tags
+ //Generate Subtext
+ if(note.text != '' && note.title != ''){
+ note.subtext = note.text
+ .replace(/&[#A-Za-z0-9]+;/g,' ') //Rip out all HTML entities
+ .replace(/<[^>]+>/g, ' ') //Rip out all HTML tags
+ .replace(/\s+/g, ' ') //Remove all whitespace
+ .substring(note.title.length + 2)
+ }
+
+
note.note_highlights = []
note.attachment_highlights = []
note.tag_highlights = []
diff --git a/server/routes/notesController.js b/server/routes/notesController.js
index a85667d..e4963b3 100644
--- a/server/routes/notesController.js
+++ b/server/routes/notesController.js
@@ -24,6 +24,11 @@ router.post('/get', function (req, res) {
.then( data => res.send(data) )
})
+router.post('/delete', function (req, res) {
+ Notes.delete(userId, req.body.noteId)
+ .then( data => res.send(data) )
+})
+
router.post('/create', function (req, res) {
Notes.create(userId, req.body.title)
.then( id => res.send({id}) )