Merge branch 'master' into feat/i18n

mui · Feb 11, 2025 · 9a68c44 · 9a68c44
2 parents 4b5a772 + 09a1f82
commit 9a68c44
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 22 deletions.
diff --git a/docs/data/toolpad/core/integrations/react-router.md b/docs/data/toolpad/core/integrations/react-router.md
@@ -334,7 +334,7 @@ import DashboardIcon from '@mui/icons-material/Dashboard';
 import ShoppingCartIcon from '@mui/icons-material/ShoppingCart';
 import { ReactRouterAppProvider } from '@toolpad/core/react-router';
 import { Outlet, useNavigate } from 'react-router';
-import type { Navigation, Session } from '@toolpad/core';
+import type { Navigation } from '@toolpad/core';
 import {
   firebaseSignOut,
   signInWithGoogle,

diff --git a/docs/data/toolpad/core/pages.ts b/docs/data/toolpad/core/pages.ts
@@ -84,11 +84,6 @@ const pages: MuiPage[] = [
             pathname: '/toolpad/core/react-page-container',
             title: 'Page Container',
           },
-          {
-            pathname: '/toolpad/core/react-notification-center',
-            title: 'Notification Center',
-            planned: true,
-          },
         ],
       },
       {
@@ -103,16 +98,6 @@ const pages: MuiPage[] = [
             pathname: '/toolpad/core/react-account',
             title: 'Account',
           },
-          {
-            pathname: '/toolpad/core/react-sign-up-page',
-            title: 'Sign-up Page',
-            planned: true,
-          },
-          {
-            pathname: '/toolpad/core/react-rbac',
-            title: 'RBAC',
-            planned: true,
-          },
         ],
       },
       {
@@ -124,11 +109,6 @@ const pages: MuiPage[] = [
             title: 'CRUD',
             planned: true,
           },
-          {
-            pathname: '/toolpad/core/react-stat-card',
-            title: 'Stats Card',
-            planned: true,
-          },
         ],
       },
       {

diff --git a/packages/create-toolpad-app/src/generateProject.ts b/packages/create-toolpad-app/src/generateProject.ts
@@ -62,7 +62,7 @@ export default function generateProject(
     [
       'package.json',
       {
-        content: JSON.stringify(packageJson(options)),
+        content: JSON.stringify(packageJson(options), null, 2),
       },
     ],
   ]);

diff --git a/packages/toolpad-core/src/DashboardLayout/AppTitle.tsx b/packages/toolpad-core/src/DashboardLayout/AppTitle.tsx
@@ -37,6 +37,7 @@ export function AppTitle(props: AppTitleProps) {
             fontWeight: '700',
             ml: 1,
             whiteSpace: 'nowrap',
+            lineHeight: 1,
           }}
         >
           {title}
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ export default function generateProject( @@
         [
           'package.json',
           {
-            content: JSON.stringify(packageJson(options)),
+            content: JSON.stringify(packageJson(options), null, 2),
           },
         ],
       ]);
@@ Expand Down @@