Skip to content

Commit 7c1b524

Browse files
connorabbasconnorabbas
authored
Merge pull request #45 from connorabbas/develop
Changes from inertia project
2 parents 50c7a16 + 46697f2 commit 7c1b524

File tree

9 files changed

+62
-37
lines changed

9 files changed

+62
-37
lines changed

‎src/components/primevue/menu/Breadcrumb.vue‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,18 @@ defineExpose({ el: childRef });
2626
>
2727
<template #item="{ item, props }">
2828
<RouterLink
29-
v-if="item.route"
29+
v-if="item.visible !== false && item.route"
3030
v-slot="{ href, navigate }"
3131
:to="item.route"
3232
custom
3333
>
3434
<a
3535
:href="href"
36-
v-bind="props.action"
37-
class="p-breadcrumb-item-link"
36+
:target="item.target"
37+
:class="['p-breadcrumb-item-link', item.class]"
38+
:style="item.style"
39+
:aria-disabled="item.disabled === true"
40+
custom
3841
@click="navigate"
3942
>
4043
<i
@@ -51,10 +54,13 @@ defineExpose({ el: childRef });
5154
</a>
5255
</RouterLink>
5356
<a
54-
v-else
57+
v-else-if="item.visible !== false"
58+
v-bind="props.action"
5559
:href="item.url"
5660
:target="item.target"
57-
v-bind="props.action"
61+
:class="item.class"
62+
:style="item.style"
63+
:aria-disabled="item.disabled === true"
5864
>
5965
<i
6066
v-if="item.icon"

‎src/components/primevue/menu/Menu.vue‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,18 @@ defineExpose({
3535
</template>
3636
<template #item="{ item, props }">
3737
<RouterLink
38-
v-if="item.route"
38+
v-if="item.visible !== false && item.route"
3939
v-slot="{ href, navigate }"
4040
:to="item.route"
4141
custom
4242
>
4343
<a
4444
:href="href"
45-
v-bind="props.action"
46-
class="p-menu-item-link"
45+
:target="item.target"
46+
:class="['p-menu-item-link', item.class]"
47+
:style="item.style"
48+
:aria-disabled="item.disabled === true"
49+
custom
4750
@click="navigate"
4851
>
4952
<i
@@ -60,10 +63,13 @@ defineExpose({
6063
</a>
6164
</RouterLink>
6265
<a
63-
v-else
66+
v-else-if="item.visible !== false"
67+
v-bind="props.action"
6468
:href="item.url"
6569
:target="item.target"
66-
v-bind="props.action"
70+
:class="item.class"
71+
:style="item.style"
72+
:aria-disabled="item.disabled === true"
6773
>
6874
<i
6975
v-if="item.icon"

‎src/components/primevue/menu/MenuBar.vue‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ defineExpose({ el: childRef });
3636
</template>
3737
<template #item="{ item, props, hasSubmenu, root }">
3838
<RouterLink
39-
v-if="item.route"
39+
v-if="item.visible !== false && item.route"
4040
v-slot="{ href, navigate }"
4141
:to="item.route"
4242
custom
4343
>
4444
<a
4545
:href="href"
46-
v-bind="props.action"
47-
class="p-menubar-item-link"
48-
:class="{
49-
'font-bold! text-muted-color': item.active,
50-
}"
46+
:target="item.target"
47+
:class="['p-menubar-item-link', { 'font-bold! text-muted-color': item.active }, item.class]"
48+
:style="item.style"
49+
:aria-disabled="item.disabled === true"
50+
custom
5151
@click="navigate"
5252
>
5353
<i
@@ -64,11 +64,13 @@ defineExpose({ el: childRef });
6464
</a>
6565
</RouterLink>
6666
<a
67-
v-else
67+
v-else-if="item.visible !== false"
68+
v-bind="props.action"
6869
:href="item.url"
6970
:target="item.target"
70-
v-bind="props.action"
71-
class="p-menubar-item-link"
71+
:class="item.class"
72+
:style="item.style"
73+
:aria-disabled="item.disabled === true"
7274
>
7375
<i
7476
v-if="item.icon"

‎src/components/primevue/menu/PanelMenu.vue‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,27 @@ defineExpose({ el: childRef });
2727
ref="child-ref"
2828
v-bind="{ ...componentProps, pt: defaultPt, ptOptions: { mergeProps: ptViewMerge } }"
2929
>
30-
<template #item="{ item, root, active, hasSubmenu }">
30+
<template #item="{ item, root, active, props, hasSubmenu }">
31+
<Divider
32+
v-if="item.separator"
33+
pt:root:class="my-0"
34+
/>
3135
<RouterLink
32-
v-if="item.route"
36+
v-else-if="item.visible !== false && item.route"
3337
v-slot="{ href, navigate }"
3438
:to="item.route"
3539
custom
3640
>
3741
<a
3842
:href="href"
43+
:target="item.target"
3944
:class="[
40-
'p-panelmenu-item-link flex items-center cursor-pointer no-underline p-2',
41-
{ 'font-bold! text-muted-color': item.active }
45+
'p-panelmenu-item-link flex items-center cursor-pointer no-underline px-3 py-2',
46+
{ 'font-bold! text-muted-color': item.active },
4247
]"
48+
:style="item.style"
49+
:aria-disabled="item.disabled === true"
50+
custom
4351
@click="navigate"
4452
>
4553
<i
@@ -60,13 +68,16 @@ defineExpose({ el: childRef });
6068
</a>
6169
</RouterLink>
6270
<a
63-
v-else
71+
v-else-if="item.visible !== false"
72+
v-bind="props.action"
6473
:href="item.url"
6574
:target="item.target"
6675
:class="[
67-
'flex items-center cursor-pointer no-underline p-2',
76+
'flex items-center cursor-pointer no-underline px-3 py-2',
6877
hasSubmenu ? 'p-panelmenu-header-link' : 'p-panelmenu-item-link',
6978
]"
79+
:style="item.style"
80+
:aria-disabled="item.disabled === true"
7081
>
7182
<i
7283
v-if="item.icon"

‎src/views/auth/Register.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ onMounted(() => {
103103
</div>
104104

105105
<div class="flex flex-col gap-2">
106-
<label for="password-confirmation">Confirm Password</label>
106+
<label for="password-confirmation">Confirm password</label>
107107
<Password
108108
v-model="formData.password_confirmation"
109109
:invalid="Boolean(validationErrors?.password_confirmation)"

‎src/views/auth/ResetPassword.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ onMounted(() => {
8787
</div>
8888
8989
<div class="flex flex-col gap-2">
90-
<label for="password">New Password</label>
90+
<label for="password">New password</label>
9191
<Password
9292
v-model="formData.password"
9393
:invalid="Boolean(validationErrors?.password)"
@@ -101,7 +101,7 @@ onMounted(() => {
101101
</div>
102102
103103
<div class="flex flex-col gap-2">
104-
<label for="password-confirmation">Confirm New Password</label>
104+
<label for="password-confirmation">Confirm new password</label>
105105
<Password
106106
v-model="formData.password_confirmation"
107107
:invalid="Boolean(validationErrors?.password_confirmation)"

‎src/views/settings/Appearance.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import SelectColorModeButton from '@/components/SelectColorModeButton.vue';
55
66
const breadcrumbs = [
77
{ label: 'Dashboard', route: { name: 'dashboard' } },
8-
{ label: 'Appearance Settings' },
8+
{ label: 'Appearance settings' },
99
];
1010
</script>
1111

‎src/views/settings/Password.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import InputErrors from '@/components/InputErrors.vue';
1010
1111
const breadcrumbs = [
1212
{ label: 'Dashboard', route: { name: 'dashboard' } },
13-
{ label: 'Password Settings' },
13+
{ label: 'Password settings' },
1414
];
1515
1616
const toast = useToast();
@@ -73,7 +73,7 @@ const submit = () => {
7373
pt:caption:class="space-y-1"
7474
>
7575
<template #title>
76-
Update Password
76+
Update password
7777
</template>
7878
<template #subtitle>
7979
Ensure your account is using a long, random password to stay secure
@@ -84,7 +84,7 @@ const submit = () => {
8484
@submit.prevent="submit"
8585
>
8686
<div class="flex flex-col gap-2">
87-
<label for="current-password">Current Password</label>
87+
<label for="current-password">Current password</label>
8888
<Password
8989
ref="current-password-input"
9090
v-model="formData.current_password"
@@ -100,7 +100,7 @@ const submit = () => {
100100
</div>
101101
102102
<div class="flex flex-col gap-2">
103-
<label for="password">New Password</label>
103+
<label for="password">New password</label>
104104
<Password
105105
ref="new-password-input"
106106
v-model="formData.password"
@@ -115,7 +115,7 @@ const submit = () => {
115115
</div>
116116
117117
<div class="flex flex-col gap-2">
118-
<label for="password-confirmation">Confirm New Password</label>
118+
<label for="password-confirmation">Confirm new password</label>
119119
<Password
120120
v-model="formData.password_confirmation"
121121
:invalid="Boolean(validationErrors?.password_confirmation)"

‎src/views/settings/Profile.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import InputErrors from '@/components/InputErrors.vue';
1111
1212
const breadcrumbs = [
1313
{ label: 'Dashboard', route: { name: 'dashboard' } },
14-
{ label: 'Profile Settings' },
14+
{ label: 'Profile settings' },
1515
];
1616
1717
const toast = useToast();
@@ -58,7 +58,7 @@ const resendVerifyEmail = () => {
5858
pt:caption:class="space-y-1"
5959
>
6060
<template #title>
61-
Profile Information
61+
Profile information
6262
</template>
6363
<template #subtitle>
6464
Update your name and email address
@@ -131,7 +131,7 @@ const resendVerifyEmail = () => {
131131
pt:caption:class="space-y-1"
132132
>
133133
<template #title>
134-
Delete Account
134+
Delete account
135135
</template>
136136
<template #subtitle>
137137
Delete your account and all of its resources

0 commit comments

Comments
 (0)