Merge pull request #299 from Shikkanime/dev

Dev
Shikkanime · Mar 20, 2024 · e2ac8c2 · e2ac8c2
2 parents bde0ae9 + 716e67f
commit e2ac8c2
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 16 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 val ktorVersion = "2.3.9"
-val ktorSwaggerUiVersion = "2.7.4"
+val ktorSwaggerUiVersion = "2.7.5"
 val hibernateCoreVersion = "6.4.4.Final"
 val ehcacheVersion = "3.10.8"
 val glassfishJaxbVersion = "4.0.5"

diff --git a/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt b/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt
@@ -1,6 +1,7 @@
 package fr.shikkanime.controllers.site
 
 import com.google.inject.Inject
+import fr.shikkanime.dtos.AnimeDto
 import fr.shikkanime.entities.SortParameter
 import fr.shikkanime.entities.enums.CountryCode
 import fr.shikkanime.entities.enums.Link
@@ -36,19 +37,41 @@ class SiteController {
         )
     }
 
+    private fun getFullAnimesSimulcast(): MutableList<AnimeDto> {
+        val animeSimulcastLimit = 6
+
+        val animes = animeCacheService.findAllBy(
+            CountryCode.FR,
+            simulcastCacheService.currentSimulcast?.uuid,
+            listOf(SortParameter("name", SortParameter.Order.ASC)),
+            1,
+            animeSimulcastLimit
+        )!!.data.toMutableList()
+
+        val simulcasts = simulcastCacheService.findAll()
+
+        if (animes.size in 1..<animeSimulcastLimit && simulcasts!!.size > 1) {
+            val previousSimulcastAnimes = animeCacheService.findAllBy(
+                CountryCode.FR,
+                simulcasts[1].uuid,
+                listOf(SortParameter("name", SortParameter.Order.ASC)),
+                1,
+                animeSimulcastLimit - animes.size
+            )!!.data
+
+            animes.addAll(previousSimulcastAnimes)
+        }
+
+        return animes
+    }
+
     @Path
     @Get
     private fun home(): Response {
         return Response.template(
             Link.HOME,
             mutableMapOf(
-                "animes" to animeCacheService.findAllBy(
-                    CountryCode.FR,
-                    simulcastCacheService.currentSimulcast?.uuid,
-                    listOf(SortParameter("name", SortParameter.Order.ASC)),
-                    1,
-                    6
-                )!!.data,
+                "animes" to getFullAnimesSimulcast(),
                 "episodes" to episodeCacheService.findAllBy(
                     CountryCode.FR,
                     null,

diff --git a/src/main/resources/templates/site/_navigation.ftl b/src/main/resources/templates/site/_navigation.ftl
@@ -38,7 +38,7 @@
             </div>
         </main>
 
-        <div class="container">
+        <div class="container-fluid px-md-5">
             <footer class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top">
                 <div class="col-md-4 d-flex align-items-center">
                     <div>
@@ -116,7 +116,7 @@
                     <ul class="mt-3 list-unstyled justify-content-end text-md-end">
                         <#list footerLinks as link>
                             <li>
-                                <a href="${link.href}" class="text-muted">
+                                <a href="${link.href}" class="text-muted text-decoration-none">
                                     ${link.name}
                                 </a>
                             </li>

diff --git a/src/main/resources/templates/site/anime.ftl b/src/main/resources/templates/site/anime.ftl
@@ -10,7 +10,7 @@
                      height="720">
             </div>
 
-            <div class="col-md-8 col-12 mt-0 text-start mt-md-0 mt-5 d-flex flex-column justify-content-center">
+            <div class="col-md-8 col-12 text-start mt-md-0 mt-5 d-flex flex-column justify-content-center">
                 <h6 class="h6">${anime.shortName?upper_case}</h6>
                 <p class="text-muted">${anime.name}</p>
 
@@ -31,9 +31,9 @@
         </div>
     </div>
 
-    <div class="row mt-5 justify-content-center">
+    <div class="row g-3 mt-5 justify-content-center">
         <#list episodes as episode>
-            <@episodeComponent.display episode=episode cover=false col="col-md-2" />
+            <@episodeComponent.display episode=episode cover=false desktopColSize="col-md-2" mobileColSize="col-6" />
         </#list>
     </div>
 </@navigation.display>
diff --git a/src/main/resources/templates/site/components/episode.ftl b/src/main/resources/templates/site/components/episode.ftl
@@ -9,8 +9,9 @@
     </#switch>
 </#function>
 
-<#macro display episode col cover>
-    <div class="${col} col-12" x-data="{ hover: false }" @mouseenter="hover = true" @mouseleave="hover = false">
+<#macro display episode desktopColSize mobileColSize cover>
+    <div class="${desktopColSize} ${mobileColSize}" x-data="{ hover: false }" @mouseenter="hover = true"
+         @mouseleave="hover = false">
         <article>
             <a href="${episode.url}" target="_blank" class="text-decoration-none text-white">
                 <div class="position-relative">

diff --git a/src/main/resources/templates/site/home.ftl b/src/main/resources/templates/site/home.ftl
@@ -20,7 +20,7 @@
                     <#assign firstRow=true>
                 </#if>
 
-                <@episodeComponent.display episode=episode col=col cover=firstRow />
+                <@episodeComponent.display episode=episode desktopColSize=col mobileColSize="col-12" cover=firstRow />
             </#list>
         </div>
     <#else>