Skip to content

A self-hosted media server and file management system

fix: auth form styling still uses gray

aminnausin14af60397e6a
diff --git a/resources/js/components/forms/LoginForm.vue b/resources/js/components/forms/LoginForm.vue
index ed667775..d29f81c7 100644
--- a/resources/js/components/forms/LoginForm.vue
+++ b/resources/js/components/forms/LoginForm.vue
@@ -13,6 +13,8 @@ import { ref } from 'vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
+import { InputShell } from '../cedar-ui/input';
+import { cn } from '@aminnausin/cedar-ui';
const { userData } = storeToRefs(useAuthStore());
const router = useRouter();
@@ -49,10 +51,7 @@ const handleLogin = async () => {
<FormItem v-for="(field, index) in fields" :key="index">
<span v-if="field.name === 'password'" class="flex flex-wrap">
<FormLabel :for="field.name" :text="field.text" :subtext="field.subtext" class="me-auto" />
- <RouterLink
- to="/recovery"
- 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"
- >
+ <RouterLink to="/recovery" class="focus:ring-primary-muted text-foreground-1 hover:text-foreground-0 rounded-md underline focus:ring-2 focus:outline-hidden">
Forgot password?
</RouterLink>
</span>
@@ -62,28 +61,21 @@ const handleLogin = async () => {
</FormItem>
<!-- Remember Me -->
- <label for="remember-me" class="flex w-full items-center gap-2">
- <input
- v-model="form.fields.remember"
- id="remember-me"
- type="checkbox"
- class=""
- :class="[
- 'rounded-sm border-neutral-300 shadow-xs dark:border-neutral-700 dark:bg-neutral-900',
- 'appearance-none',
- 'focus:ring-primary-muted ring-offset-0! focus:ring-2!',
- 'checked:text-primary',
- ]"
- name="remember_me"
- />
- <span class="text-sm text-gray-600 dark:text-gray-400">Remember me</span>
- </label>
-
+ <div class="flex items-center gap-2">
+ <InputShell>
+ <template #input="{ class: inputClass }">
+ <input
+ :class="cn(inputClass, 'checked:bg-primary focus:ring-primary-muted! size-4 cursor-pointer rounded-sm shadow-xs', 'ring-offset-0')"
+ id="remember-me"
+ type="checkbox"
+ name="remember_me"
+ />
+ </template>
+ </InputShell>
+ <FormLabel for="remember-me" class="text-foreground-1 text-sm"> Remember me </FormLabel>
+ </div>
<div class="flex flex-wrap items-center justify-end gap-2 gap-x-4 text-center">
- <RouterLink
- 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"
- >
+ <RouterLink class="focus:ring-primary-muted text-foreground-1 hover:text-foreground-0 rounded-md underline focus:ring-2 focus:outline-hidden" to="/register">
Not Registered?
</RouterLink>
<ButtonForm variant="auth" type="button" @click="handleLogin" class="min-h-(--input-height)" :disabled="form.processing"> Log in </ButtonForm>
diff --git a/resources/js/components/forms/RecoveryForm.vue b/resources/js/components/forms/RecoveryForm.vue
index 4bc1495a..d154d259 100644
--- a/resources/js/components/forms/RecoveryForm.vue
+++ b/resources/js/components/forms/RecoveryForm.vue
@@ -45,13 +45,8 @@ const handleSubmit = async () => {
<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">
+ <span class="text-foreground-1 mx-auto">
Or, return to
- <RouterLink
- 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
- </RouterLink>
+ <RouterLink class="focus:ring-primary-muted hover:text-foreground-0 rounded-md underline focus:ring-2 focus:outline-hidden" to="/login"> log in </RouterLink>
</span>
</template>
diff --git a/resources/js/components/forms/RegisterForm.vue b/resources/js/components/forms/RegisterForm.vue
index ee5cdec0..2ce5bad1 100644
--- a/resources/js/components/forms/RegisterForm.vue
+++ b/resources/js/components/forms/RegisterForm.vue
@@ -57,10 +57,7 @@ const handleRegister = async () => {
<FormErrorList :errors="form.errors" :field-name="field.name" />
</FormItem>
<div class="flex flex-wrap items-center justify-end gap-2 gap-x-4 text-center">
- <RouterLink
- 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"
- >
+ <RouterLink class="focus:ring-primary-muted text-foreground-1 hover:text-foreground-0 rounded-md underline focus:ring-2 focus:outline-hidden" to="/login">
Already registered?
</RouterLink>
diff --git a/resources/js/components/forms/ResetPassword.vue b/resources/js/components/forms/ResetPassword.vue
index 0d4128c3..46229ace 100644
--- a/resources/js/components/forms/ResetPassword.vue
+++ b/resources/js/components/forms/ResetPassword.vue
@@ -56,7 +56,7 @@ const handleSubmit = async () => {
return resetPassword(fields);
},
{
- onSuccess: (response) => {
+ onSuccess: (_) => {
toast.success('Your password has been reset.');
router.push('/login');
},