Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/components/primevue/menu/Breadcrumb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,18 @@ defineExpose({ el: childRef });
>
<template #item="{ item, props }">
<RouterLink
v-if="item.route"
v-if="item.visible !== false && item.route"
v-slot="{ href, navigate }"
:to="item.route"
custom
>
<a
:href="href"
v-bind="props.action"
class="p-breadcrumb-item-link"
:target="item.target"
:class="['p-breadcrumb-item-link', item.class]"
:style="item.style"
:aria-disabled="item.disabled === true"
custom
@click="navigate"
>
<i
Expand All @@ -51,10 +54,13 @@ defineExpose({ el: childRef });
</a>
</RouterLink>
<a
v-else
v-else-if="item.visible !== false"
v-bind="props.action"
:href="item.url"
:target="item.target"
v-bind="props.action"
:class="item.class"
:style="item.style"
:aria-disabled="item.disabled === true"
>
<i
v-if="item.icon"
Expand Down
16 changes: 11 additions & 5 deletions src/components/primevue/menu/Menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,18 @@ defineExpose({
</template>
<template #item="{ item, props }">
<RouterLink
v-if="item.route"
v-if="item.visible !== false && item.route"
v-slot="{ href, navigate }"
:to="item.route"
custom
>
<a
:href="href"
v-bind="props.action"
class="p-menu-item-link"
:target="item.target"
:class="['p-menu-item-link', item.class]"
:style="item.style"
:aria-disabled="item.disabled === true"
custom
@click="navigate"
>
<i
Expand All @@ -60,10 +63,13 @@ defineExpose({
</a>
</RouterLink>
<a
v-else
v-else-if="item.visible !== false"
v-bind="props.action"
:href="item.url"
:target="item.target"
v-bind="props.action"
:class="item.class"
:style="item.style"
:aria-disabled="item.disabled === true"
>
<i
v-if="item.icon"
Expand Down
20 changes: 11 additions & 9 deletions src/components/primevue/menu/MenuBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ defineExpose({ el: childRef });
</template>
<template #item="{ item, props, hasSubmenu, root }">
<RouterLink
v-if="item.route"
v-if="item.visible !== false && item.route"
v-slot="{ href, navigate }"
:to="item.route"
custom
>
<a
:href="href"
v-bind="props.action"
class="p-menubar-item-link"
:class="{
'font-bold! text-muted-color': item.active,
}"
:target="item.target"
:class="['p-menubar-item-link', { 'font-bold! text-muted-color': item.active }, item.class]"
:style="item.style"
:aria-disabled="item.disabled === true"
custom
@click="navigate"
>
<i
Expand All @@ -64,11 +64,13 @@ defineExpose({ el: childRef });
</a>
</RouterLink>
<a
v-else
v-else-if="item.visible !== false"
v-bind="props.action"
:href="item.url"
:target="item.target"
v-bind="props.action"
class="p-menubar-item-link"
:class="item.class"
:style="item.style"
:aria-disabled="item.disabled === true"
>
<i
v-if="item.icon"
Expand Down
23 changes: 17 additions & 6 deletions src/components/primevue/menu/PanelMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,27 @@ defineExpose({ el: childRef });
ref="child-ref"
v-bind="{ ...componentProps, pt: defaultPt, ptOptions: { mergeProps: ptViewMerge } }"
>
<template #item="{ item, root, active, hasSubmenu }">
<template #item="{ item, root, active, props, hasSubmenu }">
<Divider
v-if="item.separator"
pt:root:class="my-0"
/>
<RouterLink
v-if="item.route"
v-else-if="item.visible !== false && item.route"
v-slot="{ href, navigate }"
:to="item.route"
custom
>
<a
:href="href"
:target="item.target"
:class="[
'p-panelmenu-item-link flex items-center cursor-pointer no-underline p-2',
{ 'font-bold! text-muted-color': item.active }
'p-panelmenu-item-link flex items-center cursor-pointer no-underline px-3 py-2',
{ 'font-bold! text-muted-color': item.active },
]"
:style="item.style"
:aria-disabled="item.disabled === true"
custom
@click="navigate"
>
<i
Expand All @@ -60,13 +68,16 @@ defineExpose({ el: childRef });
</a>
</RouterLink>
<a
v-else
v-else-if="item.visible !== false"
v-bind="props.action"
:href="item.url"
:target="item.target"
:class="[
'flex items-center cursor-pointer no-underline p-2',
'flex items-center cursor-pointer no-underline px-3 py-2',
hasSubmenu ? 'p-panelmenu-header-link' : 'p-panelmenu-item-link',
]"
:style="item.style"
:aria-disabled="item.disabled === true"
>
<i
v-if="item.icon"
Expand Down
2 changes: 1 addition & 1 deletion src/views/auth/Register.vue
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ onMounted(() => {
</div>

<div class="flex flex-col gap-2">
<label for="password-confirmation">Confirm Password</label>
<label for="password-confirmation">Confirm password</label>
<Password
v-model="formData.password_confirmation"
:invalid="Boolean(validationErrors?.password_confirmation)"
Expand Down
4 changes: 2 additions & 2 deletions src/views/auth/ResetPassword.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ onMounted(() => {
</div>

<div class="flex flex-col gap-2">
<label for="password">New Password</label>
<label for="password">New password</label>
<Password
v-model="formData.password"
:invalid="Boolean(validationErrors?.password)"
Expand All @@ -101,7 +101,7 @@ onMounted(() => {
</div>

<div class="flex flex-col gap-2">
<label for="password-confirmation">Confirm New Password</label>
<label for="password-confirmation">Confirm new password</label>
<Password
v-model="formData.password_confirmation"
:invalid="Boolean(validationErrors?.password_confirmation)"
Expand Down
2 changes: 1 addition & 1 deletion src/views/settings/Appearance.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import SelectColorModeButton from '@/components/SelectColorModeButton.vue';

const breadcrumbs = [
{ label: 'Dashboard', route: { name: 'dashboard' } },
{ label: 'Appearance Settings' },
{ label: 'Appearance settings' },
];
</script>

Expand Down
10 changes: 5 additions & 5 deletions src/views/settings/Password.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import InputErrors from '@/components/InputErrors.vue';

const breadcrumbs = [
{ label: 'Dashboard', route: { name: 'dashboard' } },
{ label: 'Password Settings' },
{ label: 'Password settings' },
];

const toast = useToast();
Expand Down Expand Up @@ -73,7 +73,7 @@ const submit = () => {
pt:caption:class="space-y-1"
>
<template #title>
Update Password
Update password
</template>
<template #subtitle>
Ensure your account is using a long, random password to stay secure
Expand All @@ -84,7 +84,7 @@ const submit = () => {
@submit.prevent="submit"
>
<div class="flex flex-col gap-2">
<label for="current-password">Current Password</label>
<label for="current-password">Current password</label>
<Password
ref="current-password-input"
v-model="formData.current_password"
Expand All @@ -100,7 +100,7 @@ const submit = () => {
</div>

<div class="flex flex-col gap-2">
<label for="password">New Password</label>
<label for="password">New password</label>
<Password
ref="new-password-input"
v-model="formData.password"
Expand All @@ -115,7 +115,7 @@ const submit = () => {
</div>

<div class="flex flex-col gap-2">
<label for="password-confirmation">Confirm New Password</label>
<label for="password-confirmation">Confirm new password</label>
<Password
v-model="formData.password_confirmation"
:invalid="Boolean(validationErrors?.password_confirmation)"
Expand Down
6 changes: 3 additions & 3 deletions src/views/settings/Profile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import InputErrors from '@/components/InputErrors.vue';

const breadcrumbs = [
{ label: 'Dashboard', route: { name: 'dashboard' } },
{ label: 'Profile Settings' },
{ label: 'Profile settings' },
];

const toast = useToast();
Expand Down Expand Up @@ -58,7 +58,7 @@ const resendVerifyEmail = () => {
pt:caption:class="space-y-1"
>
<template #title>
Profile Information
Profile information
</template>
<template #subtitle>
Update your name and email address
Expand Down Expand Up @@ -131,7 +131,7 @@ const resendVerifyEmail = () => {
pt:caption:class="space-y-1"
>
<template #title>
Delete Account
Delete account
</template>
<template #subtitle>
Delete your account and all of its resources
Expand Down