not found -> null

app/(pages)/(private)/@modal/(pages)/account/[tab]/page.tsx

@@ -2,7 +2,6 @@ import AccountEmailForm from '@/_components/account-email-form';
 import AccountPasswordForm from '@/_components/account-password-form';
 import AccountProfileForm from '@/_components/account-profile-form';
 import getCurrentUserFromSession from '@/_queries/get-current-user-from-session';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -16,7 +15,7 @@ export const generateMetadata = ({ params: { tab } }: PageProps) => {
 
 const Page = async ({ params: { tab } }: PageProps) => {
   const user = await getCurrentUserFromSession();
-  if (!user || !['email', 'password', 'profile'].includes(tab)) notFound();
+  if (!user || !['email', 'password', 'profile'].includes(tab)) return null;
 
   switch (tab) {
     case 'profile': {

app/(pages)/(private)/@modal/(pages)/inputs/[inputId]/page.tsx

@@ -3,7 +3,6 @@ import PageModalHeader from '@/_components/page-modal-header';
 import getInput from '@/_queries/get-input';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -22,7 +21,7 @@ const Page = async ({ params: { inputId } }: PageProps) => {
     listSubjectsByTeamId(),
   ]);
 
-  if (!input || !subjects) notFound();
+  if (!input || !subjects) return null;
 
   return (
     <>

app/(pages)/(private)/@modal/(pages)/inputs/create/from-input/[inputId]/page.tsx

@@ -3,7 +3,6 @@ import PageModalHeader from '@/_components/page-modal-header';
 import getInput from '@/_queries/get-input';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -19,7 +18,7 @@ const Page = async ({ params: { inputId } }: PageProps) => {
     getInput(inputId),
   ]);
 
-  if (!input || !subjects) notFound();
+  if (!input || !subjects) return null;
 
   return (
     <>

app/(pages)/(private)/@modal/(pages)/inputs/create/page.tsx

@@ -2,13 +2,12 @@ import InputForm from '@/_components/input-form';
 import PageModalHeader from '@/_components/page-modal-header';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 export const metadata = { title: formatTitle(['Inputs', 'Create']) };
 
 const Page = async () => {
   const { data: subjects } = await listSubjectsByTeamId();
-  if (!subjects) notFound();
+  if (!subjects) return null;
 
   return (
     <>

app/(pages)/(private)/@modal/(pages)/subjects/[subjectId]/edit/page.tsx

@@ -2,7 +2,6 @@ import PageModalHeader from '@/_components/page-modal-header';
 import SubjectForm from '@/_components/subject-form';
 import getSubject from '@/_queries/get-subject';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -19,7 +18,7 @@ export const generateMetadata = async ({
 
 const Page = async ({ params: { subjectId } }: PageProps) => {
   const { data: subject } = await getSubject(subjectId);
-  if (!subject) notFound();
+  if (!subject) return null;
 
   return (
     <>

app/(pages)/(private)/@modal/(pages)/subjects/[subjectId]/event-types/[eventTypeId]/edit/page.tsx

@@ -6,7 +6,6 @@ import listInputsBySubjectId from '@/_queries/list-inputs-by-subject-id';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import listTemplatesWithData from '@/_queries/list-templates-with-data';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -48,7 +47,7 @@ const Page = async ({ params: { eventTypeId, subjectId } }: PageProps) => {
     !availableTemplates ||
     !subjects
   ) {
-    notFound();
+    return null;
   }
 
   return (

app/(pages)/(private)/@modal/(pages)/subjects/[subjectId]/event-types/[eventTypeId]/page.tsx

@@ -4,7 +4,6 @@ import getCurrentUserFromSession from '@/_queries/get-current-user-from-session'
 import getEventTypeWithInputsAndOptions from '@/_queries/get-event-type-with-inputs-and-options';
 import getSubject from '@/_queries/get-subject';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -32,7 +31,7 @@ const Page = async ({ params: { eventTypeId, subjectId } }: PageProps) => {
     getEventTypeWithInputsAndOptions(eventTypeId),
   ]);
 
-  if (!subject || !eventType) notFound();
+  if (!subject || !eventType) return null;
 
   return (
     <>

app/(pages)/(private)/@modal/(pages)/subjects/[subjectId]/event-types/create/page.tsx

@@ -5,7 +5,6 @@ import listInputsBySubjectId from '@/_queries/list-inputs-by-subject-id';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import listTemplatesWithData from '@/_queries/list-templates-with-data';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -34,7 +33,7 @@ const Page = async ({ params: { subjectId } }: PageProps) => {
   ]);
 
   if (!subject || !availableInputs || !availableTemplates || !subjects) {
-    notFound();
+    return null;
   }
 
   return (

app/(pages)/(private)/@modal/(pages)/subjects/[subjectId]/events/[eventId]/page.tsx

@@ -5,7 +5,6 @@ import getCurrentUserFromSession from '@/_queries/get-current-user-from-session'
 import getEvent from '@/_queries/get-event';
 import getSubject from '@/_queries/get-subject';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -33,7 +32,7 @@ const Page = async ({ params: { eventId, subjectId } }: PageProps) => {
     getEvent(eventId),
   ]);
 
-  if (!subject || !event || !event.type) notFound();
+  if (!subject || !event || !event.type) return null;
 
   return (
     <>

app/(pages)/(private)/@modal/(pages)/subjects/[subjectId]/training-plans/[missionId]/edit/page.tsx

@@ -3,7 +3,6 @@ import PageModalHeader from '@/_components/page-modal-header';
 import getMission from '@/_queries/get-mission';
 import getSubject from '@/_queries/get-subject';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -29,7 +28,7 @@ const Page = async ({ params: { missionId, subjectId } }: PageProps) => {
     getMission(missionId),
   ]);
 
-  if (!subject || !mission) notFound();
+  if (!subject || !mission) return null;
 
   return (
     <>

app/(pages)/(private)/@modal/(pages)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/page.tsx

@@ -12,7 +12,6 @@ import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import listTemplatesWithData from '@/_queries/list-templates-with-data';
 import forceArray from '@/_utilities/force-array';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -77,7 +76,7 @@ const Page = async ({
     !subjects ||
     !isTeamMember
   ) {
-    notFound();
+    return null;
   }
 
   return (

app/(pages)/(private)/@modal/(pages)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/page.tsx

@@ -10,7 +10,6 @@ import listInputsBySubjectId from '@/_queries/list-inputs-by-subject-id';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import listTemplatesWithData from '@/_queries/list-templates-with-data';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -71,7 +70,7 @@ const Page = async ({
     !subjects ||
     !isTeamMember
   ) {
-    notFound();
+    return null;
   }
 
   return (

app/(pages)/(private)/@modal/(pages)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/page.tsx

@@ -9,7 +9,6 @@ import listInputsBySubjectId from '@/_queries/list-inputs-by-subject-id';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import listTemplatesWithData from '@/_queries/list-templates-with-data';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -64,7 +63,7 @@ const Page = async ({ params: { missionId, order, subjectId } }: PageProps) => {
     !availableTemplates ||
     !isTeamMember
   ) {
-    notFound();
+    return null;
   }
 
   return (

app/(pages)/(private)/@modal/(pages)/subjects/[subjectId]/training-plans/create/page.tsx

@@ -2,7 +2,6 @@ import MissionForm from '@/_components/mission-form';
 import PageModalHeader from '@/_components/page-modal-header';
 import getSubject from '@/_queries/get-subject';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -19,7 +18,7 @@ export const generateMetadata = async ({
 
 const Page = async ({ params: { subjectId } }: PageProps) => {
   const { data: subject } = await getSubject(subjectId);
-  if (!subject) notFound();
+  if (!subject) return null;
 
   return (
     <>

app/(pages)/(private)/@modal/(pages)/templates/[templateId]/page.tsx

@@ -4,7 +4,6 @@ import getTemplate from '@/_queries/get-template';
 import listInputs from '@/_queries/list-inputs';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -27,7 +26,7 @@ const Page = async ({ params: { templateId } }: PageProps) => {
       listSubjectsByTeamId(),
     ]);
 
-  if (!template || !availableInputs || !subjects) notFound();
+  if (!template || !availableInputs || !subjects) return null;
 
   return (
     <>

app/(pages)/(private)/@modal/(pages)/templates/create/from-event-type/[eventTypeId]/page.tsx

@@ -4,7 +4,6 @@ import getEventTypeWithInputs from '@/_queries/get-event-type-with-inputs';
 import listInputs from '@/_queries/list-inputs';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -22,7 +21,7 @@ const Page = async ({ params: { eventTypeId } }: PageProps) => {
       listSubjectsByTeamId(),
     ]);
 
-  if (!eventType || !availableInputs || !subjects) notFound();
+  if (!eventType || !availableInputs || !subjects) return null;
 
   return (
     <>

app/(pages)/(private)/@modal/(pages)/templates/create/page.tsx

@@ -3,7 +3,6 @@ import TemplateForm from '@/_components/template-form';
 import listInputs from '@/_queries/list-inputs';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 export const metadata = { title: formatTitle(['Templates', 'Create']) };
 
@@ -13,7 +12,7 @@ const Page = async () => {
     listSubjectsByTeamId(),
   ]);
 
-  if (!availableInputs || !subjects) notFound();
+  if (!availableInputs || !subjects) return null;
 
   return (
     <>

app/(pages)/(private)/notifications/[tab]/page.tsx

@@ -1,6 +1,5 @@
 import Notifications from '@/_components/notifications';
 import listNotifications from '@/_queries/list-notifications';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -13,7 +12,7 @@ export const generateMetadata = ({ params: { tab } }: PageProps) => {
 };
 
 const Page = async ({ params: { tab } }: PageProps) => {
-  if (!['archive', 'inbox'].includes(tab)) notFound();
+  if (!['archive', 'inbox'].includes(tab)) return null;
 
   const { data: notifications } = await listNotifications({
     archived: tab === 'archive',

app/(pages)/(public)/share/@modal/(pages)/[subjectId]/events/[eventId]/page.tsx

@@ -4,7 +4,6 @@ import PageModalHeader from '@/_components/page-modal-header';
 import getPublicEvent from '@/_queries/get-public-event';
 import getPublicSubject from '@/_queries/get-public-subject';
 import formatTitle from '@/_utilities/format-title';
-import { notFound } from 'next/navigation';
 
 interface PageProps {
   params: {
@@ -30,7 +29,7 @@ const Page = async ({ params: { eventId, subjectId } }: PageProps) => {
     getPublicEvent(eventId),
   ]);
 
-  if (!subject || !event || !event?.type) notFound();
+  if (!subject || !event || !event?.type) return null;
 
   return (
     <>

app/_components/session-page.tsx

@@ -14,7 +14,6 @@ import getSessionWithDetails from '@/_queries/get-session-with-details';
 import getSubject from '@/_queries/get-subject';
 import firstIfArray from '@/_utilities/first-if-array';
 import CalendarIcon from '@heroicons/react/24/outline/CalendarIcon';
-import { notFound } from 'next/navigation';
 
 interface SessionPageProps {
   isPublic?: boolean;
@@ -42,7 +41,7 @@ const SessionPage = async ({
         : getSessionWithDetails(sessionId),
     ]);
 
-  if (!subject || !mission || !session) notFound();
+  if (!subject || !mission || !session) return null;
   const isTeamMember = subject.team_id === user?.id;
 
   return (

app/_components/sessions-page.tsx

@@ -13,7 +13,6 @@ import ArrowLeftIcon from '@heroicons/react/24/outline/ArrowLeftIcon';
 import ArrowRightIcon from '@heroicons/react/24/outline/ArrowRightIcon';
 import InformationCircleIcon from '@heroicons/react/24/outline/InformationCircleIcon';
 import PlusIcon from '@heroicons/react/24/outline/PlusIcon';
-import { notFound } from 'next/navigation';
 import { twMerge } from 'tailwind-merge';
 
 interface SessionsPageProps {
@@ -33,14 +32,14 @@ const SessionsPage = async ({
     ? getPublicSubject(subjectId)
     : getSubject(subjectId));
 
-  if (!subject) notFound();
+  if (!subject) return null;
   const isTeamMember = subject.team_id === user?.id;
 
   const { data: mission } = isPublic
     ? await getPublicMissionWithSessionsAndEvents(missionId)
     : await getMissionWithSessionsAndEvents(missionId, { draft: isTeamMember });
 
-  if (!mission) notFound();
+  if (!mission) return null;
 
   const { highestOrder, sessionsReversed } = mission.sessions.reduce(
     (acc, session, i) => {

app/_components/subject-page.tsx

@@ -12,7 +12,6 @@ import getCurrentUserFromSession from '@/_queries/get-current-user-from-session'
 import getPublicSubject from '@/_queries/get-public-subject';
 import getSubject from '@/_queries/get-subject';
 import ArrowLeftIcon from '@heroicons/react/24/outline/ArrowLeftIcon';
-import { notFound } from 'next/navigation';
 
 interface SubjectPageProps {
   eventsTo?: string;
@@ -31,7 +30,7 @@ const SubjectPage = async ({
     ? getPublicSubject(subjectId)
     : getSubject(subjectId));
 
-  if (!subject) notFound();
+  if (!subject) return null;
   const isTeamMember = subject.team_id === user?.id;
 
   return (