Skip to content

A self-hosted media server and file management system

tags smh

aminnausinff5777834edf
diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index f06235c4..00000000
--- a/.eslintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-dist
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.php
index 770c926e..f135c30d 100644
--- a/app/Http/Controllers/Api/V1/MetadataController.php
+++ b/app/Http/Controllers/Api/V1/MetadataController.php
@@ -6,14 +6,29 @@ use App\Models\Metadata;
use App\Http\Controllers\Controller;
use App\Http\Requests\MetadataStoreRequest;
use App\Http\Requests\MetadataUpdateRequest;
+use App\Http\Resources\MetadataResource;
use App\Http\Resources\VideoResource;
use App\Models\Video;
+use App\Models\VideoTag;
use App\Traits\HttpResponses;
use Illuminate\Support\Facades\Auth;
class MetadataController extends Controller
{
use HttpResponses;
+
+ public function show($id)
+ {
+ try {
+ return $this->success(
+ new MetadataResource(Metadata::where('id', $id)->first())
+ );
+ } catch (\Throwable $th) {
+ return $this->error(null, 'Unable to get data. Error: ' . $th->getMessage(), 500);
+ }
+ }
+
+
/**
* Store a newly created resource in storage.
*/
@@ -33,10 +48,15 @@ class MetadataController extends Controller
if ($existing) {
$existing->update($validated);
+
+ $this->generateTags($existing->id, $request->video_tags, $request->deleted_tags);
return $this->success(new VideoResource($existing->video), $validated); // new MetadataResource($metadata)
}
+
$metadata = Metadata::create($validated);
+
+ $this->generateTags($metadata->id, $request->video_tags, $request->deleted_tags);
return $this->success(new VideoResource($metadata->video), $validated); // new MetadataResource($metadata)
} catch (\Throwable $th) {
return $this->error(null, 'Unable to create metadata. Error: ' . $th->getMessage(), 500);
@@ -53,9 +73,19 @@ class MetadataController extends Controller
$validated['editor_id'] = Auth::user()->id;
$metadata->update($validated);
+ $this->generateTags($metadata->id, $request->video_tags, $request->deleted_tags);
return $this->success(new VideoResource($metadata->video), $validated);
} catch (\Throwable $th) {
return $this->error($request, 'Unable to edit video metadata. Error: ' . $th->getMessage(), 500);
}
}
+
+ function generateTags($metadata_id, $video_tags, $deleted_tags = [])
+ {
+ foreach ($video_tags as $tag) {
+ VideoTag::firstOrCreate(['tag_id' => $tag['id'], 'metadata_id' => $metadata_id]);
+ }
+
+ VideoTag::destroy($deleted_tags);
+ }
}
diff --git a/app/Http/Controllers/Api/V1/TagController.php b/app/Http/Controllers/Api/V1/TagController.php
index d875cae7..5276bf17 100644
--- a/app/Http/Controllers/Api/V1/TagController.php
+++ b/app/Http/Controllers/Api/V1/TagController.php
@@ -32,7 +32,7 @@ class TagController extends Controller
try {
return $this->success(
TagResource::collection(
- Tag::all()
+ Tag::all()->sortBy('name')
)
);
} catch (\Throwable $th) {
@@ -51,9 +51,11 @@ class TagController extends Controller
$existing = Tag::where('name', $request->name)->first();
if ($existing) return $this->error($existing, 'Tag already exists!', 500);
+ $validated['name'] = strtolower($validated['name']);
+
$validated['creator_id'] = Auth::user()->id;
$tag = Tag::create($validated);
- return $this->success(new TagResource($tag));
+ return new TagResource($tag);
} catch (\Throwable $th) {
return $this->error(null, 'Unable to create tag. Error: ' . $th->getMessage() . $request, 500);
}
diff --git a/app/Http/Requests/MetadataStoreRequest.php b/app/Http/Requests/MetadataStoreRequest.php
index a3b37877..8aa5b183 100644
--- a/app/Http/Requests/MetadataStoreRequest.php
+++ b/app/Http/Requests/MetadataStoreRequest.php
@@ -31,7 +31,10 @@ class MetadataStoreRequest extends FormRequest
'date_released' => 'nullable|date|date_format:"F d, Y"',
'tags' => 'nullable|max:128',
'video_tags' => 'nullable|array',
- 'video_tags.*' => 'integer'
+ 'video_tags.*.name' => 'required|min:1|max:64',
+ 'video_tags.*.id' => 'required|integer',
+ 'deleted_tags' => 'nullable|array',
+ 'deleted_tags.*' => 'integer',
];
}
}
diff --git a/app/Http/Requests/MetadataUpdateRequest.php b/app/Http/Requests/MetadataUpdateRequest.php
index 842970cd..fa636744 100644
--- a/app/Http/Requests/MetadataUpdateRequest.php
+++ b/app/Http/Requests/MetadataUpdateRequest.php
@@ -30,7 +30,10 @@ class MetadataUpdateRequest extends FormRequest
'date_released' => 'nullable|date|date_format:"F d, Y"',
'tags' => 'nullable|max:128',
'video_tags' => 'nullable|array',
- 'video_tags.*' => 'integer'
+ 'video_tags.*.name' => 'required|min:1|max:64',
+ 'video_tags.*.id' => 'required|integer',
+ 'deleted_tags' => 'nullable|array',
+ 'deleted_tags.*' => 'integer',
];
}
}
diff --git a/app/Http/Resources/MetadataResource.php b/app/Http/Resources/MetadataResource.php
index e4864e54..a7c7d5f9 100644
--- a/app/Http/Resources/MetadataResource.php
+++ b/app/Http/Resources/MetadataResource.php
@@ -30,8 +30,8 @@ class MetadataResource extends JsonResource
'video_id' => $this->video ? (string)$this->video->id : null,
'editor_id' => $this->editor ? $this->editor->id : null,
'editor_name' => $this->editor ? $this->editor->name : '',
- 'playback_data' => $this->playback(),
- 'video_tags' => $this->tags() ?? [],
+ // 'playback_data' => PlaybackResource::collection($this->playbacks),
+ 'video_tags' => VideoTagResource::collection($this->videoTags),
]
];
}
diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.php
index e4c27ccf..b9c1089c 100755
--- a/app/Http/Resources/VideoResource.php
+++ b/app/Http/Resources/VideoResource.php
@@ -29,7 +29,7 @@ class VideoResource extends JsonResource
'season' => $metadata ? $this->metadata->season : $this->season,
'view_count' => $metadata ? $this->metadata->view_count : $this->view_count,
'tags' => $this->metadata->tags ?? '',
- 'video_tags' => $this->metadata->tags() ?? [],
+ 'video_tags' => VideoTagResource::collection($this->metadata->videotags),
'date_released' => $this->metadata->date_released,
'date_updated' => $this->metadata->updated_at,
// ],
diff --git a/app/Http/Resources/VideoTagResource.php b/app/Http/Resources/VideoTagResource.php
index 48ea208d..66c8ec76 100644
--- a/app/Http/Resources/VideoTagResource.php
+++ b/app/Http/Resources/VideoTagResource.php
@@ -15,12 +15,9 @@ class VideoTagResource extends JsonResource
public function toArray(Request $request): array
{
return [
- 'id' => $this->id,
+ 'video_tag_id' => $this->id,
'name' => $this->tag->name,
- 'relationships' => [
- 'metadata_id' => $this->metadata ? $this->metadata->id : null,
- 'tag_id' => $this->tag ? $this->tag->id : null,
- ]
+ 'id' => $this->tag ? $this->tag->id : null,
];
}
}
diff --git a/app/Models/Metadata.php b/app/Models/Metadata.php
index e79cc20f..7d4bae50 100644
--- a/app/Models/Metadata.php
+++ b/app/Models/Metadata.php
@@ -36,12 +36,12 @@ class Metadata extends Model
return $this->belongsTo(User::class);
}
- public function playback(): HasMany
+ public function playbacks(): HasMany
{
return $this->hasMany(Playback::class);
}
- public function tags(): HasMany
+ public function videoTags(): HasMany
{
return $this->hasMany(VideoTag::class);
}
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index 1d6378d3..dd9355ef 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -18,4 +18,9 @@ class Tag extends Model
{
return $this->belongsTo(User::class);
}
+
+ public function metadata()
+ {
+ return $this->belongsTo(Metadata::class);
+ }
}
diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vue
index 55f246a2..f08ede6d 100755
--- a/resources/js/components/forms/EditVideo.vue
+++ b/resources/js/components/forms/EditVideo.vue
@@ -8,17 +8,20 @@ import DatePicker from '../pinesUI/DatePicker.vue';
import FormInputNumber from '../inputs/FormInputNumber.vue';
import InputMultiChip from '../pinesUI/InputMultiChip.vue';
-import { onMounted, reactive, ref } from 'vue';
-import { useToast } from '../../composables/useToast';
-
-import { useGetVideoTags } from '@/service/queries';
import { toCalendarFormattedDate } from '../../service/util';
+import { reactive, ref, watch } from 'vue';
+import { useGetVideoTags } from '@/service/queries';
+import { UseCreateTag } from '../../service/mutations';
+import { useToast } from '../../composables/useToast';
const emit = defineEmits(['handleFinish']);
const props = defineProps(['video']);
const toast = useToast();
-const allTags = ref([]);
+const createTag = UseCreateTag();
+const { data: tagsQuery } = useGetVideoTags();
+
+const allTags = ref([]);
const fields = reactive([
{
name: 'title',
@@ -61,13 +64,13 @@ const fields = reactive([
default: null,
},
{
- name: 'tags',
+ name: 'video_tags',
text: 'Tags',
- type: 'text',
- value: props.video?.tags,
- default: props.video?.tags,
+ type: 'multi',
+ value: props.video?.video_tags ?? [],
+ default: props.video?.video_tags ?? [],
subtext: 'Tags that describe the video',
- max: 128,
+ max: 24,
},
]);
@@ -77,7 +80,8 @@ const form = useForm({
episode: props.video?.episode ?? null,
season: props.video?.season ?? null,
date_released: props.video?.date_released ? toCalendarFormattedDate(props.video?.date_released) : null,
- tags: props.video?.tags ?? null,
+ video_tags: props.video?.video_tags ?? [],
+ deleted_tags: [],
});
const handleSubmit = async () => {
@@ -100,13 +104,34 @@ const handleSubmit = async () => {
};
const handleCreateTag = async (name) => {
- console.log(name);
+ try {
+ const { data: response } = await createTag.mutateAsync({ name });
+
+ toast.add({ type: 'success', title: 'Success', description: 'Tag created!', life: 3000 });
+ form.fields['video_tags'] = [...form.fields['video_tags'], { id: response.id, name: response.name }];
+ allTags.value = [...allTags.value, response];
+ } catch (error) {
+ console.log(error);
+
+ toast.add({ type: 'error', title: 'Error', description: 'Unable to create tag. It may already exist.', life: 3000 });
+ }
};
-onMounted(async () => {
- const { data: tagsQuery } = await useGetVideoTags();
+const handleSetTags = (tags) => {
+ form.fields['video_tags'] = [...tags];
+ form.fields['deleted_tags'] = form.fields['deleted_tags'].filter((itm) => !tags.find((newTag) => newTag.name === itm.name));
+};
+
+const handleRemoveTag = (tag) => {
+ form.fields['video_tags'] = form.fields['video_tags'].filter((itm) => itm.name !== tag.name);
+
+ if (tag.video_tag_id) form.fields['deleted_tags'] = [...form.fields['deleted_tags'], tag.video_tag_id];
+};
- allTags.value = tagsQuery.value?.data;
+watch(tagsQuery, () => {
+ if (tagsQuery.value?.data?.data) {
+ allTags.value = tagsQuery.value?.data.data;
+ }
});
</script>
@@ -115,26 +140,20 @@ onMounted(async () => {
<div v-for="(field, index) in fields" :key="index" class="w-full" :class="field.class">
<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]" :field="field" :tabindex="index + 1" />
- <FormInputNumber v-else-if="field.type === 'number'" v-model="form.fields[field.name]" :field="field" :tabindex="index + 1" />
+ <FormTextArea v-if="field.type === 'textArea'" v-model="form.fields[field.name]" :field="field" />
+ <DatePicker v-else-if="field.type === 'date'" v-model="form.fields[field.name]" :field="field" />
+ <FormInputNumber v-else-if="field.type === 'number'" v-model="form.fields[field.name]" :field="field" />
<InputMultiChip
- v-else-if="field.name === 'tags'"
+ v-else-if="field.name === 'video_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"
+ :defaultItems="form.fields[field.name] ? form.fields[field.name] : []"
+ :options="allTags"
+ :max="field.max"
+ @createAction="handleCreateTag"
+ @selectItems="handleSetTags"
+ @removeAction="handleRemoveTag"
/>
- <FormInput v-else v-model="form.fields[field.name]" :field="field" :tabindex="index + 1" />
+ <FormInput v-else v-model="form.fields[field.name]" :field="field" />
<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>
</ul>
diff --git a/resources/js/components/inputs/ButtonIcon.vue b/resources/js/components/inputs/ButtonIcon.vue
index 1fc8bba7..4c9f0c65 100755
--- a/resources/js/components/inputs/ButtonIcon.vue
+++ b/resources/js/components/inputs/ButtonIcon.vue
@@ -1,20 +1,18 @@
-<script setup lang="ts">
-const props = defineProps({
- class: {
- type: String,
- default: '',
- },
- type: {
- type: String,
- default: '',
- },
-});
+<script setup>
+const props = defineProps(['class', 'type', 'disabled', 'title']);
</script>
<template>
<button
- :class="`p-2 flex items-center justify-center h-10 max-h-full aspect-square shadow-sm rounded-md cursor-pointer focus:outline-none ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem] focus:ring-indigo-400 dark:focus:ring-indigo-500 hover:ring-violet-400 hover:dark:ring-violet-700 text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800 ${props.class}`"
+ :class="`p-2 flex items-center justify-center h-10 max-h-full
+ aspect-square shadow-sm rounded-md cursor-pointer focus:outline-none
+ ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem]
+ focus:ring-indigo-400 dark:focus:ring-indigo-500 hover:ring-violet-400 hover:dark:ring-violet-700
+ text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800
+ ${props.class} disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:ring-[1px]`"
:type="props.type"
+ :disabled="props.disabled"
+ :title="props.title ?? 'Icon'"
>
<slot name="icon"> </slot>
</button>
diff --git a/resources/js/components/inputs/TextInput.vue b/resources/js/components/inputs/TextInput.vue
index 868fd6f7..8fe1c77a 100644
--- a/resources/js/components/inputs/TextInput.vue
+++ b/resources/js/components/inputs/TextInput.vue
@@ -1,6 +1,6 @@
<script setup>
const model = defineModel();
-const { placeholder, id } = defineProps(['placeholder', 'id']);
+const { placeholder, id, minlength, maxlength } = defineProps(['placeholder', 'id', 'minlength', 'maxlength']);
</script>
<template>
<input
@@ -8,6 +8,8 @@ const { placeholder, id } = defineProps(['placeholder', 'id']);
v-model="model"
:name="id"
:id="id"
+ :minlength="minlength"
+ :maxlength="maxlength"
:placeholder="placeholder"
:class="`h-10 p-2 shadow-sm rounded-md w-full text-sm text-ellipsis whitespace-nowrap line-clamp-1
border-none outline-none
diff --git a/resources/js/components/labels/ChipTag.vue b/resources/js/components/labels/ChipTag.vue
index 27d24bd2..8d80ccef 100644
--- a/resources/js/components/labels/ChipTag.vue
+++ b/resources/js/components/labels/ChipTag.vue
@@ -5,7 +5,7 @@ import ButtonCorner from '../inputs/ButtonCorner.vue';
const props = defineProps(['label', 'colour', 'URL', 'removeable']);
-const styling = `p-1 px-2 text-sm leading-none rounded-xl truncate lowercase text-neutral-100 dark:text-neutral-300 ${props.colour ? `bg-${props.colour}` : 'bg-violet-600 dark:bg-violet-900/60'} shrink-0`;
+const styling = `p-1 px-2 text-sm leading-none rounded-xl truncate lowercase text-neutral-100 dark:text-neutral-300 ${props.colour ? `bg-${props.colour}` : 'bg-violet-600 dark:bg-violet-900/90'} shrink-0`;
</script>
<template>
<RouterLink v-if="props.URL" :class="styling" :to="props.URL">
@@ -14,8 +14,8 @@ const styling = `p-1 px-2 text-sm leading-none rounded-xl truncate lowercase tex
v-if="removeable"
:positionClasses="'w-4 h-4'"
:textClasses="'text-white dark:text-rose-700'"
- :colourClasses="'dark:hover:bg-rose-700 hover:bg-rose-300 hover:text-rose-700 dark:hover:text-white drop-shadow'"
- :label="'Delete'"
+ :colourClasses="'dark:bg-neutral-900/20 dark:hover:bg-rose-700 hover:bg-rose-300 hover:text-rose-700 dark:hover:text-white drop-shadow'"
+ :label="'Remove'"
@click.stop.prevent="$emit('clickAction')"
/>
</RouterLink>
@@ -25,8 +25,8 @@ const styling = `p-1 px-2 text-sm leading-none rounded-xl truncate lowercase tex
v-if="removeable"
:positionClasses="'w-4 h-4'"
:textClasses="'text-white dark:text-rose-700'"
- :colourClasses="'dark:hover:bg-rose-700 hover:bg-rose-300 hover:text-rose-700 dark:hover:text-white drop-shadow'"
- :label="'Delete'"
+ :colourClasses="'dark:bg-neutral-900/20 dark:hover:bg-rose-700 hover:bg-rose-300 hover:text-rose-700 dark:hover:text-white drop-shadow'"
+ :label="'Remove'"
@click.stop.prevent="$emit('clickAction')"
/>
</p>
diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vue
index bd2d9cc5..8da1e1bb 100644
--- a/resources/js/components/pinesUI/InputMultiChip.vue
+++ b/resources/js/components/pinesUI/InputMultiChip.vue
@@ -53,30 +53,45 @@ const props = defineProps({
];
},
},
+ max: {
+ type: Number,
+ default: 32,
+ },
});
-const emit = defineEmits(['selectItem']);
+const emit = defineEmits(['createAction', 'selectItems', 'removeAction']);
const selectButton = ref(null);
const selectableItemsList = ref(null);
const select = useMultiSelect(props, { selectableItemsList, selectButton });
+const newValue = ref('');
-const handleItemClick = (item, setFocus = true) => {
+const handleItemClick = (item, setFocus = true, triggerSelect = true) => {
if (!item?.name) return;
select.selectedItems = [...select.selectedItems, item];
- // select.selectableItems = select.selectableItems.filter((otherItem) => otherItem.name != item.name);
select.toggleSelect(false);
+
if (setFocus) selectButton.value?.focus();
- emit('selectItem', select.selectedItems);
+ if (triggerSelect) emit('selectItems', select.selectedItems);
};
const handleRemoveChip = (name) => {
+ const item = select.selectedItems.find((item) => item.name === name);
select.selectedItems = select.selectedItems.filter((item) => item.name !== name);
+
+ emit('removeAction', item);
+};
+
+const handleCreate = (e) => {
+ e.preventDefault();
+ if (!newValue.value) return;
+ emit('createAction', newValue.value);
+ newValue.value = '';
};
onMounted(() => {
- if (props.defaultItem != undefined && props.defaultItem < props.options.length && props.defaultItem >= 0) {
- handleItemClick(props.options[props.defaultItem], false);
+ if (props.defaultItems != undefined && props.defaultItems < props.options.length && props.defaultItems >= 0) {
+ handleItemClick(props.options[props.defaultItems], false);
}
});
@@ -94,16 +109,33 @@ watch(
},
{ immediate: true },
);
+
watch(
- props,
+ () => props.defaultItems,
+ (newVal) => {
+ select.selectedItems = newVal;
+ },
+ { immediate: true },
+);
+watch(
+ () => props.options,
+ (newVal) => {
+ select.selectableItems = newVal;
+ },
+ { immediate: true },
+);
+
+watch(
+ props.defaultItems,
() => {
select.selectedItems = props.defaultItems ?? [];
-
- if (props.defaultItems && props.options) {
- select.selectableItems = props.options?.filter((option) =>
- !props.defaultItems ? true : !props.defaultItems.find((item) => item.name === option.name),
- );
- }
+ },
+ { immediate: false },
+);
+watch(
+ props.options,
+ () => {
+ select.selectableItems = props.options;
},
{ immediate: false },
);
@@ -146,7 +178,7 @@ watch(
'disabled:cursor-not-allowed disabled:opacity-50 ' +
'text-left text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ' +
'ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700 ' +
- `${select.selectOpen ? 'hocus:ring-0' : 'hocus:ring-[0.125rem]'} hover:ring-violet-400 hover:dark:ring-violet-700 focus:ring-indigo-400 dark:focus:ring-indigo-500`
+ `${select.selectOpen ? 'hocus:ring-0' : 'hocus:ring-[0.125rem]'} hover:ring-violet-400 hover:dark:ring-violet-700 focus:ring-indigo-400 dark:focus:ring-indigo-500 focus:outline-none`
"
type="button"
>
@@ -177,16 +209,23 @@ watch(
v-show="select.selectOpen"
ref="selectableItemsList"
:class="{
- 'bottom-0 mb-10': select.selectDropdownPosition == 'top',
- 'top-0 mt-10': select.selectDropdownPosition == 'bottom',
+ 'bottom-0 mb-11': select.selectDropdownPosition == 'top',
+ 'top-0 mt-11': select.selectDropdownPosition == 'bottom',
}"
class="z-30 absolute w-full mt-1 overflow-auto text-sm rounded-md shadow-md max-h-56 focus:outline-none ring-1 ring-opacity-5 ring-black dark:ring-neutral-700 bg-white dark:bg-neutral-800/70 backdrop-blur-lg"
v-cloak
>
<UseFocusTrap v-if="select.selectOpen" :options="{ immediate: true }">
<li class="p-2 flex gap-2 w-full">
- <TextInput :placeholder="props.options.length" tabindex="548" />
- <ButtonIcon :type="'button'" tabindex="549">
+ <TextInput
+ :placeholder="'Add a new tag here'"
+ tabindex="548"
+ v-model="newValue"
+ :maxlength="props.max"
+ @keydown.enter="handleCreate"
+ @keydown.space="handleCreate"
+ />
+ <ButtonIcon :type="'button'" tabindex="549" :disabled="!newValue" @click="handleCreate">
<template #icon>
<MdiLightPlus class="w-6 h-6" />
</template>
@@ -200,14 +239,18 @@ watch(
>
<li
@click="handleItemClick(item)"
- :id="item.value + '-' + select.selectId"
+ :id="index + '-' + select.selectId"
:data-disabled="item.disabled ? item.disabled : ''"
:class="{
'bg-neutral-100 dark:bg-neutral-900/70 text-gray-900 dark:text-neutral-100':
- select.selectableItemIsActive(item),
- 'text-gray-700 dark:text-neutral-300': !select.selectableItemIsActive(item),
+ select.selectableItemActive === item,
+ 'text-gray-700 dark:text-neutral-300': !select.selectableItemActive === item,
}"
- @mousemove="select.selectableItemActive = item"
+ @mousemove="
+ () => {
+ select.selectableItemActive = item;
+ }
+ "
class="relative flex items-center h-full py-2 pl-8 cursor-pointer select-none data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none"
:tabindex="`55${index}`"
>
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 929358f1..83139378 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -165,14 +165,7 @@ watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true }
</section>
<section class="flex flex-col justify-end text-end text-sm dark:text-slate-400 text-slate-500 max-w-full overflow-clip gap-1">
<span class="flex gap-1 flex-row flex-wrap max-h-[22px] overflow-hidden justify-end">
- <ChipTag
- v-for="(tag, index) in (stateVideo?.tags ? stateVideo.tags : '#atmospheric #sad #action')
- .replace('#', '')
- .split(' ')
- .filter((tag) => tag.replaceAll(' ', ''))"
- v-bind:key="index"
- :label="tag"
- />
+ <ChipTag v-for="(tag, index) in stateVideo?.video_tags" v-bind:key="index" :label="tag.name" />
</span>
</section>
</div>
diff --git a/resources/js/composables/useMultiSelect.js b/resources/js/composables/useMultiSelect.js
index 273a01db..78322fe7 100644
--- a/resources/js/composables/useMultiSelect.js
+++ b/resources/js/composables/useMultiSelect.js
@@ -22,7 +22,10 @@ export default function useMultiSelect({ options, defaultItems }, refs) {
this.selectableItemsList = values.selectableItemsList;
},
selectableItemIsActive(item) {
- return this.selectableItemActive && this.selectableItemActive.value == item.value;
+ console.log(item);
+
+ return false;
+ // return this.selectableItemActive && this.selectableItemActive.value == item;
},
selectableItemActiveNext() {
let index = this.selectableItems.indexOf(this.selectableItemActive);
@@ -86,6 +89,7 @@ export default function useMultiSelect({ options, defaultItems }, refs) {
return bestMatch;
},
selectPositionUpdate() {
+ if (!this.selectButton || !this.selectableItemsList) return;
let selectDropdownBottomPos =
this.selectButton.getBoundingClientRect().top +
this.selectButton.offsetHeight +
diff --git a/resources/js/service/queries.ts b/resources/js/service/queries.ts
index 7bcc1b8a..4be9c68f 100644
--- a/resources/js/service/queries.ts
+++ b/resources/js/service/queries.ts
@@ -12,8 +12,7 @@ export const useGetVideoTags = () => {
return useQuery({
queryKey: ['videoTags'],
queryFn: async () => {
- const { data: response } = await mediaAPI.getTags();
- return { data: response.data };
+ return mediaAPI.getTags();
},
});
};
diff --git a/routes/api.php b/routes/api.php
index 8a13208b..871e288e 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -27,7 +27,7 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
Route::resource('/records', RecordController::class)->only(['index', 'store', 'destroy']);
Route::resource('/profile', ProfileController::class)->only(['show', 'store', 'update']);
Route::resource('/series', SeriesController::class)->only(['index', 'store', 'update']);
- Route::resource('/metadata', MetadataController::class)->only(['store', 'update']);
+ Route::resource('/metadata', MetadataController::class)->only(['show', 'store', 'update']);
Route::resource('/tags', TagController::class)->only(['index', 'store']);
});