Skip to content

A self-hosted media server and file management system

optimise loading resources and convert a bunch of stuff to typescript

aminnausin99e647d9d990
diff --git a/app/Http/Resources/CategoryResource.php b/app/Http/Resources/CategoryResource.php
index 8847aff0..dc994baf 100755
--- a/app/Http/Resources/CategoryResource.php
+++ b/app/Http/Resources/CategoryResource.php
@@ -5,19 +5,17 @@ namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
-class CategoryResource extends JsonResource
-{
+class CategoryResource extends JsonResource {
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
- public function toArray(Request $request): array
- {
+ public function toArray(Request $request): array {
return [
'id' => (string)$this->id,
'name' => $this->name,
- 'folders_count' => $this->folders->count(),
+ 'folders_count' => $this->folders_count ?? 0,
'folders' => FolderResource::collection($this->folders),
];
}
diff --git a/app/Http/Resources/FolderResource.php b/app/Http/Resources/FolderResource.php
index 2e2943fe..f4e337fb 100755
--- a/app/Http/Resources/FolderResource.php
+++ b/app/Http/Resources/FolderResource.php
@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class FolderResource extends JsonResource {
+
/**
* Transform the resource into an array.
*
@@ -13,14 +14,12 @@ class FolderResource extends JsonResource {
*/
public function toArray(Request $request): array {
return [
- 'id' => (string)$this->id,
+ 'id' => $this->id,
'name' => $this->name,
'path' => $this->path,
- 'file_count' => $this->videos->count(),
- 'total_size' => $this->videos->sum(function ($video) {
- return $video->metadata ? $video->metadata->file_size : 0;
- }),
- 'category_id' => (string)$this->category->id,
+ 'file_count' => $this->videos_count ?? 0, //$videos->count(),
+ 'total_size' => $this->total_size,
+ 'category_id' => $this->category_id,
'videos' => $this->when($request->videos, function () {
return VideoResource::collection($this->videos);
}),
@@ -28,3 +27,29 @@ class FolderResource extends JsonResource {
];
}
}
+
+/*
+Mega Yikes AI code
+protected static $categoryCache = [];
+
+$videos = $request->videos ? $this->videos : [];
+
+$totalFileSize = $this->videos->sum(function ($video) {
+return $video->metadata ? $video->metadata->file_size : 0;
+});
+$self = Folder::with('videos.metadata')->find($this->id);
+
+$categoryId = $this->category_id; // Assuming editor_id is the foreign key
+$category = null;
+
+if (isset(self::$categoryCache[$categoryId])) {
+ $category = self::$categoryCache[$categoryId];
+} else {
+ $category = $this->category;
+ self::$categoryCache[$categoryId] = $category;
+}
+
+'total_size' => $this->videos->sum(function ($video) {
+ return $video->metadata ? $video->metadata->file_size : 0;
+}),
+*/
diff --git a/app/Http/Resources/MetadataResource.php b/app/Http/Resources/MetadataResource.php
index 0d21f9ac..de42a712 100644
--- a/app/Http/Resources/MetadataResource.php
+++ b/app/Http/Resources/MetadataResource.php
@@ -5,15 +5,13 @@ namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
-class MetadataResource extends JsonResource
-{
+class MetadataResource extends JsonResource {
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
- public function toArray(Request $request): array
- {
+ public function toArray(Request $request): array {
return [
'id' => $this->id,
'attributes' => [
@@ -28,12 +26,23 @@ class MetadataResource extends JsonResource
'date_updated' => $this->updated_at
],
'relationships' => [
- 'video_id' => $this->video ? (string)$this->video->id : null,
- 'editor_id' => $this->editor ? $this->editor->id : null,
- 'editor_name' => $this->editor ? $this->editor->name : '',
+ 'video_id' => $this->video_id,
+ 'editor_id' => $this->editor_id,
// 'playback_data' => PlaybackResource::collection($this->playbacks),
'video_tags' => VideoTagResource::collection($this->videoTags),
]
];
}
}
+
+// protected static $editorCache = [];
+
+// $editorId = $this->editor_id; // Assuming editor_id is the foreign key
+// $editor = null;
+
+// if (isset(self::$editorCache[$editorId])) {
+// $editor = self::$editorCache[$editorId];
+// } else {
+// $editor = $this->editor;
+// self::$editorCache[$editorId] = $editor;
+// }
diff --git a/app/Http/Resources/PlaybackResource.php b/app/Http/Resources/PlaybackResource.php
index 3b7b10ed..563c78ec 100644
--- a/app/Http/Resources/PlaybackResource.php
+++ b/app/Http/Resources/PlaybackResource.php
@@ -5,23 +5,21 @@ namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
-class PlaybackResource extends JsonResource
-{
+class PlaybackResource extends JsonResource {
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
- public function toArray(Request $request): array
- {
+ public function toArray(Request $request): array {
return [
'id' => $this->id,
'attributes' => [
'progress' => $this->progress
],
'relationships' => [
- 'metadata_id' => $this->metadata ? $this->metadata->id : null,
- 'video_id' => $this->metadata ? $this->metadata->video_id : null,
+ 'metadata_id' => $this->metadata_id,
+ // 'video_id' => $this->metadata ? $this->metadata->video_id : null, ?? dont need ??
]
];
}
diff --git a/app/Http/Resources/RecordResource.php b/app/Http/Resources/RecordResource.php
index 2ded86fc..cb8ec59e 100755
--- a/app/Http/Resources/RecordResource.php
+++ b/app/Http/Resources/RecordResource.php
@@ -6,12 +6,30 @@ use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class RecordResource extends JsonResource {
+
+ // Mega Yikes AI code
+ protected static $categoryCache = [];
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array {
+ $metadata = $this->metadata;
+ $video = $metadata ? $metadata->video : $this->video; // $this->video is only for compatibility with old database design, new records dont need to use it
+ $folder = $video ? $video->folder : null;
+ $category = $category = null;
+
+ if ($folder) {
+ $categoryId = $folder->category_id;
+ if (isset(self::$categoryCache[$categoryId])) {
+ $category = self::$categoryCache[$categoryId];
+ } else {
+ $category = $folder->category;
+ self::$categoryCache[$categoryId] = $category;
+ }
+ }
+
return [
'id' => (string)$this->id,
'attributes' => [
@@ -19,16 +37,30 @@ class RecordResource extends JsonResource {
'updated_at' => $this->updated_at
],
'relationships' => [
- 'user_id' => (string)$this->user->id,
- 'user_name' => $this->user->name,
- 'video_id' => $this->video ? (string)$this->video->id : ($this->metadata && $this->metadata->video ? $this->metadata->video->id : null),
- 'video_name' => $this->metadata ? $this->metadata->title : ($this->video ? ($this->video->title ?? $this->video->name) : $this->name) ?? 'Deleted',
- 'file_name' => $this->video ? $this->video->name : $this->name,
- 'folder' => $this->video ? new FolderResource($this->video->folder) : array("name" => ($this->metadata && $this->metadata->video ? $this->metadata->video->folder->name : 'Unknown')),
- 'category' => $this->video && $this->video->folder->category ? new CategoryResource($this->video->folder->category) : null,
- 'metadata_id' => $this->metadata ? $this->metadata->id : 'None',
- 'metadata' => $this->metadata ? new MetadataResource($this->metadata) : null,
+ 'folder' => $folder ?? array("name" => 'Unknown'),
+ 'metadata' => $metadata,
+ 'category' => $category,
+ 'video_id' => $this->video_id,
+ 'video_name' => $metadata->title ?? $this->name ?? 'Deleted',
+ 'file_name' => $video ? $video->name : $this->name,
]
];
}
}
+
+// 'user' => $this->user,
+// 'video' => $video,
+// 'metadata' => $metadata ? new MetadataResource($metadata) : null,
+// 'category' => $category ? new CategoryResource($category) : null,
+
+// 'user' => $this->user,
+// 'video' => $this->video,
+// 'user_id' => (string)$this->user->id,
+// 'user_name' => $this->user->name,
+// 'video_id' => $this->video ? (string)$this->video->id : ($this->metadata && $this->metadata->video ? $this->metadata->video->id : null),
+// 'video_name' => $this->metadata ? $this->metadata->title : ($this->video ? ($this->video->title ?? $this->video->name) : $this->name) ?? 'Deleted',
+// 'file_name' => $this->video ? $this->video->name : $this->name,
+// 'folder' => $this->video ? new FolderResource($this->video->folder) : array("name" => ($this->metadata && $this->metadata->video ? $this->metadata->video->folder->name : 'Unknown')),
+// 'category' => $this->video && $this->video->folder->category ? new CategoryResource($this->video->folder->category) : null,
+// 'metadata_id' => $this->metadata ? $this->metadata->id : 'None',
+// 'metadata' => $this->metadata ? new MetadataResource($this->metadata) : null,
diff --git a/app/Http/Resources/SeriesResource.php b/app/Http/Resources/SeriesResource.php
index 5c8047bd..23eaac23 100644
--- a/app/Http/Resources/SeriesResource.php
+++ b/app/Http/Resources/SeriesResource.php
@@ -5,20 +5,29 @@ namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
-class SeriesResource extends JsonResource
-{
+class SeriesResource extends JsonResource {
+
+ protected static $editorCache = [];
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
- public function toArray(Request $request): array
- {
+ public function toArray(Request $request): array {
+ $editorId = $this->editor_id; // Assuming editor_id is the foreign key
+ $editor = null;
+
+ if (isset(self::$editorCache[$editorId])) {
+ $editor = self::$editorCache[$editorId];
+ } else {
+ $editor = $this->editor;
+ self::$editorCache[$editorId] = $editor;
+ }
return [
'id' => $this->id,
- 'folder_id' => $this->folder ? (string)$this->folder->id : null,
- 'editor_id' => $this->editor ? $this->editor->id : null,
- 'editor_name' => $this->editor ? $this->editor->name : '',
+ 'folder_id' => $this->folder_id,
+ // 'editor' => $editor,
+ 'editor_id' => $this->editor_id,
'title' => $this->title ?? $this->folder->name,
'description' => $this->description,
'studio' => $this->studio,
diff --git a/app/Http/Resources/TagResource.php b/app/Http/Resources/TagResource.php
index e8d71e0c..903253e1 100644
--- a/app/Http/Resources/TagResource.php
+++ b/app/Http/Resources/TagResource.php
@@ -5,20 +5,18 @@ namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
-class TagResource extends JsonResource
-{
+class TagResource extends JsonResource {
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
- public function toArray(Request $request): array
- {
+ public function toArray(Request $request): array {
return [
'id' => $this->id,
'name' => $this->name,
'relationships' => [
- 'creator_id' => $this->creator ? $this->creator->id : null,
+ 'creator_id' => $this->creator_id,
]
];
}
diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.php
index 9e00a7eb..1c99295d 100755
--- a/app/Http/Resources/VideoResource.php
+++ b/app/Http/Resources/VideoResource.php
@@ -5,39 +5,45 @@ namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
-class VideoResource extends JsonResource
-{
+class VideoResource extends JsonResource {
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
- public function toArray(Request $request): array
- {
+ public function toArray(Request $request): array {
$metadata = $this->metadata;
return [
'id' => (string)$this->id,
+ // 'path' => $this->path,
+ // 'name' => $this->name,
+ // 'date' => $this->date,
+
+ // 'folder_id' => (string)$this->folder->id,
+ // 'metadata' => new MetadataResource($metadata),
+
+
// 'attributes' => [
'name' => $this->name,
'path' => $this->path,
'date' => $this->date,
- 'date_raw' => $this->date_raw,
- 'title' => ($metadata ? $this->metadata->title : $this->title) ?? $this->name,
- 'description' => $metadata ? $this->metadata->description : $this->description, // ?? $this->folder->series->description
- 'duration' => $metadata ? $this->metadata->duration : $this->duration,
- 'episode' => $metadata ? $this->metadata->episode : $this->episode,
- 'season' => $metadata ? $this->metadata->season : $this->season,
- 'view_count' => $metadata ? $this->metadata->view_count : $this->view_count,
- 'file_size' => $this->metadata ? $this->metadata->file_size : null,
- // 'tags' => $this->metadata->tags ?? '',
- 'video_tags' => $this->metadata ? VideoTagResource::collection($this->metadata->videotags) : [],
- 'date_released' => $this->metadata ? $this->metadata->date_released : null,
- 'date_updated' => $this->metadata ? $this->metadata->updated_at : null,
+ // 'date_raw' => $this->date_raw,
+ 'title' => ($metadata ? $metadata->title : $this->title) ?? $this->name,
+ 'description' => $metadata ? $metadata->description : $this->description, // ?? $this->folder->series->description
+ 'duration' => $metadata ? $metadata->duration : $this->duration,
+ 'episode' => $metadata ? $metadata->episode : $this->episode,
+ 'season' => $metadata ? $metadata->season : $this->season,
+ 'view_count' => $metadata ? $metadata->view_count : $this->view_count,
+ 'file_size' => $metadata ? $metadata->file_size : null,
+ // 'tags' => $metadata->tags ?? '',
+ 'video_tags' => $metadata ? VideoTagResource::collection($metadata->videotags) : [],
+ 'date_released' => $metadata ? $metadata->date_released : null,
+ 'date_updated' => $metadata ? $metadata->updated_at : null,
// ],
// 'relationships' => [
- 'folder_id' => (string)$this->folder->id,
- 'metadata' => new MetadataResource($metadata),
- 'editor' => $metadata ? $this->metadata->editor : null
+ // 'folder_id' => (string)$this->folder->id,
+ 'metadata' => $metadata,
+ // 'editor' => $metadata ? $metadata->editor : null
// ]
];
}
diff --git a/app/Http/Resources/VideoTagResource.php b/app/Http/Resources/VideoTagResource.php
index 66c8ec76..79ccf150 100644
--- a/app/Http/Resources/VideoTagResource.php
+++ b/app/Http/Resources/VideoTagResource.php
@@ -5,19 +5,17 @@ namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
-class VideoTagResource extends JsonResource
-{
+class VideoTagResource extends JsonResource {
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
- public function toArray(Request $request): array
- {
+ public function toArray(Request $request): array {
return [
'video_tag_id' => $this->id,
'name' => $this->tag->name,
- 'id' => $this->tag ? $this->tag->id : null,
+ 'id' => $this->tag_id,
];
}
}
diff --git a/app/Jobs/EmbedUidInMetadata.php b/app/Jobs/EmbedUidInMetadata.php
index 67114c1b..baf60b8a 100644
--- a/app/Jobs/EmbedUidInMetadata.php
+++ b/app/Jobs/EmbedUidInMetadata.php
@@ -5,13 +5,14 @@ namespace App\Jobs;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\Attributes\DeleteWhenMissingModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Symfony\Component\Process\Process;
use Symfony\Component\Process\Exception\ProcessFailedException;
-class EmbedUidInMetadata implements ShouldQueue
-{
+#[DeleteWhenMissingModels]
+class EmbedUidInMetadata implements ShouldQueue {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
protected $filePath;
@@ -22,8 +23,7 @@ class EmbedUidInMetadata implements ShouldQueue
*
* @return void
*/
- public function __construct($filePath, $uid)
- {
+ public function __construct($filePath, $uid) {
$this->filePath = $filePath;
$this->uid = $uid;
}
@@ -33,8 +33,7 @@ class EmbedUidInMetadata implements ShouldQueue
*
* @return void
*/
- public function handle()
- {
+ public function handle() {
$ext = pathinfo($this->filePath, PATHINFO_EXTENSION);
dump("Adding uuid to $this->filePath");
@@ -85,8 +84,7 @@ class EmbedUidInMetadata implements ShouldQueue
}
}
- private function getUidFromMetadata($filePath)
- {
+ private function getUidFromMetadata($filePath) {
$command = [
'ffprobe',
'-v',
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 3c729962..e2eee8ca 100755
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -6,15 +6,21 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
-class Category extends Model
-{
+class Category extends Model {
use HasFactory;
public $timestamps = false;
protected $fillable = ['name', 'media_content'];
- public function folders(): HasMany{
+ public function folders(): HasMany {
return $this->hasMany(Folder::class);
}
+
+ protected static function boot() {
+ parent::boot(); // Automatic withCount
+ static::addGlobalScope('foldersCount', function ($builder) {
+ $builder->withCount('folders');
+ });
+ }
}
diff --git a/app/Models/Folder.php b/app/Models/Folder.php
index cd892f86..e45ff578 100755
--- a/app/Models/Folder.php
+++ b/app/Models/Folder.php
@@ -8,21 +8,31 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasOne;
-class Folder extends Model
-{
+class Folder extends Model {
use HasFactory;
public $timestamps = false;
-
- public function videos(): HasMany{
+
+ public function videos(): HasMany {
return $this->hasMany(Video::class);
}
- public function series(): HasOne{
+ public function series(): HasOne {
return $this->hasOne(Series::class);
}
- public function category(): BelongsTo{
+ public function category(): BelongsTo {
return $this->belongsTo(Category::class);
}
+
+ public function getTotalSizeAttribute() {
+ return $this->videos()->join('metadata', 'videos.id', '=', 'metadata.video_id')->sum('metadata.file_size');
+ }
+
+ protected static function boot() {
+ parent::boot(); // Automatic withCount
+ static::addGlobalScope('videosCount', function ($builder) {
+ $builder->withCount('videos');
+ });
+ }
}
diff --git a/resources/js/App.vue b/resources/js/App.vue
index 40ed4c7f..f01d6bf1 100755
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -1,22 +1,24 @@
-<script setup>
-import ToastController from './components/pinesUI/ToastController.vue';
+<script setup lang="ts">
+import ToastController from '@/components/pinesUI/ToastController.vue';
import { onMounted, watch } from 'vue';
import { RouterView } from 'vue-router';
import { storeToRefs } from 'pinia';
-import { useAppStore } from './stores/AppStore';
+import { useAppStore } from '@/stores/AppStore';
const appStore = useAppStore();
-const { lightMode, ambientMode } = storeToRefs(appStore);
-const { toggleDarkMode, initDarkMode, initAmbientMode, setAmbientMode } = appStore;
+const { lightMode, ambientMode, playbackHeatmap } = storeToRefs(appStore);
+const { toggleDarkMode, initDarkMode, initAmbientMode, setAmbientMode, initPlaybackHeatmap, setPlaybackHeatmap } = appStore;
onMounted(async () => {
initDarkMode();
initAmbientMode();
+ initPlaybackHeatmap();
});
-watch(() => ambientMode.value, setAmbientMode, { immediate: false });
+watch(ambientMode, setAmbientMode, { immediate: false });
watch(lightMode, toggleDarkMode, { immediate: false });
+watch(playbackHeatmap, setPlaybackHeatmap, { immediate: false });
</script>
<template>
diff --git a/resources/js/components/cards/RecordCard.vue b/resources/js/components/cards/RecordCard.vue
index b9927d73..09e2adca 100755
--- a/resources/js/components/cards/RecordCard.vue
+++ b/resources/js/components/cards/RecordCard.vue
@@ -16,9 +16,13 @@ const rawDate = new Date((props.record.attributes.created_at ?? '').replace(' ',
const timeSpan = toTimeSpan(rawDate);
const videoLink = computed(() => {
- if (!props.record.relationships.video_id || !props.record.relationships.category?.name || !props.record.relationships.folder?.name)
+ if (
+ !(props.record.relationships.video_id ?? props.record.relationships.metadata?.video_id) ||
+ !props.record.relationships.category?.name ||
+ !props.record.relationships.folder?.name
+ )
return false;
- return `/${encodeURIComponent(props.record.relationships?.category?.name ?? '')}/${encodeURIComponent(props.record.relationships.folder?.name ?? '')}?video=${props.record.relationships.video_id}`;
+ return `/${encodeURIComponent(props.record.relationships?.category?.name ?? '')}/${encodeURIComponent(props.record.relationships.folder?.name ?? '')}?video=${props.record.relationships.video_id ?? props.record.relationships.metadata?.video_id}`;
});
</script>
diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vue
index 28579418..412faa02 100755
--- a/resources/js/components/panels/NavBar.vue
+++ b/resources/js/components/panels/NavBar.vue
@@ -11,8 +11,8 @@ import NavLink from '@/components/inputs/NavLink.vue';
import MaterialSymbolsLightHistory from '~icons/material-symbols-light/history';
import CircumFolderOn from '~icons/circum/folder-on';
-import CircumMonitor from '~icons/circum/monitor';
import CircumInboxIn from '~icons/circum/inbox-in';
+import CircumMonitor from '~icons/circum/monitor';
const authStore = useAuthStore();
const appStore = useAppStore();
diff --git a/resources/js/components/pinesUI/DropdownMenu.vue b/resources/js/components/pinesUI/DropdownMenu.vue
index 431c268a..41f75732 100755
--- a/resources/js/components/pinesUI/DropdownMenu.vue
+++ b/resources/js/components/pinesUI/DropdownMenu.vue
@@ -1,5 +1,9 @@
-<script setup>
-import DropdownItem from './DropdownItem.vue';
+<script setup lang="ts">
+import { OnClickOutside } from '@vueuse/components';
+import { useAuthStore } from '@/stores/AuthStore';
+import { storeToRefs } from 'pinia';
+
+import DropdownItem from '@/components/pinesUI/DropdownItem.vue';
import LucideSettings from '~icons/lucide/settings';
import LucideUser from '~icons/lucide/user';
@@ -14,37 +18,35 @@ import LucideFolderSearch from '~icons/lucide/folder-search';
import LucideFolderCheck from '~icons/lucide/folder-check';
import LucideLayoutDashboard from '~icons/lucide/layout-dashboard';
-import { OnClickOutside } from '@vueuse/components';
-import { useAuthStore } from '../../stores/AuthStore';
-import { storeToRefs } from 'pinia';
-
const authStore = useAuthStore();
const { userData } = storeToRefs(authStore);
+const defaults = { external: false, disabled: false };
+
const dropDownItems = [
- [{ name: 'settings', url: '/settings', text: 'Settings', icon: LucideSettings }],
+ [{ ...defaults, name: 'settings', url: '/settings', text: 'Settings', icon: LucideSettings }],
[
- { name: 'login', url: '/login', text: 'Log in', icon: LucideLogIn },
- { name: 'register', url: '/register', text: 'Sign up', icon: LucideUserPlus },
+ { ...defaults, name: 'login', url: '/login', text: 'Log in', icon: LucideLogIn },
+ { ...defaults, name: 'register', url: '/register', text: 'Sign up', icon: LucideUserPlus },
],
];
const dropDownItemsAuth = [
[
- { name: 'profile', url: '/profile', text: 'Profile', icon: LucideUser },
- { name: 'settings', url: '/settings', text: 'Settings', icon: LucideSettings, disabled: true },
- { name: 'home', url: '/', text: 'Home', icon: LucideTvMinimalPlay },
+ { ...defaults, name: 'profile', url: '/profile', text: 'Profile', icon: LucideUser, disabled: true },
+ { ...defaults, name: 'settings', url: '/settings', text: 'Settings', icon: LucideSettings },
+ { ...defaults, name: 'home', url: '/', text: 'Home', icon: LucideTvMinimalPlay },
],
[
- { name: 'friends', url: '/friends', text: 'Friends', icon: LucideUsers, disabled: true },
- { name: 'history', url: '/history', text: 'Full History', icon: LucideHistory },
- { name: 'dashboard', url: '/Dashboard', text: 'Dashboard', icon: LucideLayoutDashboard },
+ { ...defaults, name: 'friends', url: '/friends', text: 'Friends', icon: LucideUsers, disabled: true },
+ { ...defaults, name: 'history', url: '/history', text: 'Full History', icon: LucideHistory },
+ { ...defaults, name: 'dashboard', url: '/Dashboard', text: 'Dashboard', icon: LucideLayoutDashboard },
],
[
- { name: 'index', url: '/jobs/indexFiles', text: 'Index Files', external: true, icon: LucideFolderSearch },
- { name: 'sync', url: '/jobs/syncFiles', text: 'Sync Files', external: true, icon: LucideFolderSync },
- { name: 'verify', url: '/jobs/verifyFiles', text: 'Verify Files', external: true, icon: LucideFolderCheck },
+ { ...defaults, name: 'index', url: '/jobs/indexFiles', text: 'Index Files', external: true, icon: LucideFolderSearch },
+ { ...defaults, name: 'sync', url: '/jobs/syncFiles', text: 'Sync Files', external: true, icon: LucideFolderSync },
+ { ...defaults, name: 'verify', url: '/jobs/verifyFiles', text: 'Verify Files', external: true, icon: LucideFolderCheck },
],
- [{ name: 'logout', url: '/logout', text: 'Log out', icon: LucideLogOut, shortcut: '⇧⌘Q' }],
+ [{ ...defaults, name: 'logout', url: '/logout', text: 'Log out', icon: LucideLogOut, shortcut: '⇧⌘Q' }],
];
const props = defineProps(['dropdownOpen']);
diff --git a/resources/js/components/video/VideoAmbientPlayer.vue b/resources/js/components/video/VideoAmbientPlayer.vue
index bcfdf4f6..51fee157 100755
--- a/resources/js/components/video/VideoAmbientPlayer.vue
+++ b/resources/js/components/video/VideoAmbientPlayer.vue
@@ -1,22 +1,22 @@
-<script setup>
+<script setup lang="ts">
import VideoPlayer from './VideoPlayer.vue';
import { storeToRefs } from 'pinia';
import { useAppStore } from '../../stores/AppStore';
import { onMounted, onUnmounted, ref, watch } from 'vue';
-const container = ref(null);
-// const canvasContainer = ref(null);
-const player = ref(null);
-const step = ref(undefined);
-const canvas = ref(null);
-const ctx = ref(null);
+const container = ref<null | HTMLElement>(null);
+const player = ref<null | HTMLVideoElement>(null);
+const step = ref<undefined | number>(undefined);
+const canvas = ref<null | HTMLCanvasElement>(null);
+const ctx = ref<null | CanvasRenderingContext2D>(null);
const appStore = useAppStore();
const { lightMode, ambientMode } = storeToRefs(appStore);
const draw = () => {
- ctx.value.drawImage(player?.value, 0, 0, canvas.value?.width, canvas.value?.height);
+ if (!ctx.value || !player.value || !canvas.value) return;
+ ctx.value.drawImage(player.value, 0, 0, canvas.value.width, canvas.value.height);
};
const drawLoop = () => {
@@ -50,8 +50,8 @@ const adjustOverlayDiv = () => {
onMounted(() => {
window.addEventListener('resize', adjustOverlayDiv);
adjustOverlayDiv(); // Adjust initially in case video metadata is already loaded
- ctx.value = canvas.value?.getContext('2d');
- player.value = document.getElementById('vid-source');
+ if (canvas.value) ctx.value = canvas.value.getContext('2d');
+ player.value = document.getElementById('vid-source') as HTMLVideoElement;
});
onUnmounted(() => {
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 1d441cd8..e017111c 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -1,27 +1,18 @@
<!-- eslint-disable no-unused-vars -->
-<script setup>
-import { storeToRefs } from 'pinia';
-import { useContentStore } from '@/stores/ContentStore';
-import { computed, ref, watch } from 'vue';
+<script setup lang="ts">
+import type { VideoResource } from '@/types/resources';
+import type { Metadata } from '@/types/model';
+
+import { computed, ref, watch, type Ref } from 'vue';
import { UseCreatePlayback } from '@/service/mutations';
import { useVideoPlayback } from '@/service/queries';
+import { useContentStore } from '@/stores/ContentStore';
+import { useAppStore } from '@/stores/AppStore';
+import { storeToRefs } from 'pinia';
+import { getMediaUrl } from '@/service/api';
const playbackDataBuffer = 5;
-
-const player = ref(null);
-const currentID = ref(-1);
-const ContentStore = useContentStore();
-const metadata_id = ref(NaN);
-const progressCache = ref([]);
-
-const createPlayback = UseCreatePlayback().mutate;
-
-const { stateVideo } = storeToRefs(ContentStore);
-const { createRecord, updateViewCount } = ContentStore;
-const { data: playbackData } = useVideoPlayback(metadata_id);
-
-// Heatmap can be composable
-const heatMapData = ref([
+const defaultHeatMapData = ref([
{ x: 25, y: 60 },
{ x: 154, y: 48 },
{ x: 266, y: 12 },
@@ -30,10 +21,29 @@ const heatMapData = ref([
{ x: 1000, y: 100 },
]);
+const ContentStore = useContentStore();
+const appStore = useAppStore();
+const progressCache = ref<{ metadata_id: number; progress: number }[]>([]);
+const metadata_id = ref<number>(NaN);
+const currentID = ref(-1);
+const player = ref<null | HTMLVideoElement>(null);
+// const url = ref('');
+
+const { data: playbackData } = useVideoPlayback(metadata_id);
+
+const { createRecord, updateViewCount } = ContentStore;
+const { playbackHeatmap } = storeToRefs(appStore);
+const { stateVideo } = storeToRefs(ContentStore) as {
+ stateVideo: Ref<VideoResource | { id?: number; metadata?: Metadata; path?: string }>;
+};
+
+const emit = defineEmits(['loadedData', 'seeked', 'play', 'pause', 'ended']);
+const createPlayback = UseCreatePlayback().mutate;
+
const heatMap = computed(() => {
const start = 'M 0.0,100.0 ';
- var catmullRomFitting = function (data, alpha) {
+ var catmullRomFitting = function (data: string | any[], alpha: number | undefined) {
if (!data?.length || data.length < 5) return '';
if (alpha == 0 || alpha === undefined) {
return '';
@@ -108,7 +118,7 @@ const heatMap = computed(() => {
catmullRomFitting(
playbackData.value
? [
- ...playbackData.value.map((entry) => {
+ ...playbackData.value.map((entry: { progress: any; count: number }) => {
return { x: entry.progress, y: 100 - Math.min(entry.count, 10) * 10 };
}),
{ x: 1000, y: 100 },
@@ -119,10 +129,11 @@ const heatMap = computed(() => {
);
});
-const emit = defineEmits(['loadedData', 'seeked', 'play', 'pause', 'ended']);
-
-const initVideoPlayer = () => {
+const initVideoPlayer = async () => {
let root = document.getElementById('root');
+
+ if (!root) return;
+
root.scrollIntoView();
if (progressCache.value && progressCache.value.length > 0) {
@@ -131,10 +142,12 @@ const initVideoPlayer = () => {
}
metadata_id.value = stateVideo.value?.metadata ? stateVideo.value?.metadata.id : NaN;
+
+ // url.value = await getMediaUrl(stateVideo.value.path ?? '');
};
const handlePlayVideo = () => {
- if (currentID.value === stateVideo.value.id) return; // stop recording every time video seek
+ if (!stateVideo.value.id || currentID.value === stateVideo.value.id) return; // stop recording every time video seek
currentID.value = stateVideo.value.id;
createRecord(stateVideo.value.id);
updateViewCount(stateVideo.value.id);
@@ -150,9 +163,14 @@ const handlePlayerSeeked = () => {
//#region Player Events
const handleProgress = (override = false) => {
- let progress = player.value?.currentTime / player.value?.duration;
+ if (!player.value || !stateVideo.value.metadata?.id) return;
+
+ let progress = player.value.currentTime / player.value.duration;
- progressCache.value = [...progressCache.value, { metadata_id: stateVideo.value?.metadata?.id, progress: progress.toFixed(2) * 1000 }];
+ progressCache.value = [
+ ...progressCache.value,
+ { metadata_id: stateVideo.value?.metadata?.id, progress: parseFloat(progress.toFixed(2)) * 1000 },
+ ];
if (stateVideo.value?.metadata?.id && !isNaN(progress) && (progressCache.value.length >= playbackDataBuffer || override)) {
createPlayback({ entries: progressCache.value });
@@ -160,7 +178,7 @@ const handleProgress = (override = false) => {
}
};
-const onPlayerPlay = (event) => {
+const onPlayerPlay = (event: any) => {
// console.log(event.type);
// player.setPlaying(true);
handlePlayVideo();
@@ -168,49 +186,49 @@ const onPlayerPlay = (event) => {
handleProgress();
};
-const onPlayerPause = (event) => {
+const onPlayerPause = (event: any) => {
// console.log(event.type);
// player.setPlaying(false);
emit('pause');
};
-const onPlayerEnded = (event) => {
+const onPlayerEnded = (event: any) => {
// console.log(event.type);
// player.setPlaying(false);
emit('ended');
};
-const onPlayerLoadeddata = (event) => {
+const onPlayerLoadeddata = (event: any) => {
// console.log(event.type);
emit('loadedData');
};
-const onPlayerWaiting = (event) => {
+const onPlayerWaiting = (event: any) => {
// console.log(event.type);
};
-const onPlayerPlaying = (event) => {
+const onPlayerPlaying = (event: any) => {
// console.log(event.type);
};
-const onPlayerTimeupdate = (event) => {
+const onPlayerTimeupdate = (event: any) => {
// console.log({ event: event.type, time: event.target.currentTime });
};
-const onPlayerCanplay = (event) => {
+const onPlayerCanplay = (event: any) => {
// console.log(event.type);
};
-const onPlayerCanplaythrough = (event) => {
+const onPlayerCanplaythrough = (event: any) => {
// console.log(event.type);
};
-const onPlayerSeek = (event) => {
+const onPlayerSeek = (event: any) => {
// console.log(event.type);
handlePlayerSeeked();
};
-const playerStateChanged = (event) => {
+const playerStateChanged = (event: any) => {
// console.log(event.type);
};
@@ -244,26 +262,11 @@ watch(stateVideo, initVideoPlayer);
<track kind="captions" />
</video>
<section
- class="absolute bottom-6 w-[94.95%] m-auto left-0 right-0 opacity-0 group-hover:opacity-100 transition-opacity duration-75"
+ class="absolute bottom-6 w-[94.95%] m-auto left-0 right-0 opacity-0 group-hover:opacity-100 transition-opacity duration-75 h-5"
+ v-show="playbackHeatmap"
>
- <!-- group-hover:block -->
- <svg
- class="ytp-heat-map-svg fill-indigo-200/20"
- height="100%"
- preserveAspectRatio="none"
- version="1.1"
- viewBox="0 0 1000 100"
- width="100%"
- style="height: 20px"
- >
+ <svg class="ytp-heat-map-svg fill-indigo-200/20 h-full w-full" preserveAspectRatio="none" viewBox="0 0 1000 100">
<defs>
- <!-- <clipPath id="4">
- <path
- class="ytp-heat-map-path"
- d="M 0.0,100.0 C 1.0,92.1 2.0,65.5 5.0,60.3 C 8.0,55.0 11.0,70.8 15.0,73.8 C 19.0,76.7 21.0,74.1 25.0,74.9 C 29.0,75.7 31.0,77.0 35.0,77.7 C 39.0,78.3 41.0,77.6 45.0,78.1 C 49.0,78.5 51.0,79.3 55.0,80.0 C 59.0,80.6 61.0,81.0 65.0,81.2 C 69.0,81.5 71.0,81.8 75.0,81.2 C 79.0,80.7 81.0,79.2 85.0,78.5 C 89.0,77.7 91.0,77.7 95.0,77.6 C 99.0,77.4 101.0,77.6 105.0,77.9 C 109.0,78.1 111.0,79.9 115.0,78.9 C 119.0,78.0 121.0,74.5 125.0,73.0 C 129.0,71.6 131.0,72.0 135.0,71.7 C 139.0,71.4 141.0,71.6 145.0,71.6 C 149.0,71.5 151.0,71.7 155.0,71.5 C 159.0,71.3 161.0,72.3 165.0,70.6 C 169.0,68.9 171.0,64.8 175.0,63.0 C 179.0,61.1 181.0,62.1 185.0,61.4 C 189.0,60.7 191.0,60.1 195.0,59.6 C 199.0,59.0 201.0,59.2 205.0,58.7 C 209.0,58.2 211.0,56.8 215.0,57.1 C 219.0,57.4 221.0,58.9 225.0,60.1 C 229.0,61.4 231.0,63.1 235.0,63.2 C 239.0,63.3 241.0,61.0 245.0,60.6 C 249.0,60.1 251.0,62.1 255.0,61.2 C 259.0,60.2 261.0,57.0 265.0,55.9 C 269.0,54.8 271.0,55.7 275.0,55.7 C 279.0,55.8 281.0,56.1 285.0,56.2 C 289.0,56.4 291.0,56.4 295.0,56.6 C 299.0,56.9 301.0,58.0 305.0,57.6 C 309.0,57.2 311.0,54.5 315.0,54.5 C 319.0,54.6 321.0,56.5 325.0,57.9 C 329.0,59.3 331.0,60.1 335.0,61.3 C 339.0,62.5 341.0,64.2 345.0,64.0 C 349.0,63.7 351.0,60.6 355.0,60.1 C 359.0,59.7 361.0,61.1 365.0,61.6 C 369.0,62.1 371.0,62.5 375.0,62.8 C 379.0,63.0 381.0,64.9 385.0,63.1 C 389.0,61.2 391.0,56.3 395.0,53.7 C 399.0,51.2 401.0,51.1 405.0,50.2 C 409.0,49.4 411.0,49.9 415.0,49.5 C 419.0,49.1 421.0,48.8 425.0,48.3 C 429.0,47.7 431.0,50.7 435.0,46.9 C 439.0,43.0 441.0,32.9 445.0,29.1 C 449.0,25.3 451.0,28.1 455.0,27.9 C 459.0,27.7 461.0,28.2 465.0,28.1 C 469.0,28.0 471.0,32.1 475.0,27.4 C 479.0,22.8 481.0,10.3 485.0,4.8 C 489.0,-0.7 491.0,0.3 495.0,0.0 C 499.0,-0.3 501.0,-0.0 505.0,3.2 C 509.0,6.3 511.0,13.0 515.0,15.9 C 519.0,18.8 521.0,19.5 525.0,17.7 C 529.0,15.8 531.0,7.7 535.0,6.8 C 539.0,5.8 541.0,10.4 545.0,12.9 C 549.0,15.4 551.0,16.4 555.0,19.3 C 559.0,22.3 561.0,25.3 565.0,27.4 C 569.0,29.6 571.0,28.2 575.0,30.1 C 579.0,32.0 581.0,34.0 585.0,37.0 C 589.0,40.0 591.0,42.1 595.0,45.0 C 599.0,48.0 601.0,49.4 605.0,51.6 C 609.0,53.9 611.0,54.1 615.0,56.2 C 619.0,58.3 621.0,59.8 625.0,62.1 C 629.0,64.4 631.0,65.7 635.0,67.5 C 639.0,69.4 641.0,70.1 645.0,71.4 C 649.0,72.8 651.0,73.3 655.0,74.3 C 659.0,75.3 661.0,75.6 665.0,76.4 C 669.0,77.2 671.0,77.3 675.0,78.4 C 679.0,79.4 681.0,79.7 685.0,81.7 C 689.0,83.7 691.0,86.8 695.0,88.4 C 699.0,90.1 701.0,89.7 705.0,90.0 C 709.0,90.3 711.0,90.0 715.0,90.0 C 719.0,90.0 721.0,90.0 725.0,90.0 C 729.0,90.0 731.0,90.0 735.0,90.0 C 739.0,90.0 741.0,90.0 745.0,90.0 C 749.0,90.0 751.0,90.2 755.0,90.0 C 759.0,89.8 761.0,89.7 765.0,89.2 C 769.0,88.6 771.0,88.3 775.0,87.4 C 779.0,86.6 781.0,85.8 785.0,84.9 C 789.0,83.9 791.0,82.9 795.0,82.7 C 799.0,82.6 801.0,84.2 805.0,84.0 C 809.0,83.9 811.0,83.0 815.0,82.1 C 819.0,81.1 821.0,80.0 825.0,79.3 C 829.0,78.6 831.0,79.0 835.0,78.8 C 839.0,78.6 841.0,78.6 845.0,78.3 C 849.0,78.0 851.0,78.0 855.0,77.3 C 859.0,76.5 861.0,75.2 865.0,74.5 C 869.0,73.8 871.0,74.3 875.0,73.9 C 879.0,73.6 881.0,72.4 885.0,72.7 C 889.0,73.0 891.0,75.2 895.0,75.4 C 899.0,75.6 901.0,74.8 905.0,73.7 C 909.0,72.6 911.0,71.8 915.0,70.1 C 919.0,68.4 921.0,67.0 925.0,65.2 C 929.0,63.4 931.0,61.7 935.0,61.1 C 939.0,60.4 941.0,62.4 945.0,62.1 C 949.0,61.8 951.0,60.8 955.0,59.5 C 959.0,58.2 961.0,56.6 965.0,55.6 C 969.0,54.6 971.0,55.2 975.0,54.5 C 979.0,53.9 981.0,52.4 985.0,52.4 C 989.0,52.4 992.0,53.9 995.0,54.3 C 998.0,54.7 999.0,45.1 1000.0,54.3 C 1001.0,63.4 1000.0,90.9 1000.0,100.0"
- fill="white"
- ></path>
- </clipPath> -->
<clipPath id="4">
<path class="ytp-heat-map-path" :d="heatMap"></path>
</clipPath>
diff --git a/resources/js/router/index.js b/resources/js/router/index.js
index 5ec8a015..79c565b5 100755
--- a/resources/js/router/index.js
+++ b/resources/js/router/index.js
@@ -1,16 +1,16 @@
-import SettingsView from '../views/SettingsView.vue';
-import HistoryView from '../views/HistoryView.vue';
-import ProfileView from '../views/ProfileView.vue';
-import RegisterView from '../views/RegisterView.vue';
-import LoginView from '../views/LoginView.vue';
-import VideoView from '../views/VideoView.vue';
-import ErrorView from '../views/ErrorView.vue';
+import SettingsView from '@/views/SettingsView.vue';
+import HistoryView from '@/views/HistoryView.vue';
+import ProfileView from '@/views/ProfileView.vue';
+import RegisterView from '@/views/RegisterView.vue';
+import LoginView from '@/views/LoginView.vue';
+import VideoView from '@/views/VideoView.vue';
+import ErrorView from '@/views/ErrorView.vue';
import { createRouter, createWebHistory } from 'vue-router';
-import { useAuthStore } from '../stores/AuthStore';
-import { logout } from '../service/authAPI';
-import { toTitleCase } from '../service/util';
-import { useToast } from '../composables/useToast';
+import { useAuthStore } from '@/stores/AuthStore';
+import { logout } from '@/service/authAPI';
+import { toTitleCase } from '@/service/util';
+import { useToast } from '@/composables/useToast';
import DashboardView from '@/views/DashboardView.vue';
const router = createRouter({
diff --git a/resources/js/service/api.js b/resources/js/service/api.ts
old mode 100755
new mode 100644
similarity index 62%
rename from resources/js/service/api.js
rename to resources/js/service/api.ts
index 254bd081..94be1149
--- a/resources/js/service/api.js
+++ b/resources/js/service/api.ts
@@ -1,15 +1,15 @@
import axios from 'axios';
-const handleResponse = (response) => {
+const handleResponse = (response: any) => {
return response;
};
-const handleError = (error) => {
+const handleError = (error: { response: { status: number; data: { message: any } }; message: any }) => {
// if the server throws an error (404, 500 etc.)
console.log(error);
if (error.response.status === 403) {
//|| error.response.status === 500
- window.location = `/${error.response.status}?message=${error?.response?.data?.message ?? error?.message}`;
+ window.location.href = `/${error.response.status}?message=${error?.response?.data?.message ?? error?.message}`;
return;
}
@@ -38,5 +38,14 @@ export const WEB = axios.create({
withCredentials: true,
});
+export async function getMediaUrl(path: string): Promise<string> {
+ if (!path) return '';
+ let newPath = path.replace('storage/', '');
+ // console.log(newPath);
+
+ const response = await axios.get(`/signed-url/${newPath}`);
+ return response.data; // The signed URL
+}
+
API.interceptors.response.use(handleResponse, handleError);
WEB.interceptors.response.use(handleResponse, handleError);
diff --git a/resources/js/service/authAPI.js b/resources/js/service/authAPI.ts
old mode 100755
new mode 100644
similarity index 86%
rename from resources/js/service/authAPI.js
rename to resources/js/service/authAPI.ts
index 928bf5bc..5f240d72
--- a/resources/js/service/authAPI.js
+++ b/resources/js/service/authAPI.ts
@@ -4,7 +4,7 @@ export const getCSRF = async () => {
return WEB.get(`/sanctum/csrf-cookie`);
};
-export const login = async (credentials) => {
+export const login = async (credentials: any) => {
try {
await WEB.get(`/sanctum/csrf-cookie`);
const response = await API.post('/login', credentials);
@@ -14,7 +14,7 @@ export const login = async (credentials) => {
}
};
-export const register = async (credentials) => {
+export const register = async (credentials: any) => {
try {
const response = await API.post('/register', credentials);
return Promise.resolve(response);
@@ -33,7 +33,7 @@ export const logout = async () => {
}
};
-export const authenticate = async (token) => {
+export const authenticate = async (token: string | null) => {
try {
return await API.get('/auth', {
headers: {
diff --git a/resources/js/stores/AppStore.js b/resources/js/stores/AppStore.ts
old mode 100755
new mode 100644
similarity index 50%
rename from resources/js/stores/AppStore.js
rename to resources/js/stores/AppStore.ts
index 8ffa8055..1f85b4b5
--- a/resources/js/stores/AppStore.js
+++ b/resources/js/stores/AppStore.ts
@@ -1,18 +1,19 @@
-import { ref } from 'vue';
import { defineStore } from 'pinia';
+import { ref } from 'vue';
export const useAppStore = defineStore('App', () => {
const pageTitle = ref('');
- const lightMode = ref(null);
- const ambientMode = ref(null);
+ const lightMode = ref<null | boolean>(null);
+ const ambientMode = ref<null | boolean>(null);
+ const playbackHeatmap = ref<null | boolean>(null);
const selectedSideBar = ref('');
const scrollLock = ref(false);
function toggleDarkMode() {
let rootHTML = document.querySelector('html');
- localStorage.setItem('lightMode', lightMode.value);
- lightMode.value ? rootHTML.classList.remove('dark', 'tw-dark') : rootHTML.classList.add('dark', 'tw-dark');
+ localStorage.setItem('lightMode', booleanToString(lightMode.value));
+ lightMode.value ? rootHTML?.classList.remove('dark', 'tw-dark') : rootHTML?.classList.add('dark', 'tw-dark');
}
function initDarkMode() {
@@ -21,11 +22,11 @@ export const useAppStore = defineStore('App', () => {
if (!init) return;
lightMode.value = cachedState === 'true';
- localStorage.setItem('lightMode', lightMode.value);
+ localStorage.setItem('lightMode', booleanToString(lightMode.value));
}
function setAmbientMode() {
- localStorage.setItem('ambientMode', ambientMode.value);
+ localStorage.setItem('ambientMode', booleanToString(ambientMode.value));
}
function initAmbientMode() {
@@ -34,13 +35,26 @@ export const useAppStore = defineStore('App', () => {
if (!init) return;
ambientMode.value = cachedState === 'true';
- localStorage.setItem('ambientMode', ambientMode.value);
+ localStorage.setItem('ambientMode', booleanToString(ambientMode.value));
+ }
+
+ function setPlaybackHeatmap() {
+ localStorage.setItem('playbackHeatmap', booleanToString(playbackHeatmap.value));
+ }
+
+ function initPlaybackHeatmap() {
+ let init = playbackHeatmap.value === null;
+ let cachedState = localStorage.getItem('playbackHeatmap');
+ if (!init) return;
+
+ playbackHeatmap.value = cachedState === 'true';
+ localStorage.setItem('playbackHeatmap', booleanToString(playbackHeatmap.value));
}
function cycleSideBar(target = '') {
if (selectedSideBar.value === target) {
selectedSideBar.value = '';
- document.getElementById('root').scrollIntoView({ behavior: 'smooth' });
+ document.getElementById('root')?.scrollIntoView({ behavior: 'smooth' });
return;
}
selectedSideBar.value = target;
@@ -50,6 +64,10 @@ export const useAppStore = defineStore('App', () => {
scrollLock.value = state;
}
+ function booleanToString(val: null | boolean) {
+ return val ? 'true' : 'false';
+ }
+
return {
initDarkMode,
toggleDarkMode,
@@ -57,6 +75,9 @@ export const useAppStore = defineStore('App', () => {
initAmbientMode,
setAmbientMode,
ambientMode,
+ initPlaybackHeatmap,
+ setPlaybackHeatmap,
+ playbackHeatmap,
cycleSideBar,
selectedSideBar,
pageTitle,
diff --git a/resources/js/stores/AuthStore.js b/resources/js/stores/AuthStore.ts
old mode 100755
new mode 100644
similarity index 87%
rename from resources/js/stores/AuthStore.js
rename to resources/js/stores/AuthStore.ts
index e69fbfb4..09330272
--- a/resources/js/stores/AuthStore.js
+++ b/resources/js/stores/AuthStore.ts
@@ -2,6 +2,7 @@ import { ref } from 'vue';
import { defineStore } from 'pinia';
import { authenticate } from '../service/authAPI';
import { useToast } from '../composables/useToast';
+import { AxiosError } from 'axios';
export const useAuthStore = defineStore('Auth', () => {
const userData = ref(null);
@@ -26,11 +27,11 @@ export const useAuthStore = defineStore('Auth', () => {
try {
const localToken = localStorage.getItem('auth-token');
- const { data, error, status } = await authenticate(localToken);
+ const { data, status } = await authenticate(localToken);
- if (error || status !== 200) {
+ if (status !== 200) {
// Auth request was denied (so local data is invalid) -> don't logout because that will be another 401 anyway
- throw error ?? 'Unauthenticated';
+ throw new AxiosError('Not Authenticated', status.toString()) ?? 'Unauthenticated';
}
userData.value = data.data.user;
diff --git a/resources/js/types/resources.ts b/resources/js/types/resources.ts
index f16d5e3c..a9f91bcd 100644
--- a/resources/js/types/resources.ts
+++ b/resources/js/types/resources.ts
@@ -1,4 +1,4 @@
-import type { User } from './model';
+import type { Category, Folder, Metadata, User } from './model';
export interface CategoryResource {
id: number;
@@ -32,7 +32,7 @@ export interface MetadataResource {
relationships: {
video_id?: number;
editor_id?: number;
- editor_name?: string;
+ // editor_name?: string;
video_tags?: VideoTagResource[];
};
}
@@ -43,33 +43,32 @@ export interface PlaybackResource {
};
relationships: {
metadata_id?: number;
- video_id?: number;
+ // video_id?: number;
};
}
export interface RecordResource {
id: number;
attributes: {
- name?: string;
+ // name?: string;
created_at?: string;
updated_at?: string;
};
relationships: {
- user_id: number;
- user_name: string;
+ // user_id: number;
+ // user_name: string;
+ folder?: Folder | { name: string };
+ metadata?: Metadata;
+ category?: Category;
video_id?: number;
video_name?: string;
file_name?: string;
- folder?: FolderResource;
- category?: CategoryResource;
- metadata_id?: number | 'None';
- metadata?: MetadataResource;
};
}
export interface SeriesResource {
id: number;
folder_id?: number;
editor_id?: number;
- editor_name?: string;
+ // editor_name?: string;
title?: string;
description?: string;
studio?: string;
@@ -112,12 +111,12 @@ export interface VideoResource {
video_tags: VideoTagResource[];
date_released?: string;
date_updated?: string;
- folder_id: number;
- metadata?: MetadataResource;
- editor?: User;
+ // folder_id: number;
+ metadata?: Metadata;
+ // editor?: User;
}
export interface VideoTagResource {
video_tag_id: number; // video tag (this) id
- id: number; // tag id
name?: string;
+ id: number; // tag id
}
diff --git a/resources/js/views/LoginView.vue b/resources/js/views/LoginView.vue
index f826bf8a..3b950602 100755
--- a/resources/js/views/LoginView.vue
+++ b/resources/js/views/LoginView.vue
@@ -1,15 +1,15 @@
-<script setup>
-import LayoutAuth from '../layouts/LayoutAuth.vue';
-import FormInputLabel from '../components/labels/FormInputLabel.vue';
-import FormInput from '../components/inputs/FormInput.vue';
-import useForm from '../composables/useForm';
-
+<script setup lang="ts">
import { useRouter, useRoute, RouterLink } from 'vue-router';
-import { useAuthStore } from '../stores/AuthStore';
+import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
-import { login } from '../service/authAPI';
+import { login } from '@/service/authAPI';
import { ref } from 'vue';
+import FormInputLabel from '@/components/labels/FormInputLabel.vue';
+import LayoutAuth from '@/layouts/LayoutAuth.vue';
+import FormInput from '@/components/inputs/FormInput.vue';
+import useForm from '@/composables/useForm';
+
const router = useRouter();
const route = useRoute();
const authStore = useAuthStore();
@@ -28,16 +28,16 @@ const form = useForm({
const handleLogin = async () => {
form.submit(
- async (fields) => {
+ async (fields: any) => {
console.log(fields);
return await login(fields);
},
{
- onSuccess: (response) => {
+ onSuccess: (response: { data: { data: { token: string; user: null } } }) => {
localStorage.setItem('auth-token', response.data.data.token);
userData.value = response.data.data.user;
- router.push(route.query.redirect ?? '/');
+ router.push(route.query.redirect ? route.query.redirect.toString() : '/');
},
onError: () => form.reset('password'),
},
diff --git a/resources/js/views/RegisterView.vue b/resources/js/views/RegisterView.vue
index 6e83d053..abc36e29 100755
--- a/resources/js/views/RegisterView.vue
+++ b/resources/js/views/RegisterView.vue
@@ -1,15 +1,15 @@
<script setup>
-import LayoutAuth from '../layouts/LayoutAuth.vue';
-import FormInputLabel from '../components/labels/FormInputLabel.vue';
-import FormInput from '../components/inputs/FormInput.vue';
-import useForm from '../composables/useForm';
-
-import { register } from '../service/authAPI';
import { useRouter, RouterLink } from 'vue-router';
-import { useAuthStore } from '../stores/AuthStore';
+import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
+import { register } from '@/service/authAPI';
import { ref } from 'vue';
+import FormInputLabel from '@/components/labels/FormInputLabel.vue';
+import LayoutAuth from '@/layouts/LayoutAuth.vue';
+import FormInput from '@/components/inputs/FormInput.vue';
+import useForm from '@/composables/useForm';
+
const router = useRouter();
const authStore = useAuthStore();
const { userData } = storeToRefs(authStore);
diff --git a/resources/js/views/SettingsView.vue b/resources/js/views/SettingsView.vue
index 374bcffb..e4e35eac 100755
--- a/resources/js/views/SettingsView.vue
+++ b/resources/js/views/SettingsView.vue
@@ -1,15 +1,15 @@
-<script setup>
+<script setup lang="ts">
+import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
-import { useAppStore } from '../stores/AppStore';
import { onMounted } from 'vue';
-import FormInputLabel from '../components/labels/FormInputLabel.vue';
-import ToggleBase from '../components/inputs/ToggleBase.vue';
-import LayoutBase from '../layouts/LayoutBase.vue';
+import FormInputLabel from '@/components/labels/FormInputLabel.vue';
+import ToggleBase from '@/components/inputs/ToggleBase.vue';
+import LayoutBase from '@/layouts/LayoutBase.vue';
const appStore = useAppStore();
-const { pageTitle, ambientMode } = storeToRefs(appStore);
+const { pageTitle, ambientMode, playbackHeatmap } = storeToRefs(appStore);
onMounted(() => {
pageTitle.value = 'Settings';
@@ -19,12 +19,21 @@ onMounted(() => {
<template>
<LayoutBase>
<template v-slot:content>
- <section id="content-settings" class="space-y-2 cursor-pointer min-h-[80vh]">
- <FormInputLabel :field="{ name: 'ToggleAmbientMode', text: 'Ambient Mode' }" />
- <div class="flex items-center gap-2">
- <ToggleBase v-model="ambientMode" />
- <p>{{ ambientMode ? 'On' : 'Off' }}</p>
- </div>
+ <section id="content-settings" class="flex flex-col gap-4 [&>*]:space-y-1">
+ <span>
+ <FormInputLabel :field="{ name: 'ToggleAmbientMode', text: 'Ambient Mode' }" />
+ <div class="flex items-center gap-2">
+ <ToggleBase v-model="ambientMode" />
+ <p>{{ ambientMode ? 'On' : 'Off' }}</p>
+ </div>
+ </span>
+ <span>
+ <FormInputLabel :field="{ name: 'TogglePlaybackHeatmap', text: 'Playback Heatmap' }" />
+ <div class="flex items-center gap-2">
+ <ToggleBase v-model="playbackHeatmap" />
+ <p>{{ playbackHeatmap ? 'On' : 'Off' }}</p>
+ </div>
+ </span>
</section>
</template>
<template v-slot:sidebar>