Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MOSIP-33843 MOSIP-33864 resolved all the alignment issues #121

Merged
merged 3 commits into from
Jun 24, 2024
Merged

MOSIP-33843 MOSIP-33864 resolved all the alignment issues #121

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b68ec85
MOSIP-33843 resolved all the alignment issues
MadhuMosip Jun 21, 2024
0488881
MOSIP-33843 changed login lable text
MadhuMosip Jun 21, 2024
708e1bc
MOSIP-33864 Changed email content and added username policy
MadhuMosip Jun 22, 2024
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
15 changes: 14 additions & 1 deletion keycloak-artemis/mosip_keycloak_theme/src/keycloak-theme/login/KcApp.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
margin: 0;
}

.login-pf-page{
min-height: 95vh;
height: auto;
}

.btn-primary {
height: 40px !important;
background-color: #0D3077 !important;
Expand All @@ -66,6 +71,11 @@
color: #ffffff !important;
}

#storybook-root{
min-height: 95vh;
height: auto;
}

a {
color: #0D3077 !important;
text-decoration: none !important;
Expand All @@ -87,7 +97,8 @@ a#kc-current-locale-link::after{

.login-pf-page .card-pf {
padding: 20px 25px 20px 25px;
width: 550px;
min-width: 550px;
max-width: 632px;
}

.login-pf-page .card-pf p{
Expand Down Expand Up @@ -125,6 +136,7 @@ input[type=number]::-webkit-outer-spin-button {
@media (max-width: 840px) {
.login-pf-page .card-pf {
max-width: 500px;
min-width: auto;
}
}

Expand All @@ -134,6 +146,7 @@ input[type=number]::-webkit-outer-spin-button {
}
#kc-locale {
top: 40px;
width: auto;
}
}

Expand Down
106 changes: 55 additions & 51 deletions keycloak-artemis/mosip_keycloak_theme/src/keycloak-theme/login/Template.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,13 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
)
}</div >
</div >
<div className="flex justify-center">
<div className={clsx(getClassName("kcFormCardClass"), displayWide && getClassName("kcFormCardAccountClass"), 'rounded-3xl p-5')}>
<header className={getClassName("kcFormHeaderClass")}>
{headerNode}
{/* {!(auth !== undefined && auth.showUsername && !auth.showResetCredentials) ? (
<div className="flex flex-col min-h-[83vh] justify-center align-center">
<div>
<div className="flex justify-center">
<div className={clsx(getClassName("kcFormCardClass"), displayWide && getClassName("kcFormCardAccountClass"), 'rounded-3xl p-5')}>
<header className={getClassName("kcFormHeaderClass")}>
{headerNode}
{/* {!(auth !== undefined && auth.showUsername && !auth.showResetCredentials) ? (
displayRequiredFields ? (
<div className={getClassName("kcContentWrapperClass")}>
<div className={clsx(getClassName("kcLabelWrapperClass"), "subtitle")}>
Expand Down Expand Up @@ -164,58 +166,60 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
</div>
</>
)} */}
</header>
<div id="kc-content">
<div id="kc-content-wrapper">
{/* App-initiated actions should not see warning messages about the need to complete the action during login. */}
{displayMessage && message !== undefined && (message.type !== "warning" || !isAppInitiatedAction) && (pageId === 'login.ftl') && (
<div className={`min-h-11 p-2 text-center font-semibold mb-3 ${message.type === "error" && "bg-errorBg text-errorColor"} ${message.type === "success" && "bg-[#E7F2E2] text-[#2E6E0D]"} ${(message.type === "warning" || message.type === 'info') && "bg-[#FFF7E5] text-[#8B6105"}`}>
{/* {message.type === "success" && <span className={getClassName("kcFeedbackSuccessIcon")}></span>}
</header>
<div id="kc-content">
<div id="kc-content-wrapper">
{/* App-initiated actions should not see warning messages about the need to complete the action during login. */}
{displayMessage && message !== undefined && (message.type !== "warning" || !isAppInitiatedAction) && (pageId === 'login.ftl') && (
<div className={`min-h-11 p-2 text-center font-semibold mb-3 ${message.type === "error" && "bg-errorBg text-errorColor"} ${message.type === "success" && "bg-[#E7F2E2] text-[#2E6E0D]"} ${(message.type === "warning" || message.type === 'info') && "bg-[#FFF7E5] text-[#8B6105"}`}>
{/* {message.type === "success" && <span className={getClassName("kcFeedbackSuccessIcon")}></span>}
{message.type === "warning" && <span className={getClassName("kcFeedbackWarningIcon")}></span>}
{message.type === "info" && <span className={getClassName("kcFeedbackInfoIcon")}></span>} */}
<span className="kc-feedback-text"
dangerouslySetInnerHTML={{
"__html": message.summary
}}
/>
</div>
)}
{children}
{auth !== undefined && auth.showTryAnotherWayLink && showAnotherWayIfPresent && (
<form
id="kc-select-try-another-way-form"
action={url.loginAction}
method="post"
className={clsx(displayWide && getClassName("kcContentWrapperClass"))}
>
<div
className={clsx(
displayWide && [getClassName("kcFormSocialAccountContentClass"), getClassName("kcFormSocialAccountClass")]
)}
>
<div className={getClassName("kcFormGroupClass")}>
<input type="hidden" name="tryAnotherWay" value="on" />
<a
href="#"
id="try-another-way"
onClick={() => {
document.forms["kc-select-try-another-way-form" as never].submit();
return false;
<span className="kc-feedback-text"
dangerouslySetInnerHTML={{
"__html": message.summary
}}
/>
</div>
)}
{children}
{auth !== undefined && auth.showTryAnotherWayLink && showAnotherWayIfPresent && (
<form
id="kc-select-try-another-way-form"
action={url.loginAction}
method="post"
className={clsx(displayWide && getClassName("kcContentWrapperClass"))}
>
<div
className={clsx(
displayWide && [getClassName("kcFormSocialAccountContentClass"), getClassName("kcFormSocialAccountClass")]
)}
>
{msg("doTryAnotherWay")}
</a>
<div className={getClassName("kcFormGroupClass")}>
<input type="hidden" name="tryAnotherWay" value="on" />
<a
href="#"
id="try-another-way"
onClick={() => {
document.forms["kc-select-try-another-way-form" as never].submit();
return false;
}}
>
{msg("doTryAnotherWay")}
</a>
</div>
</div>
</form>
)}
{displayInfo && (
<div id="kc-info" className={getClassName("kcSignUpClass")}>
<div id="kc-info-wrapper" className={getClassName("kcInfoAreaWrapperClass")}>
{infoNode}
</div>
</div>
</div>
</form>
)}
{displayInfo && (
<div id="kc-info" className={getClassName("kcSignUpClass")}>
<div id="kc-info-wrapper" className={getClassName("kcInfoAreaWrapperClass")}>
{infoNode}
</div>
)}
</div>
)}
</div>
</div>
</div>
</div>
Expand Down
12 changes: 10 additions & 2 deletions keycloak-artemis/mosip_keycloak_theme/src/keycloak-theme/login/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ export const { useI18n } = createUseI18n({
pageExpiredTitle: "Session has expired!",
pageExpiredMsg1: "Please click on continue to resume from where you left. Else click on Restart to start a new session.",
restartProcess: "Restart Process",
continueSession: "Continue Session"
continueSession: "Continue Session",
userNameLable: "Username / Email address",
firstName: "First Name",
lastName: "Last Name",
phoneNumber: "Phone Number"
},
fr: {
/* spell-checker: disable */
Expand Down Expand Up @@ -141,7 +145,11 @@ export const { useI18n } = createUseI18n({
pageExpiredTitle: "Session has expired!",
pageExpiredMsg1: "Please click on continue to resume from where you left. Else click on Restart to start a new session.",
restartProcess: "Restart Process",
continueSession: "Continue Session"
continueSession: "Continue Session",
userNameLable: "Username / Email address",
firstName: "First Name",
lastName: "Last Name",
phoneNumber: "Phone Number"
/* spell-checker: enable */
}
});
Expand Down
4 changes: 2 additions & 2 deletions keycloak-artemis/mosip_keycloak_theme/src/keycloak-theme/login/pages/Error.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ export default function Error(props: PageProps<Extract<KcContext, { pageId: "err

return (
<Template {...{ kcContext, i18n, doUseDefaultCss, classes }} displayMessage={false} headerNode={
<div className="flex flex-col justify-center items-center">
<div className="flex flex-col justify-center items-center font-inter">
<img className="w-36" alt="" src={errorIcon} />
<h4 className="font-bold text-[#000000] text-xl">{msg("sryText")}</h4>
</div>
}>
<div id="kc-error-message" className="text-center w-100%">
<div id="kc-error-message" className="text-center w-100% font-inter">
<p className="instruction">{message.summary}</p>
{client !== undefined && client.baseUrl !== undefined && (
<button className="bg-hLinkColor w-9/12 h-16 text-[#ffffff] mt-9 rounded-xl">
Expand Down
4 changes: 2 additions & 2 deletions keycloak-artemis/mosip_keycloak_theme/src/keycloak-theme/login/pages/Info.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ export default function Info(props: PageProps<Extract<KcContext, { pageId: "info
{...{ kcContext, i18n, doUseDefaultCss, classes }}
displayMessage={false}
headerNode={
<div className="flex flex-col justify-center items-center">
<div className="flex flex-col justify-center items-center font-inter">
<img className="w-36" alt="" src={errorIcon} />
<h4 className="font-bold text-[#000000] text-xl">{msg("sryText")}</h4>
</div>
}
>
<div id="kc-info-message" className="text-center">
<div id="kc-info-message" className="text-center font-inter">
<p className="instruction">
{message?.summary}
</p>
Expand Down
21 changes: 11 additions & 10 deletions keycloak-artemis/mosip_keycloak_theme/src/keycloak-theme/login/pages/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
displayWide={realm.password && social.providers !== undefined}
headerNode={
<>
<h1 id="kc-page-title" className="text-3xl font-bold text-hTextColor font-sans">{msg("doLogIn")}</h1>
<p className="text-pTextColor text-xl font-semibold">{msg("loginDesc")}</p>
<h1 id="kc-page-title" className="text-3xl font-bold text-hTextColor font-inter">{msg("doLogIn")}</h1>
<p className="text-pTextColor text-xl font-semibold font-inter">{msg("loginDesc")}</p>
</>
}
infoNode={
<div id="kc-registration" className="text-center mt-4">
<div id="kc-registration" className="text-center mt-4 font-inter">
<span onClick={() => setReloadBtn(true)}>
{msg("noAccount")} &nbsp;
<a className="text-hLinkColor font-semibold" tabIndex={6} href={url.registrationUrl}>
Expand All @@ -112,10 +112,10 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log

return (
<>
<label htmlFor={autoCompleteHelper} className={(getClassName("kcLabelClass"), 'text-hTextColor text-xl')}>
{msg(label)}
<label htmlFor={autoCompleteHelper} className={(getClassName("kcLabelClass"), 'text-hTextColor text-xl font-inter')}>
{msg('userNameLable')}
</label>
<div className="border border-bColor border-solid rounded-lg h-14 w-full p-2">
<div className="border border-bColor border-solid rounded-lg h-14 w-full p-2 font-inter">
<input
tabIndex={1}
id={autoCompleteHelper}
Expand All @@ -137,13 +137,13 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
})()}
</div>
<div className={getClassName("kcFormGroupClass")}>
<label htmlFor="password" className={(getClassName("kcLabelClass"), 'text-hTextColor text-xl flex flex-row items-center')}>
<label htmlFor="password" className={(getClassName("kcLabelClass"), 'text-hTextColor text-xl flex flex-row items-center font-inter')}>
<span>{msg("password")} </span>
<ToolTip tooltip={msgStr('passwordInfo')}>
<img className="ml-2 cursor-pointer" alt="info" src={info} />
</ToolTip>
</label>
<div className="flex flex-row justify-between items-center border border-bColor border-solid rounded-lg h-14 p-2">
<div className="flex flex-row justify-between items-center border border-bColor border-solid rounded-lg h-14 p-2 font-inter">
<input
tabIndex={2}
id="password"
Expand All @@ -167,6 +167,7 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
id="rememberMe"
name="rememberMe"
type="checkbox"
className="font-inter"
{...(login.rememberMe === "on"
? {
"checked": true
Expand All @@ -178,7 +179,7 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
</div>
)}
</div>
<div className={(getClassName("kcFormOptionsWrapperClass"), 'text-hLinkColor font-bold text-right')}>
<div className={(getClassName("kcFormOptionsWrapperClass"), 'text-hLinkColor font-bold text-right font-inter')}>
{realm.resetPasswordAllowed && (
<span onClick={() => setReloadBtn(true)}>
<a tabIndex={5} href={url.loginResetCredentialsUrl}>
Expand All @@ -188,7 +189,7 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
)}
</div>
</div>
<div id="kc-form-buttons" className={getClassName("kcFormGroupClass")}>
<div id="kc-form-buttons" className={(getClassName("kcFormGroupClass"), 'font-inter')}>
<input
type="hidden"
id="id-hidden-input"
Expand Down
6 changes: 3 additions & 3 deletions keycloak-artemis/mosip_keycloak_theme/src/keycloak-theme/login/pages/LoginPageExpired.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ export default function LoginPageExpired(props: PageProps<Extract<KcContext, { p
<Template {...{ kcContext, i18n, doUseDefaultCss, classes }} displayMessage={false} headerNode={
<div className="flex flex-col justify-center items-center">
<img className="w-36" alt="" src={errorIcon} />
<h4 className="font-bold text-[#000000] text-[15px]">{msg("pageExpiredTitle")}</h4>
<h4 className="font-bold text-hTextColor text-2xl font-inter">{msg("pageExpiredTitle")}</h4>
</div>}
>
<div className="text-center pr-5 pb-5">
<span className="text-[12px] text-[#666666] font-normal">{msg("pageExpiredMsg1")}</span>
<span className=" text-[#666666] font-normal text-xl font-inter">{msg("pageExpiredMsg1")}</span>
<hr className="mt-8 mb-6 border-[1px] border-[#D8D8D8]" />
<div className="font-bold flex justify-center items-center">
<div className="font-bold flex justify-center items-center text-2xl font-inter">
<p><a id="loginRestartLink" href={url.loginRestartFlowUrl}>
{msg("restartProcess")}
</a></p>
Expand Down
Loading
Loading