Max/SolidScribe
Max/SolidScribe
1
0
Fork 0
Code Issues 24 Pull Requests Releases Wiki Activity

Updated marketing images to change with theme

Browse Source 
Removed visible attribute that was left over from testing
Removed drag attribute on check boxes, needs better implimentation later. Drag prevented click events
This commit is contained in:
Max G 2022-04-03 17:21:05 +00:00
parent 0c4f6e94c1
commit d94b8c90fc
5 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/components/NoteInputPanel.vue
View File

@ -159,11 +159,6 @@
v-on:click="$router.push(`/notes/open/${noteid}/menu/tags`)" v-on:click="$router.push(`/notes/open/${noteid}/menu/tags`)"
:style="{ 'background-color':styleObject['noteBackground'] }"> :style="{ 'background-color':styleObject['noteBackground'] }">
<span>
{{ lastVisibilityState }}
</span>
<span class="add-mini-tag" v-if="allTags.length == 0"> <span class="add-mini-tag" v-if="allTags.length == 0">
<i class="tags icon"></i>Add Tags <i class="tags icon"></i>Add Tags
</span> </span>
@ -441,10 +436,12 @@
watch: { watch: {
urlData(newVal, oldVal){ urlData(newVal, oldVal){
// return
//Handle changes in URL to //Handle changes in URL to
if(newVal.id == undefined || newVal.id != this.noteid){ if(newVal.id == undefined || newVal.id != this.noteid){
// this.closeButtonAction() this.closeButtonAction()
} }
//Reset all note menus on URL change //Reset all note menus on URL change
@ -684,6 +681,12 @@
this.onKeyup(event) this.onKeyup(event)
}) })
// this.editor.addEventListener("dragstart", e => {
// console.log('Dragging')
// console.log(e)
// if(){}
// });
//Show and hide additional toolbars //Show and hide additional toolbars
// this.editor.addEventListener('focus', e => { // this.editor.addEventListener('focus', e => {
// }) // })

12
client/src/mixins/SquireButtonFunctions.js
View File

@ -357,9 +357,21 @@ const SquireButtonFunctions = {
}, },
setText(inText){ setText(inText){
this.editor.setHTML(inText) this.editor.setHTML(inText)
// this.noteText = this.editor._getHTML() // this.noteText = this.editor._getHTML()
// this.diffNoteText = 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(){ getText(){

50
client/src/pages/HomePage.vue
View File

@ -149,23 +149,23 @@
<!-- All marketing images if you need to review --> <!-- All marketing images if you need to review -->
<div v-if="false" class="sixteen wide column"> <div v-if="false" class="sixteen wide column">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/add.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/add.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/gardening.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/gardening.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/growth.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/growth.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/icecream.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/icecream.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/investing.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/investing.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/onboarding.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/onboarding.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/robot.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/robot.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/solution.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/solution.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/watching.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/watching.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/cloud.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/cloud.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/grandma.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/grandma.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/hamburger.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/hamburger.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/idea.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/idea.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/notebook.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/notebook.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/plan.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/plan.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/secure.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/secure.svg">
<img loading="lazy" width="10%" src="/api/static/assets/marketing/void.svg" alt=""> <img loading="lazy" width="10%" src="/api/static/assets/marketing/void.svg">
</div> </div>
<!-- Go to notes button --> <!-- Go to notes button -->
@ -200,7 +200,7 @@
<!-- <h3>Tools to organize and collaborate on thousands of notes while maintaining security and respecting your privacy.</h3> --> <!-- <h3>Tools to organize and collaborate on thousands of notes while maintaining security and respecting your privacy.</h3> -->
</div> </div>
<div class="four wide column"> <div class="four wide column">
<img loading="lazy" width="100%" src="/api/static/assets/marketing/idea.svg" alt="Explosion of New Ideas"> <svg-displayer file="idea" alt="Explosion of New Ideas" />
</div> </div>
</div> </div>
@ -392,7 +392,7 @@
</div> </div>
<div class="six wide column"> <div class="six wide column">
<img loading="lazy" width="100%" src="/api/static/assets/marketing/onboarding.svg" alt=""> <svg-displayer file="onboarding" alt="Observe this chart" />
</div> </div>
</div> </div>
@ -400,8 +400,7 @@
<div class="middle aligned centered row"> <div class="middle aligned centered row">
<div class="four wide right aligned column"> <div class="four wide right aligned column">
<img loading="lazy" width="100%" src="/api/static/assets/marketing/secure.svg" alt="marketing mumbo jumbo"> <svg-displayer file="secure" alt="So dang secure" />
</div> </div>
<div class="six wide column"> <div class="six wide column">
<h2>Only you can read your notes. </h2> <h2>Only you can read your notes. </h2>
@ -415,13 +414,13 @@
<h3>Works on mobile or desktop browsers. <br>Behaves like an installed app on mobile phones.</h3> <h3>Works on mobile or desktop browsers. <br>Behaves like an installed app on mobile phones.</h3>
</div> </div>
<div class="four wide right aligned column"> <div class="four wide right aligned column">
<img loading="lazy" width="100%" src="/api/static/assets/marketing/cloud.svg" alt="Girl falling into the spiral of digital chaos"> <svg-displayer file="cloud" alt="Girl falling into the spiral of digital chaos" />
</div> </div>
</div> </div>
<div class="middle aligned centered row"> <div class="middle aligned centered row">
<div class="four wide right aligned column"> <div class="four wide right aligned column">
<img loading="lazy" width="100%" src="/api/static/assets/marketing/robot.svg" alt="Shrunken man near giant tablet"> <svg-displayer file="robot" alt="Murder Robot in office environment" />
</div> </div>
<div class="six wide column"> <div class="six wide column">
<h2>Secure Data Sharing</h2> <h2>Secure Data Sharing</h2>
@ -440,7 +439,7 @@
<a href="https://pi-hole.net/" target="_blank">Pi-hole</a> on the network.</h3> <a href="https://pi-hole.net/" target="_blank">Pi-hole</a> on the network.</h3>
</div> </div>
<div class="four wide column"> <div class="four wide column">
<img loading="lazy" width="100%" src="/api/static/assets/marketing/icecream.svg" alt="Emergence of a 4th dimensional being perceived as a large ice cream "> <svg-displayer file="icecream" alt="Emergence of a 4th dimensional being perceived as a large ice cream" />
</div> </div>
</div> </div>
@ -512,7 +511,7 @@
<p>Awesomely Generic Marketing Images - <a target="_blank" href="https://undraw.co/">https://unDraw.co/</a></p> <p>Awesomely Generic Marketing Images - <a target="_blank" href="https://undraw.co/">https://unDraw.co/</a></p>
</div> </div>
<div class="four wide column"> <div class="four wide column">
<img loading="lazy" width="100%" src="/api/static/assets/marketing/watching.svg" alt="Drinking the blood of the elderly"> <svg-displayer file="watching" alt="Drinking the blood of the elderly" />
</div> </div>
</div> </div>
@ -531,6 +530,7 @@ export default {
components: { components: {
'login-form':require('@/components/LoginFormComponent.vue').default, 'login-form':require('@/components/LoginFormComponent.vue').default,
'logo':require('@/components/LogoComponent.vue').default, 'logo':require('@/components/LogoComponent.vue').default,
'svg-displayer':require('@/components/SvgDisplayer.vue').default,
}, },
data(){ data(){
return { return {

2
server/models/User.js
View File

@ -9,7 +9,7 @@ const speakeasy = require('speakeasy')
let User = module.exports = {} 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 //Login a user, if that user does not exist create them
//Issues login token //Issues login token

2
staticFiles/assets/marketing/idea.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB