From 46b2860c859fd771bda675ff36352f723e53850a Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 18 Apr 2023 15:28:35 +0200
Subject: [PATCH] update components
---
src/components/MailSuject/mailSubject.tsx | 2 +-
src/components/Modal/Modal.tsx | 2 +-
src/components/MonthlyInfo/MonthlyInfo.tsx | 8 +++----
src/components/MonthlyNews/MonthlyNews.tsx | 6 ++---
.../{Editing => Newsletter}/CustomEditor.tsx | 0
.../{Editing => Newsletter}/CustomLink.tsx | 0
.../DateSelector/DateSelector.tsx | 6 ++---
.../DateSelector/dateSelector.scss | 7 +++---
.../Editing.tsx => Newsletter/Newsletter.tsx} | 24 +++++++++----------
.../{Editing => Newsletter}/customEditor.scss | 0
.../newsletter.scss} | 0
src/components/Poll/Poll.tsx | 6 ++---
.../Settings.tsx => Popups/Popups.tsx} | 10 ++++----
.../settings.scss => Popups/popups.scss} | 2 +-
src/components/Routes/Router.tsx | 8 +++----
15 files changed, 41 insertions(+), 40 deletions(-)
rename src/components/{Editing => Newsletter}/CustomEditor.tsx (100%)
rename src/components/{Editing => Newsletter}/CustomLink.tsx (100%)
rename src/components/{ => Newsletter}/DateSelector/DateSelector.tsx (92%)
rename src/components/{ => Newsletter}/DateSelector/dateSelector.scss (86%)
rename src/components/{Editing/Editing.tsx => Newsletter/Newsletter.tsx} (98%)
rename src/components/{Editing => Newsletter}/customEditor.scss (100%)
rename src/components/{Editing/editing.scss => Newsletter/newsletter.scss} (100%)
rename src/components/{Settings/Settings.tsx => Popups/Popups.tsx} (99%)
rename src/components/{Settings/settings.scss => Popups/popups.scss} (99%)
diff --git a/src/components/MailSuject/mailSubject.tsx b/src/components/MailSuject/mailSubject.tsx
index b60ee97e..fe322b3e 100644
--- a/src/components/MailSuject/mailSubject.tsx
+++ b/src/components/MailSuject/mailSubject.tsx
@@ -1,5 +1,5 @@
import React, { ChangeEvent } from 'react'
-import { ContentItems } from '../Editing/Editing'
+import { ContentItems } from '../Newsletter/Newsletter'
import './mailSubject.scss'
interface MailSubjectProps {
diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx
index 7d7c146b..c8ca2b97 100644
--- a/src/components/Modal/Modal.tsx
+++ b/src/components/Modal/Modal.tsx
@@ -6,7 +6,7 @@ interface ModalProps {
classname?: string
}
-const Modal: React.FC<ModalProps> = ({ children, classname }: ModalProps) => {
+const Modal: React.FC<ModalProps> = ({ children, classname }) => {
return createPortal(
<div className="modal-bg">
<div className="modal-container">
diff --git a/src/components/MonthlyInfo/MonthlyInfo.tsx b/src/components/MonthlyInfo/MonthlyInfo.tsx
index c28c461f..efaf3571 100644
--- a/src/components/MonthlyInfo/MonthlyInfo.tsx
+++ b/src/components/MonthlyInfo/MonthlyInfo.tsx
@@ -1,10 +1,10 @@
import React from 'react'
-import { ContentItems } from '../Editing/Editing'
-import { convertStringToEditorState } from '../../utils/editorStateManagment'
-import CustomEditor from '../Editing/CustomEditor'
import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'
-import './monthlyInfo.scss'
+import { convertStringToEditorState } from '../../utils/editorStateManagment'
import ImagePicker from '../ImagePicker/ImagePicker'
+import CustomEditor from '../Newsletter/CustomEditor'
+import { ContentItems } from '../Newsletter/Newsletter'
+import './monthlyInfo.scss'
interface MonthlyInfoProps {
onSave: () => Promise<void>
onCancel: () => void
diff --git a/src/components/MonthlyNews/MonthlyNews.tsx b/src/components/MonthlyNews/MonthlyNews.tsx
index 7699c523..ac202720 100644
--- a/src/components/MonthlyNews/MonthlyNews.tsx
+++ b/src/components/MonthlyNews/MonthlyNews.tsx
@@ -1,8 +1,8 @@
import React, { ChangeEvent } from 'react'
-import { ContentItems } from '../Editing/Editing'
-import { convertStringToEditorState } from '../../utils/editorStateManagment'
-import CustomEditor from '../Editing/CustomEditor'
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 './monthlyNews.scss'
interface MonthlyNewsProps {
diff --git a/src/components/Editing/CustomEditor.tsx b/src/components/Newsletter/CustomEditor.tsx
similarity index 100%
rename from src/components/Editing/CustomEditor.tsx
rename to src/components/Newsletter/CustomEditor.tsx
diff --git a/src/components/Editing/CustomLink.tsx b/src/components/Newsletter/CustomLink.tsx
similarity index 100%
rename from src/components/Editing/CustomLink.tsx
rename to src/components/Newsletter/CustomLink.tsx
diff --git a/src/components/DateSelector/DateSelector.tsx b/src/components/Newsletter/DateSelector/DateSelector.tsx
similarity index 92%
rename from src/components/DateSelector/DateSelector.tsx
rename to src/components/Newsletter/DateSelector/DateSelector.tsx
index 0b501077..fd29f16e 100644
--- a/src/components/DateSelector/DateSelector.tsx
+++ b/src/components/Newsletter/DateSelector/DateSelector.tsx
@@ -1,8 +1,8 @@
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 './dateSelector.scss'
-import leftChevron from '../../assets/icons/left-chevron.svg'
-import rightChevron from '../../assets/icons/right-chevron.svg'
-import Modal from '../Modal/Modal'
interface DateSelectorProps {
date: Date
diff --git a/src/components/DateSelector/dateSelector.scss b/src/components/Newsletter/DateSelector/dateSelector.scss
similarity index 86%
rename from src/components/DateSelector/dateSelector.scss
rename to src/components/Newsletter/DateSelector/dateSelector.scss
index 5d079413..cb2a92c0 100644
--- a/src/components/DateSelector/dateSelector.scss
+++ b/src/components/Newsletter/DateSelector/dateSelector.scss
@@ -1,6 +1,7 @@
-@import '../../styles/config/colors';
-@import '../../styles/config/typography';
-@import '../../styles/config/breakpoints';
+@import 'src/styles/config/colors';
+@import 'src/styles/config/typography';
+@import 'src/styles/config/breakpoints';
+
.date-selector {
display: flex;
align-items: center;
diff --git a/src/components/Editing/Editing.tsx b/src/components/Newsletter/Newsletter.tsx
similarity index 98%
rename from src/components/Editing/Editing.tsx
rename to src/components/Newsletter/Newsletter.tsx
index 12e95379..418da31b 100644
--- a/src/components/Editing/Editing.tsx
+++ b/src/components/Newsletter/Newsletter.tsx
@@ -5,21 +5,21 @@ import React, {
useMemo,
useState,
} from 'react'
-import DateSelector from '../DateSelector/DateSelector'
-import { NewsletterService } from '../../services/newsletter.service'
+import { getAxiosXSRFHeader } from '../../axios.config'
import { UserContext, UserContextProps } from '../../hooks/userContext'
-import { IMonthlyNews } from '../../models/monthlyNews.model'
+import { IMailSubject } from '../../models/mailSubject.model'
import { IMonthlyInfo } from '../../models/monthlyInfo.model'
+import { IMonthlyNews } from '../../models/monthlyNews.model'
import { IPoll } from '../../models/poll.model'
-import { IMailSubject } from '../../models/mailSubject.model'
+import { NewsletterService } from '../../services/newsletter.service'
+import Loader from '../Loader/Loader'
import MailSubject from '../MailSuject/mailSubject'
-import Poll from '../Poll/Poll'
+import Modal from '../Modal/Modal'
import MonthlyInfo from '../MonthlyInfo/MonthlyInfo'
import MonthlyNews from '../MonthlyNews/MonthlyNews'
-import Loader from '../Loader/Loader'
-import Modal from '../Modal/Modal'
-import './editing.scss'
-import { getAxiosXSRFHeader } from '../../axios.config'
+import Poll from '../Poll/Poll'
+import DateSelector from './DateSelector/DateSelector'
+import './newsletter.scss'
export type ContentItems =
| 'monthlyInfo'
@@ -28,8 +28,8 @@ export type ContentItems =
| 'subject'
| ''
-const Editing: React.FC = () => {
- // Fonctional rule :
+const Newsletter: React.FC = () => {
+ // Functional rule :
// Display next month after the 3rd of the current month
const getCurrentNewsletterDate = (): Date => {
const newsletterDate = new Date()
@@ -354,4 +354,4 @@ const Editing: React.FC = () => {
)
}
-export default Editing
+export default Newsletter
diff --git a/src/components/Editing/customEditor.scss b/src/components/Newsletter/customEditor.scss
similarity index 100%
rename from src/components/Editing/customEditor.scss
rename to src/components/Newsletter/customEditor.scss
diff --git a/src/components/Editing/editing.scss b/src/components/Newsletter/newsletter.scss
similarity index 100%
rename from src/components/Editing/editing.scss
rename to src/components/Newsletter/newsletter.scss
diff --git a/src/components/Poll/Poll.tsx b/src/components/Poll/Poll.tsx
index d8df0bf0..976da911 100644
--- a/src/components/Poll/Poll.tsx
+++ b/src/components/Poll/Poll.tsx
@@ -1,8 +1,8 @@
import React, { ChangeEvent } from 'react'
-import { ContentItems } from '../Editing/Editing'
-import CustomEditor from '../Editing/CustomEditor'
-import { convertStringToEditorState } from '../../utils/editorStateManagment'
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 './poll.scss'
interface PollProps {
diff --git a/src/components/Settings/Settings.tsx b/src/components/Popups/Popups.tsx
similarity index 99%
rename from src/components/Settings/Settings.tsx
rename to src/components/Popups/Popups.tsx
index 91101a3f..24628c28 100644
--- a/src/components/Settings/Settings.tsx
+++ b/src/components/Popups/Popups.tsx
@@ -6,15 +6,15 @@ import { CheckboxType } from '../../enum/checkboxType.enum'
import { UserContext, UserContextProps } from '../../hooks/userContext'
import { ICustomPopup, PopupDuration } from '../../models/cutomPopup.model'
import {
+ Option,
durationEnum,
durationType,
- Option,
} from '../../models/durationOptios.model'
import { IPartnersInfo } from '../../models/partnersInfo.model'
import { CustomPopupService } from '../../services/customPopup.service'
import { PartnersInfoService } from '../../services/partnersInfo.service'
import Loader from '../Loader/Loader'
-import './settings.scss'
+import './popups.scss'
const OPTIONS: Array<Option> = [
{
@@ -31,7 +31,7 @@ const OPTIONS: Array<Option> = [
},
]
-const Settings: React.FC = () => {
+const Popups: React.FC = () => {
const [refreshData, setRefreshData] = useState(false)
const [isLoading, setIsLoading] = useState(false)
const [partnersInfo, setPartnersInfo] = useState<IPartnersInfo>({
@@ -231,7 +231,7 @@ const Settings: React.FC = () => {
<p className="title pagetitle">Paramètres de l'appli</p>
</div>
- <div className="content settings">
+ <div className="content popups">
{isLoading && <Loader />}
{!isLoading && (
<>
@@ -403,4 +403,4 @@ const Settings: React.FC = () => {
)
}
-export default Settings
+export default Popups
diff --git a/src/components/Settings/settings.scss b/src/components/Popups/popups.scss
similarity index 99%
rename from src/components/Settings/settings.scss
rename to src/components/Popups/popups.scss
index 9510c527..2c2400fb 100644
--- a/src/components/Settings/settings.scss
+++ b/src/components/Popups/popups.scss
@@ -1,6 +1,6 @@
@import '../../styles/config/colors';
-.settings {
+.popupsÃ’ {
.disabled {
opacity: 0.5;
}
diff --git a/src/components/Routes/Router.tsx b/src/components/Routes/Router.tsx
index cbf8b0f6..0155cdde 100644
--- a/src/components/Routes/Router.tsx
+++ b/src/components/Routes/Router.tsx
@@ -2,10 +2,10 @@ import React, { useContext } from 'react'
import { Redirect, Route, Switch } from 'react-router-dom'
import { UserContext } from '../../hooks/userContext'
import Consents from '../Consents/Consents'
-import Editing from '../Editing/Editing'
import Login from '../Login/Login'
+import Newsletter from '../Newsletter/Newsletter'
+import Popups from '../Popups/Popups'
import Prices from '../Prices/Prices'
-import Settings from '../Settings/Settings'
const links: { [key: string]: { label: string; path: string } } = {
newsletter: {
@@ -38,9 +38,9 @@ const Router: React.FC = () => {
<Switch>
{user ? (
<>
- <Route exact path={links.newsletter.path} component={Editing} />
+ <Route exact path={links.newsletter.path} component={Newsletter} />
<Route exact path={links.prices.path} component={Prices} />
- <Route exact path={links.popups.path} component={Settings} />
+ <Route exact path={links.popups.path} component={Popups} />
<Route exact path={links.consents.path} component={Consents} />
<Redirect path="*" to={links.newsletter.path} />
</>
--
GitLab