From 3ec2944189c68aca6bf8dc67860e948d5c5ef106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Sat, 6 Jul 2024 16:41:34 +0200 Subject: [PATCH] refactor: Improve edit components --- components/konstitisyon/{ => edit}/article.js | 4 ++-- .../konstitisyon/{edit.js => edit/index.js} | 20 +++++++++++-------- components/konstitisyon/{ => edit}/titre.js | 10 +++++----- components/konstitisyon/index.js | 6 +++--- 4 files changed, 22 insertions(+), 18 deletions(-) rename components/konstitisyon/{ => edit}/article.js (86%) rename components/konstitisyon/{edit.js => edit/index.js} (71%) rename components/konstitisyon/{ => edit}/titre.js (62%) diff --git a/components/konstitisyon/article.js b/components/konstitisyon/edit/article.js similarity index 86% rename from components/konstitisyon/article.js rename to components/konstitisyon/edit/article.js index f2c6a97..7416cdb 100644 --- a/components/konstitisyon/article.js +++ b/components/konstitisyon/edit/article.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types' import Box from '@mui/material/Box' import Typography from '@mui/material/Typography' -import Edit from './edit.js' +import Edit from './index.js' export default function Article({session, articleId, numero, contenu}) { const formattedContent = contenu.replaceAll('\n', '
') @@ -11,7 +11,7 @@ export default function Article({session, articleId, numero, contenu}) { {!numero || numero === 0 ? 'Article ...' : `Article ${numero}`} {session && ( - + )} diff --git a/components/konstitisyon/edit.js b/components/konstitisyon/edit/index.js similarity index 71% rename from components/konstitisyon/edit.js rename to components/konstitisyon/edit/index.js index 7606e0c..2f7173d 100644 --- a/components/konstitisyon/edit.js +++ b/components/konstitisyon/edit/index.js @@ -19,12 +19,13 @@ const LightTooltip = styled(({className, ...props}) => ( }, })) -export default function Edit({titre, article, session}) { +export default function Edit({id, session, contenu, collection}) { const router = useRouter() const handleClick = () => { - console.log('titre', titre) - console.log('article', article) + console.log('🚀 ~ Edit ~ id:', id) + console.log('🚀 ~ Edit ~ contenu:', contenu) + console.log('🚀 ~ Edit ~ collection:', collection) if (!session) { router.push('/login') } @@ -32,11 +33,13 @@ export default function Edit({titre, article, session}) { return ( - {titre ? ( + {collection === 'titres' && ( - ) : ( + )} + + {collection === 'articles' && ( @@ -46,7 +49,8 @@ export default function Edit({titre, article, session}) { } Edit.propTypes = { - titre: PropTypes.string, - article: PropTypes.string, - session: PropTypes.object.isRequired + id: PropTypes.string.isRequired, + session: PropTypes.object.isRequired, + contenu: PropTypes.string.isRequired, + collection: PropTypes.oneOf(['titres', 'articles']).isRequired } diff --git a/components/konstitisyon/titre.js b/components/konstitisyon/edit/titre.js similarity index 62% rename from components/konstitisyon/titre.js rename to components/konstitisyon/edit/titre.js index 24f4c97..6eb0c73 100644 --- a/components/konstitisyon/titre.js +++ b/components/konstitisyon/edit/titre.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types' import Box from '@mui/material/Box' import Typography from '@mui/material/Typography' -import Edit from './edit.js' +import Edit from './index.js' -export default function Titre({session, titreId, titre}) { +export default function Titre({session, titreId, contenu}) { return ( - {titre} + {contenu} {session && ( - + )} ) @@ -17,5 +17,5 @@ export default function Titre({session, titreId, titre}) { Titre.propTypes = { session: PropTypes.object, titreId: PropTypes.string.isRequired, - titre: PropTypes.string.isRequired + contenu: PropTypes.string.isRequired } diff --git a/components/konstitisyon/index.js b/components/konstitisyon/index.js index 3c40f08..5f4fadf 100644 --- a/components/konstitisyon/index.js +++ b/components/konstitisyon/index.js @@ -9,8 +9,8 @@ import AddCommentIcon from '@mui/icons-material/AddComment' import CommentIcon from '@mui/icons-material/Comment' import Tooltip, {tooltipClasses} from '@mui/material/Tooltip' import AuthAlert from '../auth-form/auth-alert.js' -import Titre from './titre.js' -import Article from './article.js' +import Titre from './edit/titre.js' +import Article from './edit/article.js' import HandleCreate from './create/handle-create.js' import ListComments from './list-comments.js' import {formatKonstitisyon} from '@/lib/format.js' @@ -61,7 +61,7 @@ export default function Konstitisyon({session, titres, articles}) { {konstitisyon.map(({titreId, titre, articles}) => ( - + {articles.map(({id, numero, contenu}) => (
))}