Skip to content

Commit 8c648db

Browse files
connorabbasconnorabbas
authored
Merge pull request #125 from connorabbas/admin-develop
Pull master, cleanup
2 parents 6a29d9c + 53d7a38 commit 8c648db

File tree

8 files changed

+31
-33
lines changed

8 files changed

+31
-33
lines changed

‎resources/js/Layouts/Admin/Partials/DrawerMenu.vue

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const exampleNestedMenuItems = ref([
5656
icon: 'pi pi-cloud-upload',
5757
command: () => {
5858
alert('Example using programmatic functionality');
59-
}
59+
},
6060
},
6161
{
6262
label: 'Download',
@@ -72,26 +72,20 @@ const exampleNestedMenuItems = ref([
7272
</script>
7373

7474
<template>
75-
<Drawer
76-
v-model:visible="visible"
77-
position="left"
78-
:autoZIndex="false"
79-
>
80-
<div>
81-
<div class="mb-5">
82-
<p class="text-muted-color font-bold uppercase text-sm mb-2">
83-
Home
84-
</p>
75+
<Drawer v-model:visible="visible" position="left" :autoZIndex="false">
76+
<div class="space-y-5">
77+
<div class="space-y-2">
78+
<p class="text-muted-color font-bold uppercase text-sm">Home</p>
8579
<LinksPanelMenu :model="homeMenuItems" class="w-full" />
8680
</div>
87-
<div class="mb-5">
88-
<p class="text-muted-color font-bold uppercase text-sm mb-2">
81+
<div class="space-y-2">
82+
<p class="text-muted-color font-bold uppercase text-sm">
8983
Analytics
9084
</p>
9185
<LinksPanelMenu :model="analyticsMenuItems" class="w-full" />
9286
</div>
93-
<div class="mb-5">
94-
<p class="text-muted-color font-bold uppercase text-sm mb-2">
87+
<div class="space-y-2">
88+
<p class="text-muted-color font-bold uppercase text-sm">
9589
Example Nested
9690
</p>
9791
<LinksPanelMenu

‎resources/js/Layouts/Admin/Partials/SideMenuItems.vue

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,19 @@ const exampleNestedMenuItems = [
6767
</script>
6868

6969
<template>
70-
<div class="h-full">
71-
<div class="mb-5">
72-
<p class="text-muted-color font-bold uppercase text-sm mb-2">
73-
Home
74-
</p>
70+
<div class="h-full space-y-5">
71+
<div class="space-y-2">
72+
<p class="text-muted-color font-bold uppercase text-sm">Home</p>
7573
<LinksPanelMenu :model="homeMenuItems" class="w-full" />
7674
</div>
77-
<div class="mb-5">
78-
<p class="text-muted-color font-bold uppercase text-sm mb-2">
75+
<div class="space-y-2">
76+
<p class="text-muted-color font-bold uppercase text-sm">
7977
Analytics
8078
</p>
8179
<LinksPanelMenu :model="analyticsMenuItems" class="w-full" />
8280
</div>
83-
<div class="mb-5">
84-
<p class="text-muted-color font-bold uppercase text-sm mb-2">
81+
<div class="space-y-2">
82+
<p class="text-muted-color font-bold uppercase text-sm">
8583
Example Nested
8684
</p>
8785
<LinksPanelMenu :model="exampleNestedMenuItems" class="w-full" />

‎resources/js/Layouts/Admin/Partials/TopNav.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ const toggleUserMenu = (event) => {
7171
<div class="flex items-center space-x-3">
7272
<div>
7373
<ToggleDarkModeButton
74-
text
7574
severity="secondary"
75+
text
7676
rounded
7777
/>
7878
</div>

‎resources/js/Layouts/AuthenticatedLayout.vue

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ watchEffect(() => {
111111
>
112112
<div>
113113
<ToggleDarkModeButton
114-
text
115114
severity="secondary"
115+
text
116116
rounded
117117
/>
118118
</div>
@@ -168,13 +168,17 @@ watchEffect(() => {
168168
<!-- Mobile drawer menu -->
169169
<Drawer v-model:visible="mobileMenuOpen" position="right">
170170
<template #header>
171-
<ToggleDarkModeButton text severity="secondary" rounded />
171+
<ToggleDarkModeButton
172+
severity="secondary"
173+
text
174+
rounded
175+
/>
172176
</template>
173177
<div>
174-
<div>
175-
<div class="mb-5">
178+
<div class="space-y-5">
179+
<div class="space-y-2">
176180
<p
177-
class="text-muted-color font-bold uppercase text-sm mb-2"
181+
class="text-muted-color font-bold uppercase text-sm"
178182
>
179183
Home
180184
</p>

‎resources/js/Pages/Admin/Profile/Edit.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const breadcrumbs = [
2424
<template>
2525
<Head :title="pageTitle" />
2626

27-
<AdminAuthenticatedLayout
27+
<AuthenticatedAdminLayout
2828
:page-title="pageTitle"
2929
:breadcrumbs="breadcrumbs"
3030
>
@@ -96,5 +96,5 @@ const breadcrumbs = [
9696
</Card>
9797
</div>
9898
</Container>
99-
</AdminAuthenticatedLayout>
99+
</AuthenticatedAdminLayout>
100100
</template>

‎resources/js/Pages/Admin/Profile/Partials/DeleteUserForm.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ function focusPasswordInput() {
2828
<Dialog
2929
v-model:visible="modalOpen"
3030
:draggable="false"
31+
:dismissableMask="true"
3132
position="center"
3233
modal
3334
header="Are you sure you want to delete your account?"

‎resources/js/Pages/Admin/Users/Index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ const {
8787
/>
8888
<DataTable
8989
ref="dataTable"
90+
v-model:filters="filters"
9091
lazy
9192
paginator
9293
removableSort
9394
resizableColumns
9495
columnResizeMode="fit"
95-
v-model:filters="filters"
9696
:loading="processing"
9797
:value="users.data"
9898
:totalRecords="users.total"

‎resources/js/Pages/Profile/Partials/DeleteUserForm.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ function focusPasswordInput() {
2828
<Dialog
2929
v-model:visible="modalOpen"
3030
:draggable="false"
31+
:dismissableMask="true"
3132
position="center"
3233
modal
3334
header="Are you sure you want to delete your account?"

0 commit comments

Comments
 (0)