A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
refactor: move layout serving cards to their own folder
aminnausincbd9eef2ef8d
diff --git a/resources/js/components/cards/AuthCard.vue b/resources/js/components/cards/layout/AuthCard.vuesimilarity index 100%rename from resources/js/components/cards/AuthCard.vuerename to resources/js/components/cards/layout/AuthCard.vuediff --git a/resources/js/components/cards/DashboardCard.vue b/resources/js/components/cards/layout/DashboardCard.vuesimilarity index 100%rename from resources/js/components/cards/DashboardCard.vuerename to resources/js/components/cards/layout/DashboardCard.vuediff --git a/resources/js/components/cards/SettingsCard.vue b/resources/js/components/cards/layout/SettingsCard.vuesimilarity index 100%rename from resources/js/components/cards/SettingsCard.vuerename to resources/js/components/cards/layout/SettingsCard.vuediff --git a/resources/js/components/dashboard/DashboardAnalytics.vue b/resources/js/components/dashboard/DashboardAnalytics.vueindex c1465bc5..4bbb53a6 100644--- a/resources/js/components/dashboard/DashboardAnalytics.vue+++ b/resources/js/components/dashboard/DashboardAnalytics.vue@@ -15,7 +15,7 @@ import PulseSlowQueries from '@/components/pulseCards/PulseSlowQueries.vue';import PulseExceptions from '@/components/pulseCards/PulseExceptions.vue';import PulseRequests from '@/components/pulseCards/PulseRequests.vue';import PulseSlowJobs from '@/components/pulseCards/PulseSlowJobs.vue';-import DashboardCard from '@/components/cards/DashboardCard.vue';+import DashboardCard from '@/components/cards/layout/DashboardCard.vue';import PulseServers from '@/components/pulseCards/PulseServers.vue';import PulseQueues from '@/components/pulseCards/PulseQueues.vue';import BreadCrumbs from '@/components/pinesUI/BreadCrumbs.vue';@@ -66,22 +66,22 @@ watch();</script><template>- <div class="flex items-center gap-2 justify-between flex-wrap">+ <div class="flex flex-wrap items-center justify-between gap-2"><BreadCrumbs :bread-crumbs="breadCrumbs" />- <div class="flex items-center flex-wrap gap-2 ml-auto text-sm font-medium">+ <div class="ml-auto flex flex-wrap items-center gap-2 text-sm font-medium"><h5>Time Period</h5><buttonv-for="(validPeriod, index) in validPeriods":key="index"@click="period = validPeriod.value"- :class="`font-semibold ${period === validPeriod.value ? 'text-gray-700 dark:text-gray-300' : 'text-gray-300 dark:text-gray-600'} hover:text-gray-400 dark:hover:text-gray-500`"+ :class="`font-semibold ${period === validPeriod.value ? 'text-gray-700 dark:text-gray-300' : 'text-gray-300 dark:text-gray-600'} hover:text-gray-400 dark:hover:text-gray-500`">{{ validPeriod.key }}</button></div>- <div class="flex flex-wrap items-center gap-2 *:h-fit xs:*:h-8 w-full">- <ButtonText @click.stop.prevent="handleStartTask('scan')" :text="'Run Full Scan'" title="Scan All Files" class="flex-1 xs:flex-initial">+ <div class="xs:*:h-8 flex w-full flex-wrap items-center gap-2 *:h-fit">+ <ButtonText @click.stop.prevent="handleStartTask('scan')" :text="'Run Full Scan'" title="Scan All Files" class="xs:flex-initial flex-1"><template #icon><ProiconsArrowSync /></template></ButtonText><BasePopover popoverClass="w-52! rounded-lg mt-10 " :button-attributes="{ title: 'Start New Task', text: 'New Task', class: 'h-full' }" ref="taskPopover" class="">@@ -92,19 +92,19 @@ watch(<DashboardTaskMenu @handle-close="taskPopover?.handleClose" :show-scan-all="false" /></template></BasePopover>- <ButtonText :to="'/pulse'" text="Pulse" title="Detailed Analytics" class="flex-1 xs:flex-initial">+ <ButtonText :to="'/pulse'" text="Pulse" title="Detailed Analytics" class="xs:flex-initial flex-1"><template #icon><ProiconsBolt /></template></ButtonText></div></div>- <span class="mx-auto grid grid-cols-2 sm:grid-cols-4 lg:grid-cols-6 gap-6 w-full">+ <span class="mx-auto grid w-full grid-cols-2 gap-6 sm:grid-cols-4 lg:grid-cols-6"><PulseServers :pulseData="pulseData" :isLoading="pulseLoading" cols="6" :rows="1" /><DashboardCard cols="2" :rows="4" :title="'Data changes over time'" :name="'Data Changes'" :details="`past ${periodForHumans(period)}`"><template #icon>- <LucideChartNoAxesCombined class="w-6 h-6" />+ <LucideChartNoAxesCombined class="h-6 w-6" /></template>- <span v-for="(stat, index) in stats?.changes" :key="index" class="flex gap-2 capitalize items-center flex-wrap">- <h3 class="text-sm dark:text-neutral-400 text-neutral-500 w-full text-nowrap">{{ stat.title }}</h3>+ <span v-for="(stat, index) in stats?.changes" :key="index" class="flex flex-wrap items-center gap-2 capitalize">+ <h3 class="w-full text-sm text-nowrap text-neutral-500 dark:text-neutral-400">{{ stat.title }}</h3><span><h3 class="text-lg">{{ stat.count ?? 0 }}</h3></span>diff --git a/resources/js/components/forms/ChangeEmail.vue b/resources/js/components/forms/ChangeEmail.vueindex b8db2281..dc48b775 100644--- a/resources/js/components/forms/ChangeEmail.vue+++ b/resources/js/components/forms/ChangeEmail.vue@@ -9,7 +9,7 @@ import { toast } from '@aminnausin/cedar-ui';import SettingsHeader from '@/components/settings/SettingsHeader.vue';import FormInputLabel from '@/components/labels/FormInputLabel.vue';import FormErrorList from '@/components/labels/FormErrorList.vue';-import SettingsCard from '@/components/cards/SettingsCard.vue';+import SettingsCard from '@/components/cards/layout/SettingsCard.vue';import ButtonForm from '@/components/inputs/ButtonForm.vue';import FormInput from '@/components/inputs/FormInput.vue';import useForm from '@/composables/useForm';diff --git a/resources/js/components/forms/ChangePassword.vue b/resources/js/components/forms/ChangePassword.vueindex 31133a29..2f72712e 100644--- a/resources/js/components/forms/ChangePassword.vue+++ b/resources/js/components/forms/ChangePassword.vue@@ -9,7 +9,7 @@ import { toast } from '@aminnausin/cedar-ui';import SettingsHeader from '@/components/settings/SettingsHeader.vue';import FormInputLabel from '@/components/labels/FormInputLabel.vue';import FormErrorList from '@/components/labels/FormErrorList.vue';-import SettingsCard from '@/components/cards/SettingsCard.vue';+import SettingsCard from '@/components/cards/layout/SettingsCard.vue';import ButtonForm from '@/components/inputs/ButtonForm.vue';import FormInput from '@/components/inputs/FormInput.vue';import useForm from '@/composables/useForm';diff --git a/resources/js/components/pulseCards/PulseCache.vue b/resources/js/components/pulseCards/PulseCache.vueindex 89f42405..a324ba4a 100644--- a/resources/js/components/pulseCards/PulseCache.vue+++ b/resources/js/components/pulseCards/PulseCache.vue@@ -7,7 +7,7 @@ import { computed } from 'vue';import IconInformationCircle from '@/components/icons/IconInformationCircle.vue';import IconRocketLaunch from '@/components/icons/IconRocketLaunch.vue';import PulseNoResults from '@/components/pulse/PulseNoResults.vue';-import DashboardCard from '@/components/cards/DashboardCard.vue';+import DashboardCard from '@/components/cards/layout/DashboardCard.vue';import PulseScroll from '@/components/pulse/PulseScroll.vue';import PulseTable from '@/components/pulse/PulseTable.vue';import PulseThead from '@/components/pulse/PulseThead.vue';@@ -54,7 +54,7 @@ const config = computed(() => {<button:title="`Keys may be normalized using groups.\n\nThere ${Object.keys(config.groups).length === 1 ? 'is' : 'are'} currently ${Object.keys(config.groups).length} ${Object.keys(config.groups).length === 1 ? 'group' : 'groups'} configured.`">- <IconInformationCircle class="w-5 h-5 stroke-gray-400 dark:stroke-gray-600" />+ <IconInformationCircle class="h-5 w-5 stroke-gray-400 dark:stroke-gray-600" /></button></template>@@ -63,7 +63,7 @@ const config = computed(() => {<div class="flex flex-col gap-6" v-else><div class="grid grid-cols-3 gap-3 text-center"><div class="flex flex-col justify-center @sm:block">- <span class="text-xl uppercase font-bold text-gray-700 dark:text-gray-300 tabular-nums">+ <span class="text-xl font-bold text-gray-700 uppercase tabular-nums dark:text-gray-300"><spanv-if="config.sample_rate < 1":title="`Sample rate: ${config.sample_rate}, Raw value: ${format_number(pulseData.cache.allCacheInteractions.hits)}`"@@ -74,10 +74,10 @@ const config = computed(() => {{{ format_number(pulseData.cache.allCacheInteractions.hits) }}</template></span>- <span class="text-xs uppercase font-bold text-gray-500 dark:text-gray-400"> Hits </span>+ <span class="text-xs font-bold text-gray-500 uppercase dark:text-gray-400"> Hits </span></div><div class="flex flex-col justify-center @sm:block">- <span class="text-xl uppercase font-bold text-gray-700 dark:text-gray-300 tabular-nums">+ <span class="text-xl font-bold text-gray-700 uppercase tabular-nums dark:text-gray-300"><spanv-if="config.sample_rate < 1":title="`Sample rate: ${config.sample_rate}, Raw value: ${format_number(pulseData.cache.allCacheInteractions.misses)}`"@@ -88,10 +88,10 @@ const config = computed(() => {{{ format_number(pulseData.cache.allCacheInteractions.misses) }}</template></span>- <span class="text-xs uppercase font-bold text-gray-500 dark:text-gray-400"> Misses </span>+ <span class="text-xs font-bold text-gray-500 uppercase dark:text-gray-400"> Misses </span></div><div class="flex flex-col justify-center @sm:block">- <span class="text-xl uppercase font-bold text-gray-700 dark:text-gray-300 tabular-nums">+ <span class="text-xl font-bold text-gray-700 uppercase tabular-nums dark:text-gray-300">{{Math.floor((pulseData.cache.allCacheInteractions.hits /@@ -100,7 +100,7 @@ const config = computed(() => {) / 100}}%</span>- <span class="text-xs uppercase font-bold text-gray-500 dark:text-gray-400"> Hit Rate </span>+ <span class="text-xs font-bold text-gray-500 uppercase dark:text-gray-400"> Hit Rate </span></div></div><div>@@ -124,12 +124,12 @@ const config = computed(() => {<tr class="h-2 first:h-0"></tr><tr><PulseTd class="max-w-px">- <code class="block text-xs text-gray-900 dark:text-gray-100 truncate" :title="interaction.key">+ <code class="block truncate text-xs text-gray-900 dark:text-gray-100" :title="interaction.key">{{ interaction.key }}</code></PulseTd>- <PulseTd :numeric="true" class="text-neutral-700 dark:text-neutral-300 font-bold">+ <PulseTd :numeric="true" class="font-bold text-neutral-700 dark:text-neutral-300"><span v-if="config.sample_rate < 1" :title="`Sample rate: ${config.sample_rate}, Raw value: ${format_number(interaction.hits)}`">~{{ format_number(interaction.hits * (1 / config.sample_rate)) }}</span>@@ -138,7 +138,7 @@ const config = computed(() => {</template></PulseTd>- <PulseTd :numeric="true" class="text-neutral-700 dark:text-neutral-300 font-bold">+ <PulseTd :numeric="true" class="font-bold text-neutral-700 dark:text-neutral-300"><span v-if="config.sample_rate < 1" :title="`Sample rate: ${config.sample_rate}, Raw value: ${format_number(interaction.misses)}`">~{{ format_number(interaction.misses * (1 / config.sample_rate)) }}</span>@@ -147,14 +147,14 @@ const config = computed(() => {</template></PulseTd>- <PulseTd :numeric="true" class="text-gray-700 dark:text-gray-300 font-bold">+ <PulseTd :numeric="true" class="font-bold text-gray-700 dark:text-gray-300">{{ Math.floor((interaction.hits / (parseFloat(`${interaction.hits}`) + parseFloat(`${interaction.misses}`))) * 10000) / 100 }}%</PulseTd></tr></template></tbody></PulseTable>- <div v-if="cacheKeyInteractions.length > 100" class="mt-2 text-xs text-neutral-400 text-center">Limited to 100 entries</div>+ <div v-if="cacheKeyInteractions.length > 100" class="mt-2 text-center text-xs text-neutral-400">Limited to 100 entries</div></div></div></PulseScroll>diff --git a/resources/js/components/pulseCards/PulseExceptions.vue b/resources/js/components/pulseCards/PulseExceptions.vueindex bd80984c..3f92a888 100644--- a/resources/js/components/pulseCards/PulseExceptions.vue+++ b/resources/js/components/pulseCards/PulseExceptions.vue@@ -8,7 +8,7 @@ import { toTimeSpan } from '@/service/util';import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';import PulseNoResults from '@/components/pulse/PulseNoResults.vue';-import DashboardCard from '@/components/cards/DashboardCard.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';@@ -76,7 +76,7 @@ const exceptions = computed(() => {<InputSelect:placeholder="'None'":options="exceptionOptions"- class="flex-1 rounded-l-none capitalize w-full! whitespace-nowrap!"+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"title="Select usage type"@selectItem="handleSetSort":defaultItem="0"@@ -85,7 +85,7 @@ const exceptions = computed(() => {</template><PulseScroll :expand="false" :loading="isLoading ?? false">- <div class="min-h-full flex flex-col">+ <div class="flex min-h-full flex-col"><PulseNoResults :isLoading="isLoading" v-if="exceptions.length === 0" /><PulseTable v-else><colgroup>@@ -105,17 +105,17 @@ const exceptions = computed(() => {<tr class="h-2 first:h-0"></tr><tr><PulseTd class="max-w-px">- <code class="block text-xs text-neutral-900 dark:text-neutral-100 truncate" :title="exception.class">+ <code class="block truncate text-xs text-neutral-900 dark:text-neutral-100" :title="exception.class">{{ exception.class }}</code>- <p class="mt-1 text-xs text-neutral-500 dark:text-neutral-400 truncate" :title="exception.location">+ <p class="mt-1 truncate text-xs text-neutral-500 dark:text-neutral-400" :title="exception.location">{{ exception.location }}</p></PulseTd>- <PulseTd :numeric="true" class="text-neutral-700 dark:text-neutral-300 font-bold">+ <PulseTd :numeric="true" class="font-bold text-neutral-700 dark:text-neutral-300">{{ toTimeSpan(new Date(exception.latest), ' EST', true) }}</PulseTd>- <PulseTd :numeric="true" class="text-neutral-700 dark:text-neutral-300 font-bold">+ <PulseTd :numeric="true" class="font-bold text-neutral-700 dark:text-neutral-300"><spanv-if="pulseData?.exceptions?.config.sample_rate && pulseData.exceptions.config.sample_rate < 1":title="`Sample rate: ${pulseData?.exceptions?.config.sample_rate}, Raw value: ${format_number(exception.count)}`"@@ -129,7 +129,7 @@ const exceptions = computed(() => {</template></tbody></PulseTable>- <div v-if="exceptions.length > 100" class="mt-2 text-xs text-neutral-400 text-center">Limited to 100 entries</div>+ <div v-if="exceptions.length > 100" class="mt-2 text-center text-xs text-neutral-400">Limited to 100 entries</div></div></PulseScroll></DashboardCard>diff --git a/resources/js/components/pulseCards/PulseQueues.vue b/resources/js/components/pulseCards/PulseQueues.vueindex 6923a508..583079e4 100644--- a/resources/js/components/pulseCards/PulseQueues.vue+++ b/resources/js/components/pulseCards/PulseQueues.vue@@ -6,7 +6,7 @@ import { computed } from 'vue';import PulseLineChart from '@/components/charts/PulseLineChart.vue';import PulseNoResults from '@/components/pulse/PulseNoResults.vue';-import DashboardCard from '@/components/cards/DashboardCard.vue';+import DashboardCard from '@/components/cards/layout/DashboardCard.vue';import IconQueueList from '@/components/icons/IconQueueList.vue';import PulseScroll from '@/components/pulse/PulseScroll.vue';@@ -44,7 +44,7 @@ function scale(data: { [key: string]: any }) {<IconQueueList /></template><template #actions>- <div class="flex flex-wrap gap-4 text-xs text-gray-600 dark:text-gray-400 font-medium">+ <div class="flex flex-wrap gap-4 text-xs font-medium text-gray-600 dark:text-gray-400"><div class="flex items-center gap-2"><div class="h-0.5 w-3 rounded-full bg-[rgba(107,114,128,0.5)]"></div>Queued@@ -70,7 +70,7 @@ function scale(data: { [key: string]: any }) {<PulseScroll :expand="true" :loading="isLoading ?? true"><PulseNoResults :isLoading="isLoading" v-if="!queues || (Object.keys(queues)?.length ?? 0) == 0" />- <div v-else-if="queues" class="grid gap-3 mx-px mb-px">+ <div v-else-if="queues" class="mx-px mb-px grid gap-3"><div v-for="queue in Object.keys(queues)" :key="queue"><h3 class="font-bold text-neutral-700 dark:text-neutral-300"><template v-if="pulseData?.queues?.showConnection">@@ -80,9 +80,9 @@ function scale(data: { [key: string]: any }) {{{ queue.substring(queue.indexOf(':') + 1) }}</template></h3>- <div class="mt-3 relative">+ <div class="relative mt-3"><div- class="absolute -left-px -top-2 max-w-fit h-4 flex items-center px-1 text-xs leading-none text-white font-bold bg-purple-500 rounded-sm after:[--triangle-size:4px] after:border-l-purple-500 after:absolute after:right-[calc(-1*var(--triangle-size))] after:top-[calc(50%-var(--triangle-size))] after:border-t-(length:--triangle-size) after:border-b-(length:--triangle-size) after:border-l-(length:--triangle-size) after:border-transparent"+ 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]"><spanv-if="pulseData?.queues?.config.sample_rate && pulseData.queues.config.sample_rate < 1"@@ -96,7 +96,7 @@ function scale(data: { [key: string]: any }) {<div class="h-14"><PulseLineChart- :class="' dark:bg-primary-dark-800! bg-primary-900! '"+ :class="'dark:bg-primary-dark-800! bg-primary-900!'":chart-data="{labels: Object.keys(queues[queue].queued).map((v) => pulseFormatDate(v)),datasets: [diff --git a/resources/js/components/pulseCards/PulseRequests.vue b/resources/js/components/pulseCards/PulseRequests.vueindex 892c05bf..bf8762bd 100644--- a/resources/js/components/pulseCards/PulseRequests.vue+++ b/resources/js/components/pulseCards/PulseRequests.vue@@ -7,7 +7,7 @@ import { computed } from 'vue';import IconArrowsLeftRight from '@/components/icons/IconArrowsLeftRight.vue';import PulseLineChart from '@/components/charts/PulseLineChart.vue';import PulseNoResults from '@/components/pulse/PulseNoResults.vue';-import DashboardCard from '@/components/cards/DashboardCard.vue';+import DashboardCard from '@/components/cards/layout/DashboardCard.vue';import PulseScroll from '@/components/pulse/PulseScroll.vue';const validPeriods = ['1_hour', '6_hours', '24_hours', '7_days'];@@ -50,23 +50,23 @@ function scale(data: { [key: string]: any }) {</template><template #actions><div class="flex flex-wrap gap-4">- <div v-if="config.record_informational" class="flex items-center gap-2 text-xs text-gray-600 dark:text-gray-400 font-medium">+ <div v-if="config.record_informational" class="flex items-center gap-2 text-xs font-medium text-gray-600 dark:text-gray-400"><div class="h-0.5 w-3 rounded-full" style="background-color: rgba(29, 153, 172, 0.5)"></div>Informational</div>- <div v-if="config.record_successful" class="flex items-center gap-2 text-xs text-gray-600 dark:text-gray-400 font-medium">+ <div v-if="config.record_successful" class="flex items-center gap-2 text-xs font-medium text-gray-600 dark:text-gray-400"><div class="h-0.5 w-3 rounded-full bg-[#9333ea]"></div>Successful</div>- <div v-if="config.record_redirection" class="flex items-center gap-2 text-xs text-gray-600 dark:text-gray-400 font-medium">+ <div v-if="config.record_redirection" class="flex items-center gap-2 text-xs font-medium text-gray-600 dark:text-gray-400"><div class="h-0.5 w-3 rounded-full bg-[rgba(107,114,128,0.5)]"></div>Redirection</div>- <div v-if="config.record_client_error" class="flex items-center gap-2 text-xs text-gray-600 dark:text-gray-400 font-medium">+ <div v-if="config.record_client_error" class="flex items-center gap-2 text-xs font-medium text-gray-600 dark:text-gray-400"><div class="h-0.5 w-3 rounded-full bg-[#eab308]"></div>Client Error</div>- <div v-if="config.record_server_error" class="flex items-center gap-2 text-xs text-gray-600 dark:text-gray-400 font-medium">+ <div v-if="config.record_server_error" class="flex items-center gap-2 text-xs font-medium text-gray-600 dark:text-gray-400"><div class="h-0.5 w-3 rounded-full bg-[#e11d48]"></div>Server Error</div>@@ -75,11 +75,11 @@ function scale(data: { [key: string]: any }) {<PulseScroll :expand="true" :loading="isLoading ?? true"><PulseNoResults :isLoading="isLoading" v-if="!requests || (Object.keys(requests)?.length ?? 0) == 0" />- <div v-else-if="requests" class="grid gap-3 mx-px mb-px">+ <div v-else-if="requests" class="mx-px mb-px grid gap-3"><div v-for="request in Object.keys(requests)" :key="request">- <div class="mt-3 relative">+ <div class="relative mt-3"><div- class="absolute -left-px -top-2 max-w-fit h-4 flex items-center px-1 text-xs leading-none text-white font-bold bg-purple-500 rounded-sm after:[--triangle-size:4px] after:border-l-purple-500 after:absolute after:right-[calc(-1*var(--triangle-size))] after:top-[calc(50%-var(--triangle-size))] after:border-t-(length:--triangle-size) after:border-b-(length:--triangle-size) after:border-l-(length:--triangle-size) after:border-transparent"+ 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]"><spanv-if="config.sample_rate && pulseData.requests.config.sample_rate < 1"@@ -93,7 +93,7 @@ function scale(data: { [key: string]: any }) {<div class="h-14"><PulseLineChart- :class="' dark:bg-primary-dark-800! bg-primary-900! '"+ :class="'dark:bg-primary-dark-800! bg-primary-900!'":chart-data="{labels: Object.keys(requests[request][Object.keys(requests[request])[0]]).map((v) => pulseFormatDate(v)),datasets: [diff --git a/resources/js/components/pulseCards/PulseSlowJobs.vue b/resources/js/components/pulseCards/PulseSlowJobs.vueindex 34cecbe9..b0228f97 100644--- a/resources/js/components/pulseCards/PulseSlowJobs.vue+++ b/resources/js/components/pulseCards/PulseSlowJobs.vue@@ -8,7 +8,7 @@ import { sortObject } from '@/service/sort/baseSort';import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';import IconCommandLine from '@/components/icons/IconCommandLine.vue';import PulseNoResults from '@/components/pulse/PulseNoResults.vue';-import DashboardCard from '@/components/cards/DashboardCard.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';@@ -74,7 +74,7 @@ const config = computed(() => {<InputSelect:placeholder="'None'":options="exceptionOptions"- class="flex-1 rounded-l-none capitalize w-full! whitespace-nowrap!"+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"title="Select usage type"@selectItem="handleSetSort":defaultItem="0"@@ -83,7 +83,7 @@ const config = computed(() => {</template><PulseScroll :expand="false" :loading="isLoading ?? false">- <div class="min-h-full flex flex-col">+ <div class="flex min-h-full flex-col"><PulseNoResults :isLoading="isLoading" v-if="slowJobs.length === 0" /><PulseTable v-else><colgroup>@@ -103,12 +103,12 @@ const config = computed(() => {<tr class="h-2 first:h-0"></tr><tr><PulseTd class="max-w-px">- <code class="block text-xs text-gray-900 dark:text-gray-100 truncate" :title="slowJob.job">+ <code class="block truncate text-xs text-gray-900 dark:text-gray-100" :title="slowJob.job">{{ slowJob.job }}</code><p v-if="Array.isArray(config?.threshold)" class="mt-1 text-xs text-gray-500 dark:text-gray-400">{{ slowJob.threshold }}ms threshold</p></PulseTd>- <PulseTd :numeric="true" class="text-neutral-700 dark:text-neutral-300 font-bold">+ <PulseTd :numeric="true" class="font-bold text-neutral-700 dark:text-neutral-300"><span v-if="config.sample_rate < 1" :title="`Sample rate: ${config.sample_rate}, Raw value: ${format_number(slowJob.count)}`">~{{ format_number(slowJob.count * (1 / config.sample_rate)) }}</span>@@ -126,7 +126,7 @@ const config = computed(() => {</template></tbody></PulseTable>- <div v-if="slowJobs.length > 100" class="mt-2 text-xs text-neutral-400 text-center">Limited to 100 entries</div>+ <div v-if="slowJobs.length > 100" class="mt-2 text-center text-xs text-neutral-400">Limited to 100 entries</div></div></PulseScroll></DashboardCard>diff --git a/resources/js/components/pulseCards/PulseSlowOutgoingRequests.vue b/resources/js/components/pulseCards/PulseSlowOutgoingRequests.vueindex 91f56cda..e74d6471 100644--- a/resources/js/components/pulseCards/PulseSlowOutgoingRequests.vue+++ b/resources/js/components/pulseCards/PulseSlowOutgoingRequests.vue@@ -10,7 +10,7 @@ import PulseHttpMethodBadge from '@/components/pulse/PulseHttpMethod-Badge.vue';import IconCloudArrowUp from '@/components/icons/IconCloudArrowUp.vue';import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';import PulseNoResults from '@/components/pulse/PulseNoResults.vue';-import DashboardCard from '@/components/cards/DashboardCard.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';@@ -83,13 +83,13 @@ function getDomainFromUrl(input: string): string | null {<button:title="`URIs may be normalized using groups.\n\nThere ${config.groups.length === 1 ? 'is' : 'are'} currently ${config.groups.length} ${config.groups.length === 1 ? 'group' : 'groups'} configured.`">- <IconInformationCircle class="w-5 h-5 stroke-gray-400 dark:stroke-gray-600" />+ <IconInformationCircle class="h-5 w-5 stroke-gray-400 dark:stroke-gray-600" /></button><PulseSelectLabel controlId="Select-Slow-Outgoing-Requests-Order"> Sort By </PulseSelectLabel><InputSelect:placeholder="'None'":options="exceptionOptions"- class="flex-1 rounded-l-none capitalize w-full! whitespace-nowrap!"+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"title="Select usage type"@selectItem="handleSetSort":defaultItem="0"@@ -98,7 +98,7 @@ function getDomainFromUrl(input: string): string | null {</template><PulseScroll :expand="false" :loading="isLoading ?? false">- <div class="min-h-full flex flex-col">+ <div class="flex min-h-full flex-col"><PulseNoResults :isLoading="isLoading" v-if="slowOutgoingRequests.length === 0" /><PulseTable v-else><colgroup>@@ -128,11 +128,11 @@ function getDomainFromUrl(input: string): string | null {v-if="getDomainFromUrl(slowRequest.uri)":src="`https://unavatar.io/${getDomainFromUrl(slowRequest.uri)}?fallback=false`"loading="lazy"- class="w-4 h-4 mr-2"+ class="mr-2 h-4 w-4"onerror="this.style.display='none'"alt="URL favicon"/>- <code class="block text-xs text-gray-900 dark:text-gray-100 truncate">+ <code class="block truncate text-xs text-gray-900 dark:text-gray-100">{{ slowRequest.uri }}</code></div>@@ -140,7 +140,7 @@ function getDomainFromUrl(input: string): string | null {{{ slowRequest.threshold }}ms threshold</p></PulseTd>- <PulseTd :numeric="true" class="text-neutral-700 dark:text-neutral-300 font-bold">+ <PulseTd :numeric="true" class="font-bold text-neutral-700 dark:text-neutral-300"><span v-if="config.sample_rate < 1" :title="`Sample rate: ${config.sample_rate}, Raw value: ${format_number(slowRequest.count)}`">~{{ format_number(slowRequest.count * (1 / config.sample_rate)) }}</span>@@ -158,7 +158,7 @@ function getDomainFromUrl(input: string): string | null {</template></tbody></PulseTable>- <div v-if="slowOutgoingRequests.length > 100" class="mt-2 text-xs text-neutral-400 text-center">Limited to 100 entries</div>+ <div v-if="slowOutgoingRequests.length > 100" class="mt-2 text-center text-xs text-neutral-400">Limited to 100 entries</div></div></PulseScroll></DashboardCard>diff --git a/resources/js/components/pulseCards/PulseSlowQueries.vue b/resources/js/components/pulseCards/PulseSlowQueries.vueindex 98c1d77e..59bd249d 100644--- a/resources/js/components/pulseCards/PulseSlowQueries.vue+++ b/resources/js/components/pulseCards/PulseSlowQueries.vue@@ -8,7 +8,7 @@ import { sortObject } from '@/service/sort/baseSort';import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';import IconCircleStack from '@/components/icons/IconCircleStack.vue';import PulseNoResults from '@/components/pulse/PulseNoResults.vue';-import DashboardCard from '@/components/cards/DashboardCard.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';@@ -75,7 +75,7 @@ const config = computed(() => {<InputSelect:placeholder="'None'":options="exceptionOptions"- class="flex-1 rounded-l-none capitalize w-full! whitespace-nowrap!"+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"title="Select usage type"@selectItem="handleSetSort":defaultItem="0"@@ -84,7 +84,7 @@ const config = computed(() => {</template><PulseScroll :expand="false" :loading="isLoading ?? false">- <div class="min-h-full flex flex-col">+ <div class="flex min-h-full flex-col"><PulseNoResults :isLoading="isLoading" v-if="slowQueries.length === 0" /><PulseTable v-else><colgroup>@@ -103,25 +103,25 @@ const config = computed(() => {<template v-for="(query, index) in slowQueries.slice(0, 100)" :key="index"><tr class="h-2 first:h-0"></tr><tr>- <PulseTd class="p-0! truncate max-w-px">+ <PulseTd class="max-w-px truncate p-0!"><div class="relative"><div- class="bg-gray-700 dark:bg-gray-800 py-4 rounded-md text-gray-100 block text-xs whitespace-nowrap overflow-x-auto [scrollbar-color:var(--color-gray-500)_transparent] [scrollbar-width:thin]"+ class="block overflow-x-auto rounded-md bg-gray-700 py-4 text-xs whitespace-nowrap text-gray-100 [scrollbar-color:var(--color-gray-500)_transparent] [scrollbar-width:thin] dark:bg-gray-800">- <code class="whitespace-nowrap px-3" v-html="query.sql"></code>- <p v-if="query.location" class="px-3 mt-3 leading-none text-gray-400 dark:text-gray-500">+ <code class="px-3 whitespace-nowrap" v-html="query.sql"></code>+ <p v-if="query.location" class="mt-3 px-3 leading-none text-gray-400 dark:text-gray-500">{{ query.location }}</p>- <p v-if="Array.isArray(config?.threshold)" class="px-3 mt-3 leading-none text-gray-400 dark:text-gray-500">+ <p v-if="Array.isArray(config?.threshold)" class="mt-3 px-3 leading-none text-gray-400 dark:text-gray-500">{{ query.threshold }}ms threshold</p></div><div- class="absolute top-0 right-0 bottom-0 rounded-r-md w-3 bg-linear-to-r from-transparent to-gray-700 dark:to-gray-800 pointer-events-none"+ class="pointer-events-none absolute top-0 right-0 bottom-0 w-3 rounded-r-md bg-linear-to-r from-transparent to-gray-700 dark:to-gray-800"></div></div></PulseTd>- <PulseTd :numeric="true" class="text-neutral-700 dark:text-neutral-300 font-bold">+ <PulseTd :numeric="true" class="font-bold text-neutral-700 dark:text-neutral-300"><span v-if="config.sample_rate < 1" :title="`Sample rate: ${config.sample_rate}, Raw value: ${format_number(query.count)}`">~{{ format_number(query.count * (1 / config.sample_rate)) }}</span>@@ -139,7 +139,7 @@ const config = computed(() => {</template></tbody></PulseTable>- <div v-if="slowQueries.length > 100" class="mt-2 text-xs text-neutral-400 text-center">Limited to 100 entries</div>+ <div v-if="slowQueries.length > 100" class="mt-2 text-center text-xs text-neutral-400">Limited to 100 entries</div></div></PulseScroll></DashboardCard>diff --git a/resources/js/components/pulseCards/PulseSlowRequests.vue b/resources/js/components/pulseCards/PulseSlowRequests.vueindex 52112a66..6052b005 100644--- a/resources/js/components/pulseCards/PulseSlowRequests.vue+++ b/resources/js/components/pulseCards/PulseSlowRequests.vue@@ -9,7 +9,7 @@ import PulseHttpMethodBadge from '@/components/pulse/PulseHttpMethod-Badge.vue';import IconArrowsLeftRight from '@/components/icons/IconArrowsLeftRight.vue';import PulseSelectLabel from '@/components/pulse/PulseSelectLabel.vue';import PulseNoResults from '@/components/pulse/PulseNoResults.vue';-import DashboardCard from '@/components/cards/DashboardCard.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';@@ -76,7 +76,7 @@ const config = computed(() => {<InputSelect:placeholder="'None'":options="exceptionOptions"- class="flex-1 rounded-l-none capitalize w-full! whitespace-nowrap!"+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"title="Select usage type"@selectItem="handleSetSort":defaultItem="0"@@ -85,7 +85,7 @@ const config = computed(() => {</template><PulseScroll :expand="false" :loading="isLoading ?? false">- <div class="min-h-full flex flex-col">+ <div class="flex min-h-full flex-col"><PulseNoResults :isLoading="isLoading" v-if="requests.length === 0" /><PulseTable v-else><colgroup>@@ -109,18 +109,18 @@ const config = computed(() => {<PulseTd><PulseHttpMethodBadge :method="slowRequest.method" /></PulseTd>- <PulseTd class="overflow-hidden max-w-px">- <code class="block text-xs text-neutral-900 dark:text-neutral-100 truncate" :title="slowRequest.uri">+ <PulseTd class="max-w-px overflow-hidden">+ <code class="block truncate text-xs text-neutral-900 dark:text-neutral-100" :title="slowRequest.uri">{{ slowRequest.uri }}</code>- <p v-if="slowRequest.action" class="mt-1 text-xs text-neutral-500 dark:text-neutral-400 truncate" :title="slowRequest.action">+ <p v-if="slowRequest.action" class="mt-1 truncate text-xs text-neutral-500 dark:text-neutral-400" :title="slowRequest.action">{{ slowRequest.action }}</p><p v-if="Array.isArray(config?.threshold)" class="mt-1 text-xs text-neutral-500 dark:text-neutral-400">{{ slowRequest.threshold }}ms threshold</p></PulseTd>- <PulseTd :numeric="true" class="text-neutral-700 dark:text-neutral-300 font-bold">+ <PulseTd :numeric="true" class="font-bold text-neutral-700 dark:text-neutral-300"><span v-if="config.sample_rate < 1" :title="`Sample rate: ${config.sample_rate}, Raw value: ${format_number(slowRequest.count)}`">~{{ format_number(slowRequest.count * (1 / config.sample_rate)) }}</span>@@ -138,7 +138,7 @@ const config = computed(() => {</template></tbody></PulseTable>- <div v-if="requests.length > 100" class="mt-2 text-xs text-neutral-400 text-center">Limited to 100 entries</div>+ <div v-if="requests.length > 100" class="mt-2 text-center text-xs text-neutral-400">Limited to 100 entries</div></div></PulseScroll></DashboardCard>diff --git a/resources/js/components/pulseCards/PulseUsage.vue b/resources/js/components/pulseCards/PulseUsage.vueindex ce565edb..74ab6339 100644--- a/resources/js/components/pulseCards/PulseUsage.vue+++ b/resources/js/components/pulseCards/PulseUsage.vue@@ -8,7 +8,7 @@ import IconCursorArrowRays from '@/components/icons/IconCursorArrowRays.vue';import IconArrowTrendingUp from '@/components/icons/IconArrowTrendingUp.vue';import PulseNoResults from '@/components/pulse/PulseNoResults.vue';import PulseUserCard from '@/components/pulse/PulseUserCard.vue';-import DashboardCard from '@/components/cards/DashboardCard.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';@@ -90,7 +90,7 @@ const sampleRate = () => {<InputSelect:placeholder="'None'":options="requestOptions"- class="flex-1 rounded-l-none capitalize w-full! whitespace-nowrap!"+ class="w-full! flex-1 rounded-l-none whitespace-nowrap! capitalize"title="Select usage type"@selectItem="handleSetType":defaultItem="0"@@ -101,7 +101,7 @@ const sampleRate = () => {<PulseScroll :expand="false" :loading="isLoading ?? false"><PulseNoResults :isLoading="isLoading" v-if="userRequestCounts?.length === 0" />- <div v-else class="grid grid-cols-1 @lg:grid-cols-2 @3xl:grid-cols-3 6xl:grid-cols-2 gap-2 overflow-visible">+ <div v-else class="6xl:grid-cols-2 grid grid-cols-1 gap-2 overflow-visible @lg:grid-cols-2 @3xl:grid-cols-3"><PulseUserCard v-for="userRequestCount in userRequestCounts" :key="userRequestCount.key" :user="userRequestCount.user"><template #stats><span v-if="sampleRate() < 1" :title="`Sample rate: ${sampleRate()}, Raw value: ${format_number(userRequestCount.count)}`"diff --git a/resources/js/components/settings/account/SettingsDeleteAccount.vue b/resources/js/components/settings/account/SettingsDeleteAccount.vueindex 7d196f93..7c1c45ee 100644--- a/resources/js/components/settings/account/SettingsDeleteAccount.vue+++ b/resources/js/components/settings/account/SettingsDeleteAccount.vue@@ -3,7 +3,7 @@ import { useModalStore } from '@/stores/ModalStore';import DeleteAccountModal from '@/components/modals/DeleteAccountModal.vue';import SettingsHeader from '@/components/settings/SettingsHeader.vue';-import SettingsCard from '@/components/cards/SettingsCard.vue';+import SettingsCard from '@/components/cards/layout/SettingsCard.vue';import ButtonForm from '@/components/inputs/ButtonForm.vue';const modal = useModalStore();@@ -18,8 +18,8 @@ const modal = useModalStore();</SettingsHeader><!-- Other Browser Sessions -->- <section class="flex flex-col gap-4 w-full max-w-xl mt-auto">- <div class="relative flex flex-col-reverse sm:flex-row sm:justify-end gap-2 w-full">+ <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"><ButtonFormvariant="submit"class="bg-rose-600 hover:bg-rose-700 dark:hover:bg-rose-500"diff --git a/resources/js/components/settings/account/SettingsSessions.vue b/resources/js/components/settings/account/SettingsSessions.vueindex 870c1cb9..0d936fcc 100644--- a/resources/js/components/settings/account/SettingsSessions.vue+++ b/resources/js/components/settings/account/SettingsSessions.vue@@ -5,7 +5,7 @@ import { storeToRefs } from 'pinia';import LogoutSessionsModal from '@/components/modals/LogoutSessionsModal.vue';import SettingsHeader from '@/components/settings/SettingsHeader.vue';-import SettingsCard from '@/components/cards/SettingsCard.vue';+import SettingsCard from '@/components/cards/layout/SettingsCard.vue';import SessionCard from '@/components/cards/SessionCard.vue';import ButtonForm from '@/components/inputs/ButtonForm.vue';@@ -25,21 +25,21 @@ const modal = useModalStore();</SettingsHeader><!-- Other Browser Sessions -->- <section class="flex flex-col gap-4 w-full max-w-xl">+ <section class="flex w-full max-w-xl flex-col gap-4"><divv-if="isLoadingSessions || stateSessions.length === 0"- class="col-span-full flex items-center justify-center text-center uppercase tracking-wider w-full gap-2 my-auto text-neutral-600 dark:text-neutral-400"+ class="col-span-full my-auto flex w-full items-center justify-center gap-2 text-center tracking-wider text-neutral-600 uppercase dark:text-neutral-400"><p>{{ isLoadingSessions ? '...Loading' : 'No Sessions' }}</p><SvgSpinners90RingWithBg v-show="isLoadingSessions" /></div><divv-if="stateSessions.length > 0"- class="flex flex-col gap-2 max-h-64 scrollbar-minimal scrollbar-track:bg-neutral-300 scrollbar-track:dark:bg-neutral-800 overflow-y-auto"+ 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 flex-col-reverse sm:flex-row sm:justify-end gap-2 w-full">+ <div class="relative flex 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/settings/preferences/SettingsPlayerPreferences.vue b/resources/js/components/settings/preferences/SettingsPlayerPreferences.vueindex f7b0bf30..42a357c7 100644--- a/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue+++ b/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue@@ -3,7 +3,7 @@ import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';import SettingsHeader from '@/components/settings/SettingsHeader.vue';-import SettingsCard from '@/components/cards/SettingsCard.vue';+import SettingsCard from '@/components/cards/layout/SettingsCard.vue';import InputLabel from '@/components/labels/InputLabel.vue';import ToggleBase from '@/components/inputs/ToggleBase.vue';diff --git a/resources/js/views/LoginView.vue b/resources/js/views/LoginView.vueindex 35478ca2..f857bf19 100755--- a/resources/js/views/LoginView.vue+++ b/resources/js/views/LoginView.vue@@ -5,7 +5,7 @@ import { storeToRefs } from 'pinia';import AuthHeader from '@/components/headers/AuthHeader.vue';import LayoutAuth from '@/layouts/LayoutAuth.vue';import LoginForm from '@/components/forms/LoginForm.vue';-import AuthCard from '@/components/cards/AuthCard.vue';+import AuthCard from '@/components/cards/layout/AuthCard.vue';const { appManifest } = storeToRefs(useAppStore());</script>diff --git a/resources/js/views/RecoveryView.vue b/resources/js/views/RecoveryView.vueindex 82be64c8..a8293d8c 100644--- a/resources/js/views/RecoveryView.vue+++ b/resources/js/views/RecoveryView.vue@@ -2,7 +2,7 @@import RecoveryForm from '@/components/forms/RecoveryForm.vue';import AuthHeader from '@/components/headers/AuthHeader.vue';import LayoutAuth from '@/layouts/LayoutAuth.vue';-import AuthCard from '@/components/cards/AuthCard.vue';+import AuthCard from '@/components/cards/layout/AuthCard.vue';</script><template>diff --git a/resources/js/views/RegisterView.vue b/resources/js/views/RegisterView.vueindex d5a8b62f..ac08dd52 100755--- a/resources/js/views/RegisterView.vue+++ b/resources/js/views/RegisterView.vue@@ -2,7 +2,7 @@import RegisterForm from '@/components/forms/RegisterForm.vue';import AuthHeader from '@/components/headers/AuthHeader.vue';import LayoutAuth from '@/layouts/LayoutAuth.vue';-import AuthCard from '@/components/cards/AuthCard.vue';+import AuthCard from '@/components/cards/layout/AuthCard.vue';</script><template>diff --git a/resources/js/views/ResetPasswordView.vue b/resources/js/views/ResetPasswordView.vueindex bb8d40e0..1534f265 100644--- a/resources/js/views/ResetPasswordView.vue+++ b/resources/js/views/ResetPasswordView.vue@@ -2,7 +2,7 @@import ResetPassword from '@/components/forms/ResetPassword.vue';import AuthHeader from '@/components/headers/AuthHeader.vue';import LayoutAuth from '@/layouts/LayoutAuth.vue';-import AuthCard from '@/components/cards/AuthCard.vue';+import AuthCard from '@/components/cards/layout/AuthCard.vue';</script><template>