diff --git a/app/api/home/route.js b/app/api/home/route.js
index f53597d..81161b9 100644
--- a/app/api/home/route.js
+++ b/app/api/home/route.js
@@ -15,6 +15,8 @@ export async function GET(request) {
statusId = 2;
} else if (status == "announce") {
statusId = 3;
+ } else {
+ return NextResponse.json({message: "Bad status"}, {status: 400});
}
const data = {
diff --git a/app/components/Navbar/Navbar.jsx b/app/components/Navbar/Navbar.jsx
index 6f69a60..4fc026c 100644
--- a/app/components/Navbar/Navbar.jsx
+++ b/app/components/Navbar/Navbar.jsx
@@ -43,11 +43,11 @@ export const Navbar = () => {
];
return (
- <header className="bg-black text-white sm:sticky sm:top-0 left-0 z-50 fixed bottom-0 w-full">
+ <header className="fixed bottom-0 left-0 z-50 w-full text-white bg-black sm:sticky sm:top-0">
<div className="px-4 py-4">
<nav className="flex gap-4">
{navLinks.map((link) => {
- return <Link key={link.id} href={link.href} className="flex items-center flex-col sm:flex-row"><span className={`iconify ${pathname == link.href ? link.iconActive : link.icon} w-6 h-6`}></span><span className={`${pathname == link.href ? "font-bold" : ""} text-xs sm:text-base`}>{link.title}</span></Link>;
+ return <Link key={link.id} href={link.href} className="flex flex-col items-center sm:flex-row"><span className={`iconify ${pathname == link.href ? link.iconActive : link.icon} w-6 h-6`}></span><span className={`${pathname == link.href ? "font-bold" : ""} text-xs sm:text-base`}>{link.title}</span></Link>;
})}
</nav>
</div>
diff --git a/app/components/ReleaseCourusel/ReleaseCourusel.jsx b/app/components/ReleaseCourusel/ReleaseCourusel.jsx
index f92962a..14eb607 100644
--- a/app/components/ReleaseCourusel/ReleaseCourusel.jsx
+++ b/app/components/ReleaseCourusel/ReleaseCourusel.jsx
@@ -1,5 +1,5 @@
"use client";
-import { useEffect, useRef } from "react";
+import { useEffect } from "react";
import { ReleaseLink } from "../ReleaseLink/ReleaseLink";
import Link from "next/link";
@@ -36,7 +36,9 @@ export const ReleaseCourusel = (props) => {
return (
<section className={`${Styles.section}`}>
<div className="flex justify-between px-4 border-b-2 border-black">
- <h1 className="font-bold text-md sm:text-xl md:text-lg xl:text-xl">{props.sectionTitle}</h1>
+ <h1 className="font-bold text-md sm:text-xl md:text-lg xl:text-xl">
+ {props.sectionTitle}
+ </h1>
<Link href={props.showAllLink}>
<div className="flex items-center">
<p className="hidden text-xl font-bold sm:block">Показать все</p>
@@ -54,13 +56,21 @@ export const ReleaseCourusel = (props) => {
key={release.id}
style={{ width: "fit-content" }}
>
- <ReleaseLink {...release} />
+ <div className="xl:w-[600px] sm:w-[400px] w-[90vw] aspect-video">
+ <ReleaseLink {...release} />
+ </div>
</div>
);
})}
</div>
- <div className={`swiper-button-prev ${Styles["swiper-button"]} after:iconify after:material-symbols--chevron-left aspect-square bg-black bg-opacity-25 backdrop-blur rounded-full after:bg-white`} style={{"--swiper-navigation-size": "64px"}}></div>
- <div className={`swiper-button-next ${Styles["swiper-button"]} after:iconify after:material-symbols--chevron-right aspect-square bg-black bg-opacity-25 backdrop-blur rounded-full after:bg-white`} style={{"--swiper-navigation-size": "64px"}}></div>
+ <div
+ className={`swiper-button-prev ${Styles["swiper-button"]} after:iconify after:material-symbols--chevron-left aspect-square bg-black bg-opacity-25 backdrop-blur rounded-full after:bg-white`}
+ style={{ "--swiper-navigation-size": "64px" }}
+ ></div>
+ <div
+ className={`swiper-button-next ${Styles["swiper-button"]} after:iconify after:material-symbols--chevron-right aspect-square bg-black bg-opacity-25 backdrop-blur rounded-full after:bg-white`}
+ style={{ "--swiper-navigation-size": "64px" }}
+ ></div>
</div>
</div>
</section>
diff --git a/app/components/ReleaseCourusel/ReleaseCourusel.module.css b/app/components/ReleaseCourusel/ReleaseCourusel.module.css
index 3a53a01..157046c 100644
--- a/app/components/ReleaseCourusel/ReleaseCourusel.module.css
+++ b/app/components/ReleaseCourusel/ReleaseCourusel.module.css
@@ -1,11 +1,13 @@
.swiper-button:global(.swiper-button-disabled) {
- opacity: 0 !important;
- }
-
-.section .swiper-button {
- display: none !important;
+ opacity: 0 !important;
}
-.section:hover .swiper-button {
+.section .swiper-button {
+ display: none !important;
+}
+
+@media (hover: hover) {
+ .section:hover .swiper-button {
display: flex !important;
-}
\ No newline at end of file
+ }
+}
diff --git a/app/components/ReleaseLink/ReleaseLink.jsx b/app/components/ReleaseLink/ReleaseLink.jsx
index 6c3b70a..e10c901 100644
--- a/app/components/ReleaseLink/ReleaseLink.jsx
+++ b/app/components/ReleaseLink/ReleaseLink.jsx
@@ -4,7 +4,7 @@ export const ReleaseLink = (props) => {
const grade = props.grade.toFixed(1);
return (
<Link href={`/release/${props.id}`}>
- <div className="aspect-video xl:w-[600px] md:w-[400px] w-[200px] group">
+ <div className="w-full aspect-video group">
<div className="relative w-full h-full overflow-hidden bg-gradient-to-t from-black to-transparent">
<img
className="absolute z-0 object-cover w-full h-full transition mix-blend-overlay group-hover:scale-110"
@@ -24,18 +24,18 @@ export const ReleaseLink = (props) => {
: "bg-green-500"
}`}
>
- <p className="px-2 sm:px-4 py-0.5 sm:py-1 text-xs sm:text-base text-white">
+ <p className="px-2 sm:px-4 py-0.5 sm:py-1 text-xs xl:text-base text-white">
{grade}
</p>
</div>
<div className="absolute flex flex-col items-end gap-1 top-2 right-2">
<div className="bg-gray-500 rounded-sm">
- <p className="px-2 sm:px-4 py-0.5 sm:py-1 text-xs sm:text-base text-white">
+ <p className="px-2 sm:px-4 py-0.5 sm:py-1 text-xs xl:text-base text-white">
{props.status.name}
</p>
</div>
{props.status.name === "Выходит" && <div className="bg-gray-500 rounded-sm">
- <div className="px-2 sm:px-4 py-0.5 sm:py-1 text-xs sm:text-base text-white flex">
+ <div className="px-2 sm:px-4 py-0.5 sm:py-1 text-xs xl:text-base text-white flex">
{props.episodes_released && (
<p>{`${props.episodes_released}/`}</p>
)}
@@ -47,7 +47,7 @@ export const ReleaseLink = (props) => {
</div>
</div>}
</div>
- <p className="absolute text-xs text-white md:text-base lg:text-lg left-2 bottom-2">
+ <p className="absolute text-xs text-white xl:text-base lg:text-lg left-2 bottom-2 right-2">
{props.title_ru}
</p>
</div>
diff --git a/app/components/ReleaseSection/ReleaseSection.jsx b/app/components/ReleaseSection/ReleaseSection.jsx
new file mode 100644
index 0000000..8e9d628
--- /dev/null
+++ b/app/components/ReleaseSection/ReleaseSection.jsx
@@ -0,0 +1,28 @@
+
+import { ReleaseLink } from "../ReleaseLink/ReleaseLink";
+
+export const ReleaseSection = (props) => {
+ return (
+ <section>
+ <div className="flex justify-between px-4 border-b-2 border-black">
+ <h1 className="font-bold text-md sm:text-xl md:text-lg xl:text-xl">
+ {props.sectionTitle}
+ </h1>
+ </div>
+ <div className="m-4">
+ <div className="grid justify-center sm:grid-cols-[repeat(auto-fill,400px)] grid-cols-[100%] gap-2">
+ {props.content.map((release) => {
+ return (
+ <div
+ key={release.id}
+ className="w-full h-full aspect-video"
+ >
+ <ReleaseLink {...release} />
+ </div>
+ );
+ })}
+ </div>
+ </div>
+ </section>
+ );
+};
diff --git a/app/components/Spinner/Spinner.jsx b/app/components/Spinner/Spinner.jsx
new file mode 100644
index 0000000..6dffd42
--- /dev/null
+++ b/app/components/Spinner/Spinner.jsx
@@ -0,0 +1,25 @@
+export const Spinner = () => {
+ return (
+ <div>
+ <div role="status">
+ <svg
+ aria-hidden="true"
+ className="inline w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
+ viewBox="0 0 100 101"
+ fill="none"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path
+ d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+ fill="currentColor"
+ />
+ <path
+ d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+ fill="currentFill"
+ />
+ </svg>
+ <span className="sr-only">Loading...</span>
+ </div>
+ </div>
+ );
+};
diff --git a/app/home/[slug]/page.js b/app/home/[slug]/page.js
new file mode 100644
index 0000000..61766d2
--- /dev/null
+++ b/app/home/[slug]/page.js
@@ -0,0 +1,50 @@
+"use client";
+import useSWR from "swr";
+import { ReleaseSection } from "../../components/ReleaseSection/ReleaseSection";
+import { Spinner } from "../../components/Spinner/Spinner";
+
+const fetcher = async (...args) => {
+ const res = await fetch(...args);
+
+ if (!res.ok) {
+ const error = new Error("An error occurred while fetching the data.");
+ error.info = await res.json();
+ error.status = res.status;
+ throw error;
+ }
+
+ return res.json();
+};
+
+const SectionTitleMapping = {
+ last: "Последние релизы",
+ finished: "Завершенные релизы",
+ ongoing: "В эфире",
+ announce: "Анонсированные релизы",
+};
+
+export default function HomeStatus({ params }) {
+ const { data, error, isLoading } = useSWR(
+ `/api/home?status=${params.slug}`,
+ fetcher
+ );
+
+ if (error) return <div>failed to load</div>;
+ if (isLoading)
+ return (
+ <main className="flex flex-col items-center justify-center min-w-full min-h-screen">
+ <Spinner />
+ </main>
+ );
+
+ return (
+ <main className="flex flex-col pt-2 pb-16 sm:pt-4 sm:pb-0">
+ {data && (
+ <ReleaseSection
+ sectionTitle={SectionTitleMapping[params.slug]}
+ content={data.content}
+ />
+ )}
+ </main>
+ );
+}
diff --git a/app/page.js b/app/page.js
index 0d6a75b..4d9c025 100644
--- a/app/page.js
+++ b/app/page.js
@@ -1,45 +1,53 @@
"use client";
import useSWR from "swr";
import { ReleaseCourusel } from "./components/ReleaseCourusel/ReleaseCourusel";
+import { Spinner } from "./components/Spinner/Spinner";
const fetcher = (...args) => fetch(...args).then((res) => res.json());
function fetchReleases(status) {
- const { data, error, isLoading } = useSWR(
- `/api/home?status=${status}`,
- fetcher
- );
- return [data, error, isLoading];
+ const { data } = useSWR(`/api/home?status=${status}`, fetcher);
+ return [data];
}
export default function Home() {
- const [lastReleasesData, lastReleasesError, lastReleasesIsLoading] =
- fetchReleases("last");
- const [
- finishedReleasesData,
- finishedReleasesError,
- finishedReleasesIsLoading,
- ] = fetchReleases("finished");
- const [ongoingReleasesData, ongoingReleasesError, ongoingReleasesIsLoading] =
- fetchReleases("ongoing");
- const [
- announceReleasesData,
- announceReleasesError,
- announceReleasesIsLoading,
- ] = fetchReleases("announce");
+ const [lastReleasesData] = fetchReleases("last");
+ const [finishedReleasesData] = fetchReleases("finished");
+ const [ongoingReleasesData] = fetchReleases("ongoing");
+ const [announceReleasesData] = fetchReleases("announce");
return (
<main className="flex flex-col pt-2 pb-16 sm:pt-4 sm:pb-0">
- {lastReleasesData && (
- <ReleaseCourusel id="home-courusel-last" sectionTitle="Последние релизы" showAllLink="/last" content={lastReleasesData.content} />
+ {lastReleasesData ? (
+ <ReleaseCourusel
+ sectionTitle="Последние релизы"
+ showAllLink="/home/last"
+ content={lastReleasesData.content}
+ />
+ ) : (
+ <div className="flex items-center justify-center min-w-full min-h-screen">
+ <Spinner />
+ </div>
)}
{finishedReleasesData && (
- <ReleaseCourusel id="home-courusel-finished" sectionTitle="Завершенные релизы" showAllLink="/finished" content={finishedReleasesData.content} />
+ <ReleaseCourusel
+ sectionTitle="Завершенные релизы"
+ showAllLink="/home/finished"
+ content={finishedReleasesData.content}
+ />
)}
{ongoingReleasesData && (
- <ReleaseCourusel id="home-courusel-ongoing" sectionTitle="В эфире" showAllLink="/ongoing" content={ongoingReleasesData.content} />
+ <ReleaseCourusel
+ sectionTitle="В эфире"
+ showAllLink="/home/ongoing"
+ content={ongoingReleasesData.content}
+ />
)}
{announceReleasesData && (
- <ReleaseCourusel id="home-courusel-announce" sectionTitle="Анонсированные релизы" showAllLink="/announce" content={announceReleasesData.content} />
+ <ReleaseCourusel
+ sectionTitle="Анонсированные релизы"
+ showAllLink="/home/announce"
+ content={announceReleasesData.content}
+ />
)}
</main>
);