Skip to content

A self-hosted media server and file management system

feat: majority of ui replaced

aminnausinadb18b8a4062
diff --git a/resources/js/components/inputs/ButtonForm.vue b/resources/js/components-archive/buttons/ButtonForm.vue
similarity index 100%
rename from resources/js/components/inputs/ButtonForm.vue
rename to resources/js/components-archive/buttons/ButtonForm.vue
diff --git a/resources/js/components/inputs/TextInput.vue b/resources/js/components-archive/inputs/TextInput.vue
similarity index 100%
rename from resources/js/components/inputs/TextInput.vue
rename to resources/js/components-archive/inputs/TextInput.vue
diff --git a/resources/js/components/labels/InputLabel.vue b/resources/js/components-archive/labels/InputLabel.vue
similarity index 100%
rename from resources/js/components/labels/InputLabel.vue
rename to resources/js/components-archive/labels/InputLabel.vue
diff --git a/resources/js/components/pinesUI/DatePicker.vue b/resources/js/components-archive/pinesUI/DatePicker.vue
similarity index 99%
rename from resources/js/components/pinesUI/DatePicker.vue
rename to resources/js/components-archive/pinesUI/DatePicker.vue
index 0eed7b03..cac7838b 100644
--- a/resources/js/components/pinesUI/DatePicker.vue
+++ b/resources/js/components-archive/pinesUI/DatePicker.vue
@@ -2,7 +2,7 @@
import { useTemplateRef } from 'vue';
import { OnClickOutside } from '@vueuse/components';
-import DatePickerValueButton from '@/components/pinesUI/DatePickerValueButton.vue';
+import DatePickerValueButton from '@/components-archive/pinesUI/DatePickerValueButton.vue';
import useDatePicker from '@/composables/useDatePicker';
const { field } = defineProps(['field']);
diff --git a/resources/js/components/pinesUI/DatePickerValueButton.vue b/resources/js/components-archive/pinesUI/DatePickerValueButton.vue
similarity index 100%
rename from resources/js/components/pinesUI/DatePickerValueButton.vue
rename to resources/js/components-archive/pinesUI/DatePickerValueButton.vue
diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components-archive/pinesUI/InputMultiChip.vue
similarity index 99%
rename from resources/js/components/pinesUI/InputMultiChip.vue
rename to resources/js/components-archive/pinesUI/InputMultiChip.vue
index 537cb2e9..608f5b4b 100644
--- a/resources/js/components/pinesUI/InputMultiChip.vue
+++ b/resources/js/components-archive/pinesUI/InputMultiChip.vue
@@ -7,7 +7,7 @@ import { toast } from '@aminnausin/cedar-ui';
import useMultiSelect from '@/composables/useMultiSelect';
import ButtonIcon from '@/components-archive/buttons/ButtonIcon.vue';
-import TextInput from '@/components/inputs/TextInput.vue';
+import TextInput from '@/components-archive/inputs/TextInput.vue';
import ChipTag from '@/components-archive/labels/ChipTag.vue';
import MdiLightPlus from '~icons/mdi-light/plus';
diff --git a/resources/js/components/pinesUI/InputSelect.vue b/resources/js/components-archive/pinesUI/InputSelect.vue
old mode 100755
new mode 100644
similarity index 100%
rename from resources/js/components/pinesUI/InputSelect.vue
rename to resources/js/components-archive/pinesUI/InputSelect.vue
diff --git a/resources/js/components-archive/table/TableBase.vue b/resources/js/components-archive/table/TableBase.vue
index 680d1480..c78cd004 100644
--- a/resources/js/components-archive/table/TableBase.vue
+++ b/resources/js/components-archive/table/TableBase.vue
@@ -7,7 +7,7 @@ import { cn } from '@aminnausin/cedar-ui';
import TableLoadingSpinner from '@/components-archive/table/TableLoadingSpinner.vue';
import TextInputLabelled from '@/components-archive/inputs/TextInputLabelled.vue';
import TablePagination from '@/components-archive/table/TablePagination.vue';
-import InputSelect from '@/components/pinesUI/InputSelect.vue';
+import InputSelect from '@/components-archive/pinesUI/InputSelect.vue';
import ButtonIcon from '@/components-archive/buttons/ButtonIcon.vue';
import useTable from '@/composables/useTable.ts';
diff --git a/resources/js/components/cards/data/LibraryCard.vue b/resources/js/components/cards/data/LibraryCard.vue
index f2f6b80d..3cd049c1 100644
--- a/resources/js/components/cards/data/LibraryCard.vue
+++ b/resources/js/components/cards/data/LibraryCard.vue
@@ -114,7 +114,7 @@ watch(
</RouterLink>
<section class="flex h-full flex-1 flex-col gap-2 p-3">
<div class="flex flex-wrap items-start justify-between">
- <h3 class="capitalize group-hover:text-purple-600">
+ <h3 class="group-hover:text-primary capitalize">
{{ data?.name }}
</h3>
<span class="flex gap-2 text-sm *:h-6">
diff --git a/resources/js/components/cards/data/LibraryFolderCard.vue b/resources/js/components/cards/data/LibraryFolderCard.vue
index 72eee610..ce7b3dfd 100644
--- a/resources/js/components/cards/data/LibraryFolderCard.vue
+++ b/resources/js/components/cards/data/LibraryFolderCard.vue
@@ -24,11 +24,11 @@ const popover = useTemplateRef('popover');
alt="Folder Cover Art"
loading="lazy"
/>
- <span class="absolute top-0 left-0 h-full w-full rounded-t-md ring-purple-600/90 ring-inset hover:ring-2"></span>
+ <span class="ring-primary/90 absolute top-0 left-0 h-full w-full rounded-t-md ring-inset hover:ring-2"></span>
</RouterLink>
<section class="flex h-full flex-1 flex-col gap-2 p-3">
<div class="xs:flex-nowrap flex flex-wrap items-start justify-between gap-1">
- <h3 class="capitalize group-hover:text-purple-600">
+ <h3 class="group-hover:text-primary capitalize">
{{ data?.title ?? data?.name }}
</h3>
<span class="flex gap-2 text-sm *:h-6">
diff --git a/resources/js/components/cards/data/VideoCard.vue b/resources/js/components/cards/data/VideoCard.vue
index 4c5c9550..73b35354 100644
--- a/resources/js/components/cards/data/VideoCard.vue
+++ b/resources/js/components/cards/data/VideoCard.vue
@@ -131,7 +131,7 @@ const contextMenuItems = computed(() => {
</h4>
</span>
- <span v-if="videoData.video_tags.length" class="hidden max-h-[22px] flex-1 flex-wrap gap-1 overflow-clip px-2 [overflow-clip-margin:4px] sm:flex" title="Tags">
+ <span v-if="videoData.video_tags.length" class="hidden flex-1 flex-wrap gap-1 overflow-clip px-2 [overflow-clip-margin:4px] sm:flex" title="Tags">
<MediaTag v-for="(tag, index) in videoData.video_tags" :key="index" :label="tag.name" />
</span>
</span>
diff --git a/resources/js/components/cards/pulse/PulseExceptions.vue b/resources/js/components/cards/pulse/PulseExceptions.vue
index bf26e135..01f32775 100644
--- a/resources/js/components/cards/pulse/PulseExceptions.vue
+++ b/resources/js/components/cards/pulse/PulseExceptions.vue
@@ -3,6 +3,7 @@ import type { PulseResponse } from '@/types/pulseTypes';
import { format_number, periodForHumans } from '@/service/pulseUtil';
import { computed, ref } from 'vue';
+import { InputSelect } from '@/components/cedar-ui/select';
import { sortObject } from '@/service/sort/baseSort';
import { toTimeSpan } from '@/service/util';
@@ -10,7 +11,6 @@ import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';
import PulseNoResults from '@/components/pulse/PulseNoResults.vue';
import DashboardCard from '@/components/cards/layout/DashboardCard.vue';
import PulseScroll from '@/components/pulse/PulseScroll.vue';
-import InputSelect from '@/components/pinesUI/InputSelect.vue';
import IconBugAnt from '@/components/icons/IconBugAnt.vue';
import PulseTable from '@/components/pulse/PulseTable.vue';
import PulseThead from '@/components/pulse/PulseThead.vue';
@@ -76,7 +76,7 @@ const exceptions = computed(() => {
<InputSelect
:placeholder="'None'"
:options="exceptionOptions"
- class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"
+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize ring-inset"
title="Select usage type"
@selectItem="handleSetSort"
:defaultItem="0"
diff --git a/resources/js/components/cards/pulse/PulseQueues.vue b/resources/js/components/cards/pulse/PulseQueues.vue
index f4cf96b5..22ea17af 100644
--- a/resources/js/components/cards/pulse/PulseQueues.vue
+++ b/resources/js/components/cards/pulse/PulseQueues.vue
@@ -82,7 +82,7 @@ function scale(data: { [key: string]: any }) {
</h3>
<div class="relative mt-3">
<div
- class="absolute -top-2 -left-px flex h-4 max-w-fit items-center rounded-sm bg-purple-500 px-1 text-xs leading-none font-bold text-white after:absolute after:top-[calc(50%-var(--triangle-size))] after:right-[calc(-1*var(--triangle-size))] after:border-t-(length:--triangle-size) after:border-b-(length:--triangle-size) after:border-l-(length:--triangle-size) after:border-transparent after:border-l-purple-500 after:[--triangle-size:4px]"
+ class="bg-primary-muted after:border-l-primary-muted absolute -top-2 -left-px flex h-4 max-w-fit items-center rounded-sm px-1 text-xs leading-none font-bold text-white after:absolute after:top-[calc(50%-var(--triangle-size))] after:right-[calc(-1*var(--triangle-size))] after:border-t-(length:--triangle-size) after:border-b-(length:--triangle-size) after:border-l-(length:--triangle-size) after:border-transparent after:[--triangle-size:4px]"
>
<span
v-if="pulseData?.queues?.config.sample_rate && pulseData.queues.config.sample_rate < 1"
diff --git a/resources/js/components/cards/pulse/PulseRequests.vue b/resources/js/components/cards/pulse/PulseRequests.vue
index bf8762bd..de62c444 100644
--- a/resources/js/components/cards/pulse/PulseRequests.vue
+++ b/resources/js/components/cards/pulse/PulseRequests.vue
@@ -79,7 +79,7 @@ function scale(data: { [key: string]: any }) {
<div v-for="request in Object.keys(requests)" :key="request">
<div class="relative mt-3">
<div
- class="absolute -top-2 -left-px flex h-4 max-w-fit items-center rounded-sm bg-purple-500 px-1 text-xs leading-none font-bold text-white after:absolute after:top-[calc(50%-var(--triangle-size))] after:right-[calc(-1*var(--triangle-size))] after:border-t-(length:--triangle-size) after:border-b-(length:--triangle-size) after:border-l-(length:--triangle-size) after:border-transparent after:border-l-purple-500 after:[--triangle-size:4px]"
+ class="bg-primary-muted after:border-l-primary-muted absolute -top-2 -left-px flex h-4 max-w-fit items-center rounded-sm px-1 text-xs leading-none font-bold text-white after:absolute after:top-[calc(50%-var(--triangle-size))] after:right-[calc(-1*var(--triangle-size))] after:border-t-(length:--triangle-size) after:border-b-(length:--triangle-size) after:border-l-(length:--triangle-size) after:border-transparent after:[--triangle-size:4px]"
>
<span
v-if="config.sample_rate && pulseData.requests.config.sample_rate < 1"
diff --git a/resources/js/components/cards/pulse/PulseSlowJobs.vue b/resources/js/components/cards/pulse/PulseSlowJobs.vue
index 83391ac2..74c733de 100644
--- a/resources/js/components/cards/pulse/PulseSlowJobs.vue
+++ b/resources/js/components/cards/pulse/PulseSlowJobs.vue
@@ -3,6 +3,7 @@ import type { PulseResponse } from '@/types/pulseTypes';
import { format_number, periodForHumans } from '@/service/pulseUtil';
import { computed, ref } from 'vue';
+import { InputSelect } from '@/components/cedar-ui/select';
import { sortObject } from '@/service/sort/baseSort';
import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';
@@ -10,7 +11,6 @@ import IconCommandLine from '@/components/icons/IconCommandLine.vue';
import PulseNoResults from '@/components/pulse/PulseNoResults.vue';
import DashboardCard from '@/components/cards/layout/DashboardCard.vue';
import PulseScroll from '@/components/pulse/PulseScroll.vue';
-import InputSelect from '@/components/pinesUI/InputSelect.vue';
import PulseTable from '@/components/pulse/PulseTable.vue';
import PulseThead from '@/components/pulse/PulseThead.vue';
import PulseTd from '@/components/pulse/PulseTd.vue';
@@ -74,7 +74,7 @@ const config = computed(() => {
<InputSelect
:placeholder="'None'"
:options="exceptionOptions"
- class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"
+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize ring-inset"
title="Select usage type"
@selectItem="handleSetSort"
:defaultItem="0"
diff --git a/resources/js/components/cards/pulse/PulseSlowOutgoingRequests.vue b/resources/js/components/cards/pulse/PulseSlowOutgoingRequests.vue
index e22f4d8b..d3d90bcb 100644
--- a/resources/js/components/cards/pulse/PulseSlowOutgoingRequests.vue
+++ b/resources/js/components/cards/pulse/PulseSlowOutgoingRequests.vue
@@ -3,6 +3,7 @@ import type { PulseResponse } from '@/types/pulseTypes';
import { format_number, periodForHumans } from '@/service/pulseUtil';
import { computed, ref } from 'vue';
+import { InputSelect } from '@/components/cedar-ui/select';
import { sortObject } from '@/service/sort/baseSort';
import IconInformationCircle from '@/components/icons/IconInformationCircle.vue';
@@ -12,7 +13,6 @@ import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';
import PulseNoResults from '@/components/pulse/PulseNoResults.vue';
import DashboardCard from '@/components/cards/layout/DashboardCard.vue';
import PulseScroll from '@/components/pulse/PulseScroll.vue';
-import InputSelect from '@/components/pinesUI/InputSelect.vue';
import PulseTable from '@/components/pulse/PulseTable.vue';
import PulseThead from '@/components/pulse/PulseThead.vue';
import PulseTd from '@/components/pulse/PulseTd.vue';
@@ -89,7 +89,7 @@ function getDomainFromUrl(input: string): string | null {
<InputSelect
:placeholder="'None'"
:options="exceptionOptions"
- class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"
+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize ring-inset"
title="Select usage type"
@selectItem="handleSetSort"
:defaultItem="0"
diff --git a/resources/js/components/cards/pulse/PulseSlowQueries.vue b/resources/js/components/cards/pulse/PulseSlowQueries.vue
index 0de0be42..54e43d09 100644
--- a/resources/js/components/cards/pulse/PulseSlowQueries.vue
+++ b/resources/js/components/cards/pulse/PulseSlowQueries.vue
@@ -3,6 +3,7 @@ import type { PulseResponse } from '@/types/pulseTypes';
import { format_number, periodForHumans } from '@/service/pulseUtil';
import { computed, ref } from 'vue';
+import { InputSelect } from '@/components/cedar-ui/select';
import { sortObject } from '@/service/sort/baseSort';
import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';
@@ -10,7 +11,6 @@ import IconCircleStack from '@/components/icons/IconCircleStack.vue';
import PulseNoResults from '@/components/pulse/PulseNoResults.vue';
import DashboardCard from '@/components/cards/layout/DashboardCard.vue';
import PulseScroll from '@/components/pulse/PulseScroll.vue';
-import InputSelect from '@/components/pinesUI/InputSelect.vue';
import PulseTable from '@/components/pulse/PulseTable.vue';
import PulseThead from '@/components/pulse/PulseThead.vue';
import PulseTd from '@/components/pulse/PulseTd.vue';
@@ -75,7 +75,7 @@ const config = computed(() => {
<InputSelect
:placeholder="'None'"
:options="exceptionOptions"
- class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"
+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize ring-inset"
title="Select usage type"
@selectItem="handleSetSort"
:defaultItem="0"
diff --git a/resources/js/components/cards/pulse/PulseSlowRequests.vue b/resources/js/components/cards/pulse/PulseSlowRequests.vue
index a467efce..5b9abfec 100644
--- a/resources/js/components/cards/pulse/PulseSlowRequests.vue
+++ b/resources/js/components/cards/pulse/PulseSlowRequests.vue
@@ -3,6 +3,7 @@ import type { PulseResponse } from '@/types/pulseTypes';
import { format_number, periodForHumans } from '@/service/pulseUtil';
import { computed, ref } from 'vue';
+import { InputSelect } from '@/components/cedar-ui/select';
import { sortObject } from '@/service/sort/baseSort';
import PulseHttpMethodBadge from '@/components/pulse/PulseHttpMethod-Badge.vue';
@@ -11,7 +12,6 @@ import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';
import PulseNoResults from '@/components/pulse/PulseNoResults.vue';
import DashboardCard from '@/components/cards/layout/DashboardCard.vue';
import PulseScroll from '@/components/pulse/PulseScroll.vue';
-import InputSelect from '@/components/pinesUI/InputSelect.vue';
import PulseTable from '@/components/pulse/PulseTable.vue';
import PulseThead from '@/components/pulse/PulseThead.vue';
import PulseTd from '@/components/pulse/PulseTd.vue';
@@ -76,7 +76,7 @@ const config = computed(() => {
<InputSelect
:placeholder="'None'"
:options="exceptionOptions"
- class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"
+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize ring-inset"
title="Select usage type"
@selectItem="handleSetSort"
:defaultItem="0"
diff --git a/resources/js/components/cards/pulse/PulseUsage.vue b/resources/js/components/cards/pulse/PulseUsage.vue
index 9e43f81b..02da5394 100644
--- a/resources/js/components/cards/pulse/PulseUsage.vue
+++ b/resources/js/components/cards/pulse/PulseUsage.vue
@@ -3,6 +3,7 @@ import type { PulseResponse } from '@/types/pulseTypes';
import { format_number, periodForHumans } from '@/service/pulseUtil';
import { computed, ref } from 'vue';
+import { InputSelect } from '@/components/cedar-ui/select';
import IconCursorArrowRays from '@/components/icons/IconCursorArrowRays.vue';
import IconArrowTrendingUp from '@/components/icons/IconArrowTrendingUp.vue';
@@ -10,7 +11,6 @@ import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';
import PulseNoResults from '@/components/pulse/PulseNoResults.vue';
import PulseUserCard from '@/components/pulse/PulseUserCard.vue';
import DashboardCard from '@/components/cards/layout/DashboardCard.vue';
-import InputSelect from '@/components/pinesUI/InputSelect.vue';
import PulseScroll from '@/components/pulse/PulseScroll.vue';
import IconClock from '@/components/icons/IconClock.vue';
import IconScale from '@/components/icons/IconScale.vue';
@@ -90,7 +90,7 @@ const sampleRate = () => {
<InputSelect
:placeholder="'None'"
:options="requestOptions"
- class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"
+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize ring-inset"
title="Select usage type"
@selectItem="handleSetType"
:defaultItem="0"
diff --git a/resources/js/components/cedar-ui/badge/BadgeTag.vue b/resources/js/components/cedar-ui/badge/BadgeTag.vue
index 0498a8d9..2d8b0310 100644
--- a/resources/js/components/cedar-ui/badge/BadgeTag.vue
+++ b/resources/js/components/cedar-ui/badge/BadgeTag.vue
@@ -33,12 +33,12 @@ const wrapperProps = computed(() => (props.URL ? { to: props.URL } : {}));
<slot> {{ label }}</slot>
<ButtonCorner
v-if="removeable"
- :positionClasses="'w-4 h-4'"
+ :positionClasses="'size-4'"
:colourClasses="''"
:class="
cn(
'hover:bg-danger-2 text-white hover:text-white',
- 'dark:text-danger-2 dark:hover:text-foreground dark:hover:bg-danger-2 bg-neutral-900/20 drop-shadow-sm',
+ 'dark:text-danger-2 dark:hover:text-foreground-0 dark:hover:bg-danger-2 bg-neutral-900/20 drop-shadow-sm',
btnClass,
)
"
diff --git a/resources/js/components/cedar-ui/button/ButtonForm.vue b/resources/js/components/cedar-ui/button/ButtonForm.vue
index 287ec2e4..76b26096 100644
--- a/resources/js/components/cedar-ui/button/ButtonForm.vue
+++ b/resources/js/components/cedar-ui/button/ButtonForm.vue
@@ -9,7 +9,7 @@ const props = withDefaults(
defineProps<{
disabled?: boolean;
type?: ButtonType;
- variant?: FormButtonVariant;
+ variant?: FormButtonVariant | 'danger';
label?: string;
class?: string;
}>(),
@@ -23,15 +23,17 @@ const variantClass = computed(() => {
case 'submit':
return ['text-foreground-i font-medium border-transparent', 'focus:ring-primary bg-surface-i hocus:bg-surface-i/90 dark:hover:bg-foreground-4'];
case 'reset':
- return ['font-medium', 'hocus:ring-foreground-4-hover', 'hocus:bg-surface-3'];
+ return ['font-medium', 'hocus:ring-foreground-4-hover', 'hocus:bg-surface-3 bg-surface-1'];
case 'auth': // This one is styled from Laravel
return [
'bg-gray-800 dark:bg-gray-200 hover:dark:bg-gray-300',
'border-transparent font-semibold text-xs uppercase tracking-widest',
'text-foreground-i hover:bg-gray-700 dark:hover:foreground-0',
'focus:bg-gray-700 dark:focus:bg-foreground-0 active:bg-gray-900 dark:active:bg-gray-300',
- 'focus:ring-2 focus:ring-purple-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800',
+ 'focus:ring-2 focus:ring-primary-muted focus:ring-offset-2 dark:focus:ring-offset-gray-800',
];
+ case 'danger':
+ return ['text-foreground-i font-medium border-transparent', 'dark:text-foreground-0 bg-danger hocus:bg-danger-2 hocus:dark:bg-danger-1 focus:ring-foreground-0'];
default:
return ['focus:ring-r-button dark:focus:ring-r-disabled hocus:bg-surface-3'];
}
@@ -40,7 +42,7 @@ const variantClass = computed(() => {
<template>
<ButtonBase
:type="type"
- :class="cn('px-4', 'border-r-button ring-offset-surface-0 border', 'inline-flex', 'focus:ring-1 focus:ring-offset-1', ...variantClass, props.class)"
+ :class="cn('h-full px-4', 'border-r-button ring-offset-surface-0 border', 'inline-flex', 'focus:ring-1 focus:ring-offset-1', ...variantClass, props.class)"
:disabled="disabled"
:aria-label="label"
>
diff --git a/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vue b/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vue
index 5363904a..65dd6475 100644
--- a/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vue
+++ b/resources/js/components/cedar-ui/date-picker/ButtonDatePicker.vue
@@ -17,7 +17,7 @@ withDefaults(
<template>
<ButtonBase
:class="[
- 'hocus:bg-overlay-accent text-foreground-1 dark:text-foreground-4 dark:hocus:text-foreground-5 text-center',
+ 'hocus:bg-overlay-accent text-foreground-1 dark:text-foreground-4 dark:hocus:text-foreground-5 text-center transition-none',
{
'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,
diff --git a/resources/js/components/cedar-ui/date-picker/DatePicker.vue b/resources/js/components/cedar-ui/date-picker/DatePicker.vue
index 86ac4179..d37413f4 100644
--- a/resources/js/components/cedar-ui/date-picker/DatePicker.vue
+++ b/resources/js/components/cedar-ui/date-picker/DatePicker.vue
@@ -96,7 +96,7 @@ watch(datePickerPanel, () => {
@click="
toggleDatePicker();
if (datePickerOpen && datePickerInput) {
- datePickerInput.focus();
+ datePickerInput?.focus();
}
"
variant="ghost"
@@ -108,19 +108,13 @@ watch(datePickerPanel, () => {
>
<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"
- >
+ <Transition enter-from-class="opacity-0" enter-to-class="opacity-100" leave-from-class="opacity-100" leave-active-class="duration-100" leave-to-class="opacity-0">
<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',
+ 'rounded-md shadow-xs transition ease-in-out',
'text-foreground bg-overlay border-overlay-border border',
`${datePickerPosition === 'top' ? 'bottom-0 mb-12' : 'top-0 mt-12'}`,
]"
diff --git a/resources/js/components/cedar-ui/multi-select/InputMultiChip.vue b/resources/js/components/cedar-ui/multi-select/InputMultiChip.vue
new file mode 100644
index 00000000..c63a9940
--- /dev/null
+++ b/resources/js/components/cedar-ui/multi-select/InputMultiChip.vue
@@ -0,0 +1,304 @@
+<script setup lang="ts">
+import type { MultiSelectItem, MultiSelectProps } from '@aminnausin/cedar-ui';
+
+import { computed, onMounted, ref, useTemplateRef, watch } from 'vue';
+import { isInputLikeElement, toast, useMultiSelect } from '@aminnausin/cedar-ui';
+import { CedarChevronUpDown, MdiLightPlus } from '@/components/cedar-ui/icons';
+import { OnClickOutside } from '@vueuse/components';
+import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component.mjs';
+import { ButtonIcon } from '@/components/cedar-ui/button';
+import { TextInput } from '@/components/cedar-ui/input';
+import { BadgeTag } from '@/components/cedar-ui/badge';
+
+const props = withDefaults(defineProps<MultiSelectProps>(), {
+ placeholder: 'Select Item',
+ defaultItems: () => [],
+ options: () => [],
+ max: 32,
+});
+
+const emit = defineEmits(['createAction', 'selectItems', 'removeAction']);
+const selectButton = useTemplateRef('selectButton');
+const selectInput = useTemplateRef('selectInput');
+const selectableItemsList = useTemplateRef('selectableItemsList');
+const select = useMultiSelect(props, { selectableItemsList, selectButton });
+const newValue = ref('');
+const lastActiveItemId = ref(-1);
+
+const filteredItemsList = computed(() => {
+ return (
+ select.selectableItems.filter((selectable: MultiSelectItem) => {
+ return !select.selectedItems?.find((selected: MultiSelectItem) => selectable.name === selected.name) && selectable.name?.includes(newValue.value.toLocaleLowerCase());
+ }) ?? []
+ );
+});
+
+const handleItemClick = (item: any, setFocus = true, triggerSelect = true) => {
+ if (!item?.name) return;
+
+ select.selectedItems = [...select.selectedItems, item];
+ select.toggleSelect(false);
+
+ if (setFocus && selectButton.value) selectButton.value.focus();
+ if (triggerSelect) emit('selectItems', select.selectedItems);
+};
+
+const handleItemHover = (item: any) => {
+ select.selectableItemActive = item;
+ lastActiveItemId.value = item.id;
+
+ if (isInputLikeElement(document.activeElement as HTMLElement, '')) return;
+
+ (document.activeElement as HTMLElement)?.blur();
+};
+
+const handleItemFocus = (item: any) => {
+ select.selectableItemActive = item;
+ lastActiveItemId.value = item.id;
+ // select.selectScrollToActiveItem(item.id); => ISSUE: this blocks clicks and scrolls an item into view instead of registering a click. Only the centred items allow clicks.
+};
+
+const handleListFocus = () => {
+ if (lastActiveItemId.value <= 0) return;
+
+ const el = document.getElementById(lastActiveItemId.value + '-' + select.selectId);
+ el?.focus();
+};
+
+const handleRemoveChip = (name: string) => {
+ const item = select.selectedItems.find((item: MultiSelectItem) => item.name === name);
+ select.selectedItems = select.selectedItems.filter((item: MultiSelectItem) => item.name !== name);
+
+ emit('removeAction', item);
+};
+
+const handleCreate = (e: Event) => {
+ e.preventDefault();
+ e.stopPropagation();
+
+ const parsedValue = newValue.value?.toLocaleLowerCase().trim();
+ if (!parsedValue) return;
+
+ if (select.selectableItemActive && (select.selectableItemActive as unknown as MultiSelectItem).name === parsedValue) {
+ handleItemClick(select.selectableItemActive);
+ return;
+ }
+
+ if (select.selectedItems.some((item: MultiSelectItem) => item.name === parsedValue)) {
+ toast.info('This tag was already added');
+ return;
+ }
+
+ const selectableFound = select.selectableItems.find((item: MultiSelectItem) => item.name === parsedValue);
+ if (selectableFound) {
+ handleItemClick(selectableFound);
+ return;
+ }
+
+ emit('createAction', parsedValue);
+
+ newValue.value = '';
+ select.toggleSelect(false);
+};
+
+const selectableItemActiveNext = async () => {
+ if (!select.selectableItemActive) return;
+ const index = filteredItemsList.value.indexOf(select.selectableItemActive);
+ if (index + 1 < filteredItemsList.value.length) {
+ select.selectableItemActive = filteredItemsList.value[index + 1];
+ select.selectScrollToActiveItem(filteredItemsList.value[index + 1].id);
+ }
+};
+const selectableItemActivePrevious = async () => {
+ if (!select.selectableItemActive) return;
+ const index = filteredItemsList.value.indexOf(select.selectableItemActive);
+ if (index - 1 >= 0) {
+ select.selectableItemActive = filteredItemsList.value[index - 1];
+ select.selectScrollToActiveItem(filteredItemsList.value[index - 1].id);
+ }
+};
+
+onMounted(() => {
+ if (props.defaultItems != undefined && props.defaultItems.length < props.options.length) {
+ // Default items is a list of selected tags
+ // I assume this should handle click for all of the provided default items
+ // idk where i got this code because this isn't PinesUI
+ // idek if this should happen because it kind of worked without
+
+ // haha this is inefficient
+ select.selectedItems = [];
+ props.options.forEach((element) => {
+ if (props.defaultItems.find((item) => item.name === element.name)) {
+ handleItemClick(element, false);
+ }
+ });
+ }
+});
+
+watch([() => selectButton.value, () => selectableItemsList.value], () => {
+ select.updateRefs({ selectButton, selectableItemsList });
+});
+
+watch(
+ () => props.defaultItems,
+ (newVal) => {
+ select.selectedItems = newVal;
+ },
+ { immediate: true },
+);
+watch(
+ () => props.options,
+ (newVal) => {
+ select.selectableItems = newVal;
+ },
+ { immediate: true },
+);
+</script>
+<template>
+ <div class="group relative mt-1">
+ <button
+ @click="select.toggleSelect(true)"
+ :id="fieldName"
+ :title="title ?? 'Make Selection'"
+ :disabled="disabled"
+ :class="[
+ 'transition duration-200 ease-in-out focus:outline-hidden', // Animation
+ 'disabled:button-disabled disabled:button-disabled-pointer', // Disabled
+ 'relative flex items-center justify-between gap-2', // Layout
+ 'cursor-pointer rounded-md shadow-xs', // Style
+ 'h-10 max-h-full w-full py-2 pr-10 pl-3', // Size
+ 'bg-surface-2 dark:bg-neutral-700',
+ 'ring-r-button hocus:ring-2 ring-1',
+ { 'hocus:ring-0': select.selectOpen },
+ 'hover:ring-primary-muted focus:ring-primary focus-within:ring-primary-muted',
+ props.class,
+ ]"
+ ref="selectButton"
+ type="button"
+ >
+ <span class="truncate">{{ placeholder }}</span>
+ <span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
+ <slot name="selectButtonIcon">
+ <CedarChevronUpDown :class="['text-foreground-2 size-5']" />
+ </slot>
+ </span>
+ </button>
+ <Transition enter-from-class="opacity-0" enter-to-class="opacity-100" leave-from-class="opacity-100" leave-to-class="opacity-0">
+ <UseFocusTrap
+ v-if="select.selectOpen"
+ :class="{
+ 'bottom-0 mb-11': select.selectDropdownPosition == 'top',
+ 'top-0 mt-11': select.selectDropdownPosition == 'bottom',
+ }"
+ class="bg-overlay-t ring-r-button absolute z-30 mt-1 max-h-56 w-full overflow-clip rounded-md shadow-md ring-1 backdrop-blur-lg transition duration-200 ease-in-out"
+ :options="{
+ allowOutsideClick: true,
+ initialFocus: () => selectInput?.el,
+ returnFocusOnDeactivate: true,
+ }"
+ >
+ <OnClickOutside
+ @trigger="select.toggleSelect(false)"
+ @keydown.esc.stop="
+ (event: Event) => {
+ if (select.selectOpen) {
+ select.toggleSelect(false);
+ event.stopPropagation();
+ }
+ }
+ "
+ @keydown.down.stop.prevent="
+ (event: Event) => {
+ if (select.selectOpen) {
+ selectableItemActiveNext();
+ } else {
+ select.toggleSelect(true);
+ }
+ event.preventDefault();
+ }
+ "
+ @keydown.up.stop.prevent="
+ (event: Event) => {
+ if (select.selectOpen) {
+ selectableItemActivePrevious();
+ } else {
+ select.toggleSelect(true);
+ }
+ event.preventDefault();
+ }
+ "
+ @keydown="select.selectKeydown($event)"
+ v-cloak
+ >
+ <section class="flex w-full gap-2 p-2" @focusin="lastActiveItemId = -1">
+ <TextInput
+ v-model="newValue"
+ @focus="selectButton?.scrollIntoView({ behavior: 'smooth', block: 'center' })"
+ @change="selectInput?.$el.scrollIntoView({ behavior: 'smooth', block: 'center' })"
+ @keydown.enter.stop="handleCreate"
+ @keydown.space.stop=""
+ ref="selectInput"
+ role="combobox"
+ class="h-9 scroll-m-4 ring-inset"
+ aria-autocomplete="list"
+ aria-controls="selectableItemsList"
+ :placeholder="'Search for a tag'"
+ :aria-expanded="select.selectOpen ? 'true' : 'false'"
+ :aria-activedescendant="lastActiveItemId ? `${lastActiveItemId}-${select.selectId}` : null"
+ :maxlength="props.max"
+ />
+ <ButtonIcon :type="'button'" :disabled="!newValue" @click="handleCreate" class="inline-flex size-9 p-0 ring-inset" title="Add a new tag">
+ <template #icon>
+ <MdiLightPlus class="ms-0.5 size-6" />
+ </template>
+ </ButtonIcon>
+ </section>
+ <section v-show="filteredItemsList.length == 0" class="text-foreground-6 p-2 pl-8 select-none" @focusin="lastActiveItemId = -1">
+ <p class="block truncate">No Results... Add New?</p>
+ </section>
+ <ul
+ class="scrollbar-minimal max-h-48 overflow-auto last:rounded-b-md"
+ aria-describedby="selectable-items-list"
+ ref="selectableItemsList"
+ role="listbox"
+ @focusin="handleListFocus"
+ >
+ <template v-for="item in filteredItemsList" :key="item.value">
+ <li
+ @keydown.enter.prevent.stop="handleItemClick(select.selectableItemActive)"
+ @keydown.space.prevent.stop="handleItemClick(select.selectableItemActive)"
+ @click.prevent.stop="handleItemClick(item)"
+ @mousemove="handleItemHover(item)"
+ @focus="handleItemFocus(item)"
+ :id="item.id + '-' + select.selectId"
+ :data-disabled="item.disabled ? item.disabled : ''"
+ :class="[
+ {
+ 'bg-overlay-accent dark:bg-overlay-accent/70': select.selectableItemActive === item,
+ 'text-foreground-6': !select.selectableItemActive === item,
+ },
+ 'data-[disabled=true]:button-disabled data-[disabled=true]:button-disabled-pointer relative flex h-full cursor-pointer items-center py-2 pl-8 focus:rounded-md',
+ ]"
+ :tabindex="'0'"
+ role="option"
+ :aria-selected="select.selectableItemActive === item ? 'true' : 'false'"
+ >
+ <span class="block truncate">{{ item.name }}</span>
+ </li>
+ </template>
+ </ul>
+ </OnClickOutside>
+ </UseFocusTrap>
+ </Transition>
+ </div>
+ <span v-if="select.selectedItems?.length > 0" class="flex h-fit flex-wrap gap-1 pt-2 pb-1">
+ <BadgeTag
+ v-for="(chip, index) in select.selectedItems"
+ :key="index"
+ :label="chip.name"
+ :removeable="true"
+ @clickAction="handleRemoveChip(chip.name)"
+ :btn-class="'bg-inherit shadow-none'"
+ />
+ </span>
+</template>
diff --git a/resources/js/components/cedar-ui/multi-select/index.ts b/resources/js/components/cedar-ui/multi-select/index.ts
new file mode 100644
index 00000000..29160567
--- /dev/null
+++ b/resources/js/components/cedar-ui/multi-select/index.ts
@@ -0,0 +1 @@
+export { default as InputMultiChip } from './InputMultiChip.vue';
diff --git a/resources/js/components/dashboard/DashboardLibraries.vue b/resources/js/components/dashboard/DashboardLibraries.vue
index d2b81ce7..acf0a577 100644
--- a/resources/js/components/dashboard/DashboardLibraries.vue
+++ b/resources/js/components/dashboard/DashboardLibraries.vue
@@ -264,7 +264,7 @@ watchEffect(() => {
<ModalBase :modalData="editFolderModal" :useControls="false">
<template #description v-if="cachedFolder && cachedFolder.series?.editor_id && cachedFolder.series.date_updated">
Last edited by
- <a title="Editor profile" target="_blank" :href="`/profile/${cachedFolder.series.editor_id}`" class="hover:text-purple-600 dark:hover:text-purple-500"
+ <a title="Editor profile" target="_blank" :href="`/profile/${cachedFolder.series.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted"
>@{{ cachedFolder.series.editor_id }}</a
>
at
diff --git a/resources/js/components/forms/ChangeEmail.vue b/resources/js/components/forms/ChangeEmail.vue
index 33d6adde..ed702e3d 100644
--- a/resources/js/components/forms/ChangeEmail.vue
+++ b/resources/js/components/forms/ChangeEmail.vue
@@ -4,12 +4,12 @@ import type { FormField } from '@/types/types';
import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { changeEmail } from '@/service/authAPI';
+import { ButtonForm } from '@/components/cedar-ui/button';
import { reactive } from 'vue';
import { toast } from '@aminnausin/cedar-ui';
import SettingsHeader from '@/components/settings/SettingsHeader.vue';
import SettingsCard from '@/components/cards/layout/SettingsCard.vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
import useForm from '@/composables/useForm';
const fields = reactive<FormField[]>([
@@ -78,7 +78,7 @@ const handleSubmit = async () => {
<FormErrorList :errors="form.errors" :field-name="field.name" />
</div>
- <div class="relative flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
+ <div class="relative flex h-8 w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
<ButtonForm @click="form.reset(...Object.keys(form.fields))" type="button" variant="reset" :disabled="form.processing"> Cancel </ButtonForm>
<ButtonForm @click="handleSubmit" type="button" variant="submit" :disabled="form.processing"> Save Email </ButtonForm>
</div>
diff --git a/resources/js/components/forms/ChangePassword.vue b/resources/js/components/forms/ChangePassword.vue
index d33ad737..1031358e 100644
--- a/resources/js/components/forms/ChangePassword.vue
+++ b/resources/js/components/forms/ChangePassword.vue
@@ -4,12 +4,12 @@ import type { FormField } from '@/types/types';
import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { changePassword } from '@/service/authAPI';
+import { ButtonForm } from '@/components/cedar-ui/button';
import { reactive } from 'vue';
import { toast } from '@aminnausin/cedar-ui';
import SettingsHeader from '@/components/settings/SettingsHeader.vue';
import SettingsCard from '@/components/cards/layout/SettingsCard.vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
import useForm from '@/composables/useForm';
const fields = reactive<FormField[]>([
@@ -90,9 +90,9 @@ const handleSubmit = async () => {
<FormErrorList :errors="form.errors" :field-name="field.name" />
</div>
- <div class="relative flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
+ <div class="relative flex h-8 w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
<ButtonForm @click="form.reset(...Object.keys(form.fields))" type="button" variant="reset" :disabled="form.processing"> Cancel </ButtonForm>
- <ButtonForm @click="handleSubmit" type="button" variant="submit" :disabled="form.processing"> Save Password </ButtonForm>
+ <ButtonForm @click="handleSubmit" type="button" variant="submit" :disabled="form.processing"> Save Email </ButtonForm>
</div>
</form>
</template>
diff --git a/resources/js/components/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vue
index 7c10ffd7..8c8d9d0a 100644
--- a/resources/js/components/forms/EditFolder.vue
+++ b/resources/js/components/forms/EditFolder.vue
@@ -8,6 +8,7 @@ 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 { InputMultiChip } from '@/components/cedar-ui/multi-select';
import { useGetAllTags } from '@/service/queries';
import { FormTextArea } from '@/components/cedar-ui/textarea';
import { UseCreateTag } from '@/service/mutations';
@@ -15,7 +16,6 @@ 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 mediaAPI from '@/service/mediaAPI.ts';
import useForm from '@/composables/useForm';
@@ -223,9 +223,9 @@ watch(tagsQuery, () => {
<FormErrorList :errors="form.errors" :field-name="field.name" />
</div>
- <div class="relative mt-2 flex h-9 w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
- <ButtonForm @click="$emit('handleFinish')" variant="reset" :disabled="form.processing" class="h-full dark:hover:bg-neutral-900"> Cancel </ButtonForm>
- <ButtonForm @click="handleSubmit" variant="submit" :disabled="form.processing" class="h-full"> Submit Details </ButtonForm>
+ <div class="relative mt-2 flex w-full flex-col-reverse gap-2 *:h-9 sm:flex-row sm:justify-end">
+ <ButtonForm @click="$emit('handleFinish')" variant="reset" :disabled="form.processing"> 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.vue
index 980294b8..8dc2d91a 100644
--- a/resources/js/components/forms/EditLyrics.vue
+++ b/resources/js/components/forms/EditLyrics.vue
@@ -9,14 +9,15 @@ import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form'
import { ButtonForm, ButtonText } from '@/components/cedar-ui/button';
import { TableLoadingSpinner } from '@/components/cedar-ui/table';
import { toFormattedDuration } from '@/service/util';
+import { useDateFieldModel } from '@/components/cedar-ui/date-picker/useDateFieldModel';
import { FormNumberField } from '@/components/cedar-ui/number-field';
import { useLyricStore } from '@/stores/LyricStore';
import { FormTextArea } from '@/components/cedar-ui/textarea';
import { storeToRefs } from 'pinia';
+import { DatePicker } from '@/components/cedar-ui/date-picker';
import { toast } from '@aminnausin/cedar-ui';
import LrcLibCard from '@/components/cards/data/LrcLibCard.vue';
-import DatePicker from '@/components/pinesUI/DatePicker.vue';
import useForm from '@/composables/useForm';
const { isLoadingLyrics, stateLyrics, searchResults, hasSearchedForLyrics, dirtyLyric } = storeToRefs(useLyricStore());
@@ -139,7 +140,7 @@ watch(
<FormLabel :for="field.name" :text="field.text" :subtext="field.subtext" />
<FormInput v-if="field.name === 'duration'" :field="field" v-model="field.value" disabled title="Song Duration" />
<FormTextArea v-else-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" />
<FormInput v-else v-model="form.fields[field.name]" :field="field" />
<FormErrorList :errors="form.errors" :field-name="field.name" />
@@ -172,7 +173,7 @@ watch(
<p v-show="changedMetadata.album">Overwriting Existing Album Name!</p>
</div>
- <div class="relative mt-4 flex h-9 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 *:h-9 sm:flex-row sm:justify-end">
<ButtonForm
@click="
() => {
@@ -182,11 +183,10 @@ watch(
"
variant="reset"
:disabled="form.processing"
- class="h-full dark:hover:bg-neutral-900"
>
Cancel
</ButtonForm>
- <ButtonForm @click="handleSubmit" variant="submit" :disabled="form.processing" class="h-full"> Submit Details </ButtonForm>
+ <ButtonForm @click="handleSubmit" variant="submit" :disabled="form.processing"> Submit Details </ButtonForm>
</div>
</form>
</template>
diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vue
index 0242de40..abbccde1 100755
--- a/resources/js/components/forms/EditVideo.vue
+++ b/resources/js/components/forms/EditVideo.vue
@@ -9,6 +9,7 @@ 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 { InputMultiChip } from '@/components/cedar-ui/multi-select';
import { useGetAllTags } from '@/service/queries';
import { FormTextArea } from '@/components/cedar-ui/textarea';
import { UseCreateTag } from '@/service/mutations';
@@ -18,7 +19,6 @@ 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 mediaAPI from '@/service/mediaAPI.ts';
import useForm from '@/composables/useForm';
@@ -238,9 +238,9 @@ watch(tagsQuery, () => {
<FormErrorList :errors="form.errors" :field-name="field.name" />
</div>
- <div class="relative mt-2 flex h-9 w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
- <ButtonForm @click="$emit('handleFinish')" variant="reset" :disabled="form.processing" class="h-full dark:hover:bg-neutral-900"> Cancel </ButtonForm>
- <ButtonForm @click="handleSubmit" variant="submit" :disabled="form.processing" class="h-full"> Submit Details </ButtonForm>
+ <div class="relative mt-2 flex w-full flex-col-reverse gap-2 *:h-9 sm:flex-row sm:justify-end">
+ <ButtonForm @click="$emit('handleFinish')" variant="reset" :disabled="form.processing"> Cancel </ButtonForm>
+ <ButtonForm @click="handleSubmit" variant="submit" :disabled="form.processing"> Submit Details </ButtonForm>
</div>
</form>
</template>
diff --git a/resources/js/components/forms/LoginForm.vue b/resources/js/components/forms/LoginForm.vue
index 2b7a7c95..1b3b97ba 100644
--- a/resources/js/components/forms/LoginForm.vue
+++ b/resources/js/components/forms/LoginForm.vue
@@ -6,10 +6,10 @@ import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form'
import { useRouter, useRoute, RouterLink } from 'vue-router';
import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
+import { ButtonForm } from '@/components/cedar-ui/button';
import { login } from '@/service/authAPI';
import { ref } from 'vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
@@ -52,7 +52,7 @@ const handleLogin = async () => {
<FormLabel :for="field.name" :text="field.text" :subtext="field.subtext" class="me-auto" />
<RouterLink
to="/recovery"
- class="rounded-md leading-none text-gray-600 underline hover:text-gray-900 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:text-gray-400 dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
+ class="focus:ring-primary-muted rounded-md leading-none text-gray-600 underline hover:text-gray-900 focus:ring-2 focus:ring-offset-2 focus:outline-hidden dark:text-gray-400 dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
>
Forgot password?
</RouterLink>
@@ -72,8 +72,8 @@ const handleLogin = async () => {
:class="[
'rounded-sm border-neutral-300 shadow-xs dark:border-neutral-700 dark:bg-neutral-900',
'appearance-none',
- 'ring-offset-0! focus:ring-2! focus:ring-indigo-500',
- 'checked:text-indigo-600',
+ 'focus:ring-primary-muted ring-offset-0! focus:ring-2!',
+ 'checked:text-primary',
]"
name="remember_me"
/>
@@ -82,12 +82,12 @@ const handleLogin = async () => {
<div class="flex flex-wrap items-center justify-end gap-2 gap-x-4 text-center">
<RouterLink
- class="rounded-md text-gray-600 underline hover:text-gray-900 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:text-gray-400 dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
+ class="focus:ring-primary-muted rounded-md text-gray-600 underline hover:text-gray-900 focus:ring-2 focus:ring-offset-2 focus:outline-hidden dark:text-gray-400 dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
to="/register"
>
Not Registered?
</RouterLink>
- <ButtonForm variant="auth" type="button" @click="handleLogin" :disabled="form.processing"> Log in </ButtonForm>
+ <ButtonForm variant="auth" type="button" @click="handleLogin" class="min-h-(--input-height)" :disabled="form.processing"> Log in </ButtonForm>
</div>
</BaseForm>
</template>
diff --git a/resources/js/components/forms/PasswordConfirm.vue b/resources/js/components/forms/PasswordConfirm.vue
index ad13d6f3..3d12dec0 100644
--- a/resources/js/components/forms/PasswordConfirm.vue
+++ b/resources/js/components/forms/PasswordConfirm.vue
@@ -4,9 +4,9 @@ import type { AxiosResponse } from 'axios';
import type { FormField } from '@/types/types';
import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
+import { ButtonForm } from '@/components/cedar-ui/button';
import { toast } from '@aminnausin/cedar-ui';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
@@ -72,8 +72,8 @@ const handleSubmit = async () => {
</FormItem>
<template #footer>
- <ButtonForm variant="reset" type="button" :disabled="form.processing" class="capitalize!" @click="$emit('cancel')">{{ cancelText }}</ButtonForm>
- <ButtonForm variant="submit" type="button" @click="handleSubmit" :disabled="form.processing" class="bg-danger-2! capitalize! hover:bg-rose-500!">
+ <ButtonForm variant="reset" type="button" :disabled="form.processing" class="min-h-(--input-height)" @click="$emit('cancel')">{{ cancelText }}</ButtonForm>
+ <ButtonForm variant="danger" class="min-h-(--input-height)" @click="handleSubmit" :disabled="form.processing">
{{ confirmText }}
</ButtonForm>
</template>
diff --git a/resources/js/components/forms/RecoveryForm.vue b/resources/js/components/forms/RecoveryForm.vue
index 5635bdc6..4bc1495a 100644
--- a/resources/js/components/forms/RecoveryForm.vue
+++ b/resources/js/components/forms/RecoveryForm.vue
@@ -3,11 +3,11 @@ import type { FormField } from '@/types/types';
import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { recoverAccount } from '@/service/authAPI';
+import { ButtonForm } from '@/components/cedar-ui/button';
import { RouterLink } from 'vue-router';
import { toast } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
@@ -43,12 +43,12 @@ const handleSubmit = async () => {
<FormErrorList :errors="form.errors" :field-name="field.name" />
</FormItem>
- <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="w-full justify-center! capitalize!">Email password reset link</ButtonForm>
+ <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="min-h-(--input-height) capitalize">Email password reset link</ButtonForm>
</BaseForm>
<span class="mx-auto text-gray-600 dark:text-gray-400">
Or, return to
<RouterLink
- class="rounded-md underline hover:text-gray-900 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
+ class="focus:ring-primary-muted rounded-md underline hover:text-gray-900 focus:ring-2 focus:ring-offset-2 focus:outline-hidden dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
to="/login"
>
log in
diff --git a/resources/js/components/forms/RegisterForm.vue b/resources/js/components/forms/RegisterForm.vue
index bfa25a75..caa75008 100644
--- a/resources/js/components/forms/RegisterForm.vue
+++ b/resources/js/components/forms/RegisterForm.vue
@@ -5,10 +5,10 @@ import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form'
import { useRouter, RouterLink } from 'vue-router';
import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
+import { ButtonForm } from '@/components/cedar-ui/button';
import { register } from '@/service/authAPI';
import { ref } from 'vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
@@ -59,13 +59,13 @@ const handleRegister = async () => {
</FormItem>
<div class="flex flex-wrap items-center justify-end gap-2 gap-x-4 text-center">
<RouterLink
- class="rounded-md text-sm text-gray-600 underline hover:text-gray-900 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:text-gray-400 dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
+ class="focus:ring-primary-muted rounded-md text-sm text-gray-600 underline hover:text-gray-900 focus:ring-2 focus:ring-offset-2 focus:outline-hidden dark:text-gray-400 dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
to="/login"
>
Already registered?
</RouterLink>
- <ButtonForm variant="auth" type="submit" :disabled="form.processing">Register</ButtonForm>
+ <ButtonForm variant="auth" type="submit" :disabled="form.processing" class="min-h-(--input-height)">Register</ButtonForm>
</div>
</BaseForm>
</template>
diff --git a/resources/js/components/forms/ResetPassword.vue b/resources/js/components/forms/ResetPassword.vue
index 737dd534..0d4128c3 100644
--- a/resources/js/components/forms/ResetPassword.vue
+++ b/resources/js/components/forms/ResetPassword.vue
@@ -4,10 +4,10 @@ import type { FormField } from '@/types/types';
import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { useRoute, useRouter } from 'vue-router';
import { resetPassword } from '@/service/authAPI';
+import { ButtonForm } from '@/components/cedar-ui/button';
import { toast } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
@@ -76,7 +76,7 @@ const handleSubmit = async () => {
</FormItem>
<template #footer>
- <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="w-full justify-center! capitalize!">Reset Password</ButtonForm>
+ <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="min-h-(--input-height) capitalize">Reset Password</ButtonForm>
</template>
</BaseForm>
</template>
diff --git a/resources/js/components/labels/MediaTag.vue b/resources/js/components/labels/MediaTag.vue
index ed16bfae..551306ea 100644
--- a/resources/js/components/labels/MediaTag.vue
+++ b/resources/js/components/labels/MediaTag.vue
@@ -9,7 +9,7 @@ const props = defineProps<{ class?: string }>();
cn(
'dark:hover:bg-primary/90 dark:hover:text-foreground-0 dark:bg-neutral-900',
'hover:text-foreground-i text-foreground-7 hover:bg-primary bg-neutral-200',
- 'max-h-[22px]! leading-none shadow-sm select-none',
+ 'max-h-[22px] leading-none shadow-sm select-none',
props.class,
)
"
diff --git a/resources/js/components/menus/LibraryCardMenu.vue b/resources/js/components/menus/LibraryCardMenu.vue
index 0096db17..6effa666 100644
--- a/resources/js/components/menus/LibraryCardMenu.vue
+++ b/resources/js/components/menus/LibraryCardMenu.vue
@@ -3,8 +3,7 @@ import type { CategoryResource, FolderResource } from '@/types/resources';
import { InputSelect } from '@/components/cedar-ui/select';
import { ButtonText } from '@/components/cedar-ui/button';
-
-import InputLabel from '@/components/labels/InputLabel.vue';
+import { FormLabel } from '@/components/cedar-ui/form';
import ProiconsArrowSync from '~icons/proicons/arrow-sync';
import ProiconsLockOpen from '~icons/proicons/lock-open';
@@ -34,9 +33,9 @@ const props = withDefaults(
</div>
<div class="flex flex-col gap-2 *:h-8 dark:*:bg-neutral-900">
<div class="flex h-auto! flex-col gap-1 bg-transparent!">
- <InputLabel text="Default Folder" name="Default Folder" class="font-normal" />
+ <FormLabel text="Default Folder" for="default-folder" class="font-normal" />
<InputSelect
- id="default-folder"
+ name="default-folder"
root-class="flex-1 rounded-l-none capitalize w-full! whitespace-nowrap! col-span-2"
class="h-8! py-0 ps-2! dark:bg-neutral-900!"
:placeholder="'Select Default Folder'"
diff --git a/resources/js/components/panels/FolderSidebar.vue b/resources/js/components/panels/FolderSidebar.vue
index a3e0331d..3de94c0f 100644
--- a/resources/js/components/panels/FolderSidebar.vue
+++ b/resources/js/components/panels/FolderSidebar.vue
@@ -124,7 +124,7 @@ const handleSeriesUpdate = async (res: any) => {
<ModalBase :modalData="editFolderModal" :useControls="false">
<template #description v-if="cachedFolder && cachedFolder.series?.editor_id && cachedFolder.series.date_updated">
Last edited by
- <a title="Editor profile" target="_blank" :href="`/profile/${cachedFolder.series.editor_id}`" class="hover:text-purple-600 dark:hover:text-purple-500"
+ <a title="Editor profile" target="_blank" :href="`/profile/${cachedFolder.series.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted"
>@{{ cachedFolder.series.editor_id }}</a
>
at
diff --git a/resources/js/components/settings/account/SettingsDeleteAccount.vue b/resources/js/components/settings/account/SettingsDeleteAccount.vue
index 182c9d37..141d2221 100644
--- a/resources/js/components/settings/account/SettingsDeleteAccount.vue
+++ b/resources/js/components/settings/account/SettingsDeleteAccount.vue
@@ -1,10 +1,10 @@
<script setup lang="ts">
import { useModalStore } from '@/stores/ModalStore';
+import { ButtonForm } from '@/components/cedar-ui/button';
import DeleteAccountModal from '@/components/modals/DeleteAccountModal.vue';
import SettingsHeader from '@/components/settings/SettingsHeader.vue';
import SettingsCard from '@/components/cards/layout/SettingsCard.vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
const modal = useModalStore();
</script>
@@ -18,18 +18,9 @@ const modal = useModalStore();
</SettingsHeader>
<!-- Other Browser Sessions -->
- <section class="mt-auto flex w-full max-w-xl flex-col gap-4">
- <div class="relative flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
- <ButtonForm
- variant="submit"
- class="bg-danger-2 hover:bg-rose-700 dark:hover:bg-rose-500"
- title="Delete your account permanently"
- @click="modal.open(DeleteAccountModal)"
- >
- Delete Account
- </ButtonForm>
- </div>
- </section>
+ <div class="mt-auto flex h-8 w-full max-w-xl flex-col sm:flex-row sm:justify-end">
+ <ButtonForm variant="danger" class="" title="Delete your account permanently" @click="modal.open(DeleteAccountModal)"> Delete Account </ButtonForm>
+ </div>
</template>
</SettingsCard>
</template>
diff --git a/resources/js/components/settings/account/SettingsSessions.vue b/resources/js/components/settings/account/SettingsSessions.vue
index b6ce7c75..08f3389f 100644
--- a/resources/js/components/settings/account/SettingsSessions.vue
+++ b/resources/js/components/settings/account/SettingsSessions.vue
@@ -2,14 +2,15 @@
import { useSettingsStore } from '@/stores/SettingsStore';
import { useModalStore } from '@/stores/ModalStore';
import { storeToRefs } from 'pinia';
+import { ButtonForm } from '@/components/cedar-ui/button';
import LogoutSessionsModal from '@/components/modals/LogoutSessionsModal.vue';
import SettingsHeader from '@/components/settings/SettingsHeader.vue';
import SettingsCard from '@/components/cards/layout/SettingsCard.vue';
import SessionCard from '@/components/cards/data/SessionCard.vue';
-import ButtonForm from '@/components/inputs/ButtonForm.vue';
import SvgSpinners90RingWithBg from '~icons/svg-spinners/90-ring-with-bg';
+import TableLoadingSpinner from '@/components/cedar-ui/table/TableLoadingSpinner.vue';
const { stateSessions, isLoadingSessions } = storeToRefs(useSettingsStore());
@@ -26,20 +27,19 @@ const modal = useModalStore();
<!-- Other Browser Sessions -->
<section class="flex w-full max-w-xl flex-col gap-4">
- <div
+ <TableLoadingSpinner
v-if="isLoadingSessions || stateSessions.length === 0"
- class="text-foreground-1 col-span-full my-auto flex w-full items-center justify-center gap-2 text-center tracking-wider uppercase"
- >
- <p>{{ isLoadingSessions ? '...Loading' : 'No Sessions' }}</p>
- <SvgSpinners90RingWithBg v-show="isLoadingSessions" />
- </div>
+ :is-loading="isLoadingSessions"
+ no-results-message="No Sessions"
+ class="*:text-foreground-1 text-sm"
+ />
<div
v-if="stateSessions.length > 0"
class="scrollbar-minimal scrollbar-track:bg-neutral-300 scrollbar-track:dark:bg-neutral-800 flex max-h-64 flex-col gap-2 overflow-y-auto"
>
<SessionCard v-for="(session, index) in stateSessions" :key="index" :session="session" class="flex items-center" />
</div>
- <div class="relative flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
+ <div class="relative flex h-8 w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
<ButtonForm variant="submit" @click="modal.open(LogoutSessionsModal)">Log Out Other Sessions</ButtonForm>
</div>
</section>
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index c34f7244..b9a114db 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -282,7 +282,7 @@ const videoPopoverItems = computed(() => {
icon: ProiconsSparkle2,
selectedIcon: ProiconsCheckmark,
selected: ambientMode.value,
- selectedIconStyle: 'text-purple-600',
+ selectedIconStyle: 'text-primary',
disabled: lightMode.value,
action: () => {
ambientMode.value = !ambientMode.value;
@@ -294,7 +294,7 @@ const videoPopoverItems = computed(() => {
icon: ProiconsArrowTrending,
selectedIcon: ProiconsCheckmark,
selected: playbackHeatmap.value,
- selectedIconStyle: 'text-purple-600',
+ selectedIconStyle: 'text-primary',
action: () => {
playbackHeatmap.value = !playbackHeatmap.value;
},
@@ -305,7 +305,7 @@ const videoPopoverItems = computed(() => {
icon: isShowingLyrics.value ? LucideCaptions : LucideCaptionsOff,
selectedIcon: ProiconsCheckmark,
selected: isShowingLyrics.value,
- selectedIconStyle: 'text-purple-600 stroke-none',
+ selectedIconStyle: 'text-primary stroke-none',
disabled: getScreenSize() !== 'default' || isAudio.value || stateFolder.value.is_majority_audio,
action: () => {
isShowingLyrics.value = !isShowingLyrics.value;
@@ -318,7 +318,7 @@ const videoPopoverItems = computed(() => {
iconStyle: `*:stroke-[1.4px]`,
selectedIcon: ProiconsCheckmark,
selected: isShowingLyrics.value,
- selectedIconStyle: 'text-purple-600 stroke-none',
+ selectedIconStyle: 'text-primary stroke-none',
disabled: getScreenSize() !== 'default' || (!isAudio.value && !stateFolder.value.is_majority_audio),
action: () => {
isShowingLyrics.value = !isShowingLyrics.value;
@@ -330,7 +330,7 @@ const videoPopoverItems = computed(() => {
icon: MagePlaylist,
selectedIcon: ProiconsCheckmark,
selected: isPlaylist.value,
- selectedIconStyle: 'text-purple-600',
+ selectedIconStyle: 'text-primary',
action: () => {
if (isLoading.value) return;
isPlaylist.value = !isPlaylist.value;
@@ -343,7 +343,7 @@ const videoPopoverItems = computed(() => {
icon: ProiconsTextHighlightColor,
selectedIcon: ProiconsCheckmark,
selected: usingPlayerModernUI.value,
- selectedIconStyle: 'text-purple-600',
+ selectedIconStyle: 'text-primary',
action: () => {
usingPlayerModernUI.value = !usingPlayerModernUI.value;
},
@@ -354,7 +354,7 @@ const videoPopoverItems = computed(() => {
icon: ProiconsPictureInPictureEnter,
selectedIcon: ProiconsCheckmark,
selected: isPictureInPicture.value,
- selectedIconStyle: 'text-purple-600',
+ selectedIconStyle: 'text-primary',
disabled: !document.pictureInPictureEnabled || isAudio.value,
action: () => {
if (isLoading.value) return;
diff --git a/resources/js/components/video/VideoPopover.vue b/resources/js/components/video/VideoPopover.vue
index 5e4e7b11..a29621e8 100644
--- a/resources/js/components/video/VideoPopover.vue
+++ b/resources/js/components/video/VideoPopover.vue
@@ -102,7 +102,7 @@ onUnmounted(() => {
<template>
<VideoButton
ref="popoverButton"
- :class="buttonClass + ` ${popoverOpen ? 'text-purple-600' : ''}`"
+ :class="[buttonClass, { 'text-primary': popoverOpen }]"
@click="popoverOpen = true"
v-bind="buttonAttributes"
:disabled="disabled"
diff --git a/resources/js/views/SetupView.vue b/resources/js/views/SetupView.vue
index c4aecb2c..844bb3c7 100644
--- a/resources/js/views/SetupView.vue
+++ b/resources/js/views/SetupView.vue
@@ -27,57 +27,57 @@ onMounted(async () => {
<template>
<LayoutBase>
<template v-slot:content>
- <section id="content-settings" class="flex flex-col gap-4 *:space-y-1 space-y-2 lg:min-h-[80vh] 3xl:min-h-[60vh]">
+ <section id="content-settings" class="3xl:min-h-[60vh] flex flex-col gap-4 space-y-2 *:space-y-1 lg:min-h-[80vh]">
<h2>Before you can start watching your media, you must complete these setup steps</h2>
- <ul class="text-sm flex flex-col gap-2">
- <li class="flex flex-wrap gap-1 items-center">
+ <ul class="flex flex-col gap-2 text-sm">
+ <li class="flex flex-wrap items-center gap-1">
<p>
- 1. <RouterLink to="/register" :class="`text-purple-500 underline decoration-1`">Register</RouterLink> for an account. The first one will be your
+ 1. <RouterLink to="/register" :class="`text-primary-muted underline decoration-1`">Register</RouterLink> for an account. The first one will be your
administrator account.
</p>
- <p v-show="userData" class="ms-auto text-xs font-bold text-green-600 dark:text-green-700">Done!</p>
+ <p v-show="userData" class="text-success ms-auto text-xs font-bold dark:text-green-700">Done!</p>
</li>
<li>
- <span class="flex gap-1 items-start">
+ <span class="flex items-start gap-1">
<p>2. Put your files in the data/media folder. You must follow this folder structure. An example url would be /library1/folder2</p>
- <p v-show="librariesAdded" class="ms-auto text-xs font-bold text-green-600 dark:text-green-700">Done!</p>
+ <p v-show="librariesAdded" class="text-success ms-auto text-xs font-bold dark:text-green-700">Done!</p>
</span>
- <div class="p-2 w-full font-mono">
+ <div class="w-full p-2 font-mono">
<ul>
<li class="font-bold">/data</li>
<ul class="ml-4">
- <li class="font-bold gap-1 flex"><LucideFolder />/media</li>
+ <li class="flex gap-1 font-bold"><LucideFolder />/media</li>
<ul class="ml-4">
- <li class="font-bold flex gap-1 items-center flex-wrap">
+ <li class="flex flex-wrap items-center gap-1 font-bold">
<ProiconsLibrary />
/library1
- <p class="font-normal text-xs leading-none dark:text-neutral-400">-</p>
- <p class="font-normal text-xs leading-none dark:text-neutral-400">Each library will show all of it's folders on the same page</p>
+ <p class="text-xs leading-none font-normal dark:text-neutral-400">-</p>
+ <p class="text-xs leading-none font-normal dark:text-neutral-400">Each library will show all of it's folders on the same page</p>
</li>
<ul class="ml-4">
- <li class="font-bold gap-1 flex"><LucideFolder /> /folder1</li>
+ <li class="flex gap-1 font-bold"><LucideFolder /> /folder1</li>
<ul class="ml-4">
- <li class="flex gap-1 items-center">
+ <li class="flex items-center gap-1">
video1.mp4
<p class="text-xs leading-none dark:text-neutral-400">-</p>
<p class="text-xs leading-none dark:text-neutral-400">Each video will have it's own link by library/folder/?video=id</p>
</li>
<li>video2.mp4</li>
</ul>
- <li class="font-bold gap-1 flex"><LucideFolder /> /folder2</li>
+ <li class="flex gap-1 font-bold"><LucideFolder /> /folder2</li>
<ul class="ml-4">
<li>video1.mkv</li>
<li>video2.mp4</li>
</ul>
</ul>
- <li class="font-bold flex gap-1"><ProiconsLibrary />/library2</li>
+ <li class="flex gap-1 font-bold"><ProiconsLibrary />/library2</li>
<ul class="ml-4">
- <li class="font-bold gap-1 flex"><LucideFolder /> /folder1</li>
+ <li class="flex gap-1 font-bold"><LucideFolder /> /folder1</li>
<ul class="ml-4">
<li>song1.wav</li>
<li>song2.ogg</li>
</ul>
- <li class="font-bold gap-1 flex"><LucideFolder />/folder2</li>
+ <li class="flex gap-1 font-bold"><LucideFolder />/folder2</li>
<ul class="ml-4">
<li>song1.mp3</li>
<li>song2.mp3</li>
@@ -88,19 +88,19 @@ onMounted(async () => {
</ul>
</div>
</li>
- <li class="flex flex-wrap gap-1 items-center">
+ <li class="flex flex-wrap items-center gap-1">
<p>
- 3. <RouterLink :class="`text-purple-500 underline decoration-1`" to="/dashboard/tasks">Start an "Index Files Task"</RouterLink> to discover all the
+ 3. <RouterLink :class="`text-primary-muted underline decoration-1`" to="/dashboard/tasks">Start an "Index Files Task"</RouterLink> to discover all the
videos you have organised.
</p>
- <p v-show="librariesAdded" class="ms-auto text-xs font-bold text-green-600 dark:text-green-700">Done!</p>
+ <p v-show="librariesAdded" class="text-success ms-auto text-xs font-bold dark:text-green-700">Done!</p>
</li>
- <li class="flex flex-wrap gap-1 items-center">
+ <li class="flex flex-wrap items-center gap-1">
<p>
- 4. <RouterLink :class="`text-purple-500 underline decoration-1`" to="/dashboard/tasks">Start a "Verify Files Task"</RouterLink> to generate metadata for
- all of your videos.
+ 4. <RouterLink :class="`text-primary-muted underline decoration-1`" to="/dashboard/tasks">Start a "Verify Files Task"</RouterLink> to generate metadata
+ for all of your videos.
</p>
- <p v-show="false" class="ms-auto text-xs font-bold text-green-600 dark:text-green-700">Done!</p>
+ <p v-show="false" class="text-success ms-auto text-xs font-bold dark:text-green-700">Done!</p>
</li>
<li>5. <RouterLink to="/">Enjoy</RouterLink> your media library!</li>
</ul>
diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vue
index 6828e8d4..1b1c5b67 100755
--- a/resources/js/views/VideoView.vue
+++ b/resources/js/views/VideoView.vue
@@ -233,7 +233,7 @@ watch(() => stateVideo.value, setVideoAsDocumentTitle, { immediate: true });
title="Editor profile"
target="_blank"
:href="`/profile/${cachedVideo.metadata.editor_id}`"
- class="hover:text-purple-600 dark:hover:text-purple-500"
+ class="hover:text-primary dark:hover:text-primary-muted"
>
@{{ cachedVideo.metadata.editor_id }}
</a>