wip

SethSharp · Aug 26, 2024 · 497fdd9 · 497fdd9
1 parent 94fb9a4
commit 497fdd9
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 89 deletions.
diff --git a/app/Http/Controllers/Dashboard/Blogs/IndexBlogsController.php b/app/Http/Controllers/Dashboard/Blogs/IndexBlogsController.php
@@ -27,8 +27,7 @@ public function __invoke(): Response
                 AllowedFilter::custom('q', new BlogSearchFilter()),
             ])
             ->when($currentStatus->value === BlogStatus::PUBLISHED->value, fn ($query) => $query->orderByDesc('published_at'))
-            ->paginate(9)
-            ->withQueryString();
+            ->paginate(10);
 
         return Inertia::render('Dashboard/Blogs/Index', [
             'blogs' => $blogs,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
         "@alpinejs/intersect": "^3.13.7",
         "@headlessui/vue": "^1.7.16",
         "@heroicons/vue": "^2.0.18",
-        "@sethsharp/ui": "1.0.0-alpha.2.0.36",
+        "@sethsharp/ui": "1.0.0-alpha.2.0.40",
         "@tiptap/extension-bubble-menu": "^2.2.1",
         "@tiptap/extension-code-block-lowlight": "^2.2.4",
         "@tiptap/extension-document": "^2.2.1",

diff --git a/resources/js/Layouts/AuthenticatedLayout.vue b/resources/js/Layouts/AuthenticatedLayout.vue
@@ -2,7 +2,14 @@
 import { ref } from 'vue'
 import { useDark } from '@vueuse/core'
 import { Head, Link } from '@inertiajs/vue3'
-import { Notifications, Dropdown, DropdownMenuLink, SecondaryButton, Toggle } from '@sethsharp/ui'
+import {
+    Notifications,
+    Dropdown,
+    DropdownMenuLink,
+    BaseDropdownMenuItem,
+    SecondaryButton,
+    Toggle,
+} from '@sethsharp/ui'
 import NavLink from '@/Components/Links/NavLink.vue'
 import ApplicationLogo from '@/Components/ApplicationLogo.vue'
 import ResponsiveNavLink from '@/Components/Links/ResponsiveNavLink.vue'
@@ -89,9 +96,12 @@ const isDark = useDark({
                                         Portfolio
                                     </DropdownMenuLink>
 
-                                    <div class="flex justify-start px-2">
-                                        Dark Mode: <Toggle v-model="isDark" />
-                                    </div>
+                                    <BaseDropdownMenuItem>
+                                        <div class="flex gap-2">
+                                            <span class="my-auto">Dark Mode: </span>
+                                            <Toggle v-model="isDark" />
+                                        </div>
+                                    </BaseDropdownMenuItem>
 
                                     <DropdownMenuLink
                                         method="post"

diff --git a/resources/js/Layouts/IndexTagsLayout.vue b/resources/js/Layouts/IndexTagsLayout.vue
@@ -1,8 +1,9 @@
 <script setup>
-import { Tabs } from '@sethsharp/ui'
+import { onMounted } from 'vue'
+import { Pagination, Tabs } from '@sethsharp/ui'
 import AuthenticatedLayout from '@/Layouts/AuthenticatedLayout.vue'
 
-defineProps({
+const props = defineProps({
     status: String,
     tabs: Object,
     count: Number,
@@ -12,6 +13,11 @@ defineProps({
         required: false,
     },
 })
+
+onMounted(() => {
+    props.data.links.shift()
+    props.data.links.pop()
+})
 </script>
 
 <template>
@@ -21,8 +27,10 @@ defineProps({
                 <slot name="header" />
             </div>
 
-            <Tabs :tabs="tabs" :data="data">
+            <Tabs :tabs="tabs">
                 <slot />
+
+                <Pagination :data="data" />
             </Tabs>
         </div>
     </AuthenticatedLayout>

diff --git a/resources/js/Pages/Dashboard/Blogs/Index.vue b/resources/js/Pages/Dashboard/Blogs/Index.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { router, Link } from '@inertiajs/vue3'
 import { SecondaryButton, PrimaryButton, Text } from '@sethsharp/ui'
 import Blog from '@/Components/Cards/Blog.vue'
@@ -33,6 +33,11 @@ watch(search, (newSearch) => {
         visitSearch()
     }
 })
+
+onMounted(() => {
+    props.blogs.links.shift()
+    props.blogs.links.pop()
+})
 </script>
 
 <template>