Skip to content

A self-hosted media server and file management system

record sorting fix

aminnausin5e7ae89fbad8
diff --git a/app/Http/Resources/RecordResource.php b/app/Http/Resources/RecordResource.php
index 9086d733..4acd16ec 100755
--- a/app/Http/Resources/RecordResource.php
+++ b/app/Http/Resources/RecordResource.php
@@ -25,7 +25,8 @@ class RecordResource extends JsonResource
'user_id' => (string)$this->user->id,
'user_name' => $this->user->name,
'video_id' => $this->video ? (string)$this->video->id : null,
- 'video_name' => $this->video ? $this->video->name : $this->name,
+ 'video_name' => $this->video ? ($this->video->title ?? $this->video->name) : $this->name,
+ '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 : 'Deleted',
'category_name' => $this->video ? $this->video->folder->category->name : null
diff --git a/resources/js/components/cards/RecordCardDetails.vue b/resources/js/components/cards/RecordCardDetails.vue
index f22c15c1..8b78c7c4 100755
--- a/resources/js/components/cards/RecordCardDetails.vue
+++ b/resources/js/components/cards/RecordCardDetails.vue
@@ -1,10 +1,10 @@
<script setup>
-import ButtonCorner from '../inputs/ButtonCorner.vue';
-import CircumPlay1 from '~icons/circum/play-1';
-
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 rawDate = new Date(props.data?.attributes?.created_at?.replace(' ', 'T'));
@@ -21,7 +21,7 @@ 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">{{ 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
:positionClasses="'w-7 h-7'"
@@ -44,7 +44,17 @@ const videoLink = computed(() => {
</div>
</section>
<section class="flex flex-col sm:flex-row sm:justify-between w-full">
- <h3 class="text-neutral-500 w-full text-wrap truncate sm:text-nowrap">
+ <h3
+ class="text-neutral-500 w-full text-wrap truncate sm:text-nowrap"
+ :title="`Watched on ${rawDate.toLocaleDateString('en-ca', {
+ year: 'numeric',
+ month: '2-digit',
+ day: '2-digit',
+ hour: '2-digit',
+ hour12: false,
+ minute: '2-digit',
+ })}`"
+ >
{{ 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/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vue
index 66bb2a87..f4f39bb9 100644
--- a/resources/js/components/forms/EditFolder.vue
+++ b/resources/js/components/forms/EditFolder.vue
@@ -1,15 +1,15 @@
<script setup>
-import useForm from '../../composables/useForm';
-import mediaAPI from '@/service/mediaAPI.ts';
-import FormInput from '../inputs/FormInput.vue';
-import FormTextArea from '../inputs/FormTextArea.vue';
-import FormInputLabel from '../labels/FormInputLabel.vue';
-
+import { toCalendarFormattedDate } from '../../service/util';
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';
+import FormInputLabel from '../labels/FormInputLabel.vue';
+import FormTextArea from '../inputs/FormTextArea.vue';
+import DatePicker from '../pinesUI/DatePicker.vue';
+import FormInput from '../inputs/FormInput.vue';
+import mediaAPI from '@/service/mediaAPI.ts';
+import useForm from '../../composables/useForm';
const emit = defineEmits(['handleFinish']);
const props = defineProps(['folder']);
diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vue
index 044c5d53..79cb9cd9 100644
--- a/resources/js/components/pinesUI/InputMultiChip.vue
+++ b/resources/js/components/pinesUI/InputMultiChip.vue
@@ -1,4 +1,8 @@
<script setup>
+import { onMounted, ref, watch } from 'vue';
+import { OnClickOutside } from '@vueuse/components';
+import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component.mjs';
+
import useMultiSelect from '../../composables/useMultiSelect';
import ButtonIcon from '../inputs/ButtonIcon.vue';
import TextInput from '../inputs/TextInput.vue';
@@ -6,10 +10,6 @@ import ChipTag from '../labels/ChipTag.vue';
import MdiLightPlus from '~icons/mdi-light/plus';
-import { onMounted, ref, watch } from 'vue';
-import { OnClickOutside } from '@vueuse/components';
-import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component.mjs';
-
// import CircumCirclePlus from '~icons/circum/circle-plus';
const props = defineProps({
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index 0a03817a..4e8f4fb2 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -71,8 +71,8 @@ export const useContentStore = defineStore('Content', () => {
async function recordsSort(column = 'created_at', dir = 1) {
let tempList = stateRecords.value.sort((recordA, recordB) => {
if (column === 'created_at') {
- let dateA = new Date(recordA['created_at']);
- let dateB = new Date(recordB['created_at']);
+ let dateA = new Date(recordA?.attributes['created_at']);
+ let dateB = new Date(recordB?.attributes['created_at']);
return (dateB - dateA) * dir;
}
return recordB?.relationships[column]?.localeCompare(recordA?.relationships[column]) * dir;
diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vue
index d1d2c4dd..ed60c0c2 100755
--- a/resources/js/views/HistoryView.vue
+++ b/resources/js/views/HistoryView.vue
@@ -1,15 +1,15 @@
<script setup>
-import RecordCardDetails from '../components/cards/RecordCardDetails.vue';
-import LayoutBase from '../layouts/LayoutBase.vue';
-import ModalBase from '../components/pinesUI/ModalBase.vue';
-import useModal from '../composables/useModal';
-import TableBase from '../components/table/TableBase.vue';
+import RecordCardDetails from '@/components/cards/RecordCardDetails.vue';
+import LayoutBase from '@/layouts/LayoutBase.vue';
+import ModalBase from '@/components/pinesUI/ModalBase.vue';
+import useModal from '@/composables/useModal';
+import TableBase from '@/components/table/TableBase.vue';
-import { storeToRefs } from 'pinia';
-import { useAppStore } from '../stores/AppStore';
-import { useContentStore } from '../stores/ContentStore';
import { computed, onMounted, ref } from 'vue';
-import { useToast } from '../composables/useToast';
+import { useContentStore } from '@/stores/ContentStore';
+import { storeToRefs } from 'pinia';
+import { useAppStore } from '@/stores/AppStore';
+import { useToast } from '@/composables/useToast';
const toast = useToast();
@@ -20,9 +20,9 @@ const cachedID = ref(null);
const confirmModal = useModal({ title: 'Delete Record?', submitText: 'Confim' });
const searchQuery = ref('');
+const { getRecords, deleteRecord, recordsSort } = ContentStore;
const { pageTitle, selectedSideBar } = storeToRefs(appStore);
const { stateRecords } = storeToRefs(ContentStore);
-const { getRecords, deleteRecord, recordsSort } = ContentStore;
const filteredRecords = computed(() => {
let tempList = searchQuery.value
diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vue
index 941f4124..3a3bea46 100755
--- a/resources/js/views/VideoView.vue
+++ b/resources/js/views/VideoView.vue
@@ -1,4 +1,10 @@
<script setup>
+import { nextTick, onMounted, ref, watch } from 'vue';
+import { useContentStore } from '../stores/ContentStore';
+import { useAppStore } from '../stores/AppStore';
+import { storeToRefs } from 'pinia';
+import { useRoute } from 'vue-router';
+
import VideoAmbientPlayer from '../components/video/VideoAmbientPlayer.vue';
import VideoInfoPanel from '../components/video/VideoInfoPanel.vue';
import VideoSidebar from '../components/panels/VideoSidebar.vue';
@@ -6,12 +12,6 @@ import LayoutBase from '../layouts/LayoutBase.vue';
import VideoCard from '../components/cards/VideoCard.vue';
import TableBase from '../components/table/TableBase.vue';
-import { nextTick, onMounted, ref, watch } from 'vue';
-import { useContentStore } from '../stores/ContentStore';
-import { useAppStore } from '../stores/AppStore';
-import { storeToRefs } from 'pinia';
-import { useRoute } from 'vue-router';
-
const route = useRoute();
const loading = ref(true);
const videoSortColumn = ref('title');