refactor directory structure and loading states

xvvvyz · Jul 2, 2024 · 6ac2efb · 6ac2efb
1 parent d668fe5
commit 6ac2efb
Show file tree

Hide file tree

Showing 111 changed files with 31 additions and 54 deletions.
diff --git a/...es)/(public)/(auth)/authenticate/route.ts → app/(pages)/(auth)/authenticate/route.ts b/...es)/(public)/(auth)/authenticate/route.ts → app/(pages)/(auth)/authenticate/route.ts
diff --git a/.../(public)/(auth)/change-password/page.tsx → app/(pages)/(auth)/change-password/page.tsx b/.../(public)/(auth)/change-password/page.tsx → app/(pages)/(auth)/change-password/page.tsx
diff --git a/...public)/(auth)/confirmation-sent/page.tsx → ...(pages)/(auth)/confirmation-sent/page.tsx b/...public)/(auth)/confirmation-sent/page.tsx → ...(pages)/(auth)/confirmation-sent/page.tsx
diff --git a/...e)/subjects/(group)/@archived/loading.tsx → ...h)/forgot-password/email-sent/loading.tsx b/...e)/subjects/(group)/@archived/loading.tsx → ...h)/forgot-password/email-sent/loading.tsx
diff --git a/...auth)/forgot-password/email-sent/page.tsx → ...auth)/forgot-password/email-sent/page.tsx b/...auth)/forgot-password/email-sent/page.tsx → ...auth)/forgot-password/email-sent/page.tsx
diff --git a/.../(public)/(auth)/forgot-password/page.tsx → app/(pages)/(auth)/forgot-password/page.tsx b/.../(public)/(auth)/forgot-password/page.tsx → app/(pages)/(auth)/forgot-password/page.tsx
diff --git a/app/(pages)/(public)/(auth)/layout.tsx → app/(pages)/(auth)/layout.tsx b/app/(pages)/(public)/(auth)/layout.tsx → app/(pages)/(auth)/layout.tsx
diff --git a/app/(pages)/(public)/(auth)/sign-in/page.tsx → app/(pages)/(auth)/sign-in/page.tsx b/app/(pages)/(public)/(auth)/sign-in/page.tsx → app/(pages)/(auth)/sign-in/page.tsx
diff --git a/app/(pages)/(public)/(auth)/sign-up/page.tsx → app/(pages)/(auth)/sign-up/page.tsx b/app/(pages)/(public)/(auth)/sign-up/page.tsx → app/(pages)/(auth)/sign-up/page.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/(lg)/template.tsx b/app/(pages)/(public)/share/[subjectId]/@modal/(lg)/template.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/(md)/layout.tsx b/app/(pages)/(public)/share/[subjectId]/@modal/(md)/layout.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/[...default]/page.tsx b/app/(pages)/(public)/share/[subjectId]/@modal/[...default]/page.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/default.tsx b/app/(pages)/(public)/share/[subjectId]/@modal/default.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/default.tsx b/app/(pages)/(public)/share/[subjectId]/default.tsx
diff --git a/app/(pages)/(private)/inputs/layout.tsx → app/(pages)/(with-nav)/inputs/layout.tsx b/app/(pages)/(private)/inputs/layout.tsx → app/(pages)/(with-nav)/inputs/layout.tsx
diff --git a/app/(pages)/(private)/inputs/loading.tsx → app/(pages)/(with-nav)/inputs/loading.tsx b/app/(pages)/(private)/inputs/loading.tsx → app/(pages)/(with-nav)/inputs/loading.tsx
diff --git a/app/(pages)/(private)/inputs/page.tsx → app/(pages)/(with-nav)/inputs/page.tsx b/app/(pages)/(private)/inputs/page.tsx → app/(pages)/(with-nav)/inputs/page.tsx
diff --git a/app/(pages)/(private)/layout.tsx → app/(pages)/(with-nav)/layout.tsx b/app/(pages)/(private)/layout.tsx → app/(pages)/(with-nav)/layout.tsx
@@ -9,10 +9,9 @@ import { ReactNode } from 'react';
 
 interface LayoutProps {
   children: ReactNode;
-  modal: ReactNode;
 }
 
-const Layout = async ({ children, modal }: LayoutProps) => {
+const Layout = async ({ children }: LayoutProps) => {
   const [{ count }, user] = await Promise.all([
     countNotifications(),
     getCurrentUser(),
@@ -67,7 +66,6 @@ const Layout = async ({ children, modal }: LayoutProps) => {
         </nav>
       )}
       {children}
-      {modal}
     </div>
   );
 };

diff --git a/...ectId]/(group)/(group)/events/loading.tsx → app/(pages)/(with-nav)/loading.tsx b/...ectId]/(group)/(group)/events/loading.tsx → app/(pages)/(with-nav)/loading.tsx
diff --git a/...s)/(private)/notifications/[tab]/page.tsx → ...)/(with-nav)/notifications/[tab]/page.tsx b/...s)/(private)/notifications/[tab]/page.tsx → ...)/(with-nav)/notifications/[tab]/page.tsx
diff --git a/...pages)/(private)/notifications/layout.tsx → ...ages)/(with-nav)/notifications/layout.tsx b/...pages)/(private)/notifications/layout.tsx → ...ages)/(with-nav)/notifications/layout.tsx
diff --git a/...(private)/notifications/[tab]/loading.tsx → ...ges)/(with-nav)/notifications/loading.tsx b/...(private)/notifications/[tab]/loading.tsx → ...ges)/(with-nav)/notifications/loading.tsx
diff --git a/...h)/forgot-password/email-sent/loading.tsx → ...av)/subjects/(list)/@archived/loading.tsx b/...h)/forgot-password/email-sent/loading.tsx → ...av)/subjects/(list)/@archived/loading.tsx
diff --git a/...vate)/subjects/(group)/@archived/page.tsx → ...h-nav)/subjects/(list)/@archived/page.tsx b/...vate)/subjects/(group)/@archived/page.tsx → ...h-nav)/subjects/(list)/@archived/page.tsx
diff --git a/...es)/(private)/subjects/(group)/layout.tsx → ...es)/(with-nav)/subjects/(list)/layout.tsx b/...es)/(private)/subjects/(group)/layout.tsx → ...es)/(with-nav)/subjects/(list)/layout.tsx
diff --git a/...s)/(private)/subjects/(group)/loading.tsx → ...s)/(with-nav)/subjects/(list)/loading.tsx b/...s)/(private)/subjects/(group)/loading.tsx → ...s)/(with-nav)/subjects/(list)/loading.tsx
diff --git a/...ages)/(private)/subjects/(group)/page.tsx → ...ages)/(with-nav)/subjects/(list)/page.tsx b/...ages)/(private)/subjects/(group)/page.tsx → ...ages)/(with-nav)/subjects/(list)/page.tsx
diff --git a/...ubjectId]/(group)/(group)/events/page.tsx → ...ubject-loading)/(subject)/events/page.tsx b/...ubjectId]/(group)/(group)/events/page.tsx → ...ubject-loading)/(subject)/events/page.tsx
diff --git a/...jectId]/(group)/(group)/insights/page.tsx → ...ject-loading)/(subject)/insights/page.tsx b/...jectId]/(group)/(group)/insights/page.tsx → ...ject-loading)/(subject)/insights/page.tsx
diff --git a/...ts/[subjectId]/(group)/(group)/layout.tsx → ...d]/(subject-loading)/(subject)/layout.tsx b/...ts/[subjectId]/(group)/(group)/layout.tsx → ...d]/(subject-loading)/(subject)/layout.tsx
diff --git a/...tId]/(group)/(group)/insights/loading.tsx → ...]/(subject-loading)/(subject)/loading.tsx b/...tId]/(group)/(group)/insights/loading.tsx → ...]/(subject-loading)/(subject)/loading.tsx
diff --git a/...)/subjects/[subjectId]/(group)/layout.tsx → .../[subjectId]/(subject-loading)/layout.tsx b/...)/subjects/[subjectId]/(group)/layout.tsx → .../[subjectId]/(subject-loading)/layout.tsx
diff --git a/.../subjects/[subjectId]/(group)/loading.tsx → ...[subjectId]/(subject-loading)/loading.tsx b/.../subjects/[subjectId]/(group)/loading.tsx → ...[subjectId]/(subject-loading)/loading.tsx
diff --git a/.../subjects/[subjectId]/events.csv/route.ts → .../subjects/[subjectId]/events.csv/route.ts b/.../subjects/[subjectId]/events.csv/route.ts → .../subjects/[subjectId]/events.csv/route.ts
diff --git a/...cts/[subjectId]/join/[shareCode]/page.tsx → ...cts/[subjectId]/join/[shareCode]/page.tsx b/...cts/[subjectId]/join/[shareCode]/page.tsx → ...cts/[subjectId]/join/[shareCode]/page.tsx
diff --git a/app/(pages)/(private)/templates/layout.tsx → app/(pages)/(with-nav)/templates/layout.tsx b/app/(pages)/(private)/templates/layout.tsx → app/(pages)/(with-nav)/templates/layout.tsx
diff --git a/app/(pages)/(private)/templates/loading.tsx → app/(pages)/(with-nav)/templates/loading.tsx b/app/(pages)/(private)/templates/loading.tsx → app/(pages)/(with-nav)/templates/loading.tsx
diff --git a/app/(pages)/(private)/templates/page.tsx → app/(pages)/(with-nav)/templates/page.tsx b/app/(pages)/(private)/templates/page.tsx → app/(pages)/(with-nav)/templates/page.tsx
diff --git a/...pages)/(private)/@modal/(lg)/template.tsx → app/(pages)/@modal/(lg)/layout.tsx b/...pages)/(private)/@modal/(lg)/template.tsx → app/(pages)/@modal/(lg)/layout.tsx
@@ -5,8 +5,8 @@ interface LayoutProps {
   children: ReactNode;
 }
 
-const Template = ({ children }: LayoutProps) => (
+const Layout = ({ children }: LayoutProps) => (
   <PageModal className="max-w-4xl">{children}</PageModal>
 );
 
-export default Template;
+export default Layout;
diff --git a/...Id]/insights/[insightId]/edit/loading.tsx → app/(pages)/@modal/(lg)/loading.tsx b/...Id]/insights/[insightId]/edit/loading.tsx → app/(pages)/@modal/(lg)/loading.tsx
diff --git a/...bjectId]/insights/[insightId]/loading.tsx → ...bjectId]/insights/[insightId]/loading.tsx b/...bjectId]/insights/[insightId]/loading.tsx → ...bjectId]/insights/[insightId]/loading.tsx
diff --git a/...@modal/(lg)/insights/[insightId]/page.tsx → ...[subjectId]/insights/[insightId]/page.tsx b/...@modal/(lg)/insights/[insightId]/page.tsx → ...[subjectId]/insights/[insightId]/page.tsx
diff --git a/...s/[subjectId]/insights/create/loading.tsx → ...Id]/insights/[insightId]/edit/loading.tsx b/...s/[subjectId]/insights/create/loading.tsx → ...Id]/insights/[insightId]/edit/loading.tsx
diff --git a/...ectId]/insights/[insightId]/edit/page.tsx → ...ectId]/insights/[insightId]/edit/page.tsx b/...ectId]/insights/[insightId]/edit/page.tsx → ...ectId]/insights/[insightId]/edit/page.tsx
diff --git a/.../@modal/(md)/inputs/[inputId]/loading.tsx → ...bjectId]/insights/[insightId]/loading.tsx b/.../@modal/(md)/inputs/[inputId]/loading.tsx → ...bjectId]/insights/[insightId]/loading.tsx
diff --git a/...[subjectId]/insights/[insightId]/page.tsx → ...[subjectId]/insights/[insightId]/page.tsx b/...[subjectId]/insights/[insightId]/page.tsx → ...[subjectId]/insights/[insightId]/page.tsx
diff --git a/...s/create/from-input/[inputId]/loading.tsx → ...s/[subjectId]/insights/create/loading.tsx b/...s/create/from-input/[inputId]/loading.tsx → ...s/[subjectId]/insights/create/loading.tsx
diff --git a/...ects/[subjectId]/insights/create/page.tsx → ...ects/[subjectId]/insights/create/page.tsx b/...ects/[subjectId]/insights/create/page.tsx → ...ects/[subjectId]/insights/create/page.tsx
diff --git a/...te)/@modal/(md)/account/[tab]/loading.tsx → ...es)/@modal/(md)/account/[tab]/loading.tsx b/...te)/@modal/(md)/account/[tab]/loading.tsx → ...es)/@modal/(md)/account/[tab]/loading.tsx
diff --git a/...ivate)/@modal/(md)/account/[tab]/page.tsx → ...pages)/@modal/(md)/account/[tab]/page.tsx b/...ivate)/@modal/(md)/account/[tab]/page.tsx → ...pages)/@modal/(md)/account/[tab]/page.tsx
diff --git a/.../(private)/@modal/(md)/account/layout.tsx → app/(pages)/@modal/(md)/account/layout.tsx b/.../(private)/@modal/(md)/account/layout.tsx → app/(pages)/@modal/(md)/account/layout.tsx
diff --git a/...te)/@modal/(md)/inputs/create/loading.tsx → .../@modal/(md)/inputs/[inputId]/loading.tsx b/...te)/@modal/(md)/inputs/create/loading.tsx → .../@modal/(md)/inputs/[inputId]/loading.tsx
diff --git a/...te)/@modal/(md)/inputs/[inputId]/page.tsx → ...es)/@modal/(md)/inputs/[inputId]/page.tsx b/...te)/@modal/(md)/inputs/[inputId]/page.tsx → ...es)/@modal/(md)/inputs/[inputId]/page.tsx
diff --git a/...md)/subjects/[subjectId]/edit/loading.tsx → ...s/create/from-input/[inputId]/loading.tsx b/...md)/subjects/[subjectId]/edit/loading.tsx → ...s/create/from-input/[inputId]/loading.tsx
diff --git a/...puts/create/from-input/[inputId]/page.tsx → ...puts/create/from-input/[inputId]/page.tsx b/...puts/create/from-input/[inputId]/page.tsx → ...puts/create/from-input/[inputId]/page.tsx
diff --git a/...vent-types/[eventTypeId]/edit/loading.tsx → ...es)/@modal/(md)/inputs/create/loading.tsx b/...vent-types/[eventTypeId]/edit/loading.tsx → ...es)/@modal/(md)/inputs/create/loading.tsx
diff --git a/...ivate)/@modal/(md)/inputs/create/page.tsx → ...pages)/@modal/(md)/inputs/create/page.tsx b/...ivate)/@modal/(md)/inputs/create/page.tsx → ...pages)/@modal/(md)/inputs/create/page.tsx
diff --git a/...pages)/(private)/@modal/(md)/template.tsx → app/(pages)/@modal/(md)/layout.tsx b/...pages)/(private)/@modal/(md)/template.tsx → app/(pages)/@modal/(md)/layout.tsx
@@ -5,8 +5,6 @@ interface LayoutProps {
   children: ReactNode;
 }
 
-const Template = ({ children }: LayoutProps) => (
-  <PageModal>{children}</PageModal>
-);
+const Layout = ({ children }: LayoutProps) => <PageModal>{children}</PageModal>;
 
-export default Template;
+export default Layout;
diff --git a/...Id]/event-types/[eventTypeId]/loading.tsx → app/(pages)/@modal/(md)/loading.tsx b/...Id]/event-types/[eventTypeId]/loading.tsx → app/(pages)/@modal/(md)/loading.tsx
diff --git a/...subjectId]/event-types/create/loading.tsx → .../[subjectId]/events/[eventId]/loading.tsx b/...subjectId]/event-types/create/loading.tsx → .../[subjectId]/events/[eventId]/loading.tsx
diff --git a/...Id]/@modal/(md)/events/[eventId]/page.tsx → ...are/[subjectId]/events/[eventId]/page.tsx b/...Id]/@modal/(md)/events/[eventId]/page.tsx → ...are/[subjectId]/events/[eventId]/page.tsx
diff --git a/.../[subjectId]/events/[eventId]/loading.tsx → ...ssionId]/sessions/[sessionId]/loading.tsx b/.../[subjectId]/events/[eventId]/loading.tsx → ...ssionId]/sessions/[sessionId]/loading.tsx
diff --git a/...[missionId]/sessions/[sessionId]/page.tsx → ...[missionId]/sessions/[sessionId]/page.tsx b/...[missionId]/sessions/[sessionId]/page.tsx → ...[missionId]/sessions/[sessionId]/page.tsx
diff --git a/...ng-plans/[missionId]/sessions/loading.tsx → ...ng-plans/[missionId]/sessions/loading.tsx b/...ng-plans/[missionId]/sessions/loading.tsx → ...ng-plans/[missionId]/sessions/loading.tsx
diff --git a/...ining-plans/[missionId]/sessions/page.tsx → ...ining-plans/[missionId]/sessions/page.tsx b/...ining-plans/[missionId]/sessions/page.tsx → ...ining-plans/[missionId]/sessions/page.tsx
diff --git a/...aining-plans/[missionId]/edit/loading.tsx → ...md)/subjects/[subjectId]/edit/loading.tsx b/...aining-plans/[missionId]/edit/loading.tsx → ...md)/subjects/[subjectId]/edit/loading.tsx
diff --git a/...l/(md)/subjects/[subjectId]/edit/page.tsx → ...l/(md)/subjects/[subjectId]/edit/page.tsx b/...l/(md)/subjects/[subjectId]/edit/page.tsx → ...l/(md)/subjects/[subjectId]/edit/page.tsx
diff --git a/...Id]/sessions/[sessionId]/edit/loading.tsx → ...vent-types/[eventTypeId]/edit/loading.tsx b/...Id]/sessions/[sessionId]/edit/loading.tsx → ...vent-types/[eventTypeId]/edit/loading.tsx
diff --git a/...]/event-types/[eventTypeId]/edit/page.tsx → ...]/event-types/[eventTypeId]/edit/page.tsx b/...]/event-types/[eventTypeId]/edit/page.tsx → ...]/event-types/[eventTypeId]/edit/page.tsx
diff --git a/...ssionId]/sessions/[sessionId]/loading.tsx → ...Id]/event-types/[eventTypeId]/loading.tsx b/...ssionId]/sessions/[sessionId]/loading.tsx → ...Id]/event-types/[eventTypeId]/loading.tsx
diff --git a/...ectId]/event-types/[eventTypeId]/page.tsx → ...ectId]/event-types/[eventTypeId]/page.tsx b/...ectId]/event-types/[eventTypeId]/page.tsx → ...ectId]/event-types/[eventTypeId]/page.tsx
diff --git a/...der]/from-session/[sessionId]/loading.tsx → ...subjectId]/event-types/create/loading.tsx b/...der]/from-session/[sessionId]/loading.tsx → ...subjectId]/event-types/create/loading.tsx
diff --git a/...s/[subjectId]/event-types/create/page.tsx → ...s/[subjectId]/event-types/create/page.tsx b/...s/[subjectId]/event-types/create/page.tsx → ...s/[subjectId]/event-types/create/page.tsx
diff --git a/...onId]/sessions/create/[order]/loading.tsx → .../[subjectId]/events/[eventId]/loading.tsx b/...onId]/sessions/create/[order]/loading.tsx → .../[subjectId]/events/[eventId]/loading.tsx
diff --git a/...cts/[subjectId]/events/[eventId]/page.tsx → ...cts/[subjectId]/events/[eventId]/page.tsx b/...cts/[subjectId]/events/[eventId]/page.tsx → ...cts/[subjectId]/events/[eventId]/page.tsx
diff --git a/...ng-plans/[missionId]/sessions/loading.tsx → ...aining-plans/[missionId]/edit/loading.tsx b/...ng-plans/[missionId]/sessions/loading.tsx → ...aining-plans/[missionId]/edit/loading.tsx
diff --git a/.../training-plans/[missionId]/edit/page.tsx → .../training-plans/[missionId]/edit/page.tsx b/.../training-plans/[missionId]/edit/page.tsx → .../training-plans/[missionId]/edit/page.tsx
diff --git a/...jectId]/training-plans/create/loading.tsx → ...Id]/sessions/[sessionId]/edit/loading.tsx b/...jectId]/training-plans/create/loading.tsx → ...Id]/sessions/[sessionId]/edit/loading.tsx
diff --git a/...ionId]/sessions/[sessionId]/edit/page.tsx → ...ionId]/sessions/[sessionId]/edit/page.tsx b/...ionId]/sessions/[sessionId]/edit/page.tsx → ...ionId]/sessions/[sessionId]/edit/page.tsx
diff --git a/...)/@modal/(md)/subjects/create/loading.tsx → ...ssionId]/sessions/[sessionId]/loading.tsx b/...)/@modal/(md)/subjects/create/loading.tsx → ...ssionId]/sessions/[sessionId]/loading.tsx
diff --git a/...[missionId]/sessions/[sessionId]/page.tsx → ...[missionId]/sessions/[sessionId]/page.tsx b/...[missionId]/sessions/[sessionId]/page.tsx → ...[missionId]/sessions/[sessionId]/page.tsx
diff --git a/...l/(md)/templates/[templateId]/loading.tsx → ...der]/from-session/[sessionId]/loading.tsx b/...l/(md)/templates/[templateId]/loading.tsx → ...der]/from-session/[sessionId]/loading.tsx
diff --git a/...[order]/from-session/[sessionId]/page.tsx → ...[order]/from-session/[sessionId]/page.tsx b/...[order]/from-session/[sessionId]/page.tsx → ...[order]/from-session/[sessionId]/page.tsx
diff --git a/...from-event-type/[eventTypeId]/loading.tsx → ...onId]/sessions/create/[order]/loading.tsx b/...from-event-type/[eventTypeId]/loading.tsx → ...onId]/sessions/create/[order]/loading.tsx
diff --git a/...ssionId]/sessions/create/[order]/page.tsx → ...ssionId]/sessions/create/[order]/page.tsx b/...ssionId]/sessions/create/[order]/page.tsx → ...ssionId]/sessions/create/[order]/page.tsx
diff --git a/.../@modal/(md)/templates/create/loading.tsx → ...ng-plans/[missionId]/sessions/loading.tsx b/.../@modal/(md)/templates/create/loading.tsx → ...ng-plans/[missionId]/sessions/loading.tsx
diff --git a/...ining-plans/[missionId]/sessions/page.tsx → ...ining-plans/[missionId]/sessions/page.tsx b/...ining-plans/[missionId]/sessions/page.tsx → ...ining-plans/[missionId]/sessions/page.tsx
diff --git a/...dal/(lg)/insights/[insightId]/loading.tsx → ...jectId]/training-plans/create/loading.tsx b/...dal/(lg)/insights/[insightId]/loading.tsx → ...jectId]/training-plans/create/loading.tsx
diff --git a/...subjectId]/training-plans/create/page.tsx → ...subjectId]/training-plans/create/page.tsx b/...subjectId]/training-plans/create/page.tsx → ...subjectId]/training-plans/create/page.tsx
diff --git a/.../@modal/(md)/events/[eventId]/loading.tsx → ...)/@modal/(md)/subjects/create/loading.tsx b/.../@modal/(md)/events/[eventId]/loading.tsx → ...)/@modal/(md)/subjects/create/loading.tsx
diff --git a/...ate)/@modal/(md)/subjects/create/page.tsx → ...ges)/@modal/(md)/subjects/create/page.tsx b/...ate)/@modal/(md)/subjects/create/page.tsx → ...ges)/@modal/(md)/subjects/create/page.tsx
diff --git a/...ssionId]/sessions/[sessionId]/loading.tsx → ...l/(md)/templates/[templateId]/loading.tsx b/...ssionId]/sessions/[sessionId]/loading.tsx → ...l/(md)/templates/[templateId]/loading.tsx
diff --git a/...odal/(md)/templates/[templateId]/page.tsx → ...odal/(md)/templates/[templateId]/page.tsx b/...odal/(md)/templates/[templateId]/page.tsx → ...odal/(md)/templates/[templateId]/page.tsx
diff --git a/app/(pages)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/loading.tsx b/app/(pages)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/loading.tsx
@@ -0,0 +1,5 @@
+import PageModalLoading from '@/_components/page-modal-loading';
+
+const Loading = PageModalLoading;
+
+export default Loading;
diff --git a/...te/from-event-type/[eventTypeId]/page.tsx → ...te/from-event-type/[eventTypeId]/page.tsx b/...te/from-event-type/[eventTypeId]/page.tsx → ...te/from-event-type/[eventTypeId]/page.tsx
diff --git a/app/(pages)/@modal/(md)/templates/create/loading.tsx b/app/(pages)/@modal/(md)/templates/create/loading.tsx
@@ -0,0 +1,5 @@
+import PageModalLoading from '@/_components/page-modal-loading';
+
+const Loading = PageModalLoading;
+
+export default Loading;
diff --git a/...te)/@modal/(md)/templates/create/page.tsx → ...es)/@modal/(md)/templates/create/page.tsx b/...te)/@modal/(md)/templates/create/page.tsx → ...es)/@modal/(md)/templates/create/page.tsx
diff --git a/...s)/(private)/@modal/[...default]/page.tsx → app/(pages)/@modal/[...default]/page.tsx b/...s)/(private)/@modal/[...default]/page.tsx → app/(pages)/@modal/[...default]/page.tsx
diff --git a/app/(pages)/(private)/@modal/default.tsx → app/(pages)/@modal/default.tsx b/app/(pages)/(private)/@modal/default.tsx → app/(pages)/@modal/default.tsx
diff --git a/app/(pages)/(private)/default.tsx → app/(pages)/default.tsx b/app/(pages)/(private)/default.tsx → app/(pages)/default.tsx
diff --git a/app/(pages)/layout.tsx b/app/(pages)/layout.tsx
@@ -5,16 +5,8 @@ import { ReactNode } from 'react';
 import { twMerge } from 'tailwind-merge';
 import '../../tailwind.css';
 
-const figtree = Figtree({ subsets: ['latin'], variable: '--font-body' });
-
-const inconsolata = Inconsolata({
-  subsets: ['latin'],
-  variable: '--font-mono',
-});
-
-interface LayoutProps {
-  children: ReactNode;
-}
+const sans = Figtree({ subsets: ['latin'], variable: '--font-body' });
+const mono = Inconsolata({ subsets: ['latin'], variable: '--font-mono' });
 
 export const metadata = {
   description:
@@ -32,10 +24,16 @@ export const viewport: Viewport = {
   width: 'device-width',
 };
 
-const Layout = ({ children }: LayoutProps) => (
-  <html className={twMerge(figtree.variable, inconsolata.variable)} lang="en">
+interface LayoutProps {
+  children: ReactNode;
+  modal: ReactNode;
+}
+
+const Layout = ({ children, modal }: LayoutProps) => (
+  <html className={twMerge(sans.variable, mono.variable)} lang="en">
     <body>
       {children}
+      {modal}
       <Analytics />
     </body>
   </html>

diff --git a/...ectId]/(group)/(group)/events/loading.tsx → app/(pages)/loading.tsx b/...ectId]/(group)/(group)/events/loading.tsx → app/(pages)/loading.tsx
diff --git a/...ubjectId]/(group)/(group)/events/page.tsx → ...ubject-loading)/(subject)/events/page.tsx b/...ubjectId]/(group)/(group)/events/page.tsx → ...ubject-loading)/(subject)/events/page.tsx
diff --git a/...jectId]/(group)/(group)/insights/page.tsx → ...ject-loading)/(subject)/insights/page.tsx b/...jectId]/(group)/(group)/insights/page.tsx → ...ject-loading)/(subject)/insights/page.tsx
diff --git a/...re/[subjectId]/(group)/(group)/layout.tsx → ...d]/(subject-loading)/(subject)/layout.tsx b/...re/[subjectId]/(group)/(group)/layout.tsx → ...d]/(subject-loading)/(subject)/layout.tsx
diff --git a/...tId]/(group)/(group)/insights/loading.tsx → ...]/(subject-loading)/(subject)/loading.tsx b/...tId]/(group)/(group)/insights/loading.tsx → ...]/(subject-loading)/(subject)/loading.tsx
diff --git a/...lic)/share/[subjectId]/(group)/layout.tsx → .../[subjectId]/(subject-loading)/layout.tsx b/...lic)/share/[subjectId]/(group)/layout.tsx → .../[subjectId]/(subject-loading)/layout.tsx
diff --git a/...ic)/share/[subjectId]/(group)/loading.tsx → ...[subjectId]/(subject-loading)/loading.tsx b/...ic)/share/[subjectId]/(group)/loading.tsx → ...[subjectId]/(subject-loading)/loading.tsx
diff --git a/...c)/share/[subjectId]/events.csv/route.tsx → ...s)/share/[subjectId]/events.csv/route.tsx b/...c)/share/[subjectId]/events.csv/route.tsx → ...s)/share/[subjectId]/events.csv/route.tsx
diff --git a/...es)/(public)/share/[subjectId]/layout.tsx → app/(pages)/share/[subjectId]/layout.tsx b/...es)/(public)/share/[subjectId]/layout.tsx → app/(pages)/share/[subjectId]/layout.tsx
@@ -6,15 +6,10 @@ import { ReactNode } from 'react';
 
 interface LayoutProps {
   children: ReactNode;
-  modal: ReactNode;
   params: { subjectId: string };
 }
 
-const Layout = async ({
-  children,
-  modal,
-  params: { subjectId },
-}: LayoutProps) => {
+const Layout = async ({ children, params: { subjectId } }: LayoutProps) => {
   const [{ data: subject }, user] = await Promise.all([
     getSubject(subjectId),
     getCurrentUser(),
@@ -67,7 +62,6 @@ const Layout = async ({
         </div>
       </div>
       <div className="mx-auto max-w-lg pb-20">{children}</div>
-      {modal}
     </>
   );
 };

diff --git a/app/(pages)/share/[subjectId]/loading.tsx b/app/(pages)/share/[subjectId]/loading.tsx
@@ -0,0 +1,5 @@
+import Spinner from '@/_components/spinner';
+
+const Loading = () => <Spinner className="mx-auto my-16" />;
+
+export default Loading;