Fix explicit lyrics display & move submit username

components/awtis/mizik-lis.js

@@ -60,7 +60,7 @@ export default function MizikLis({meteEsMobilOuve, niAwtis, paroles, slugTeksChw
           onClick={() => handleClick(attributes.slug)}
         >
           <ListItemText primary={attributes.titre} secondary={niAwtis ? getAlias(attributes.artistes, attributes.prioriteArtistes) : null} />
-          {attributes.explicite && (
+          {attributes.explicitLyrics && (
             <ExplicitIcon style={{marginRight: 5}} color='secondary' />
           )}
           {attributes.okiMizikID && (

components/teks/teks-kat.js

@@ -8,7 +8,8 @@ import {
   CardContent,
   CardMedia,
   Typography,
-  Grid
+  Grid,
+  Box
 } from '@mui/material'
 import ExplicitIcon from '@mui/icons-material/Explicit'
 import {styled} from '@mui/material/styles'
@@ -59,30 +60,32 @@ export default function TeksKat({parole}) {
             title={titre}
           />
           <CardContent>
+            <Box sx={{display: 'flex', alignItems: 'center'}}>
               <Typography display='inline' style={{marginRight: 5}} variant='h6' component='h2'>
                 {titre}
               </Typography>
-            {parole.eksplisit && (
+              {attributes.explicitLyrics && (
                 <ExplicitIcon style={{marginRight: 5}} color='secondary' fontSize='small' />
               )}
-            <Typography variant='caption'>
+            </Box>
-              {parole.user && (
-                <>
-                  (<i>parole soumise par {parole.user.username}</i>)
-                </>
-              )}
-              {parole.userAdmin && !parole.user && (
-                <>
-                  (<i>parole soumise par {parole.userAdmin}</i>)
-                </>
-              )}
-            </Typography>
             <Typography variant='body2' color='textSecondary' component='p'>
               {aliases}
             </Typography>
             <Typography variant='body2' color='textSecondary' component='p'>
               {annee}
             </Typography>
+            <Typography sx={{fontStyle: 'italic'}} variant='caption'>
+              {attributes.user && (
+                <>
+                  (<i>parole soumise par {attributes.user.username}</i>)
+                </>
+              )}
+              {attributes.userAdmin && !attributes.user && (
+                <>
+                  (<i>parole soumise par {attributes.userAdmin}</i>)
+                </>
+              )}
+            </Typography>
             <Typography align='center' style={{marginTop: '0.5em'}} variant='body1' color='textSecondary' component='p'>
               Publiée le : {datPiblikasyon}
             </Typography>