move insights to page modal

app/(pages)/(with-nav)/inputs/layout.tsx

@@ -11,7 +11,7 @@ const Layout = ({ children }: LayoutProps) => (
     <div className="my-16 flex h-8 items-center justify-between gap-8 px-4">
       <h1 className="text-2xl">Inputs</h1>
       <Button href="/inputs/create" scroll={false} size="sm">
-        <PlusIcon className="w-5" />
+        <PlusIcon className="-ml-0.5 w-5" />
         New input
       </Button>
     </div>

app/(pages)/(with-nav)/subjects/(list)/layout.tsx

@@ -11,7 +11,7 @@ const Layout = async ({ children }: LayoutProps) => (
     <div className="my-16 flex h-8 items-center justify-between gap-8 px-4">
       <h1 className="text-2xl">Subjects</h1>
       <Button href="/subjects/create" scroll={false} size="sm">
-        <PlusIcon className="w-5" />
+        <PlusIcon className="-ml-0.5 w-5" />
         New subject
       </Button>
     </div>

app/(pages)/(with-nav)/subjects/(list)/page.tsx

@@ -45,21 +45,23 @@ const Page = async () => {
       {!clientSubjects.length && !teamSubjects.length && (
         <Empty className="mx-4">
           <InformationCircleIcon className="w-7" />
-          Subjects can be dogs, cats, humans or
+          Add a subject to start collaboratively
           <br />
-          anything else you want to track.
+          tracking and improving behavior.
         </Empty>
       )}
       <SubjectList
         clientSubjects={clientSubjects}
         teamSubjects={teamSubjects}
       />
-      <CollapsibleArchive>
-        <SubjectList
-          clientSubjects={archivedClientSubjects}
-          teamSubjects={archivedTeamSubjects}
-        />
-      </CollapsibleArchive>
+      {(!!archivedTeamSubjects.length || !!archivedClientSubjects.length) && (
+        <CollapsibleArchive>
+          <SubjectList
+            clientSubjects={archivedClientSubjects}
+            teamSubjects={archivedTeamSubjects}
+          />
+        </CollapsibleArchive>
+      )}
     </>
   );
 };

app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/events/page.tsx → app/(pages)/(with-nav)/subjects/[subjectId]/page.tsx

@@ -1,4 +1,4 @@
-import SubjectEventsPage from '@/_components/subject-events-page';
+import SubjectPage from '@/_components/subject-page';
 import formatTitle from '@/_utilities/format-title';
 
 interface PageProps {
@@ -12,7 +12,7 @@ const Page = ({
   params: { subjectId },
   searchParams: { from, limit, to },
 }: PageProps) => (
-  <SubjectEventsPage from={from} limit={limit} subjectId={subjectId} to={to} />
+  <SubjectPage from={from} limit={limit} subjectId={subjectId} to={to} />
 );
 
 export default Page;

app/(pages)/(with-nav)/templates/layout.tsx

@@ -11,7 +11,7 @@ const Layout = ({ children }: LayoutProps) => (
     <div className="my-16 flex h-8 items-center justify-between gap-8 px-4">
       <h1 className="text-2xl">Templates</h1>
       <Button href="/templates/create" scroll={false} size="sm">
-        <PlusIcon className="w-5" />
+        <PlusIcon className="-ml-0.5 w-5" />
         New template
       </Button>
     </div>

app/(pages)/@modal/(lg)/share/[subjectId]/insights/[insightId]/loading.tsx

@@ -1,5 +1,5 @@
 import PageModalLoading from '@/_components/page-modal-loading';
 
-const Loading = PageModalLoading;
+const Loading = () => <PageModalLoading className="rounded bg-bg-3" />;
 
 export default Loading;

app/(pages)/share/[subjectId]/(subject-loading)/(subject)/insights/page.tsx → app/(pages)/@modal/(lg)/share/[subjectId]/insights/page.tsx

@@ -1,4 +1,4 @@
-import SubjectInsightsPage from '@/_components/subject-insights-page';
+import InsightsPage from '@/_components/insights-page';
 import formatTitle from '@/_utilities/format-title';
 
 interface PageProps {
@@ -9,11 +9,7 @@ interface PageProps {
 export const metadata = { title: formatTitle(['Subjects', 'Insights']) };
 
 const Page = async ({ params: { subjectId }, searchParams }: PageProps) => (
-  <SubjectInsightsPage
-    isPublic
-    searchParams={searchParams}
-    subjectId={subjectId}
-  />
+  <InsightsPage isPublic searchParams={searchParams} subjectId={subjectId} />
 );
 
 export default Page;

app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/page.tsx

@@ -26,7 +26,7 @@ const Page = async ({ params: { insightId, subjectId } }: PageProps) => {
 
   return (
     <>
-      <PageModalHeader title="New insight" />
+      <PageModalHeader title="Edit insight" />
       <InsightForm events={events} insight={insight} subjectId={subjectId} />
     </>
   );

app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/loading.tsx

@@ -1,5 +1,5 @@
 import PageModalLoading from '@/_components/page-modal-loading';
 
-const Loading = PageModalLoading;
+const Loading = () => <PageModalLoading className="rounded bg-bg-3" />;
 
 export default Loading;

app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/insights/page.tsx → app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/page.tsx

@@ -1,4 +1,4 @@
-import SubjectInsightsPage from '@/_components/subject-insights-page';
+import InsightsPage from '@/_components/insights-page';
 import formatTitle from '@/_utilities/format-title';
 
 interface PageProps {
@@ -9,7 +9,7 @@ interface PageProps {
 export const metadata = { title: formatTitle(['Subjects', 'Insights']) };
 
 const Page = async ({ params: { subjectId }, searchParams }: PageProps) => (
-  <SubjectInsightsPage searchParams={searchParams} subjectId={subjectId} />
+  <InsightsPage searchParams={searchParams} subjectId={subjectId} />
 );
 
 export default Page;

app/(pages)/@modal/(md)/account/[tab]/loading.tsx

@@ -1,7 +1,7 @@
 import Spinner from '@/_components/spinner';
 
 const Loading = () => (
-  <div className="py-24">
+  <div className="pb-24 pt-16">
     <Spinner className="mx-auto" />
   </div>
 );

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

@@ -1,7 +1,7 @@
-import MissionForm from '@/_components/mission-form';
 import PageModalHeader from '@/_components/page-modal-header';
-import getMission from '@/_queries/get-mission';
+import TrainingPlanForm from '@/_components/training-plan-form';
 import getSubject from '@/_queries/get-subject';
+import getTrainingPlan from '@/_queries/get-training-plan';
 import formatTitle from '@/_utilities/format-title';
 
 interface PageProps {
@@ -18,15 +18,15 @@ export const metadata = {
 const Page = async ({ params: { missionId, subjectId } }: PageProps) => {
   const [{ data: subject }, { data: mission }] = await Promise.all([
     getSubject(subjectId),
-    getMission(missionId),
+    getTrainingPlan(missionId),
   ]);
 
   if (!subject || !mission) return null;
 
   return (
     <>
       <PageModalHeader title={mission.name} />
-      <MissionForm mission={mission} subjectId={subjectId} />
+      <TrainingPlanForm mission={mission} subjectId={subjectId} />
     </>
   );
 };

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

@@ -3,9 +3,9 @@ import PageModalHeader from '@/_components/page-modal-header';
 import SessionForm from '@/_components/session-form';
 import SessionLayout from '@/_components/session-layout';
 import getCurrentUser from '@/_queries/get-current-user';
-import getMissionWithSessions from '@/_queries/get-mission-with-sessions';
 import getSession from '@/_queries/get-session';
 import getSubject from '@/_queries/get-subject';
+import getTrainingPlanWithSessions from '@/_queries/get-training-plan-with-sessions';
 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';
@@ -37,7 +37,7 @@ const Page = async ({
     user,
   ] = await Promise.all([
     getSubject(subjectId),
-    getMissionWithSessions(missionId, { draft: true }),
+    getTrainingPlanWithSessions(missionId, { draft: true }),
     getSession(sessionId),
     listInputsBySubjectId(subjectId),
     listTemplatesWithData(),

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

@@ -3,9 +3,9 @@ import PageModalHeader from '@/_components/page-modal-header';
 import SessionForm from '@/_components/session-form';
 import SessionLayout from '@/_components/session-layout';
 import getCurrentUser from '@/_queries/get-current-user';
-import getMissionWithSessions from '@/_queries/get-mission-with-sessions';
 import getSession from '@/_queries/get-session';
 import getSubject from '@/_queries/get-subject';
+import getTrainingPlanWithSessions from '@/_queries/get-training-plan-with-sessions';
 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';
@@ -37,7 +37,7 @@ const Page = async ({
     user,
   ] = await Promise.all([
     getSubject(subjectId),
-    getMissionWithSessions(missionId, { draft: true }),
+    getTrainingPlanWithSessions(missionId, { draft: true }),
     getSession(sessionId),
     listInputsBySubjectId(subjectId),
     listTemplatesWithData(),

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

@@ -3,8 +3,8 @@ import PageModalHeader from '@/_components/page-modal-header';
 import SessionForm from '@/_components/session-form';
 import SessionLayout from '@/_components/session-layout';
 import getCurrentUser from '@/_queries/get-current-user';
-import getMissionWithSessions from '@/_queries/get-mission-with-sessions';
 import getSubject from '@/_queries/get-subject';
+import getTrainingPlanWithSessions from '@/_queries/get-training-plan-with-sessions';
 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';
@@ -32,7 +32,7 @@ const Page = async ({ params: { missionId, order, subjectId } }: PageProps) => {
     user,
   ] = await Promise.all([
     getSubject(subjectId),
-    getMissionWithSessions(missionId, { draft: true }),
+    getTrainingPlanWithSessions(missionId, { draft: true }),
     listSubjectsByTeamId(),
     listInputsBySubjectId(subjectId),
     listTemplatesWithData(),

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

@@ -1,5 +1,5 @@
-import MissionForm from '@/_components/mission-form';
 import PageModalHeader from '@/_components/page-modal-header';
+import TrainingPlanForm from '@/_components/training-plan-form';
 import getSubject from '@/_queries/get-subject';
 import formatTitle from '@/_utilities/format-title';
 
@@ -20,7 +20,7 @@ const Page = async ({ params: { subjectId } }: PageProps) => {
   return (
     <>
       <PageModalHeader title="New training plan" />
-      <MissionForm subjectId={subjectId} />
+      <TrainingPlanForm subjectId={subjectId} />
     </>
   );
 };

app/(pages)/share/[subjectId]/layout.tsx

@@ -29,7 +29,7 @@ const Layout = async ({ children, params: { subjectId } }: LayoutProps) => {
                   </span>
                   <Button
                     className="text-sm"
-                    href={`/subjects/${subjectId}/events`}
+                    href={`/subjects/${subjectId}`}
                     variant="link"
                   >
                     View full profile

app/(pages)/share/[subjectId]/loading.tsx

@@ -1,3 +1,3 @@
-const Loading = () => null;
+import SubjectLoading from '@/_components/subject-loading';
 
-export default Loading;
+export default SubjectLoading;

app/(pages)/share/[subjectId]/(subject-loading)/(subject)/events/page.tsx → app/(pages)/share/[subjectId]/page.tsx

@@ -1,4 +1,4 @@
-import SubjectEventsPage from '@/_components/subject-events-page';
+import SubjectPage from '@/_components/subject-page';
 import formatTitle from '@/_utilities/format-title';
 
 interface PageProps {
@@ -12,7 +12,7 @@ const Page = async ({
   params: { subjectId },
   searchParams: { from, limit, to },
 }: PageProps) => (
-  <SubjectEventsPage
+  <SubjectPage
     from={from}
     limit={limit}
     isPublic

app/(pages)/(with-nav)/subjects/[subjectId]/join/[shareCode]/page.tsx → app/(pages)/subjects/[subjectId]/join/[shareCode]/page.tsx

@@ -18,7 +18,7 @@ const Page = async ({ params: { shareCode, subjectId } }: PageProps) => {
     });
   }
 
-  redirect(`/subjects/${subjectId}/events`);
+  redirect(`/subjects/${subjectId}`);
 };
 
 export default Page;

app/_components/alert.tsx

@@ -38,7 +38,7 @@ const Alert = ({
       <div className="fixed inset-0 z-20 bg-alpha-reverse-1 backdrop-blur-sm" />
       <div className="fixed inset-0 z-30 overflow-y-auto p-4">
         <div className="flex min-h-full items-center justify-center">
-          <DialogPanel className="w-full max-w-xs rounded border border-alpha-1 bg-bg-2 p-8 text-center drop-shadow">
+          <DialogPanel className="w-full max-w-xs rounded border border-alpha-1 bg-bg-2 p-8 text-center drop-shadow-2xl">
             <DialogTitle className="text-2xl">{title}</DialogTitle>
             {description && (
               <Description className="mt-2 text-fg-4">

app/_components/button.tsx

@@ -107,7 +107,10 @@ const Button = forwardRef<HTMLButtonElement | HTMLAnchorElement, ButtonProps>(
         {loading || (type === 'submit' && pending) ? (
           <>
             {variant !== 'link' && (
-              <Spinner color={spinnerColorSchemes[colorScheme]} />
+              <Spinner
+                className="-ml-0.5"
+                color={spinnerColorSchemes[colorScheme]}
+              />
             )}
             {loadingText ?? children}
           </>