fix: wip

apps/remix/app/routes/_authenticated+/_layout.tsx

@@ -1,15 +1,22 @@
 import { Outlet, redirect } from 'react-router';
 
 import { LimitsProvider } from '@documenso/ee/server-only/limits/provider/client';
+import { getSiteSettings } from '@documenso/lib/server-only/site-settings/get-site-settings';
+import { SITE_SETTINGS_BANNER_ID } from '@documenso/lib/server-only/site-settings/schemas/banner';
 
+import { AppBanner } from '~/components/(dashboard)/layout/app-banner';
 import { Header } from '~/components/(dashboard)/layout/header';
 import { VerifyEmailBanner } from '~/components/(dashboard)/layout/verify-email-banner';
 
 import type { Route } from './+types/_layout';
 
-export const loader = ({ context }: Route.LoaderArgs) => {
+export const loader = async ({ context }: Route.LoaderArgs) => {
   const { session } = context;
 
+  const banner = await getSiteSettings().then((settings) =>
+    settings.find((setting) => setting.id === SITE_SETTINGS_BANNER_ID),
+  );
+
   if (!session) {
     throw redirect('/signin');
   }
@@ -17,18 +24,18 @@ export const loader = ({ context }: Route.LoaderArgs) => {
   return {
     user: session.user,
     teams: session.teams,
+    banner,
   };
 };
 
 export default function Layout({ loaderData }: Route.ComponentProps) {
-  const { user, teams } = loaderData;
+  const { user, teams, banner } = loaderData;
 
   return (
     <LimitsProvider>
       {!user.emailVerified && <VerifyEmailBanner email={user.email} />}
 
-      {/* // Todo: Banner */}
-      {/* <Banner /> */}
+      {banner && <AppBanner banner={banner} />}
 
       <Header user={user} teams={teams} />
 

apps/remix/app/routes/_authenticated+/admin+/_layout.tsx

@@ -1,7 +1,7 @@
 import { Trans } from '@lingui/macro';
 import { BarChart3, FileStack, Settings, Trophy, Users, Wallet2 } from 'lucide-react';
 import { Link, Outlet, redirect, useLocation } from 'react-router';
-import { getRequiredSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderSession } from 'server/utils/get-required-session-context';
 
 import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';
 import { cn } from '@documenso/ui/lib/utils';
@@ -10,7 +10,7 @@ import { Button } from '@documenso/ui/primitives/button';
 import type { Route } from './+types/_layout';
 
 export function loader({ context }: Route.LoaderArgs) {
-  const { user } = getRequiredSessionContext(context);
+  const { user } = getRequiredLoaderSession(context);
 
   if (!user || !isAdmin(user)) {
     throw redirect('/documents');

apps/remix/app/routes/_authenticated+/documents+/$id._index.tsx

@@ -3,7 +3,7 @@ import { useLingui } from '@lingui/react';
 import { DocumentStatus, TeamMemberRole } from '@prisma/client';
 import { ChevronLeft, Clock9, Users2 } from 'lucide-react';
 import { Link, redirect } from 'react-router';
-import { getRequiredSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderSession } from 'server/utils/get-required-session-context';
 import { match } from 'ts-pattern';
 
 import { useSession } from '@documenso/lib/client-only/providers/session';
@@ -34,7 +34,7 @@ import { DocumentPageViewRecipients } from '~/components/general/document/docume
 import type { Route } from './+types/$id._index';
 
 export async function loader({ params, context }: Route.LoaderArgs) {
-  const { user, currentTeam: team } = getRequiredSessionContext(context);
+  const { user, currentTeam: team } = getRequiredLoaderSession(context);
 
   const { id } = params;
 

apps/remix/app/routes/_authenticated+/documents+/$id.edit.tsx

@@ -2,7 +2,7 @@ import { Plural, Trans } from '@lingui/macro';
 import { DocumentStatus as InternalDocumentStatus, TeamMemberRole } from '@prisma/client';
 import { ChevronLeft, Users2 } from 'lucide-react';
 import { Link, redirect } from 'react-router';
-import { getRequiredSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderSession } from 'server/utils/get-required-session-context';
 import { match } from 'ts-pattern';
 
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
@@ -18,7 +18,7 @@ import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
 import type { Route } from './+types/$id.edit';
 
 export async function loader({ params, context }: Route.LoaderArgs) {
-  const { user, currentTeam: team } = getRequiredSessionContext(context);
+  const { user, currentTeam: team } = getRequiredLoaderSession(context);
 
   const { id } = params;
 

apps/remix/app/routes/_authenticated+/documents+/$id.logs.tsx

@@ -5,7 +5,7 @@ import type { Recipient } from '@prisma/client';
 import { ChevronLeft } from 'lucide-react';
 import { DateTime } from 'luxon';
 import { Link, redirect } from 'react-router';
-import { getRequiredSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderSession } from 'server/utils/get-required-session-context';
 
 import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
 import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
@@ -25,7 +25,7 @@ import type { Route } from './+types/$id.logs';
 export async function loader({ params, context }: Route.LoaderArgs) {
   const { id } = params;
 
-  const { user, currentTeam: team } = getRequiredSessionContext(context);
+  const { user, currentTeam: team } = getRequiredLoaderSession(context);
 
   const documentId = Number(id);
 

apps/remix/app/routes/_authenticated+/settings+/public-profile+/index.tsx

@@ -4,7 +4,7 @@ import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import type { TemplateDirectLink } from '@prisma/client';
 import { TemplateType } from '@prisma/client';
-import { getRequiredSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderSession } from 'server/utils/get-required-session-context';
 
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { getUserPublicProfile } from '@documenso/lib/server-only/user/get-user-public-profile';
@@ -44,7 +44,7 @@ const teamProfileText = {
 };
 
 export async function loader({ context }: Route.LoaderArgs) {
-  const { user } = getRequiredSessionContext(context);
+  const { user } = getRequiredLoaderSession(context);
 
   const { profile } = await getUserPublicProfile({
     userId: user.id,

apps/remix/app/routes/_authenticated+/settings+/tokens+/index.tsx

@@ -1,7 +1,7 @@
 import { Trans } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { DateTime } from 'luxon';
-import { getRequiredSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderSession } from 'server/utils/get-required-session-context';
 
 import { getUserTokens } from '@documenso/lib/server-only/public-api/get-all-user-tokens';
 import { Button } from '@documenso/ui/primitives/button';
@@ -12,7 +12,7 @@ import { ApiTokenForm } from '~/components/forms/token';
 import type { Route } from './+types/index';
 
 export async function loader({ context }: Route.LoaderArgs) {
-  const { user } = getRequiredSessionContext(context);
+  const { user } = getRequiredLoaderSession(context);
 
   // Todo: Use TRPC & use table instead
   const tokens = await getUserTokens({ userId: user.id });

apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx

@@ -3,7 +3,7 @@ import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { ChevronLeft } from 'lucide-react';
 import { Link, Outlet, isRouteErrorResponse, redirect, useNavigate } from 'react-router';
-import { getRequiredSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderSession } from 'server/utils/get-required-session-context';
 import { match } from 'ts-pattern';
 
 import { AppErrorCode } from '@documenso/lib/errors/app-error';
@@ -15,7 +15,7 @@ import { TeamProvider } from '~/providers/team';
 import type { Route } from './+types/_layout';
 
 export const loader = ({ context }: Route.LoaderArgs) => {
-  const { currentTeam } = getRequiredSessionContext(context);
+  const { currentTeam } = getRequiredLoaderSession(context);
 
   if (!currentTeam) {
     throw redirect('/documents');

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings+/_layout.tsx

@@ -1,6 +1,6 @@
 import { Trans } from '@lingui/macro';
 import { Outlet } from 'react-router';
-import { getRequiredTeamSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderTeamSession } from 'server/utils/get-required-session-context';
 
 import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
 
@@ -9,10 +9,9 @@ import { TeamSettingsMobileNav } from '~/components/general/teams/team-settings-
 
 import type { Route } from '../+types/_layout';
 
-export async function loader({ context }: Route.LoaderArgs) {
-  const { currentTeam: team } = getRequiredTeamSessionContext(context);
+export function loader({ context }: Route.LoaderArgs) {
+  const { currentTeam: team } = getRequiredLoaderTeamSession(context);
 
-  // Todo: Test that 404 page shows up from error.
   if (!team || !canExecuteTeamAction('MANAGE_TEAM', team.currentTeamMember.role)) {
     throw new Response(null, { status: 401 }); // Unauthorized.
   }

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings+/billing.tsx

@@ -1,7 +1,7 @@
 import { Plural, Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { DateTime } from 'luxon';
-import { getRequiredTeamSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderTeamSession } from 'server/utils/get-required-session-context';
 import type Stripe from 'stripe';
 import { match } from 'ts-pattern';
 
@@ -16,7 +16,7 @@ import { TeamBillingPortalButton } from '~/components/general/teams/team-billing
 import type { Route } from './+types/billing';
 
 export async function loader({ context }: Route.LoaderArgs) {
-  const { currentTeam: team } = getRequiredTeamSessionContext(context);
+  const { currentTeam: team } = getRequiredLoaderTeamSession(context);
 
   let teamSubscription: Stripe.Subscription | null = null;
 

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings+/public-profile.tsx

@@ -1,4 +1,4 @@
-import { getRequiredTeamSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderTeamSession } from 'server/utils/get-required-session-context';
 
 import { getTeamPublicProfile } from '@documenso/lib/server-only/team/get-team-public-profile';
 
@@ -7,7 +7,7 @@ import PublicProfilePage from '~/routes/_authenticated+/settings+/public-profile
 import type { Route } from './+types/public-profile';
 
 export async function loader({ context }: Route.LoaderArgs) {
-  const { user, currentTeam: team } = getRequiredTeamSessionContext(context);
+  const { user, currentTeam: team } = getRequiredLoaderTeamSession(context);
 
   const { profile } = await getTeamPublicProfile({
     userId: user.id,

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings+/tokens.tsx

@@ -1,7 +1,7 @@
 import { Trans } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { DateTime } from 'luxon';
-import { getRequiredTeamSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderTeamSession } from 'server/utils/get-required-session-context';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { getTeamTokens } from '@documenso/lib/server-only/public-api/get-all-team-tokens';
@@ -13,7 +13,7 @@ import { ApiTokenForm } from '~/components/forms/token';
 import type { Route } from './+types/tokens';
 
 export async function loader({ context }: Route.LoaderArgs) {
-  const { user, currentTeam: team } = getRequiredTeamSessionContext(context);
+  const { user, currentTeam: team } = getRequiredLoaderTeamSession(context);
 
   const tokens = await getTeamTokens({ userId: user.id, teamId: team.id }).catch(() => null);
 

apps/remix/app/routes/_authenticated+/templates+/$id._index.tsx

@@ -2,7 +2,7 @@ import { Trans } from '@lingui/macro';
 import { DocumentSigningOrder, SigningStatus } from '@prisma/client';
 import { ChevronLeft, LucideEdit } from 'lucide-react';
 import { Link, redirect } from 'react-router';
-import { getRequiredSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderSession } from 'server/utils/get-required-session-context';
 
 import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
 import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
@@ -25,7 +25,7 @@ import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
 import type { Route } from './+types/$id._index';
 
 export async function loader({ params, context }: Route.LoaderArgs) {
-  const { user, currentTeam: team } = getRequiredSessionContext(context);
+  const { user, currentTeam: team } = getRequiredLoaderSession(context);
 
   const { id } = params;
 

apps/remix/app/routes/_authenticated+/templates+/$id.edit.tsx

@@ -1,7 +1,7 @@
 import { Trans } from '@lingui/macro';
 import { ChevronLeft } from 'lucide-react';
 import { Link, redirect } from 'react-router';
-import { getRequiredSessionContext } from 'server/utils/get-required-session-context';
+import { getRequiredLoaderSession } from 'server/utils/get-required-session-context';
 
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
@@ -16,7 +16,7 @@ import { TemplateDirectLinkDialogWrapper } from '../../../components/dialogs/tem
 import type { Route } from './+types/$id.edit';
 
 export async function loader({ context, params }: Route.LoaderArgs) {
-  const { user, currentTeam: team } = getRequiredSessionContext(context);
+  const { user, currentTeam: team } = getRequiredLoaderSession(context);
 
   const { id } = params;