diff --git a/src/pages/comic/[comicId]/chapter/[chapterNumber]/with-api.tsx b/src/pages/comic/[comicId]/chapter/[chapterNumber]/with-api.tsx
index d7befa59..809de101 100644
--- a/src/pages/comic/[comicId]/chapter/[chapterNumber]/with-api.tsx
+++ b/src/pages/comic/[comicId]/chapter/[chapterNumber]/with-api.tsx
@@ -2,79 +2,18 @@ import axios from 'axios'
import getConfig from 'next/config'
import { useRouter } from 'next/router'
import { useContext, useRef } from 'react'
-import { COMIC_STATUS, LANGUAGE } from 'src/constants'
+import { LANGUAGE } from 'src/constants'
import { Context, privateAxios } from 'src/context'
import useApi from 'src/hooks/useApi'
import { IChapter } from 'src/models/chapter'
import { IComicDetail } from 'src/models/comic'
import { IComment } from 'src/models/comment'
-import { formatStatus } from 'src/utils'
+import { getComicDetail } from 'src/services'
const withApi = (Component: React.FC) => (props: any) => {
const { query } = useRouter()
const { account } = useContext(Context)
const config = getConfig()
const chapterId = useRef()
- const getComicDetail = async () => {
- const d: any = await axios.get(`${config.API_URL}/api/rest/public/manga/${query.comicId}`, {
- params: {
- user_id: account?.id,
- },
- })
- const data = d?.data?.manga[0]
-
- const res = {
- id: data.id,
- languages: data.manga_languages.map((ml) => ({
- ...LANGUAGE.find((l) => l.id == ml.language_id),
- isMainLanguage: ml.is_main_language,
- })),
- chapters: data.chapters.map((chapter) => ({
- id: chapter.id,
- name: chapter.chapter_name,
- number: chapter.chapter_number,
- type: chapter.chapter_type,
- status: formatStatus(chapter.status),
- thumbnail: chapter.thumbnail_url,
- date: chapter.pushlish_date,
- likes: chapter.chapter_total_likes?.likes || 0,
- views: chapter.views || 0,
- isLiked: !!chapter.chapters_likes?.length,
- })),
- status: {
- type: COMIC_STATUS[formatStatus(data.status)],
- text: formatStatus(data.status),
- },
- views: data.manga_total_views?.views || 0,
- likes: data.manga_total_likes?.likes || 0,
- isSubscribe: !!data.manga_subscribers.length,
- image: data.poster,
- cover: data.banner,
- tags: data.manga_tags.map(({ tag }: any) => {
- const r = {}
- LANGUAGE.forEach((l) => {
- const tagLanguage = tag.tag_languages.find((tl) => tl.language_id == l.id) || tag.tag_languages[0]
- r[l.shortLang] = tagLanguage.value
- })
- return r
- }),
- authors: data.manga_creators?.map((c: any) => ({
- id: c.creator?.isActive ? c.creator?.id : undefined,
- name: c.creator?.isActive ? c.creator?.name : 'Unknown creator',
- })),
- releaseDate: data.release_date,
- }
-
- LANGUAGE.forEach((l) => {
- const mangaLanguages =
- data.manga_languages.find((ml) => ml.language_id == l.id) ||
- data.manga_languages.find((ml) => ml.is_main_language)
- res[l.shortLang] = {
- title: mangaLanguages?.title,
- description: mangaLanguages?.description,
- }
- })
- return res
- }
const getChapterDetails = async () => {
const {
@@ -144,7 +83,11 @@ const withApi = (Component: React.FC) => (props: any) => {
return []
}
- const comicDetails = useApi(getComicDetail, !!query.comicId, [query.comicId, account?.id])
+ const comicDetails = useApi(
+ async () => await getComicDetail(query.comicId as string, account?.id),
+ !!query.comicId,
+ [query.comicId, account?.id]
+ )
const chapterComments = useApi(getChapterComments, !!chapterId.current, [chapterId.current])
const chapterDetails = useApi(getChapterDetails, !!query.comicId && !!query.chapterNumber, [
query.comicId,
diff --git a/src/pages/comic/[comicId]/comic.tsx b/src/pages/comic/[comicId]/comic.tsx
index 47c90c9a..0039e121 100644
--- a/src/pages/comic/[comicId]/comic.tsx
+++ b/src/pages/comic/[comicId]/comic.tsx
@@ -156,7 +156,13 @@ export default function Comic({ comicDetails, subscribe, unsubscribe, like, unli
-
+
diff --git a/src/pages/comic/[comicId]/with-api.tsx b/src/pages/comic/[comicId]/with-api.tsx
index f390906b..467ee991 100644
--- a/src/pages/comic/[comicId]/with-api.tsx
+++ b/src/pages/comic/[comicId]/with-api.tsx
@@ -1,71 +1,14 @@
-import axios from 'axios'
import getConfig from 'next/config'
import { useRouter } from 'next/router'
import { useContext } from 'react'
-import { LANGUAGE } from 'src/constants'
import { Context, privateAxios } from 'src/context'
import useApi from 'src/hooks/useApi'
import { IComicDetail } from 'src/models/comic'
-import { formatStatus } from 'src/utils'
+import { getComicDetail } from 'src/services'
const withApi = (Component: React.FC
) => (props: any) => {
const { account } = useContext(Context)
const { query } = useRouter()
const config = getConfig()
- const getComicDetail = async () => {
- const d: any = await axios.get(`${config.API_URL}/api/rest/public/manga/${query.comicId}`, {
- params: {
- user_id: account?.id,
- },
- })
- const data = d?.data?.manga[0]
- const res = {
- id: data.id,
- languages: data.manga_languages.map((ml) => ({
- ...LANGUAGE.find((l) => l.id == ml.language_id),
- isMainLanguage: ml.is_main_language,
- })),
- chapters: data.chapters.map((chapter) => ({
- id: chapter.id,
- name: chapter.chapter_name,
- number: chapter.chapter_number,
- type: chapter.chapter_type,
- status: formatStatus(chapter.status),
- thumbnail: chapter.thumbnail_url,
- date: chapter.pushlish_date,
- likes: chapter.chapter_total_likes?.likes || 0,
- views: chapter.views || 0,
- isLiked: !!chapter.chapters_likes?.length,
- })),
- views: data.manga_total_views?.views || 0,
- likes: data.manga_total_likes?.likes || 0,
- isSubscribe: !!data.manga_subscribers.length,
- image: data.poster,
- cover: data.banner,
- tags: data.manga_tags.map(({ tag }: any) => {
- const r = {}
- LANGUAGE.forEach((l) => {
- const tagLanguage = tag.tag_languages.find((tl) => tl.language_id == l.id) || tag.tag_languages[0]
- r[l.shortLang] = tagLanguage.value
- })
- return r
- }),
- authors: data.manga_creators?.map((c: any) => ({
- id: c.creator?.isActive ? c.creator?.id : undefined,
- name: c.creator?.isActive ? c.creator?.name : 'Unknown creator',
- })),
- }
-
- LANGUAGE.forEach((l) => {
- const mangaLanguages =
- data.manga_languages.find((ml) => ml.language_id == l.id) ||
- data.manga_languages.find((ml) => ml.is_main_language)
- res[l.shortLang] = {
- title: mangaLanguages?.title,
- description: mangaLanguages?.description,
- }
- })
- return res
- }
const subscribe = async () => {
await privateAxios.post(`${config.API_URL}/api/rest/user/manga/${query.comicId}/subscribe`)
}
@@ -80,7 +23,11 @@ const withApi = (Component: React.FC) => (props: any) => {
await privateAxios.delete(`${config.API_URL}/api/rest/user/chapters/${id}/likes`)
}
- const comicDetails = useApi(getComicDetail, !!query.comicId, [query.comicId, account?.id])
+ const comicDetails = useApi(
+ async () => await getComicDetail(query.comicId as string, account?.id),
+ !!query.comicId,
+ [query.comicId, account?.id]
+ )
return (
{
return response
})
}
+export const getComicDetail = async (comicId: string, accountId: string) => {
+ const d: any = await axios.get(`${getConfig().API_URL}/api/rest/public/manga/${comicId}`, {
+ params: {
+ user_id: accountId,
+ },
+ })
+ const data = d?.data?.manga[0]
+ const hasAccess = await getAccess(data.id)
+ const res = {
+ id: data.id,
+ languages: data.manga_languages.map((ml) => ({
+ ...LANGUAGE.find((l) => l.id == ml.language_id),
+ isMainLanguage: ml.is_main_language,
+ })),
+ hasAccess: hasAccess,
+ chapters: data.chapters.map((chapter) => ({
+ id: chapter.id,
+ name: chapter.chapter_name,
+ number: chapter.chapter_number,
+ type: chapter.chapter_type,
+ status: formatStatus(chapter.status),
+ thumbnail: chapter.thumbnail_url,
+ date: chapter.pushlish_date,
+ likes: chapter.chapter_total_likes?.likes || 0,
+ views: chapter.views || 0,
+ isLiked: !!chapter.chapters_likes?.length,
+ })),
+ status: {
+ type: COMIC_STATUS[formatStatus(data.status)],
+ text: formatStatus(data.status),
+ },
+ views: data.manga_total_views?.views || 0,
+ likes: data.manga_total_likes?.likes || 0,
+ isSubscribe: !!data.manga_subscribers.length,
+ image: data.poster,
+ cover: data.banner,
+ tags: data.manga_tags.map(({ tag }: any) => {
+ const r = {}
+ LANGUAGE.forEach((l) => {
+ const tagLanguage = tag.tag_languages.find((tl) => tl.language_id == l.id) || tag.tag_languages[0]
+ r[l.shortLang] = tagLanguage.value
+ })
+ return r
+ }),
+ authors: data.manga_creators?.map((c: any) => ({
+ id: c.creator?.isActive ? c.creator?.id : undefined,
+ name: c.creator?.isActive ? c.creator?.name : 'Unknown creator',
+ })),
+ releaseDate: data.release_date,
+ }
+
+ LANGUAGE.forEach((l) => {
+ const mangaLanguages =
+ data.manga_languages.find((ml) => ml.language_id == l.id) ||
+ data.manga_languages.find((ml) => ml.is_main_language)
+ res[l.shortLang] = {
+ title: mangaLanguages?.title,
+ description: mangaLanguages?.description,
+ }
+ })
+ return res
+}
+export const getAccess = async (id: number) => {
+ try {
+ const { data } = await privateAxios.get(`${getConfig().REST_API_URL}/manga/${id}/get-access`)
+ return data?.nft
+ } catch (error) {
+ console.log(error)
+ return false
+ }
+}