Skip to content

Commit 99092f5

Browse files
authored
Merge pull request #402 from connorabbas/develop
Patch - Adjusted error messaging, router link menus namespace
2 parents a4345ff + 3357059 commit 99092f5

File tree

11 files changed

+8
-8
lines changed

11 files changed

+8
-8
lines changed

bootstrap/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@
6969
->setStatusCode($statusCode);
7070
} else {
7171
// Return JSON response for PrimeVue toast to display, handled by Inertia router event listener
72-
$errorSummary = "$statusCode - $errorTitles[$statusCode]";
72+
$errorSummary = "$errorTitles[$statusCode] - $statusCode";
7373
$errorDetail = $errorDetails[$statusCode];
7474
if (get_class($exception) === ErrorToastException::class) {
75-
$errorSummary = "$statusCode - Error";
75+
$errorSummary = "Error";
7676
$errorDetail = $exception->getMessage();
7777
}
7878
return response()->json([

resources/js/components/PopupMenuButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
99
import { computed, useTemplateRef } from 'vue'
10-
import Menu from '@/components/primevue/menu/Menu.vue'
10+
import Menu from '@/components/router-link-menus/Menu.vue'
1111
import Button, { type ButtonProps } from 'primevue/button'
1212
import { ChevronDown } from 'lucide-vue-next'
1313
import { MenuItem } from '@/types'

resources/js/components/primevue/menu/Breadcrumb.vue renamed to resources/js/components/router-link-menus/Breadcrumb.vue

File renamed without changes.

resources/js/components/primevue/menu/ContextMenu.vue renamed to resources/js/components/router-link-menus/ContextMenu.vue

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

resources/js/components/primevue/menu/TieredMenu.vue renamed to resources/js/components/router-link-menus/TieredMenu.vue

File renamed without changes.

resources/js/layouts/app/HeaderLayout.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import Container from '@/components/Container.vue'
77
import PopupMenuButton from '@/components/PopupMenuButton.vue'
88
import NavLogoLink from '@/components/NavLogoLink.vue'
99
import FlashMessages from '@/components/FlashMessages.vue'
10-
import Menubar from '@/components/primevue/menu/Menubar.vue'
11-
import PanelMenu from '@/components/primevue/menu/PanelMenu.vue'
12-
import Breadcrumb from '@/components/primevue/menu/Breadcrumb.vue'
10+
import Menubar from '@/components/router-link-menus/Menubar.vue'
11+
import PanelMenu from '@/components/router-link-menus/PanelMenu.vue'
12+
import Breadcrumb from '@/components/router-link-menus/Breadcrumb.vue'
1313
import { MenuItem } from '@/types'
1414
1515
const props = withDefaults(defineProps<{

0 commit comments

Comments
 (0)