Skip to content

A self-hosted media server and file management system

feat: form footer

aminnausina3d919a87ec0
diff --git a/resources/js/components/config/performance/ConfigServerPerformance.vue b/resources/js/components/config/performance/ConfigServerPerformance.vue
index 7bfd882a..33a3fee0 100644
--- a/resources/js/components/config/performance/ConfigServerPerformance.vue
+++ b/resources/js/components/config/performance/ConfigServerPerformance.vue
@@ -12,6 +12,7 @@ import ConfigServerSkeleton from '@/components/config/server/ConfigServerSkeleto
import ConfigFormLabel from '@/components/config/ConfigFormLabel.vue';
import SettingsCard from '@/components/cards/layout/SettingsCard.vue';
import ConfigHeader from '@/components/config/ConfigHeader.vue';
+import FormFooter from '@/components/forms/FormFooter.vue';
import useForm from '@/composables/useForm';
const { data: serverConfig, isLoading } = useGetConfig();
@@ -89,17 +90,16 @@ watch(
</div>
</div>
- <div class="flex flex-wrap justify-end gap-2">
+ <FormFooter>
<ButtonForm
variant="reset"
- class="h-8"
:disabled="form.processing"
@click="resetForm(serverConfig?.values.performance)"
:class="cn('transition-reveal overflow-hidden', form.dirty ? 'mx-0 w-18 px-4 opacity-100' : '-mx-0.5 w-0 px-0 opacity-0')"
>
Reset
</ButtonForm>
- <ButtonForm variant="submit" class="h-8" :disabled="form.processing" @click="handleSavePerformance"> Save </ButtonForm>
- </div>
+ <ButtonForm variant="submit" :disabled="form.processing" @click="handleSavePerformance"> Save </ButtonForm>
+ </FormFooter>
</SettingsCard>
</template>
diff --git a/resources/js/components/config/server/ConfigServerIndexing.vue b/resources/js/components/config/server/ConfigServerIndexing.vue
index 32ce30fb..74a0c07c 100644
--- a/resources/js/components/config/server/ConfigServerIndexing.vue
+++ b/resources/js/components/config/server/ConfigServerIndexing.vue
@@ -11,6 +11,7 @@ import { watch } from 'vue';
import ConfigToggleRow from '@/components/config/ConfigToggleRow.vue';
import SettingsCard from '@/components/cards/layout/SettingsCard.vue';
import ConfigHeader from '@/components/config/ConfigHeader.vue';
+import FormFooter from '@/components/forms/FormFooter.vue';
import useForm from '@/composables/useForm';
const { data: serverConfig, isLoading } = useGetConfig();
@@ -116,7 +117,7 @@ watch(
<FormErrorList :errors="form.errors" />
- <div class="flex flex-wrap justify-end gap-2 *:h-8">
+ <FormFooter>
<ButtonForm
@click="resetForm(serverConfig?.values.scanner)"
type="button"
@@ -127,7 +128,7 @@ watch(
Reset
</ButtonForm>
<ButtonForm variant="submit" :disabled="form.processing" @click="handleSaveScanner"> Save </ButtonForm>
- </div>
+ </FormFooter>
</template>
</SettingsCard>
</template>
diff --git a/resources/js/components/config/server/ConfigServerStorage.vue b/resources/js/components/config/server/ConfigServerStorage.vue
index c954fab1..de7f6fdc 100644
--- a/resources/js/components/config/server/ConfigServerStorage.vue
+++ b/resources/js/components/config/server/ConfigServerStorage.vue
@@ -74,14 +74,13 @@ watch(
<FormFooter>
<ButtonForm
variant="reset"
- class="h-8"
:disabled="form.processing"
@click="resetForm(serverConfig?.values.storage)"
:class="cn('transition-reveal overflow-hidden', form.dirty ? 'mx-0 w-18 px-4 opacity-100' : '-mx-0.5 w-0 px-0 opacity-0')"
>
Reset
</ButtonForm>
- <ButtonForm variant="submit" class="h-8" :disabled="form.processing" @click="handleSavePaths"> Save </ButtonForm>
+ <ButtonForm variant="submit" :disabled="form.processing" @click="handleSavePaths"> Save </ButtonForm>
</FormFooter>
</SettingsCard>
</template>
diff --git a/resources/js/components/forms/ChangeEmail.vue b/resources/js/components/forms/ChangeEmail.vue
index 43fa508c..92ccc47a 100644
--- a/resources/js/components/forms/ChangeEmail.vue
+++ b/resources/js/components/forms/ChangeEmail.vue
@@ -10,6 +10,7 @@ import { toast } from '@aminnausin/cedar-ui';
import SettingsHeader from '@/components/settings/SettingsHeader.vue';
import SettingsCard from '@/components/cards/layout/SettingsCard.vue';
+import FormFooter from '@/components/forms/FormFooter.vue';
import useForm from '@/composables/useForm';
const fields = reactive<FormField[]>([
@@ -74,14 +75,14 @@ const handleSubmit = async () => {
<form class="flex w-full max-w-xl flex-col flex-wrap gap-4 sm:flex-row sm:justify-between" @submit.prevent="handleSubmit">
<div v-for="(field, index) in fields.filter((field) => !field.disabled)" :key="index" class="w-full" :class="field.class">
<FormLabel :for="field.name" :text="field.text" :subtext="field.subtext" />
- <FormInput v-model="form.fields[field.name]" :field="field" :class="'dark:bg-primary-dark-900/70 bg-white ring-neutral-300 dark:ring-neutral-800'" />
+ <FormInput v-model="form.fields[field.name]" :field="field" />
<FormErrorList :errors="form.errors" :field-name="field.name" />
</div>
- <div class="flex w-full flex-col-reverse gap-2 *:h-8 sm:flex-row sm:justify-end">
+ <FormFooter>
<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>
+ <ButtonForm @click="handleSubmit" type="button" variant="submit" :disabled="form.processing"> Save </ButtonForm>
+ </FormFooter>
</form>
</template>
</SettingsCard>
diff --git a/resources/js/components/forms/ChangePassword.vue b/resources/js/components/forms/ChangePassword.vue
index 1c409485..c9a1029f 100644
--- a/resources/js/components/forms/ChangePassword.vue
+++ b/resources/js/components/forms/ChangePassword.vue
@@ -10,6 +10,7 @@ import { toast } from '@aminnausin/cedar-ui';
import SettingsHeader from '@/components/settings/SettingsHeader.vue';
import SettingsCard from '@/components/cards/layout/SettingsCard.vue';
+import FormFooter from '@/components/forms/FormFooter.vue';
import useForm from '@/composables/useForm';
// To avoid having duplicate inputs with the same id on the account settings page
@@ -101,14 +102,14 @@ const handleSubmit = async () => {
<form class="flex w-full max-w-xl flex-col flex-wrap gap-4 sm:flex-row sm:justify-between" @submit.prevent="handleSubmit">
<div v-for="(field, index) in fields.filter((field) => !field.disabled)" :key="index" class="w-full" :class="field.class">
<FormLabel :for="field.name" :text="field.text" :subtext="field.subtext" />
- <FormInput v-model="form.fields[field.name]" :field="field" :class="'dark:bg-primary-dark-900/70 bg-white ring-neutral-300 dark:ring-neutral-800'" />
+ <FormInput v-model="form.fields[field.name]" :field="field" />
<FormErrorList :errors="form.errors" :field-name="field.name" />
</div>
- <div class="flex w-full flex-col-reverse gap-2 *:h-8 sm:flex-row sm:justify-end">
+ <FormFooter>
<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>
+ <ButtonForm @click="handleSubmit" type="button" variant="submit" :disabled="form.processing"> Save </ButtonForm>
+ </FormFooter>
</form>
</template>
</SettingsCard>
diff --git a/resources/js/components/forms/FormFooter.vue b/resources/js/components/forms/FormFooter.vue
new file mode 100644
index 00000000..f391fcb5
--- /dev/null
+++ b/resources/js/components/forms/FormFooter.vue
@@ -0,0 +1,8 @@
+<script setup lang="ts">
+import { cn } from '@aminnausin/cedar-ui';
+</script>
+<template>
+ <div :class="cn('flex h-8 flex-wrap justify-end gap-2', $attrs.class)">
+ <slot />
+ </div>
+</template>
diff --git a/resources/js/components/settings/account/SettingsDeleteAccount.vue b/resources/js/components/settings/account/SettingsDeleteAccount.vue
index 141d2221..2a1921d3 100644
--- a/resources/js/components/settings/account/SettingsDeleteAccount.vue
+++ b/resources/js/components/settings/account/SettingsDeleteAccount.vue
@@ -5,22 +5,20 @@ 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 FormFooter from '@/components/forms/FormFooter.vue';
const modal = useModalStore();
</script>
<template>
<SettingsCard>
- <template #content>
- <SettingsHeader>
- <h3 class="text-base font-medium">Account Management</h3>
- <p class="text-foreground-1">Permanently delete your account.</p>
- </SettingsHeader>
+ <SettingsHeader>
+ <h3 class="text-base font-medium">Account Management</h3>
+ <p class="text-foreground-1">Permanently delete your account.</p>
+ </SettingsHeader>
- <!-- Other Browser Sessions -->
- <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>
+ <FormFooter class="mt-auto w-fit flex-1 text-nowrap">
+ <ButtonForm variant="danger" title="Delete your account permanently" @click="modal.open(DeleteAccountModal)"> Delete Account </ButtonForm>
+ </FormFooter>
</SettingsCard>
</template>
diff --git a/resources/js/components/settings/account/SettingsSessions.vue b/resources/js/components/settings/account/SettingsSessions.vue
index 2a47ef56..59e8f5db 100644
--- a/resources/js/components/settings/account/SettingsSessions.vue
+++ b/resources/js/components/settings/account/SettingsSessions.vue
@@ -9,6 +9,7 @@ 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 FormFooter from '@/components/forms/FormFooter.vue';
const { stateSessions, isLoadingSessions } = storeToRefs(useSettingsStore());
@@ -37,9 +38,10 @@ const modal = useModalStore();
>
<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 *:h-8 sm:flex-row sm:justify-end">
+
+ <FormFooter>
<ButtonForm variant="submit" @click="modal.open(LogoutSessionsModal)">Log Out Other Sessions</ButtonForm>
- </div>
+ </FormFooter>
</section>
</template>
</SettingsCard>