diff --git a/CHANGELOG.md b/CHANGELOG.md index 69c472c2d482d2..e5a0f62210d306 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -582,7 +582,7 @@ A big thanks to the 15 contributors who made this release possible. Here are som - 💫 Material UI, Joy UI, and Base UI are compatible with [NextJS App Router](https://nextjs.org/docs/app) (#37656) @mj12albert - 📚 Added new guides for integrating with Next.js 13 App Router (#37656) @mj12albert - Ⓜ️ [Material UI guide](https://mui.com/material-ui/guides/next-js-app-router/) - - 🅙 [Joy UI guide](https://mui.com/joy-ui/guides/next-js-app-router/) + - 🅙 [Joy UI guide](https://mui.com/joy-ui/integrations/next-js-app-router/) - 🅱️ [Base UI guide](https://mui.com/base-ui/guides/next-js-app-router/) - 🐛 bug fixes, 📚 documentation, and ⚙️ infrastructure improvements. diff --git a/docs/data/joy/getting-started/tutorial/tutorial.md b/docs/data/joy/getting-started/tutorial/tutorial.md index 0bbabded8e3fe4..1d88c7e5681684 100644 --- a/docs/data/joy/getting-started/tutorial/tutorial.md +++ b/docs/data/joy/getting-started/tutorial/tutorial.md @@ -256,4 +256,4 @@ Learn more about [different customization approaches](/joy-ui/customization/appr To see some more sophisticated examples of Joy UI in action, check out our [collection of templates](/joy-ui/getting-started/templates/). Are you migrating from Material UI? -Learn how to work with [Joy UI and Material UI together in one app](/joy-ui/integrations/material-ui//). +Learn how to work with [Joy UI and Material UI together in one app](/joy-ui/integrations/material-ui/). diff --git a/docs/pages/blog/mui-next-js-app-router.md b/docs/pages/blog/mui-next-js-app-router.md index ffad12d2f67d45..6478e0ae4b8f52 100644 --- a/docs/pages/blog/mui-next-js-app-router.md +++ b/docs/pages/blog/mui-next-js-app-router.md @@ -26,8 +26,8 @@ See [this explanation of Client Components and SSR](https://github.com/reactwg/s Additionally, we've created guides to walk you through setting up an app using the Next.js App Router with each of the Core libraries: - [Material UI setup](https://mui.com/material-ui/guides/next-js-app-router/) +- [Joy UI setup](https://mui.com/joy-ui/integrations/next-js-app-router/) - [Base UI setup](https://mui.com/base-ui/guides/next-js-app-router/) -- [Joy UI setup](https://mui.com/joy-ui/guides/next-js-app-router/) Screenshot of the Material UI documentation diff --git a/docs/public/_redirects b/docs/public/_redirects index c645ad1fec10ab..01dfd62303a74e 100644 --- a/docs/public/_redirects +++ b/docs/public/_redirects @@ -488,6 +488,9 @@ https://v4.material-ui.com/* https://v4.mui.com/:splat 301! /base-ui/react-components/ /base-ui/all-components/ 301 /system/getting-started/overview/ /system/getting-started/ 301 /blog/introducing-mui-base/ /blog/introducing-base-ui/ 301 +/joy-ui/guides/next-js-app-router/ /joy-ui/integrations/next-js-app-router/ 301 +/joy-ui/guides/using-joy-ui-and-material-ui-together/ /joy-ui/integrations/material-ui/ 301 +/joy-ui/guides/using-icon-libraries/ /joy-ui/integrations/icon-libraries/ 301 # Proxies