Merge pull request #493 from Shikkanime/dev

Site - Season
Shikkanime · May 26, 2024 · 61dd9e2 · 61dd9e2
2 parents a3ad9c9 + 8920f7b
commit 61dd9e2
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 14 deletions.
diff --git a/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt b/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt
@@ -124,7 +124,29 @@ class SiteController {
     @Get
     private fun animeDetail(@PathParam("slug") slug: String): Response {
         val dto = animeCacheService.findBySlug(CountryCode.FR, slug) ?: return Response.redirect("/404")
-        return Response.redirect("/animes/${dto.slug}/season-${dto.seasons.first().number}")
+        val seasonDto = dto.seasons.firstOrNull() ?: return Response.redirect("/404")
+
+        return Response.template(
+            "/site/anime.ftl",
+            dto.shortName,
+            mutableMapOf(
+                "description" to dto.description?.let { StringUtils.sanitizeXSS(it) },
+                "anime" to dto,
+                "episodeMappings" to episodeMappingCacheService.findAllBy(
+                    CountryCode.FR,
+                    dto.uuid,
+                    seasonDto.number,
+                    listOf(
+                        SortParameter("releaseDateTime", SortParameter.Order.ASC),
+                        SortParameter("season", SortParameter.Order.ASC),
+                        SortParameter("episodeType", SortParameter.Order.ASC),
+                        SortParameter("number", SortParameter.Order.ASC),
+                    ),
+                    1,
+                    configCacheService.getValueAsInt(ConfigPropertyKey.ANIME_EPISODES_SIZE_LIMIT, 24)
+                )!!.data,
+            )
+        )
     }
 
     @Path("animes/{slug}/season-{season}")
@@ -138,7 +160,7 @@ class SiteController {
 
         return Response.template(
             "/site/anime.ftl",
-            dto.shortName,
+            "${dto.shortName} - Saison $season",
             mutableMapOf(
                 "description" to dto.description?.let { StringUtils.sanitizeXSS(it) },
                 "anime" to dto,

diff --git a/src/main/resources/assets/css/purged/bootstrap.min.css b/src/main/resources/assets/css/purged/bootstrap.min.css
diff --git a/src/main/resources/templates/site/anime.ftl b/src/main/resources/templates/site/anime.ftl
@@ -2,7 +2,13 @@
 <#import "components/episode-mapping.ftl" as episodeMappingComponent />
 <#import "components/langType.ftl" as langTypeComponent />
 
-<@navigation.display canonicalUrl="${baseUrl}/animes/${anime.slug}/season-${season.number}" openGraphImage="${apiUrl}/v1/attachments?uuid=${anime.uuid}&type=banner">
+<#assign canonicalUrl = baseUrl + "/animes/" + anime.slug>
+
+<#if season??>
+    <#assign canonicalUrl = canonicalUrl + "/season-" + season.number>
+</#if>
+
+<@navigation.display canonicalUrl=canonicalUrl openGraphImage="${apiUrl}/v1/attachments?uuid=${anime.uuid}&type=banner">
     <div class="container mb-3">
         <div class="row g-3 mt-3">
             <div class="col-md-4 col-12 mt-0 text-center">
@@ -13,7 +19,7 @@
             </div>
 
             <div class="col-md-8 col-12 text-start mt-md-0 mt-5 d-flex flex-column justify-content-center">
-                <h1 class="h6 fw-bold mb-0">${anime.shortName?upper_case}</h1>
+                <h1 class="h6 fw-bold mb-0 text-uppercase">${anime.shortName}<#if season??> - Saison ${season.number}</#if></h1>
 
                 <div class="mt-1">
                     <#list anime.langTypes as langType>
@@ -50,7 +56,7 @@
 
     <div class="row g-3 justify-content-center">
         <#list episodeMappings as episodeMapping>
-            <@episodeMappingComponent.display episodeMapping=episodeMapping cover=false desktopColSize="col-md-2" mobileColSize="col-6" />
+            <@episodeMappingComponent.display episodeMapping=episodeMapping cover=false desktopColSize="col-md-2" mobileColSize="col-6" showAnime=false showSeason=false />
         </#list>
     </div>
 </@navigation.display>
diff --git a/src/main/resources/templates/site/components/anime.ftl b/src/main/resources/templates/site/components/anime.ftl
@@ -3,7 +3,7 @@
 <#macro display anime>
     <div class="col-md-2 col-6 mt-0 mb-4">
         <article x-data="{ hover: false }" class="shikk-element">
-            <a href="/animes/${anime.slug}/season-${anime.seasons?first.number}" class="text-decoration-none text-white"
+            <a href="/animes/${anime.slug}" class="text-decoration-none text-white"
                @mouseenter="hover = true" @mouseleave="hover = false">
                 <div class="position-relative">
                     <img src="${apiUrl}/v1/attachments?uuid=${anime.uuid}&type=image" alt="${su.sanitizeXSS(anime.shortName)} anime"

diff --git a/src/main/resources/templates/site/components/episode-mapping.ftl b/src/main/resources/templates/site/components/episode-mapping.ftl
@@ -13,7 +13,7 @@
     </#switch>
 </#function>
 
-<#macro display episodeMapping desktopColSize mobileColSize cover>
+<#macro display episodeMapping desktopColSize mobileColSize cover showAnime=true showSeason=true>
     <div class="${desktopColSize} ${mobileColSize}" x-data="{ hover: false }" @mouseenter="hover = true"
          @mouseleave="hover = false">
         <article class="shikk-element">
@@ -36,11 +36,17 @@
                     </div>
 
                     <div class="mx-2 mb-1">
-                        <div class="h6 mt-2 mb-1 text-truncate-2 fw-bold">${episodeMapping.anime.shortName}</div>
+                        <#if showAnime>
+                            <div class="h6 mt-2 mb-1 text-truncate-2 fw-bold">${episodeMapping.anime.shortName}</div>
 
-                        <p class="text-muted mb-0">
-                            Saison ${episodeMapping.season?c} | ${getPrefixEpisode(episodeMapping.episodeType)} ${episodeMapping.number?c}
-                        </p>
+                            <p class="text-muted mb-0">
+                                <#if showSeason>Saison ${episodeMapping.season?c} | </#if>${getPrefixEpisode(episodeMapping.episodeType)} ${episodeMapping.number?c}
+                            </p>
+                        <#else>
+                            <div class="h6 mt-2 mb-0 text-truncate-2 fw-bold">
+                                <#if showSeason>Saison ${episodeMapping.season?c} | </#if>${getPrefixEpisode(episodeMapping.episodeType)} ${episodeMapping.number?c}
+                            </div>
+                        </#if>
 
                         <#list episodeMapping.langTypes as langTypes>
                             <p class="text-muted mt-0 mb-0"><@langTypeComponent.display langType=langTypes /></p>
@@ -65,12 +71,12 @@
                         </span>
 
                         <#if episodeMapping.description??>
-                            <div class="text-truncate-4 mt-3">
+                            <div class="text-truncate-4 my-2 m-0">
                                 ${episodeMapping.description}
                             </div>
                         </#if>
 
-                        <div class="mt-3 text-warning fw-bold">
+                        <div class="text-warning fw-bold">
                             <i class="me-2">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
                                      class="bi bi-box-arrow-up-right" viewBox="0 0 16 16">