refolder shared

Author: maxchistt

client/src/App.js

@@ -3,7 +3,7 @@
  */
 import React from 'react'
 import './App.css'
-import Loader from './Shared/Loader'
+import Loader from './Shared/Components/Loader'
 import { BrowserRouter as Router } from 'react-router-dom'
 import { useRoutes } from './routes'
 import { useAuth } from './Hooks/auth.hook'

client/src/Hooks/useNotesArr.hook.js

@@ -1,6 +1,6 @@
 /**@file useNotesArr.hook.js */
 import { useState } from 'react'
-import { checkNotesArr } from '../Shared/noteType/Note'
+import { checkNotesArr } from '../Shared/Validation/Note'
 
 /**
  * Хук использования массива заметок

client/src/NoteComponents/ModalNoteEdit.js

@@ -4,7 +4,7 @@
 import React from 'react'
 import NotesContext from '../Context/NotesContext'
 import TextareaAutosize from 'react-textarea-autosize'
-import Modal, { ModalProps } from "../Shared/Modal/Modal"
+import Modal, { ModalProps } from "../Shared/Components/Modal/Modal"
 import Palette from './palette/palette'
 
 /**расчет числа строк */

client/src/NoteComponents/NoteItem.js

@@ -3,7 +3,7 @@
  */
 import React, { useContext } from 'react'
 import NotesContext from '../Context/NotesContext'
-import Note, { PropTypeNote } from '../Shared/noteType/Note'
+import { PropTypeNote } from '../Shared/Validation/Note'
 import ReactMarkdown from 'react-markdown'
 import gfm from 'remark-gfm'
 
@@ -17,7 +17,7 @@ function fixLineBreaks(mdStr) {
  * @param {*} param0 
  *  
  */
-function NoteItem({ note = new Note() }) {
+function NoteItem({ note }) {
     /**Подключение контекста */
     const { setEditNoteId, editNoteOrder } = useContext(NotesContext)
 

client/src/NoteComponents/NoteList.js

@@ -3,6 +3,7 @@
  */
 import React from 'react'
 import PropTypes from 'prop-types'
+import { PropTypeNote } from '../Shared/Validation/Note'
 import NoteItem from './NoteItem'
 import StackGrid, { transitions } from "react-stack-grid"
 import sizeMe from 'react-sizeme'
@@ -66,7 +67,7 @@ function NoteList(props) {
 
 // Валидация
 NoteList.propTypes = {
-    notes: PropTypes.arrayOf(PropTypes.object).isRequired,
+    notes: PropTypes.arrayOf(PropTypeNote).isRequired,
 }
 
 export default sizeMe()(NoteList)

client/src/Pages/NotesPage.js

@@ -6,9 +6,9 @@ import './NotesPage.css'
 import NoteList from '../NoteComponents/NoteList'
 import AddNote from '../NoteComponents/AddNote'
 import NotesContext from '../Context/NotesContext'
-import Loader from '../Shared/Loader'
+import Loader from '../Shared/Components/Loader'
 import ModalNoteEdit from '../NoteComponents/ModalNoteEdit'
-import Note from '../Shared/noteType/Note'
+import Note from '../Shared/Validation/Note'
 import { NavLink } from 'react-router-dom'
 import { AuthContext } from '../Context/AuthContext'
 import useNavbarEffect from '../Hooks/useNavbarEffect.hook'