From eb28244fc8f98e28728c7b3f951e102b9cc56590 Mon Sep 17 00:00:00 2001 From: piotrruss Date: Mon, 16 Aug 2021 21:22:32 +0200 Subject: styles moved to scss --- apps/Notes/components/Import.js | 88 +++-------------------------- apps/Notes/components/List.js | 45 ++------------- apps/Notes/components/ListItem.js | 115 +++++++++----------------------------- apps/Notes/components/NoteEdit.js | 83 +-------------------------- apps/Notes/components/NoteView.js | 31 +--------- 5 files changed, 43 insertions(+), 319 deletions(-) (limited to 'apps/Notes/components') diff --git a/apps/Notes/components/Import.js b/apps/Notes/components/Import.js index 71c08d6..2e2e5c7 100644 --- a/apps/Notes/components/Import.js +++ b/apps/Notes/components/Import.js @@ -1,58 +1,21 @@ +import styles from '../Notes.module.scss' import React, {useState} from 'react' import fetchJson from 'lib/fetchJson' import useNotes from '../hooks/useNotes' -import {faCheck, faTimes} from '@fortawesome/free-solid-svg-icons' -import {FontAwesomeIcon} from '@fortawesome/react-fontawesome' +import {state, color, handleImport, handleChange} from '../helpers/import' const Import = ({action, setAction}) => { const [files, setFiles] = useState() const [done, setDone] = useState([]) const {mutateNotes} = useNotes() - const state = i => done[i] && - - const readFileAsText = (file) => new Promise((resolve,reject) => { - let fr = new FileReader() - - fr.onload = () => resolve(fr.result) - fr.onerror = () => reject(fr) - - fr.readAsText(file) - }) - - const handleImport = async e => { - e.preventDefault(); - - Array.from(files).forEach(async (file, i) => { - const title = file.name.replace(/\.[^/.]+$/, "") - const content = await readFileAsText(file); - - try { - const notes = await fetchJson('/api/notes', { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({title, content}), - }) - if (i === files.length - 1) await mutateNotes(notes) - setDone((prev) => ({...prev, [i]: 1})) - } catch (e) { - setDone((prev) => ({...prev, [i]: 0})) - } - }) - } - - const handleChange = e => { - setFiles(e.currentTarget.files) - setDone([]) - } - return ( -
+
-
{ setAction('') }}>Back
+
{setAction('')}}>Back
-
+ handleImport(e, files, mutateNotes, setDone)}> Import new notes:
@@ -70,7 +33,7 @@ const Import = ({action, setAction}) => { <>

Notes to import:

    - {[...files].map((f, i) =>
  • {f.name} {state(i)}
  • )} + {[...files].map((f, i) =>
  • {f.name} {state(done[i])}
  • )}
{ done.length === 0 @@ -81,43 +44,6 @@ const Import = ({action, setAction}) => { )}
-
) } diff --git a/apps/Notes/components/List.js b/apps/Notes/components/List.js index ec19639..b9fde02 100644 --- a/apps/Notes/components/List.js +++ b/apps/Notes/components/List.js @@ -1,8 +1,8 @@ +import styles from '../Notes.module.scss' import React, {useState, useEffect, useRef} from 'react' import useUser from 'lib/useUser' import useNotes from '../hooks/useNotes' import useSort from '../hooks/useSort' -import fetchJson from 'lib/fetchJson' import {Layout} from 'components' import ListItem from './ListItem' import Actions from './Actions' @@ -33,12 +33,12 @@ const List = () => {
setAction('import')}>Import
{}}>Export
- +
- - - + + + @@ -68,41 +68,6 @@ const List = () => { /> ) } - ) } diff --git a/apps/Notes/components/ListItem.js b/apps/Notes/components/ListItem.js index 42d67c0..5d3b91f 100644 --- a/apps/Notes/components/ListItem.js +++ b/apps/Notes/components/ListItem.js @@ -1,3 +1,4 @@ +import styles from '../Notes.module.scss' import React, { useContext } from 'react' import fetchJson from 'lib/fetchJson' import {getNote, removeNote} from '../helpers/noteActions.js' @@ -22,97 +23,33 @@ const ListItem = ({note, setAction, setFetchedNote}) => { } return ( - <> - - + - - - - - + + + + + + ) } diff --git a/apps/Notes/components/NoteEdit.js b/apps/Notes/components/NoteEdit.js index b568aa9..42eee46 100644 --- a/apps/Notes/components/NoteEdit.js +++ b/apps/Notes/components/NoteEdit.js @@ -1,3 +1,4 @@ +import styles from '../Notes.module.scss' import React, {useState, useContext} from 'react' import Context from 'context'; import fetchJson from 'lib/fetchJson' @@ -24,11 +25,10 @@ const NoteEdit = ({action, setAction, fetchedNote}) => { // } return ( -
+

{fetchedNote ? 'Edit note:' : 'Add new note:'}

-
+ { />
sortBy(1)}>Title {sortedBy(1)} sortBy(2)}>Created {sortedBy(2)} sortBy(3)}>Modified {sortedBy(3)} sortBy(1)}>Title {sortedBy(1)} sortBy(2)}>Created {sortedBy(2)} sortBy(3)}>Modified {sortedBy(3)}
handleNoteAction('showNote', note)} +
handleNoteAction('showNote', note)} + > + {`${note.title}`} + handleNoteAction('editNote', note, e)} > - {`${note.title}`} - handleNoteAction('editNote', note, e)} - > - - - removeNote(e, note._id, mutateNotes, setPopup, setAction)} - > - - - handleNoteAction('showNote', note)} + + + removeNote(e, note._id, mutateNotes, setPopup, setAction)} > - {datestring(note.created_at)} - handleNoteAction('showNote', note)} - > - {datestring(note.updated_at)} -
handleNoteAction('showNote', note)} + > + {datestring(note.created_at)} + handleNoteAction('showNote', note)} + > + {datestring(note.updated_at)} +