Remove TinyMce Added Squire

client/src/pages/AttachmentsPage.vue

@@ -6,22 +6,35 @@
 				<h2 class="ui header">
 					<i class="folder icon"></i>
 						<div class="content">
-						Attachments
-						<div class="sub header">Files and scraped web pages from notes</div>
+						Files
+						<div class="sub header">Uploaded Files and Websites from notes.</div>
 					</div>
 				</h2>
 			</div>
 
-			<div class="ui segment" v-if="searchParams.noteId">
-				Showing Attachments for note. <div class="ui button" v-on:click="clearNote">Clear</div>
+			<div class="sixteen wide column" v-if="searchParams.noteId">
+				<div class="ui green button" v-on:click="clearNote">
+					<i class="chevron circle left icon"></i>
+					Show All Attachments
+				</div>
+				<div class="ui green button" v-on:click="openNote">
+					<i class="file icon"></i>
+					Open Note
+				</div>
 			</div>
 
-			<div class="ui basic segment">
-			<attachment-display 
-				v-for="item in attachments" 
-				:item="item"
-				:key="item.id"
-			/>
+			<div class="sixteen wide column" v-if="searchParams['noteId'] && attachments.length == 0">
+				<h3>There are no attachments for this note.</h3>
+				<h3>Attachments are links or files added to the note.</h3>
+			</div>
+
+			<div class="sixteen wide column">
+				<attachment-display 
+					v-for="item in attachments" 
+					:item="item"
+					:key="item.id"
+					:search-params="searchParams"
+				/>
 			</div>
 			
 		</div>
@@ -50,18 +63,30 @@
 		mounted: function(){
 
 			//Mount notes on load if note ID is set
-			if(this.$route.params && this.$route.params.id){
-				const inputNoteId = this.$route.params.id
-				this.searchParams['noteId'] = inputNoteId
-			}
-
+			this.openNoteAttachments()
 			this.searchAttachments()
 		},
+		watch:{
+			$route (to, from){
+				//Open or close notes on route change
+				this.openNoteAttachments()
+				this.searchAttachments()
+			}
+		},
 		methods: {
+			openNoteAttachments(){
+				if(this.$route.params && this.$route.params.id){
+					const inputNoteId = this.$route.params.id
+					this.searchParams['noteId'] = inputNoteId
+				}
+			},
+			openNote(){
+				const noteId = this.searchParams['noteId']
+				this.$router.push('/notes/open/'+noteId)
+			},
 			clearNote(){
 				this.$router.push('/attachments/')
 				delete this.searchParams.noteId
-				this.searchAttachments()
 			},
 			searchAttachments (){
 

client/src/pages/NotesPage.vue

@@ -115,6 +115,18 @@
 
 			</div>
 
+
+			<!-- found attachments  -->
+			<div class="sixteen wide column" v-if="foundAttachments.length > 0">
+				<h4><i class="green folder icon"></i> Found in Files ({{ foundAttachments.length }})</h4>
+				<attachment-display 
+					v-for="item in foundAttachments" 
+					:item="item"
+					:key="item.id"
+					:search-params="{}"
+				/>
+			</div>
+
 		</div>
 
 		
@@ -135,6 +147,7 @@
 			'note-title-display-card': require('@/components/NoteTitleDisplayCard.vue').default,
 			'fast-filters': require('@/components/FastFilters.vue').default,
 			'search-input': require('@/components/SearchInput.vue').default,
+			'attachment-display': require('@/components/AttachmentDisplayCard').default,
 		},
 		data () {
 			return {
@@ -176,20 +189,14 @@
 
 				lastVisibilityState: null,
 
+				foundAttachments: []
+
 			}
 		},
 		beforeMount(){
 
 			this.$parent.loginGateway()
 
-			//Load tinymce into the page only do it once
-			if(document.querySelectorAll('[data-mceload]').length == 0){
-				let tinyMceIncluder = document.createElement('script')
-				tinyMceIncluder.setAttribute('src', '/api/static/assets/tinymce/tinymce.min.js')
-				tinyMceIncluder.setAttribute('data-mceload','loaded')
-				document.head.appendChild(tinyMceIncluder)
-			}
-
 			this.$bus.$on('close_active_note', ({position, noteId}) => {
 				this.closeNote(position)
 				this.updateSingleNote(noteId)
@@ -220,6 +227,9 @@
 				this.searchTerm = sentInSearchTerm
 				this.search(true, this.batchSize)
 					.then( () => {
+
+						this.searchAttachments()
+
 						return this.fetchUserTags()
 					})
 			})
@@ -244,7 +254,7 @@
 			//Close notes when back button is pressed
 			window.addEventListener('hashchange', this.hashChangeAction)
 
-
+			//update note on visibility change
 			document.addEventListener('visibilitychange', this.visibiltyChangeAction);
 
 		},
@@ -475,6 +485,14 @@
 					}
 				})
 			},
+			searchAttachments(){
+				axios.post('/api/attachment/textsearch', {'searchTerm':this.searchTerm})
+				.then(results => {
+					console.log('Attachment Results')
+					console.log(results.data)
+					this.foundAttachments = results.data
+				})
+			},
 			search(showLoading = true, notesInNextLoad = null, mergeExisting = false){
 				return new Promise((resolve, reject) => {
 
@@ -595,6 +613,7 @@
 				this.searchTerm = ''
 				this.searchTags = []
 				this.fastFilters = {}
+				this.foundAttachments = [] //Remove all attachments 
 				this.$bus.$emit('reset_fast_filters')
 
 				//Load initial batch, then tags, then other batch

client/src/pages/QuickPage.vue

@@ -83,7 +83,7 @@
 			checkKeyup(event){
 
 				let element = event.target
-				let padding = 22
+				let padding = 0
 
 				element.style.height = 'auto';
       			element.style.height = (element.scrollHeight + padding) +'px';