diff --git a/app/news/detail/[id]/page.tsx b/app/news/detail/[id]/page.tsx index 73a53f0..d64a9e1 100644 --- a/app/news/detail/[id]/page.tsx +++ b/app/news/detail/[id]/page.tsx @@ -8,7 +8,10 @@ type Props = { }; export async function generateMetadata({ params }: any): Promise { - const res = await getArticleById(params?.id?.split("-")[0]); + // const params = await props.params; + const { id } = await params; + + const res = await getArticleById(id?.split("-")[0]); const article = res?.data?.data; return { title: article.title, @@ -22,7 +25,10 @@ export async function generateMetadata({ params }: any): Promise { } export default async function NewsPage({ params }: any) { - const articleId = params?.id?.split("-")[0]; + // const params = await props.params; + const { id } = await params; + + const articleId = id?.split("-")[0]; const res = await getArticleById(articleId); const article = res?.data?.data; return ( diff --git a/components/landing/HeaderNews.tsx b/components/landing/HeaderNews.tsx index 3cb6676..bb4ad60 100644 --- a/components/landing/HeaderNews.tsx +++ b/components/landing/HeaderNews.tsx @@ -371,7 +371,7 @@ export default function HeaderNews() { key={list?.id} className="text-xs text-left m-2 p-2 dark:bg-[#1E1616] bg-white rounded-md" > - +

{list?.title}

diff --git a/components/page/detail-news.tsx b/components/page/detail-news.tsx index 65912bb..9aa2e8a 100644 --- a/components/page/detail-news.tsx +++ b/components/page/detail-news.tsx @@ -37,7 +37,7 @@ export default function DetailNews(props: { data: any; listArticle: any }) { const params = useParams(); const id: any = params?.id; const shareText = "Humas Polri"; - const [filteredFiles, setFilteredFiles] = useState([]); + // const [filteredFiles, setFilteredFiles] = useState([]); const [uid, setUid] = useState(""); const [token, setToken] = useState(""); @@ -166,9 +166,9 @@ export default function DetailNews(props: { data: any; listArticle: any }) {

- {filteredFiles ? ( - filteredFiles[0]?.file_name.split(".")[1].includes("doc") || - filteredFiles[0]?.file_name.split(".")[1].includes("pdf") ? ( + {data.files.length > 0 ? ( + data.files[0]?.file_name.split(".")[1].includes("doc") || + data.files[0]?.file_name.split(".")[1].includes("pdf") ? ( ) : ( - filteredFiles?.length > 0 && ( - // Main Image - 0 && ( + Main Image ) @@ -204,10 +195,10 @@ export default function DetailNews(props: { data: any; listArticle: any }) { "" )}
- {filteredFiles?.length > 0 && - (filteredFiles[0].file_name.split(".")[1].includes("doc") || - filteredFiles[0].file_name.split(".")[1].includes("pdf") ? ( - filteredFiles?.map((file: any, index: number) => ( + {data.files?.length > 0 && + (data.files[0].file_name.split(".")[1].includes("doc") || + data.files[0].file_name.split(".")[1].includes("pdf") ? ( + data.files?.map((file: any, index: number) => ( - {filteredFiles?.map((file: any, index: number) => ( + {data.files?.map((file: any, index: number) => ( setImageNow(index)}