A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
refactor: datepicker and number field on forms
aminnausinc25bf1a705bb
diff --git a/resources/css/cedar-theme.css b/resources/css/cedar-theme.cssindex 52c7e025..ae308cc5 100644--- a/resources/css/cedar-theme.css+++ b/resources/css/cedar-theme.css@@ -33,6 +33,9 @@--container-padding: 2rem;--container-2xl: 1536px;+ /* Input */+ --input-height: calc(var(--spacing) * 9); /* h-8 */+/* Surfaces (0 is page) */--color-surface-i: oklch(0.1749 0.0082 285.52); /* primary-dark-950 #101014 */--color-surface-0: oklch(0.9841 0.0035 39.48); /* primary-950 #fcf9f8 */diff --git a/resources/js/components/cards/data/SessionCard.vue b/resources/js/components/cards/data/SessionCard.vueindex a8b37da3..5081bf05 100644--- a/resources/js/components/cards/data/SessionCard.vue+++ b/resources/js/components/cards/data/SessionCard.vue@@ -38,7 +38,7 @@ const agent = computed(() => {<span class="recent bg-success inline-block size-2 animate-pulse rounded-sm"></span>This device</span>- <span v-else>Last active {{ session.last_active }}</span>+ <span v-else class="ms-1">Last active {{ session.last_active }}</span></div></section></div>diff --git a/resources/js/components/cedar-ui/clipboard/CopyToClipboard.vue b/resources/js/components/cedar-ui/clipboard/CopyToClipboard.vueindex 92995020..c304349c 100644--- a/resources/js/components/cedar-ui/clipboard/CopyToClipboard.vue+++ b/resources/js/components/cedar-ui/clipboard/CopyToClipboard.vue@@ -12,7 +12,7 @@ const clipboard = useClipboard(text);<template><div class="flex h-8 justify-between gap-4">- <TextInput name="clipboard-text" class="cursor-text" v-model="text" disabled />+ <TextInput name="clipboard-text" class="h-full cursor-text" v-model="text" disabled /><div class="relative z-20 flex items-center"><Transitionenter-active-class="transition ease-out duration-300"diff --git a/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vue b/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vuenew file mode 100644index 00000000..5363904a--- /dev/null+++ b/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vue@@ -0,0 +1,33 @@+<script setup lang="ts">+import { ButtonBase } from '../button';++withDefaults(+ defineProps<{+ value: number | string;+ isSelected?: boolean;+ isDefault?: boolean;+ classOverride?: string;+ }>(),+ {+ isSelected: false,+ },+);+</script>++<template>+ <ButtonBase+ :class="[+ 'hocus:bg-overlay-accent text-foreground-1 dark:text-foreground-4 dark:hocus:text-foreground-5 text-center',+ {+ 'hover:text-foreground bg-overlay-accent dark:hocus:bg-overlay-accent dark:bg-overlay-accent/80': isDefault && !isSelected,+ 'dark:bg-opacity-60 hocus:bg-primary dark:bg-primary-active bg-neutral-800 text-white': isSelected,+ },+ classOverride,+ ]"+ type="button"+ >+ <slot>+ {{ value }}+ </slot>+ </ButtonBase>+</template>diff --git a/resources/js/components/cedar-ui/date-picker/DatePicker.vue b/resources/js/components/cedar-ui/date-picker/DatePicker.vuenew file mode 100644index 00000000..86ac4179--- /dev/null+++ b/resources/js/components/cedar-ui/date-picker/DatePicker.vue@@ -0,0 +1,200 @@+<script setup lang="ts">+import { CedarCalendar, CedarChevronLeft, CedarChevronRight } from '../icons';+import { nextTick, useTemplateRef, watch } from 'vue';+import { ButtonIcon, ButtonText } from '../button';+import { OnClickOutside } from '@vueuse/components';+import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';+import { cn } from '@aminnausin/cedar-ui';++import { ButtonDatePicker, useDatePicker } from '.';+import { InputShell } from '../input';++const props = defineProps<{ field: any; disabled?: boolean }>();++const datePickerInput = useTemplateRef('datePickerInput');+const datePickerCalendar = useTemplateRef('datePickerCalendar');++const model = defineModel<string | null>();++const {+ datePickerOpen,+ datePickerPanel,+ toggleDatePicker,+ datePickerDays,+ datePickerMonthVerbose,+ datePickerDay,+ datePickerMonth,+ datePickerYear,+ datePickerDecade,+ datePickerPosition,+ datePickerMonthNames,+ datePickerPrevious,+ datePickerNext,+ datePickerIsSelectedMonth,+ datePickerIsSelectedDate,+ datePickerIsToday,+ datePickerDaysInMonth,+ datePickerBlankDaysInMonth,+ datePickerValueClicked,+ showDatePickerPanel,+} = useDatePicker({ model }, datePickerInput, datePickerCalendar);++async function focusInitialElement() {+ await nextTick();++ if (!datePickerCalendar.value) return;++ const el: HTMLElement | null = datePickerCalendar.value.querySelector('[data-initial-focus=true]');+ el?.focus({ preventScroll: true });+}++function shouldFocusDay(day: number, index: number): boolean {+ if (datePickerIsSelectedDate(day)) return true; // its the selected date+ if (datePickerIsToday(day) && !datePickerDay) return true; // its today and either no day is selected+ if (!datePickerIsSelectedMonth() && index === 0) return true; // its a month that isnt current and isnt selected+ return false;+}++watch(datePickerOpen, (open) => {+ if (!open) return;++ focusInitialElement();+});++watch(datePickerPanel, () => {+ focusInitialElement();+});+</script>++<template>+ <OnClickOutside class="group relative text-sm" @trigger="toggleDatePicker(false)">+ <slot name="trigger">+ <InputShell>+ <template #input="{ class: inputClass }">+ <input+ ref="datePickerInput"+ @keydown.space.prevent="toggleDatePicker()"+ @keydown.enter.prevent="toggleDatePicker()"+ @click="toggleDatePicker()"+ @keydown.esc="toggleDatePicker(false)"+ v-model="model"+ type="text"+ :id="field.name"+ :name="field.name"+ :title="field.text ?? field.name"+ :required="field.required"+ :disabled="field.disabled"+ :placeholder="field?.placeholder ?? 'Select Date'"+ :aria-autocomplete="field.autocomplete ? 'list' : 'none'"+ :class="['mt-1 pe-12', { 'placeholder:text-foreground-2': datePickerOpen, 'button-disabled': disabled }, inputClass]"+ readonly+ />+ </template>+ </InputShell>+ </slot>+ <ButtonIcon+ @click="+ toggleDatePicker();+ if (datePickerOpen && datePickerInput) {+ datePickerInput.focus();+ }+ "+ variant="ghost"+ :class="[+ 'text-foreground-3 group-hover:text-foreground-2 absolute top-0 right-0 h-full cursor-pointer rounded-l-none px-3',+ 'hocus:text-foreground-0 focus:ring-primary ring-inset hover:bg-transparent focus:bg-transparent focus:ring-2', // Clear colour+ { 'text-foreground-0 bg-inherit': datePickerOpen },+ ]"+ >+ <CedarCalendar class="aspect-square h-full shrink-0" />+ </ButtonIcon>+ <Transition+ enter-from-class="opacity-0 scale-75"+ enter-to-class="opacity-100 scale-100"+ leave-from-class="opacity-100 scale-100"+ leave-active-class="duration-100"+ leave-to-class="opacity-0 scale-75"+ >+ <UseFocusTrap v-if="datePickerOpen">+ <div+ ref="datePickerCalendar"+ :class="[+ 'absolute left-0 z-30 w-full max-w-68 p-4',+ 'rounded-md shadow-xs transition-all ease-in-out',+ 'text-foreground bg-overlay border-overlay-border border',+ `${datePickerPosition === 'top' ? 'bottom-0 mb-12' : 'top-0 mt-12'}`,+ ]"+ >+ <div class="mb-2 flex items-center justify-between">+ <div class="flex text-lg *:px-2">+ <ButtonText v-if="datePickerPanel === 'D'" variant="ghost" @click="showDatePickerPanel('M')" class="hocus:bg-overlay-accent font-bold" :title="'Month'">+ {{ datePickerMonthVerbose }}+ </ButtonText>++ <h3 v-if="datePickerPanel === 'Y'" aria-label="Year Range">+ {{ Math.floor(datePickerYear / 10) * 10 }} - {{ Math.floor(datePickerYear / 10) * 10 + 10 }}+ </h3>++ <ButtonText+ v-else+ variant="ghost"+ @click="showDatePickerPanel('Y')"+ :class="['hocus:bg-overlay-accent', { 'text-foreground-1 dark:text-neutral-200': datePickerPanel === 'D' }]"+ :title="'Year'"+ >+ {{ datePickerYear }}+ </ButtonText>+ </div>+ <div class="text-foreground-3 dark:text-neutral-200">+ <ButtonIcon variant="ghost" class="hocus:bg-overlay-accent inline-flex rounded-full p-0" :title="'Previous Page'" @click="datePickerPrevious()">+ <CedarChevronLeft class="size-6" />+ </ButtonIcon>+ <ButtonIcon variant="ghost" class="hocus:bg-overlay-accent inline-flex rounded-full p-0" :title="'Next Page'" @click="datePickerNext()">+ <CedarChevronRight class="size-6" />+ </ButtonIcon>+ </div>+ </div>+ <div class="grid grid-cols-7" v-if="datePickerPanel === 'D'">+ <p v-for="(day, index) in datePickerDays" :key="index" class="text-foreground-0 dark:text-foreground-1 mb-2 text-center text-xs font-medium">+ {{ day }}+ </p>+ <span v-for="(_, index) in datePickerBlankDaysInMonth" :key="index"></span>+ <div v-for="(day, dayIndex) in datePickerDaysInMonth" class="aspect-square leading-none" :key="dayIndex">+ <ButtonDatePicker+ class="mx-auto aspect-square size-7 rounded-full p-0"+ :value="day"+ :is-selected="datePickerIsSelectedDate(day)"+ :is-default="datePickerIsToday(day)"+ :data-initial-focus="shouldFocusDay(day, dayIndex)"+ @click="datePickerValueClicked(day)"+ />+ </div>+ </div>++ <div v-if="datePickerPanel === 'M'" class="grid grid-cols-3 gap-2">+ <ButtonDatePicker+ v-for="(month, index) in datePickerMonthNames"+ :key="month"+ :value="index"+ :is-selected="datePickerMonth === index"+ :data-initial-focus="datePickerMonth === index"+ @click="datePickerValueClicked(index)"+ >+ {{ month.slice(0, 3) }}+ </ButtonDatePicker>+ </div>+ <div v-if="datePickerPanel === 'Y'" class="grid grid-cols-3 grid-rows-4 gap-2 px-4">+ <ButtonDatePicker+ v-for="year in datePickerDecade"+ :key="year"+ :value="year"+ :is-selected="datePickerYear === year"+ :data-initial-focus="datePickerYear === year"+ @click="datePickerValueClicked(year)"+ />+ </div>+ </div>+ </UseFocusTrap>+ </Transition>+ </OnClickOutside>+</template>diff --git a/resources/js/components/cedar-ui/date-picker/index.ts b/resources/js/components/cedar-ui/date-picker/index.tsnew file mode 100644index 00000000..7e84e1d3--- /dev/null+++ b/resources/js/components/cedar-ui/date-picker/index.ts@@ -0,0 +1,3 @@+export { default as ButtonDatePicker } from './ButtonDatePicker.vue';+export { default as useDatePicker } from './useDatePicker';+export { default as DatePicker } from './DatePicker.vue';diff --git a/resources/js/components/cedar-ui/date-picker/useDateFieldModel.ts b/resources/js/components/cedar-ui/date-picker/useDateFieldModel.tsnew file mode 100644index 00000000..7c0db4a0--- /dev/null+++ b/resources/js/components/cedar-ui/date-picker/useDateFieldModel.ts@@ -0,0 +1,13 @@+import { computed } from 'vue';++export function useDateFieldModel(form: { fields: any }, fieldName: string) {+ return computed<string | null | undefined>({+ get() {+ const value = form.fields[fieldName];+ return typeof value === 'string' || value === null ? value : undefined;+ },+ set(value) {+ form.fields[fieldName] = value;+ },+ });+}diff --git a/resources/js/components/cedar-ui/date-picker/useDatePicker.ts b/resources/js/components/cedar-ui/date-picker/useDatePicker.tsnew file mode 100644index 00000000..2fe5d7f8--- /dev/null+++ b/resources/js/components/cedar-ui/date-picker/useDatePicker.ts@@ -0,0 +1,245 @@+import { computed, nextTick, onMounted, ref, watch, type ModelRef, type Ref } from 'vue';++interface DatePickerProps {+ model?: ModelRef<string | undefined | null>;+ defaultDate?: string;+ useDefaultDate?: boolean;+}++export default function useDatePicker(props: DatePickerProps, datePickerInput: Ref<HTMLElement | null>, datePickerCalendar: Ref<HTMLElement | null>) {+ const datePickerMonth = ref(0);+ const datePickerYear = ref(0);+ const datePickerDay = ref(0);++ 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 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 ?? !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:+ datePickerDay.value = value;+ datePickerValue.value = datePickerFormatDate(new Date(datePickerYear.value, datePickerMonth.value, value));+ 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;+ }+ }++ /**+ * Is the date picker looking at the month of the currently selected value+ */+ function datePickerIsSelectedMonth() {+ if (!datePickerDay.value) return false;+ const d = new Date(datePickerValue.value);+ return d.getMonth() === datePickerMonth.value && d.getFullYear() === datePickerYear.value;+ }++ 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 datePickerIsCurrentMonth() {+ const today = new Date();+ const d = new Date(datePickerValue.value);+ return d.getMonth() === today.getMonth() && d.getFullYear() === today.getFullYear();+ }++ 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,+ datePickerIsSelectedMonth,+ datePickerIsSelectedDate,+ datePickerIsToday,+ datePickerIsCurrentMonth,+ showDatePickerPanel,+ };+}diff --git a/resources/js/components/cedar-ui/input/InputShell.vue b/resources/js/components/cedar-ui/input/InputShell.vueindex f3c1dbb6..4f685d5b 100644--- a/resources/js/components/cedar-ui/input/InputShell.vue+++ b/resources/js/components/cedar-ui/input/InputShell.vue@@ -11,6 +11,7 @@ const props = withDefaults(defineProps<InputShellProps>(), { clampText: true });name="input":class="cn(+ 'h-(--input-height)','scrollable-input scrollbar-thin','transition duration-200 ease-in-out focus:outline-hidden','bg-surface-2 placeholder:text-foreground-3 dark:placeholder:text-foreground-2 dark:bg-neutral-700',diff --git a/resources/js/components/cedar-ui/number-field/FormNumberField.vue b/resources/js/components/cedar-ui/number-field/FormNumberField.vueindex 1b72abfa..f796ee58 100644--- a/resources/js/components/cedar-ui/number-field/FormNumberField.vue+++ b/resources/js/components/cedar-ui/number-field/FormNumberField.vue@@ -39,7 +39,7 @@ const clamp = () => {</script><template>- <span class="relative mt-1 inline-flex w-full text-sm">+ <span class="group relative mt-1 inline-flex w-full"><InputShell><template #input="{ class: inputClass }"><input@@ -64,7 +64,7 @@ const clamp = () => {<span class="absolute top-0 right-0 flex h-full w-12 flex-col"><ButtonIcon@click.prevent.stop="step(1)"- class="focus:ring-primary hover:bg-overlay-border/50 h-1/2 rounded-none rounded-tr-md ring-inset focus:ring-2"+ class="focus:ring-primary hover:bg-overlay-border/50 text-foreground-3 hover:text-foreground-0 h-1/2 rounded-none rounded-tr-md ring-inset focus:ring-2":title="`Increment ${field.name}`":variant="'ghost'">@@ -72,7 +72,7 @@ const clamp = () => {</ButtonIcon><ButtonIcon@click.prevent.stop="step(-1)"- class="focus:ring-primary hover:bg-overlay-border/50 h-1/2 rounded-none rounded-br-md ring-inset focus:ring-2"+ class="focus:ring-primary hover:bg-overlay-border/50 text-foreground-3 hover:text-foreground-0 h-1/2 rounded-none rounded-br-md ring-inset focus:ring-2":title="`Decrement ${field.name}`":variant="'ghost'">diff --git a/resources/js/components/cedar-ui/table/TableBase.vue b/resources/js/components/cedar-ui/table/TableBase.vueindex 728c2a2a..55f94a23 100644--- a/resources/js/components/cedar-ui/table/TableBase.vue+++ b/resources/js/components/cedar-ui/table/TableBase.vue@@ -52,7 +52,7 @@ onMounted(() => {<template><section class="flex w-full flex-col gap-3">- <section v-if="props.useToolbar" class="flex flex-col justify-center gap-2 sm:flex-row sm:justify-between">+ <section v-if="props.useToolbar" class="flex h-10 flex-col justify-center gap-2 sm:flex-row sm:justify-between"><TextInputv-if="model !== undefined"v-model="model"diff --git a/resources/js/components/cedar-ui/textarea/FormTextArea.vue b/resources/js/components/cedar-ui/textarea/FormTextArea.vueindex a4cb7bdc..09379a1f 100644--- a/resources/js/components/cedar-ui/textarea/FormTextArea.vue+++ b/resources/js/components/cedar-ui/textarea/FormTextArea.vue@@ -34,7 +34,7 @@ onMounted(() => {:disabled="field.disabled":required="field.required":placeholder="field.placeholder"- :class="cn('scrollbar-minimal scrollbar-thumb:bg-foreground-1 min-h-8', inputClass)"+ :class="cn('scrollbar-minimal scrollbar-thumb:bg-foreground-1 min-h-(--input-height)', inputClass)":style="{'max-height': `${maxHeight}px`,'text-overflow': 'unset',diff --git a/resources/js/components/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vueindex c06c2421..d4fa7042 100644--- a/resources/js/components/forms/EditFolder.vue+++ b/resources/js/components/forms/EditFolder.vue@@ -6,14 +6,16 @@ import type { SeriesUpdateRequest } from '@/types/requests';import { handleStorageURL, toCalendarFormattedDate } from '@/service/util';import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';import { computed, reactive, ref, watch } from 'vue';+import { useDateFieldModel } from '@/components/cedar-ui/date-picker/useDateFieldModel';import { FormNumberField } from '@/components/cedar-ui/number-field';import { useGetAllTags } from '@/service/queries';import { FormTextArea } from '@/components/cedar-ui/textarea';import { UseCreateTag } from '@/service/mutations';+import { DatePicker } from '@/components/cedar-ui/date-picker';+import { ButtonForm } from '@/components/cedar-ui/button';import { toast } from '@aminnausin/cedar-ui';import InputMultiChip from '@/components/pinesUI/InputMultiChip.vue';-import DatePicker from '@/components/pinesUI/DatePicker.vue';import mediaAPI from '@/service/mediaAPI.ts';import useForm from '@/composables/useForm';@@ -200,12 +202,12 @@ watch(tagsQuery, () => {</script><template>- <form class="flex flex-col flex-wrap gap-4 sm:flex-row sm:justify-between" @submit.prevent="handleSubmit">+ <form class="flex flex-col flex-wrap gap-4 text-sm sm:flex-row sm:justify-between" @submit.prevent="handleSubmit"><div v-for="(field, index) in fields" :key="index" class="w-full" :class="field.class"><FormLabel :for="field.name" :text="field.text" :subtext="field.subtext" /><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" />+ <DatePicker v-else-if="field.type === 'date'" v-model="useDateFieldModel(form, field.name).value" :field="field" /><FormNumberField v-else-if="field.type === 'number'" v-model="form.fields[field.name]" :field="field" /><InputMultiChipv-else-if="field.name === 'tags'"@@ -221,25 +223,9 @@ watch(tagsQuery, () => {<FormErrorList :errors="form.errors" :field-name="field.name" /></div>- <div class="relative flex w-full flex-col-reverse gap-2 pt-1 sm:flex-row sm:justify-end">- <button- @click="$emit('handleFinish')"- type="button"- class="inline-flex h-10 items-center justify-center rounded-md border px-4 py-2 text-sm font-medium transition-colors focus:outline-hidden dark:border-neutral-600"- :class="'hover:bg-neutral-100 focus:ring-1 focus:ring-neutral-100 focus:ring-offset-1 dark:hover:bg-neutral-900 dark:focus:ring-neutral-400'"- :disabled="form.processing"- >- Cancel- </button>- <button- @click="handleSubmit"- type="button"- class="inline-flex h-10 items-center justify-center rounded-md border border-transparent px-4 py-2 text-sm font-medium text-white transition-colors focus:outline-hidden"- :class="'bg-neutral-950 hover:bg-neutral-800 focus:ring-1 focus:ring-violet-900 focus:ring-offset-1 dark:hover:bg-neutral-900'"- :disabled="form.processing"- >- Submit Details- </button>+ <div class="relative flex h-9 w-full flex-col-reverse gap-2 pt-1 sm:flex-row sm:justify-end">+ <ButtonForm @click="$emit('handleFinish')" variant="reset" :disabled="form.processing" class="dark:hover:bg-neutral-900"> Cancel </ButtonForm>+ <ButtonForm @click="handleSubmit" variant="submit" :disabled="form.processing"> Submit Details </ButtonForm></div></form></template>diff --git a/resources/js/components/forms/EditLyrics.vue b/resources/js/components/forms/EditLyrics.vueindex 6378404c..14539107 100644--- a/resources/js/components/forms/EditLyrics.vue+++ b/resources/js/components/forms/EditLyrics.vue@@ -172,7 +172,7 @@ watch(<p v-show="changedMetadata.album">Overwriting Existing Album Name!</p></div>- <div class="*:hocus:ring-foreground-0 *:hocus:ring-offset-0 relative mt-4 flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">+ <div class="relative mt-4 flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end"><ButtonForm@click="() => {@@ -182,7 +182,7 @@ watch(":disabled="form.processing"variant="reset"- class="dark:bg-surface-1"+ class="dark:hover:bg-neutral-900">Cancel</ButtonForm>diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vueindex e2828a13..985a519a 100755--- a/resources/js/components/forms/EditVideo.vue+++ b/resources/js/components/forms/EditVideo.vue@@ -6,17 +6,19 @@ import type { MetadataUpdateRequest } from '@/types/requests';import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';import { computed, reactive, ref, watch } from 'vue';import { toCalendarFormattedDate } from '@/service/util';+import { useDateFieldModel } from '@/components/cedar-ui/date-picker/useDateFieldModel';import { FormNumberField } from '@/components/cedar-ui/number-field';import { useContentStore } from '@/stores/ContentStore';import { useGetAllTags } from '@/service/queries';import { FormTextArea } from '@/components/cedar-ui/textarea';import { UseCreateTag } from '@/service/mutations';import { storeToRefs } from 'pinia';+import { DatePicker } from '@/components/cedar-ui/date-picker';+import { ButtonForm } from '@/components/cedar-ui/button';import { MediaType } from '@/types/types';import { toast } from '@aminnausin/cedar-ui';import InputMultiChip from '@/components/pinesUI/InputMultiChip.vue';-import DatePicker from '@/components/pinesUI/DatePicker.vue';import mediaAPI from '@/service/mediaAPI.ts';import useForm from '@/composables/useForm';@@ -215,12 +217,12 @@ watch(tagsQuery, () => {</script><template>- <form class="flex flex-col flex-wrap gap-4 sm:flex-row sm:justify-between" @submit.prevent="handleSubmit">+ <form class="flex flex-col flex-wrap gap-4 text-sm sm:flex-row sm:justify-between" @submit.prevent="handleSubmit"><div v-for="(field, index) in fields.filter((field) => !field.disabled)" :key="index" class="w-full" :class="field.class"><FormLabel :for="field.name" :text="field.text" :subtext="field.subtext" class="capitalize" /><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" />+ <DatePicker v-else-if="field.type === 'date'" v-model="useDateFieldModel(form, field.name).value" :field="field" /><FormNumberField v-else-if="field.type === 'number'" v-model="form.fields[field.name]" :field="field" /><InputMultiChipv-else-if="field.name === 'video_tags'"@@ -237,24 +239,8 @@ watch(tagsQuery, () => {</div><div class="relative flex w-full flex-col-reverse gap-2 pt-1 sm:flex-row sm:justify-end">- <button- @click="$emit('handleFinish')"- type="button"- class="inline-flex h-10 items-center justify-center rounded-md border px-4 py-2 text-sm font-medium transition-colors focus:outline-hidden dark:border-neutral-600"- :class="'hover:bg-neutral-100 focus:ring-1 focus:ring-neutral-100 focus:ring-offset-1 dark:hover:bg-neutral-900 dark:focus:ring-neutral-400'"- :disabled="form.processing"- >- Cancel- </button>- <button- @click="handleSubmit"- type="button"- class="inline-flex h-10 items-center justify-center rounded-md border border-transparent px-4 py-2 text-sm font-medium text-white transition-colors focus:outline-hidden"- :class="'bg-neutral-950 hover:bg-neutral-800 focus:ring-1 focus:ring-violet-900 focus:ring-offset-1 dark:hover:bg-neutral-900'"- :disabled="form.processing"- >- Submit Details- </button>+ <ButtonForm @click="$emit('handleFinish')" variant="reset" :disabled="form.processing" class="dark:hover:bg-neutral-900"> Cancel </ButtonForm>+ <ButtonForm @click="handleSubmit" variant="submit" :disabled="form.processing"> Submit Details </ButtonForm></div></form></template>