From 579adeffe433e2e7f1e2a92a14343770390c5843 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 18 Apr 2023 15:39:27 +0200
Subject: [PATCH] move components
---
src/components/Consents/DowloadModal.tsx | 2 +-
.../Newsletter/DateSelector/DateSelector.tsx | 2 +-
.../{ => Newsletter}/ImagePicker/ImagePicker.tsx | 8 ++++----
.../{ => Newsletter}/ImagePicker/SingleImage.tsx | 0
.../{ => Newsletter}/ImagePicker/imagePicker.scss | 4 ++--
.../{ => Newsletter}/MailSuject/mailSubject.scss | 0
.../{ => Newsletter}/MailSuject/mailSubject.tsx | 4 ++--
src/components/{ => Newsletter}/Modal/Modal.tsx | 0
src/components/{ => Newsletter}/Modal/modal.scss | 2 +-
.../{ => Newsletter}/MonthlyInfo/MonthlyInfo.tsx | 8 ++++----
.../{ => Newsletter}/MonthlyInfo/monthlyInfo.scss | 0
.../{ => Newsletter}/MonthlyNews/MonthlyNews.tsx | 8 ++++----
.../{ => Newsletter}/MonthlyNews/monthlyNews.scss | 0
src/components/Newsletter/Newsletter.tsx | 10 +++++-----
src/components/{ => Newsletter}/Poll/Poll.tsx | 6 +++---
src/components/{ => Newsletter}/Poll/poll.scss | 0
16 files changed, 27 insertions(+), 27 deletions(-)
rename src/components/{ => Newsletter}/ImagePicker/ImagePicker.tsx (94%)
rename src/components/{ => Newsletter}/ImagePicker/SingleImage.tsx (100%)
rename src/components/{ => Newsletter}/ImagePicker/imagePicker.scss (85%)
rename src/components/{ => Newsletter}/MailSuject/mailSubject.scss (100%)
rename src/components/{ => Newsletter}/MailSuject/mailSubject.tsx (94%)
rename src/components/{ => Newsletter}/Modal/Modal.tsx (100%)
rename src/components/{ => Newsletter}/Modal/modal.scss (94%)
rename src/components/{ => Newsletter}/MonthlyInfo/MonthlyInfo.tsx (87%)
rename src/components/{ => Newsletter}/MonthlyInfo/monthlyInfo.scss (100%)
rename src/components/{ => Newsletter}/MonthlyNews/MonthlyNews.tsx (88%)
rename src/components/{ => Newsletter}/MonthlyNews/monthlyNews.scss (100%)
rename src/components/{ => Newsletter}/Poll/Poll.tsx (85%)
rename src/components/{ => Newsletter}/Poll/poll.scss (100%)
diff --git a/src/components/Consents/DowloadModal.tsx b/src/components/Consents/DowloadModal.tsx
index 47307482..e5774f8d 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 fd29f16e..d872dd64 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 705b2dcd..2e7efab0 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 249a9917..d831ef10 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 fe322b3e..1b3374b2 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 1f479756..ae25cc96 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 efaf3571..18647ceb 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 ac202720..0926e7a7 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 418da31b..36db5833 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 976da911..2db7ebdc 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
--
GitLab