Skip to content

A self-hosted media server and file management system

fix video links kind of

aminnausinb1f0c58b97d2
diff --git a/resources/js/components/cards/FolderCard.vue b/resources/js/components/cards/FolderCard.vue
index ee3961b3..98c58905 100755
--- a/resources/js/components/cards/FolderCard.vue
+++ b/resources/js/components/cards/FolderCard.vue
@@ -1,27 +1,34 @@
-<script setup>
-import ButtonCorner from '../inputs/ButtonCorner.vue';
-import CircumShare1 from '~icons/circum/share-1';
-import CircumFolderOn from '~icons/circum/folder-on';
-
+<script setup lang="ts">
+import type { FolderResource } from '@/types/resources';
+import { formatFileSize } from '@/composables/useMetaData';
import { RouterLink } from 'vue-router';
import { ref } from 'vue';
-import { formatFileSize } from '@/composables/useMetaData';
-const props = defineProps(['folder', 'categoryName', 'stateFolderName']);
+import ButtonCorner from '@/components/inputs/ButtonCorner.vue';
+
+import CircumFolderOn from '~icons/circum/folder-on';
+import CircumShare1 from '~icons/circum/share-1';
+
+const props = defineProps<{
+ folder: FolderResource;
+ categoryName: string;
+ stateFolderName: string;
+}>();
+
const folderLink = ref(`/${props.categoryName}/${props.folder.name}`);
</script>
<template>
<RouterLink
:to="folderLink"
- 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"
+ 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-100 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">
<h2 class="text-xl w-full truncate" :title="props.folder.name">{{ props.folder.name }}</h2>
<div class="flex justify-end gap-1">
<ButtonCorner
:positionClasses="'w-7 h-7'"
- :textClasses="'hover:text-neutral-900 dark:hover:text-violet-400'"
+ :textClasses="'hover:text-violet-600 dark:hover:text-violet-500'"
:colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"
:label="'Share Folder'"
@click.stop.prevent="$emit('clickAction', folderLink)"
diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vue
index 7e283908..faa3e8ac 100755
--- a/resources/js/components/cards/VideoCard.vue
+++ b/resources/js/components/cards/VideoCard.vue
@@ -1,14 +1,20 @@
-<script setup>
-import useMetaData from '../../composables/useMetaData';
-
-import { watch } from 'vue';
+<script setup lang="ts">
+import { useContentStore } from '@/stores/ContentStore';
+import { toFormattedDate } from '@/service/util';
+import { storeToRefs } from 'pinia';
import { RouterLink } from 'vue-router';
-import { toFormattedDate } from '../../service/util';
-import ChipTag from '../labels/ChipTag.vue';
+import { watch } from 'vue';
+
+import useMetaData from '@/composables/useMetaData';
+import ChipTag from '@/components/labels/ChipTag.vue';
+const emit = defineEmits(['clickAction']);
const props = defineProps(['data', 'index', 'currentID']);
const metaData = useMetaData({ ...props.data, id: props.data.id, skipBaseURL: true });
-const emit = defineEmits(['clickAction']);
+const ContentStore = useContentStore();
+
+const { stateFolder, stateDirectory } = storeToRefs(ContentStore);
+
const handlePlay = () => {
emit('clickAction', props.data?.id);
};
@@ -18,16 +24,16 @@ const handlePropsUpdate = () => {
};
watch(props, handlePropsUpdate, { immediate: true });
+// @click.left.stop.prevent.capture="handlePlay"
</script>
<template>
<RouterLink
:class="{ 'ring-violet-600/70 ring-[0.125rem]': props?.currentID === props.data?.id }"
- :to="metaData.fields.url"
+ :to="encodeURI(`/${stateDirectory.name}/${stateFolder.name}?video=${props.data.id}`)"
class="relative group flex flex-wrap flex-col gap-x-8 gap-y-4 p-3 w-full shadow rounded-md ring-inset cursor-pointer dark:bg-primary-dark-800/70 dark:hover:bg-violet-700/70 bg-gray-100 hover:bg-violet-400/30 odd:bg-violet-100 dark:odd:bg-primary-dark-600"
:data-id="props.data?.id"
:data-path="`../${props.data?.path}`"
- @click.left.stop.prevent.capture="handlePlay"
>
<section class="flex justify-between gap-4 w-full items-start overflow-hidden" :title="metaData?.fields?.description">
<h3 class="w-full line-clamp-1 flex gap-8 items-end min-w-fit max-w-[30%]">
@@ -41,14 +47,14 @@ watch(props, handlePropsUpdate, { immediate: true });
</h4>
</section>
<section
- class="flex justify-between gap-4 w-full items-start text-sm sm:text-base sm:w-auto text-neutral-500 dark:text-neutral-400 overflow-hidden"
+ class="flex justify-between gap-4 w-full items-start text-sm sm:text-base sm:w-auto text-neutral-500 dark:text-neutral-400"
>
<span class="flex gap-2 items-center w-full flex-1">
- <h4 class="text-sm sm:text-base text-nowrap text-start">
+ <h4 class="text-sm sm:text-base text-nowrap text-start truncate">
{{ metaData?.fields?.views }}
</h4>
- <span class="hidden sm:flex flex-wrap gap-1 max-h-5 h-full sm:max-h-[24px] overflow-x-hidden px-2 flex-1">
+ <span class="hidden sm:flex flex-wrap gap-1 max-h-5 h-full sm:max-h-[24px] px-2 flex-1">
<ChipTag
v-for="(tag, index) in props.data?.video_tags"
v-bind:key="index"
diff --git a/resources/js/components/inputs/ButtonIcon.vue b/resources/js/components/inputs/ButtonIcon.vue
index 4c9f0c65..92616b59 100755
--- a/resources/js/components/inputs/ButtonIcon.vue
+++ b/resources/js/components/inputs/ButtonIcon.vue
@@ -1,15 +1,20 @@
-<script setup>
-const props = defineProps(['class', 'type', 'disabled', 'title']);
+<script setup lang="ts">
+const props = defineProps<{
+ class?: string;
+ type?: 'reset' | 'submit' | 'button' | undefined;
+ disabled?: boolean;
+ title?: string;
+}>();
</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]
+ ring-1 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]`"
+ ${props.class} disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:ring-1`"
:type="props.type"
:disabled="props.disabled"
:title="props.title ?? 'Icon'"
diff --git a/resources/js/components/inputs/ButtonText.vue b/resources/js/components/inputs/ButtonText.vue
index 8d1e02d2..3cc88a2c 100755
--- a/resources/js/components/inputs/ButtonText.vue
+++ b/resources/js/components/inputs/ButtonText.vue
@@ -1,10 +1,18 @@
<script setup>
-const props = defineProps(['class']);
+const props = defineProps(['class', 'type', 'disabled', 'title']);
</script>
<template>
<button
- :class="`${props.class} p-2 flex items-center justify-center h-full shadow-sm rounded-md focus:outline-none cursor-pointer 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`"
+ :class="`p-2 flex items-center justify-center h-10 max-h-full
+ shadow-sm rounded-md cursor-pointer focus:outline-none
+ ring-1 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-1`"
+ :type="props.type"
+ :disabled="props.disabled"
+ :title="props.title ?? 'Button'"
>
<slot name="text"> </slot>
</button>
diff --git a/resources/js/components/inputs/FormInput.vue b/resources/js/components/inputs/FormInput.vue
index 71746f27..67db6905 100755
--- a/resources/js/components/inputs/FormInput.vue
+++ b/resources/js/components/inputs/FormInput.vue
@@ -10,7 +10,7 @@ const model = defineModel();
'focus:outline-none border-none ' +
'disabled:cursor-not-allowed disabled:opacity-50 ' +
'text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ' +
- 'ring-inset focus:ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700 ' +
+ 'ring-inset focus:ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 ' +
'focus:ring-[0.125rem] focus:ring-indigo-400 dark:focus:ring-indigo-500'
"
:name="field.name"
diff --git a/resources/js/components/inputs/FormInputNumber.vue b/resources/js/components/inputs/FormInputNumber.vue
index 47658b1a..de8b64c2 100644
--- a/resources/js/components/inputs/FormInputNumber.vue
+++ b/resources/js/components/inputs/FormInputNumber.vue
@@ -28,7 +28,7 @@ const decrementNumber = () => {
'focus:outline-none border-none ' +
'disabled:cursor-not-allowed disabled:opacity-50 ' +
'text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ' +
- 'ring-inset focus:ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700 ' +
+ 'ring-inset focus:ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 ' +
'focus:ring-[0.125rem] focus:ring-indigo-400 dark:focus:ring-indigo-500'
"
:name="field.name"
diff --git a/resources/js/components/inputs/FormTextArea.vue b/resources/js/components/inputs/FormTextArea.vue
index 02fc6351..887be185 100755
--- a/resources/js/components/inputs/FormTextArea.vue
+++ b/resources/js/components/inputs/FormTextArea.vue
@@ -18,9 +18,9 @@ const resize = () => {
type="text"
ref="$el"
:class="`flex w-full h-auto min-h-[80px] px-3 py-2 text-sm rounded-md focus:outline-none border-none
- disabled:cursor-not-allowed disabled:opacity-50
+ disabled:cursor-not-allowed disabled:opacity-50
text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400
- ring-inset focus:ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700
+ ring-inset focus:ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700
focus:ring-[0.125rem] focus:ring-indigo-400 dark:focus:ring-indigo-500`"
:name="field.name"
:title="field.name"
diff --git a/resources/js/components/inputs/TextInput.vue b/resources/js/components/inputs/TextInput.vue
index 8fe1c77a..a839557e 100644
--- a/resources/js/components/inputs/TextInput.vue
+++ b/resources/js/components/inputs/TextInput.vue
@@ -15,7 +15,7 @@ const { placeholder, id, minlength, maxlength } = defineProps(['placeholder', 'i
border-none outline-none
disabled:cursor-not-allowed disabled:opacity-50
text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800 placeholder:text-neutral-400
- ring-inset focus:ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700
+ ring-inset focus:ring-inset ring-1 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`"
/>
</template>
diff --git a/resources/js/components/inputs/TextInputLabelled.vue b/resources/js/components/inputs/TextInputLabelled.vue
index fc924085..9a0465af 100755
--- a/resources/js/components/inputs/TextInputLabelled.vue
+++ b/resources/js/components/inputs/TextInputLabelled.vue
@@ -13,11 +13,11 @@ const { text, placeholder, id } = defineProps(['text', 'placeholder', 'id']);
:name="id"
:id="id"
:placeholder="placeholder"
- :class="`h-10 p-2 shadow-sm rounded-md w-full text-sm
- border-none outline-none
- disabled:cursor-not-allowed disabled:opacity-50
+ :class="`h-10 p-2 shadow-sm rounded-md w-full text-sm
+ border-none outline-none
+ disabled:cursor-not-allowed disabled:opacity-50
text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800 placeholder:text-neutral-400
- ring-inset focus:ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700
+ ring-inset focus:ring-inset ring-1 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`"
/>
</div>
diff --git a/resources/js/components/panels/VideoSidebar.vue b/resources/js/components/panels/VideoSidebar.vue
index 548a7c2b..f5a10f3a 100755
--- a/resources/js/components/panels/VideoSidebar.vue
+++ b/resources/js/components/panels/VideoSidebar.vue
@@ -49,7 +49,13 @@ watch(selectedSideBar, () => {
</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" @clickAction="handleShare" />
- <RouterLink to="/history" class="text-center text-sm dark:text-neutral-400 mx-auto p-3 hover:underline">View More</RouterLink>
+ <RouterLink
+ v-if="stateRecords.length != 0"
+ to="/history"
+ class="text-center text-sm dark:text-neutral-400 mx-auto p-3 hover:underline"
+ >View More</RouterLink
+ >
+ <h2 v-else class="text-gray-500 dark:text-gray-400 tracking-wider w-full py-2">Nothing Yet...</h2>
</section>
<ModalBase :modalData="shareModal">
<template #content>
diff --git a/resources/js/components/pinesUI/ButtonClipboard.vue b/resources/js/components/pinesUI/ButtonClipboard.vue
index f81fb1c6..88c14471 100755
--- a/resources/js/components/pinesUI/ButtonClipboard.vue
+++ b/resources/js/components/pinesUI/ButtonClipboard.vue
@@ -10,7 +10,7 @@ const clipboard = useClipboard(props.text);
<input
:value="props.text"
disabled
- class="h-8 w-full rounded-md shadow-sm block p-2 border-none outline-none text-gray-900 dark:text-gray-300 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700"
+ class="h-8 w-full rounded-md shadow-sm block p-2 border-none outline-none text-gray-900 dark:text-gray-300 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700"
/>
<div class="relative z-20 flex items-center">
<Transition
diff --git a/resources/js/components/pinesUI/DatePicker.vue b/resources/js/components/pinesUI/DatePicker.vue
index e09d92f9..def7f97c 100644
--- a/resources/js/components/pinesUI/DatePicker.vue
+++ b/resources/js/components/pinesUI/DatePicker.vue
@@ -36,7 +36,7 @@ watch(
'focus:outline-none border-none ' +
'disabled:cursor-not-allowed disabled:opacity-50 ' +
'text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ' +
- 'ring-inset focus:ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700 ' +
+ 'ring-inset focus:ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 ' +
'focus:ring-[0.125rem] focus:ring-indigo-400 dark:focus:ring-indigo-500'
"
@click="datePicker.toggleDatePicker()"
@@ -85,7 +85,7 @@ watch(
'focus:outline-none border shadow border-neutral-200/70 dark:border-neutral-600 ' +
'disabled:cursor-not-allowed disabled:opacity-50 ' +
'text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ' +
- 'ring-inset focus:ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700 ' +
+ 'ring-inset focus:ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 ' +
'focus:ring-[0.125rem] focus:ring-indigo-400 dark:focus:ring-indigo-500 ' +
`${datePicker.datePickerPosition === 'top' ? 'bottom-0 mb-12' : 'top-0 mt-12'}`
"
diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vue
index 79cb9cd9..b2d92713 100644
--- a/resources/js/components/pinesUI/InputMultiChip.vue
+++ b/resources/js/components/pinesUI/InputMultiChip.vue
@@ -178,7 +178,7 @@ watch(
'focus:outline-none border-none cursor-pointer ' +
'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 ' +
+ 'ring-inset ring-1 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 focus:outline-none`
"
type="button"
diff --git a/resources/js/components/pinesUI/InputSelect.vue b/resources/js/components/pinesUI/InputSelect.vue
index 7b66f69d..a893b425 100755
--- a/resources/js/components/pinesUI/InputSelect.vue
+++ b/resources/js/components/pinesUI/InputSelect.vue
@@ -115,7 +115,7 @@ watch(
ref="selectButton"
@click="select.toggleSelect()"
:class="{ 'hocus:ring-0': select.selectOpen }"
- class="relative h-10 flex items-center justify-between w-full py-2 pl-3 pr-10 text-left rounded-md shadow-sm cursor-pointer text-sm border-none focus:outline-none ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem] hover:ring-violet-400 hover:dark:ring-violet-700 focus:ring-indigo-400 dark:focus:ring-indigo-500 text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-800"
+ class="relative h-10 flex items-center justify-between w-full py-2 pl-3 pr-10 text-left rounded-md shadow-sm cursor-pointer text-sm border-none focus:outline-none ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem] hover:ring-violet-400 hover:dark:ring-violet-700 focus:ring-indigo-400 dark:focus:ring-indigo-500 text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-800"
>
<span class="truncate">{{ select.selectedItem ? select.selectedItem.title : placeholder }}</span>
<span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
diff --git a/resources/js/components/table/TableBase.vue b/resources/js/components/table/TableBase.vue
index d42bf082..3e722276 100755
--- a/resources/js/components/table/TableBase.vue
+++ b/resources/js/components/table/TableBase.vue
@@ -51,8 +51,8 @@ const handleSortChange = (sortKey) => {
@input="$emit('search', tableData.fields.searchQuery)"
title="Search Here"
/>
- <span class="flex items-end gap-2">
- <div class="flex gap-2 flex-col w-full sm:w-40">
+ <span class="flex items-end gap-2 flex-wrap">
+ <div class="flex gap-2 flex-col w-full sm:w-40 flex-1">
<FormInputLabel :field="{ name: 'sort', text: 'Sort by:' }" />
<InputSelect
:placeholder="'None'"
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 3f1e0c42..d3090159 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -81,7 +81,7 @@ watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true }
<div class="h-28 object-cover rounded-md shadow-md aspect-2/3 mb-auto relative group">
<img
id="folder-thumbnail"
- class="h-28 object-cover rounded-md aspect-2/3"
+ class="h-28 object-cover rounded-md aspect-2/3 ring-1 ring-gray-900/5"
:src="
stateFolder?.series?.thumbnail_url ??
'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'
@@ -137,7 +137,7 @@ watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true }
</div>
</div>
- <div id="mp4-details" class="hidden sm:flex flex-col lg:min-w-32 max-w-64 w-fit gap-4 justify-between overflow-hidden" role="group">
+ <div id="mp4-details" class="hidden sm:flex flex-col lg:min-w-32 max-w-64 w-fit gap-4 justify-between" role="group">
<section class="flex gap-2 justify-end h-8">
<ButtonText
v-if="userData"
diff --git a/resources/js/composables/useMetaData.js b/resources/js/composables/useMetaData.js
index dee8bc50..51425487 100755
--- a/resources/js/composables/useMetaData.js
+++ b/resources/js/composables/useMetaData.js
@@ -1,6 +1,6 @@
-import { reactive } from 'vue';
import { toFormattedDuration } from '@/service/util';
import { useRoute } from 'vue-router';
+import { reactive } from 'vue';
// This so does not work lol
export default function useMetaData(data) {
diff --git a/resources/js/layouts/LayoutBase.vue b/resources/js/layouts/LayoutBase.vue
index e9da0a42..0e4ae47f 100755
--- a/resources/js/layouts/LayoutBase.vue
+++ b/resources/js/layouts/LayoutBase.vue
@@ -28,7 +28,7 @@ const scrollBody = ref(null);
></section>
<section
id="content-card"
- class="bg-primary-900 dark:bg-primary-dark-900 dark:text-[#e2e0e2] shadow-xl p-6 pt-3 rounded-2xl w-full h-fit flex flex-col gap-3 z-20"
+ class="bg-primary-900 dark:bg-primary-dark-900 dark:text-[#e2e0e2] shadow-xl p-6 pt-3 rounded-2xl w-full h-fit flex flex-col gap-3 z-20 ring-1 ring-gray-900/5"
>
<NavBar class="z-20" />
<slot name="content" class="relative z-0"></slot>
@@ -36,7 +36,7 @@ const scrollBody = ref(null);
<section
id="list-card"
:class="{ invisible: !selectedSideBar }"
- class="bg-primary-900 dark:bg-primary-dark-900 dark:text-[#e2e0e2] shadow-xl p-3 rounded-2xl w-full h-fit lg:w-1/6 lg:max-w-72 sm:min-w-32 shrink-0 space-y-2 scroll-mt-6 z-20"
+ class="bg-primary-900 dark:bg-primary-dark-900 dark:text-[#e2e0e2] shadow-xl p-3 rounded-2xl w-full h-fit lg:w-1/6 lg:max-w-72 sm:min-w-32 shrink-0 space-y-2 scroll-mt-6 z-20 ring-1 ring-gray-900/5"
>
<slot name="sidebar"></slot>
</section>
diff --git a/resources/js/router/index.js b/resources/js/router/index.js
index 79c565b5..895bfa44 100755
--- a/resources/js/router/index.js
+++ b/resources/js/router/index.js
@@ -72,6 +72,7 @@ const router = createRouter({
{
path: '/profile',
name: 'profile',
+ meta: { protected: true },
component: ProfileView,
},
{
@@ -82,6 +83,7 @@ const router = createRouter({
{
path: '/dashboard',
name: 'dashboard',
+ meta: { protected: true },
component: DashboardView,
},
{
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index 4e8f4fb2..a707c4a5 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -82,6 +82,8 @@ export const useContentStore = defineStore('Content', () => {
}
function playlistFind(id) {
+ console.log('find');
+
let result = stateFilteredPlaylist.value.length > 0 ? stateFilteredPlaylist.value[0] : {};
if (id && stateVideo.value.id === id) return;
@@ -181,6 +183,11 @@ export const useContentStore = defineStore('Content', () => {
}
async function getFolder(nextFolderName) {
+ if (stateFolder.value.name === nextFolderName) {
+ // playlistFind(route.query?.video);
+ return Promise.resolve(true);
+ }
+
const nextFolder = stateDirectory.value.folders?.find((folder) => {
return folder.name === nextFolderName;
});
diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vue
index 3a3bea46..121fc378 100755
--- a/resources/js/views/VideoView.vue
+++ b/resources/js/views/VideoView.vue
@@ -18,8 +18,9 @@ const videoSortColumn = ref('title');
const videoSortDir = ref(1);
const appStore = useAppStore();
const ContentStore = useContentStore();
+
const { selectedSideBar } = storeToRefs(appStore);
-const { searchQuery, stateFilteredPlaylist, stateVideo } = storeToRefs(ContentStore);
+const { searchQuery, stateFilteredPlaylist, stateVideo, stateFolder } = storeToRefs(ContentStore);
const { getFolder, getCategory, getRecords, playlistFind } = ContentStore;
async function cycleSideBar(state) {
@@ -96,6 +97,15 @@ onMounted(async () => {
loading.value = false;
});
+watch(
+ () => route.query.video,
+ (newVideo) => {
+ if (stateFolder.value.name === route.params.folder) {
+ playlistFind(newVideo);
+ }
+ },
+ { immediate: false },
+);
watch(() => route.params.folder, reload, { immediate: false });
watch(() => selectedSideBar.value, cycleSideBar, { immediate: false });
</script>