From d94b8c90fc3c839775f4908edb06991da32e2894 Mon Sep 17 00:00:00 2001 From: Max G Date: Sun, 3 Apr 2022 17:21:05 +0000 Subject: [PATCH] Updated marketing images to change with theme Removed visible attribute that was left over from testing Removed drag attribute on check boxes, needs better implimentation later. Drag prevented click events --- client/src/components/NoteInputPanel.vue | 15 ++++--- client/src/mixins/SquireButtonFunctions.js | 12 ++++++ client/src/pages/HomePage.vue | 50 +++++++++++----------- server/models/User.js | 2 +- staticFiles/assets/marketing/idea.svg | 2 +- 5 files changed, 48 insertions(+), 33 deletions(-) diff --git a/client/src/components/NoteInputPanel.vue b/client/src/components/NoteInputPanel.vue index cfeab0c..81cd542 100644 --- a/client/src/components/NoteInputPanel.vue +++ b/client/src/components/NoteInputPanel.vue @@ -159,11 +159,6 @@ v-on:click="$router.push(`/notes/open/${noteid}/menu/tags`)" :style="{ 'background-color':styleObject['noteBackground'] }"> - - - {{ lastVisibilityState }} - - Add Tags @@ -441,10 +436,12 @@ watch: { urlData(newVal, oldVal){ + // return + //Handle changes in URL to if(newVal.id == undefined || newVal.id != this.noteid){ - // this.closeButtonAction() + this.closeButtonAction() } //Reset all note menus on URL change @@ -684,6 +681,12 @@ this.onKeyup(event) }) + // this.editor.addEventListener("dragstart", e => { + // console.log('Dragging') + // console.log(e) + // if(){} + // }); + //Show and hide additional toolbars // this.editor.addEventListener('focus', e => { // }) diff --git a/client/src/mixins/SquireButtonFunctions.js b/client/src/mixins/SquireButtonFunctions.js index 30bc9cb..2264208 100644 --- a/client/src/mixins/SquireButtonFunctions.js +++ b/client/src/mixins/SquireButtonFunctions.js @@ -357,9 +357,21 @@ const SquireButtonFunctions = { }, setText(inText){ + + this.editor.setHTML(inText) // this.noteText = this.editor._getHTML() // this.diffNoteText = this.editor._getHTML() + + //Make sure all list items have draggable property + let container = document.getElementById('squire-id') + let listItems = container.getElementsByTagName('li') + for(let itemIndex in listItems){ + // console.log(listItems[itemIndex]) + // listItems[itemIndex].setAttribute('draggable','true') + } + // console.log(listItems) + }, getText(){ diff --git a/client/src/pages/HomePage.vue b/client/src/pages/HomePage.vue index b2b420e..39f80bb 100644 --- a/client/src/pages/HomePage.vue +++ b/client/src/pages/HomePage.vue @@ -149,23 +149,23 @@
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
@@ -200,7 +200,7 @@
- Explosion of New Ideas +
@@ -392,7 +392,7 @@
- +
@@ -400,8 +400,7 @@
- marketing mumbo jumbo - +

Only you can read your notes.

@@ -415,13 +414,13 @@

Works on mobile or desktop browsers.
Behaves like an installed app on mobile phones.

- Girl falling into the spiral of digital chaos +
- Shrunken man near giant tablet +

Secure Data Sharing

@@ -440,7 +439,7 @@ Pi-hole on the network.
- Emergence of a 4th dimensional being perceived as a large ice cream +
@@ -512,7 +511,7 @@

Awesomely Generic Marketing Images - https://unDraw.co/

- Drinking the blood of the elderly +
@@ -531,6 +530,7 @@ export default { components: { 'login-form':require('@/components/LoginFormComponent.vue').default, 'logo':require('@/components/LogoComponent.vue').default, + 'svg-displayer':require('@/components/SvgDisplayer.vue').default, }, data(){ return { diff --git a/server/models/User.js b/server/models/User.js index ebb3c3f..e7aab97 100644 --- a/server/models/User.js +++ b/server/models/User.js @@ -9,7 +9,7 @@ const speakeasy = require('speakeasy') let User = module.exports = {} -const version = '3.4.2' +const version = '3.4.3' //Login a user, if that user does not exist create them //Issues login token diff --git a/staticFiles/assets/marketing/idea.svg b/staticFiles/assets/marketing/idea.svg index ab06ad9..e80f5bb 100644 --- a/staticFiles/assets/marketing/idea.svg +++ b/staticFiles/assets/marketing/idea.svg @@ -1 +1 @@ -new_ideas \ No newline at end of file +new_ideas \ No newline at end of file