settings

5 files changed, 14 insertions, 28 deletions

diff --git a/apps/Notes/components/List.js b/apps/Notes/components/List.js
index 54f66b5..1fd03af 100644
--- a/apps/Notes/components/List.js
+++ b/apps/Notes/components/List.js
@@ -5,7 +5,7 @@ import useNotes from '../hooks/useNotes'
 import useSort from '../hooks/useSort'
 import ListItem from './ListItem'
 import Actions from './Actions'
-import Splash from './Splash'
+import {Splash} from 'components'
 
 const List = () => {
   const [fetchedNote, setFetchedNote] = useState()
diff --git a/apps/Notes/components/ListItem.js b/apps/Notes/components/ListItem.js
index 0e34ffc..4a404db 100644
--- a/apps/Notes/components/ListItem.js
+++ b/apps/Notes/components/ListItem.js
@@ -1,10 +1,10 @@
 import styles from '../Notes.module.scss'
-import React, { useContext } from 'react'
+import React from 'react'
 import {getNote, exportNote, removeNote} from '../helpers/noteActions.js'
 import useNotes from '../hooks/useNotes'
-import Context from 'context';
-import { faEdit, faDownload, faTrash } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import usePopup from 'hooks/usePopup'
+import {faEdit, faDownload, faTrash } from '@fortawesome/free-solid-svg-icons'
+import {FontAwesomeIcon} from '@fortawesome/react-fontawesome'
 
 const datestring = date => {
   const d = new Date(date);
@@ -13,8 +13,8 @@ const datestring = date => {
 };
 
 const ListItem = ({note, setAction, setFetchedNote, setLoading}) => {
+  const {setPopup} = usePopup()
   const {mutateNotes} = useNotes()
-  const {setPopup} = useContext(Context)
 
   const handleNoteAction = async (a, note, e) => {
     if (e) e.stopPropagation()
@@ -28,8 +28,7 @@ const ListItem = ({note, setAction, setFetchedNote, setLoading}) => {
       key={note._id}
       onClick={() => handleNoteAction('showNote', note)}
     >
-      <td
-      >
+      <td>
         <span>{`${note.title}`}</span>
         <span onClick={e => handleNoteAction('editNote', note, e)}>
           <FontAwesomeIcon icon={faEdit} />
diff --git a/apps/Notes/components/NoteEdit.js b/apps/Notes/components/NoteEdit.js
index ad936a4..40a33c0 100644
--- a/apps/Notes/components/NoteEdit.js
+++ b/apps/Notes/components/NoteEdit.js
@@ -1,12 +1,12 @@
 import styles from '../Notes.module.scss'
-import React, {useContext} from 'react'
-import Context from 'context';
+import React from 'react'
 import useNotes from '../hooks/useNotes'
+import usePopup from 'hooks/usePopup'
 import {addNote, updateNote} from '../helpers/noteActions.js'
 
 const NoteEdit = ({setAction, fetchedNote}) => {
   const {mutateNotes} = useNotes()
-  const {setPopup} = useContext(Context)
+  const {setPopup} = usePopup()
 
   const handleSubmit = e => {
     e.preventDefault()
diff --git a/apps/Notes/components/NoteView.js b/apps/Notes/components/NoteView.js
index 29aba34..6926b09 100644
--- a/apps/Notes/components/NoteView.js
+++ b/apps/Notes/components/NoteView.js
@@ -1,14 +1,14 @@
 import styles from '../Notes.module.scss'
-import React, {useContext} from 'react';
-import Context from 'context';
+import React from 'react';
 import useNotes from '../hooks/useNotes'
+import usePopup from 'hooks/usePopup'
 import {removeNote, exportNote} from '../helpers/noteActions.js'
 import copyToClipboard from '../helpers/copyToClipboard.js'
-import Splash from './Splash'
+import Splash from 'components/Splash'
 
 const NoteView = ({fetchedNote, setFetchedNote, setAction}) => {
+  const {setPopup} = usePopup()
   const {mutateNotes} = useNotes()
-  const {setPopup} = useContext(Context)
 
   if (!fetchedNote) return <Splash />
   if (fetchedNote.error) {
diff --git a/apps/Notes/components/Splash.js b/apps/Notes/components/Splash.js
deleted file mode 100644
index b17fa6b..0000000
--- a/apps/Notes/components/Splash.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import styles from '../Notes.module.scss'
-import React from 'react'
-import {FontAwesomeIcon} from '@fortawesome/react-fontawesome'
-import {faBan, faSpinner} from '@fortawesome/free-solid-svg-icons'
-
-const Splash = ({type}) => (
-  <div className={type === 'connection' ? styles.connection : styles.loader}>
-    <FontAwesomeIcon icon={type === 'connection' ? faBan : faSpinner} />
-    <p>{type === 'connection' ? 'No connection' : 'Loading...'}</p>
-  </div>
-)
-
-export default Splash