From ecbf6a9cde4f872bdc9598885229da0cb0209f04 Mon Sep 17 00:00:00 2001
From: Max G <admin@internet.com>
Date: Thu, 26 Mar 2020 04:45:23 +0000
Subject: [PATCH] Added rate limiting and server security Ton of little visual
 style tweaks and little up improvements for mobile

---
 backupDatabase.sh                             |   2 +-
 buildAndUpdateProd.sh                         |   4 +-
 client/src/App.vue                            |   2 +-
 client/src/assets/semantic-helper.css         |  37 ++++-
 client/src/components/GlobalSiteMenu.vue      |  50 ++++---
 client/src/components/NoteInputPanel.vue      | 126 +++++++++---------
 .../components/NoteMenuButtonComponent.vue    |   5 +-
 client/src/components/SearchInput.vue         |  61 ++++++++-
 client/src/pages/AttachmentsPage.vue          |  15 +--
 client/src/pages/HomePage.vue                 |  32 +++--
 client/src/pages/NotesPage.vue                |   6 +-
 package.json                                  |   3 +
 server/helpers/ProcessText.js                 |  50 +++++--
 server/index.js                               |  19 +++
 server/models/Note.js                         |  13 +-
 server/models/Tag.js                          |   6 +-
 staticFiles/assets/favicon.ico                | Bin 147238 -> 41662 bytes
 17 files changed, 283 insertions(+), 148 deletions(-)
 mode change 100644 => 100755 staticFiles/assets/favicon.ico

diff --git a/backupDatabase.sh b/backupDatabase.sh
index 4352f1b..7f521e2 100755
--- a/backupDatabase.sh
+++ b/backupDatabase.sh
@@ -6,7 +6,7 @@ mkdir -p $BACKUPDIR
 cd $BACKUPDIR
 
 NOW=$(date +"%Y-%m-%d_%H-%M")
-ssh mab@avidhabit.com -p 13328 "mysqldump --all-databases --user root -p***REMOVED***" > "backup-$NOW.sql"
+ssh mab@solidscribe.com -p 13328 "mysqldump --all-databases --user root -p***REMOVED***" > "backup-$NOW.sql"
 
 cp "backup-$NOW.sql" "/mnt/Windows Data/DatabaseBackups/backup-$NOW.sql"
 
diff --git a/buildAndUpdateProd.sh b/buildAndUpdateProd.sh
index c6bba11..a7e2679 100755
--- a/buildAndUpdateProd.sh
+++ b/buildAndUpdateProd.sh
@@ -18,14 +18,14 @@ tar -czf release.tar.gz server node_modules client/dist staticFiles/assets
 
 #send compressed release to remote machine
 echo -e "\e[32m\nMoving compressed release to production... \n\e[0m"
-rsync -e 'ssh -p 13328' -havzC --update release.tar.gz mab@avidhabit.com:/home/mab/pi/
+rsync -e 'ssh -p 13328' -havzC --update release.tar.gz mab@solidscribe.com:/home/mab/pi/
 
 # Remove Release from local after its been uploaded
 rm release.tar.gz
 
 #uncompress release on server
 echo -e "\e[32m\nExtracting release on production... \n\e[0m"
-ssh mab@avidhabit.com -p 13328 "cd /home/mab/pi/; rm -r server node_modules client; tar -xzf *.tar.gz --overwrite; rm *.tar.gz; pm2 reload all"
+ssh mab@solidscribe.com -p 13328 "cd /home/mab/pi/; rm -r server node_modules client; tar -xzf *.tar.gz --overwrite; rm *.tar.gz; pm2 reload all"
 
 #Congratulate how awesome you are
 echo -e "\e[32m\nRelease Complete! Nice Work! \n\e[0m"
\ No newline at end of file
diff --git a/client/src/App.vue b/client/src/App.vue
index ac34488..7cf7798 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-	<div id="app">
+	<div id="app" :class="{ 'night-mode':($store.getters.getIsNightMode) }">
 
 		<global-site-menu />
 
diff --git a/client/src/assets/semantic-helper.css b/client/src/assets/semantic-helper.css
index 65f15a5..c127384 100644
--- a/client/src/assets/semantic-helper.css
+++ b/client/src/assets/semantic-helper.css
@@ -35,6 +35,14 @@ div.ui.basic.segment.no-fluf-segment {
 		margin-top: 0px;
 	}
 
+/* Night mode modifiers */
+
+/*Make images sepia in night mode */
+.night-mode img {
+	filter: grayscale(50%) brightness(80%) sepia(80%);
+
+}
+
 /* OVERWRITE DEFAULT SEMANTIC STYLES FOR CUSTOM/NIGHT MODES*/
 body {
 	color: var(--text_color);
@@ -231,22 +239,27 @@ a:hover {
 	.squire-box a {
 		cursor: pointer;
 	}
-/*	.note-card-text i,
+	.note-card-text i:not(.icon),
 	.squire-box i {
 		padding: 0.5em 0.99em;
-		border: 1px solid #CCC;
-		margin: 1px;
-		border-radius: 9px;
+		border-radius: 1px;
 		display: inline-block;
-	}*/
+		font-style: normal;
+		background-color: rgba(113, 113, 113, 0.1);
+	}
+	.night-mode .note-card-text i:not(.icon),
+	.night-mode .squire-box i {
+		background-color: rgba(255, 255, 255, 0.2);
+	}
+
+	.note-card-text p,
 	.squire-box p {
 		margin-bottom: 0;
 	}
 	.note-card-text blockquote, 
 	.squire-box blockquote {
 		margin: 0;
-		padding: 0.8em;
-		border-left: 2px solid blue;
+		padding: 0 0 0 2.5em;
 	}
 	.note-card-text img {
 		max-width:100%;
@@ -305,6 +318,10 @@ a:hover {
 	/* adjust checkboxes for mobile. Make them a little bigger, easier to click */
 	@media only screen and (max-width: 740px) {
 
+		.ui.button.shrinking {
+			font-size: 0.85714286rem;
+		}
+
 		.note-card-text ul > li,
 		.squire-box ul > li {
 			min-height: 30px;
@@ -346,6 +363,12 @@ a:hover {
 .float-right {
 	float: right;
 }
+.ui.grid.reduced-padding > .column {
+	padding-left: 2px;
+	padding-right: 2px;
+	padding-top: 5px;
+	padding-bottom: 5px;
+}
 
 .textarea-height {
 	height: calc(100% - 90px);
diff --git a/client/src/components/GlobalSiteMenu.vue b/client/src/components/GlobalSiteMenu.vue
index cff8727..fc3abb9 100644
--- a/client/src/components/GlobalSiteMenu.vue
+++ b/client/src/components/GlobalSiteMenu.vue
@@ -18,6 +18,11 @@
 		left: 0;
 		bottom: 0;
 	}
+	.menu-logo-display {
+		width: 25px;
+		margin: 5px 0 0 34px;
+		display: inline-block;
+	}
 
 		.menu-item {
 			color: #fff;
@@ -101,31 +106,39 @@
 						<i class="green bars icon"></i>
 					</div>
 
-					<router-link class="ui large basic compact icon button" to="/notes" v-on:click.native="emitReloadEvent()">
+					<router-link v-if="loggedIn" class="ui large basic compact icon button" to="/notes" v-on:click.native="emitReloadEvent()">
 						<i class="green home icon"></i>
 					</router-link>
 
+					<router-link v-if="loggedIn" class="ui basic icon button" exact-active-class="active" to="/attachments">
+						<i class="open folder outline icon"></i>
+					</router-link>
+
+					
+				</div>
+
+				<div class="two wide center aligned bottom aligned column">
+					<img loading="lazy" src="/api/static/assets/logo.svg" alt="Solid Scribe Logo">
+				</div>
+
+				<div class="seven wide right aligned column">
+	
 					<div v-on:click="toggleNightMode" class="ui large basic compact icon button">
 						<i class="green moon outline icon"></i>
 					</div>
-				</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>
-				</div>
-				<div class="three wide right aligned column">
-
 					<!-- mobile create note button -->
-					<div v-if="loggedIn">
-						<div v-if="!disableNewNote" @click="createNote" class="ui large basic compact icon button">
+					<span v-if="loggedIn">
+						<span v-if="!disableNewNote" @click="createNote" class="ui large basic compact icon button">
 							<i class="green plus icon"></i>
-						</div>
-						<div v-if="disableNewNote" class="ui large basic compact icon button">
+						</span>
+						<span v-if="disableNewNote" class="ui large basic compact icon button">
 							<i class="grey plus icon"></i>
-						</div>
-					</div>
-
+						</span>
+					</span>
 				</div>
+
 			</div>
 		</div>
 
@@ -136,10 +149,11 @@
 
 		<div class="global-menu" v-if="!collapsed" v-on:click="menuClicked">
 
-			<div class="menu-section">
-				<div class="menu-item menu-button" v-on:click="collapseMenu">
-					<i class="angle left icon"></i>
-				</div>
+			<div class="menu-section" v-on:click="collapseMenu">
+				<!-- <div class="menu-item menu-button" > -->
+					<i class="white angle left icon"></i>
+					<img class="menu-logo-display" loading="lazy" src="/api/static/assets/logo.svg" alt="Solid Scribe Logo">
+				<!-- </div> -->
 			</div>
 
 			<div class="menu-section" v-if="loggedIn">
diff --git a/client/src/components/NoteInputPanel.vue b/client/src/components/NoteInputPanel.vue
index b7e2bd0..8e5b4ad 100644
--- a/client/src/components/NoteInputPanel.vue
+++ b/client/src/components/NoteInputPanel.vue
@@ -19,23 +19,24 @@
 
 		<div class="note-menu">
 
-			<nm-button v-on:click.native="close" icon="close" />
+			<nm-button tip="Close" bottom-tip="true" v-on:click.native="close" icon="close" />
 
-			<nm-button v-on:click.native="toggleList('ol')" icon="list ol" />
+			<nm-button tip="Numbered List" bottom-tip="true" v-on:click.native="toggleList('ol')" icon="list ol" />
 			
-			<nm-button v-on:click.native="toggleList('ul')" icon="tasks" />
+			<nm-button tip="Task List" bottom-tip="true" v-on:click.native="toggleList('ul')" icon="tasks" />
 			
-			<nm-button v-on:click.native="toggleBold()" icon="bold" />
+			<nm-button tip="Bold" bottom-tip="true" v-on:click.native="toggleBold()" icon="bold" />
 			
-			<nm-button v-on:click.native="toggleItalic()" icon="quote left" />
+			<nm-button tip="Quote" bottom-tip="true" v-on:click.native="toggleItalic()" icon="quote left" />
 
-			<nm-button v-on:click.native="modifyFont('1.4em')" icon="text height" />
+			<nm-button tip="Title" bottom-tip="true" v-on:click.native="modifyFont('1.4em')" icon="text height" />
 
-			<nm-button v-on:click.native="undoCustom()" icon="undo" />
+			<nm-button tip="Indent" bottom-tip="true" v-on:click.native="editor.increaseQuoteLevel()" icon="indent" />
 
-			<nm-button v-if="usersOnNote > 1" icon="green user circle" />
+			<nm-button tip="Outdent" bottom-tip="true" v-on:click.native="editor.decreaseQuoteLevel()" icon="outdent" />
+
+			<nm-button tip="Users on Note" bottom-tip="true" v-if="usersOnNote > 1" icon="green user circle" />
 
-			<nm-button icon="ellipsis horizontal" v-on:click.native="showNoteOptions = !showNoteOptions" />
 		</div>
 
 		<!-- Squire box grows -->
@@ -92,25 +93,52 @@
 
 			<!-- bottom stats -->
 			<div class="ui basic segment">
-				<div class="ui grid">
-					<div class="sixteen wide column">
+				<div class="ui grid reduced-padding">
+
+					<div class="four wide column">
+						<!-- Tags  -->
+						<button class="ui compact basic fluid button shrinking" v-on:click="showTagSlideMenu = !showTagSlideMenu; modified = true">
+							<i class="tags icon"></i> Tags
+						</button>
+					</div>
+					<div class="four wide column">
+						<!-- Archive Button  -->
+						<button class="ui compact basic fluid button shrinking" v-on:click="onToggleArchived">
+							<span v-if="archived == 1"><i class="green archive icon"></i> Archived</span>
+							<span v-if="archived != 1"><i class="archive icon"></i> Archive</span>
+						</button>
+					</div>
+					<div class="four wide column"><!-- Pin button -->
+						<button class="ui compact basic fluid button shrinking" v-on:click="onTogglePinned">
+							<span v-if="pinned == 1"><i class="green pin icon"></i> Pinned</span>
+							<span v-if="pinned != 1"><i class="pin icon"></i> Pin</span>
+						</button></div>
+					<div class="four wide column">
+						<!-- files button -->
+						<button class="ui compact basic fluid button shrinking" v-on:click="openEditAttachment">
+							<i class="folder icon"></i> Files
+						</button>
+					</div>
+
+					<!-- <div class="sixteen wide column"></div> -->
+
+					<div class="eight wide column">
 						
-						<div class="ui basic button"v-if="!isEncrypted" v-on:click="passwordEnterVisible = true">
+						<button class="ui basic compact button shrinking" v-if="!isEncrypted" v-on:click="passwordEnterVisible = true">
 							<i class="shield alternate icon"></i>
 							Password Protect
-						</div>
-						<div class="ui icon basic button" v-if="isEncrypted && isDecrypted" v-on:click="disableEncryption">
+						</button>
+						<button class="ui icon basic compact button shrinking" v-if="isEncrypted && isDecrypted" v-on:click="disableEncryption">
 							<i class="unlock icon"></i>
 							Remove Password
-						</div>
-						
-						<div class="ui basic compact button">
-							Status: {{ statusText }}
-						</div>
-						<div class="ui basic compact button" :data-tooltip="`Created: ${$helpers.timeAgo(created)}`">
-							Last Change: {{ $helpers.timeAgo(updated) }}
-						</div>
+						</button>
 					</div>
+					<div class="seven wide right aligned middle aligned column">
+						<span :data-tooltip="`Created: ${$helpers.timeAgo(created)}`">
+							Edited: {{ $helpers.timeAgo(updated) }} 
+						</span>
+					</div>
+					<div class="one wide column"></div>
 				</div>
 			</div>
 
@@ -126,31 +154,13 @@
 		<div class="all-settings" :class="{ 'low-settings':!extraToolbarsVisible }">
 
 			<div class="note-menu shrink-icons-on-mobile">
-
-				<!-- Pin Button  -->
-				<nm-button
-					v-on:click.native="onToggleArchived"
-					:icon="(archived == 1)?'green archive':'archive'"
-					:text="(archived == 1)?'Archived':'Archive'"
-					tip="Show in archive"
-					:showText="true"
-				></nm-button>
-
-				<!-- archive button -->
-				<nm-button
-					v-on:click.native="onTogglePinned"
-					:icon="(pinned == 1)?'green pin':'pin'"
-					:text="(pinned == 1)?'Pinned':'Pin'"
-					tip="Pin to top of list"
-					:showText="true"
-				></nm-button>
 	
 				<!-- colors button -->
 				<nm-button
 					v-on:click.native="showColorPicker"
 					icon="paint brush"
-					text="Colors"
-					tip="Colors"
+					text="Color"
+					tip="Note Color"
 				></nm-button>
 
 				<!-- add images panel -->
@@ -161,27 +171,18 @@
 					tip="Images"
 				></nm-button>
 
-				<!-- Tags  -->
-				<nm-button
-					v-on:click.native="showTagSlideMenu = !showTagSlideMenu; modified = true"
-					icon="tags"
-					text="Tags"
-					tip="Tags"
-				></nm-button>
-
 				<!-- file upload button  -->
 				<file-upload-button 
 					class="nm-button" 
 					:noteId="noteid" />
 
-				<!-- files button -->
-				<nm-button
-					v-on:click.native="openEditAttachment"
-					icon="folder"
-					text="Files"
-					tip="Files on Note"
-					:showText="true"
-				></nm-button>
+				<nm-button v-on:click.native="undoCustom()" icon="undo" tip="Undo" text="Undo" />
+
+				<nm-button 
+					icon="ellipsis horizontal" 
+					text="Options"
+					tip="More Options"
+					v-on:click.native="showNoteOptions = !showNoteOptions" />
 
 			</div>
 		</div>
@@ -238,12 +239,6 @@
 							Uncheck all Checked items
 						</div>
 					</div>
-					<div class="eight wide column">
-						<div class="ui labeled icon fluid basic button" v-on:click="undoCustom">
-							<i class="undo icon"></i>
-							Undo last change
-						</div>
-					</div>
 					<div class="eight wide column">
 						<div class="ui labeled icon fluid basic button" v-on:click="calculateMath" data-tooltip="Calculates algebra before '='">
 							<i class="calculator icon"></i>
@@ -251,6 +246,7 @@
 						</div>
 					</div>
 					<div class="sixteen wide column" v-if="rawTextId > 0">
+						<h2>Share Note</h2>
 						<share-note-component 
 							:note-id="noteid"
 							:raw-text-id="rawTextId"
@@ -274,7 +270,7 @@
 				<h2><i class="green lock alternate icon"></i>Password protect this Note</h2>
 				<p>Password protection will prevent anyone from reading the text of this note, unless they enter the correct password.</p>
 				<p><b>Only the note text is protected. Title, tags, and files are not encrypted and remain visible without a password.</b></p>
-				<p>The password you select will only be used for this note. You can use the same password on multiple notes. The note will be encrypted using the password entered. A longer password is will be more secure.</p>
+				<p>The password you select will only be used for this note. You can use the same password on multiple notes. The note will be encrypted using the password entered. A longer password will be more secure.</p>
 				<h4><i class="red icon exclamation triangle"></i> Warning. There is no way to recover a lost password.</h4>
 
 				</div>
diff --git a/client/src/components/NoteMenuButtonComponent.vue b/client/src/components/NoteMenuButtonComponent.vue
index e2bc93a..b059c9e 100644
--- a/client/src/components/NoteMenuButtonComponent.vue
+++ b/client/src/components/NoteMenuButtonComponent.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="nm-button" :class="moreClass" :data-tooltip="tip" data-inverted>
+	<div class="nm-button" :class="moreClass" :data-tooltip="tip" data-inverted :data-position=" bottomTip?'bottom center':'top center'">
 		<!-- Display Icon and text  -->
 		<i v-if="icon" :class="`${icon} icon`"></i>
 		<span v-if="(text && mobile) || (text && showText)">{{text}}</span>
@@ -21,12 +21,11 @@
 
 	export default {
 		name: 'NoteMenuButtonComponent',
-		props: [ 'icon', 'text', 'tooltip', 'moreClass', 'showText', 'tip'],
+		props: [ 'icon', 'text', 'tooltip', 'moreClass', 'showText', 'tip', 'bottomTip'],
 		data () {
 			return {
 				files: [],
 				mobile: false,
-				showTooltip: false,
 			}
 		},
 		beforeMount(){
diff --git a/client/src/components/SearchInput.vue b/client/src/components/SearchInput.vue
index f19b13a..acf2ad5 100644
--- a/client/src/components/SearchInput.vue
+++ b/client/src/components/SearchInput.vue
@@ -1,10 +1,46 @@
+<style type="text/css" scoped>
+	.fixed-search {
+		position: fixed;
+		top: 50%;
+		left: 0;
+		right: 0;
+		padding: 10px;
+	}
+</style>
 <template>
-	<div class="ui form">
-		<div class="ui left icon fluid input">
-			<input v-model="searchTerm" @keyup="searchKeyUp" @:keyup.enter="search" placeholder="Search Notes and Files" />
-			<i class="search icon"></i>
+	<span>
+
+		<div class="ui form" v-if="!$store.getters.getIsUserOnMobile">
+			<!-- normal search menu  -->
+			<div class="ui left icon fluid input">
+				<input v-model="searchTerm" @keyup="searchKeyUp" @keyup.enter="search" placeholder="Search Notes and Files" ref="searchInput"/>
+				<i class="search icon"></i>
+			</div>
 		</div>
-	</div>
+
+		
+		<span class="ui basic icon button" v-on:click="openFloatingSearch">
+			<i class="green search icon"></i>
+		</span>
+
+		<div class="fixed-search" v-if="showFixedSearch">
+			<div class="ui raised segment">
+				<h2 class="ui center aligned header">Search!</h2>
+				<div class="ui form">
+					<div class="ui left icon fluid input">
+						<input 
+							ref="fixedSearch"
+							v-model="searchTerm"
+							@keyup.enter="search"
+							v-on:blur="showFixedSearch = false"
+							placeholder="Press Enter to Search" />
+						<i class="search icon"></i>
+					</div>
+				</div>
+			</div>
+		</div>
+
+	</span>
 </template>
 
 <script>
@@ -16,6 +52,7 @@
 				searchTerm: '',
 				searchTimeout: null,
 				searchDebounceDuration: 300,
+				showFixedSearch: false,
 			}
 		},
 		beforeCreate: function(){
@@ -29,13 +66,27 @@
 
 		},
 		methods: {
+			openFloatingSearch(){
+				this.showFixedSearch = !this.showFixedSearch
+
+				if(this.showFixedSearch){
+					this.$nextTick( () => {
+						this.searchTerm = ''
+						this.$refs.fixedSearch.focus()
+					})
+				}
+			},
 			searchKeyUp(){
+				//This event is not triggered on mobile
 				clearTimeout(this.searchTimeout)
 				this.searchTimeout = setTimeout(() => {
 					this.search()
 				}, this.searchDebounceDuration)
 			},
 			search(){
+				if(this.$store.getters.getIsUserOnMobile){
+					this.$refs.fixedSearch.blur()
+				}
 				this.$bus.$emit('update_search_term', this.searchTerm)
 			},
 		}
diff --git a/client/src/pages/AttachmentsPage.vue b/client/src/pages/AttachmentsPage.vue
index ecd56c3..371740d 100644
--- a/client/src/pages/AttachmentsPage.vue
+++ b/client/src/pages/AttachmentsPage.vue
@@ -1,8 +1,8 @@
 <template>
 	<div class="ui basic segment no-fluf-segment" ref="content">
-		<div class="ui grid">
+		<div class="ui stacking grid">
 
-			<div class="ui twelve wide column">
+			<div class="sixteen wide column">
 				<h2 class="ui header">
 					<i class="folder open outline icon"></i>
 						<div class="content">
@@ -14,7 +14,7 @@
 				<!-- subnav  -->
 				<router-link
 					exact-active-class="green" 
-					class="ui basic button" 
+					class="ui basic button shrinking" 
 					to="/attachments">
 					<i class="open folder outline icon"></i>
 					All
@@ -22,7 +22,7 @@
 				<router-link
 					v-if="$store.getters.totals && $store.getters.totals['linkFiles']"
 					exact-active-class="green" 
-					class="ui basic button" 
+					class="ui basic button shrinking" 
 					to="/attachments/type/links">
 					<i class="linkify icon"></i>
 					Links
@@ -30,16 +30,13 @@
 				<router-link 
 					v-if="$store.getters.totals && $store.getters.totals['otherFiles']"
 					exact-active-class="green"
-					class="ui basic button"
+					class="ui basic button shrinking"
 					to="/attachments/type/files">
 					<i class="copy icon"></i>
 					Other Files
 				</router-link>
 
 			</div>
-			<div class="four wide bottom aligned column">
-				<i v-if="loading" class="green sync alternate loading icon"></i>
-			</div>
 
 			<div class="sixteen wide column" v-if="searchParams.noteId">
 				<router-link class="ui green button" to="/attachments">
@@ -50,6 +47,8 @@
 					<i class="file outline icon"></i>
 					Open Note
 				</div>
+
+				<i v-if="loading" class="green sync alternate loading icon"></i>
 			</div>
 
 			<div class="sixteen wide column" v-if="searchParams['noteId'] && attachments.length == 0">
diff --git a/client/src/pages/HomePage.vue b/client/src/pages/HomePage.vue
index 430752b..15b072f 100644
--- a/client/src/pages/HomePage.vue
+++ b/client/src/pages/HomePage.vue
@@ -11,12 +11,16 @@
 		-moz-animation: fadeorama 16s ease infinite;
 		animation: fadeorama 16s ease infinite;
 	}
+	.logo-display {
+		width: 50%;
+	}
 	.lightly-padded {
 		margin-top: 10px;
 	}
 	.massive-text {
 		color: white;
 		font-size: 4rem;
+		text-align: center;
 	}
 	.blinking {
 		animation:blinkingText 1.5s linear infinite;
@@ -63,6 +67,9 @@
 	}
 
 	/*safari fix - prevents page from being below the menu */
+	.green-text {
+		color: #3710a4;
+	}
 	.dont-pad-me {
 		margin-right: 0 !important;
 		margin-left: 0 !important;
@@ -101,13 +108,18 @@
 
 				<!-- desktop column - large screen only -->
 				<div class="seven wide middle aligned left aligned column">
-					<h2 class="massive-text">Take Notes, <br>Like Never Before</h2>
+
+					<h2 class="massive-text">
+						<img class="logo-display" loading="lazy" src="/api/static/assets/logo.svg" alt="Solid Scribe Logo">
+						<br>
+						Solid Scribe
+					</h2>
+
 					<h3 class="subtext">
-						Using an online note application <i class="i cursor icon blinking"></i> 
+						Take Notes Like Never Before<i class="i cursor icon blinking"></i> 
 					</h3>
-					<p>Assuming you have never used a note application previously in your life.</p>
-					<br>
-					<i class="huge inverted chevron circle down icon"></i>
+					<p class="green-text">Assuming you have never used a note application previously in your life.</p>
+					
 				</div>
 
 				<div class="eight wide middle aligned left aligned column">
@@ -269,7 +281,6 @@
 					<p>
 						If you see anything broken or want to see a feature implemented, I'm open to suggestions. <i class="thumbs up icon"></i>
 					</p>
-					<p>Hero Slide Photo Credit - <a target="_blank" href="https://unsplash.com/@tkaslik14">https://unsplash.com/@tkaslik14</a></p>
 					<p>Generic Marketing Images - <a target="_blank" href="https://undraw.co/">https://unDraw.co/</a></p>
 				</div>
 				<div class="four wide column">
@@ -291,15 +302,14 @@ export default {
 			realInformation: false,
 		}
 	},
-	beforeMount(){
-
-		
-
+	beforeCreate(){
 		//Force HTTPS on prod, always. Dev doesn't have certs
 		const isDev = process.env['NODE_ENV'] == 'development'
 		if (!isDev && location.protocol != 'https:'){
-			window.location.replace('https://www.avidhabit.com')
+			window.location.replace('https://www.solidscribe.com')
 		}
+	},
+	beforeMount(){
 		
 		//Don't change hero banner on mobile
 		if(!this.$store.getters.getIsUserOnMobile){
diff --git a/client/src/pages/NotesPage.vue b/client/src/pages/NotesPage.vue
index ed893fd..5ebb7a2 100644
--- a/client/src/pages/NotesPage.vue
+++ b/client/src/pages/NotesPage.vue
@@ -14,7 +14,7 @@
 					
 					<div class="ten wide column" :class="{ 'sixteen wide column':$store.getters.getIsUserOnMobile }">
 
-						<div class="ui basic button" 
+						<div class="ui basic button shrinking" 
 						v-on:click="updateFastFilters(3)" 
 						v-if="$store.getters.totals && ($store.getters.totals['sharedToNotes'] > 0 || $store.getters.totals['sharedFromNotes'] > 0)" 
 						style="position: relative;">
@@ -24,12 +24,12 @@
 							</span>
 						</div>
 
-						<div class="ui basic button" v-on:click="updateFastFilters(2)" v-if="$store.getters.totals && $store.getters.totals['archivedNotes'] > 0">
+						<div class="ui basic button shrinking" v-on:click="updateFastFilters(2)" v-if="$store.getters.totals && $store.getters.totals['archivedNotes'] > 0">
 							<i class="green archive icon"></i>Archived
 							<!-- <span>{{ $store.getters.totals['archivedNotes'] }}</span> -->
 						</div>
 
-						<div class="ui basic button" v-on:click="updateFastFilters(4)" v-if="$store.getters.totals && $store.getters.totals['encryptedNotes'] > 0">
+						<div class="ui basic button shrinking" v-on:click="updateFastFilters(4)" v-if="$store.getters.totals && $store.getters.totals['encryptedNotes'] > 0">
 							<i class="green lock alternate icon"></i>Locked
 							<!-- <span>{{ $store.getters.totals['encryptedNotes'] }}</span> -->
 						</div>
diff --git a/package.json b/package.json
index 94ff618..504afa6 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,11 @@
     "body-parser": "^1.18.3",
     "cheerio": "^1.0.0-rc.3",
     "express": "^4.16.4",
+    "express-rate-limit": "^5.1.1",
     "gm": "^1.23.1",
+    "helmet": "^3.21.3",
     "jsonwebtoken": "^8.5.1",
+    "module-alias": "^2.2.2",
     "multer": "^1.4.2",
     "mysql2": "^1.6.5",
     "node-tesseract-ocr": "^1.0.0",
diff --git a/server/helpers/ProcessText.js b/server/helpers/ProcessText.js
index 3bc4370..b2dfcb3 100644
--- a/server/helpers/ProcessText.js
+++ b/server/helpers/ProcessText.js
@@ -26,6 +26,17 @@ ProcessText.stripBlankHtmlLines = (string) => {
 	return string.replace(/\<p\>\<br\>\<\/p\>/g,'')
 }
 
+//Remove Double Empty HTML lines from a string
+ProcessText.stripDoubleBlankLines = (string) => {
+
+	if(string == undefined || string == null || string.length == 0){
+		return ''
+	}
+
+	//Blank lines look like this -> <p><br></p>
+	return string.replace(/\<p\>\<br\>\<\/p\>\<p\>\<br\>\<\/p\>/g,'')
+}
+
 ProcessText.getUrlsFromString = (string) => {
 	const urlPattern = /(?:(?:https?|ftp|file):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#/%=~_|$?!:,.]*\)|[A-Z0-9+&@#/%=~_|$])/igm
 	return string.match(urlPattern)
@@ -41,11 +52,16 @@ ProcessText.getUrlsFromString = (string) => {
 		+ If note starts as a list, skip the title
 */
 
-ProcessText.deduceNoteTitle = (inString) => {
+ProcessText.deduceNoteTitle = (inTitle, inString) => {
 
-	let title = '' //Title of note
+	let title = inTitle //Title of note
 	let sub = '' //sub text below note
 
+	//Always return a title as a String
+	if(title == null){
+		title = ''
+	}
+
 	if(!inString || inString == null || inString.length == 0){
 		return {title, sub}
 	}
@@ -55,16 +71,17 @@ ProcessText.deduceNoteTitle = (inString) => {
 
 	const tagFreeLength = ProcessText.removeHtml(inString).length
 
-	if(tagFreeLength < 100){
-		sub = ProcessText.stripBlankHtmlLines(inString)
-		return {title, sub}
+	//
+	// Simplified attempt!
+	// Remove tags, push caret if greater than 200 chars...thats it
+	// Still needs, links to open in a new window.
+
+	sub = ProcessText.stripDoubleBlankLines(inString)
+	if(tagFreeLength > 200){
+		sub += '... <i class="green caret down icon"></i>'
 	}
 
-	//Primare Case - Short notes
-	if(tagFreeLength < 300){
-		sub = ProcessText.stripBlankHtmlLines(inString)
-		return {title, sub}
-	}
+	return {title, sub}
 
 	//Emergency ending tag if truncated. This will help regex find all the lines
 	inString += '</end>'
@@ -87,6 +104,7 @@ ProcessText.deduceNoteTitle = (inString) => {
 	let charLimit = 400
 	let listStart = false
 	let noTitleJustList = false
+	let appendCaret = false
 
 	for(let i=0; i < totalLines; i++){
 
@@ -167,8 +185,8 @@ ProcessText.deduceNoteTitle = (inString) => {
 			if(cleanCutString.length == 0){
 				cleanCutString = cutString
 			}
-
-			finalLines.push(cleanCutString + '... <i class="green caret down icon"></i>')
+			appendCaret = true
+			
 			break;
 		}
 
@@ -176,9 +194,13 @@ ProcessText.deduceNoteTitle = (inString) => {
 
 	}
 
+	if(tagFreeLength.length >= 300 || appendCaret){
+		finalLines.push('... <i class="green caret down icon"></i>')
+	}
+
 	//Pull out title if its not an empty string
-	if(ProcessText.removeHtml(finalLines[0]).trim().replace('&nbsp','').length > 0 && !noTitleJustList){
-		// title = finalLines.shift()
+	if(!noTitleJustList && title == ''){
+		title = ProcessText.removeHtml( finalLines.shift() ).replace('&nbsp','')
 	}
 	
 	sub = finalLines.join('')
diff --git a/server/index.js b/server/index.js
index b5d4b4c..aa8adad 100644
--- a/server/index.js
+++ b/server/index.js
@@ -3,10 +3,29 @@ require('module-alias/register')
 
 let Auth = require('@helpers/Auth')
 
+const helmet = require('helmet')
+
+
 const express = require('express')
 const app = express()
+app.use( helmet() )
 const port = 3000
 
+
+//
+// Request Rate Limiter 
+//
+const rateLimit = require('express-rate-limit');
+const limiter = rateLimit({
+	windowMs: 10 * 60 * 1000, // minutes
+	max: 1000 // limit each IP to 100 requests per windowMs
+});
+ 
+// apply to all requests
+app.use(limiter);
+
+
+
 var http = require('http').createServer(app);
 var io = require('socket.io')(http, {
 	path:'/socket'
diff --git a/server/models/Note.js b/server/models/Note.js
index 7c5839b..b1413f1 100644
--- a/server/models/Note.js
+++ b/server/models/Note.js
@@ -512,7 +512,7 @@ Note.solrQuery = (userId, searchQuery, searchTags) => {
 		} else {
 
 			//Number of characters before and after search word
-			const front = 5
+			const front = 20
 			const tail = 150
 
 			db.promise()
@@ -584,7 +584,7 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => {
 			let searchParams = [userId]
 			let noteSearchQuery = `
 				SELECT note.id, 
-					SUBSTRING(note_raw_text.text, 1, 1500) as text, 
+					SUBSTRING(note_raw_text.text, 1, 500) as text, 
 					note_raw_text.title as title,
 					note_raw_text.updated as updated, 
 					opened,
@@ -722,15 +722,10 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => {
 					if(note.encrypted == 1){ note.text = '' }
 
 					//Deduce note title
-					const textData = ProcessText.deduceNoteTitle(note.text)
+					const textData = ProcessText.deduceNoteTitle(note.title, note.text)
 					// console.log(textData)
-
-					// console.log(textData)
-						
-					if(note.title == null){
-						note.title = ''
-					}
 					
+					note.title = textData.title
 					note.subtext = textData.sub
 					note.titleLength = textData.titleLength
 					note.subtextLength = textData.subtextLength
diff --git a/server/models/Tag.js b/server/models/Tag.js
index 41877ed..6392c2a 100644
--- a/server/models/Tag.js
+++ b/server/models/Tag.js
@@ -5,6 +5,10 @@ let Tag = module.exports = {}
 Tag.userTags = (userId, searchQuery, searchTags, fastFilters) => {
 	return new Promise((resolve, reject) => {
 
+		if(searchQuery && searchQuery.length > 0){
+			return resolve([])
+		}
+
 		let query = `
 			SELECT 
 				tag.id, 
@@ -12,7 +16,7 @@ Tag.userTags = (userId, searchQuery, searchTags, fastFilters) => {
 				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
+			JOIN note ON note.id = note_tag.note_id
 			WHERE note_tag.user_id = ?
 		`
 
diff --git a/staticFiles/assets/favicon.ico b/staticFiles/assets/favicon.ico
old mode 100644
new mode 100755
index a1ac3d9f64e2cf2eb50b679e1bdc9006b9221600..7ef9058a4a8870386ec7b88fac6a7817d43023bf
GIT binary patch
literal 41662
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
Oe7!a6IUnffi~j-M)mU%<

literal 147238
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
X0TLhq5+DH*AOR8}0TLjAY6AZU6kQq#