Skip to content

A self-hosted media server and file management system

fix record cards

aminnausin4db466c27585
diff --git a/app/Http/Resources/RecordResource.php b/app/Http/Resources/RecordResource.php
index b453884b..2ded86fc 100755
--- a/app/Http/Resources/RecordResource.php
+++ b/app/Http/Resources/RecordResource.php
@@ -5,19 +5,16 @@ namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
-class RecordResource extends JsonResource
-{
+class RecordResource 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,
'attributes' => [
- 'name' => $this->name,
'created_at' => $this->created_at,
'updated_at' => $this->updated_at
],
@@ -27,10 +24,10 @@ class RecordResource extends JsonResource
'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_id' => $this->video ? $this->video->folder_id : null,
- 'folder_name' => $this->video ? $this->video->folder->name : ($this->metadata && $this->metadata->video ? $this->metadata->video->folder->name : 'Deleted'),
- 'category_name' => $this->video ? $this->video->folder->category->name : null,
- 'metadata_id' => $this->metadata ? $this->metadata->id : 'None'
+ '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/resources/js/components/cards/RecordCard.vue b/resources/js/components/cards/RecordCard.vue
index ef0471c1..f84fe889 100755
--- a/resources/js/components/cards/RecordCard.vue
+++ b/resources/js/components/cards/RecordCard.vue
@@ -1,18 +1,24 @@
-<script setup>
+<script setup lang="ts">
+import { toFormattedDate, toTimeSpan } from '../../service/util';
+import { type RecordResource } from '@/types/resources';
+import { formatFileSize } from '@/composables/useMetaData';
+import { computed } from 'vue';
+
import ButtonCorner from '../inputs/ButtonCorner.vue';
import CircumShare1 from '~icons/circum/share-1';
import CircumPlay1 from '~icons/circum/play-1';
-import { toFormattedDate, toTimeSpan } from '../../service/util';
-import { computed } from 'vue';
+const props = defineProps<{
+ record: RecordResource;
+}>();
-const props = defineProps(['record']);
-const rawDate = new Date(props.record?.attributes.created_at?.replace(' ', 'T'));
+const rawDate = new Date((props.record.attributes.created_at ?? '').replace(' ', 'T'));
const timeSpan = toTimeSpan(rawDate);
const videoLink = computed(() => {
- if (!props.record.relationships.video_id) return false;
- return `/${encodeURIComponent(props.record.relationships.category_name)}/${encodeURIComponent(props.record.relationships.folder_name)}?video=${props.record.relationships.video_id}`;
+ if (!props.record.relationships.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}`;
});
</script>
@@ -20,16 +26,16 @@ const videoLink = computed(() => {
<div
class="text-left relative flex flex-col gap-4 lg:gap-2 sm:flex-row flex-wrap rounded-lg dark:bg-primary-dark-800/70 bg-primary-800 dark:hover:bg-primary-dark-600 hover:bg-gray-200 dark:text-white shadow p-3 w-full group cursor-pointer divide-gray-300 dark:divide-gray-400"
>
- <section class="flex justify-between gap-4 w-full">
+ <section class="flex justify-between gap-4 w-full items-center">
<h2 class="text-xl w-full truncate" :title="props.record.relationships.video_name">
{{ props.record.relationships.video_name }}
</h2>
- <div class="flex justify-end gap-1">
+ <div class="flex justify-end gap-1" v-if="videoLink">
<ButtonCorner
:positionClasses="'w-7 h-7'"
:textClasses="'hover:text-neutral-900 dark:hover:text-violet-400'"
:colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"
- :label="'Share Folder'"
+ :label="'Share Video'"
@click.stop.prevent="$emit('clickAction', videoLink)"
>
<template #icon>
@@ -37,7 +43,6 @@ const videoLink = computed(() => {
</template>
</ButtonCorner>
<ButtonCorner
- v-if="videoLink"
:positionClasses="'w-7 h-7'"
:textClasses="`hover:text-violet-600 dark:hover:text-violet-500`"
:colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"
@@ -49,21 +54,26 @@ const videoLink = computed(() => {
</template>
</ButtonCorner>
</div>
+ <div class="flex justify-end gap-1 text-neutral-500 w-full truncate" v-else>
+ <!-- -if="props.record.relationships.metadata?.attributes?.file_size" -->
+ {{ 'Deleted' }}
+ <!-- {{ formatFileSize(props.record.relationships.metadata?.attributes?.file_size) }} -->
+ </div>
</section>
- <section class="flex flex-col sm:flex-row sm:justify-between w-full">
+ <section class="flex flex-wrap sm:flex-nowrap sm:justify-between w-full gap-x-2">
<h3
- class="hidden lg:block text-neutral-500 w-full text-wrap truncate sm:text-nowrap"
- :title="props.record.relationships.folder_name"
+ class="hidden lg:block text-neutral-500 w-full text-wrap truncate sm:text-nowrap shrink-0"
+ :title="props.record.relationships.folder?.name"
>
- {{ props.record.relationships.folder_name }}
+ {{ props.record.relationships.folder?.name }}
</h3>
<h3 class="hidden lg:block truncate text-right text-neutral-500 w-full line-clamp-2" :title="toFormattedDate(rawDate)">
{{ timeSpan }}
</h3>
- <h3 class="lg:hidden text-neutral-500 w-full text-wrap truncate sm:text-nowrap">
- {{ props.record.relationships.folder_name }} · {{ timeSpan }}
+ <h3 class="lg:hidden text-neutral-500 text-wrap truncate sm:text-nowrap mr-auto">
+ {{ props.record.relationships.folder?.name }} · {{ timeSpan }}
</h3>
- <h3 class="lg:hidden truncate sm:text-right text-neutral-500 w-full line-clamp-2">
+ <h3 class="lg:hidden truncate sm:text-right text-neutral-500 line-clamp-2 text-wrap sm:text-nowrap">
{{
`${rawDate.toLocaleDateString('en-ca', {
year: 'numeric',
diff --git a/resources/js/components/cards/RecordCardDetails.vue b/resources/js/components/cards/RecordCardDetails.vue
index 8b78c7c4..a3ff3b41 100755
--- a/resources/js/components/cards/RecordCardDetails.vue
+++ b/resources/js/components/cards/RecordCardDetails.vue
@@ -1,17 +1,22 @@
-<script setup>
-import { toTimeSpan } from '../../service/util';
+<script setup lang="ts">
+import type { RecordResource } from '@/types/resources';
+import { toTimeSpan } from '@/service/util';
import { computed } from 'vue';
import ButtonCorner from '../inputs/ButtonCorner.vue';
import CircumPlay1 from '~icons/circum/play-1';
-const props = defineProps(['data']);
+const props = defineProps<{
+ data: RecordResource;
+}>();
-const rawDate = new Date(props.data?.attributes?.created_at?.replace(' ', 'T'));
+const rawDate = new Date((props.data?.attributes.created_at ?? '').replace(' ', 'T'));
const timeSpan = toTimeSpan(rawDate);
const videoLink = computed(() => {
- return `/${encodeURIComponent(props.data.relationships.category_name)}/${encodeURIComponent(props.data.relationships.folder_name)}?video=${props.data.relationships.video_id}`;
+ if (!props.data.relationships.video_id || !props.data.relationships.category?.name || !props.data.relationships.folder?.name)
+ return false;
+ return `/${encodeURIComponent(props.data.relationships?.category?.name ?? '')}/${encodeURIComponent(props.data.relationships.folder?.name ?? '')}?video=${props.data.relationships.video_id}`;
});
</script>
@@ -21,9 +26,12 @@ const videoLink = computed(() => {
class="text-left relative flex flex-col gap-4 sm:flex-row flex-wrap rounded-xl dark:bg-primary-dark-800/70 bg-primary-800 dark:hover:bg-primary-dark-600 hover:bg-gray-200 dark:text-white shadow p-3 w-full group cursor-pointer divide-gray-300 dark:divide-neutral-400"
>
<section class="flex justify-between gap-4 w-full">
- <h2 class="text-xl w-full truncate" :title="props.data.relationships.file_name">{{ props.data.relationships.video_name }}</h2>
+ <h2 class="text-xl w-full truncate" :title="props.data.relationships.file_name">
+ {{ props.data.relationships.video_name }}
+ </h2>
<div class="flex justify-end gap-1">
<ButtonCorner
+ v-if="videoLink"
:positionClasses="'w-7 h-7'"
:textClasses="'hover:text-violet-600 dark:hover:text-violet-500'"
:colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"
@@ -55,7 +63,7 @@ const videoLink = computed(() => {
minute: '2-digit',
})}`"
>
- {{ props.data.relationships.folder_name }} · {{ timeSpan }}
+ {{ props.data.relationships.folder?.name }} · {{ timeSpan }}
</h3>
<h3 class="truncate sm:text-right text-neutral-500 w-full line-clamp-2">
{{
diff --git a/resources/js/components/panels/VideoSidebar.vue b/resources/js/components/panels/VideoSidebar.vue
index 8f8f7d4e..548a7c2b 100755
--- a/resources/js/components/panels/VideoSidebar.vue
+++ b/resources/js/components/panels/VideoSidebar.vue
@@ -1,23 +1,23 @@
<script setup>
+import { useContentStore } from '../../stores/ContentStore';
+import { useAppStore } from '../../stores/AppStore';
+import { storeToRefs } from 'pinia';
+import { RouterLink } from 'vue-router';
+import { ref, watch } from 'vue';
+
import ButtonClipboard from '../pinesUI/ButtonClipboard.vue';
import FolderCard from '../cards/FolderCard.vue';
import RecordCard from '../cards/RecordCard.vue';
import ModalBase from '../pinesUI/ModalBase.vue';
import useModal from '../../composables/useModal';
-import { useContentStore } from '../../stores/ContentStore';
-import { useAppStore } from '../../stores/AppStore';
-import { storeToRefs } from 'pinia';
-import { RouterLink } from 'vue-router';
-import { ref } from 'vue';
-
const appStore = useAppStore();
const contentStore = useContentStore();
const shareModal = useModal({ title: 'Share Video' });
const shareLink = ref('');
-const { selectedSideBar } = storeToRefs(appStore);
const { stateRecords, stateDirectory, stateFolder } = storeToRefs(contentStore);
+const { selectedSideBar } = storeToRefs(appStore);
const handleShare = (link) => {
if (!link || link[0] !== '/') return;
@@ -25,6 +25,10 @@ const handleShare = (link) => {
shareLink.value = window.location.origin + link;
shareModal.toggleModal(true);
};
+
+watch(selectedSideBar, () => {
+ shareModal.setTitle(`${selectedSideBar === 'folders' ? 'Share Folder' : 'Share Video'}`);
+});
</script>
<template>
@@ -44,7 +48,7 @@ const handleShare = (link) => {
/>
</section>
<section v-if="selectedSideBar === 'history'" id="list-content-history" class="flex space-y-2 flex-wrap">
- <RecordCard v-for="record in stateRecords.slice(0, 10)" :key="record.id" :record="record" />
+ <RecordCard v-for="record in stateRecords.slice(0, 10)" :key="record.id" :record="record" @clickAction="handleShare" />
<RouterLink to="/history" class="text-center text-sm dark:text-neutral-400 mx-auto p-3 hover:underline">View More</RouterLink>
</section>
<ModalBase :modalData="shareModal">
diff --git a/resources/js/components/table/TableBase.vue b/resources/js/components/table/TableBase.vue
index 573b7a2b..d42bf082 100755
--- a/resources/js/components/table/TableBase.vue
+++ b/resources/js/components/table/TableBase.vue
@@ -16,6 +16,7 @@ const props = defineProps([
'data',
'row',
'clickAction',
+ 'otherAction',
'loading',
'sortAction',
'sortingOptions',
@@ -93,6 +94,7 @@ const handleSortChange = (sortKey) => {
:index="index"
:currentID="props.selectedID ?? null"
@clickAction="props.clickAction(row?.id)"
+ @otherAction="$emit('otherAction', $event)"
></component>
</tbody>
<TablePagination
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 00d52f8e..1d441cd8 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -154,8 +154,6 @@ const handleProgress = (override = false) => {
progressCache.value = [...progressCache.value, { metadata_id: stateVideo.value?.metadata?.id, progress: progress.toFixed(2) * 1000 }];
- console.log(progressCache.value);
-
if (stateVideo.value?.metadata?.id && !isNaN(progress) && (progressCache.value.length >= playbackDataBuffer || override)) {
createPlayback({ entries: progressCache.value });
progressCache.value = [];
diff --git a/resources/js/composables/useModal.js b/resources/js/composables/useModal.js
index 1f4c1e20..ed56fd35 100755
--- a/resources/js/composables/useModal.js
+++ b/resources/js/composables/useModal.js
@@ -2,7 +2,8 @@ import { reactive } from 'vue';
export default function useModal(props) {
let closingTimeoutID;
- const modal = reactive({
+ return reactive({
+ title: '',
...props,
modalOpen: false,
isAnimating: false,
@@ -20,6 +21,8 @@ export default function useModal(props) {
this.isAnimating = false;
}, this.animationTime);
},
+ setTitle(title) {
+ if (title && this?.title) this.title = title;
+ },
});
- return modal;
}
diff --git a/resources/js/types/model.ts b/resources/js/types/model.ts
index 1121694e..b22c2db0 100644
--- a/resources/js/types/model.ts
+++ b/resources/js/types/model.ts
@@ -1,11 +1,11 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
-export type Category = {
+export interface Category {
id: number;
name: string;
media_content: boolean;
folders?: Folder[];
-};
-export type Folder = {
+}
+export interface Folder {
id: number;
category_id: number;
name: string;
@@ -13,8 +13,8 @@ export type Folder = {
videos?: Video[];
series?: Series;
category?: Category;
-};
-export type Metadata = {
+}
+export interface Metadata {
id: number;
video_id?: number;
composite_id: string;
@@ -37,8 +37,8 @@ export type Metadata = {
editor?: User;
playbacks?: Playback[];
video_tags?: VideoTag[];
-};
-export type Playback = {
+}
+export interface Playback {
id: number;
metadata_id?: number;
progress: number;
@@ -46,8 +46,8 @@ export type Playback = {
updated_at?: string;
count: number;
metadata?: Metadata;
-};
-export type Record = {
+}
+export interface Record {
id: number;
user_id: number;
video_id?: number;
@@ -58,8 +58,8 @@ export type Record = {
user?: User;
video?: Video;
metadata?: Metadata;
-};
-export type Series = {
+}
+export interface Series {
id: number;
folder_id?: number;
composite_id: string;
@@ -78,8 +78,8 @@ export type Series = {
updated_at?: string;
folder?: Folder;
editor?: User;
-};
-export type Tag = {
+}
+export interface Tag {
id: number;
creator_id?: number;
name: string;
@@ -87,16 +87,16 @@ export type Tag = {
updated_at?: string;
creator?: User;
metadata?: Metadata;
-};
-export type User = {
+}
+export interface User {
id: number;
name: string;
email: string;
email_verified_at?: string;
created_at?: string;
updated_at?: string;
-};
-export type Video = {
+}
+export interface Video {
id: number;
folder_id: number;
name: string;
@@ -111,8 +111,8 @@ export type Video = {
uuid?: any;
folder?: Folder;
metadata?: Metadata;
-};
-export type VideoTag = {
+}
+export interface VideoTag {
id: number;
tag_id: number;
metadata_id: number;
@@ -120,4 +120,4 @@ export type VideoTag = {
updated_at?: string;
metadata?: Metadata;
tag?: Tag;
-};
+}
diff --git a/resources/js/types/resources.ts b/resources/js/types/resources.ts
index a92d1c7b..f16d5e3c 100644
--- a/resources/js/types/resources.ts
+++ b/resources/js/types/resources.ts
@@ -1,12 +1,12 @@
import type { User } from './model';
-export type CategoryResource = {
+export interface CategoryResource {
id: number;
name: string;
folders_count: number;
folders: FolderResource[];
-};
-export type FolderResource = {
+}
+export interface FolderResource {
id: number;
name: string;
path: string;
@@ -15,8 +15,8 @@ export type FolderResource = {
category_id: number;
videos?: VideoResource[];
series?: SeriesResource;
-};
-export type MetadataResource = {
+}
+export interface MetadataResource {
id: number;
attributes: {
title?: string;
@@ -35,8 +35,8 @@ export type MetadataResource = {
editor_name?: string;
video_tags?: VideoTagResource[];
};
-};
-export type PlaybackResource = {
+}
+export interface PlaybackResource {
id: number;
attributes: {
progress: number;
@@ -45,10 +45,10 @@ export type PlaybackResource = {
metadata_id?: number;
video_id?: number;
};
-};
-export type RecordResource = {
+}
+export interface RecordResource {
id: number;
- attributes?: {
+ attributes: {
name?: string;
created_at?: string;
updated_at?: string;
@@ -59,13 +59,13 @@ export type RecordResource = {
video_id?: number;
video_name?: string;
file_name?: string;
- folder_id?: number;
- folder_name?: string;
- category_name?: string;
+ folder?: FolderResource;
+ category?: CategoryResource;
metadata_id?: number | 'None';
+ metadata?: MetadataResource;
};
-};
-export type SeriesResource = {
+}
+export interface SeriesResource {
id: number;
folder_id?: number;
editor_id?: number;
@@ -81,15 +81,15 @@ export type SeriesResource = {
date_end?: string;
thumbnail_url?: string;
date_updated?: string;
-};
-export type TagResource = {
+}
+export interface TagResource {
id: number;
name: string;
relationships: {
creator_id?: number;
};
-};
-// export type UserResource = {
+}
+// export interface UserResource {
// id: number;
// name: string;
// email: string;
@@ -97,7 +97,7 @@ export type TagResource = {
// created_at?: string;
// updated_at?: string;
// };
-export type VideoResource = {
+export interface VideoResource {
id: number;
name: string;
path: string;
@@ -115,9 +115,9 @@ export type VideoResource = {
folder_id: number;
metadata?: MetadataResource;
editor?: User;
-};
-export type VideoTagResource = {
+}
+export interface VideoTagResource {
video_tag_id: number; // video tag (this) id
id: number; // tag id
name?: string;
-};
+}
diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vue
index ed60c0c2..c1bb020d 100755
--- a/resources/js/views/HistoryView.vue
+++ b/resources/js/views/HistoryView.vue
@@ -12,7 +12,6 @@ import { useAppStore } from '@/stores/AppStore';
import { useToast } from '@/composables/useToast';
const toast = useToast();
-
const appStore = useAppStore();
const ContentStore = useContentStore();
const loading = ref(true);