Change awtis to artiste

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,
       >
         <Box display='flex' justifyContent='center' alignItems='center'>
           <DialogTitle id='scroll-dialog-title' align='center'>{alias}</DialogTitle>
-          <MizikBadjMeni teks={teks} />
+          <MizikBadjMeni paroles={paroles} />
         </Box>
         <DialogContent dividers>
           <DialogContentText
@@ -49,9 +49,9 @@ export default function AwtisBiyografi({alias, teks, biyografi, esByografiOuve,
             id='scroll-dialog-description'
             tabIndex={-1}
           >
-            {biyografi ? (
+            {biographie ? (
               <Typography component='span'>
-                {biyografi}
+                {biographie}
               </Typography>
             ) : (
               <Typography component='span'>
@@ -62,7 +62,7 @@ export default function AwtisBiyografi({alias, teks, biyografi, esByografiOuve,
         </DialogContent>
         <DialogActions style={{margin: 'auto'}}>
           <Button variant='outlined' color='primary' onClick={handleClose}>
-            Fèmen
+            Fermer
           </Button>
         </DialogActions>
       </Dialog>
@@ -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
 }

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}) {
       </Box>
       <Box sx={{justifyContent: 'center', display: 'flex', marginBottom: 2}}>
         <Avatar
-          src={`${API_URL}${foto[0].url}`}
+          src={`${photo?.data?.attributes?.url ? `${IMAGE_URL}${photo?.data?.attributes?.url}` : noImageUrl}`}
           alt={`Photo ${alias}`}
           sx={{width: 200, height: 200, border: `2px solid ${green[500]}`}}
         />
@@ -69,7 +70,7 @@ export default function AwtisDetay({anAwtis}) {
         )}
         <Grid item xs={12} md={6}>
           <Box marginBottom={3}>
-            {teks.length > 1 ? (
+            {paroles.data.length > 1 ? (
               <Accordion>
                 <AccordionSummary
                   expandIcon={<ExpandMoreIcon />}
@@ -77,7 +78,7 @@ export default function AwtisDetay({anAwtis}) {
                   id='panel-teks-header'
                 >
                   <Typography marginRight={2} textAlign='center' variant='body1' component='h2'><strong>Liste des textes</strong></Typography>
-                  <Chip color='primary' label={teks.length} size='small' variant='contained' />
+                  <Chip color='primary' label={paroles.data.length} size='small' variant='contained' />
                 </AccordionSummary>
                 <AccordionDetails>
                   <MizikLis teks={sortedTeks} />
@@ -87,7 +88,7 @@ export default function AwtisDetay({anAwtis}) {
               <>
                 <Typography gutterBottom textAlign='center' variant='body1' component='h2'><strong>Texte</strong></Typography>
                 <Paper>
-                  <MizikLis teks={teks} />
+                  <MizikLis paroles={paroles.data} />
                 </Paper>
               </>
             )}
@@ -102,8 +103,8 @@ export default function AwtisDetay({anAwtis}) {
       {esByografiOuve && (
         <AwtisBiyografi
           alias={alias}
-          teks={teks}
-          biyografi={biyografi}
+          paroles={paroles.data}
+          biographie={biographie}
           esByografiOuve={esByografiOuve}
           meteEsByografiOuve={meteEsByografiOuve}
         />

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}
             />
             <CardContent>
@@ -84,7 +86,7 @@ export default function AwtisKat({anAwtis}) {
                 {alias}
               </Typography>
               <Typography align='center' variant='body2' color='textSecondary' component='h5'>
-                {anAwtis.teks.length} tèks
+                {`${paroles.data.length} ${paroles.data.length > 1 ? 'textes' : 'texte'}`}
               </Typography>
             </CardContent>
           </CardActionArea>
@@ -104,15 +106,15 @@ export default function AwtisKat({anAwtis}) {
           </CardActions>
           <Collapse unmountOnExit in={expanded} timeout='auto'>
             <CardContent>
-              <MizikLis teks={teks} />
+              <MizikLis paroles={paroles.data} />
             </CardContent>
           </Collapse>
         </Card>
         {esByografiOuve && (
           <AwtisBiyografi
             alias={alias}
-            teks={teks}
-            biyografi={biyografi}
+            paroles={paroles.data}
+            biographie={biographie}
             esByografiOuve={esByografiOuve}
             meteEsByografiOuve={meteEsByografiOuve}
           />
@@ -123,5 +125,5 @@ export default function AwtisKat({anAwtis}) {
 }
 
 AwtisKat.propTypes = {
-  anAwtis: PropTypes.object.isRequired
+  artiste: PropTypes.object.isRequired
 }