feat: add organisations (#1820)

This commit is contained in:
David Nguyen
2025-06-10 11:49:52 +10:00
committed by GitHub
parent 0b37f19641
commit e6dc237ad2
631 changed files with 37616 additions and 25695 deletions

View File

@ -21,9 +21,7 @@ export default function RecipientLayout() {
return (
<div className="min-h-screen">
{sessionData?.user && (
<AuthenticatedHeader user={sessionData.user} teams={sessionData.teams} />
)}
{sessionData?.user && <AuthenticatedHeader />}
<main className="mb-8 mt-8 px-4 md:mb-12 md:mt-12 md:px-8">
<Outlet />

View File

@ -17,6 +17,7 @@ import { getNextPendingRecipient } from '@documenso/lib/server-only/recipient/ge
import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';
import { getRecipientsForAssistant } from '@documenso/lib/server-only/recipient/get-recipients-for-assistant';
import { getTeamSettings } from '@documenso/lib/server-only/team/get-team-settings';
import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email';
import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
import { SigningCard3D } from '@documenso/ui/components/signing-card';
@ -139,6 +140,8 @@ export async function loader({ params, request }: Route.LoaderArgs) {
const [recipientSignature] = await getRecipientSignatures({ recipientId: recipient.id });
const settings = await getTeamSettings({ teamId: document.teamId });
return superLoaderJson({
isDocumentAccessValid: true,
document,
@ -149,6 +152,7 @@ export async function loader({ params, request }: Route.LoaderArgs) {
completedFields,
recipientSignature,
isRecipientsTurn,
includeSenderDetails: settings.includeSenderDetails,
} as const);
}
@ -175,6 +179,7 @@ export default function SigningPage() {
recipientSignature,
isRecipientsTurn,
allRecipients,
includeSenderDetails,
recipientWithFields,
} = data;
@ -207,7 +212,7 @@ export default function SigningPage() {
</p>
{user ? (
<Link to="/documents" className="text-documenso-700 hover:text-documenso-600 mt-36">
<Link to="/" className="text-documenso-700 hover:text-documenso-600 mt-36">
<Trans>Go Back Home</Trans>
</Link>
) : (
@ -249,6 +254,7 @@ export default function SigningPage() {
completedFields={completedFields}
isRecipientsTurn={isRecipientsTurn}
allRecipients={allRecipients}
includeSenderDetails={includeSenderDetails}
/>
</DocumentSigningAuthProvider>
</DocumentSigningProvider>

View File

@ -249,7 +249,7 @@ export default function CompletedSigningPage({ loaderData }: Route.ComponentProp
)}
{user && (
<Link to="/documents" className="text-documenso-700 hover:text-documenso-600 mt-2">
<Link to="/" className="text-documenso-700 hover:text-documenso-600 mt-2">
<Trans>Go Back Home</Trans>
</Link>
)}

View File

@ -56,9 +56,8 @@ export async function loader({ params, request }: Route.LoaderArgs) {
}
}
const documentPathForEditing = isOwnerOrTeamMember
? formatDocumentsPath(team?.url) + '/' + document.id
: null;
const documentPathForEditing =
isOwnerOrTeamMember && team ? formatDocumentsPath(team.url) + '/' + document.id : null;
return {
documentPathForEditing,
@ -95,7 +94,7 @@ export default function WaitingForTurnToSignPage({ loaderData }: Route.Component
</Button>
) : (
<Button variant="link" asChild>
<Link to="/documents">Return Home</Link>
<Link to="/">Return Home</Link>
</Button>
)}
</div>