- turbo-stream for Chapter updates
- progressbar for chapter scrapping
- minor optimisations
This commit is contained in:
Jérémy Guillot
2024-07-17 20:20:19 +02:00
parent 4672886a67
commit 7fc2f15f6b
14 changed files with 111 additions and 63 deletions

View File

@@ -5,6 +5,7 @@
{% endif %}
{% endblock %}
{% block body %}
<div {{ turbo_stream_listen('App\\Entity\\Chapter') }}></div>
<div class="container mx-auto mt-8 p-2">
<div class="bg-white overflow-hidden">
<div class="overflow-x-auto">
@@ -24,7 +25,7 @@
</thead>
<tbody class="text-gray-700">
{% for manga in status %}
<tr class="border-b border-gray-200 hover:bg-gray-50 transition duration-150 ease-in-out">
<tr id="activity-{{ manga.chapterId }}" class="border-b border-gray-200 hover:bg-gray-50 transition duration-150 ease-in-out">
<td class="py-4 px-4 text-center">
<input type="checkbox" class="form-checkbox h-5 w-5 text-green-600">
</td>
@@ -40,7 +41,7 @@
data-controller="chapter-progress"
data-chapter-progress-chapter-id-value="{{ manga.chapterId }}">
<div class="relative bg-gray-200 rounded-full h-6 overflow-hidden">
<div data-chapter-progress-target="progressBar" class="absolute top-0 left-0 h-full bg-green-400 transition-all duration-300 ease-out" style="width: 0%"></div>
<div data-chapter-progress-target="progressBar" class="absolute top-0 left-0 h-full bg-green-400 transition-all duration-300 ease-out" style="width: 0"></div>
<div class="absolute inset-0 flex items-center justify-center text-xs font-semibold text-white" data-chapter-progress-target="progressText">
0 / 0
</div>

View File

@@ -0,0 +1,21 @@
{% block create %}
<turbo-stream action="prepend" target="volume-{{ entity.volume }}">
<template>
{% include 'manga/_chapter_row.html.twig' with { chapter: entity, manga: entity.manga } %}
</template>
</turbo-stream>
{% endblock %}
{% block update %}
<turbo-stream action="remove" target="activity-{{ entity.id }}"></turbo-stream>
<turbo-stream action="replace" target="chapter-{{ entity.id }}">
<template>
{% include 'manga/_chapter_row.html.twig' with { chapter: entity, manga: entity.manga } %}
</template>
</turbo-stream>
{% endblock %}
{% block remove %}
{% endblock %}

View File

@@ -1,5 +1,5 @@
<turbo-frame id="chapter_list">
<div class="p-4">
<div class="p-4" {{ turbo_stream_listen('App\\Entity\\Chapter') }}>
{% for volume, chapters in chapters_by_volume %}
{% set is_first = loop.first %}
{% set volume_cbz_path = chapters|first.cbzPath %}
@@ -63,7 +63,7 @@
<th class="px-4 py-2 text-right">Actions</th>
</tr>
</thead>
<tbody>
<tbody id="volume-{{ volume }}">
{% if all_chapters_same_cbz and volume_cbz_path is not null %}
<tr class="border-t hover:bg-green-100">
<td class="px-4 py-2 text-green-500">
@@ -85,54 +85,7 @@
</tr>
{% else %}
{% for chapter in chapters %}
<tr class="border-t hover:bg-green-100">
{% if chapter.cbzPath is not null %}
<td class="px-4 py-2 text-green-500">
<a data-turbo-frame="_top" href="{{ path('app_manga_read', { mangaSlug: manga.slug, chapterNumber: chapter.number, pageNumber: 1 }) }}">
{{ '%02d'|format(chapter.number) }}
</a>
</td>
{% else %}
<td class="px-4 py-2">{{ '%02d'|format(chapter.number) }}</td>
{% endif %}
<td class="px-4 py-2 w-full text-left">
{% if chapter.cbzPath is not null %}
<a data-turbo-frame="_top" href="{{ path('app_manga_read', { mangaSlug: manga.slug, chapterNumber: chapter.number, pageNumber: 1 }) }}">
{{ chapter.title ?? 'No title' }}
</a>
{% else %}
{{ chapter.title ?? 'No title' }}
{% endif %}
</td>
<td class="px-4 py-2 flex justify-end gap-2">
{% if chapter.cbzPath is null %}
<button
data-controller="download"
data-action="download#download"
data-download-url-value="{{ path('search_chapter', {id: chapter.id}) }}"
>
<span class="text-gray-500 hover:text-green-500">
<i data-download-target="icon" class="fas fa-search"></i>
</span>
</button>
{% else %}
<button disabled>
<span class="text-gray-500">
<i class="fas fa-search"></i>
</span>
</button>
{% endif %}
<a href="#"
data-controller="download"
data-action="download#download"
data-download-url-value="{{ path('download_cbz', {chapterId: chapter.id}) }}"
class="w-8 text-center">
<i data-download-target="icon"
class="fas fa-download text-gray-500 hover:text-green-500"></i>
</a>
</td>
</tr>
{% include 'manga/_chapter_row.html.twig' with {'chapter': chapter, 'manga': manga} %}
{% endfor %}
{% endif %}
</tbody>

View File

@@ -0,0 +1,48 @@
<tr id="chapter-{{ chapter.id }}" class="border-t hover:bg-green-100">
{% if chapter.cbzPath is not null %}
<td class="px-4 py-2 text-green-500">
<a data-turbo-frame="_top" href="{{ path('app_manga_read', { mangaSlug: manga.slug, chapterNumber: chapter.number, pageNumber: 1 }) }}">
{{ '%02d'|format(chapter.number) }}
</a>
</td>
{% else %}
<td class="px-4 py-2">{{ '%02d'|format(chapter.number) }}</td>
{% endif %}
<td class="px-4 py-2 w-full text-left">
{% if chapter.cbzPath is not null %}
<a data-turbo-frame="_top" href="{{ path('app_manga_read', { mangaSlug: manga.slug, chapterNumber: chapter.number, pageNumber: 1 }) }}">
{{ chapter.title ?? 'No title' }}
</a>
{% else %}
{{ chapter.title ?? 'No title' }}
{% endif %}
</td>
<td class="px-4 py-2 flex justify-end gap-2">
{% if chapter.cbzPath is null %}
<button
data-controller="download"
data-action="download#download"
data-download-url-value="{{ path('search_chapter', {id: chapter.id}) }}"
>
<span class="text-gray-500 hover:text-green-500">
<i data-download-target="icon" class="fas fa-search"></i>
</span>
</button>
{% else %}
<button disabled>
<span class="text-gray-500">
<i class="fas fa-search"></i>
</span>
</button>
{% endif %}
<a href="#"
data-controller="download"
data-action="download#download"
data-download-url-value="{{ path('download_cbz', {chapterId: chapter.id}) }}"
class="w-8 text-center">
<i data-download-target="icon"
class="fas fa-download text-gray-500 hover:text-green-500"></i>
</a>
</td>
</tr>

View File

@@ -1,6 +1,5 @@
{% block body %}
{% if currentView == 'poster' %}
{# Vue poster actuelle #}
<div
class="w-full p-4 grid sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-8 2xl:grid-cols-12 gap-4">
{% for manga in mangas %}
@@ -25,7 +24,6 @@
{% endfor %}
</div>
{% elseif currentView == 'resume' %}
{# Vue résumé #}
<div class="w-full p-4 space-y-4">
{% for manga in mangas %}
<div