From d9f57e4e869b9a8686e29d67ec4250329b78faed Mon Sep 17 00:00:00 2001 From: User Date: Tue, 21 Jan 2025 19:57:07 -0500 Subject: [PATCH] 0.1.4 --- app/Http/Controllers/ComicController.php | 3 +- app/Jobs/ComicUpsert.php | 6 +- app/Jobs/ImageUpsert.php | 9 +- app/Jobs/RemotePrefetch.php | 18 +- app/Remote/CopyManga.php | 39 ++-- bootstrap/providers.php | 1 + bun.lockb | Bin 171182 -> 171159 bytes composer.json | 4 +- composer.lock | 208 +++++++++++---------- config/queue-monitor.php | 60 ------ package.json | 6 +- resources/js/Pages/Comic/Chapters.jsx | 27 ++- resources/js/Pages/Comic/Histories.jsx | 2 +- resources/js/Pages/Comic/Index.jsx | 31 +-- resources/js/Pages/Comic/Read.jsx | 6 +- resources/js/Pages/Pages/Updates.jsx | 14 +- resources/js/components/ui/app-sidebar.jsx | 2 +- 17 files changed, 206 insertions(+), 230 deletions(-) delete mode 100644 config/queue-monitor.php diff --git a/app/Http/Controllers/ComicController.php b/app/Http/Controllers/ComicController.php index b69fafd..32ad4f7 100644 --- a/app/Http/Controllers/ComicController.php +++ b/app/Http/Controllers/ComicController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use App\Helper\ZhConversion; -use App\Jobs\ComicInsert; use App\Jobs\ComicUpsert; use App\Jobs\ImageUpsert; use App\Jobs\RemotePrefetch; @@ -224,7 +223,7 @@ class ComicController extends Controller $offset = $request->header('offset', 0); $comic = $this->copyManga->comic($pathword); - $chapters = $this->copyManga->chapters($pathword, 200, $offset, [], $request->get('group', 'default')); + $chapters = $this->copyManga->chapters($pathword, 200, $offset, [], $request->get('group', 'default'), $request->get('reload', false)); // Get the comic object and fill other parameters try { diff --git a/app/Jobs/ComicUpsert.php b/app/Jobs/ComicUpsert.php index 13f13d1..643d152 100644 --- a/app/Jobs/ComicUpsert.php +++ b/app/Jobs/ComicUpsert.php @@ -4,15 +4,13 @@ namespace App\Jobs; use App\Models\Author; use App\Models\Comic; -use App\Models\Image; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Queue\Queueable; use Illuminate\Support\Facades\Log; -use romanzipp\QueueMonitor\Traits\IsMonitored; class ComicUpsert implements ShouldQueue { - use IsMonitored, Queueable; + use Queueable; /** * Create a new job instance. @@ -26,7 +24,6 @@ class ComicUpsert implements ShouldQueue */ public function handle(): void { - $this->queueProgress(0); Log::info("JOB ComicUpsert START"); $comicsUpsertArray = []; @@ -66,6 +63,5 @@ class ComicUpsert implements ShouldQueue } Log::info('JOB ComicUpsert END'); - $this->queueProgress(100); } } diff --git a/app/Jobs/ImageUpsert.php b/app/Jobs/ImageUpsert.php index de29b90..c708f8f 100644 --- a/app/Jobs/ImageUpsert.php +++ b/app/Jobs/ImageUpsert.php @@ -6,11 +6,10 @@ use App\Models\Image; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Queue\Queueable; use Illuminate\Support\Facades\Log; -use romanzipp\QueueMonitor\Traits\IsMonitored; class ImageUpsert implements ShouldQueue { - use IsMonitored, Queueable; + use Queueable; /** * Create a new job instance. @@ -26,12 +25,7 @@ class ImageUpsert implements ShouldQueue */ public function handle(): void { - $this->queueProgress(0); Log::info("JOB ImageUpsert START, comicId: {$this->comicId}, chapterId: {$this->chapterId}"); - $this->queueData([ - 'comicId' => $this->comicId, - 'chapterId' => $this->chapterId, - ]); $arrayForUpsert = []; @@ -53,6 +47,5 @@ class ImageUpsert implements ShouldQueue Image::upsert($arrayForUpsert, uniqueBy: 'url'); Log::info('JOB ImageUpsert END'); - $this->queueProgress(100); } } diff --git a/app/Jobs/RemotePrefetch.php b/app/Jobs/RemotePrefetch.php index 4474150..aecf014 100644 --- a/app/Jobs/RemotePrefetch.php +++ b/app/Jobs/RemotePrefetch.php @@ -6,11 +6,10 @@ use App\Remote\CopyManga; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Queue\Queueable; use Illuminate\Support\Facades\Log; -use romanzipp\QueueMonitor\Traits\IsMonitored; class RemotePrefetch implements ShouldQueue { - use IsMonitored, Queueable; + use Queueable; /** * Create a new job instance. @@ -25,17 +24,11 @@ class RemotePrefetch implements ShouldQueue */ public function handle(): void { - $this->queueProgress(0); $copyManga = new CopyManga(); switch ($this->action) { case 'chapter': Log::info("JOB RemotePrefetch START, action '{$this->action}', Pathword: {$this->parameters['pathword']}, UUID: {$this->parameters['uuid']}"); - $this->queueData([ - 'action' => $this->action, - 'pathword' => $this->parameters['pathword'], - 'uuid' => $this->parameters['uuid'] - ]); $copyManga->chapter($this->parameters['pathword'], $this->parameters['uuid']); @@ -46,13 +39,6 @@ class RemotePrefetch implements ShouldQueue break; case 'comics': Log::info("JOB RemotePrefetch START, action '{$this->action}', Offset: {$this->parameters['offset']}"); - $this->queueData([ - 'action' => $this->action, - 'offset' => $this->parameters['offset'], - 'limit' => $this->parameters['limit'], - 'top' => $this->parameters['top'], - 'params' => $this->parameters['params'] - ]); $copyManga->comics($this->parameters['offset'], $this->parameters['limit'], $this->parameters['top'], $this->parameters['params']); @@ -62,7 +48,5 @@ class RemotePrefetch implements ShouldQueue Log::info("JOB RemotePrefetch Unknown action '{$this->action}'"); break; } - - $this->queueProgress(100); } } diff --git a/app/Remote/CopyManga.php b/app/Remote/CopyManga.php index 911dfe2..9664e4d 100644 --- a/app/Remote/CopyManga.php +++ b/app/Remote/CopyManga.php @@ -123,19 +123,24 @@ class CopyManga * @param string $method * @param string $userAgent * @param int $ttl + * @param bool $force * @return mixed|string * @throws GuzzleException */ - protected function execute(string $url, string $method = 'GET', string $userAgent = "", int $ttl = 0): mixed + protected function execute(string $url, string $method = 'GET', string $userAgent = "", int $ttl = 0, bool $force = false): mixed { - if ($this->options['caching']) { - // Check cache exist - if (Cache::has("URL_{$url}")) { - $cache = Cache::get("URL_{$url}"); - if (isset($cache['type']) && $cache['type'] == 'HTML') { - return $cache['response']; - } else { - return $cache; + if ($force) { + $this->forget($url); + } else { + if ($this->options['caching']) { + // Check cache exist + if (Cache::has("URL_{$url}")) { + $cache = Cache::get("URL_{$url}"); + if (isset($cache['type']) && $cache['type'] == 'HTML') { + return $cache['response']; + } else { + return $cache; + } } } } @@ -178,6 +183,17 @@ class CopyManga } } + /** + * Remove a cache with key + * + * @param string $url + * @return void + */ + public function forget(string $url): void + { + Cache::forget("URL_{$url}"); + } + /** * Get tags available * @@ -256,16 +272,17 @@ class CopyManga * @param int $offset * @param array $parameters * @param string $group + * @param bool $force * @return mixed|string * @throws GuzzleException */ - public function chapters(string $comic, int $limit = 200, int $offset = 0, array $parameters = [], string $group = "default"): mixed + public function chapters(string $comic, int $limit = 200, int $offset = 0, array $parameters = [], string $group = "default", bool $force = false): mixed { $parameters['limit'] = $limit; $parameters['offset'] = $offset; $options = $this->execute($this->buildUrl("comic/{$comic}/group/{$group}/chapters", $parameters, false), 'OPTIONS'); - return $this->execute($this->buildUrl("comic/{$comic}/group/{$group}/chapters", $parameters), ttl: 24 * 60 * 60); + return $this->execute($this->buildUrl("comic/{$comic}/group/{$group}/chapters", $parameters), ttl: 24 * 60 * 60, force: $force); } /** diff --git a/bootstrap/providers.php b/bootstrap/providers.php index 38b258d..4e3b440 100644 --- a/bootstrap/providers.php +++ b/bootstrap/providers.php @@ -2,4 +2,5 @@ return [ App\Providers\AppServiceProvider::class, + App\Providers\HorizonServiceProvider::class, ]; diff --git a/bun.lockb b/bun.lockb index 5514e1a6cecde44045812aad248664c06d7f154d..7d3305ecf0e6e3387eadd8d3b5ac1bb47d737c55 100755 GIT binary patch delta 9964 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 bBI`?LPn$lyx?*}Q4~rIqZ4=wYfo}f+q%bfV diff --git a/composer.json b/composer.json index 1794416..cb9ec57 100644 --- a/composer.json +++ b/composer.json @@ -11,11 +11,11 @@ "ext-openssl": "*", "inertiajs/inertia-laravel": "^2.0", "laravel/framework": "^11.31", + "laravel/horizon": "^5.30", "laravel/sanctum": "^4.0", "laravel/tinker": "^2.9", "plesk/ext-laravel-integration": "^7.0", "predis/predis": "^2.0", - "romanzipp/laravel-queue-monitor": "^5.3", "sentry/sentry-laravel": "^4.10", "tightenco/ziggy": "^2.0" }, @@ -60,7 +60,7 @@ ], "dev": [ "Composer\\Config::disableProcessTimeout", - "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite" + "bun concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"bun run dev\" --names=server,queue,logs,vite" ] }, "extra": { diff --git a/composer.lock b/composer.lock index c6ee78f..6311a4a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6f784bba21b3b875b87a164afa37ff36", + "content-hash": "4fdc8c399054a90a77205cf8919b938e", "packages": [ { "name": "brick/math", @@ -1189,16 +1189,16 @@ }, { "name": "laravel/framework", - "version": "v11.38.2", + "version": "v11.39.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "9d290aa90fcad44048bedca5219d2b872e98772a" + "reference": "996c96955f78e8a2b26a24c490a1721cfb14574f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/9d290aa90fcad44048bedca5219d2b872e98772a", - "reference": "9d290aa90fcad44048bedca5219d2b872e98772a", + "url": "https://api.github.com/repos/laravel/framework/zipball/996c96955f78e8a2b26a24c490a1721cfb14574f", + "reference": "996c96955f78e8a2b26a24c490a1721cfb14574f", "shasum": "" }, "require": { @@ -1399,7 +1399,87 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-01-15T00:06:46+00:00" + "time": "2025-01-21T15:02:43+00:00" + }, + { + "name": "laravel/horizon", + "version": "v5.30.2", + "source": { + "type": "git", + "url": "https://github.com/laravel/horizon.git", + "reference": "baef526f036717b0090754cbd9c9b67f879739fd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/horizon/zipball/baef526f036717b0090754cbd9c9b67f879739fd", + "reference": "baef526f036717b0090754cbd9c9b67f879739fd", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-pcntl": "*", + "ext-posix": "*", + "illuminate/contracts": "^9.21|^10.0|^11.0", + "illuminate/queue": "^9.21|^10.0|^11.0", + "illuminate/support": "^9.21|^10.0|^11.0", + "nesbot/carbon": "^2.17|^3.0", + "php": "^8.0", + "ramsey/uuid": "^4.0", + "symfony/console": "^6.0|^7.0", + "symfony/error-handler": "^6.0|^7.0", + "symfony/polyfill-php83": "^1.28", + "symfony/process": "^6.0|^7.0" + }, + "require-dev": { + "mockery/mockery": "^1.0", + "orchestra/testbench": "^7.0|^8.0|^9.0", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^9.0|^10.4", + "predis/predis": "^1.1|^2.0" + }, + "suggest": { + "ext-redis": "Required to use the Redis PHP driver.", + "predis/predis": "Required when not using the Redis PHP driver (^1.1|^2.0)." + }, + "type": "library", + "extra": { + "laravel": { + "aliases": { + "Horizon": "Laravel\\Horizon\\Horizon" + }, + "providers": [ + "Laravel\\Horizon\\HorizonServiceProvider" + ] + }, + "branch-alias": { + "dev-master": "5.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\Horizon\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Dashboard and code-driven configuration for Laravel queues.", + "keywords": [ + "laravel", + "queue" + ], + "support": { + "issues": "https://github.com/laravel/horizon/issues", + "source": "https://github.com/laravel/horizon/tree/v5.30.2" + }, + "time": "2025-01-13T16:51:22+00:00" }, { "name": "laravel/prompts", @@ -3681,76 +3761,6 @@ ], "time": "2024-04-27T21:32:50+00:00" }, - { - "name": "romanzipp/laravel-queue-monitor", - "version": "5.3.7", - "source": { - "type": "git", - "url": "https://github.com/romanzipp/Laravel-Queue-Monitor.git", - "reference": "7412f5315bbb2fa5ea4a05743d615e56b397a96e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/romanzipp/Laravel-Queue-Monitor/zipball/7412f5315bbb2fa5ea4a05743d615e56b397a96e", - "reference": "7412f5315bbb2fa5ea4a05743d615e56b397a96e", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-mbstring": "*", - "illuminate/database": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/queue": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "nesbot/carbon": "^2.0|^3.0", - "php": "^8.0" - }, - "require-dev": { - "doctrine/dbal": "^3.1", - "friendsofphp/php-cs-fixer": "^3.0", - "laravel/framework": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "mockery/mockery": "^1.3.2", - "orchestra/testbench": ">=3.8", - "phpstan/phpstan": "^0.12.99|^1.0", - "phpunit/phpunit": "^8.5.23|^9.0|^10.5", - "romanzipp/php-cs-fixer-config": "^3.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "romanzipp\\QueueMonitor\\Providers\\QueueMonitorProvider" - ] - } - }, - "autoload": { - "psr-4": { - "romanzipp\\QueueMonitor\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "romanzipp", - "email": "ich@ich.wtf", - "homepage": "https://ich.wtf" - } - ], - "description": "Queue Monitoring for Laravel Database Job Queue", - "support": { - "issues": "https://github.com/romanzipp/Laravel-Queue-Monitor/issues", - "source": "https://github.com/romanzipp/Laravel-Queue-Monitor/tree/5.3.7" - }, - "funding": [ - { - "url": "https://github.com/romanzipp", - "type": "github" - } - ], - "time": "2024-12-05T14:46:27+00:00" - }, { "name": "sentry/sentry", "version": "4.10.0", @@ -7036,16 +7046,16 @@ }, { "name": "laravel/breeze", - "version": "v2.3.1", + "version": "v2.3.2", "source": { "type": "git", "url": "https://github.com/laravel/breeze.git", - "reference": "60ac80abfa08c3c2dbc61e4b16f02230b843cfd3" + "reference": "2a4764055792b14e0e571a710adbda9c9eb300d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/breeze/zipball/60ac80abfa08c3c2dbc61e4b16f02230b843cfd3", - "reference": "60ac80abfa08c3c2dbc61e4b16f02230b843cfd3", + "url": "https://api.github.com/repos/laravel/breeze/zipball/2a4764055792b14e0e571a710adbda9c9eb300d4", + "reference": "2a4764055792b14e0e571a710adbda9c9eb300d4", "shasum": "" }, "require": { @@ -7093,7 +7103,7 @@ "issues": "https://github.com/laravel/breeze/issues", "source": "https://github.com/laravel/breeze" }, - "time": "2025-01-13T16:52:29+00:00" + "time": "2025-01-21T14:57:42+00:00" }, { "name": "laravel/pail", @@ -7544,16 +7554,16 @@ }, { "name": "pestphp/pest", - "version": "v3.7.1", + "version": "v3.7.2", "source": { "type": "git", "url": "https://github.com/pestphp/pest.git", - "reference": "bf3178473dcaa53b0458f21dfdb271306ea62512" + "reference": "709ecb1ba2641fc0c4653ebe1fd8a402bbf4d18b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest/zipball/bf3178473dcaa53b0458f21dfdb271306ea62512", - "reference": "bf3178473dcaa53b0458f21dfdb271306ea62512", + "url": "https://api.github.com/repos/pestphp/pest/zipball/709ecb1ba2641fc0c4653ebe1fd8a402bbf4d18b", + "reference": "709ecb1ba2641fc0c4653ebe1fd8a402bbf4d18b", "shasum": "" }, "require": { @@ -7564,17 +7574,17 @@ "pestphp/pest-plugin-arch": "^3.0.0", "pestphp/pest-plugin-mutate": "^3.0.5", "php": "^8.2.0", - "phpunit/phpunit": "^11.5.1" + "phpunit/phpunit": "^11.5.3" }, "conflict": { "filp/whoops": "<2.16.0", - "phpunit/phpunit": ">11.5.1", + "phpunit/phpunit": ">11.5.3", "sebastian/exporter": "<6.0.0", "webmozart/assert": "<1.11.0" }, "require-dev": { "pestphp/pest-dev-tools": "^3.3.0", - "pestphp/pest-plugin-type-coverage": "^3.2.0", + "pestphp/pest-plugin-type-coverage": "^3.2.3", "symfony/process": "^7.2.0" }, "bin": [ @@ -7640,7 +7650,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v3.7.1" + "source": "https://github.com/pestphp/pest/tree/v3.7.2" }, "funding": [ { @@ -7652,7 +7662,7 @@ "type": "github" } ], - "time": "2024-12-12T11:52:01+00:00" + "time": "2025-01-19T17:35:09+00:00" }, { "name": "pestphp/pest-plugin", @@ -8605,16 +8615,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.1", + "version": "11.5.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2b94d4f2450b9869fa64a46fd8a6a41997aef56a" + "reference": "30e319e578a7b5da3543073e30002bf82042f701" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2b94d4f2450b9869fa64a46fd8a6a41997aef56a", - "reference": "2b94d4f2450b9869fa64a46fd8a6a41997aef56a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/30e319e578a7b5da3543073e30002bf82042f701", + "reference": "30e319e578a7b5da3543073e30002bf82042f701", "shasum": "" }, "require": { @@ -8628,14 +8638,14 @@ "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.2", - "phpunit/php-code-coverage": "^11.0.7", + "phpunit/php-code-coverage": "^11.0.8", "phpunit/php-file-iterator": "^5.1.0", "phpunit/php-invoker": "^5.0.1", "phpunit/php-text-template": "^4.0.1", "phpunit/php-timer": "^7.0.1", "sebastian/cli-parser": "^3.0.2", - "sebastian/code-unit": "^3.0.1", - "sebastian/comparator": "^6.2.1", + "sebastian/code-unit": "^3.0.2", + "sebastian/comparator": "^6.3.0", "sebastian/diff": "^6.0.2", "sebastian/environment": "^7.2.0", "sebastian/exporter": "^6.3.0", @@ -8686,7 +8696,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.1" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.3" }, "funding": [ { @@ -8702,7 +8712,7 @@ "type": "tidelift" } ], - "time": "2024-12-11T10:52:48+00:00" + "time": "2025-01-13T09:36:00+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/queue-monitor.php b/config/queue-monitor.php deleted file mode 100644 index f7ec055..0000000 --- a/config/queue-monitor.php +++ /dev/null @@ -1,60 +0,0 @@ - 'queue_monitor', - 'connection' => null, - - /* - * Set the model used for monitoring. - * If using a custom model, be sure to implement the - * romanzipp\QueueMonitor\Models\Contracts\MonitorContract - * interface or extend the base model. - */ - 'model' => \romanzipp\QueueMonitor\Models\Monitor::class, - - // Determined if the queued jobs should be monitored - 'monitor_queued_jobs' => true, - - // Specify the max character length to use for storing exception backtraces. - 'db_max_length_exception' => 4294967295, - 'db_max_length_exception_message' => 65535, - - // The optional UI settings. - 'ui' => [ - // Enable the UI - 'enabled' => true, - - // Accepts route group configuration - 'route' => [ - 'prefix' => 'queues', - 'middleware' => [], - ], - - // Set the monitored jobs count to be displayed per page. - 'per_page' => 50, - - // Show custom data stored on model - 'show_custom_data' => true, - - // Allow the deletion of single monitor items. - 'allow_deletion' => true, - - // Allow retry for a single failed monitor item. - 'allow_retry' => true, - - // Allow purging all monitor entries. - 'allow_purge' => true, - - 'show_metrics' => true, - - // Time frame used to calculate metrics values (in days). - 'metrics_time_frame' => 14, - - // The interval before refreshing the dashboard (in seconds). - 'refresh_interval' => 5, - - // Order the queued but not started jobs first - 'order_queued_first' => false, - ], -]; diff --git a/package.json b/package.json index 5f8bc7c..d5f0295 100644 --- a/package.json +++ b/package.json @@ -7,18 +7,18 @@ }, "devDependencies": { "@headlessui/react": "^2.2.0", - "@inertiajs/react": "^2.0.2", + "@inertiajs/react": "^2.0.3", "@tailwindcss/forms": "^0.5.10", "@vitejs/plugin-react": "^4.3.4", "autoprefixer": "^10.4.20", "axios": "^1.7.9", "concurrently": "^9.1.2", - "laravel-vite-plugin": "^1.1.1", + "laravel-vite-plugin": "^1.2.0", "postcss": "^8.5.1", "react": "^18.3.1", "react-dom": "^18.3.1", "tailwindcss": "^3.4.17", - "vite": "^6.0.7" + "vite": "^6.0.11" }, "dependencies": { "@hookform/resolvers": "^3.10.0", diff --git a/resources/js/Pages/Comic/Chapters.jsx b/resources/js/Pages/Comic/Chapters.jsx index 4b732c8..045a10a 100644 --- a/resources/js/Pages/Comic/Chapters.jsx +++ b/resources/js/Pages/Comic/Chapters.jsx @@ -1,6 +1,6 @@ import { useState } from 'react'; import { Head, Link, router } from '@inertiajs/react'; -import { Plus, Star, ArrowDownNarrowWide, ArrowUpNarrowWide, ChevronsLeft, ChevronsRight, Trash2 } from 'lucide-react'; +import { Plus, Star, ArrowDownNarrowWide, ArrowUpNarrowWide, ChevronsLeft, ChevronsRight, Trash2, RefreshCw } from 'lucide-react'; import AppLayout from '@/Layouts/AppLayout.jsx'; @@ -47,6 +47,13 @@ export default function Chapters({ auth, comic, chapters, histories, offset }) { }); } + const forceReload = (pathword) => { + router.get(`/comic/${ comic.comic.path_word }?reload=true`, {}, { + only: ['chapters'], + preserveState: true, + }); + } + const groupOnClickHandler = (pathword) => { router.get(`/comic/${ comic.comic.path_word }?group=${ pathword }`, {}, { only: ['chapters'], @@ -97,7 +104,8 @@ export default function Chapters({ auth, comic, chapters, histories, offset }) { { comic.comic.name } -
+
@@ -188,6 +196,19 @@ export default function Chapters({ auth, comic, chapters, histories, offset }) { + + + + + + +

Force reload

+ + + + @@ -205,7 +226,7 @@ export default function Chapters({ auth, comic, chapters, histories, offset }) {
- { (chapters.total > chapters.limit && chapters.offset > 0) && ( + { (chapters.total > (chapters.limit + chapters.offset) && chapters.offset > 0) && (