Skip to content

Pull master #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connorabbas merged 5 commits into from
Dec 17, 2025
Merged

Pull master #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3357059
patch: adjusted error messaging, adjusted router link menus namespace
connorabbas Dec 17, 2025
99092f5
Merge pull request #402 from connorabbas/develop
connorabbas Dec 17, 2025
f00ea8e
Merge branch 'master' of github.com:connorabbas/laravel-primevue-star…
connorabbas Dec 17, 2025
e1332ac
fix: router menu namespace
connorabbas Dec 17, 2025
e610387
patch: adjusted menu button gap
connorabbas Dec 17, 2025
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
4 changes: 2 additions & 2 deletions bootstrap/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@
->setStatusCode($statusCode);
} else {
// Return JSON response for PrimeVue toast to display, handled by Inertia router event listener
$errorSummary = "$statusCode - $errorTitles[$statusCode]";
$errorSummary = "$errorTitles[$statusCode] - $statusCode";
$errorDetail = $errorDetails[$statusCode];
if (get_class($exception) === ErrorToastException::class) {
$errorSummary = "$statusCode - Error";
$errorSummary = "Error";
$errorDetail = $exception->getMessage();
}
return response()->json([
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/PopupMenuButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import { computed, useTemplateRef } from 'vue'
import Menu from '@/components/primevue/menu/Menu.vue'
import Menu from '@/components/router-link-menus/Menu.vue'
import Button, { type ButtonProps } from 'primevue/button'
import { ChevronDown } from 'lucide-vue-next'
import { MenuItem } from '@/types'
Expand Down
0 ...s/components/primevue/menu/Breadcrumb.vue → ...mponents/router-link-menus/Breadcrumb.vue
View file
Open in desktop
File renamed without changes.
0 .../components/primevue/menu/ContextMenu.vue → ...ponents/router-link-menus/ContextMenu.vue
View file
Open in desktop
File renamed without changes.
0 ...rces/js/components/primevue/menu/Menu.vue → .../js/components/router-link-menus/Menu.vue
View file
Open in desktop
File renamed without changes.
0 ...s/js/components/primevue/menu/Menubar.vue → .../components/router-link-menus/Menubar.vue
View file
Open in desktop
File renamed without changes.
0 ...js/components/primevue/menu/PanelMenu.vue → ...omponents/router-link-menus/PanelMenu.vue
View file
Open in desktop
File renamed without changes.
0 ...s/js/components/primevue/menu/TabMenu.vue → .../components/router-link-menus/TabMenu.vue
View file
Open in desktop
File renamed without changes.
0 ...s/components/primevue/menu/TieredMenu.vue → ...mponents/router-link-menus/TieredMenu.vue
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions resources/js/layouts/app/HeaderLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import Container from '@/components/Container.vue'
import PopupMenuButton from '@/components/PopupMenuButton.vue'
import NavLogoLink from '@/components/NavLogoLink.vue'
import FlashMessages from '@/components/FlashMessages.vue'
import Menubar from '@/components/primevue/menu/Menubar.vue'
import PanelMenu from '@/components/primevue/menu/PanelMenu.vue'
import Breadcrumb from '@/components/primevue/menu/Breadcrumb.vue'
import Menubar from '@/components/router-link-menus/Menubar.vue'
import PanelMenu from '@/components/router-link-menus/PanelMenu.vue'
import Breadcrumb from '@/components/router-link-menus/Breadcrumb.vue'
import { MenuItem } from '@/types'

const props = withDefaults(defineProps<{
Expand Down Expand Up @@ -44,13 +44,13 @@ const {
</div>
<template #footer>
<PopupMenuButton
class="w-full flex items-center justify-between gap-3"
class="w-full flex items-center justify-between gap-2"
name="mobile-user-menu-dd"
severity="secondary"
size="large"
:menu-items="userMenuItems"
>
<div class="flex items-center gap-3">
<div class="flex items-center gap-2">
<Tag
v-if="page.props.auth.isAdmin"
value="ADMIN"
Expand Down Expand Up @@ -87,13 +87,13 @@ const {
<!-- User Dropdown Menu -->
<div class="hidden lg:flex">
<PopupMenuButton
class="w-full flex items-center justify-between gap-3"
class="w-full flex items-center justify-between gap-2"
name="desktop-user-menu-dd"
side="right"
severity="secondary"
:menu-items="userMenuItems"
>
<div class="flex items-center gap-3">
<div class="flex items-center gap-2">
<Tag
v-if="page.props.auth.isAdmin"
value="ADMIN"
Expand Down
12 changes: 6 additions & 6 deletions resources/js/layouts/app/SidebarLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import Container from '@/components/Container.vue'
import PopupMenuButton from '@/components/PopupMenuButton.vue'
import FlashMessages from '@/components/FlashMessages.vue'
import NavLogoLink from '@/components/NavLogoLink.vue'
import PanelMenu from '@/components/primevue/menu/PanelMenu.vue'
import Breadcrumb from '@/components/primevue/menu/Breadcrumb.vue'
import PanelMenu from '@/components/router-link-menus/PanelMenu.vue'
import Breadcrumb from '@/components/router-link-menus/Breadcrumb.vue'
import { MenuItem } from '@/types'

const props = withDefaults(defineProps<{
Expand Down Expand Up @@ -42,13 +42,13 @@ const {
</div>
<template #footer>
<PopupMenuButton
class="w-full flex items-center justify-between gap-3"
class="w-full flex items-center justify-between gap-2"
name="mobile-user-menu-dd"
severity="secondary"
size="large"
:menu-items="userMenuItems"
>
<div class="flex items-center gap-3">
<div class="flex items-center gap-2">
<Tag
v-if="page.props.auth.isAdmin"
value="ADMIN"
Expand Down Expand Up @@ -111,12 +111,12 @@ const {
</div>
<div>
<PopupMenuButton
class="w-full flex items-center justify-between gap-3"
class="w-full flex items-center justify-between gap-2"
name="desktop-user-menu-dd"
severity="secondary"
:menu-items="userMenuItems"
>
<div class="flex items-center gap-3">
<div class="flex items-center gap-2">
<Tag
v-if="page.props.auth.isAdmin"
value="ADMIN"
Expand Down
2 changes: 1 addition & 1 deletion resources/js/pages/admin/users/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { usePaginatedDataTable } from '@/composables/usePaginatedDataTable'
import AppLayout from '@/layouts/AppLayout.vue'
import PageTitleSection from '@/components/PageTitleSection.vue'
import ClientOnly from '@/components/ClientOnly.vue'
import Menu from '@/components/primevue/menu/Menu.vue'
import Menu from '@/components/router-link-menus/Menu.vue'
import { LengthAwarePaginator } from '@/types/paginiation'
import { MenuItem, User } from '@/types'

Expand Down