Skip to content

Commit ae08bab

Browse files
connorabbasconnorabbas
committed
Password input fixes, cleanup
1 parent a6d557a commit ae08bab

File tree

8 files changed

+30
-33
lines changed

8 files changed

+30
-33
lines changed

‎resources/js/components/DeleteUserModal.vue

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ const deleteUser = () => {
1919
onFinish: () => form.reset(),
2020
});
2121
};
22-
23-
function focusPasswordInput() {
24-
passwordInput.value.$el.focus();
25-
}
2622
</script>
2723

2824
<template>
@@ -34,7 +30,6 @@ function focusPasswordInput() {
3430
:draggable="false"
3531
dismissableMask
3632
modal
37-
@show="focusPasswordInput"
3833
>
3934
<div class="mb-6">
4035
<p class="m-0 text-muted-color">
@@ -45,14 +40,13 @@ function focusPasswordInput() {
4540
</div>
4641

4742
<div class="flex flex-col gap-2">
48-
<InputText
43+
<Password
4944
id="password"
50-
ref="password-input"
5145
v-model="form.password"
52-
:invalid="Boolean(form.errors.password)"
53-
type="password"
54-
placeholder="Password"
46+
:invalid="Boolean(form.errors?.password)"
47+
:feedback="false"
5548
autocomplete="current-password"
49+
toggleMask
5650
autofocus
5751
required
5852
fluid

‎resources/js/composables/usePaginatedData.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ export function usePaginatedData(
8181
}
8282

8383
function fetchData(options: {
84-
data?: Record<string, any>,
8584
onSuccess?: (page: Page<PageProps>) => void,
8685
onError?: (errors: Errors) => void,
8786
onFinish?: () => void,
@@ -98,7 +97,6 @@ export function usePaginatedData(
9897
...pagination.value,
9998
sortField: sorting.value.field,
10099
sortOrder: sorting.value.order,
101-
...options?.data
102100
},
103101
preserveState: true,
104102
preserveUrl: false,

‎resources/js/pages/auth/ForgotPassword.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ onMounted(() => {
5757
id="email"
5858
ref="email-input"
5959
v-model="forgotPasswordForm.email"
60-
:invalid="Boolean(forgotPasswordForm.errors.email)"
60+
:invalid="Boolean(forgotPasswordForm.errors?.email)"
6161
type="email"
6262
autocomplete="username"
6363
required

‎resources/js/pages/auth/Login.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ onMounted(() => {
5858
id="email"
5959
ref="email-input"
6060
v-model="loginForm.email"
61-
:invalid="Boolean(loginForm.errors.email)"
61+
:invalid="Boolean(loginForm.errors?.email)"
6262
type="email"
6363
autocomplete="username"
6464
required
@@ -79,7 +79,8 @@ onMounted(() => {
7979
<Password
8080
id="password"
8181
v-model="loginForm.password"
82-
:invalid="Boolean(loginForm.errors.password)"
82+
:invalid="Boolean(loginForm.errors?.password)"
83+
:feedback="false"
8384
autocomplete="current-password"
8485
toggleMask
8586
required

‎resources/js/pages/auth/Register.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ onMounted(() => {
3737
id="name"
3838
ref="name-input"
3939
v-model="registerForm.name"
40-
:invalid="Boolean(registerForm.errors.name)"
40+
:invalid="Boolean(registerForm.errors?.name)"
4141
type="text"
4242
autocomplete="name"
4343
required
@@ -58,7 +58,7 @@ onMounted(() => {
5858
<InputText
5959
id="email"
6060
v-model="registerForm.email"
61-
:invalid="Boolean(registerForm.errors.email)"
61+
:invalid="Boolean(registerForm.errors?.email)"
6262
type="email"
6363
autocomplete="username"
6464
required
@@ -79,7 +79,7 @@ onMounted(() => {
7979
<Password
8080
id="password"
8181
v-model="registerForm.password"
82-
:invalid="Boolean(registerForm.errors.password)"
82+
:invalid="Boolean(registerForm.errors?.password)"
8383
autocomplete="new-password"
8484
toggleMask
8585
required
@@ -97,12 +97,13 @@ onMounted(() => {
9797

9898
<div class="flex flex-col gap-2">
9999
<label for="password_confirmation">Confirm Password</label>
100-
<InputText
100+
<Password
101101
id="password_confirmation"
102102
v-model="registerForm.password_confirmation"
103-
:invalid="Boolean(registerForm.errors.password_confirmation)"
104-
type="password"
103+
:invalid="Boolean(registerForm.errors?.password_confirmation)"
104+
:feedback="false"
105105
autocomplete="new-password"
106+
toggleMask
106107
required
107108
fluid
108109
/>

‎resources/js/pages/auth/ResetPassword.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ onMounted(() => {
4848
id="email"
4949
ref="email-input"
5050
v-model="resetPwForm.email"
51-
:invalid="Boolean(resetPwForm.errors.email)"
51+
:invalid="Boolean(resetPwForm.errors?.email)"
5252
type="email"
5353
autocomplete="username"
5454
required
@@ -65,11 +65,11 @@ onMounted(() => {
6565
</div>
6666

6767
<div class="flex flex-col gap-2">
68-
<label for="password">Password</label>
68+
<label for="password">New Password</label>
6969
<Password
7070
id="password"
7171
v-model="resetPwForm.password"
72-
:invalid="Boolean(resetPwForm.errors.password)"
72+
:invalid="Boolean(resetPwForm.errors?.password)"
7373
autocomplete="new-password"
7474
toggleMask
7575
required
@@ -87,12 +87,13 @@ onMounted(() => {
8787

8888
<div class="flex flex-col gap-2">
8989
<label for="password_confirmation">Confirm Password</label>
90-
<InputText
90+
<Password
9191
id="password_confirmation"
9292
v-model="resetPwForm.password_confirmation"
93-
:invalid="Boolean(resetPwForm.errors.password_confirmation)"
94-
type="password"
93+
:invalid="Boolean(resetPwForm.errors?.password_confirmation)"
9594
autocomplete="new-password"
95+
:feedback="false"
96+
toggleMask
9697
required
9798
fluid
9899
/>

‎resources/js/pages/settings/Password.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,14 @@ const updatePassword = () => {
7676
>
7777
<div class="flex flex-col gap-2">
7878
<label for="current_password">Current Password</label>
79-
<InputText
79+
<Password
8080
id="current_password"
8181
ref="current-password-input"
8282
v-model="updatePasswordForm.current_password"
8383
:invalid="Boolean(updatePasswordForm.errors?.current_password)"
84-
type="password"
8584
autocomplete="current-password"
85+
:feedback="false"
86+
toggleMask
8687
required
8788
fluid
8889
/>
@@ -118,12 +119,13 @@ const updatePassword = () => {
118119
</div>
119120
<div class="flex flex-col gap-2">
120121
<label for="password_confirmation">Confirm Password</label>
121-
<InputText
122+
<Password
122123
id="password_confirmation"
123124
v-model="updatePasswordForm.password_confirmation"
124125
:invalid="Boolean(updatePasswordForm.errors?.password_confirmation)"
125-
type="password"
126126
autocomplete="confirm-password"
127+
:feedback="false"
128+
toggleMask
127129
required
128130
fluid
129131
/>

‎resources/js/pages/settings/Profile.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ const updateProfileInformation = () => {
7373
<InputText
7474
id="name"
7575
v-model="updateProfileForm.name"
76-
:invalid="Boolean(updateProfileForm.errors.name)"
76+
:invalid="Boolean(updateProfileForm.errors?.name)"
7777
type="text"
7878
autocomplete="name"
7979
required
@@ -93,7 +93,7 @@ const updateProfileInformation = () => {
9393
<InputText
9494
id="email"
9595
v-model="updateProfileForm.email"
96-
:invalid="Boolean(updateProfileForm.errors.email)"
96+
:invalid="Boolean(updateProfileForm.errors?.email)"
9797
type="email"
9898
autocomplete="username"
9999
required

0 commit comments

Comments
 (0)