aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/KcApp/Register.tsx78
-rw-r--r--src/KcApp/Terms.tsx8
2 files changed, 41 insertions, 45 deletions
diff --git a/src/KcApp/Register.tsx b/src/KcApp/Register.tsx
index bad7a07..2b0ad8c 100644
--- a/src/KcApp/Register.tsx
+++ b/src/KcApp/Register.tsx
@@ -8,7 +8,7 @@ import { memo } from "react";
import Template from "keycloakify/lib/components/Template";
import type { KcProps } from "keycloakify";
import type { KcContext } from "./kcContext";
-import { useCssAndCx } from "keycloakify/lib/tools/useCssAndCx";
+import { clsx } from "keycloakify/lib/tools/clsx";
import type { I18n } from "./i18n";
type KcContext_Register = Extract<KcContext, { pageId: "register.ftl"; }>;
@@ -18,8 +18,6 @@ const Register = memo(({ kcContext, i18n, ...props }: { kcContext: KcContext_Reg
const { msg, msgStr } = i18n;
- const { cx } = useCssAndCx();
-
console.log(`NOTE: It is up to you do do something meaningful with ${kcContext.authorizedMailDomains}`)
return (
@@ -28,52 +26,52 @@ const Register = memo(({ kcContext, i18n, ...props }: { kcContext: KcContext_Reg
doFetchDefaultThemeResources={true}
headerNode={msg("registerTitle")}
formNode={
- <form id="kc-register-form" className={cx(props.kcFormClass)} action={url.registrationAction} method="post">
- <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("firstName", props.kcFormGroupErrorClass))}>
- <div className={cx(props.kcLabelWrapperClass)}>
- <label htmlFor="firstName" className={cx(props.kcLabelClass)}>
+ <form id="kc-register-form" className={clsx(props.kcFormClass)} action={url.registrationAction} method="post">
+ <div className={clsx(props.kcFormGroupClass, messagesPerField.printIfExists("firstName", props.kcFormGroupErrorClass))}>
+ <div className={clsx(props.kcLabelWrapperClass)}>
+ <label htmlFor="firstName" className={clsx(props.kcLabelClass)}>
{msg("firstName")}
</label>
</div>
- <div className={cx(props.kcInputWrapperClass)}>
+ <div className={clsx(props.kcInputWrapperClass)}>
<input
type="text"
id="firstName"
- className={cx(props.kcInputClass)}
+ className={clsx(props.kcInputClass)}
name="firstName"
defaultValue={register.formData.firstName ?? ""}
/>
</div>
</div>
- <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("lastName", props.kcFormGroupErrorClass))}>
- <div className={cx(props.kcLabelWrapperClass)}>
- <label htmlFor="lastName" className={cx(props.kcLabelClass)}>
+ <div className={clsx(props.kcFormGroupClass, messagesPerField.printIfExists("lastName", props.kcFormGroupErrorClass))}>
+ <div className={clsx(props.kcLabelWrapperClass)}>
+ <label htmlFor="lastName" className={clsx(props.kcLabelClass)}>
{msg("lastName")}
</label>
</div>
- <div className={cx(props.kcInputWrapperClass)}>
+ <div className={clsx(props.kcInputWrapperClass)}>
<input
type="text"
id="lastName"
- className={cx(props.kcInputClass)}
+ className={clsx(props.kcInputClass)}
name="lastName"
defaultValue={register.formData.lastName ?? ""}
/>
</div>
</div>
- <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("email", props.kcFormGroupErrorClass))}>
- <div className={cx(props.kcLabelWrapperClass)}>
- <label htmlFor="email" className={cx(props.kcLabelClass)}>
+ <div className={clsx(props.kcFormGroupClass, messagesPerField.printIfExists("email", props.kcFormGroupErrorClass))}>
+ <div className={clsx(props.kcLabelWrapperClass)}>
+ <label htmlFor="email" className={clsx(props.kcLabelClass)}>
{msg("email")}
</label>
</div>
- <div className={cx(props.kcInputWrapperClass)}>
+ <div className={clsx(props.kcInputWrapperClass)}>
<input
type="text"
id="email"
- className={cx(props.kcInputClass)}
+ className={clsx(props.kcInputClass)}
name="email"
defaultValue={register.formData.email ?? ""}
autoComplete="email"
@@ -81,17 +79,17 @@ const Register = memo(({ kcContext, i18n, ...props }: { kcContext: KcContext_Reg
</div>
</div>
{!realm.registrationEmailAsUsername && (
- <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("username", props.kcFormGroupErrorClass))}>
- <div className={cx(props.kcLabelWrapperClass)}>
- <label htmlFor="username" className={cx(props.kcLabelClass)}>
+ <div className={clsx(props.kcFormGroupClass, messagesPerField.printIfExists("username", props.kcFormGroupErrorClass))}>
+ <div className={clsx(props.kcLabelWrapperClass)}>
+ <label htmlFor="username" className={clsx(props.kcLabelClass)}>
{msg("username")}
</label>
</div>
- <div className={cx(props.kcInputWrapperClass)}>
+ <div className={clsx(props.kcInputWrapperClass)}>
<input
type="text"
id="username"
- className={cx(props.kcInputClass)}
+ className={clsx(props.kcInputClass)}
name="username"
defaultValue={register.formData.username ?? ""}
autoComplete="username"
@@ -101,17 +99,17 @@ const Register = memo(({ kcContext, i18n, ...props }: { kcContext: KcContext_Reg
)}
{passwordRequired && (
<>
- <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password", props.kcFormGroupErrorClass))}>
- <div className={cx(props.kcLabelWrapperClass)}>
- <label htmlFor="password" className={cx(props.kcLabelClass)}>
+ <div className={clsx(props.kcFormGroupClass, messagesPerField.printIfExists("password", props.kcFormGroupErrorClass))}>
+ <div className={clsx(props.kcLabelWrapperClass)}>
+ <label htmlFor="password" className={clsx(props.kcLabelClass)}>
{msg("password")}
</label>
</div>
- <div className={cx(props.kcInputWrapperClass)}>
+ <div className={clsx(props.kcInputWrapperClass)}>
<input
type="password"
id="password"
- className={cx(props.kcInputClass)}
+ className={clsx(props.kcInputClass)}
name="password"
autoComplete="new-password"
/>
@@ -119,41 +117,41 @@ const Register = memo(({ kcContext, i18n, ...props }: { kcContext: KcContext_Reg
</div>
<div
- className={cx(
+ className={clsx(
props.kcFormGroupClass,
messagesPerField.printIfExists("password-confirm", props.kcFormGroupErrorClass)
)}
>
- <div className={cx(props.kcLabelWrapperClass)}>
- <label htmlFor="password-confirm" className={cx(props.kcLabelClass)}>
+ <div className={clsx(props.kcLabelWrapperClass)}>
+ <label htmlFor="password-confirm" className={clsx(props.kcLabelClass)}>
{msg("passwordConfirm")}
</label>
</div>
- <div className={cx(props.kcInputWrapperClass)}>
- <input type="password" id="password-confirm" className={cx(props.kcInputClass)} name="password-confirm" />
+ <div className={clsx(props.kcInputWrapperClass)}>
+ <input type="password" id="password-confirm" className={clsx(props.kcInputClass)} name="password-confirm" />
</div>
</div>
</>
)}
{recaptchaRequired && (
<div className="form-group">
- <div className={cx(props.kcInputWrapperClass)}>
+ <div className={clsx(props.kcInputWrapperClass)}>
<div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey}></div>
</div>
</div>
)}
- <div className={cx(props.kcFormGroupClass)}>
- <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
- <div className={cx(props.kcFormOptionsWrapperClass)}>
+ <div className={clsx(props.kcFormGroupClass)}>
+ <div id="kc-form-options" className={clsx(props.kcFormOptionsClass)}>
+ <div className={clsx(props.kcFormOptionsWrapperClass)}>
<span>
<a href={url.loginUrl}>{msg("backToLogin")}</a>
</span>
</div>
</div>
- <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+ <div id="kc-form-buttons" className={clsx(props.kcFormButtonsClass)}>
<input
- className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
+ className={clsx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
type="submit"
value={msgStr("doRegister")}
/>
diff --git a/src/KcApp/Terms.tsx b/src/KcApp/Terms.tsx
index c3364df..59ed62c 100644
--- a/src/KcApp/Terms.tsx
+++ b/src/KcApp/Terms.tsx
@@ -8,7 +8,7 @@ import { evtTermMarkdown } from "keycloakify/lib/components/Terms";
import { useRerenderOnStateChange } from "evt/hooks";
import tos_en_url from "./tos_en.md";
import tos_fr_url from "./tos_fr.md";
-import { useCssAndCx } from "keycloakify/lib/tools/useCssAndCx";
+import { clsx } from "keycloakify/lib/tools/clsx";
/**
* NOTE: Yo do not need to do all this to put your own Terms and conditions
@@ -45,8 +45,6 @@ const Terms = memo(
useRerenderOnStateChange(evtTermMarkdown);
- const { cx } = useCssAndCx();
-
if (evtTermMarkdown.state === undefined) {
return null;
}
@@ -64,7 +62,7 @@ const Terms = memo(
<div id="kc-terms-text">{evtTermMarkdown.state}</div>
<form className="form-actions" action={url.loginAction} method="POST">
<input
- className={cx(
+ className={clsx(
props.kcButtonClass,
props.kcButtonClass,
props.kcButtonClass,
@@ -77,7 +75,7 @@ const Terms = memo(
value={msgStr("doAccept")}
/>
<input
- className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
+ className={clsx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
name="cancel"
id="kc-decline"
type="submit"
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-13 17:32:47 +0000