From a1a9a8a5af8d871f9cb56b48f69fe9714f65f61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Fri, 18 Dec 2020 22:13:52 +0100 Subject: [PATCH] Adapt all Awtis components to new api --- components/awtis/awtis-biyografi.js | 18 ++++++++--------- components/awtis/awtis-kat.js | 21 ++++++++++---------- components/awtis/mizik-badj-meni.js | 8 ++++---- components/awtis/mizik-lis.js | 30 ++++++++++++++--------------- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/components/awtis/awtis-biyografi.js b/components/awtis/awtis-biyografi.js index eaac8e2..870a90a 100644 --- a/components/awtis/awtis-biyografi.js +++ b/components/awtis/awtis-biyografi.js @@ -14,33 +14,33 @@ import { import MizikBadjMeni from './mizik-badj-meni' -export default function AwtisBiyografi({alias, miziks, biyografi, isBioOpen, setIsBioOpen}) { +export default function AwtisBiyografi({alias, teks, biyografi, esByografiOuve, meteEsByografiOuve}) { const handleClose = () => { - setIsBioOpen(false) + meteEsByografiOuve(false) } const descriptionElementRef = React.useRef(null) React.useEffect(() => { - if (isBioOpen) { + if (esByografiOuve) { const {current: descriptionElement} = descriptionElementRef if (descriptionElement !== null) { descriptionElement.focus() } } - }, [isBioOpen]) + }, [esByografiOuve]) return (
{alias} - + ({ })) export default function AwtisKat({anAwtis}) { - const [isBioOpen, setIsBioOpen] = useState(false) + const [esByografiOuve, meteEsByografiOuve] = useState(false) + const noImageUrl = 'https://place-hold.it/140x140?text=Pa%20ni%20imaj' - const {alias, biyografi, miziks, foto} = anAwtis + const {alias, biyografi, teks, foto} = anAwtis const classes = useStyles() const [expanded, setExpanded] = useState(false) @@ -52,7 +53,7 @@ export default function AwtisKat({anAwtis}) { } const handleClick = () => { - setIsBioOpen(true) + meteEsByografiOuve(true) } return ( @@ -64,7 +65,7 @@ export default function AwtisKat({anAwtis}) { className={classes.media} component='img' alt={alias} - image={`${foto.length > 0 ? `${process.env.NEXT_PUBLIC_API_URL}${foto[0].url}` : null}`} + image={`${foto.length > 0 ? `${process.env.NEXT_PUBLIC_API_URL}${foto[0].url}` : noImageUrl}`} title={alias} /> @@ -72,7 +73,7 @@ export default function AwtisKat({anAwtis}) { {alias} - {anAwtis.miziks.length} tèks + {anAwtis.teks.length} tèks @@ -91,18 +92,18 @@ export default function AwtisKat({anAwtis}) { - + - {isBioOpen && ( + {esByografiOuve && ( )} diff --git a/components/awtis/mizik-badj-meni.js b/components/awtis/mizik-badj-meni.js index 5b82f9f..ca4bbd1 100644 --- a/components/awtis/mizik-badj-meni.js +++ b/components/awtis/mizik-badj-meni.js @@ -25,7 +25,7 @@ const useStyles = makeStyles(theme => ({ } })) -export default function MizikBadjMeni({miziks}) { +export default function MizikBadjMeni({teks}) { const classes = useStyles() const [open, setOpen] = useState(false) const anchorRef = useRef(null) @@ -76,7 +76,7 @@ export default function MizikBadjMeni({miziks}) { vertical: 'top', horizontal: 'right' }} - badgeContent={miziks.length} + badgeContent={teks.length} color='primary' > @@ -91,7 +91,7 @@ export default function MizikBadjMeni({miziks}) { - {miziks.map(m => handleClick(m.slug)}>{m.titre})} + {teks.map(t => handleClick(t.slug)}>{t.tit})} @@ -103,5 +103,5 @@ export default function MizikBadjMeni({miziks}) { } MizikBadjMeni.propTypes = { - miziks: PropTypes.array.isRequired + teks: PropTypes.array.isRequired } diff --git a/components/awtis/mizik-lis.js b/components/awtis/mizik-lis.js index 3a8574f..dd50aa8 100644 --- a/components/awtis/mizik-lis.js +++ b/components/awtis/mizik-lis.js @@ -12,17 +12,17 @@ const useStyles = makeStyles(theme => ({ } })) -export default function MizikLis({setMobileOpen, hasAwtis, miziks, selectedMizikSlug, setSelectedMizikSlug}) { +export default function MizikLis({setMobileOpen, niAwtis, teks, slugTeksChwazi, meteSlugTeksChwazi}) { const classes = useStyles() const router = useRouter() const handleClick = slug => { - if (setSelectedMizikSlug) { - setSelectedMizikSlug(slug) + if (meteSlugTeksChwazi) { + meteSlugTeksChwazi(slug) } - if (slug !== selectedMizikSlug) { - if (hasAwtis) { + if (slug !== slugTeksChwazi) { + if (niAwtis) { router.push(`/teks/${slug}`).then(() => window.scrollTo(0, 0)) } else { router.push(`/teks/${slug}#${slug}`).then(() => window.scrollTo(0, 0)) @@ -36,15 +36,15 @@ export default function MizikLis({setMobileOpen, hasAwtis, miziks, selectedMizik return ( - {miziks.map(({slug, titre, awtis}) => ( + {teks.map(({slug, tit, awtis}) => ( handleClick(slug)} > - a.alias).join() : null} /> + a.alias).join() : null} /> ))} @@ -53,15 +53,15 @@ export default function MizikLis({setMobileOpen, hasAwtis, miziks, selectedMizik MizikLis.propTypes = { setMobileOpen: PropTypes.func, - hasAwtis: PropTypes.bool, - miziks: PropTypes.array.isRequired, - selectedMizikSlug: PropTypes.string, - setSelectedMizikSlug: PropTypes.func + niAwtis: PropTypes.bool, + teks: PropTypes.array.isRequired, + slugTeksChwazi: PropTypes.string, + meteSlugTeksChwazi: PropTypes.func } MizikLis.defaultProps = { setMobileOpen: null, - hasAwtis: false, - selectedMizikSlug: null, - setSelectedMizikSlug: null + niAwtis: false, + slugTeksChwazi: null, + meteSlugTeksChwazi: null }