Skip to content

Pull master, cleanup #125

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
merged 7 commits into from
Jan 14, 2025
Merged

Pull master, cleanup #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aaa42e9
spacing cleanup
connorabbas Jan 14, 2025
8c6354e
Cleanup
connorabbas Jan 14, 2025
8ed33c7
Merge pull request #123 from connorabbas/develop
connorabbas Jan 14, 2025
7b4a7a3
Merge branch 'master' of github.com:connorabbas/laravel-inertia-prime…
connorabbas Jan 14, 2025
5a8825d
cleanup
connorabbas Jan 14, 2025
1ff619d
fix
connorabbas Jan 14, 2025
53d7a38
eslint
connorabbas Jan 14, 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
24 changes: 9 additions & 15 deletions resources/js/Layouts/Admin/Partials/DrawerMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const exampleNestedMenuItems = ref([
icon: 'pi pi-cloud-upload',
command: () => {
alert('Example using programmatic functionality');
}
},
},
{
label: 'Download',
Expand All @@ -72,26 +72,20 @@ const exampleNestedMenuItems = ref([
</script>

<template>
<Drawer
v-model:visible="visible"
position="left"
:autoZIndex="false"
>
<div>
<div class="mb-5">
<p class="text-muted-color font-bold uppercase text-sm mb-2">
Home
</p>
<Drawer v-model:visible="visible" position="left" :autoZIndex="false">
<div class="space-y-5">
<div class="space-y-2">
<p class="text-muted-color font-bold uppercase text-sm">Home</p>
<LinksPanelMenu :model="homeMenuItems" class="w-full" />
</div>
<div class="mb-5">
<p class="text-muted-color font-bold uppercase text-sm mb-2">
<div class="space-y-2">
<p class="text-muted-color font-bold uppercase text-sm">
Analytics
</p>
<LinksPanelMenu :model="analyticsMenuItems" class="w-full" />
</div>
<div class="mb-5">
<p class="text-muted-color font-bold uppercase text-sm mb-2">
<div class="space-y-2">
<p class="text-muted-color font-bold uppercase text-sm">
Example Nested
</p>
<LinksPanelMenu
Expand Down
16 changes: 7 additions & 9 deletions resources/js/Layouts/Admin/Partials/SideMenuItems.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,19 @@ const exampleNestedMenuItems = [
</script>

<template>
<div class="h-full">
<div class="mb-5">
<p class="text-muted-color font-bold uppercase text-sm mb-2">
Home
</p>
<div class="h-full space-y-5">
<div class="space-y-2">
<p class="text-muted-color font-bold uppercase text-sm">Home</p>
<LinksPanelMenu :model="homeMenuItems" class="w-full" />
</div>
<div class="mb-5">
<p class="text-muted-color font-bold uppercase text-sm mb-2">
<div class="space-y-2">
<p class="text-muted-color font-bold uppercase text-sm">
Analytics
</p>
<LinksPanelMenu :model="analyticsMenuItems" class="w-full" />
</div>
<div class="mb-5">
<p class="text-muted-color font-bold uppercase text-sm mb-2">
<div class="space-y-2">
<p class="text-muted-color font-bold uppercase text-sm">
Example Nested
</p>
<LinksPanelMenu :model="exampleNestedMenuItems" class="w-full" />
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Layouts/Admin/Partials/TopNav.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ const toggleUserMenu = (event) => {
<div class="flex items-center space-x-3">
<div>
<ToggleDarkModeButton
text
severity="secondary"
text
rounded
/>
</div>
Expand Down
14 changes: 9 additions & 5 deletions resources/js/Layouts/AuthenticatedLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ watchEffect(() => {
>
<div>
<ToggleDarkModeButton
text
severity="secondary"
text
rounded
/>
</div>
Expand Down Expand Up @@ -168,13 +168,17 @@ watchEffect(() => {
<!-- Mobile drawer menu -->
<Drawer v-model:visible="mobileMenuOpen" position="right">
<template #header>
<ToggleDarkModeButton text severity="secondary" rounded />
<ToggleDarkModeButton
severity="secondary"
text
rounded
/>
</template>
<div>
<div>
<div class="mb-5">
<div class="space-y-5">
<div class="space-y-2">
<p
class="text-muted-color font-bold uppercase text-sm mb-2"
class="text-muted-color font-bold uppercase text-sm"
>
Home
</p>
Expand Down
4 changes: 2 additions & 2 deletions resources/js/Pages/Admin/Profile/Edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const breadcrumbs = [
<template>
<Head :title="pageTitle" />

<AdminAuthenticatedLayout
<AuthenticatedAdminLayout
:page-title="pageTitle"
:breadcrumbs="breadcrumbs"
>
Expand Down Expand Up @@ -96,5 +96,5 @@ const breadcrumbs = [
</Card>
</div>
</Container>
</AdminAuthenticatedLayout>
</AuthenticatedAdminLayout>
</template>
1 change: 1 addition & 0 deletions resources/js/Pages/Admin/Profile/Partials/DeleteUserForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function focusPasswordInput() {
<Dialog
v-model:visible="modalOpen"
:draggable="false"
:dismissableMask="true"
position="center"
modal
header="Are you sure you want to delete your account?"
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 @@ -87,12 +87,12 @@ const {
/>
<DataTable
ref="dataTable"
v-model:filters="filters"
lazy
paginator
removableSort
resizableColumns
columnResizeMode="fit"
v-model:filters="filters"
:loading="processing"
:value="users.data"
:totalRecords="users.total"
Expand Down
1 change: 1 addition & 0 deletions resources/js/Pages/Profile/Partials/DeleteUserForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function focusPasswordInput() {
<Dialog
v-model:visible="modalOpen"
:draggable="false"
:dismissableMask="true"
position="center"
modal
header="Are you sure you want to delete your account?"
Expand Down
Loading