From f08f6ca0a9d337efff280d4d1669a41b5d9c31c2 Mon Sep 17 00:00:00 2001 From: piotrruss Date: Thu, 2 Sep 2021 22:28:11 +0200 Subject: finish translations, force maximize --- apps/Notes/components/Export.js | 12 +++++++----- apps/Notes/components/Import.js | 15 ++++++++------- apps/Notes/components/List.js | 18 ++++++++++-------- apps/Notes/components/ListItem.js | 8 +++++--- apps/Notes/components/NoteEdit.js | 16 +++++++++------- apps/Notes/components/NoteView.js | 16 ++++++++-------- apps/Notes/helpers/copyToClipboard.js | 6 +++--- apps/Notes/helpers/export.js | 2 +- apps/Notes/helpers/import.js | 2 +- apps/Notes/helpers/noteActions.js | 32 ++++++++++++++++---------------- 10 files changed, 68 insertions(+), 59 deletions(-) (limited to 'apps/Notes') diff --git a/apps/Notes/components/Export.js b/apps/Notes/components/Export.js index e7966e4..0838cea 100644 --- a/apps/Notes/components/Export.js +++ b/apps/Notes/components/Export.js @@ -1,10 +1,12 @@ import styles from '../Notes.module.scss' import React, {useState} from 'react' +import useSettings from 'hooks/useSettings' import useNotes from '../hooks/useNotes' import {handleSelect, handleSelectAll, handleExport} from '../helpers/export' const Export = ({setAction}) => { const {notes} = useNotes() + const {t} = useSettings() const [ids, setIds] = useState(notes.map(n => n.noteId)) const sortFn = (a, b) => new Date(b.updated_at) - new Date(a.updated_at) @@ -13,17 +15,17 @@ const Export = ({setAction}) => { return (
-
{setAction('')}}>Back
+
{setAction('')}}>{t('back')}
-

Click to export your notes:

+

{t('notes_click_to_export')}

handleExport(e, ids, notes)} /> -

Notes to export:

+

{t('notes_to_export')}

{ onChange={e => handleSelectAll(e, notes, setIds)} checked={notes.length === ids.length} /> - +
    {notes.sort(sortFn).map(note => ( diff --git a/apps/Notes/components/Import.js b/apps/Notes/components/Import.js index 700acb4..ad2b831 100644 --- a/apps/Notes/components/Import.js +++ b/apps/Notes/components/Import.js @@ -1,10 +1,11 @@ import styles from '../Notes.module.scss' import React, {useState} from 'react' -import fetchJson from 'lib/fetchJson' +import useSettings from 'hooks/useSettings' import useNotes from '../hooks/useNotes' import {state, color, handleImport, handleChange} from '../helpers/import' const Import = ({setAction}) => { + const {t} = useSettings() const [files, setFiles] = useState() const [done, setDone] = useState([]) const {mutateNotes} = useNotes() @@ -12,14 +13,14 @@ const Import = ({setAction}) => { return (
    -
    {setAction('')}}>Back
    +
    {setAction('')}}>{t('back')}
    handleImport(e, files, mutateNotes, setDone)}> - Import new notes: + {t('notes_import')}
    {files && ( <> -

    Notes to import:

    +

    {t('notes_to_import')}

      {[...files].map((f, i) =>
    • {f.name} {state(done[i])}
    • )}
    { done.length === 0 - ? - :

    Import finished.

    Go back to notes list or choose other notes to import.

    + ? + :

    {t('import_finished')}

    {t('notes_import_go_back')}

    } )} diff --git a/apps/Notes/components/List.js b/apps/Notes/components/List.js index 1fd03af..9655d74 100644 --- a/apps/Notes/components/List.js +++ b/apps/Notes/components/List.js @@ -1,6 +1,7 @@ import styles from '../Notes.module.scss' import React, {useState, useEffect} from 'react' -import useUser from 'lib/useUser' +import useUser from 'hooks/useUser' +import useSettings from 'hooks/useSettings' import useNotes from '../hooks/useNotes' import useSort from '../hooks/useSort' import ListItem from './ListItem' @@ -13,6 +14,7 @@ const List = () => { const [loading, setLoading] = useState(false) const {notes, error} = useNotes() const [sortedBy, sortBy, sortFn] = useSort(3) + const {t} = useSettings() const {user} = useUser({ redirectToLogin: true, redirectToVerify: true, @@ -32,16 +34,16 @@ const List = () => { action === '' ? ( <>
    -
    setAction('addNote')}>New note
    -
    setAction('importNotes')}>Import
    -
    setAction('exportNotes')}>Export
    +
    setAction('addNote')}>{t('notes_new')}
    +
    setAction('importNotes')}>{t('import')}
    +
    setAction('exportNotes')}>{t('export')}
    - - - + + + @@ -57,7 +59,7 @@ const List = () => { /> ))) : ( - + )} diff --git a/apps/Notes/components/ListItem.js b/apps/Notes/components/ListItem.js index 4a404db..4a2d6f6 100644 --- a/apps/Notes/components/ListItem.js +++ b/apps/Notes/components/ListItem.js @@ -1,8 +1,9 @@ import styles from '../Notes.module.scss' import React from 'react' import {getNote, exportNote, removeNote} from '../helpers/noteActions.js' -import useNotes from '../hooks/useNotes' +import useSettings from 'hooks/useSettings' import usePopup from 'hooks/usePopup' +import useNotes from '../hooks/useNotes' import {faEdit, faDownload, faTrash } from '@fortawesome/free-solid-svg-icons' import {FontAwesomeIcon} from '@fortawesome/react-fontawesome' @@ -13,13 +14,14 @@ const datestring = date => { }; const ListItem = ({note, setAction, setFetchedNote, setLoading}) => { + const {t} = useSettings() const {setPopup} = usePopup() const {mutateNotes} = useNotes() const handleNoteAction = async (a, note, e) => { if (e) e.stopPropagation() setLoading(true) - await getNote(note, setFetchedNote, setPopup, () => setAction(a)) + await getNote(note, setFetchedNote, t, setPopup, () => setAction(a)) } return ( @@ -36,7 +38,7 @@ const ListItem = ({note, setAction, setFetchedNote, setLoading}) => { {e.stopPropagation(); exportNote(note)}}> - removeNote(e, note._id, mutateNotes, setPopup, setAction)}> + removeNote(e, note._id, mutateNotes, t, setPopup, setAction)}> diff --git a/apps/Notes/components/NoteEdit.js b/apps/Notes/components/NoteEdit.js index 40a33c0..f9cc3f2 100644 --- a/apps/Notes/components/NoteEdit.js +++ b/apps/Notes/components/NoteEdit.js @@ -1,24 +1,26 @@ import styles from '../Notes.module.scss' import React from 'react' -import useNotes from '../hooks/useNotes' import usePopup from 'hooks/usePopup' +import useSettings from 'hooks/useSettings' +import useNotes from '../hooks/useNotes' import {addNote, updateNote} from '../helpers/noteActions.js' const NoteEdit = ({setAction, fetchedNote}) => { - const {mutateNotes} = useNotes() + const {t} = useSettings() const {setPopup} = usePopup() + const {mutateNotes} = useNotes() const handleSubmit = e => { e.preventDefault() fetchedNote - ? updateNote(e, fetchedNote, mutateNotes, setAction, setPopup) - : addNote(e, mutateNotes, setAction, setPopup) + ? updateNote(e, fetchedNote, mutateNotes, setAction, t, setPopup) + : addNote(e, mutateNotes, setAction, t, setPopup) } return (
    -

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

    +

    {fetchedNote ? t('notes_edit') : t('notes_add_new')}

    { className='window__button' onClick={() => {setAction(fetchedNote ? 'showNote' : '')}} > - Cancel + {t('cancel')}
    diff --git a/apps/Notes/components/NoteView.js b/apps/Notes/components/NoteView.js index 6926b09..02937f8 100644 --- a/apps/Notes/components/NoteView.js +++ b/apps/Notes/components/NoteView.js @@ -1,12 +1,14 @@ import styles from '../Notes.module.scss' import React from 'react'; -import useNotes from '../hooks/useNotes' +import useSettings from 'hooks/useSettings' import usePopup from 'hooks/usePopup' +import useNotes from '../hooks/useNotes' import {removeNote, exportNote} from '../helpers/noteActions.js' import copyToClipboard from '../helpers/copyToClipboard.js' import Splash from 'components/Splash' const NoteView = ({fetchedNote, setFetchedNote, setAction}) => { + const {t} = useSettings() const {setPopup} = usePopup() const {mutateNotes} = useNotes() @@ -21,19 +23,17 @@ const NoteView = ({fetchedNote, setFetchedNote, setAction}) => { return (
    -
    {setFetchedNote(); setAction('')}}>Back
    -
    copyToClipboard(content, setPopup)}>Copy
    -
    {setAction('editNote')}}>Edit
    -
    exportNote(fetchedNote)}>Export
    -
    {removeNote(e, _id, mutateNotes, setPopup, setAction)}}>Remove
    +
    {setFetchedNote(); setAction('')}}>{t('back')}
    +
    copyToClipboard(content, t, setPopup)}>{t('copy')}
    +
    {setAction('editNote')}}>{t('edit')}
    +
    exportNote(fetchedNote)}>{t('export')}
    +
    {removeNote(e, _id, mutateNotes, t, setPopup, setAction)}}>{t('remove')}

    {title}

    {content}

    -
    ) } diff --git a/apps/Notes/helpers/copyToClipboard.js b/apps/Notes/helpers/copyToClipboard.js index 608d299..afaf7f6 100644 --- a/apps/Notes/helpers/copyToClipboard.js +++ b/apps/Notes/helpers/copyToClipboard.js @@ -1,15 +1,15 @@ -const copyToClipboard = (text, setPopup) => { +const copyToClipboard = (text, t, setPopup) => { navigator .clipboard.writeText(text) .then(() => { setPopup({ - content: 'Note content was copied to clipboard', + content: t('notes_copy_success'), time: 2000, }) }) .catch(() => { setPopup({ - content: 'Could not copy to clipboard', + content: t('notes_copy_error'), time: 2000, error: true }) diff --git a/apps/Notes/helpers/export.js b/apps/Notes/helpers/export.js index 011dc18..80fa100 100644 --- a/apps/Notes/helpers/export.js +++ b/apps/Notes/helpers/export.js @@ -1,4 +1,4 @@ -import fetchJson from 'lib/fetchJson' +import fetchJson from 'helpers/fetchJson' import JSZip from 'jszip' import saveFile from 'helpers/saveFile' import filename from '../helpers/fileName' diff --git a/apps/Notes/helpers/import.js b/apps/Notes/helpers/import.js index b05a458..c0c3714 100644 --- a/apps/Notes/helpers/import.js +++ b/apps/Notes/helpers/import.js @@ -1,4 +1,4 @@ -import fetchJson from 'lib/fetchJson' +import fetchJson from 'helpers/fetchJson' import {faCheck, faTimes} from '@fortawesome/free-solid-svg-icons' import {FontAwesomeIcon} from '@fortawesome/react-fontawesome' diff --git a/apps/Notes/helpers/noteActions.js b/apps/Notes/helpers/noteActions.js index 4b47011..f67e7a4 100644 --- a/apps/Notes/helpers/noteActions.js +++ b/apps/Notes/helpers/noteActions.js @@ -1,8 +1,8 @@ -import fetchJson from 'lib/fetchJson' -import filename from '../helpers/fileName' +import fetchJson from 'helpers/fetchJson' import saveFile from 'helpers/saveFile' +import filename from '../helpers/fileName' -export const getNote = async (note, setFetchedNote, setPopup, callback) => { +export const getNote = async (note, setFetchedNote, t, setPopup, callback) => { try { const {content} = await fetchJson(`/api/note/${note.noteId}`) setFetchedNote({ ...note, content}) @@ -10,14 +10,14 @@ export const getNote = async (note, setFetchedNote, setPopup, callback) => { } catch (err) { setFetchedNote() setPopup({ - content: 'Could not open note', + content: t('notes_open_error'), time: 2000, error: true, }) } } -export const addNote = async (e, mutateNotes, setAction, setPopup) => { +export const addNote = async (e, mutateNotes, setAction, t, setPopup) => { const content = e.currentTarget.content.value const title = e.currentTarget.title.value @@ -30,20 +30,20 @@ export const addNote = async (e, mutateNotes, setAction, setPopup) => { }) ) setPopup({ - content: 'New note added', + content: t('notes_added'), time: 2000, }) setAction('') } catch (e) { setPopup({ - content: 'Could not save note', + content: t(notes_added_error), time: 2000, error: true, }) } } -export const updateNote = async (e, note, mutateNotes, setAction, setPopup) => { +export const updateNote = async (e, note, mutateNotes, setAction, t, setPopup) => { const content = e.currentTarget.content.value const title = e.currentTarget.title.value const {_id, noteId} = note @@ -57,20 +57,20 @@ export const updateNote = async (e, note, mutateNotes, setAction, setPopup) => { }) ) setPopup({ - content: 'Note updated', + content: t('notes_updated'), time: 2000, }) setAction('') } catch (e) { setPopup({ - content: 'Could not update note', + content: t('notes_updated_error'), time: 2000, error: true, }) } } -export const removeNote = (e, _id, mutateNotes, setPopup, setAction) => { +export const removeNote = (e, _id, mutateNotes, t, setPopup, setAction) => { e.stopPropagation() const remove = async () => { @@ -83,13 +83,13 @@ export const removeNote = (e, _id, mutateNotes, setPopup, setAction) => { }) ) setPopup({ - content: 'Note was removed', + content: t('notes_removed'), time: 2000, }) setAction('') } catch (err) { setPopup({ - content: 'Could not remove note', + content: t('notes_removed_error'), time: 2000, error: true, }) @@ -97,9 +97,9 @@ export const removeNote = (e, _id, mutateNotes, setPopup, setAction) => { } setPopup({ - content: 'Do you want to remove note?', - yes: { label: 'Remove', action: remove }, - no: { label: 'Cancel', action: async () => {} }, + content: t('notes_remove_confirm'), + yes: { label: t('remove'), action: remove }, + no: { label: t('cancel'), action: async () => {} }, error: true, }) } -- cgit v1.2.3
    sortBy(1)}>Title {sortedBy(1)} sortBy(2)}>Created {sortedBy(2)} sortBy(3)}>Modified {sortedBy(3)} sortBy(1)}>{t('title')} {sortedBy(1)} sortBy(2)}>{t('created')} {sortedBy(2)} sortBy(3)}>{t('modified')} {sortedBy(3)}
    Your notes list is empty.{t('notes_list_empty')}