TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-12 09:54:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

username, fix build

Browse Source
This commit is contained in:
peintnermax
2024-04-01 10:19:30 +02:00
parent 8f836557c3
commit 07788e91b2
3 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
apps/login/app/layout.tsx
View File

@@ -33,41 +33,43 @@ export default async function RootLayout({
<html lang="en" className={`${lato.className}`} suppressHydrationWarning>
<head />
<body>
<div
className={`h-screen overflow-y-scroll bg-background-light-600 dark:bg-background-dark-600 ${
showNav
? "bg-[url('/grid-light.svg')] dark:bg-[url('/grid-dark.svg')]"
: ""
}`}
>
{showNav ? (
<GlobalNav />
) : (
<div className="absolute bottom-0 right-0 flex flex-row p-4">
<Theme />
</div>
)}
<ThemeProvider>
<div
className={`${
showNav ? "lg:pl-72" : ""
} pb-4 flex flex-col justify-center h-full`}
className={`h-screen overflow-y-scroll bg-background-light-600 dark:bg-background-dark-600 ${
showNav
? "bg-[url('/grid-light.svg')] dark:bg-[url('/grid-dark.svg')]"
: ""
}`}
>
<div className="mx-auto max-w-[440px] space-y-8 pt-20 lg:py-8 w-full">
{showNav && (
<div className="rounded-lg bg-vc-border-gradient dark:bg-dark-vc-border-gradient p-px shadow-lg shadow-black/5 dark:shadow-black/20">
<div className="rounded-lg bg-background-light-400 dark:bg-background-dark-500">
<AddressBar domain={domain} />
</div>
</div>
)}
{showNav ? (
<GlobalNav />
) : (
<div className="absolute bottom-0 right-0 flex flex-row p-4">
<Theme />
</div>
)}
{children}
<div
className={`${
showNav ? "lg:pl-72" : ""
} pb-4 flex flex-col justify-center h-full`}
>
<div className="mx-auto max-w-[440px] space-y-8 pt-20 lg:py-8 w-full">
{showNav && (
<div className="rounded-lg bg-vc-border-gradient dark:bg-dark-vc-border-gradient p-px shadow-lg shadow-black/5 dark:shadow-black/20">
<div className="rounded-lg bg-background-light-400 dark:bg-background-dark-500">
<AddressBar domain={domain} />
</div>
</div>
)}
{children}
</div>
</div>
</div>
</div>
<Analytics />
<Analytics />
</ThemeProvider>
</body>
</html>
);

43
apps/login/ui/DynamicTheme.tsx
View File

@@ -5,9 +5,8 @@ import React from "react";
import { Logo } from "#/ui/Logo";
import ThemeWrapper from "./ThemeWrapper";
import { LayoutProviders } from "./LayoutProviders";
import ThemeProvider from "./ThemeProvider";
export default async function DynamicTheme({
export default function DynamicTheme({
branding,
children,
}: {
@@ -23,29 +22,29 @@ export default async function DynamicTheme({
}
return (
<ThemeWrapper branding={partial}>
<ThemeProvider>
<LayoutProviders>
<div className="rounded-lg bg-vc-border-gradient dark:bg-dark-vc-border-gradient p-px shadow-lg shadow-black/5 dark:shadow-black/20 mb-10">
<div className="rounded-lg bg-background-light-400 dark:bg-background-dark-500 px-8 py-12">
<div className="mx-auto flex flex-col items-center space-y-4">
<div className="relative">
{branding && (
<Logo
lightSrc={branding.lightTheme?.logoUrl}
darkSrc={branding.darkTheme?.logoUrl}
height={150}
width={150}
/>
)}
</div>
<div className="w-full">{children}</div>
<div className="flex flex-row justify-between"></div>
{/* <ThemeProvider> */}
<LayoutProviders>
<div className="rounded-lg bg-vc-border-gradient dark:bg-dark-vc-border-gradient p-px shadow-lg shadow-black/5 dark:shadow-black/20 mb-10">
<div className="rounded-lg bg-background-light-400 dark:bg-background-dark-500 px-8 py-12">
<div className="mx-auto flex flex-col items-center space-y-4">
<div className="relative">
{branding && (
<Logo
lightSrc={branding.lightTheme?.logoUrl}
darkSrc={branding.darkTheme?.logoUrl}
height={150}
width={150}
/>
)}
</div>
<div className="w-full">{children}</div>
<div className="flex flex-row justify-between"></div>
</div>
</div>
</LayoutProviders>
</ThemeProvider>
</div>
</LayoutProviders>
{/* </ThemeProvider> */}
</ThemeWrapper>
);
}

15
apps/login/ui/UsernameForm.tsx
View File

@@ -106,6 +106,9 @@ export default function UsernameForm({
if (authRequestId) {
paramsPasskey.authRequestId = authRequestId;
}
if (organization) {
paramsPasskey.organization = organization;
}
return router.push(
"/passkey/login?" + new URLSearchParams(paramsPasskey)
@@ -120,6 +123,10 @@ export default function UsernameForm({
if (authRequestId) {
paramsPasskeyDefault.authRequestId = authRequestId;
}
if (organization) {
paramsPasskeyDefault.organization = organization;
}
return router.push(
"/password?" + new URLSearchParams(paramsPasskeyDefault)
);
@@ -143,6 +150,10 @@ export default function UsernameForm({
passkeyParams.authRequestId = authRequestId;
}
if (organization) {
passkeyParams.organization = organization;
}
return router.push(
"/passkey/login?" + new URLSearchParams(passkeyParams)
);
@@ -158,6 +169,10 @@ export default function UsernameForm({
paramsPasswordDefault.authRequestId = authRequestId;
}
if (organization) {
paramsPasswordDefault.organization = organization;
}
return router.push(
"/password?" + new URLSearchParams(paramsPasswordDefault)
);