A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: better date picker
aminnausinb3e573889f24
diff --git a/resources/js/components/pinesUI/DatePicker.vue b/resources/js/components/pinesUI/DatePicker.vueindex 59565b9b..37cf7fa0 100644--- a/resources/js/components/pinesUI/DatePicker.vue+++ b/resources/js/components/pinesUI/DatePicker.vue@@ -1,34 +1,41 @@-<script setup>+<script setup lang="ts">+import { useTemplateRef } from 'vue';+import { OnClickOutside } from '@vueuse/components';++import DatePickerValueButton from './DatePickerValueButton.vue';import useDatePicker from '@/composables/useDatePicker';-import { ref, watch } from 'vue';-import { OnClickOutside } from '@vueuse/components';+const { field } = defineProps(['field']);-const { field, tabindex } = defineProps(['field', 'tabindex']);+const datePickerInput = useTemplateRef('datePickerInput');+const datePickerCalendar = useTemplateRef('datePickerCalendar');-const model = defineModel();-const datePickerInput = ref(null);-const datePickerCalendar = ref(null);-const datePicker = useDatePicker({ model: model }, { datePickerInput, datePickerCalendar });+const model = defineModel<string>();-watch(- datePickerInput,- () => {- datePicker.datePickerInput = datePickerInput;- },- { immediate: true },-);-watch(- datePickerCalendar,- () => {- datePicker.selectableItemsList = datePickerCalendar;- },- { immediate: true },-);+const {+ datePickerOpen,+ datePickerPanel,+ toggleDatePicker,+ datePickerDays,+ datePickerMonthVerbose,+ datePickerMonth,+ datePickerYear,+ datePickerDecade,+ datePickerPosition,+ datePickerMonthNames,+ datePickerPrevious,+ datePickerNext,+ datePickerIsSelectedDate,+ datePickerIsToday,+ datePickerDaysInMonth,+ datePickerBlankDaysInMonth,+ datePickerValueClicked,+ showDatePickerPanel,+} = useDatePicker(model ? { model } : {}, datePickerInput, datePickerCalendar);</script><template>- <OnClickOutside class="relative" @trigger="datePicker.toggleDatePicker(false)">+ <OnClickOutside class="relative" @trigger="toggleDatePicker(false)"><inputref="datePickerInput":class="@@ -39,8 +46,8 @@ watch('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()"- @keydown.esc="datePicker.toggleDatePicker(false)"+ @click="toggleDatePicker()"+ @keydown.esc="toggleDatePicker(false)":name="field?.name":title="field?.name"type="text"@@ -48,13 +55,12 @@ watch(:placeholder="field?.placeholder ?? 'Select Date'":aria-autocomplete="field?.autocomplete ? 'list' : 'none'"v-model="model"- readonly/><div@click="- datePicker.toggleDatePicker();- if (datePicker.datePickerOpen) {- datePickerInput.focus();+ toggleDatePicker();+ if (datePickerOpen) {+ datePickerInput?.focus();}"class="absolute top-0 right-0 px-3 py-2 cursor-pointer text-neutral-400 hover:text-neutral-500"@@ -72,7 +78,7 @@ watch(leave-to-class="opacity-0 scale-95"><div- v-if="datePicker.datePickerOpen"+ v-if="datePickerOpen":class="'absolute left-0 rounded-md shadow-sm z-30 ' +'p-4 antialiased max-w-[17rem] w-full ' +@@ -81,22 +87,35 @@ watch('text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ' +'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'}`+ `${datePickerPosition === 'top' ? 'bottom-0 mb-12' : 'top-0 mt-12'}`"ref="datePickerCalendar"><div class="flex items-center justify-between mb-2">- <div>- <span class="text-lg font-bold dark:text-neutral-100">- {{ datePicker.datePickerMonthNames[datePicker.datePickerMonth] }}- </span>- <span class="ml-1 text-lg font-normal text-gray-600 dark:text-neutral-200">- {{ datePicker.datePickerYear }}- </span>+ <div class="flex text-lg [&>*]:px-2">+ <button+ v-if="datePickerPanel === 'D'"+ class="font-bold dark:text-neutral-100 transition duration-100 ease-in-out rounded-lg cursor-pointer focus:outline-none focus:shadow-outline hover:bg-gray-100 dark:hover:bg-neutral-900"+ type="button"+ @click="showDatePickerPanel('M')"+ >+ {{ datePickerMonthVerbose }}+ </button>++ <h3 v-if="datePickerPanel === 'Y'">{{ Math.floor(datePickerYear / 10) * 10 }} - {{ Math.floor(datePickerYear / 10) * 10 + 10 }}</h3>++ <button+ v-else+ @click="showDatePickerPanel('Y')"+ type="button"+ class="font-normal text-gray-600 dark:text-neutral-200 transition duration-100 ease-in-out rounded-lg cursor-pointer focus:outline-none focus:shadow-outline hover:bg-gray-100 dark:hover:bg-neutral-900"+ >+ {{ datePickerYear }}+ </button></div><div><button- @click="datePicker.datePickerPreviousMonth()"+ @click="datePickerPrevious()"type="button"class="inline-flex p-1 transition duration-100 ease-in-out rounded-full cursor-pointer focus:outline-none focus:shadow-outline hover:bg-gray-100 dark:hover:bg-neutral-900">@@ -105,7 +124,7 @@ watch(</svg></button><button- @click="datePicker.datePickerNextMonth()"+ @click="datePickerNext()"type="button"class="inline-flex p-1 transition duration-100 ease-in-out rounded-full cursor-pointer focus:outline-none focus:shadow-outline hover:bg-gray-100 dark:hover:bg-neutral-900">@@ -115,28 +134,43 @@ watch(</button></div></div>- <div class="grid grid-cols-7 mb-3">- <div v-for="(day, index) in datePicker.datePickerDays" :key="index" class="px-0.5">+ <div class="grid grid-cols-7 mb-3" v-if="datePickerPanel === 'D'">+ <div v-for="(day, index) in datePickerDays" :key="index" class="px-0.5"><div class="text-xs font-medium text-center text-gray-800 dark:text-neutral-300">{{ day }}</div></div></div>- <div class="grid grid-cols-7">- <div v-for="(blankDay, index) in datePicker.datePickerBlankDaysInMonth" :key="index" class="p-1 text-sm text-center border border-transparent"></div>- <div v-for="(day, dayIndex) in datePicker.datePickerDaysInMonth" :key="dayIndex" class="px-0.5 mb-1 aspect-square">+ <div class="grid grid-cols-7 text-sm" v-if="datePickerPanel === 'D'">+ <div v-for="(blankDay, index) in datePickerBlankDaysInMonth" :key="index" class="p-1 text-center border border-transparent"></div>+ <div v-for="(day, dayIndex) in datePickerDaysInMonth" :key="dayIndex" class="px-0.5 mb-1 aspect-square leading-none"><div- @click="datePicker.datePickerDayClicked(day)"+ @click="datePickerValueClicked(day)":class="{- 'bg-neutral-200 dark:bg-neutral-800/70 dark:hover:bg-neutral-900': datePicker.datePickerIsToday(day) == true,- 'text-gray-600 dark:text-neutral-400 hover:bg-neutral-200 dark:hover:text-neutral-100 dark:hover:bg-neutral-900':- datePicker.datePickerIsToday(day) == false && datePicker.datePickerIsSelectedDate(day) == false,- 'bg-neutral-800 dark:bg-violet-700 text-white hover:bg-opacity-75 dark:bg-opacity-60': datePicker.datePickerIsSelectedDate(day) == true,+ 'bg-neutral-200 dark:bg-neutral-800/70 dark:hover:bg-neutral-900': datePickerIsToday(day) == true,+ 'text-gray-600 dark:text-neutral-300 hover:bg-neutral-200 dark:hover:text-neutral-100 dark:hover:bg-neutral-900':+ datePickerIsToday(day) == false && datePickerIsSelectedDate(day) == false,+ 'bg-neutral-800 dark:bg-violet-700 text-white hover:bg-opacity-75 dark:bg-opacity-60': datePickerIsSelectedDate(day) == true,}"- class="flex items-center justify-center text-sm leading-none text-center rounded-full cursor-pointer h-7 w-7"+ class="flex items-center justify-center text-center rounded-full cursor-pointer h-7 w-7">{{ day }}</div></div></div>+ <div v-if="datePickerPanel === 'M'" class="grid grid-cols-3 gap-2">+ <DatePickerValueButton+ v-for="(month, index) in datePickerMonthNames"+ :value="index"+ :is-selected="datePickerMonth === index"+ @click="datePickerValueClicked(index)"+ >+ <template #text>+ {{ month.slice(0, 3) }}+ </template>+ </DatePickerValueButton>+ </div>+ <div v-if="datePickerPanel === 'Y'" class="grid grid-cols-3 grid-rows-4 gap-2 px-4">+ <DatePickerValueButton v-for="year in datePickerDecade" :value="year" :is-selected="datePickerYear === year" @click="datePickerValueClicked(year)" />+ </div></div></Transition></OnClickOutside>diff --git a/resources/js/components/pinesUI/DatePickerValueButton.vue b/resources/js/components/pinesUI/DatePickerValueButton.vuenew file mode 100644index 00000000..7570d6a8--- /dev/null+++ b/resources/js/components/pinesUI/DatePickerValueButton.vue@@ -0,0 +1,23 @@+<script setup lang="ts">+const props = withDefaults(+ defineProps<{+ value: number | string;+ isSelected: boolean;+ classOverride?: string;+ }>(),+ {+ isSelected: false,+ },+);+</script>++<template>+ <div+ class="flex items-center justify-center text-center rounded-md cursor-pointer"+ :class="`${classOverride ? `${classOverride} ` : ''}${isSelected ? 'bg-neutral-800 dark:bg-violet-700 text-white hover:bg-violet-700 dark:bg-opacity-60' : 'text-gray-600 dark:text-neutral-300 hover:bg-neutral-200 dark:hover:text-neutral-100 dark:hover:bg-neutral-900'}`"+ >+ <slot name="text">+ {{ value }}+ </slot>+ </div>+</template>diff --git a/resources/js/composables/useDatePicker.js b/resources/js/composables/useDatePicker.jsdeleted file mode 100644index 61ef9283..00000000--- a/resources/js/composables/useDatePicker.js+++ /dev/null@@ -1,151 +0,0 @@-import { nextTick, onMounted, reactive, watch } from 'vue';--export default function useDatePicker(props, refs) {- const datePicker = reactive({- datePickerOpen: false,- datePickerValue: props?.model?.value ?? props?.defaultDate ?? '',- datePickerFormat: 'F d, Y',- datePickerMonth: '',- datePickerYear: '',- datePickerDay: '',- datePickerDaysInMonth: [],- datePickerBlankDaysInMonth: [],- datePickerMonthNames: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],- datePickerDays: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],- datePickerInput: refs.datePickerInput,- datePickerCalendar: refs.datePickerCalendar,- datePickerPosition: 'bottom',- updateRefs(values) {- this.datePickerInput = values.datePickerInput;- this.datePickerCalendar = values.datePickerCalendar;- },- toggleDatePicker(state) {- if (state !== undefined) this.datePickerOpen = state === true;- else this.datePickerOpen = !this.datePickerOpen;- },- datePickerDayClicked(day) {- let selectedDate = new Date(this.datePickerYear, this.datePickerMonth, day);- this.datePickerDay = day;- this.datePickerValue = this.datePickerFormatDate(selectedDate);- this.datePickerIsSelectedDate(day);- this.datePickerOpen = false;-- if (props?.model) props.model.value = this.datePickerValue;- },- datePickerPreviousMonth() {- if (this.datePickerMonth == 0) {- this.datePickerYear--;- this.datePickerMonth = 12;- }- this.datePickerMonth--;- this.datePickerCalculateDays();- },- datePickerNextMonth() {- if (this.datePickerMonth == 11) {- this.datePickerMonth = 0;- this.datePickerYear++;- } else {- this.datePickerMonth++;- }- this.datePickerCalculateDays();- },- datePickerIsSelectedDate(day) {- const d = new Date(this.datePickerYear, this.datePickerMonth, day);- return this.datePickerValue === this.datePickerFormatDate(d);- },- datePickerIsToday(day) {- const today = new Date();- const d = new Date(this.datePickerYear, this.datePickerMonth, day);- return today.toDateString() === d.toDateString();- },- datePickerCalculateDays() {- let daysInMonth = new Date(this.datePickerYear, this.datePickerMonth + 1, 0).getDate();- // find where to start calendar day of week- let dayOfWeek = new Date(this.datePickerYear, this.datePickerMonth).getDay();- let blankdaysArray = [];- for (let i = 1; i <= dayOfWeek; i++) {- blankdaysArray.push(i);- }- let daysArray = [];- for (let i = 1; i <= daysInMonth; i++) {- daysArray.push(i);- }- this.datePickerBlankDaysInMonth = blankdaysArray;- this.datePickerDaysInMonth = daysArray;- },- datePickerFormatDate(date) {- let formattedDay = this.datePickerDays[date.getDay()];- let formattedDate = ('0' + date.getDate()).slice(-2); // appends 0 (zero) in single digit date- let formattedMonth = this.datePickerMonthNames[date.getMonth()];- let formattedMonthShortName = this.datePickerMonthNames[date.getMonth()].substring(0, 3);- let formattedMonthInNumber = ('0' + (parseInt(date.getMonth()) + 1)).slice(-2);- let formattedYear = date.getFullYear();-- if (this.datePickerFormat === 'F d, Y') {- return `${formattedMonth} ${formattedDate}, ${formattedYear}`;- }- if (this.datePickerFormat === 'd M, Y') {- return `${formattedDate} ${formattedMonthShortName}, ${formattedYear}`;- }- if (this.datePickerFormat === 'Y M d') {- return `${formattedYear} ${formattedMonthShortName} ${formattedDate}`;- }- if (this.datePickerFormat === 'MM-DD-YYYY') {- return `${formattedMonthInNumber}-${formattedDate}-${formattedYear}`;- }- if (this.datePickerFormat === 'DD-MM-YYYY') {- return `${formattedDate}-${formattedMonthInNumber}-${formattedYear}`;- }- if (this.datePickerFormat === 'YYYY-MM-DD') {- return `${formattedYear}-${formattedMonthInNumber}-${formattedDate}`;- }- if (this.datePickerFormat === 'D d M, Y') {- return `${formattedDay} ${formattedDate} ${formattedMonthShortName} ${formattedYear}`;- }-- return `${formattedMonth} ${formattedDate}, ${formattedYear}`;- },- datePickerPositionUpdate() {- let datePickerBottomPos = this.datePickerInput.getBoundingClientRect().top + this.datePickerInput.offsetHeight + this.datePickerCalendar.offsetHeight;-- if (window.innerHeight < datePickerBottomPos) {- this.datePickerPosition = 'top';- } else {- this.datePickerPosition = 'bottom';- }- },- });-- onMounted(() => {- datePicker.currentDate = new Date();- if (datePicker.datePickerValue) {- datePicker.currentDate = new Date(Date.parse(datePicker.datePickerValue));- }- datePicker.datePickerMonth = datePicker.currentDate.getMonth();- datePicker.datePickerYear = datePicker.currentDate.getFullYear();- datePicker.datePickerDay = datePicker.currentDate.getDay();-- datePicker.datePickerCalculateDays();- if (!props?.useDefaultDate) return;- datePicker.datePickerValue = datePicker.datePickerFormatDate(datePicker.currentDate);- });- const updatePosition = () => {- if (!datePicker.datePickerOpen) return;- datePicker.datePickerPositionUpdate();- };- watch(- () => datePicker.datePickerOpen,- async function (value) {- if (!value) {- removeEventListener('resize', updatePosition);- return;- }- await nextTick();- updatePosition();- window.addEventListener('resize', updatePosition);- },- { immediate: false },- );-- return datePicker;-}diff --git a/resources/js/composables/useDatePicker.ts b/resources/js/composables/useDatePicker.tsnew file mode 100644index 00000000..81e79b87--- /dev/null+++ b/resources/js/composables/useDatePicker.ts@@ -0,0 +1,228 @@+import { toast } from '@/service/toaster/toastService';+import { computed, nextTick, onMounted, ref, watch, type ModelRef, type Ref } from 'vue';++interface DatePickerProps {+ model?: ModelRef<string | undefined>;+ defaultDate?: string;+ useDefaultDate?: boolean;+}++export default function useDatePicker(props: DatePickerProps, datePickerInput: Ref<HTMLElement | null>, datePickerCalendar: Ref<HTMLElement | null>) {+ const datePickerOpen = ref(false);+ const datePickerValue = ref(props.model?.value ?? props.defaultDate ?? '');+ const datePickerFormat = ref<'F d, Y' | 'd M, Y' | 'Y M d' | 'MM-DD-YYYY' | 'DD-MM-YYYY' | 'YYYY-MM-DD' | 'D d M, Y'>('F d, Y');+ const datePickerMonth = ref(0);+ const datePickerYear = ref(0);+ const datePickerDay = ref(0);+ const datePickerDaysInMonth = ref<number[]>([]);+ const datePickerBlankDaysInMonth = ref<number[]>([]);+ const datePickerPosition = ref<'top' | 'bottom'>('bottom');++ const datePickerMonthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];+ const datePickerDays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];++ const datePickerPanel = ref<'Y' | 'M' | 'D'>('D');++ const datePickerMonthVerbose = computed(() => {+ let index = Math.max(datePickerMonth.value, 0);+ if (index >= datePickerMonthNames.length) index = 0;+ return datePickerMonthNames[index];+ });++ const datePickerDecade = computed(() => {+ const startYear = Math.floor(datePickerYear.value / 10) * 10;+ return Array.from({ length: 10 }, (_, i) => startYear + i);+ });++ function toggleDatePicker(state?: boolean) {+ datePickerOpen.value = state !== undefined ? state : !datePickerOpen.value;+ datePickerPanel.value = 'D';+ }++ function showDatePickerPanel(panel: 'Y' | 'M' | 'D' = 'D') {+ datePickerPanel.value = panel;+ }++ function datePickerFormatDate(date: Date): string {+ const formattedDay = datePickerDays[date.getDay()];+ const formattedDate = ('0' + date.getDate()).slice(-2);+ const formattedMonth = datePickerMonthNames[date.getMonth()];+ const formattedMonthShortName = formattedMonth.substring(0, 3);+ const formattedMonthNumber = ('0' + (date.getMonth() + 1)).slice(-2);+ const formattedYear = date.getFullYear();++ switch (datePickerFormat.value) {+ case 'F d, Y':+ return `${formattedMonth} ${formattedDate}, ${formattedYear}`;+ case 'd M, Y':+ return `${formattedDate} ${formattedMonthShortName}, ${formattedYear}`;+ case 'Y M d':+ return `${formattedYear} ${formattedMonthShortName} ${formattedDate}`;+ case 'MM-DD-YYYY':+ return `${formattedMonthNumber}-${formattedDate}-${formattedYear}`;+ case 'DD-MM-YYYY':+ return `${formattedDate}-${formattedMonthNumber}-${formattedYear}`;+ case 'YYYY-MM-DD':+ return `${formattedYear}-${formattedMonthNumber}-${formattedDate}`;+ case 'D d M, Y':+ return `${formattedDay} ${formattedDate} ${formattedMonthShortName} ${formattedYear}`;+ default:+ return `${formattedMonth} ${formattedDate}, ${formattedYear}`;+ }+ }++ function datePickerValueClicked(value: number) {+ switch (datePickerPanel.value) {+ case 'Y':+ datePickerYear.value = value;+ datePickerPanel.value = 'M';+ break;+ case 'M':+ datePickerMonth.value = value;+ datePickerPanel.value = 'D';+ calculateDays();+ break;++ default:+ const selectedDate = new Date(datePickerYear.value, datePickerMonth.value, value);+ datePickerDay.value = value;+ datePickerValue.value = datePickerFormatDate(selectedDate);+ datePickerOpen.value = false;++ if (props.model) {+ props.model.value = datePickerValue.value;+ }+ break;+ }+ }++ function datePickerPrevious() {+ switch (datePickerPanel.value) {+ case 'Y':+ datePickerYear.value -= 10;+ break;+ case 'M':+ datePickerYear.value -= 1;+ break;+ default:+ if (datePickerMonth.value === 0) {+ datePickerYear.value--;+ datePickerMonth.value = 11;+ } else {+ datePickerMonth.value--;+ }+ calculateDays();+ break;+ }+ }++ function datePickerNext() {+ switch (datePickerPanel.value) {+ case 'Y':+ datePickerYear.value += 10;++ break;+ case 'M':+ datePickerYear.value += 1;+ break;++ default:+ if (datePickerMonth.value === 11) {+ datePickerMonth.value = 0;+ datePickerYear.value++;+ } else {+ datePickerMonth.value++;+ }+ calculateDays();+ break;+ }+ }++ function datePickerIsSelectedDate(day: number) {+ const d = new Date(datePickerYear.value, datePickerMonth.value, day);+ return datePickerValue.value === datePickerFormatDate(d);+ }++ function datePickerIsToday(day: number) {+ const today = new Date();+ const d = new Date(datePickerYear.value, datePickerMonth.value, day);+ return today.toDateString() === d.toDateString();+ }++ function calculateDays() {+ const daysInMonth = new Date(datePickerYear.value, datePickerMonth.value + 1, 0).getDate();+ const dayOfWeek = new Date(datePickerYear.value, datePickerMonth.value).getDay();++ datePickerBlankDaysInMonth.value = Array.from({ length: dayOfWeek }, (_, i) => i + 1);+ datePickerDaysInMonth.value = Array.from({ length: daysInMonth }, (_, i) => i + 1);+ }++ function updatePosition() {+ if (!datePickerInput.value || !datePickerCalendar.value || !datePickerOpen.value) return;++ const inputRect = datePickerInput.value.getBoundingClientRect();+ const calendarHeight = datePickerCalendar.value.offsetHeight;+ const bottomPos = inputRect.top + inputRect.height + calendarHeight;++ datePickerPosition.value = bottomPos > window.innerHeight ? 'top' : 'bottom';+ }++ function setDate(date: Date, setDate: boolean = true) {+ datePickerMonth.value = date.getMonth();+ datePickerYear.value = date.getFullYear();+ datePickerDay.value = date.getDate();++ if (setDate) datePickerValue.value = datePickerFormatDate(date);++ calculateDays();+ }++ function resetDate() {+ if (datePickerValue.value) {+ return setDate(new Date(Date.parse(datePickerValue.value)));+ }++ setDate(new Date(), props.useDefaultDate);+ }++ onMounted(() => {+ resetDate();+ });++ watch(datePickerOpen, async (open) => {+ if (!open) {+ window.removeEventListener('resize', updatePosition);+ return;+ }+ await nextTick();+ resetDate();+ updatePosition();+ window.addEventListener('resize', updatePosition);+ });++ return {+ datePickerInput,+ datePickerCalendar,+ datePickerOpen,+ datePickerValue,+ datePickerPanel,+ datePickerFormat,+ datePickerMonth,+ datePickerMonthVerbose,+ datePickerYear,+ datePickerDecade,+ datePickerDay,+ datePickerDaysInMonth,+ datePickerBlankDaysInMonth,+ datePickerMonthNames,+ datePickerDays,+ datePickerPosition,+ toggleDatePicker,+ datePickerValueClicked,+ datePickerPrevious,+ datePickerNext,+ datePickerIsSelectedDate,+ datePickerIsToday,+ showDatePickerPanel,+ };+}