Skip to content
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

Jump to bottom

Ensure Inertia pages are children of AppLayout #1517

Draft
wants to merge 1 commit into
base: 5.x
Choose a base branch
from
Draft

Ensure Inertia pages are children of AppLayout #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ composer.lock
/phpunit.xml
/.phpunit.cache
.phpunit.result.cache
.idea
1 change: 1 addition & 0 deletions src/Console/InstallCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ protected function installInertiaStack()

// Inertia Pages...
copy(__DIR__.'/../../stubs/inertia/resources/js/Pages/Dashboard.vue', resource_path('js/Pages/Dashboard.vue'));
copy(__DIR__.'/../../stubs/inertia/resources/js/Pages/PageContainer.vue', resource_path('js/Pages/PageContainer.vue'));
copy(__DIR__.'/../../stubs/inertia/resources/js/Pages/PrivacyPolicy.vue', resource_path('js/Pages/PrivacyPolicy.vue'));
copy(__DIR__.'/../../stubs/inertia/resources/js/Pages/TermsOfService.vue', resource_path('js/Pages/TermsOfService.vue'));
copy(__DIR__.'/../../stubs/inertia/resources/js/Pages/Welcome.vue', resource_path('js/Pages/Welcome.vue'));
Expand Down
15 changes: 1 addition & 14 deletions stubs/inertia/resources/js/Layouts/AppLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<script setup>
import { ref } from 'vue';
import { Head, Link, router } from '@inertiajs/vue3';
import { Link, router } from '@inertiajs/vue3';
import ApplicationMark from '@/Components/ApplicationMark.vue';
import Banner from '@/Components/Banner.vue';
import Dropdown from '@/Components/Dropdown.vue';
import DropdownLink from '@/Components/DropdownLink.vue';
import NavLink from '@/Components/NavLink.vue';
import ResponsiveNavLink from '@/Components/ResponsiveNavLink.vue';

defineProps({
title: String,
});

const showingNavigationDropdown = ref(false);

const switchToTeam = (team) => {
Expand All @@ -29,8 +25,6 @@ const logout = () => {

<template>
<div>
<Head :title="title" />

<Banner />

<div class="min-h-screen bg-gray-100 dark:bg-gray-900">
Expand Down Expand Up @@ -273,13 +267,6 @@ const logout = () => {
</div>
</nav>

<!-- Page Heading -->
<header v-if="$slots.header" class="bg-white dark:bg-gray-800 shadow">
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
<slot name="header" />
</div>
</header>

<!-- Page Content -->
<main>
<slot />
Expand Down
9 changes: 7 additions & 2 deletions stubs/inertia/resources/js/Pages/API/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<script setup>
import ApiTokenManager from '@/Pages/API/Partials/ApiTokenManager.vue';
import AppLayout from '@/Layouts/AppLayout.vue';
import PageContainer from "@/Pages/PageContainer.vue";

defineOptions({
layout: AppLayout,
})

defineProps({
tokens: Array,
Expand All @@ -10,7 +15,7 @@ defineProps({
</script>

<template>
<AppLayout title="API Tokens">
<PageContainer title="API Tokens">
<template #header>
<h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
API Tokens
Expand All @@ -26,5 +31,5 @@ defineProps({
/>
</div>
</div>
</AppLayout>
</PageContainer>
</template>
9 changes: 7 additions & 2 deletions stubs/inertia/resources/js/Pages/Dashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<script setup>
import AppLayout from '@/Layouts/AppLayout.vue';
import Welcome from '@/Components/Welcome.vue';
import PageContainer from "@/Pages/PageContainer.vue";

defineOptions({
layout: AppLayout,
})
</script>

<template>
<AppLayout title="Dashboard">
<PageContainer title="Dashboard">
<template #header>
<h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
Dashboard
Expand All @@ -18,5 +23,5 @@ import Welcome from '@/Components/Welcome.vue';
</div>
</div>
</div>
</AppLayout>
</PageContainer>
</template>
20 changes: 20 additions & 0 deletions stubs/inertia/resources/js/Pages/PageContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<script setup>
import { Head } from '@inertiajs/vue3';

defineProps({
title: String,
});
</script>

<template>
<Head :title="title" />

<!-- Page Heading -->
<header v-if="$slots.header" class="bg-white dark:bg-gray-800 shadow">
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
<slot name="header" />
</div>
</header>

<slot />
</template>
9 changes: 7 additions & 2 deletions stubs/inertia/resources/js/Pages/Profile/Show.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import SectionBorder from '@/Components/SectionBorder.vue';
import TwoFactorAuthenticationForm from '@/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue';
import UpdatePasswordForm from '@/Pages/Profile/Partials/UpdatePasswordForm.vue';
import UpdateProfileInformationForm from '@/Pages/Profile/Partials/UpdateProfileInformationForm.vue';
import PageContainer from "@/Pages/PageContainer.vue";

defineOptions({
layout: AppLayout,
})

defineProps({
confirmsTwoFactorAuthentication: Boolean,
Expand All @@ -14,7 +19,7 @@ defineProps({
</script>

<template>
<AppLayout title="Profile">
<PageContainer title="Profile">
<template #header>
<h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
Profile
Expand Down Expand Up @@ -53,5 +58,5 @@ defineProps({
</template>
</div>
</div>
</AppLayout>
</PageContainer>
</template>
9 changes: 7 additions & 2 deletions stubs/inertia/resources/js/Pages/Teams/Create.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<script setup>
import AppLayout from '@/Layouts/AppLayout.vue';
import CreateTeamForm from '@/Pages/Teams/Partials/CreateTeamForm.vue';
import PageContainer from "@/Pages/PageContainer.vue";

defineOptions({
layout: AppLayout,
})
</script>

<template>
<AppLayout title="Create Team">
<PageContainer title="Create Team">
<template #header>
<h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
Create Team
Expand All @@ -16,5 +21,5 @@ import CreateTeamForm from '@/Pages/Teams/Partials/CreateTeamForm.vue';
<CreateTeamForm />
</div>
</div>
</AppLayout>
</PageContainer>
</template>
9 changes: 7 additions & 2 deletions stubs/inertia/resources/js/Pages/Teams/Show.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ import DeleteTeamForm from '@/Pages/Teams/Partials/DeleteTeamForm.vue';
import SectionBorder from '@/Components/SectionBorder.vue';
import TeamMemberManager from '@/Pages/Teams/Partials/TeamMemberManager.vue';
import UpdateTeamNameForm from '@/Pages/Teams/Partials/UpdateTeamNameForm.vue';
import PageContainer from "@/Pages/PageContainer.vue";

defineOptions({
layout: AppLayout,
})

defineProps({
team: Object,
Expand All @@ -13,7 +18,7 @@ defineProps({
</script>

<template>
<AppLayout title="Team Settings">
<PageContainer title="Team Settings">
<template #header>
<h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
Team Settings
Expand All @@ -38,5 +43,5 @@ defineProps({
</template>
</div>
</div>
</AppLayout>
</PageContainer>
</template>
Loading