Skip to content

A self-hosted media server and file management system

fix dates on editors?

aminnausin87b09a21fbb8
diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.php
index 6c4538ff..e4c27ccf 100755
--- a/app/Http/Resources/VideoResource.php
+++ b/app/Http/Resources/VideoResource.php
@@ -30,10 +30,12 @@ class VideoResource extends JsonResource
'view_count' => $metadata ? $this->metadata->view_count : $this->view_count,
'tags' => $this->metadata->tags ?? '',
'video_tags' => $this->metadata->tags() ?? [],
+ 'date_released' => $this->metadata->date_released,
+ 'date_updated' => $this->metadata->updated_at,
// ],
// 'relationships' => [
'folder_id' => (string)$this->folder->id,
- 'metadata' => $this->metadata,
+ 'metadata' => new MetadataResource($metadata),
'editor' => $metadata ? $this->metadata->editor : null
// ]
];
diff --git a/app/Models/Metadata.php b/app/Models/Metadata.php
index 389e0038..e79cc20f 100644
--- a/app/Models/Metadata.php
+++ b/app/Models/Metadata.php
@@ -2,6 +2,7 @@
namespace App\Models;
+use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -44,4 +45,9 @@ class Metadata extends Model
{
return $this->hasMany(VideoTag::class);
}
+
+ public function getDateReleasedFormattedAttribute()
+ {
+ return $this->attributes['date_released'] ? Carbon::parse($this->attributes['date_released'])->format('F d, Y') : null;
+ }
}
diff --git a/resources/js/components/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vue
index 1270830c..66bb2a87 100644
--- a/resources/js/components/forms/EditFolder.vue
+++ b/resources/js/components/forms/EditFolder.vue
@@ -9,6 +9,7 @@ import { reactive } from 'vue';
import { useToast } from '../../composables/useToast';
import DatePicker from '../pinesUI/DatePicker.vue';
import FormInputNumber from '../inputs/FormInputNumber.vue';
+import { toCalendarFormattedDate } from '../../service/util';
const emit = defineEmits(['handleFinish']);
const props = defineProps(['folder']);
@@ -72,7 +73,7 @@ const fields = reactive([
name: 'date_start',
text: 'Start Date',
type: 'date',
- value: props.folder?.series?.date_start,
+ value: props.folder?.series?.date_start ? toCalendarFormattedDate(props.folder?.series?.date_start) : null,
subtext: 'The release date of the first video in the series',
default: null,
},
@@ -80,7 +81,7 @@ const fields = reactive([
name: 'date_end',
text: 'End Date',
type: 'date',
- value: props.folder?.series?.date_end,
+ value: props.folder?.series?.date_end ? toCalendarFormattedDate(props.folder?.series?.date_end) : null,
subtext: 'The release date of the last video in the series',
default: null,
},
@@ -102,8 +103,8 @@ const form = useForm({
episodes: props.folder?.series?.episodes ?? null,
seasons: props.folder?.series?.seasons ?? null,
films: props.folder?.series?.films ?? null,
- date_start: props.folder?.series?.date_start ?? null,
- date_end: props.folder?.series?.date_end ?? null,
+ date_start: props.folder?.series?.date_start ? toCalendarFormattedDate(props.folder?.series?.date_start) : null,
+ date_end: props.folder?.series?.date_end ? toCalendarFormattedDate(props.folder?.series?.date_end) : null,
thumbnail_url: props.folder?.series?.thumbnail_url ?? null,
});
@@ -135,7 +136,7 @@ const handleSubmit = async () => {
<FormInputLabel :field="field" />
<FormTextArea v-if="field.type === 'textArea'" v-model="form.fields[field.name]" :field="field" :tabindex="index + 1" />
- <DatePicker v-else-if="field.type === 'date'" />
+ <DatePicker v-else-if="field.type === 'date'" v-model="form.fields[field.name]" :field="field" :tabindex="index + 1" />
<FormInputNumber v-else-if="field.type === 'number'" v-model="form.fields[field.name]" :field="field" :tabindex="index + 1" />
<FormInput v-else v-model="form.fields[field.name]" :field="field" :tabindex="index + 1" />
<ul class="text-sm text-red-600 dark:text-red-400">
diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vue
index 7a1fe7b8..55f246a2 100755
--- a/resources/js/components/forms/EditVideo.vue
+++ b/resources/js/components/forms/EditVideo.vue
@@ -6,14 +6,18 @@ import FormTextArea from '../inputs/FormTextArea.vue';
import FormInputLabel from '../labels/FormInputLabel.vue';
import DatePicker from '../pinesUI/DatePicker.vue';
import FormInputNumber from '../inputs/FormInputNumber.vue';
+import InputMultiChip from '../pinesUI/InputMultiChip.vue';
-import { reactive } from 'vue';
+import { onMounted, reactive, ref } from 'vue';
import { useToast } from '../../composables/useToast';
+import { useGetVideoTags } from '@/service/queries';
+import { toCalendarFormattedDate } from '../../service/util';
+
const emit = defineEmits(['handleFinish']);
const props = defineProps(['video']);
-
const toast = useToast();
+const allTags = ref([]);
const fields = reactive([
{
@@ -50,10 +54,10 @@ const fields = reactive([
min: 0,
},
{
- name: 'release_date',
- text: 'Release Date',
+ name: 'date_released',
+ text: 'Date Release',
type: 'date',
- value: props.video?.release_date ?? null,
+ value: props.video?.date_released ? toCalendarFormattedDate(props.video?.date_released) : null,
default: null,
},
{
@@ -72,18 +76,15 @@ const form = useForm({
description: props.video?.description ?? '',
episode: props.video?.episode ?? null,
season: props.video?.season ?? null,
- date_released: props.video?.date_released ?? null,
+ date_released: props.video?.date_released ? toCalendarFormattedDate(props.video?.date_released) : null,
tags: props.video?.tags ?? null,
});
const handleSubmit = async () => {
form.submit(
async (fields) => {
- console.log(props.video);
-
- // return mediaAPI.updateMetadata(props.video.relationships.metadata.id, fields);
- if (props.video.relationships?.metadata?.id) {
- return mediaAPI.updateMetadata(props.video.relationships.metadata.id, fields);
+ if (props.video?.metadata?.id) {
+ return mediaAPI.updateMetadata(props.video.metadata.id, fields);
} else return mediaAPI.createMetadata({ ...fields, video_id: props.video.id });
},
{
@@ -97,6 +98,16 @@ const handleSubmit = async () => {
},
);
};
+
+const handleCreateTag = async (name) => {
+ console.log(name);
+};
+
+onMounted(async () => {
+ const { data: tagsQuery } = await useGetVideoTags();
+
+ allTags.value = tagsQuery.value?.data;
+});
</script>
<template>
@@ -105,8 +116,24 @@ const handleSubmit = async () => {
<FormInputLabel :field="field" />
<FormTextArea v-if="field.type === 'textArea'" v-model="form.fields[field.name]" :field="field" :tabindex="index + 1" />
- <DatePicker v-else-if="field.type === 'date'" v-model="form.fields[field.name]" />
+ <DatePicker v-else-if="field.type === 'date'" v-model="form.fields[field.name]" :field="field" :tabindex="index + 1" />
<FormInputNumber v-else-if="field.type === 'number'" v-model="form.fields[field.name]" :field="field" :tabindex="index + 1" />
+ <InputMultiChip
+ v-else-if="field.name === 'tags'"
+ :placeholder="'Add tags'"
+ :defaultItems="
+ form.fields[field.name]
+ ? form.fields[field.name]
+ .replace('#', '')
+ .split(' ')
+ .filter((tag) => tag.replaceAll(' ', ''))
+ .map((str) => {
+ return { name: str };
+ })
+ : []
+ "
+ @addAction="handleCreateTag"
+ />
<FormInput v-else v-model="form.fields[field.name]" :field="field" :tabindex="index + 1" />
<ul class="text-sm text-red-600 dark:text-red-400">
<li v-for="(item, index) in form.errors[field.name]" :key="index">{{ item }}</li>
diff --git a/resources/js/service/util.js b/resources/js/service/util.js
index 9aa5e2b0..7e397670 100755
--- a/resources/js/service/util.js
+++ b/resources/js/service/util.js
@@ -48,3 +48,9 @@ export function toFormattedDuration(rawSeconds) {
export function formatInteger(integer, minimumDigits = 2) {
return integer.toLocaleString('en-CA', { minimumIntegerDigits: minimumDigits });
}
+
+export function toCalendarFormattedDate(date) {
+ let rawDate = new Date(date + ' EST');
+
+ return rawDate.toLocaleDateString('en-CA', { month: 'long', day: '2-digit', year: 'numeric' }).replaceAll('.', '');
+}