mirror of
https://github.com/Sonny93/my-links.git
synced 2025-12-10 15:35:35 +00:00
feat: update default layout
This commit is contained in:
@@ -4,6 +4,7 @@ import { isSSREnableForPage } from 'config-ssr';
|
||||
import 'dayjs/locale/en';
|
||||
import 'dayjs/locale/fr';
|
||||
import { createRoot, hydrateRoot } from 'react-dom/client';
|
||||
import DefaultLayout from '~/layouts/default_layout';
|
||||
import '../i18n/index';
|
||||
|
||||
const appName = import.meta.env.VITE_APP_NAME || 'MyLinks';
|
||||
@@ -13,11 +14,17 @@ createInertiaApp({
|
||||
|
||||
title: (title) => `${appName}${title && ` - ${title}`}`,
|
||||
|
||||
resolve: (name) => {
|
||||
return resolvePageComponent(
|
||||
resolve: async (name) => {
|
||||
const currentPage: any = await resolvePageComponent(
|
||||
`../pages/${name}.tsx`,
|
||||
import.meta.glob('../pages/**/*.tsx')
|
||||
);
|
||||
|
||||
currentPage.default.layout =
|
||||
currentPage.default.layout ||
|
||||
((p: any) => <DefaultLayout children={p} />);
|
||||
|
||||
return currentPage;
|
||||
},
|
||||
|
||||
setup({ el, App, props }) {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { createInertiaApp } from '@inertiajs/react';
|
||||
import ReactDOMServer from 'react-dom/server';
|
||||
import DefaultLayout from '~/layouts/default_layout';
|
||||
|
||||
export default function render(page: any) {
|
||||
return createInertiaApp({
|
||||
@@ -7,7 +8,11 @@ export default function render(page: any) {
|
||||
render: ReactDOMServer.renderToString,
|
||||
resolve: (name) => {
|
||||
const pages = import.meta.glob('../pages/**/*.tsx', { eager: true });
|
||||
return pages[`../pages/${name}.tsx`];
|
||||
let pageComponent: any = pages[`../pages/${name}.tsx`];
|
||||
pageComponent.default.layout =
|
||||
pageComponent?.default?.layout ||
|
||||
((pageChildren: any) => <DefaultLayout children={pageChildren} />);
|
||||
return pageComponent;
|
||||
},
|
||||
setup: ({ App, props }) => <App {...props} />,
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user