Skip to content

A self-hosted media server and file management system

category page barebones

aminnausinfcc778871f33
diff --git a/app/Http/Resources/CategoryResource.php b/app/Http/Resources/CategoryResource.php
index bf240bc1..b19bfd30 100755
--- a/app/Http/Resources/CategoryResource.php
+++ b/app/Http/Resources/CategoryResource.php
@@ -17,6 +17,8 @@ class CategoryResource extends JsonResource {
'name' => $this->name,
'folders_count' => $this->folders_count ?? 0,
'folders' => FolderResource::collection($this->folders),
+ 'created_at' => $this->created_at,
+ 'last_scan' => $this->last_scan,
];
}
}
diff --git a/app/Http/Resources/Pulse/CacheResource.php b/app/Http/Resources/Pulse/CacheResource.php
deleted file mode 100644
index 876f6dec..00000000
--- a/app/Http/Resources/Pulse/CacheResource.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Pulse;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Laravel\Pulse\Recorders\CacheInteractions as CacheInteractionsRecorder;
-
-class CacheResource extends PulseResource {
- public function toArray(Request $request): array {
- [$cacheInteractions, $allTime, $allRunAt] = $this->remember(
- fn () => with(
- $this->aggregateTotal(['cache_hit', 'cache_miss'], 'count'),
- fn ($results) => (object) [
- 'hits' => $results['cache_hit'] ?? 0,
- 'misses' => $results['cache_miss'] ?? 0,
- ]
- ),
- 'all'
- );
-
- [$cacheKeyInteractions, $keyTime, $keyRunAt] = $this->remember(
- fn () => $this->aggregateTypes(['cache_hit', 'cache_miss'], 'count')
- ->map(function ($row) {
- return (object) [
- 'key' => $row->key,
- 'hits' => $row->cache_hit ?? 0,
- 'misses' => $row->cache_miss ?? 0,
- ];
- }),
- 'keys'
- );
-
- return [
- 'cache' => [
- 'allTime' => $allTime,
- 'allRunAt' => $allRunAt,
- 'allCacheInteractions' => $cacheInteractions,
- 'keyTime' => $keyTime,
- 'keyRunAt' => $keyRunAt,
- 'cacheKeyInteractions' => $cacheKeyInteractions,
- $this->mergeWhen(
- config('pulse-api.include_config'),
- ['config' => Config::get('pulse.recorders.' . CacheInteractionsRecorder::class)]
- ),
- ],
- ];
- }
-}
diff --git a/app/Http/Resources/Pulse/ExceptionsResource.php b/app/Http/Resources/Pulse/ExceptionsResource.php
deleted file mode 100644
index 50f9698b..00000000
--- a/app/Http/Resources/Pulse/ExceptionsResource.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Pulse;
-
-use Carbon\CarbonImmutable;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Laravel\Pulse\Recorders\Exceptions as ExceptionsRecorder;
-use Livewire\Attributes\Url;
-
-class ExceptionsResource extends PulseResource {
- #[Url(as: 'exceptions')]
- public string $orderBy = 'count';
-
- public function toArray(Request $request): array {
- [$exceptions, $time, $runAt] = $this->remember(
- fn () => $this->aggregate(
- 'exception',
- ['max', 'count'],
- match ($this->orderBy) {
- 'latest' => 'max',
- default => 'count'
- },
- )->map(function ($row) {
- [$class, $location] = json_decode($row->key, flags: JSON_THROW_ON_ERROR);
-
- return (object) [
- 'class' => $class,
- 'location' => $location,
- 'latest' => CarbonImmutable::createFromTimestamp($row->max),
- 'count' => $row->count,
- ];
- }),
- $this->orderBy
- );
-
- return [
- 'exceptions' => [
- 'time' => $time,
- 'runAt' => $runAt,
- 'exceptions' => $exceptions,
- $this->mergeWhen(
- config('pulse-api.include_config'),
- ['config' => Config::get('pulse.recorders.' . ExceptionsRecorder::class)]
- ),
- ],
- ];
- }
-}
diff --git a/app/Http/Resources/Pulse/QueueResource.php b/app/Http/Resources/Pulse/QueueResource.php
deleted file mode 100644
index 612da165..00000000
--- a/app/Http/Resources/Pulse/QueueResource.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Pulse;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Str;
-use Laravel\Pulse\Recorders\Queues as QueuesRecorder;
-
-class QueueResource extends PulseResource {
- public function toArray(Request $request): array {
- [$queues, $time, $runAt] = $this->remember(fn () => $this->graph(
- ['queued', 'processing', 'processed', 'released', 'failed'],
- 'count',
- ));
-
- return [
- 'queues' => [
- 'queues' => $queues,
- 'showConnection' => $queues->keys()->map(fn ($queue) => Str::before($queue, ':'))->unique()->count() > 1,
- 'time' => $time,
- 'runAt' => $runAt,
- $this->mergeWhen(
- config('pulse-api.include_config'),
- ['config' => Config::get('pulse.recorders.' . QueuesRecorder::class)]
- ),
- ],
- ];
- }
-}
diff --git a/app/Http/Resources/Pulse/ScheduleResource.php b/app/Http/Resources/Pulse/ScheduleResource.php
new file mode 100644
index 00000000..4e04f04e
--- /dev/null
+++ b/app/Http/Resources/Pulse/ScheduleResource.php
@@ -0,0 +1,133 @@
+<?php
+
+
+namespace App\Http\Resources\Pulse;
+
+use Carbon\CarbonImmutable;
+use Carbon\CarbonInterval;
+use Illuminate\Http\Request;
+
+use function Safe\preg_replace;
+
+use Closure;
+use Cron\CronExpression;
+use DateTimeZone;
+use Illuminate\Console\Application;
+use Illuminate\Console\Scheduling\CallbackEvent;
+use Illuminate\Console\Scheduling\Event;
+use Illuminate\Console\Scheduling\Schedule as IlluminateSchedule;
+use Illuminate\Contracts\Console\Kernel as ConsoleKernel;
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Carbon;
+use Laravel\Pulse\Livewire\Card;
+use Livewire\Attributes\Lazy;
+use ReflectionClass;
+use ReflectionFunction;
+
+class ScheduleResource extends PulseResource {
+ public int|string|null $ignoreAfter = null;
+
+ public function toArray(Request $request,): array {
+ [$events, $time, $runAt] = $this->remember(function (ConsoleKernel $kernel, IlluminateSchedule $schedule) {
+ $kernel->bootstrap();
+
+ $timezone = new DateTimeZone(config('app.timezone')); // @phpstan-ignore-line
+ $events = collect($schedule->events())
+ ->map(fn(Event $event): array => [
+ 'command' => $this->getCommand($event),
+ 'expression' => $this->getExpression($event),
+ 'next_due' => $this->getNextDueDateForEvent($event, $timezone)
+ ->diffForHumans(),
+ ]);
+
+ return $events;
+ });
+
+ return [
+ 'schedule' => [
+ 'schedule' => $events,
+ 'time' => $time,
+ 'runAt' => $runAt,
+ ],
+ ];
+ }
+
+ private function getClosureLocation(CallbackEvent $event): string {
+ $callback = (new ReflectionClass($event))->getProperty('callback')->getValue($event);
+
+ if ($callback instanceof Closure) {
+ $function = new ReflectionFunction($callback);
+
+ return sprintf(
+ '%s:%s',
+ str_replace(app()->basePath() . DIRECTORY_SEPARATOR, '', $function->getFileName() ?: ''),
+ $function->getStartLine()
+ );
+ }
+
+ if (is_string($callback)) {
+ return $callback;
+ }
+
+ if (is_array($callback)) {
+ $className = is_string($callback[0]) ? $callback[0] : $callback[0]::class;
+
+ return sprintf('%s::%s', $className, $callback[1]);
+ }
+
+ return sprintf('%s::__invoke', $callback::class); // @phpstan-ignore-line
+ }
+
+ private function getCommand(Event $event): string {
+ $command = str_replace([Application::phpBinary(), Application::artisanBinary()], [
+ 'php',
+ preg_replace("#['\"]#", '', Application::artisanBinary()),
+ ], $event->command ?? '');
+
+ if ($event instanceof CallbackEvent) {
+ $command = $event->getSummaryForDisplay();
+
+ if (in_array($command, ['Closure', 'Callback'], true)) {
+ $command = 'Closure at: ' . $this->getClosureLocation($event);
+ }
+ }
+
+ return mb_strlen($command) > 1 ? "{$command} " : '';
+ }
+
+ private function getExpression(Event $event): string {
+ if (! $event->isRepeatable()) {
+ return $event->getExpression();
+ }
+
+ return "{$event->getExpression()} ({$event->repeatSeconds}s)";
+ }
+
+ private function getNextDueDateForEvent(Event $event, DateTimeZone $timezone): Carbon {
+ $nextDueDate = Carbon::instance(
+ (new CronExpression($event->expression))
+ ->getNextRunDate(Carbon::now()->setTimezone($event->timezone))
+ ->setTimezone($timezone)
+ );
+
+ if (! $event->isRepeatable()) {
+ return $nextDueDate;
+ }
+
+ $previousDueDate = Carbon::instance(
+ (new CronExpression($event->expression))
+ ->getPreviousRunDate(Carbon::now()->setTimezone($event->timezone), allowCurrentDate: true)
+ ->setTimezone($timezone)
+ );
+
+ $now = Carbon::now()->setTimezone($event->timezone);
+
+ if (! $now->copy()->startOfMinute()->eq($previousDueDate)) {
+ return $nextDueDate;
+ }
+
+ return $now
+ ->endOfSecond()
+ ->ceilSeconds($event->repeatSeconds); // @phpstan-ignore-line
+ }
+}
diff --git a/app/Http/Resources/Pulse/ServersResource.php b/app/Http/Resources/Pulse/ServersResource.php
deleted file mode 100644
index e8d251f2..00000000
--- a/app/Http/Resources/Pulse/ServersResource.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Pulse;
-
-use Carbon\CarbonImmutable;
-use Carbon\CarbonInterval;
-use Illuminate\Http\Request;
-
-class ServersResource extends PulseResource {
- public int|string|null $ignoreAfter = null;
-
- public function toArray(Request $request): array {
- [$servers, $time, $runAt] = $this->remember(function () {
- $graphs = $this->graph(['cpu', 'memory'], 'avg');
-
- return $this->values('system')
- ->map(function ($system, $slug) use ($graphs) {
- if ($this->ignoreSystem($system)) {
- return null;
- }
-
- $values = json_decode($system->value, flags: JSON_THROW_ON_ERROR);
-
- return (object) [
- 'name' => (string) $values->name,
- 'cpu_current' => (int) $values->cpu,
- 'cpu' => $graphs->get($slug)?->get('cpu') ?? collect(),
- 'memory_current' => (int) $values->memory_used,
- 'memory_total' => (int) $values->memory_total,
- 'memory' => $graphs->get($slug)?->get('memory') ?? collect(),
- 'storage' => collect($values->storage),
- 'updated_at' => $updatedAt = CarbonImmutable::createFromTimestamp($system->timestamp),
- 'recently_reported' => $updatedAt->isAfter(now()->subSeconds(30)),
- ];
- })
- ->filter()
- ->sortBy('name');
- });
-
- return [
- 'servers' => [
- 'servers' => $servers,
- 'time' => $time,
- 'runAt' => $runAt,
- ],
- ];
- }
-
- protected function ignoreSystem(object $system): bool {
- if ($this->ignoreAfter === null) {
- return false;
- }
-
- $ignoreAfter = is_numeric($this->ignoreAfter)
- ? (int) $this->ignoreAfter
- : CarbonInterval::createFromDateString($this->ignoreAfter)->totalSeconds;
-
- return CarbonImmutable::createFromTimestamp($system->timestamp)->addSeconds($ignoreAfter)->isPast();
- }
-}
diff --git a/app/Http/Resources/Pulse/SlowJobsResource.php b/app/Http/Resources/Pulse/SlowJobsResource.php
deleted file mode 100644
index 4640ee46..00000000
--- a/app/Http/Resources/Pulse/SlowJobsResource.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Pulse;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Laravel\Pulse\Recorders\Concerns\Thresholds;
-use Laravel\Pulse\Recorders\SlowJobs as SlowJobsRecorder;
-use Livewire\Attributes\Url;
-
-class SlowJobsResource extends PulseResource {
- use Thresholds;
-
- /**
- * Ordering.
- *
- * @var 'slowest'|'count'
- */
- #[Url(as: 'slow-jobs')]
- public string $orderBy = 'slowest';
-
- public function toArray(Request $request): array {
- [$slowJobs, $time, $runAt] = $this->remember(
- fn () => $this->aggregate(
- 'slow_job',
- ['max', 'count'],
- match ($this->orderBy) {
- 'count' => 'count',
- default => 'max',
- },
- )->map(fn ($row) => (object) [
- 'job' => $row->key,
- 'slowest' => $row->max,
- 'count' => $row->count,
- 'threshold' => $this->threshold($row->key, SlowJobsRecorder::class),
- ]),
- $this->orderBy,
- );
-
- return [
- 'slow_jobs' => [
- 'time' => $time,
- 'runAt' => $runAt,
- $this->mergeWhen(
- config('pulse-api.include_config'),
- ['config' => Config::get('pulse.recorders.' . SlowJobsRecorder::class)]
- ),
- 'slowJobs' => $slowJobs,
- ],
- ];
- }
-}
diff --git a/app/Http/Resources/Pulse/SlowOutgoingRequestsResource.php b/app/Http/Resources/Pulse/SlowOutgoingRequestsResource.php
deleted file mode 100644
index cdd02f47..00000000
--- a/app/Http/Resources/Pulse/SlowOutgoingRequestsResource.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Pulse;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Laravel\Pulse\Recorders\Concerns\Thresholds;
-use Laravel\Pulse\Recorders\SlowOutgoingRequests as SlowOutgoingRequestsRecorder;
-use Livewire\Attributes\Url;
-
-class SlowOutgoingRequestsResource extends PulseResource {
- use Thresholds;
-
- /**
- * Ordering.
- *
- * @var 'slowest'|'count'
- */
- #[Url(as: 'slow-outgoing-requests')]
- public string $orderBy = 'slowest';
-
- public function toArray(Request $request): array {
- [$slowOutgoingRequests, $time, $runAt] = $this->remember(
- fn () => $this->aggregate(
- 'slow_outgoing_request',
- ['max', 'count'],
- match ($this->orderBy) {
- 'count' => 'count',
- default => 'max',
- },
- )->map(function ($row) {
- [$method, $uri] = json_decode($row->key, flags: JSON_THROW_ON_ERROR);
-
- return (object) [
- 'method' => $method,
- 'uri' => $uri,
- 'slowest' => $row->max,
- 'count' => $row->count,
- 'threshold' => $this->threshold($uri, SlowOutgoingRequestsRecorder::class),
- ];
- }),
- $this->orderBy,
- );
-
- return [
- 'slow_outgoing_requests' => [
- 'time' => $time,
- 'runAt' => $runAt,
- $this->mergeWhen(
- config('pulse-api.include_config'),
- ['config' => Config::get('pulse.recorders.' . SlowOutgoingRequestsRecorder::class)]
- ),
- 'slowOutgoingRequests' => $slowOutgoingRequests,
- ],
- ];
- }
-}
diff --git a/app/Http/Resources/Pulse/SlowQueriesResource.php b/app/Http/Resources/Pulse/SlowQueriesResource.php
deleted file mode 100644
index e025643e..00000000
--- a/app/Http/Resources/Pulse/SlowQueriesResource.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Pulse;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\View;
-use Laravel\Pulse\Recorders\Concerns\Thresholds;
-use Laravel\Pulse\Recorders\SlowQueries as SlowQueriesRecorder;
-use Livewire\Attributes\Url;
-
-class SlowQueriesResource extends PulseResource {
- use Thresholds;
-
- /**
- * Ordering.
- *
- * @var 'slowest'|'count'
- */
- #[Url(as: 'slow-queries')]
- public string $orderBy = 'slowest';
-
- /**
- * Indicates that SQL highlighting should be disabled.
- */
- public bool $withoutHighlighting = false;
-
- /**
- * Indicates that SQL highlighting should be disabled.
- *
- * @deprecated
- */
- public bool $disableHighlighting = false;
-
- /**
- * Determine if the view should highlight SQL queries.
- */
- protected function wantsHighlighting(): bool {
- return ! ($this->withoutHighlighting || $this->disableHighlighting);
- }
-
- public function toArray(Request $request): array {
- [$slowQueries, $time, $runAt] = $this->remember(
- fn () => $this->aggregate(
- 'slow_query',
- ['max', 'count'],
- match ($this->orderBy) {
- 'count' => 'count',
- default => 'max',
- },
- )->map(function ($row) {
- [$sql, $location] = json_decode($row->key, flags: JSON_THROW_ON_ERROR);
-
- return (object) [
- 'sql' => $sql,
- 'location' => $location,
- 'slowest' => $row->max,
- 'count' => $row->count,
- 'threshold' => $this->threshold($sql, SlowQueriesRecorder::class),
- ];
- }),
- $this->orderBy,
- );
-
- return [
- 'slow_queries' => [
- 'time' => $time,
- 'runAt' => $runAt,
- $this->mergeWhen(
- config('pulse-api.include_config'),
- ['config' => Config::get('pulse.recorders.' . SlowQueriesRecorder::class)]
- ),
- 'slowQueries' => $slowQueries,
- ],
- ];
- }
-}
diff --git a/app/Http/Resources/Pulse/SlowRequestsResource.php b/app/Http/Resources/Pulse/SlowRequestsResource.php
deleted file mode 100644
index 27bdf1ec..00000000
--- a/app/Http/Resources/Pulse/SlowRequestsResource.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Pulse;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Laravel\Pulse\Recorders\Concerns\Thresholds;
-use Laravel\Pulse\Recorders\SlowRequests as SlowRequestsRecorder;
-use Livewire\Attributes\Url;
-
-class SlowRequestsResource extends PulseResource {
- use Thresholds;
-
- /**
- * Ordering.
- *
- * @var 'slowest'|'count'
- */
- #[Url(as: 'slow-requests')]
- public string $orderBy = 'slowest';
-
- public function toArray(Request $request): array {
- [$slowRequests, $time, $runAt] = $this->remember(
- fn () => $this->aggregate(
- 'slow_request',
- ['max', 'count'],
- match ($this->orderBy) {
- 'count' => 'count',
- default => 'max',
- },
- )->map(function ($row) {
- [$method, $uri, $action] = json_decode($row->key, flags: JSON_THROW_ON_ERROR);
-
- return (object) [
- 'uri' => $uri,
- 'method' => $method,
- 'action' => $action,
- 'count' => $row->count,
- 'slowest' => $row->max,
- 'threshold' => $this->threshold($uri, SlowRequestsRecorder::class),
- ];
- }),
- $this->orderBy,
- );
-
- return [
- 'slow_requests' => [
- 'time' => $time,
- 'runAt' => $runAt,
- 'slowRequests' => $slowRequests,
- $this->mergeWhen(
- config('pulse-api.include_config'),
- [
- 'config' => [
- 'threshold' => Config::get('pulse.recorders.' . SlowRequestsRecorder::class . '.threshold'),
- 'sample_rate' => Config::get('pulse.recorders.' . SlowRequestsRecorder::class . '.sample_rate'),
- ],
- ]
- ),
- ],
- ];
- }
-}
diff --git a/app/Http/Resources/Pulse/UsageResource.php b/app/Http/Resources/Pulse/UsageResource.php
deleted file mode 100644
index 4f62c7ea..00000000
--- a/app/Http/Resources/Pulse/UsageResource.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Pulse;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Laravel\Pulse\Facades\Pulse;
-use Laravel\Pulse\Recorders\SlowRequests;
-use Laravel\Pulse\Recorders\UserJobs;
-use Laravel\Pulse\Recorders\UserRequests;
-use Livewire\Attributes\Url;
-
-class UsageResource extends PulseResource {
- #[Url]
- public string $usage = 'requests';
-
- public function toArray(Request $request): array {
- $type = $this->type ?? $this->usage;
-
- [$userRequestCounts, $time, $runAt] = $this->remember(
- function () use ($type) {
- $counts = $this->aggregate(
- match ($type) {
- 'requests' => 'user_request',
- 'slow_requests' => 'slow_user_request',
- 'jobs' => 'user_job',
- default => null,
- },
- 'count',
- limit: 10,
- );
-
- $users = Pulse::resolveUsers($counts->pluck('key'));
-
- return $counts->map(fn ($row) => (object) [
- 'key' => $row->key,
- 'user' => $users->find($row->key),
- 'count' => (int) $row->count,
- ]);
- },
- $type
- );
-
- return [
- 'usage' => [
- 'time' => $time,
- 'runAt' => $runAt,
- $this->mergeWhen(config('pulse-api.include_config'), [
- 'userRequestsConfig' => Config::get('pulse.recorders.' . UserRequests::class),
- 'slowRequestsConfig' => Config::get('pulse.recorders.' . SlowRequests::class),
- 'jobsConfig' => Config::get('pulse.recorders.' . UserJobs::class),
- ]),
- 'userRequestCounts' => $userRequestCounts,
- ],
- ];
- }
-}
diff --git a/config/pulse-api.php b/config/pulse-api.php
index 53bc886c..1c4aa523 100644
--- a/config/pulse-api.php
+++ b/config/pulse-api.php
@@ -1,7 +1,8 @@
<?php
-use App\Services\PulseAPI;
+use App\Http\Resources\Pulse\ScheduleResource;
use Laravel\Pulse\Http\Middleware\Authorize;
+use Robertogallea\PulseApi\Services\PulseAPI;
return [
@@ -69,6 +70,7 @@ return [
'resources' => PulseAPI::getDefaultResources()->merge([
// Add your custom resources
+ // 'schedule' => ScheduleResource::class,
// PulseResourcesEnum::SERVERS->value => ServersResource::class,
// PulseResourcesEnum::USAGE->value => UsageResource::class,
// PulseResourcesEnum::QUEUES->value => QueueResource::class,
diff --git a/resources/js/components/cards/CategoryCard.vue b/resources/js/components/cards/CategoryCard.vue
new file mode 100644
index 00000000..2d9a157b
--- /dev/null
+++ b/resources/js/components/cards/CategoryCard.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import type { CategoryResource } from '@/types/resources';
+
+import CircumEdit from '~icons/circum/edit';
+import { toFormattedDate } from '@/service/util';
+import ButtonCorner from '../inputs/ButtonCorner.vue';
+import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
+
+const props = defineProps<{ data?: CategoryResource }>();
+</script>
+
+<template>
+ <div class="flex gap-2 p-4 overflow-clip rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white ring-1 ring-gray-900/5 w-full">
+ <div class="h-28 object-cover rounded-md shadow-md aspect-2/3 mb-auto relative group">
+ <img
+ id="folder-thumbnail"
+ class="h-28 object-cover rounded-md aspect-2/3 ring-1 ring-gray-900/5"
+ :src="
+ data?.folders[0]?.series?.thumbnail_url ??
+ 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'
+ "
+ alt="Folder Cover Art"
+ />
+ </div>
+ <section class="flex flex-1 h-full flex-col">
+ <h3 class="capitalize text-lg flex items-start justify-between">
+ {{ data?.name }}
+ <ButtonIcon class="!w-6 !h-6 !p-1 !static">
+ <template #icon>
+ <CircumEdit class="w-full h-full" />
+ </template>
+ </ButtonIcon>
+ </h3>
+ <span class="flex items-center justify-between gap-2 text-sm mt-auto" v-if="data?.folders[0]">
+ <p class="text-slate-400">First Folder: {{ data.folders[0].name }}</p>
+ <p class="text-slate-400">Videos: {{ data.folders[0].file_count }}</p>
+ </span>
+ <span class="flex items-center justify-between gap-2 text-sm">
+ <p class="text-slate-400">Folders: {{ data?.folders_count }}</p>
+ <p class="text-slate-400">Added: {{ data?.created_at ? toFormattedDate(new Date(data?.created_at + ' EST')) : 'N/A' }}</p>
+ </span>
+ </section>
+ </div>
+</template>
diff --git a/resources/js/components/dashboard/DashboardContent.vue b/resources/js/components/dashboard/DashboardContent.vue
deleted file mode 100644
index 76173e7c..00000000
--- a/resources/js/components/dashboard/DashboardContent.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<script setup lang="ts">
-import type { CategoryResource } from '@/types/resources';
-
-import { onMounted, ref } from 'vue';
-import { getCategories } from '@/service/mediaAPI';
-
-import ButtonText from '@/components/inputs/ButtonText.vue';
-import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
-
-import ProiconsAddCircle from '~icons/proicons/add-circle';
-import CircumEdit from '~icons/circum/edit';
-
-const categories = ref<CategoryResource[]>([]);
-
-onMounted(async () => {
- const { data: rawCategories } = await getCategories();
-
- categories.value = rawCategories?.data;
-});
-</script>
-<template>
- <section>
- <span class="flex items-center justify-between">
- <ButtonText title="Add New Category">
- <template #text>
- <div class="flex justify-between items-center gap-2">
- <p class="text-nowrap">Add New Category</p>
- <ProiconsAddCircle height="24" width="24" />
- </div>
- </template>
- </ButtonText>
- <p class="text-slate-400 uppercase">Categories: {{ categories.length }}</p>
- </span>
- <div class="flex flex-wrap w-full pt-4">
- <div
- v-for="(category, index) in categories"
- :key="index"
- class="flex flex-col gap-2 p-4 overflow-clip rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white ring-1 ring-gray-900/5 w-1/3"
- >
- <h3 class="capitalize text-lg flex items-end justify-between">
- {{ category.name }}
- <ButtonIcon class="w-6 h-6 !p-1">
- <template #icon>
- <CircumEdit class="w-full h-full" />
- </template>
- </ButtonIcon>
- </h3>
- <p class="text-slate-400">Folders: {{ category.folders_count }}</p>
- </div>
- </div>
- </section>
-</template>
diff --git a/resources/js/components/dashboard/DashboardLibraries.vue b/resources/js/components/dashboard/DashboardLibraries.vue
new file mode 100644
index 00000000..8ad38dba
--- /dev/null
+++ b/resources/js/components/dashboard/DashboardLibraries.vue
@@ -0,0 +1,139 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import { useContentStore } from '@/stores/ContentStore';
+import { getCategories } from '@/service/mediaAPI';
+import { storeToRefs } from 'pinia';
+import { useAppStore } from '@/stores/AppStore';
+import { useToast } from '@/composables/useToast';
+
+import RecordCardDetails from '@/components/cards/RecordCardDetails.vue';
+import ButtonText from '@/components/inputs/ButtonText.vue';
+import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
+import ModalBase from '@/components/pinesUI/ModalBase.vue';
+import TableBase from '@/components/table/TableBase.vue';
+import useModal from '@/composables/useModal';
+
+const toast = useToast();
+const appStore = useAppStore();
+const ContentStore = useContentStore();
+const loading = ref(false);
+const cachedID = ref<null | number>(null);
+const confirmModal = useModal({ title: 'Delete Category?', submitText: 'Confim' });
+const searchQuery = ref('');
+
+const { getRecords, deleteRecord, recordsSort } = ContentStore;
+const { pageTitle, selectedSideBar } = storeToRefs(appStore);
+const { stateRecords } = storeToRefs(ContentStore);
+
+import type { CategoryResource } from '@/types/resources';
+
+import ProiconsAddCircle from '~icons/proicons/add-circle';
+import CategoryCard from '../cards/CategoryCard.vue';
+
+const categories = ref<CategoryResource[]>([]);
+
+const filteredCategories = computed(() => {
+ let tempList = searchQuery.value
+ ? categories.value.filter((category: CategoryResource) => {
+ {
+ try {
+ let strRepresentation = [category.name, category.folders_count, category.folders[0]?.name ?? '', category.created_at]
+ .join(' ')
+ .toLowerCase();
+ return strRepresentation.includes(searchQuery.value.toLowerCase());
+ } catch (error) {
+ console.log(error);
+ return false;
+ }
+ }
+ })
+ : categories.value;
+ return tempList;
+});
+
+const handleDelete = (id: number) => {
+ cachedID.value = id;
+ confirmModal.toggleModal(true);
+};
+
+const submitDelete = async () => {
+ if (cachedID.value) {
+ let request = await deleteRecord(cachedID.value);
+ if (request) toast.add({ type: 'success', title: 'Success', description: 'Record Deleted Successfully!', life: 3000 });
+ else toast.add({ type: 'warning', title: 'Error', description: 'Unable to delete record. Please try again.', life: 3000 });
+ }
+};
+
+const sortingOptions = ref([
+ {
+ title: 'Title',
+ value: 'name',
+ disabled: false,
+ },
+ {
+ title: 'Date',
+ value: 'created_at',
+ disabled: false,
+ },
+ {
+ title: 'Folders',
+ value: 'folders_count',
+ disabled: false,
+ },
+]);
+
+const handleSort = async (column = 'date', dir = 1) => {
+ let tempList = categories.value.sort((categoryA, categoryB) => {
+ if (column === 'created_at') {
+ let dateA = new Date(categoryA?.created_at ?? '');
+ let dateB = new Date(categoryB?.created_at ?? '');
+ return (dateB.getTime() - dateA.getTime()) * dir;
+ }
+ return `${categoryB[column as keyof CategoryResource]}`?.localeCompare(`${categoryA[column as keyof CategoryResource]}`) * dir;
+ });
+ categories.value = tempList;
+ return tempList;
+};
+
+const handleSearch = (query: string) => {
+ searchQuery.value = query;
+};
+
+onMounted(async () => {
+ const { data: rawCategories } = await getCategories();
+
+ categories.value = rawCategories?.data;
+});
+</script>
+<template>
+ <section id="content-libraries" class="flex gap-2 flex-col">
+ <span class="flex items-center justify-between">
+ <ButtonText title="Add New Category">
+ <template #text>
+ <div class="flex justify-between items-center gap-2">
+ <p class="text-nowrap">Add New Category</p>
+ <ProiconsAddCircle height="24" width="24" />
+ </div>
+ </template>
+ </ButtonText>
+ <p class="text-slate-400 uppercase">Categories: {{ categories.length }}</p>
+ </span>
+ <TableBase
+ :data="filteredCategories"
+ :row="CategoryCard"
+ :clickAction="handleDelete"
+ :loading="loading"
+ :useToolbar="true"
+ :sortAction="handleSort"
+ :sortingOptions="sortingOptions"
+ @search="handleSearch"
+ />
+ </section>
+ <ModalBase :modalData="confirmModal" :action="submitDelete">
+ <template #content>
+ <div class="relative w-auto pb-8">
+ <p>Are you sure you want to delete this record?</p>
+ </div>
+ </template>
+ </ModalBase>
+</template>
diff --git a/resources/js/components/inputs/ButtonCorner.vue b/resources/js/components/inputs/ButtonCorner.vue
index f0528d15..e6863876 100755
--- a/resources/js/components/inputs/ButtonCorner.vue
+++ b/resources/js/components/inputs/ButtonCorner.vue
@@ -1,5 +1,5 @@
<script setup>
-import IconDelete from '../icons/IconDelete.vue';
+import IconDelete from '@/components/icons/IconDelete.vue';
const props = defineProps(['positionClasses', 'colourClasses', 'textClasses', 'to', 'label']);
</script>
diff --git a/resources/js/components/pulseCards/PulseUsage.vue b/resources/js/components/pulseCards/PulseUsage.vue
index fb2a3bcb..533ec796 100644
--- a/resources/js/components/pulseCards/PulseUsage.vue
+++ b/resources/js/components/pulseCards/PulseUsage.vue
@@ -4,17 +4,15 @@ import type { PulseQueueResponse, PulseResponse, PulseServerResponse, PulseUsage
import { format_number, periodForHumans, pulseFormatDate } from '@/service/util';
import { ref, watch } from 'vue';
-import IconQueueList from '../icons/IconQueueList.vue';
-import DashboardCard from '../cards/DashboardCard.vue';
-import PulseNoResults from '../pulse/PulseNoResults.vue';
-import PulseScroll from '../pulse/PulseScroll.vue';
-import PulseLineChart from '../charts/PulseLineChart.vue';
-import IconCursorArrowRays from '../icons/IconCursorArrowRays.vue';
-import IconArrowTrendingUp from '../icons/IconArrowTrendingUp.vue';
-import IconClock from '../icons/IconClock.vue';
-import IconScale from '../icons/IconScale.vue';
-import InputSelect from '../pinesUI/InputSelect.vue';
-import PulseUserCard from '../pulse/PulseUserCard.vue';
+import DashboardCard from '@/components/cards/DashboardCard.vue';
+import PulseNoResults from '@/components/pulse/PulseNoResults.vue';
+import PulseScroll from '@/components/pulse/PulseScroll.vue';
+import IconCursorArrowRays from '@/components/icons/IconCursorArrowRays.vue';
+import IconArrowTrendingUp from '@/components/icons/IconArrowTrendingUp.vue';
+import IconClock from '@/components/icons/IconClock.vue';
+import IconScale from '@/components/icons/IconScale.vue';
+import InputSelect from '@/components/pinesUI/InputSelect.vue';
+import PulseUserCard from '@/components/pulse/PulseUserCard.vue';
const requestOptions = [
{ value: 'requests', title: 'making requests', key: 'userRequestsConfig' },
@@ -74,7 +72,7 @@ watch([() => props.pulseData, type], () => {
<DashboardCard
:cols="cols"
:rows="rows"
- :class="`${props.class} col-span-2 md:col-span-4`"
+ :class="`${props.class} col-span-2 lg:col-span-4`"
:name="`${'Application Usage'}`"
:title="`Time: ${format_number(pulseData?.queues?.time ?? 0)}ms; Run at: ${pulseData?.servers?.runAt ? new Date(pulseData?.servers?.runAt).toLocaleDateString() : ''};`"
:details="`past ${periodForHumans(period)}`"
@@ -123,70 +121,6 @@ watch([() => props.pulseData, type], () => {
</template>
</template>
</PulseUserCard>
- <PulseUserCard
- v-for="userRequestCount in userRequestCounts"
- :key="userRequestCount.key"
- :user="userRequestCount.user"
- >
- <template #stats>
- <span
- v-if="sampleRate() < 1"
- title="Sample rate: {{ $sampleRate }}, Raw value: {{ number_format($userRequestCount->count) }}"
- >~{{ format_number(userRequestCount.count * (1 / sampleRate())) }}</span
- >
- <template v-else>
- {{ format_number(userRequestCount.count) }}
- </template>
- </template>
- </PulseUserCard>
- <PulseUserCard
- v-for="userRequestCount in userRequestCounts"
- :key="userRequestCount.key"
- :user="userRequestCount.user"
- >
- <template #stats>
- <span
- v-if="sampleRate() < 1"
- title="Sample rate: {{ $sampleRate }}, Raw value: {{ number_format($userRequestCount->count) }}"
- >~{{ format_number(userRequestCount.count * (1 / sampleRate())) }}</span
- >
- <template v-else>
- {{ format_number(userRequestCount.count) }}
- </template>
- </template>
- </PulseUserCard>
- <PulseUserCard
- v-for="userRequestCount in userRequestCounts"
- :key="userRequestCount.key"
- :user="userRequestCount.user"
- >
- <template #stats>
- <span
- v-if="sampleRate() < 1"
- title="Sample rate: {{ $sampleRate }}, Raw value: {{ number_format($userRequestCount->count) }}"
- >~{{ format_number(userRequestCount.count * (1 / sampleRate())) }}</span
- >
- <template v-else>
- {{ format_number(userRequestCount.count) }}
- </template>
- </template>
- </PulseUserCard>
- <PulseUserCard
- v-for="userRequestCount in userRequestCounts"
- :key="userRequestCount.key"
- :user="userRequestCount.user"
- >
- <template #stats>
- <span
- v-if="sampleRate() < 1"
- title="Sample rate: {{ $sampleRate }}, Raw value: {{ number_format($userRequestCount->count) }}"
- >~{{ format_number(userRequestCount.count * (1 / sampleRate())) }}</span
- >
- <template v-else>
- {{ format_number(userRequestCount.count) }}
- </template>
- </template>
- </PulseUserCard>
</div>
</template>
</PulseScroll>
diff --git a/resources/js/types/resources.ts b/resources/js/types/resources.ts
index a9f91bcd..1e82f56d 100644
--- a/resources/js/types/resources.ts
+++ b/resources/js/types/resources.ts
@@ -5,6 +5,8 @@ export interface CategoryResource {
name: string;
folders_count: number;
folders: FolderResource[];
+ created_at?: string;
+ last_scan: number;
}
export interface FolderResource {
id: number;
@@ -15,6 +17,8 @@ export interface FolderResource {
category_id: number;
videos?: VideoResource[];
series?: SeriesResource;
+ created_at?: string;
+ last_scan: number;
}
export interface MetadataResource {
id: number;
diff --git a/resources/js/views/DashboardView.vue b/resources/js/views/DashboardView.vue
index b63af9d0..4e5b93c1 100644
--- a/resources/js/views/DashboardView.vue
+++ b/resources/js/views/DashboardView.vue
@@ -4,14 +4,12 @@ import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import DashboardAnalytics from '@/components/dashboard/DashboardAnalytics.vue';
-import DashboardContent from '@/components/dashboard/DashboardContent.vue';
+import DashboardLibraries from '@/components/dashboard/DashboardLibraries.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
-import ModalBase from '@/components/pinesUI/ModalBase.vue';
-import useModal from '@/composables/useModal';
const dashboardPages = [
{ title: 'overview', timeControls: true },
- { title: 'content', timeControls: false },
+ { title: 'libraries', timeControls: false },
{ title: 'activity', timeControls: false },
{ title: 'users', timeControls: false },
{ title: 'jobs', timeControls: false },
@@ -19,14 +17,9 @@ const dashboardPages = [
const dashboardPage = ref('overview');
-const cancelModal = useModal({ title: 'Cancel Job?', submitText: 'Confim' });
const AppStore = useAppStore();
const { cycleSideBar } = AppStore;
-const { pageTitle, selectedSideBar } = storeToRefs(AppStore);
-const handleCancel = () => {
- // cachedID.value = id;
- cancelModal.toggleModal(true);
-};
+const { pageTitle } = storeToRefs(AppStore);
onMounted(async () => {
pageTitle.value = 'Dashboard';
@@ -39,16 +32,15 @@ onMounted(async () => {
<template v-slot:content>
<section id="content-dashboard" class="min-h-[80vh]">
<DashboardAnalytics v-if="dashboardPage == 'overview'" />
- <DashboardContent v-if="dashboardPage == 'content'" />
+ <DashboardLibraries v-if="dashboardPage == 'libraries'" />
</section>
</template>
<template v-slot:leftSidebar>
<div class="p-3 flex flex-col gap-3">
- <div class="flex py-1 flex-col">
+ <div class="flex py-1 flex-col gap-2">
<h1 id="sidebar-title" class="text-2xl h-8 w-full capitalize dark:text-white">{{ 'Management' }}</h1>
- <hr />
+ <hr class="" />
</div>
-
<section class="sm:text-lg flex flex-col gap-2">
<div
v-for="(page, index) in dashboardPages"
diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vue
index c1bb020d..d21a97e5 100755
--- a/resources/js/views/HistoryView.vue
+++ b/resources/js/views/HistoryView.vue
@@ -1,9 +1,11 @@
-<script setup>
+<script setup lang="ts">
+import type { RecordResource } from '@/types/resources';
+
import RecordCardDetails from '@/components/cards/RecordCardDetails.vue';
+import TableBase from '@/components/table/TableBase.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
import useModal from '@/composables/useModal';
-import TableBase from '@/components/table/TableBase.vue';
import { computed, onMounted, ref } from 'vue';
import { useContentStore } from '@/stores/ContentStore';
@@ -15,7 +17,7 @@ const toast = useToast();
const appStore = useAppStore();
const ContentStore = useContentStore();
const loading = ref(true);
-const cachedID = ref(null);
+const cachedID = ref<number | null>(null);
const confirmModal = useModal({ title: 'Delete Record?', submitText: 'Confim' });
const searchQuery = ref('');
@@ -25,10 +27,14 @@ const { stateRecords } = storeToRefs(ContentStore);
const filteredRecords = computed(() => {
let tempList = searchQuery.value
- ? stateRecords.value.filter((video) => {
+ ? stateRecords.value.filter((record: RecordResource) => {
{
try {
- let strRepresentation = [video.relationships?.video_name, video.relationships?.folder_name, video.created_at]
+ let strRepresentation = [
+ record.relationships?.video_name ?? record.relationships.file_name,
+ record.relationships?.folder?.name,
+ record.attributes.created_at,
+ ]
.join(' ')
.toLowerCase();
return strRepresentation.includes(searchQuery.value.toLowerCase());
@@ -42,7 +48,7 @@ const filteredRecords = computed(() => {
return tempList;
});
-const handleDelete = (id) => {
+const handleDelete = (id: number) => {
cachedID.value = id;
confirmModal.toggleModal(true);
};
@@ -77,7 +83,7 @@ const handleSort = (column = 'date', dir = 1) => {
recordsSort(column, dir);
};
-const handleSearch = (query) => {
+const handleSearch = (query: string) => {
searchQuery.value = query;
};