Skip to content

Commit e02b91a

Browse files
committed
fix: seperate component
1 parent e40071e commit e02b91a

4 files changed

Lines changed: 32 additions & 19 deletions

File tree

src/keycloak-theme/login/Template.tsx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ import type { KcContext } from './KcContext'
99
import { Alert, DropdownButton, DropdownButtonItem, Tooltip } from '@iqss/dataverse-design-system'
1010
import { ArrowUpRightSquareFill } from 'react-bootstrap-icons'
1111
import dataverse_logo from '@/assets/dataverse_brand_icon.svg'
12+
import { SignInNotice } from './components/SignInNotice'
1213
import styles from './template.module.scss'
1314

14-
const DATAVERSE_BASE_URL =
15-
import.meta.env.VITE_DATAVERSE_BASE_URL ?? 'https://dataverse.harvard.edu'
16-
const HARVARD_SIGN_UP_URL = `${DATAVERSE_BASE_URL}/dataverseuser.xhtml?editMode=CREATE&redirectPage=%2Fdataverse_homepage.xhtml`
17-
1815
/*
1916
* This is a Layout common to every keycloak page.
2017
* It was originally generated by running `npx keycloakify eject-page` and then selecting `Template.tsx` option.
@@ -68,16 +65,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
6865

6966
return (
7067
<div className={styles.login} id="kc-login-template">
71-
{kcContext.pageId === 'login.ftl' && (
72-
<div className={styles['top-notice']}>
73-
<Alert variant="warning" customHeading={msgStr('signInNoticeTitle')} dismissible={false}>
74-
<>
75-
{msg('signInNoticeBodyPrefix')}
76-
<a href={HARVARD_SIGN_UP_URL}>{msg('signInNoticeSignUpLinkText')}</a>
77-
</>
78-
</Alert>
79-
</div>
80-
)}
68+
{kcContext.pageId === 'login.ftl' && <SignInNotice i18n={i18n} />}
8169
<div id="kc-header">
8270
<div id="kc-header-wrapper" className={styles['header-wrapper']}>
8371
<img src={dataverse_logo} alt="Brand Logo Image" />
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.top-notice {
2+
margin: 0.5rem;
3+
border-radius: 8px;
4+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { Alert } from '@iqss/dataverse-design-system'
2+
import type { I18n } from '../i18n'
3+
import styles from './SignInNotice.module.scss'
4+
5+
const DATAVERSE_BASE_URL =
6+
(import.meta.env.VITE_DATAVERSE_BASE_URL as string) ?? 'https://dataverse.harvard.edu'
7+
const HARVARD_SIGN_UP_URL = `${DATAVERSE_BASE_URL}/dataverseuser.xhtml?editMode=CREATE&redirectPage=%2Fdataverse_homepage.xhtml`
8+
9+
interface SignInNoticeProps {
10+
i18n: I18n
11+
}
12+
13+
export function SignInNotice({ i18n }: SignInNoticeProps) {
14+
const { msg, msgStr } = i18n
15+
16+
return (
17+
<div className={styles['top-notice']}>
18+
<Alert variant="warning" customHeading={msgStr('signInNoticeTitle')} dismissible={false}>
19+
<>
20+
{msg('signInNoticeBodyPrefix')}
21+
<a href={HARVARD_SIGN_UP_URL}>{msg('signInNoticeSignUpLinkText')}</a>
22+
</>
23+
</Alert>
24+
</div>
25+
)
26+
}

src/keycloak-theme/login/template.module.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@
2929
}
3030
}
3131

32-
.top-notice {
33-
margin: 0.5rem;
34-
border-radius: 8px;
35-
}
36-
3732
.login-card {
3833
width: 100%;
3934
height: 100%;

0 commit comments

Comments
 (0)