* Removed arrows from notification

* Added trash can function * Tweaked status text to always be the same * Removed some open second note code * Edior always focuses on text now * Added some extra loading note messages * Notes are now removed from search index when deleted * Lots more things happen and update in real time on multiple machines * Shared notes can be reverted * WAY more tests * Note Categories are much more reliable * Lots of code is much cleaner
2020-05-18 07:45:35 +00:00
parent e87e8513bc
commit 5096e74a60
18 changed files with 644 additions and 368 deletions
--- a/client/src/components/GlobalNotificationComponent.vue
+++ b/client/src/components/GlobalNotificationComponent.vue
@@ -70,9 +70,7 @@
 <template>
 	<div class="popup-body slide-in-bottom" v-on:click="dismiss" v-if="notifications.length > 0">
 		<div class="popup-row color-fade" v-for="item in notifications">
-			<i class="disabled angle left icon"></i>
 			<span>{{ item }}</span>
-			<i class="disabled angle right icon"></i>
 		</div>
 	</div>
 </template>
--- a/client/src/components/GlobalSiteMenu.vue
+++ b/client/src/components/GlobalSiteMenu.vue
@@ -257,7 +257,7 @@
 		},
 		data: function(){ 
 			return {
-				version: '2.1.2',
+				version: '2.2.2',
 				username: '',
 				collapsed: false,
 				mobile: false,
@@ -329,7 +329,7 @@
 				.then(response => {

 					if(response.data && response.data.id){
-						// this.$router.push('/notes/open/'+response.data.id)
+						//Redirect to note page if user is not on it
 						this.$bus.$emit('open_note', response.data.id)
 						this.disableNewNote = false
 					}
--- a/client/src/components/NoteDeleteButtonComponent.vue
+++ b/client/src/components/NoteDeleteButtonComponent.vue
@@ -1,6 +1,6 @@
 <template>
 	<span>
-		<span class="clickable" @click="confirmDelete()" v-if="click == 0" data-tooltip="Delete" data-inverted="" data-position="top right">
+		<span class="clickable" @click="confirmDelete()" v-if="click == 0" data-tooltip="Delete Forever" data-inverted="" data-position="top right">
 			<i class="trash alternate icon"></i>
 		</span>
 		<span class="clickable" @click="actuallyDelete()" @mouseleave="reset" v-if="click == 1" data-tooltip="Click again to delete." data-position="top right" data-inverted="">
--- a/client/src/components/NoteInputPanel.vue
+++ b/client/src/components/NoteInputPanel.vue
@@ -265,7 +265,7 @@
 				updated: '',
 				shareUsername: null,
 				diffNoteText: '',
-				statusText: 'Saved',
+				statusText: 'Saved.',
 				lastNoteHash: null,
 				saveDebounce: null, //Prevent save from being called numerous times quickly
 				updated: 'Never',
@@ -306,16 +306,16 @@
 		watch: {
 			noteid:function(newVal, oldVal){

-				if(newVal == this.currentNoteId){
-					return
-				}
+				// if(newVal == this.currentNoteId){
+				// 	return
+				// }

-				if(newVal == oldVal){
-					return
-				}
+				// if(newVal == oldVal){
+				// 	return
+				// }
 				
-				this.currentNoteId = newVal
-				this.loadNote(this.currentNoteId)
+				// this.currentNoteId = newVal
+				// this.loadNote(this.currentNoteId)
 				
 			},
 			urlData(newVal, oldVal){
@@ -388,17 +388,10 @@
 				this.lastNoteHash = this.hashString(this.getText())
 				// console.log('hash on load', this.lastNoteHash)

-				//focus on open, not on mobile, thats annoying
+				//focus on open, not on mobile, it causes the keyboard to pop up, thats annoying
 				if(!this.$store.getters.getIsUserOnMobile){
-					// this.editor.focus()
-
-					if(this.noteTitle.length == 0){
-						this.$refs.titleTextarea.focus()
-					} else {
-						this.editor.focus()
-						this.editor.moveCursorToEnd()
-					}
-
+					this.editor.focus()
+					this.editor.moveCursorToEnd()
 				}

 				//Change button states on editor when element is active
@@ -812,11 +805,14 @@
 			loadNote(noteId){

 				//Generate a random loading message
+				let mod = ['Gently','Calmly','Lovingly','Quickly','','','','','','','','','','','','','']
 				let doing = ['Loading','Loading','Getting','Fetching','Grabbing','Sequencing','Organizing','Untangling','Processing','Refining','Extracting','Fusing','Pruning','Expanding','Enlarging','Transfiguring','Quantizing','Ingratiating','Lumping']
 				let thing = ['Note','Note','Note','Note','Data','Text','Document','Algorithm','Buffer','Client','Download','File','Frame','Graphics','Hardware','HTML','Interface','Logic','Mainframe','Memory','Media','Nodes','Network','Chaos']
-				let p1 = doing[Math.floor(Math.random() * doing.length)]
-				let p2 = thing[Math.floor(Math.random() * thing.length)]
-				this.loadingMessage = p1 + ' ' + p2
+
+				let p1 = mod[Math.floor(Math.random() * mod.length)]
+				let p2 = doing[Math.floor(Math.random() * doing.length)]
+				let p3 = thing[Math.floor(Math.random() * thing.length)]
+				this.loadingMessage = `${p1} ${p2} ${p3}`
 				
 				//Component is activated with NoteId in place, lookup text with associated ID
 				if(this.$store.getters.getLoggedIn){
@@ -1039,7 +1035,7 @@
 			},
 			onKeyup(){

-				this.statusText = ''
+				this.statusText = 'Modded'

 				// this.diffText()

@@ -1067,7 +1063,7 @@
 					const currentNoteText = this.getText()
 					const currentHash = this.hashString( currentNoteText )
 					if( this.lastNoteHash == currentHash){
-						this.statusText = 'Saved'
+						this.statusText = 'Saved.'
 						return resolve(true)
 					}

@@ -1090,7 +1086,7 @@

 					this.statusText = 'Saving'
 					axios.post('/api/note/update', postData).then( response => {
-						this.statusText = 'Saved'
+						this.statusText = 'Saved.'
 						this.updated = Math.round((+new Date)/1000)
 						this.modified = true

--- a/client/src/components/NoteTitleDisplayCard.vue
+++ b/client/src/components/NoteTitleDisplayCard.vue
@@ -29,12 +29,10 @@

 				<!-- Title display  -->
 				<span v-if="note.title.length > 0" 
-					data-test-id="title"
 					class="big-text"><p>{{ note.title }}</p></span>

 				<!-- Sub text display -->
 				<span v-if="note.subtext.length > 0 && !isShowingSearchResults()"
-					data-test-id="subtext"
 					class="small-text"
 					v-html="note.subtext"></span>

@@ -71,13 +69,6 @@
 			<!-- Toolbar on the bottom  -->
 			<div class="tool-bar" @click.self="cardClicked" v-if="!titleView">
 				<div class="icon-bar">
-
-					<!-- <span v-if="note.pinned == 1" data-position="top left" data-tooltip="Pinned" data-inverted>
-						<i class="green pin icon"></i>
-					</span>
-					<span v-if="note.archived == 1" data-position="top left" data-tooltip="Archived" data-inverted>
-						<i class="green archive icon"></i>
-					</span> -->
 					
 					<span class="tags" v-if="note.tags">
 						<span  v-for="tag in (note.tags.split(','))" class="little-tag">{{ tag }}</span>
@@ -90,24 +81,43 @@

 					<span class="teeny-buttons" :class="{ 'hover-hide':(!$store.getters.getIsUserOnMobile) }">

-						<i class="teeny-button" data-tooltip="Tags" data-inverted v-on:click="toggleTags(true)">
-							<i class="tags icon"></i>
-						</i>
+						<span v-if="!note.trashed">

-						<i class="teeny-button"
-							data-tooltip="Archive"
-							:data-tooltip="note.archived ? 'Un-Archive':'Archive' " 
-							data-inverted v-on:click="archiveNote">
-							<i class="archive icon" :class="{'green':note.archived}"></i>
-						</i>
+							<i class="teeny-button" data-tooltip="Tags" data-inverted v-on:click="toggleTags(true)">
+								<i class="tags icon"></i>
+							</i>

-						<i class="teeny-button" 
-							:data-tooltip="note.pinned ? 'Un-Pin':'Pin' " 
-							data-inverted v-on:click="pinNote">
-							<i class="pin icon" :class="{'green':note.pinned}"></i>
-						</i>
+							<i class="teeny-button"
+								data-tooltip="Archive"
+								:data-tooltip="note.archived ? 'Un-Archive':'Archive' " 
+								data-inverted v-on:click="archiveNote">
+								<i class="archive icon" :class="{'green':note.archived}"></i>
+							</i>

-						<delete-button class="teeny-button" :note-id="note.id" />
+							<i class="teeny-button" 
+								:data-tooltip="note.pinned ? 'Un-Pin':'Pin' " 
+								data-inverted v-on:click="pinNote">
+								<i class="pin icon" :class="{'green':note.pinned}"></i>
+							</i>
+
+							<i class="teeny-button"
+								data-tooltip="Move to Trash" 
+								data-inverted v-on:click="trashNote()">
+								<i class="trash icon"></i>
+							</i>
+						</span>
+
+						<!-- Trash note options -->
+						<span v-if="note.trashed">
+							<i class="teeny-button" 
+								data-tooltip="Un-Trash" 
+								data-inverted v-on:click="trashNote()">
+								<i class="reply icon"></i>
+							</i>
+							<delete-button class="teeny-button" :note-id="note.id" />
+						</span>
+
+						

 					</span>
 				</div>
@@ -185,7 +195,7 @@
 				let postData = {'pinned': !this.note.pinned, 'noteId':this.note.id}
 				axios.post('/api/note/setpinned', postData)
 				.then(data => {
-					this.$bus.$emit('update_single_note', this.note.id)
+					// this.$bus.$emit('update_single_note', this.note.id)
 				})
 				.catch(error => { this.$bus.$emit('notification', 'Failed to Pin Note') })
 			},
@@ -197,20 +207,35 @@
 					//Show message so no one worries where note went
 					let message = 'Moved to Archive'
 					if(postData.archived != 1){
-						message = 'Move to main list'
+						message = 'Moved to main list'
 					}
 					this.$bus.$emit('notification', message)

-					this.$bus.$emit('update_single_note', this.note.id)
+					// this.$bus.$emit('update_single_note', this.note.id)
 				})
 				.catch(error => { this.$bus.$emit('notification', 'Failed to Archive Note') })
 			},
+			trashNote(){ //toggleArchived() <- old name
+				let postData = {'trashed': !this.note.trashed, 'noteId':this.note.id}
+				axios.post('/api/note/settrashed', postData)
+				.then(data => {
+
+					//Show message so no one worries where note went
+					let message = 'Moved to Trash'
+					if(postData.trashed == 0){
+						message = 'Moved to main list'
+					}
+					this.$bus.$emit('notification', message)
+
+				})
+				.catch(error => { this.$bus.$emit('notification', 'Failed to Trash Note') })
+			},
 			toggleTags(state){

 				this.showTagSlideMenu = state

 				if(state == false){
-					this.$bus.$emit('update_single_note', this.note.id)
+					// this.$bus.$emit('update_single_note', this.note.id)
 				}
 				
 			},
@@ -330,6 +355,10 @@
 		color: var(--text_color);
 		background-color: var(--background_color);
 	}
+	.subtext {
+		display: inline-block;
+		width: 100%;
+	}

 	/*Strict font sizes for card display*/
 	.small-text {
--- a/client/src/components/ShareNoteComponent.vue
+++ b/client/src/components/ShareNoteComponent.vue
@@ -80,8 +80,14 @@
 				})
 				.catch(error => { this.$bus.$emit('notification', 'Failed to Load Shared') })
 			},
-			onRevokeAccess(noteId){
-				axios.post('/api/note/shareremoveuser', {'noteId':noteId})
+			onRevokeAccess(sharedNoteId){
+
+				const postData = {
+					'noteId': this.noteId,
+					'shareUserNoteId': sharedNoteId
+				}
+
+				axios.post('/api/note/shareremoveuser', postData)
 				.then( ({data}) => {
 					console.log(data)
 					if(data == true){
--- a/client/src/components/TagDisplayComponent.vue
+++ b/client/src/components/TagDisplayComponent.vue
@@ -25,6 +25,9 @@
 					<div class="two wide middle aligned center aligned column" v-on:click="menuOpen = false">
 						<i class="grey close icon"></i>
 					</div>
+					<div class="sixteen wide middle aligned column" v-if="loadedTags.length == 0">
+						Tags added to Notes will appear here.
+					</div>
 					<div class="row hover-row" v-for="tag in loadedTags" v-on:click="onClick(tag.id)" :class="{'green':(activeTags[0] == tag.id)}">
 						<div class="two wide center aligned column">
 							<i class="grey tag icon"></i>