Large refactor on the front end

Created pages directory
Added night mode

client/src/App.vue

@@ -37,6 +37,11 @@ export default {
 	},
 	beforeCreate: function(){
 
+		//Set color theme based on local storage
+		if(localStorage.getItem('nightMode') == 'true'){
+			this.$store.commit('toggleNightMode')
+		}
+
 		//Puts token into state on page load
 		let token = localStorage.getItem('loginToken')
 		let username = localStorage.getItem('username')

client/src/assets/semantic-helper.css

@@ -1,24 +1,10 @@
 
 :root {
-  --primary_color: #1C84DA;
-  --secondary_color: #1EAEDB;
-  
-  --element_background_color: #FFF;
-  
-
-
   --background_color: #fff;
   --text_color: #3d3d3d;
   --outline_color: rgba(34,36,38,.15);
 }
 
-/* Night mode colors */
-:root {
-  --background_color: #000;
-  --text_color: #a98457;
-  --outline_color: #a98457;
-}
-
 /* OVERWRITE DEFAULT SEMANTIC STYLES FOR CUSTOM/NIGHT MODES*/
 body{
 	color: var(--text_color);

client/src/components/NoteInputPanel.vue

@@ -63,7 +63,7 @@
 	name: 'InputNotes',
 		props: [ 'noteid', 'position' ],
 		components:{
-			'note-tag-edit': require('./NoteTagEdit.vue').default
+			'note-tag-edit': require('@/components/NoteTagEdit.vue').default
 		},
 		data(){
 			return {

client/src/components/NoteTitleDisplayCard.vue

@@ -54,7 +54,7 @@
 	name: 'NoteTitleDisplayCard',
 		props: [ 'onClick', 'data' ],
 		components: {
-			'delete-button': require('./DeleteButtonComponent.vue').default,
+			'delete-button': require('@/components/NoteDeleteButtonComponent.vue').default,
 		},
 		data () {
 			return {
@@ -108,7 +108,9 @@
 	}
 	.overflow-hidden {
 		overflow: hidden;
-		word-break: break-all;
+	}
+	.overflow-hidden p, .overflow-hidden h3 {
+		word-break: break-word;
 	}
 	.max-height {
 		height: calc(100% + 30px);

client/src/components/Notes.vue

@@ -1,38 +0,0 @@
-<template>
-	<div id="NotesPage">
-		<div class="ui basic segment">
-			<search-bar />
-		</div>
-
-		
-	</div>
-</template>
-
-<script>
-	
-	//ajax calls
-	import axios from 'axios';
-	// import { mapGetters } from 'vuex'
-
-	export default {
-	name: 'Notes',
-		components:{
-			'search-bar': require('./SearchBar.vue').default
-		},
-		data () {
-			return {
-				notes: null,
-				activeNoteId: null
-			}
-		},
-		beforeMount(){
-
-		},
-		mounted: function() {
-			//this.getLatest()
-		},
-		methods: {
-			
-		}
-	}
-</script>

client/src/pages/HelpPage.vue

@@ -2,8 +2,11 @@
 	<div class="ui basic segment">
 		<div class="ui container">
 
-			CTRL + SHIFT + V - paste without formatting
-			CTRL + Z - Undo in note, <b>Undo youtube video player embed.</b>
+			<h2>Note Editing - Keyboard Shortcuts</h2>
+
+			<p>CTRL + SHIFT + V - paste without formatting</p>
+			<p>CTRL + Z - Undo in note, <b>Undo youtube video player embed.</b></p>
+			<p>ESC - Close note editor</p>
 
 			<h2>Block formatting</h2>
 

client/src/pages/NotesPage.vue

@@ -1,5 +1,5 @@
 <template>
-	<div>
+	<div class="ui basic segment">
 		
 
 		<div class="ui equal width grid">
@@ -40,6 +40,12 @@
 					
 					<router-link class="ui basic button" to="/help">Help</router-link>
 
+					<div v-on:click="toggleNightMode" class="ui basic button">
+						Dark Theme: 
+						<span v-if="$store.getters.getIsNightMode">On</span>
+						<span v-else>Off</span>
+					</div>
+
 					<div class="ui right floated basic button" 
 					data-tooltip="Log Out" data-position="left center"
 					v-on:click="destroyLoginToken">{{username}}</div>
@@ -52,21 +58,26 @@
 				<div class="ui two wide large screen only column">
 					<div class="ui basic fluid button" @click="reset"><i class="undo icon"></i>All Notes</div>
 					<div class="ui divider"></div>
-					<div class="ui clickable basic fluid large label" v-for="tag in commonTags" @click="toggleTagFilter(tag.id)" 
-						:class="{ 'green':(searchTags.includes(tag.id)) }">
+					<div class="ui section list">
+						<div class="item" v-for="tag in commonTags" @click="toggleTagFilter(tag.id)">
+							<div class="ui clickable basic fluid large label" :class="{ 'green':(searchTags.includes(tag.id)) }">
 							{{ucWords(tag.text)}} <div class="detail">{{tag.usages}}</div>
 							</div>
 						</div>
+					</div>
+				</div>
 
 				<!-- Note title cards  -->
 				<div class="ui fourteen wide computer sixteen wide mobile column">
-					<h2>Notes ({{notes.length}})</h2>
+					<h2>
+						Notes ({{notes.length}})
+					</h2>
 					<div v-if="notes !== null" class="note-card-display-area" :class="{'one-column':(activeNoteId1 != null || activeNoteId2 != null )}">
 						<note-title-display-card 
 							v-for="note in notes" 
 							:onClick="openNote"
 							:data="note"
-							:key="note.id + note.color + searchTerm + note.note_highlights.length + note.attachment_highlights.length + note.tag_highlights.length"
+							:key="note.id + note.color + searchTerm + note.note_highlights.length + note.attachment_highlights.length + ' -' + note.tag_highlights.length + '-' +note.title.length + '-' +note.subtext.length"
 						/>
 					</div>
 
@@ -88,8 +99,8 @@
 	export default {
 	name: 'SearchBar',
 		components: {
-			'input-notes': require('./InputNotes.vue').default,
-			'note-title-display-card': require('./NoteTitleDisplayCard.vue').default,
+			'input-notes': require('@/components/NoteInputPanel.vue').default,
+			'note-title-display-card': require('@/components/NoteTitleDisplayCard.vue').default,
 		},
 		data () {
 			return {
@@ -110,6 +121,10 @@
 			}
 		},
 		beforeMount(){
+
+			let username = this.$store.getters.getUsername
+			this.username = this.ucWords(username)
+
 			this.$bus.$on('close_active_note', position => {
 				this.closeNote(position)
 			})
@@ -119,8 +134,6 @@
 			
 		},
 		mounted() {
-			let username = this.$store.getters.getUsername
-			this.username = this.ucWords(username)
 
 			this.search()
 
@@ -226,6 +239,9 @@
 			destroyLoginToken() {
 				this.$store.commit('destroyLoginToken')
 				this.$router.push('/')
+			},
+			toggleNightMode(){
+				this.$store.commit('toggleNightMode')
 			}
 		}
 	}

client/src/router/index.js

@@ -1,10 +1,10 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 
-import HelloWorld from '@/components/HelloWorld'
-import Login from '@/components/Login'
-import Notes from '@/components/Notes'
-import HelpPage from '@/components/HelpPage'
+import HomePage from '@/pages/HomePage'
+import LoginPage from '@/pages/LoginPage'
+import NotesPage from '@/pages/NotesPage'
+import HelpPage from '@/pages/HelpPage'
 
 Vue.use(Router)
 
@@ -12,21 +12,21 @@ export default new Router({
   routes: [
     {
       path: '/',
-      name: 'HelloWorld',
+      name: 'HomePage',
       meta: {title:'Home'},
-      component: HelloWorld
+      component: HomePage
     },
     {
       path: '/login',
-      name: 'Login',
+      name: 'LoginPage',
       meta: {title:'Login'},
-      component: Login
+      component: LoginPage
     },
     {
       path: '/notes',
-      name: 'Notes',
+      name: 'NotesPage',
       meta: {title:'Notes'},
-      component: Notes
+      component: NotesPage
     },
     {
       path: '/help',

client/src/stores/mainStore.js

@@ -9,7 +9,8 @@ export default new Vuex.Store({
 		count: 0,
 		message: 'Get out me yard ya wankers',
 		token: null,
-		username: null
+		username: null,
+		nightMode: false,
 	},
 	mutations: {
 		increment (state) {
@@ -40,6 +41,33 @@ export default new Vuex.Store({
 			delete axios.defaults.headers.common['Authorization']
 			state.token = null
 			state.username = null
+		},
+		toggleNightMode(state){
+
+			//Toggle state and save to local storage
+			state.nightMode = !(state.nightMode)
+			localStorage.setItem('nightMode', state.nightMode)
+
+			//Default theme colors
+			let themeColors = {
+				'background_color': '#fff',
+				'text_color': '#3d3d3d',
+				'outline_color': 'rgba(34,36,38,.15)',
+			}
+			//Night mode colors
+			if(state.nightMode){
+				themeColors = {
+					'background_color': '#000',
+					'text_color': '#a98457',
+					'outline_color': '#a98457',
+				}
+			}
+
+			//Go through each color and set CSS variable
+			let root = document.documentElement
+			Object.keys(themeColors).forEach( attribute => {
+				root.style.setProperty('--'+attribute, themeColors[attribute])
+			})
 		}
 	},
 	getters: {
@@ -55,6 +83,9 @@ export default new Vuex.Store({
 		getLoggedIn: state => {
 			let weIn = (state.token !== null && state.token != undefined && state.token.length > 0)
 			return weIn
-		}
+		},
+		getIsNightMode: state => {
+			return state.nightMode
+		},
 	}
 })

server/models/Notes.js

@@ -222,6 +222,7 @@ Notes.search = (userId, searchQuery, searchTags) => {
 						.replace(/<[^>]+>/g, '') //Rip out all HTML tags
 
 					//Generate Subtext
+					note.subtext = ''
 					if(note.text != '' && note.title != ''){
 						note.subtext = note.text
 							.replace(/&[#A-Za-z0-9]+;/g,' ') //Rip out all HTML entities
@@ -245,6 +246,9 @@ Notes.search = (userId, searchQuery, searchTags) => {
 					if(highlights && highlights[note.id] && highlights[note.id].notes_tags){
 						note['tag_highlights'] = highlights[note.id].notes_tags
 					}
+
+					//Clear out note.text before sending it to front end
+					delete note.text
 				})
 
 				//If no notes are returned, there are no tags, return empty

startDevServerAndClient.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo 'Make sure this is being run from root folder of project'
+
+echo 'Starting API server (/api), watching for file changes...'
+pm2 start server/index.js --watch
+
+echo 'Starting Client webpack dev server (/app), in a screen, watching for file changes...'
+screen -dm bash -c "cd client/; npm run watch"
+