diff --git a/components/teks/denye-teks.js b/components/teks/denye-teks.js
index d993bab..9bb81fe 100644
--- a/components/teks/denye-teks.js
+++ b/components/teks/denye-teks.js
@@ -8,9 +8,9 @@ const useStyles = makeStyles(() => ({
}
}))
-export default function DenyeTeks(miziks) {
+export default function DenyeTeks(teks) {
const classes = useStyles()
- const sortedMiziksByPublishedAt = Object.values(miziks).sort((a, b) => {
+ const teksKlasePaPibilikasyon = Object.values(teks).sort((a, b) => {
const aDate = new Date(a.published_at)
const bDate = new Date(b.published_at)
return bDate.getTime() - aDate.getTime()
@@ -20,7 +20,7 @@ export default function DenyeTeks(miziks) {
- {sortedMiziksByPublishedAt.map(m => )}
+ {teksKlasePaPibilikasyon.map(t => )}
diff --git a/components/teks/drawer-bar.js b/components/teks/drawer-bar.js
index 842fbc4..2133ee8 100644
--- a/components/teks/drawer-bar.js
+++ b/components/teks/drawer-bar.js
@@ -27,13 +27,13 @@ const useStyles = makeStyles(theme => ({
}
}))
-const getMizikFiltered = (miziks, filter) => {
- if (miziks) {
- const filteredTitre = miziks.filter(({titre}) => {
- return titre.toLowerCase().includes(filter.toLowerCase())
+const getMizikFiltered = (teks, filter) => {
+ if (teks) {
+ const filteredTitre = teks.filter(({tit}) => {
+ return tit.toLowerCase().includes(filter.toLowerCase())
})
- const filteredAlias = miziks.filter(({awtis}) => {
+ const filteredAlias = teks.filter(({awtis}) => {
const aliasLis = awtis.map(({alias}) => alias).join()
return aliasLis.toLowerCase().includes(filter.toLowerCase())
})
@@ -42,14 +42,14 @@ const getMizikFiltered = (miziks, filter) => {
}
}
-export default function DrawerBar({setMobileOpen, miziks, mizik}) {
- const slug = mizik ? mizik[0].slug : null
+export default function DrawerBar({setMobileOpen, teks, anTeks}) {
+ const slug = anTeks ? anTeks.slug : null
const classes = useStyles()
const [search, setSearch] = useState('')
- const [selectedMizikSlug, setSelectedMizikSlug] = useState(slug)
+ const [slugTeksChwazi, meteSlugTeksChwazi] = useState(slug)
- const mizikFiltered = getMizikFiltered(miziks, search)
+ const mizikFiltered = getMizikFiltered(teks, search)
const handleSearch = event => {
event.preventDefault()
@@ -75,11 +75,11 @@ export default function DrawerBar({setMobileOpen, miziks, mizik}) {
@@ -88,11 +88,11 @@ export default function DrawerBar({setMobileOpen, miziks, mizik}) {
DrawerBar.propTypes = {
setMobileOpen: PropTypes.func,
- miziks: PropTypes.array.isRequired,
- mizik: PropTypes.array
+ teks: PropTypes.array.isRequired,
+ anTeks: PropTypes.object
}
DrawerBar.defaultProps = {
setMobileOpen: null,
- mizik: null
+ anTeks: null
}
diff --git a/components/teks/teks-drawer.js b/components/teks/teks-drawer.js
index 91b9267..28fa5fe 100644
--- a/components/teks/teks-drawer.js
+++ b/components/teks/teks-drawer.js
@@ -99,8 +99,7 @@ const formatJsonString = stringToFormat => {
return stringToFormat.split('\n').map((string, index) => {`${string}`}
) // eslint-disable-line react/no-array-index-key
}
-export default function TeksDrawer({miziks, mizik}) {
- const teks = mizik ? mizik[0] : null
+export default function TeksDrawer({teks, anTeks}) {
const classes = useStyles()
const theme = useTheme()
const [mobileOpen, setMobileOpen] = useState(false)
@@ -125,21 +124,21 @@ export default function TeksDrawer({miziks, mizik}) {
>
- {teks ? (
+ {anTeks ? (
<>
- {teks.liens && teks.liens.length > 0 && (
+ {anTeks.lyen && anTeks.lyen.length > 0 && (
-
+
)}
- {teks.kouteyAchtey && teks.kouteyAchtey.length > 0 && (
+ {anTeks.kouteyAchtey && anTeks.kouteyAchtey.length > 0 && (
-
+
)}
>
@@ -165,7 +164,7 @@ export default function TeksDrawer({miziks, mizik}) {
}}
onClose={handleDrawerToggle}
>
-
+
@@ -176,15 +175,15 @@ export default function TeksDrawer({miziks, mizik}) {
}}
variant='permanent'
>
-
+
- {teks ? (
+ {anTeks ? (
<>
-
- {teks.titre}
+
+ {anTeks.tit}
@@ -192,23 +191,23 @@ export default function TeksDrawer({miziks, mizik}) {
Transcription
- {formatJsonString(teks.transcription)}
+ {formatJsonString(anTeks.transkripsyon)}
- {teks.traductions && (
+ {anTeks.tradiksyon && (
Traduction
- {formatJsonString(teks.traductions.francais)}
+ {formatJsonString(anTeks.tradiksyon.francais)}
)}
>
) : (
-
+
)}
@@ -216,10 +215,10 @@ export default function TeksDrawer({miziks, mizik}) {
}
TeksDrawer.propTypes = {
- miziks: PropTypes.array.isRequired,
- mizik: PropTypes.array
+ teks: PropTypes.array.isRequired,
+ anTeks: PropTypes.object
}
TeksDrawer.defaultProps = {
- mizik: null
+ anTeks: null
}
diff --git a/components/teks/teks-kat.js b/components/teks/teks-kat.js
index faa3410..a289487 100644
--- a/components/teks/teks-kat.js
+++ b/components/teks/teks-kat.js
@@ -26,7 +26,7 @@ export default function TeksKat({teks}) {
const classes = useStyles()
const router = useRouter()
const noImageUrl = 'https://place-hold.it/140x140?text=Pa%20ni%20imaj'
- const {titre, awtis, annee, cover, published_at, slug} = teks
+ const {tit, awtis, lanne, kouveti, published_at, slug} = teks
const datPiblikasyon = format(new Date(published_at), 'Pp', {locale: fr})
const handleClick = slug => {
@@ -40,19 +40,19 @@ export default function TeksKat({teks}) {
- {titre}
+ {tit}
{awtis.map(a => a.alias).join()}
- {annee}
+ {lanne}
Piblikasyon : {datPiblikasyon}
diff --git a/pages/teks/[slug].js b/pages/teks/[slug].js
index bf7f1ed..12418c8 100644
--- a/pages/teks/[slug].js
+++ b/pages/teks/[slug].js
@@ -1,36 +1,36 @@
import PropTypes from 'prop-types'
-import {jwennMizikEpiSlug, jwennTeks} from '../../lib/oki-api'
+import {jwennTeksEpiSlug, jwennTeks} from '../../lib/oki-api'
import TeksDrawer from '../../components/teks/teks-drawer'
import HeadLayout from '../../components/head-layout'
-export default function Mizik({miziks, mizik}) {
+export default function SlugTeks({teks, anTeks}) {
return (
-
-
+
+
)
}
export async function getServerSideProps({query}) {
const {slug} = query
- const miziks = await jwennTeks()
- const mizik = await jwennMizikEpiSlug(slug)
+ const teks = await jwennTeks()
+ const anTeks = await jwennTeksEpiSlug(slug)
- if (mizik.length === 0) {
+ if (!anTeks) {
throw new Error('San répons')
}
return {
props: {
- miziks,
- mizik
+ teks,
+ anTeks
}
}
}
-Mizik.propTypes = {
- miziks: PropTypes.array.isRequired,
- mizik: PropTypes.array.isRequired
+SlugTeks.propTypes = {
+ teks: PropTypes.array.isRequired,
+ anTeks: PropTypes.object.isRequired
}
diff --git a/pages/teks/index.js b/pages/teks/index.js
index fc14316..afc0d7c 100644
--- a/pages/teks/index.js
+++ b/pages/teks/index.js
@@ -5,24 +5,24 @@ import {jwennTeks} from '../../lib/oki-api'
import TeksDrawer from '../../components/teks/teks-drawer'
import HeadLayout from '../../components/head-layout'
-export default function Teks({miziks}) {
+export default function Teks({teks}) {
return (
-
+
)
}
export async function getServerSideProps() {
- const miziks = await jwennTeks()
+ const teks = await jwennTeks()
return {
props: {
- miziks
+ teks
}
}
}
Teks.propTypes = {
- miziks: PropTypes.array.isRequired
+ teks: PropTypes.array.isRequired
}