diff --git a/src/components/Consents/DowloadModal.tsx b/src/components/Consents/DowloadModal.tsx index 4730748274479250964c0504bbb4d3d26541ab87..e5774f8d852fe868ded8f60b2459d7ec009ddc33 100644 --- a/src/components/Consents/DowloadModal.tsx +++ b/src/components/Consents/DowloadModal.tsx @@ -1,6 +1,6 @@ import React from 'react' -import Modal from '../Modal/Modal' import dowloadIcon from '../../assets/icons/ico-download.svg' +import Modal from '../Newsletter/Modal/Modal' import styles from './DownloadModal.module.scss' interface DowloadModalProps { diff --git a/src/components/Newsletter/DateSelector/DateSelector.tsx b/src/components/Newsletter/DateSelector/DateSelector.tsx index fd29f16e113c8f7172fc74ff7d0325a63cfb6d91..d872dd6434d19652d45844105e7ab5201c8dbd26 100644 --- a/src/components/Newsletter/DateSelector/DateSelector.tsx +++ b/src/components/Newsletter/DateSelector/DateSelector.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react' import leftChevron from '../../../assets/icons/left-chevron.svg' import rightChevron from '../../../assets/icons/right-chevron.svg' -import Modal from '../../Modal/Modal' +import Modal from '../Modal/Modal' import './dateSelector.scss' interface DateSelectorProps { diff --git a/src/components/ImagePicker/ImagePicker.tsx b/src/components/Newsletter/ImagePicker/ImagePicker.tsx similarity index 94% rename from src/components/ImagePicker/ImagePicker.tsx rename to src/components/Newsletter/ImagePicker/ImagePicker.tsx index 705b2dcd48869ec84a8a00d1e5322e03b73f68e0..2e7efab07c434c6420e006767ed27560f782295e 100644 --- a/src/components/ImagePicker/ImagePicker.tsx +++ b/src/components/Newsletter/ImagePicker/ImagePicker.tsx @@ -1,10 +1,10 @@ +import Pagination from '@material-ui/lab/Pagination' import React, { useContext, useEffect, useState } from 'react' -import { NewsletterService } from '../../services/newsletter.service' +import { getAxiosXSRFHeader } from '../../../axios.config' +import { UserContext, UserContextProps } from '../../../hooks/userContext' +import { NewsletterService } from '../../../services/newsletter.service' import Modal from '../Modal/Modal' -import Pagination from '@material-ui/lab/Pagination' import SingleImage from './SingleImage' -import { UserContext, UserContextProps } from '../../hooks/userContext' -import { getAxiosXSRFHeader } from '../../axios.config' interface ImagePickerProps { imageURL: string diff --git a/src/components/ImagePicker/SingleImage.tsx b/src/components/Newsletter/ImagePicker/SingleImage.tsx similarity index 100% rename from src/components/ImagePicker/SingleImage.tsx rename to src/components/Newsletter/ImagePicker/SingleImage.tsx diff --git a/src/components/ImagePicker/imagePicker.scss b/src/components/Newsletter/ImagePicker/imagePicker.scss similarity index 85% rename from src/components/ImagePicker/imagePicker.scss rename to src/components/Newsletter/ImagePicker/imagePicker.scss index 249a99175ee8f037e6ea5cc5732257f2394792fd..d831ef10abcede991f3b82fb6104ee87d8e43a91 100644 --- a/src/components/ImagePicker/imagePicker.scss +++ b/src/components/Newsletter/ImagePicker/imagePicker.scss @@ -1,5 +1,5 @@ -@import '../../styles/config/colors'; -@import '../../styles/config/breakpoints'; +@import '../../../styles/config/colors'; +@import '../../../styles/config/breakpoints'; .image-picker { display: flex; diff --git a/src/components/MailSuject/mailSubject.scss b/src/components/Newsletter/MailSuject/mailSubject.scss similarity index 100% rename from src/components/MailSuject/mailSubject.scss rename to src/components/Newsletter/MailSuject/mailSubject.scss diff --git a/src/components/MailSuject/mailSubject.tsx b/src/components/Newsletter/MailSuject/mailSubject.tsx similarity index 94% rename from src/components/MailSuject/mailSubject.tsx rename to src/components/Newsletter/MailSuject/mailSubject.tsx index fe322b3e797e6a6ffe995dc9e942843de8f10343..1b3374b251ec7d0e88ddad851c2e13cfc619f023 100644 --- a/src/components/MailSuject/mailSubject.tsx +++ b/src/components/Newsletter/MailSuject/mailSubject.tsx @@ -1,5 +1,5 @@ import React, { ChangeEvent } from 'react' -import { ContentItems } from '../Newsletter/Newsletter' +import { ContentItems } from '../Newsletter' import './mailSubject.scss' interface MailSubjectProps { @@ -18,7 +18,7 @@ const MailSubject: React.FC<MailSubjectProps> = ({ subject, handleChange, onDelete, -}: MailSubjectProps) => { +}) => { const handleChangeSubject = (e: ChangeEvent<HTMLInputElement>) => { handleChange(e.target.value, 'subject') } diff --git a/src/components/Modal/Modal.tsx b/src/components/Newsletter/Modal/Modal.tsx similarity index 100% rename from src/components/Modal/Modal.tsx rename to src/components/Newsletter/Modal/Modal.tsx diff --git a/src/components/Modal/modal.scss b/src/components/Newsletter/Modal/modal.scss similarity index 94% rename from src/components/Modal/modal.scss rename to src/components/Newsletter/Modal/modal.scss index 1f479756c148175eeae7a188bd25af2a36c4ca0f..ae25cc96eb55815b1d094116dc26bd758602b687 100644 --- a/src/components/Modal/modal.scss +++ b/src/components/Newsletter/Modal/modal.scss @@ -1,4 +1,4 @@ -@import '../../styles/config/colors'; +@import '../../../styles/config/colors'; .modal-bg { background-color: rgba(27, 28, 34, 0.85); diff --git a/src/components/MonthlyInfo/MonthlyInfo.tsx b/src/components/Newsletter/MonthlyInfo/MonthlyInfo.tsx similarity index 87% rename from src/components/MonthlyInfo/MonthlyInfo.tsx rename to src/components/Newsletter/MonthlyInfo/MonthlyInfo.tsx index efaf357126ba2f17aec2dfb6c7568761345bf688..18647cebc317f57ff573a4de833b17c7849b8038 100644 --- a/src/components/MonthlyInfo/MonthlyInfo.tsx +++ b/src/components/Newsletter/MonthlyInfo/MonthlyInfo.tsx @@ -1,9 +1,9 @@ import React from 'react' import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css' -import { convertStringToEditorState } from '../../utils/editorStateManagment' +import { convertStringToEditorState } from '../../../utils/editorStateManagment' +import CustomEditor from '../CustomEditor' import ImagePicker from '../ImagePicker/ImagePicker' -import CustomEditor from '../Newsletter/CustomEditor' -import { ContentItems } from '../Newsletter/Newsletter' +import { ContentItems } from '../Newsletter' import './monthlyInfo.scss' interface MonthlyInfoProps { onSave: () => Promise<void> @@ -30,7 +30,7 @@ const MonthlyInfo: React.FC<MonthlyInfoProps> = ({ handleChange, onDelete, imageURL, -}: MonthlyInfoProps) => { +}) => { return ( <div className="monthlyInfo"> <h2>Informations du mois (Optionnel)</h2> diff --git a/src/components/MonthlyInfo/monthlyInfo.scss b/src/components/Newsletter/MonthlyInfo/monthlyInfo.scss similarity index 100% rename from src/components/MonthlyInfo/monthlyInfo.scss rename to src/components/Newsletter/MonthlyInfo/monthlyInfo.scss diff --git a/src/components/MonthlyNews/MonthlyNews.tsx b/src/components/Newsletter/MonthlyNews/MonthlyNews.tsx similarity index 88% rename from src/components/MonthlyNews/MonthlyNews.tsx rename to src/components/Newsletter/MonthlyNews/MonthlyNews.tsx index ac2027209b3e12275e18532b814ebeb1200a87f2..0926e7a7b40c4784b9e9e805b35128407a81f1a3 100644 --- a/src/components/MonthlyNews/MonthlyNews.tsx +++ b/src/components/Newsletter/MonthlyNews/MonthlyNews.tsx @@ -1,8 +1,8 @@ import React, { ChangeEvent } from 'react' import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css' -import { convertStringToEditorState } from '../../utils/editorStateManagment' -import CustomEditor from '../Newsletter/CustomEditor' -import { ContentItems } from '../Newsletter/Newsletter' +import { convertStringToEditorState } from '../../../utils/editorStateManagment' +import CustomEditor from '../CustomEditor' +import { ContentItems } from '../Newsletter' import './monthlyNews.scss' interface MonthlyNewsProps { @@ -23,7 +23,7 @@ const MonthlyNews: React.FC<MonthlyNewsProps> = ({ content, handleChange, onDelete, -}: MonthlyNewsProps) => { +}) => { const handleChangeTitle = (e: ChangeEvent<HTMLInputElement>) => { handleChange(e.target.value, 'title') } diff --git a/src/components/MonthlyNews/monthlyNews.scss b/src/components/Newsletter/MonthlyNews/monthlyNews.scss similarity index 100% rename from src/components/MonthlyNews/monthlyNews.scss rename to src/components/Newsletter/MonthlyNews/monthlyNews.scss diff --git a/src/components/Newsletter/Newsletter.tsx b/src/components/Newsletter/Newsletter.tsx index 418da31bb3c920fe3f486da4dad3342e605c6bf0..36db58337e11101feaa12b26fe54cd4634ff9deb 100644 --- a/src/components/Newsletter/Newsletter.tsx +++ b/src/components/Newsletter/Newsletter.tsx @@ -13,12 +13,12 @@ import { IMonthlyNews } from '../../models/monthlyNews.model' import { IPoll } from '../../models/poll.model' import { NewsletterService } from '../../services/newsletter.service' import Loader from '../Loader/Loader' -import MailSubject from '../MailSuject/mailSubject' -import Modal from '../Modal/Modal' -import MonthlyInfo from '../MonthlyInfo/MonthlyInfo' -import MonthlyNews from '../MonthlyNews/MonthlyNews' -import Poll from '../Poll/Poll' import DateSelector from './DateSelector/DateSelector' +import MailSubject from './MailSuject/mailSubject' +import Modal from './Modal/Modal' +import MonthlyInfo from './MonthlyInfo/MonthlyInfo' +import MonthlyNews from './MonthlyNews/MonthlyNews' +import Poll from './Poll/Poll' import './newsletter.scss' export type ContentItems = diff --git a/src/components/Poll/Poll.tsx b/src/components/Newsletter/Poll/Poll.tsx similarity index 85% rename from src/components/Poll/Poll.tsx rename to src/components/Newsletter/Poll/Poll.tsx index 976da9116e5f2b22182fa5819423b007638fe219..2db7ebdcb43e2cb38203ded17888e195149e26a2 100644 --- a/src/components/Poll/Poll.tsx +++ b/src/components/Newsletter/Poll/Poll.tsx @@ -1,8 +1,8 @@ import React, { ChangeEvent } from 'react' import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css' -import { convertStringToEditorState } from '../../utils/editorStateManagment' -import CustomEditor from '../Newsletter/CustomEditor' -import { ContentItems } from '../Newsletter/Newsletter' +import { convertStringToEditorState } from '../../../utils/editorStateManagment' +import CustomEditor from '../CustomEditor' +import { ContentItems } from '../Newsletter' import './poll.scss' interface PollProps { diff --git a/src/components/Poll/poll.scss b/src/components/Newsletter/Poll/poll.scss similarity index 100% rename from src/components/Poll/poll.scss rename to src/components/Newsletter/Poll/poll.scss