diff --git a/resources/js/Pages/Auth/ConfirmPassword.vue b/resources/js/Pages/Auth/ConfirmPassword.vue index 466ee4f..95e2c77 100644 --- a/resources/js/Pages/Auth/ConfirmPassword.vue +++ b/resources/js/Pages/Auth/ConfirmPassword.vue @@ -5,6 +5,7 @@ import InputLabel from '@/Components/Forms/InputLabel.vue'; import Button from '@/Components/Button.vue'; import TextInput from '@/Components/Forms/TextInput.vue'; import { Head, useForm } from '@inertiajs/vue3'; +import GeneralLayout from '@/Layouts/GeneralLayout.vue'; const form = useForm({ password: '', @@ -18,37 +19,39 @@ const submit = () => { diff --git a/resources/js/Pages/Auth/ForgotPassword.vue b/resources/js/Pages/Auth/ForgotPassword.vue index fefcec5..b4f04eb 100644 --- a/resources/js/Pages/Auth/ForgotPassword.vue +++ b/resources/js/Pages/Auth/ForgotPassword.vue @@ -5,6 +5,7 @@ import InputLabel from '@/Components/Forms/InputLabel.vue'; import Button from '@/Components/Button.vue'; import TextInput from '@/Components/Forms/TextInput.vue'; import { Head, useForm } from '@inertiajs/vue3'; +import GeneralLayout from '@/Layouts/GeneralLayout.vue'; defineProps({ @@ -23,44 +24,46 @@ const submit = () => { diff --git a/resources/js/Pages/Auth/Login.vue b/resources/js/Pages/Auth/Login.vue index de12080..ff5bb73 100644 --- a/resources/js/Pages/Auth/Login.vue +++ b/resources/js/Pages/Auth/Login.vue @@ -7,6 +7,7 @@ import Button from '@/Components/Button.vue'; import TextInput from '@/Components/Forms/TextInput.vue'; import { Head, Link, useForm } from '@inertiajs/vue3'; import ProvidersAuth from './Partials/ProvidersAuth.vue'; +import GeneralLayout from '@/Layouts/GeneralLayout.vue'; defineProps({ @@ -33,70 +34,72 @@ const submit = () => { diff --git a/resources/js/Pages/Auth/Register.vue b/resources/js/Pages/Auth/Register.vue index 6fa3de2..8cc64ab 100644 --- a/resources/js/Pages/Auth/Register.vue +++ b/resources/js/Pages/Auth/Register.vue @@ -6,6 +6,7 @@ import Button from '@/Components/Button.vue'; import TextInput from '@/Components/Forms/TextInput.vue'; import { Head, Link, useForm } from '@inertiajs/vue3'; import ProvidersAuth from './Partials/ProvidersAuth.vue'; +import GeneralLayout from '@/Layouts/GeneralLayout.vue'; const form = useForm({ @@ -23,94 +24,96 @@ const submit = () => { diff --git a/resources/js/Pages/Auth/ResetPassword.vue b/resources/js/Pages/Auth/ResetPassword.vue index 33da73c..32ed53a 100644 --- a/resources/js/Pages/Auth/ResetPassword.vue +++ b/resources/js/Pages/Auth/ResetPassword.vue @@ -5,6 +5,7 @@ import InputLabel from '@/Components/Forms/InputLabel.vue'; import Button from '@/Components/Button.vue'; import TextInput from '@/Components/Forms/TextInput.vue'; import { Head, useForm } from '@inertiajs/vue3'; +import GeneralLayout from '@/Layouts/GeneralLayout.vue'; const props = defineProps({ @@ -33,69 +34,71 @@ const submit = () => { diff --git a/resources/js/Pages/Auth/VerifyEmail.vue b/resources/js/Pages/Auth/VerifyEmail.vue index d2a21c6..a227cc5 100644 --- a/resources/js/Pages/Auth/VerifyEmail.vue +++ b/resources/js/Pages/Auth/VerifyEmail.vue @@ -3,6 +3,7 @@ import { computed } from 'vue'; import GuestLayout from '@/Layouts/GuestLayout.vue'; import Button from '@/Components/Button.vue'; import { Head, Link, useForm } from '@inertiajs/vue3'; +import GeneralLayout from '@/Layouts/GeneralLayout.vue'; const props = defineProps({ status: { @@ -22,39 +23,41 @@ const verificationLinkSent = computed( diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue index a51ffd9..8fd0797 100644 --- a/resources/js/Pages/Dashboard.vue +++ b/resources/js/Pages/Dashboard.vue @@ -1,27 +1,31 @@ diff --git a/resources/js/Pages/Post/CreatePost.vue b/resources/js/Pages/Post/CreatePost.vue index a4b8005..88b2d92 100644 --- a/resources/js/Pages/Post/CreatePost.vue +++ b/resources/js/Pages/Post/CreatePost.vue @@ -1,14 +1,17 @@ diff --git a/resources/js/Pages/Post/EditPost.vue b/resources/js/Pages/Post/EditPost.vue index 845a6d4..fe956df 100644 --- a/resources/js/Pages/Post/EditPost.vue +++ b/resources/js/Pages/Post/EditPost.vue @@ -1,14 +1,17 @@ diff --git a/resources/js/Pages/Post/Post.vue b/resources/js/Pages/Post/Post.vue index c48df52..ffc19b4 100644 --- a/resources/js/Pages/Post/Post.vue +++ b/resources/js/Pages/Post/Post.vue @@ -1,8 +1,8 @@ diff --git a/resources/js/Pages/Welcome.vue b/resources/js/Pages/Welcome.vue index fdf4ec6..7f5c2fa 100644 --- a/resources/js/Pages/Welcome.vue +++ b/resources/js/Pages/Welcome.vue @@ -3,6 +3,7 @@ import { Head, Link } from '@inertiajs/vue3'; import Hero from '@/Components/Home/Hero.vue'; import Trusted from '@/Components/Home/Trusted.vue'; import BlogSection from '@/Components/Blog/BlogSection.vue'; +import GeneralLayout from '@/Layouts/GeneralLayout.vue'; const props = defineProps({ posts: { @@ -14,13 +15,14 @@ const props = defineProps({ diff --git a/resources/js/app.js b/resources/js/app.js index a02f329..74c6e2e 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -5,7 +5,6 @@ import { createInertiaApp } from '@inertiajs/vue3'; import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'; import { createApp, h } from 'vue'; import { ZiggyVue } from '../../vendor/tightenco/ziggy'; -import GeneralLayout from '@/Layouts/GeneralLayout.vue'; import i18n, { setLocale } from '@/i18n'; const appName = import.meta.env.VITE_APP_NAME || 'Laravel'; @@ -14,11 +13,6 @@ createInertiaApp({ title: (title) => `${title} - ${appName}`, resolve: (name) => { const page = resolvePageComponent(`./Pages/${name}.vue`, import.meta.glob('./Pages/**/*.vue')); - page.then((module) => { - if (!module.default.layout) { - module.default.layout = GeneralLayout; - } - }); return page; }, setup({ el, App, props, plugin }) {