From 47bc07c5d81adf57d82479af9f23fe8077f49b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Fri, 20 May 2022 02:18:16 +0400 Subject: [PATCH] Change awtis to artiste --- components/awtis/awtis-biyografi.js | 16 +++--- components/awtis/awtis-detay.js | 25 ++++----- components/awtis/awtis-kat.js | 20 +++---- components/soumet/chwa-teks.js | 13 ++--- pages/awtis/[slug].js | 67 ++++++++++++++++-------- pages/awtis/index.js | 81 +++++++++++++++++++++-------- 6 files changed, 143 insertions(+), 79 deletions(-) diff --git a/components/awtis/awtis-biyografi.js b/components/awtis/awtis-biyografi.js index 64ec97c..42d7017 100644 --- a/components/awtis/awtis-biyografi.js +++ b/components/awtis/awtis-biyografi.js @@ -14,7 +14,7 @@ import { import MizikBadjMeni from './mizik-badj-meni' -export default function AwtisBiyografi({alias, teks, biyografi, esByografiOuve, meteEsByografiOuve}) { +export default function AwtisBiyografi({alias, paroles, biographie, esByografiOuve, meteEsByografiOuve}) { const handleClose = () => { meteEsByografiOuve(false) } @@ -40,7 +40,7 @@ export default function AwtisBiyografi({alias, teks, biyografi, esByografiOuve, > {alias} - + - {biyografi ? ( + {biographie ? ( - {biyografi} + {biographie} ) : ( @@ -62,7 +62,7 @@ export default function AwtisBiyografi({alias, teks, biyografi, esByografiOuve, @@ -72,12 +72,12 @@ export default function AwtisBiyografi({alias, teks, biyografi, esByografiOuve, AwtisBiyografi.propTypes = { alias: PropTypes.string.isRequired, - teks: PropTypes.array.isRequired, - biyografi: PropTypes.string, + paroles: PropTypes.array.isRequired, + biographie: PropTypes.string, esByografiOuve: PropTypes.bool.isRequired, meteEsByografiOuve: PropTypes.func.isRequired } AwtisBiyografi.defaultProps = { - biyografi: null + biographie: null } diff --git a/components/awtis/awtis-detay.js b/components/awtis/awtis-detay.js index 205d225..d7af5ad 100644 --- a/components/awtis/awtis-detay.js +++ b/components/awtis/awtis-detay.js @@ -13,18 +13,19 @@ import KeyboardBackspaceIcon from '@mui/icons-material/KeyboardBackspace' import AwtisBiyografi from './awtis-biyografi' import MizikLis from './mizik-lis' -const API_URL = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:1337' +const IMAGE_URL = process.env.NEXT_PUBLIC_API_URL_ROOT || 'http://localhost:1337' +const noImageUrl = 'https://place-hold.it/140x140?text=Indisponible' -const sortTeks = teks => teks.sort((a, b) => b.id - a.id) +const sortTeks = paroles => paroles.sort((a, b) => b.id - a.id) export default function AwtisDetay({anAwtis}) { const router = useRouter() const [esByografiOuve, meteEsByografiOuve] = useState(false) - const {alias, biyografi, teks, foto} = anAwtis - const sortedTeks = sortTeks(teks) - const gwanBiyo = anAwtis.biyografi.length > 100 + const {alias, biographie, paroles, photo} = anAwtis + const sortedTeks = sortTeks(paroles.data) + const gwanBiyo = biographie && biographie.length > 100 - const biyo = gwanBiyo ? `${anAwtis.biyografi.slice(0, 100)}...` : anAwtis.biyografi + const biyo = gwanBiyo ? `${biographie.slice(0, 100)}...` : biographie const handleClick = () => { meteEsByografiOuve(true) @@ -45,7 +46,7 @@ export default function AwtisDetay({anAwtis}) { @@ -69,7 +70,7 @@ export default function AwtisDetay({anAwtis}) { )} - {teks.length > 1 ? ( + {paroles.data.length > 1 ? ( } @@ -77,7 +78,7 @@ export default function AwtisDetay({anAwtis}) { id='panel-teks-header' > Liste des textes - + @@ -87,7 +88,7 @@ export default function AwtisDetay({anAwtis}) { <> Texte - + )} @@ -102,8 +103,8 @@ export default function AwtisDetay({anAwtis}) { {esByografiOuve && ( diff --git a/components/awtis/awtis-kat.js b/components/awtis/awtis-kat.js index ac20f10..a4674ab 100644 --- a/components/awtis/awtis-kat.js +++ b/components/awtis/awtis-kat.js @@ -23,6 +23,7 @@ import AwtisBiyografi from './awtis-biyografi' const PREFIX = 'awtis-kat' const SITE_URL = process.env.NEXT_PUBLIC_SITE_URL || 'http://localhost:3001' +const IMAGE_URL = process.env.NEXT_PUBLIC_API_URL_ROOT || 'http://localhost:1337' const classes = { root: `${PREFIX}-root`, @@ -54,12 +55,13 @@ const Kat = styled('div')(( } })) -export default function AwtisKat({anAwtis}) { +const noImageUrl = 'https://place-hold.it/140x140?text=Indisponible' + +export default function AwtisKat({artiste}) { const router = useRouter() const [esByografiOuve, meteEsByografiOuve] = useState(false) - const noImageUrl = 'https://place-hold.it/140x140?text=Pa%20ni%20imaj' - const {alias, biyografi, teks, foto, slug} = anAwtis + const {alias, biographie, paroles, photo, slug} = artiste const [expanded, setExpanded] = useState(false) @@ -76,7 +78,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}` : noImageUrl}`} + image={`${photo?.data?.attributes?.url ? `${IMAGE_URL}${photo?.data?.attributes?.url}` : noImageUrl}`} title={alias} /> @@ -84,7 +86,7 @@ export default function AwtisKat({anAwtis}) { {alias} - {anAwtis.teks.length} tèks + {`${paroles.data.length} ${paroles.data.length > 1 ? 'textes' : 'texte'}`} @@ -104,15 +106,15 @@ export default function AwtisKat({anAwtis}) { - + {esByografiOuve && ( @@ -123,5 +125,5 @@ export default function AwtisKat({anAwtis}) { } AwtisKat.propTypes = { - anAwtis: PropTypes.object.isRequired + artiste: PropTypes.object.isRequired } diff --git a/components/soumet/chwa-teks.js b/components/soumet/chwa-teks.js index 324c0a2..d5eaee7 100644 --- a/components/soumet/chwa-teks.js +++ b/components/soumet/chwa-teks.js @@ -15,7 +15,7 @@ import CircularProgress from '@mui/material/CircularProgress' import Typography from '@mui/material/Typography' import AudiotrackIcon from '@mui/icons-material/Audiotrack' -import {jwennTeksEpiUserId} from '../../lib/oki-api' +import {jwennUserEpiToken} from '../../lib/oki-api' function Chwa(props) { const {onClose, teksLis, selectedTeks, loading, open} = props @@ -37,14 +37,14 @@ function Chwa(props) { ) : ( - {teksLis.length > 0 ? teksLis.map(({id, tit, awtis}) => ( + {teksLis.length > 0 ? teksLis.map(({id, titre, artistes}) => ( handleListItemClick(id)}> - alias))} - ${tit}`} /> + alias))} - ${titre}`} /> )) : ( Aucun texte @@ -70,7 +70,6 @@ Chwa.propTypes = { export default function ChwaTeks({selectedTeks, setSelectedTeks}) { const {data: session} = useSession() const [loading, setLoading] = useState(false) - const {user} = session const [open, setOpen] = useState(false) const [teksLis, setTeksLis] = useState([]) @@ -78,9 +77,11 @@ export default function ChwaTeks({selectedTeks, setSelectedTeks}) { setOpen(true) setLoading(true) - const jwennTeks = await jwennTeksEpiUserId(user.id) + const user = await jwennUserEpiToken(session?.jwt) + const {paroles} = user + const parolesList = paroles && paroles.length > 0 ? paroles : [] - setTeksLis(jwennTeks) + setTeksLis(parolesList) setLoading(false) } diff --git a/pages/awtis/[slug].js b/pages/awtis/[slug].js index 8b44848..7a80d63 100644 --- a/pages/awtis/[slug].js +++ b/pages/awtis/[slug].js @@ -7,34 +7,38 @@ import HeadLayout from '../../components/head-layout' import {jwennAwtisEpiSlug} from '../../lib/oki-api' import Custom404 from '../404' +import Custom500 from '../500' -export default function SlugAwtis({error, anAwtis}) { - if (error) { - return +export default function SlugAwtis({errorCode, error404, errorMessage, anAwtis}) { + if (error404) { + return } - const {foto} = anAwtis + if (errorCode) { + console.log('⚠️ error', errorMessage) + return + } + + const {photo} = anAwtis const formatKouveti = () => { - if (foto.length === 0) { + if (!photo) { return null } - const [anFoto] = foto - - if (anFoto && anFoto.formats && anFoto.formats.large) { - return anFoto.formats.large + if (photo && photo.formats && photo.formats.large) { + return photo.formats.large } - if (anFoto && anFoto.formats && anFoto.formats.medium) { - return anFoto.formats.medium + if (photo && photo.formats && photo.formats.medium) { + return photo.formats.medium } - if (anFoto && anFoto.formats && anFoto.formats.small) { - return anFoto.formats.small + if (photo && photo.formats && photo.formats.small) { + return photo.formats.small } - return anFoto + return photo } return ( @@ -43,10 +47,10 @@ export default function SlugAwtis({error, anAwtis}) { imageWidth={formatKouveti() ? formatKouveti().width : null} imageHeight={formatKouveti() ? formatKouveti().height : null} imageMime={formatKouveti() ? formatKouveti().mime : null} - title={`${anAwtis.alias} - Paroles et Traductions`} tab={2} slug={`awtis/${anAwtis.slug}`} + title={`${anAwtis.attributes.alias} - Paroles et Traductions`} tab={2} slug={`awtis/${anAwtis.attributes.slug}`} > - +