Skip to content

Commit

Permalink
Merge pull request #121 from MadhuMosip/MOSIP-32336
Browse files Browse the repository at this point in the history 
MOSIP-33843 MOSIP-33864 resolved all the alignment issues
  • Loading branch information
@ckm007
ckm007 authored Jun 24, 2024
2 parents 51f780e + 708e1bc commit dbe22f2
Show file tree
Hide file tree
Showing 14 changed files with 202 additions and 165 deletions.
12 changes: 6 additions & 6 deletions ...oak-artemis/mosip_keycloak_theme/src/keycloak-theme/email/messages/messages_en.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
emailVerificationSubject=Verify email
emailVerificationBody=Someone has created a {2} account with this email address. If this was you, click the link below to verify your email address\n\n{0}\n\nThis link will expire within {3}.\n\nIf you didn''t create this account, just ignore this message.
emailVerificationBodyHtml=<p>Someone has created a {2} account with this email address. If this was you, click the link below to verify your email address</p><p><a href="{0}">Link to e-mail address verification</a></p><p>This link will expire within {3}.</p><p>If you didn''t create this account, just ignore this message.</p>
emailVerificationSubject=Verify your email address
emailVerificationBody=Hi user\n\nThere was a request to verify your MOSIP PMP account''s email address. If this was you, click on the link below to verify email.\n\n{0}\n\nThis link will expire within {3}.\n\nIf you don''t want to verify, kindly ignore this message.\n\nThank You.
emailVerificationBodyHtml=<p>Hi user</p><p>There was a request to verify your MOSIP PMP account''s email address. If this was you, click on the link below to verify email.</p><p><a href="{0}">Click here to verify your email address</a></p><p>This link will expire within {3}.</p><p>If you don''t want to verify, kindly ignore this message.</p><p>Thank You.</p>
emailUpdateConfirmationSubject=Verify new email
emailUpdateConfirmationBody=To update your {2} account with email address {1}, click the link below\n\n{0}\n\nThis link will expire within {3}.\n\nIf you don''t want to proceed with this modification, just ignore this message.
emailUpdateConfirmationBodyHtml=<p>To update your {2} account with email address {1}, click the link below</p><p><a href="{0}">{0}</a></p><p>This link will expire within {3}.</p><p>If you don''t want to proceed with this modification, just ignore this message.</p>
Expand All @@ -10,9 +10,9 @@ emailTestBodyHtml=<p>This is a test message</p>
identityProviderLinkSubject=Link {0}
identityProviderLinkBody=Someone wants to link your "{1}" account with "{0}" account of user {2} . If this was you, click the link below to link accounts\n\n{3}\n\nThis link will expire within {5}.\n\nIf you don''t want to link account, just ignore this message. If you link accounts, you will be able to login to {1} through {0}.
identityProviderLinkBodyHtml=<p>Someone wants to link your <b>{1}</b> account with <b>{0}</b> account of user {2}. If this was you, click the link below to link accounts</p><p><a href="{3}">Link to confirm account linking</a></p><p>This link will expire within {5}.</p><p>If you don''t want to link account, just ignore this message. If you link accounts, you will be able to login to {1} through {0}.</p>
passwordResetSubject=Reset password
passwordResetBody=Hi User, \n\nSomeone just requested to change your {2} account''s credentials. If this was you, click on the link below to reset them.\n\n{0}\n\nThis link and code will expire within {3}.\n\nIf you don''t want to reset your credentials, just ignore this message and nothing will be changed.
passwordResetBodyHtml=<p>Hi User,</><p>Someone just requested to change your {2} account''s credentials. If this was you, click on the link below to reset them.</p><p><a href="{0}">Link to reset credentials</a></p><p>This link will expire within {3}.</p><p>If you don''t want to reset your credentials, just ignore this message and nothing will be changed.</p>
passwordResetSubject=Reset your password
passwordResetBody=Hi user, \n\nThere was a request to change your MOSIP PMP account''s credentials. If this was you, click on the link below to reset your password.\n\n{0}\n\nThis link and code will expire within {3}.\n\nIf you don''t want to reset your credentials, kindly ignore this message and nothing will be changed.\n\n Thank You.
passwordResetBodyHtml=<p>Hi user,</><p>There was a request to change your MOSIP PMP account''s credentials. If this was you, click on the link below to reset your password.</p><p><a href="{0}">Click here to reset your password</a></p><p>This link will expire within {3}.</p><p>If you don''t want to reset your credentials, kindly ignore this message and nothing will be changed.</p><p>Thank You.</p>
executeActionsSubject=Update Your Account
executeActionsBody=Your administrator has just requested that you update your {2} account by performing the following action(s): {3}. Click on the link below to start this process.\n\n{0}\n\nThis link will expire within {4}.\n\nIf you are unaware that your administrator has requested this, just ignore this message and nothing will be changed.
executeActionsBodyHtml=<p>Your administrator has just requested that you update your {2} account by performing the following action(s): {3}. Click on the link below to start this process.</p><p><a href="{0}">Link to account update</a></p><p>This link will expire within {4}.</p><p>If you are unaware that your administrator has requested this, just ignore this message and nothing will be changed.</p>
Expand Down
15 changes: 14 additions & 1 deletion keycloak-artemis/mosip_keycloak_theme/src/keycloak-theme/login/KcApp.css
View file
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
123 changes: 62 additions & 61 deletions keycloak-artemis/mosip_keycloak_theme/src/keycloak-theme/login/Template.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,13 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
</>
{locale.supported.map(({ languageTag }) => (
<>
{(labelBySupportedLanguageTag[currentLanguageTag] != labelBySupportedLanguageTag[languageTag]) && (
<>
<li key={languageTag} className="text-left">
<a href="#" onClick={() => changeLocale(languageTag)}>
{labelBySupportedLanguageTag[languageTag]}
</a >
</li>
<hr className="mx-4 border-[1px] last:hidden border-[#D8D8D8]" />
</>
)}
<li key={languageTag} className="text-left">
{(labelBySupportedLanguageTag[currentLanguageTag] != labelBySupportedLanguageTag[languageTag]) && (
<a href="#" onClick={() => changeLocale(languageTag)}>
{labelBySupportedLanguageTag[languageTag]}
</a>)}
</li>
<hr className="mx-4 border-[1px] last:hidden border-[#D8D8D8]" />
</>
))}
</ul>
Expand All @@ -103,11 +100,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 +163,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
Loading

0 comments on commit dbe22f2

Please sign in to comment.