Skip to content

Commit dbed223

Browse files
replace volto style login page with plone style login (#132)
Co-authored-by: Víctor Fernández de Alba <sneridagh@gmail.com>
1 parent 5339f2f commit dbed223

6 files changed

Lines changed: 44 additions & 32 deletions

File tree

packages/cmsui/components/Login/LoginHero.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import voltoHeroSvg from '../../static/volto-hero.svg';
1+
import ploneHeroSvg from '../../static/plone-hero.svg';
22

33
const LoginHero = () => {
44
return (
55
<img
6-
src={voltoHeroSvg}
6+
src={ploneHeroSvg}
77
className="h-full w-auto object-cover"
88
alt=""
99
aria-hidden="true"

packages/cmsui/components/Login/LoginLogo.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
import ploneWhiteSVG from '../../static/plone.svg';
1+
import Plone from '../../static/plone.svg?react';
2+
import { useLoaderData } from 'react-router';
3+
import type { loader } from '../../routes/auth/login';
24

35
const LoginLogo = () => {
6+
const { siteTitle, siteLogo } = useLoaderData<typeof loader>();
7+
8+
if (siteLogo) {
9+
return <img src={siteLogo} alt={siteTitle ?? ''} className="h-32" />;
10+
}
11+
412
return (
513
<div
614
className={`
7-
flex h-32 w-32 flex-col items-center justify-center rounded-full bg-quanta-lemon p-2
15+
flex h-32 w-32 flex-col items-center justify-center rounded-full bg-quanta-sapphire p-2
816
`}
917
>
10-
<img src={ploneWhiteSVG} alt="" aria-hidden="true" />
18+
<Plone className="text-quanta-air" aria-hidden="true" />
1119
</div>
1220
);
1321
};

packages/cmsui/news/24.feature

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Switched login page from Volto style to Plone style.
2+
Added option to display site logo in login page. @arybakov05

packages/cmsui/routes/auth/login.tsx

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,29 @@ import {
1515
ploneContentContext,
1616
ploneSiteContext,
1717
} from '@plone/aurora/app/middleware.server';
18-
import { getAuthFromRequest, setAuthOnResponse } from '@plone/react-router';
18+
import {
19+
redirectIfLoggedInLoader,
20+
setAuthOnResponse,
21+
} from '@plone/react-router';
1922
import { TextField, Link } from '@plone/components/quanta';
2023
import CloseSVG from '@plone/components/icons/close.svg?react';
2124
import SlotRenderer from '@plone/layout/slots/SlotRenderer';
2225
import { Trans, useTranslation } from 'react-i18next';
2326
import type { RootLoader } from '@plone/aurora/app/root';
2427

25-
export async function loader({
26-
request,
27-
context,
28-
}: LoaderFunctionArgs<RouterContextProvider>) {
29-
const token = await getAuthFromRequest(request);
30-
if (token) throw redirect('/');
28+
export async function loader(props: LoaderFunctionArgs<RouterContextProvider>) {
29+
const { context } = props;
30+
31+
await redirectIfLoggedInLoader(props);
3132

3233
const content = context.get(ploneContentContext);
3334
const site = context.get(ploneSiteContext);
34-
return { content, siteTitle: site['plone.site_title'] };
35+
36+
return {
37+
content,
38+
siteTitle: site['plone.site_title'],
39+
siteLogo: site['plone.site_logo'],
40+
};
3541
}
3642

3743
export const meta: MetaFunction<unknown, { root: RootLoader }> = ({
@@ -127,7 +133,7 @@ export default function Login() {
127133
id="login-header"
128134
className="mt-6 text-center text-2xl leading-8 font-bold tracking-wide text-gray-900"
129135
>
130-
{t('cmsui.auth.signInTo', { site: siteTitle || 'Volto' })}
136+
{t('cmsui.auth.signInTo', { site: siteTitle || 'Aurora' })}
131137
</h2>
132138
</div>
133139
<div className="mx-auto mt-11 w-full max-w-[360px]">
Lines changed: 14 additions & 0 deletions
Loading

packages/cmsui/static/volto-hero.svg

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)