Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/login/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
"signInWithGithub": "Sign in with GitHub",
"signInWithGitlab": "Sign in with GitLab",
"loginSuccess": {
"title": "Login successful",
"description": "You have successfully been loggedIn!"
"title": "Sign in confirmed",
"description": "Directing you to your account"
},
"linkingSuccess": {
"title": "Account linked",
Expand Down
2 changes: 1 addition & 1 deletion apps/login/src/app/(main)/(illustration)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ export default function IllustrationLayout({
}: {
children: ReactNode;
}) {
return (<BoxedCard>{children}</BoxedCard>);
return <BoxedCard>{children}</BoxedCard>;
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ export const LoginBtn = () => {
</button>
</div>
<div className="text-center ztdl-p text-sm font-normal mt-6 bg-body-background rounded-lg border border-card-border p-6 shadow-[0_2px_4px_2px_rgba(12,29,49,0.03)]">
<strong><Translated i18nKey="onWaitListQuestion" namespace="register" /></strong>
<strong>
<Translated i18nKey="onWaitListQuestion" namespace="register" />
</strong>
<Translated i18nKey="onWaitListInfo" namespace="register" />
</div>
</>
Expand Down
17 changes: 14 additions & 3 deletions apps/login/src/app/(main)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,24 @@ export default async function RootLayout({
<DefaultTags />
</head>
<body className="bg-body-background font-alliance text-body-foreground relative">

<div className="fixed bottom-0 left-0 z-0 max-w-[300px] md:max-w-[416px]">
<Image src={scene1} className="size-auto w-full object-cover" alt="scene 1" width={416} height={416} />
<Image
src={scene1}
className="size-auto w-full object-cover"
alt="scene 1"
width={416}
height={416}
/>
</div>

<div className="fixed right-0 bottom-0 z-0 max-w-[500px] md:max-w-[800px]">
<Image src={scene2} className="size-auto w-full object-cover" alt="scene 2" width={800} height={800} />
<Image
src={scene2}
className="size-auto w-full object-cover"
alt="scene 2"
width={800}
height={800}
/>
</div>

<ThemeProvider>
Expand Down
2 changes: 0 additions & 2 deletions apps/login/src/components/datum-logo/full.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ export const DatumLogoFull = (props: React.SVGProps<SVGSVGElement>) => {
mounted && resolvedTheme === "dark" ? "#ffffff" : "#0C1D31";
const fillColor = mounted && resolvedTheme === "dark" ? "#E6F59E" : "#BF9595";



return (
<svg
width={82}
Expand Down
33 changes: 17 additions & 16 deletions apps/login/src/components/datum-logo/logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,20 @@ export const DatumLogo = (props: React.SVGProps<SVGSVGElement>) => {

// Default to light theme color during SSR and before hydration
const fillColor = mounted && resolvedTheme === "dark" ? "#E6F59E" : "#BF9595";

return(
<svg
width={46}
height={46}
viewBox="0 0 46 46"
fill="none"
xmlns="http://www.w3.org/2000/svg"
{...props}
>
<path
d="M17.2818 -0.000862122C16.6346 -0.000862122 16.1069 0.5252 16.1069 1.17407C16.1069 1.82294 16.1069 12.6546 16.1069 12.6546C16.1069 13.3018 16.633 13.8003 17.2818 13.8003L22.8571 13.8295C25.1605 13.8295 27.3543 14.729 29.0354 16.3603C30.7265 18.0032 31.6707 20.1722 31.6973 22.4706C31.7238 24.8254 30.826 27.0425 29.1715 28.7153C27.517 30.3881 25.3098 31.3092 22.9566 31.3092H22.8571C20.5586 31.2826 18.3896 30.3383 16.7467 28.6473C15.1154 26.9679 14.1901 24.7723 14.1901 22.4689V16.8282C14.1901 16.181 13.6899 15.7172 13.041 15.7172H1.56385C0.916641 15.7172 0.388916 16.1794 0.388916 16.8282V28.3088C0.388916 28.956 0.914981 29.5183 1.56385 29.5183H10.6231C11.8412 29.5183 12.6262 29.5003 13.2734 29.5882C14.133 29.7044 14.7088 29.95 15.1436 30.3831C15.5784 30.8163 15.8224 31.3938 15.9385 32.2534C16.0265 32.9023 16.1069 33.6856 16.1069 34.9053V43.9629C16.1069 44.6101 16.5692 45.2363 17.218 45.2363H22.9583C25.5355 45.2363 28.0663 44.7047 30.4809 43.8517C39.4804 40.6705 45.5276 32.1173 45.5276 22.5685C45.5276 13.0197 39.4804 4.46655 30.4809 1.28526C28.0663 0.43227 25.5355 -0.000862122 22.9583 -0.000862122H17.2835H17.2818Z"
fill={fillColor}
/>
</svg>
)};

return (
<svg
width={46}
height={46}
viewBox="0 0 46 46"
fill="none"
xmlns="http://www.w3.org/2000/svg"
{...props}
>
<path
d="M17.2818 -0.000862122C16.6346 -0.000862122 16.1069 0.5252 16.1069 1.17407C16.1069 1.82294 16.1069 12.6546 16.1069 12.6546C16.1069 13.3018 16.633 13.8003 17.2818 13.8003L22.8571 13.8295C25.1605 13.8295 27.3543 14.729 29.0354 16.3603C30.7265 18.0032 31.6707 20.1722 31.6973 22.4706C31.7238 24.8254 30.826 27.0425 29.1715 28.7153C27.517 30.3881 25.3098 31.3092 22.9566 31.3092H22.8571C20.5586 31.2826 18.3896 30.3383 16.7467 28.6473C15.1154 26.9679 14.1901 24.7723 14.1901 22.4689V16.8282C14.1901 16.181 13.6899 15.7172 13.041 15.7172H1.56385C0.916641 15.7172 0.388916 16.1794 0.388916 16.8282V28.3088C0.388916 28.956 0.914981 29.5183 1.56385 29.5183H10.6231C11.8412 29.5183 12.6262 29.5003 13.2734 29.5882C14.133 29.7044 14.7088 29.95 15.1436 30.3831C15.5784 30.8163 15.8224 31.3938 15.9385 32.2534C16.0265 32.9023 16.1069 33.6856 16.1069 34.9053V43.9629C16.1069 44.6101 16.5692 45.2363 17.218 45.2363H22.9583C25.5355 45.2363 28.0663 44.7047 30.4809 43.8517C39.4804 40.6705 45.5276 32.1173 45.5276 22.5685C45.5276 13.0197 39.4804 4.46655 30.4809 1.28526C28.0663 0.43227 25.5355 -0.000862122 22.9583 -0.000862122H17.2835H17.2818Z"
fill={fillColor}
/>
</svg>
);
};
3 changes: 1 addition & 2 deletions apps/login/src/styles/globals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

.ztdl-p {
@apply text-center;

&.description {
font-size: 14px;
}
Expand All @@ -25,7 +25,6 @@
@apply opacity-50;
font-size: 12px;
}

}

body {
Expand Down
2 changes: 1 addition & 1 deletion apps/login/tailwind.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export default {
// PURPOSE TOKENs
"body-background": "var(--body-background)",
"body-foreground": "var(--body-foreground)",

"card-background": "var(--card-background)",
"card-border": "var(--card-border)",

Expand Down
Loading