4 files changed, 17 insertions, 11 deletions

diff --git a/apps/Notes/components/NoteEdit.js b/apps/Notes/components/NoteEdit.js
index 0ffe1f3..b522feb 100644
--- a/apps/Notes/components/NoteEdit.js
+++ b/apps/Notes/components/NoteEdit.js
@@ -3,7 +3,7 @@ import React from 'react'
 import usePopup from 'hooks/usePopup'
 import useSettings from 'hooks/useSettings'
 import useNotes from '../hooks/useNotes'
-import { addNote, updateNote } from '../helpers/noteActions.js'
+import { addNote, updateNote, unescape } from '../helpers/noteActions.js'
 
 const NoteEdit = ({ setAction, fetchedNote }) => {
   const { t } = useSettings()
@@ -27,13 +27,13 @@ const NoteEdit = ({ setAction, fetchedNote }) => {
           type='text'
           maxLength={1000}
           placeholder='Title'
-          defaultValue={fetchedNote ? fetchedNote.title : ''}
+          defaultValue={fetchedNote ? unescape(fetchedNote.title) : ''}
         />
         <textarea
           required
           placeholder='Note'
           name='content'
-          defaultValue={fetchedNote ? fetchedNote.content : ''}
+          defaultValue={fetchedNote ? unescape(fetchedNote.content) : ''}
         />
         <div className='note__buttons'>
           <span
diff --git a/apps/Notes/components/NoteView.js b/apps/Notes/components/NoteView.js
index c6afe1f..0ebffde 100644
--- a/apps/Notes/components/NoteView.js
+++ b/apps/Notes/components/NoteView.js
@@ -3,7 +3,7 @@ import React from 'react'
 import useSettings from 'hooks/useSettings'
 import usePopup from 'hooks/usePopup'
 import useNotes from '../hooks/useNotes'
-import { removeNote, exportNote } from '../helpers/noteActions.js'
+import { removeNote, exportNote, unescape } from '../helpers/noteActions.js'
 import copyToClipboard from '../helpers/copyToClipboard.js'
 import Splash from 'components/Splash'
 
@@ -33,8 +33,8 @@ const NoteView = ({ fetchedNote, setFetchedNote, setAction }) => {
       </div>
 
       <div className='window__scroll'>
-        <h2>{title}</h2>
-        <p>{content}</p>
+        <h2>{unescape(title)}</h2>
+        <p>{unescape(content)}</p>
       </div>
     </section>
   )
diff --git a/apps/Notes/helpers/noteActions.js b/apps/Notes/helpers/noteActions.js
index d934229..b0e06e1 100644
--- a/apps/Notes/helpers/noteActions.js
+++ b/apps/Notes/helpers/noteActions.js
@@ -2,6 +2,10 @@ import fetchJson from 'helpers/fetchJson'
 import saveFile from 'helpers/saveFile'
 import filename from '../helpers/fileName'
 
+const escape = t => t.replace(/"/g, '&quot;').replace(/'/, '&apos;')
+
+export const unescape = t => t.replace(/&quot;/g, '"').replace(/&apos;/, '\'')
+
 export const getNote = async (note, setFetchedNote, t, setPopup, callback) => {
   try {
     const { content } = await fetchJson(`/api/notes/${note.noteId}`)
@@ -18,8 +22,8 @@ export const getNote = async (note, setFetchedNote, t, setPopup, callback) => {
 }
 
 export const addNote = async (e, mutateNotes, setAction, t, setPopup) => {
-  const content = e.currentTarget.content.value
-  const title = e.currentTarget.title.value
+  const content = escape(e.currentTarget.content.value)
+  const title = escape(e.currentTarget.title.value)
 
   try {
     mutateNotes(
@@ -44,8 +48,8 @@ export const addNote = async (e, mutateNotes, setAction, t, setPopup) => {
 }
 
 export const updateNote = async (e, note, mutateNotes, setAction, t, setPopup) => {
-  const content = e.currentTarget.content.value
-  const title = e.currentTarget.title.value
+  const content = escape(e.currentTarget.content.value)
+  const title = escape(e.currentTarget.title.value)
   const { _id, noteId } = note
 
   try {
diff --git a/pages/index.js b/pages/index.js
index a13a840..4380d19 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -21,7 +21,9 @@ const Home = () => {
 
   if (!user) {
     return (
-      <Layout><Splash fixed /></Layout>
+      <div style={{ position: 'fixed', top: 0, right: 0, bottom: 0, left: 0 }}>
+        <Splash fixed />
+      </div>
     )
   }