-
Notes ({{notes.length}})
+
+ Notes ({{notes.length}})
+
@@ -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')
}
}
}
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 16f99ca..8f98623 100644
--- a/client/src/router/index.js
+++ b/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',
diff --git a/client/src/stores/mainStore.js b/client/src/stores/mainStore.js
index abf4a33..b0c7da0 100644
--- a/client/src/stores/mainStore.js
+++ b/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
+ },
}
})
\ No newline at end of file
diff --git a/server/models/Notes.js b/server/models/Notes.js
index 484892d..2efb144 100644
--- a/server/models/Notes.js
+++ b/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
diff --git a/startDevServerAndClient.sh b/startDevServerAndClient.sh
new file mode 100755
index 0000000..2714d3a
--- /dev/null
+++ b/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"
+