dima
/
jce-keycloak
6
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 1 Wiki Activity

8 Commits
8bc9e4b6f0 ... b4567c6cae

Author SHA1 Message Date
  Dmitry Sim b4567c6cae 0.1.8 3 years ago
  Dmitry Sim 7628f0ee88 Merge branch 'master' of https://git.cloud.teslametric.com/dima/jce-keycloak into dev 3 years ago
  alenaPoletaeva 8e97213d49 juice_14_06_21 3 years ago
  poletaeva 921ff8c642 Upload files to 'juice/login/messages' 3 years ago
  poletaeva 8772729f7f Upload files to 'juice/login/messages' 3 years ago
  poletaeva 64e99d300b Upload files to 'juice/login/messages' 3 years ago
  poletaeva f7e86b4060 Upload files to 'juice/login' 3 years ago
  poletaeva 0094bbf23c Upload files to 'juice/login' 3 years ago
6 changed files with 125 additions and 119 deletions
Unified View
Diff Options
Show Stats
  1. +8
    -6
      juice/login/login-reset-password.ftl
  2. +94
    -91
      juice/login/login.ftl
  3. +10
    -8
      juice/login/register.ftl
  4. +12
    -4
      juice/login/resources/css/styles.css
  5. +0
    -9
      juice/login/resources/img/juice.svg
  6. +1
    -1
      version.ini

+ 8
- 6
juice/login/login-reset-password.ftl View File

@ -39,17 +39,19 @@
</div> </div>
<div class="${properties.kcFormGroupClass!} ${properties.kcFormSettingClass!}"> <div class="${properties.kcFormGroupClass!} ${properties.kcFormSettingClass!}">
<div class="${properties.kcFormOptionsWrapperClass!}">
<div id="kc-registration" class="kc-registration-signup">
<span>
<span>${msg("haveAccount")}</span>
<a tabindex="6" href="${url.loginUrl}">${msg("signInHere")}</a></span>
</div>
</div>
<div id="kc-form-options"> <div id="kc-form-options">
<#if client?? && client.baseUrl?has_content> <#if client?? && client.baseUrl?has_content>
<span><a href="${client.baseUrl}">${kcSanitize(msg("backToLogin"))?no_esc}</a></span> <span><a href="${client.baseUrl}">${kcSanitize(msg("backToLogin"))?no_esc}</a></span>
</#if> </#if>
</div> </div>
<div class="${properties.kcFormOptionsWrapperClass!}">
<div id="kc-registration">
<span>${msg("haveAccount")} <a tabindex="6"
href="${url.loginUrl}">${msg("signInHere")}</a></span>
</div>
</div>
</div> </div>
</div> </div>


+ 94
- 91
juice/login/login.ftl View File

@ -25,110 +25,113 @@
<div class="header-login-title">${msg("loginAccountTitle")}</div> <div class="header-login-title">${msg("loginAccountTitle")}</div>
<#elseif section = "form"> <#elseif section = "form">
<div id="kc-form"> <div id="kc-form">
<div id="kc-form-wrapper">
<#if realm.password>
<form id="kc-form-login" onsubmit="login.disabled = true; return true;" action="${url.loginAction}" method="post">
<div class="${properties.kcFormGroupClass!}">
<div id="kc-form-wrapper">
<#if realm.password>
<form id="kc-form-login" onsubmit="login.disabled = true; return true;" action="${url.loginAction}" method="post">
<div class="${properties.kcFormGroupClass!}">
<#if usernameEditDisabled??>
<input tabindex="1" id="username" class="${properties.kcInputClass!}" name="username" value="${(login.username!'')}" placeholder=${msg("usernameOrEmail")} type="text" disabled />
<#else>
<input tabindex="1" id="username" class="${properties.kcInputClass!}" name="username" value="${(login.username!'')}" placeholder=${msg("usernameOrEmail")} type="text" autofocus autocomplete="username"
aria-invalid="<#if messagesPerField.existsError('username','password')>true</#if>"
/>
<#if messagesPerField.existsError('username','password')>
<div id="input-error" class="${properties.kcInputErrorMessageClass!}" aria-live="polite">
${kcSanitize(messagesPerField.getFirstError('username','password'))?no_esc}
</div>
</#if>
<label class="login-form-input-label">${msg("usernameOrEmail")}</label>
</#if>
</div>
<div class="${properties.kcFormGroupClass!}">
<#if usernameEditDisabled??>
<input tabindex="1" id="username" class="${properties.kcInputClass!}" name="username" value="${(login.username!'')}" placeholder=${msg("usernameOrEmail")} type="text" disabled />
<#else>
<input tabindex="1" id="username" class="${properties.kcInputClass!}" name="username" value="${(login.username!'')}" placeholder=${msg("usernameOrEmail")} type="text" autofocus autocomplete="username"
aria-invalid="<#if messagesPerField.existsError('username','password')>true</#if>"
/>
<#if messagesPerField.existsError('username','password')>
<div id="input-error" class="${properties.kcInputErrorMessageClass!}" aria-live="polite">
${kcSanitize(messagesPerField.getFirstError('username','password'))?no_esc}
</div>
</#if>
<label class="login-form-input-label">${msg("usernameOrEmail")}</label>
<input tabindex="2" id="password" class="${properties.kcInputClass!}" name="password" type="password" placeholder=${msg("password")}
aria-invalid="<#if messagesPerField.existsError('username','password')>true</#if>"
/>
<label class="login-form-input-label">${msg("password")}</label>
</div>
</#if>
</div>
<div id="kc-form-buttons" class="${properties.kcFormGroupClass!}">
<input type="hidden" id="id-hidden-input" name="credentialId" <#if auth.selectedCredential?has_content>value="${auth.selectedCredential}"</#if>/>
<input tabindex="4" class="${properties.kcButtonClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}" name="login" id="kc-login" type="submit" value="${msg("doLogIn")}"/>
</div>
<div class="${properties.kcFormGroupClass!}">
<#if realm.password && social.providers??>
<div id="kc-social-providers" class="${properties.kcFormSocialAccountSectionClass!}">
<div class="separate-container">
<div class="separator"></div>
<div class="separate-text">${msg("identity-provider-login-label")} </div>
<div class="separator"></div>
</div>
<input tabindex="2" id="password" class="${properties.kcInputClass!}" name="password" type="password" placeholder=${msg("password")}
aria-invalid="<#if messagesPerField.existsError('username','password')>true</#if>"
/>
<label class="login-form-input-label">${msg("password")}</label>
</div>
<ul class="${properties.kcFormSocialAccountListClass!} <#if social.providers?size gt 3>${properties.kcFormSocialAccountListGridClass!}</#if>">
<#list social.providers as p>
<a id="social-${p.alias}" class="${properties.kcButtonClass!} <#if social.providers?size gt 3>${properties.kcFormSocialAccountGridItem!}</#if> social-button"
type="button" href="${p.loginUrl}">
<#if p.displayName=="Facebook" >
<div class="login-sign-image facebook"></div>
<#elseif p.displayName=="Twitter" >
<div class="login-sign-image twitter"></div>
<#elseif p.displayName=="Google" >
<div class="login-sign-image google"></div>
<#elseif p.displayName=="LinkedIn" >
<div class="login-sign-image linkedin"></div>
<#elseif p.displayName=="Apple" >
<div class="login-sign-image apple"></div>
<#elseif p.iconClasses?has_content>
<i class="${properties.kcCommonLogoIdP!} ${p.iconClasses!}" aria-hidden="true"></i>
<#else>
<span class="${properties.kcFormSocialAccountNameClass!}">${p.displayName!}</span>
</#if>
</a>
</#list>
</ul>
</div>
</#if>
<#if realm.internationalizationEnabled && locale.supported?size gt 1>
<#if locale.current="Deutsch">
<div class="signup-terms login-signup-terms">
Mit der Registrierung erklären Sie sich mit den
<a href="https://app.jplus-pilot.com/legal/tos_de.html">Nutzungsbedingungen</a> und der
<a href="https://app.jplus-pilot.com/legal/gdpr_de.html">Datenschutzerklärung</a> von Juice einverstanden.
<div id="kc-form-buttons" class="${properties.kcFormGroupClass!}">
<input type="hidden" id="id-hidden-input" name="credentialId" <#if auth.selectedCredential?has_content>value="${auth.selectedCredential}"</#if>/>
<input tabindex="4" class="${properties.kcButtonClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}" name="login" id="kc-login" type="submit" value="${msg("doLogIn")}"/>
</div> </div>
<#else>
<div class="signup-terms login-signup-terms">
By signing up, you agree to Juice's
<a href="https://app.jplus-pilot.com/legal/tos_en.html">ToS</a> and
<a href=" https://app.jplus-pilot.com/legal/gdpr_en.html">Privacy</a>
<#if realm.password && social.providers??>
<div id="kc-social-providers" class="${properties.kcFormSocialAccountSectionClass!}">
<div class="separate-container">
<div class="separator"></div>
<div class="separate-text">${msg("identity-provider-login-label")} </div>
<div class="separator"></div>
</div> </div>
</#if>
</#if>
<div>
<div class="${properties.kcFormGroupClass!} ${properties.kcFormSettingClass!}">
<div id="kc-form-options">
<#if realm.resetPasswordAllowed>
<span><a tabindex="5" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a></span>
<ul class="${properties.kcFormSocialAccountListClass!} <#if social.providers?size gt 3>${properties.kcFormSocialAccountListGridClass!}</#if>">
<#list social.providers as p>
<a id="social-${p.alias}" class="${properties.kcButtonClass!} <#if social.providers?size gt 3>${properties.kcFormSocialAccountGridItem!}</#if> social-button"
type="button" href="${p.loginUrl}">
<#if p.displayName=="Facebook" >
<div class="login-sign-image facebook"></div>
<#elseif p.displayName=="Twitter" >
<div class="login-sign-image twitter"></div>
<#elseif p.displayName=="Google" >
<div class="login-sign-image google"></div>
<#elseif p.displayName=="LinkedIn" >
<div class="login-sign-image linkedin"></div>
<#elseif p.displayName=="Apple" >
<div class="login-sign-image apple"></div>
<#elseif p.iconClasses?has_content>
<i class="${properties.kcCommonLogoIdP!} ${p.iconClasses!}" aria-hidden="true"></i>
<#else>
<span class="${properties.kcFormSocialAccountNameClass!}">${p.displayName!}</span>
</#if> </#if>
</a>
</#list>
</ul>
</div> </div>
<#if realm.password && realm.registrationAllowed && !registrationDisabled??>
<div id="kc-registration-container">
<div id="kc-registration">
<span>${msg("noAccount")} <a tabindex="6"
href="${url.registrationUrl}">${msg("signUpHere")}</a></span>
</div>
</#if>
<#if realm.internationalizationEnabled && locale.supported?size gt 1>
<#if locale.current="Deutsch">
<div class="signup-terms login-signup-terms">
Mit der Registrierung erklären Sie sich mit den
<a href="https://app.jplus-pilot.com/legal/tos_de.html">Nutzungsbedingungen</a> und der
<a href="https://app.jplus-pilot.com/legal/gdpr_de.html">Datenschutzerklärung</a> von Juice einverstanden.
</div>
<#else>
<div class="signup-terms login-signup-terms">
By signing up, you agree to Juice's
<a href="https://app.jplus-pilot.com/legal/tos_en.html">ToS</a> and
<a href=" https://app.jplus-pilot.com/legal/gdpr_en.html">Privacy</a>
</div> </div>
</#if> </#if>
</div>
</#if>
</form>
</#if>
</div>
<div>
<div class="${properties.kcFormGroupClass!} ${properties.kcFormSettingClass!}">
<#if realm.password && realm.registrationAllowed && !registrationDisabled??>
<div id="kc-registration-container">
<div id="kc-registration">
<span>${msg("noAccount")} <a tabindex="6"
href="${url.registrationUrl}">${msg("signUpHere")}</a></span>
</div>
</div>
</#if>
<div id="kc-form-options">
<#if realm.resetPasswordAllowed>
<span><a tabindex="5" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a></span>
</#if>
</div>
</div>
</div>
</form>
</#if>
</div>
</div> </div>
</#if> </#if>
</@layout.registrationLayout> </@layout.registrationLayout>


+ 10
- 8
juice/login/register.ftl View File

@ -131,19 +131,21 @@
<div> <div>
<div class="${properties.kcFormGroupClass!} ${properties.kcFormSettingClass!}"> <div class="${properties.kcFormGroupClass!} ${properties.kcFormSettingClass!}">
<div id="kc-form-options" class="signup-password">
<#if realm.resetPasswordAllowed>
<span><a tabindex="5" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a></span>
</#if>
</div>
<#if realm.password && realm.registrationAllowed && !registrationDisabled??> <#if realm.password && realm.registrationAllowed && !registrationDisabled??>
<div id="kc-registration-container"> <div id="kc-registration-container">
<div id="kc-registration">
<span>${msg("haveAccount")} <a tabindex="6"
href="${url.loginUrl}">${msg("signInHere")}</a></span>
<div id="kc-registration" class="kc-registration-signup">
<span>
<span>${msg("haveAccount")}</span>
<a tabindex="6" href="${url.loginUrl}">${msg("signInHere")}</a></span>
</div> </div>
</div> </div>
</#if> </#if>
<div id="kc-form-options" class="signup-password">
<#if realm.resetPasswordAllowed>
<span><a tabindex="5" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a></span>
</#if>
</div>
</div> </div>
</div> </div>
</form> </form>


+ 12
- 4
juice/login/resources/css/styles.css View File

@ -35,7 +35,7 @@
content: ""; content: "";
top: 56px; top: 56px;
left: 63px; left: 63px;
background: url(../img/juice.svg);
background: url(../img/juice_logo.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
} }
@ -63,7 +63,7 @@
} }
.login-pf-page-header { .login-pf-page-header {
background: url(../img/juice.svg);
background: url(../img/juice_logo.svg);
background-position-x: 63px; background-position-x: 63px;
background-position-y: 56px; background-position-y: 56px;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -295,13 +295,13 @@ a.verify-email-link:hover {
font-size: 12px; font-size: 12px;
line-height: 16px; line-height: 16px;
color: #414142; color: #414142;
color: #FF7100;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: flex-end;
justify-content: flex-start;
} }
#kc-registration a { #kc-registration a {
padding-left: 8px;
font-family: "Swis721 Md BT"; font-family: "Swis721 Md BT";
font-style: normal; font-style: normal;
font-weight: 500; font-weight: 500;
@ -309,6 +309,9 @@ a.verify-email-link:hover {
line-height: 16px; line-height: 16px;
color: #FFFFFF; color: #FFFFFF;
} }
#kc-registration.kc-registration-signup span {
padding-right: 8px;
}
#kc-registration a::after { #kc-registration a::after {
content: " →"; content: " →";
} }
@ -346,7 +349,9 @@ a.verify-email-link:hover {
#kc-form-options { #kc-form-options {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end;
width: 145px; width: 145px;
text-align: end;
} }
#kc-form-options.signup-password { #kc-form-options.signup-password {
@ -765,6 +770,9 @@ a.verify-email-link:hover {
#kc-registration { #kc-registration {
width: 155px; width: 155px;
} }
#kc-registration.kc-registration-signup a {
padding-left: 0px;
}
.social-button { .social-button {
padding: 16px 12px; padding: 16px 12px;
} }


+ 0
- 9
juice/login/resources/img/juice.svg View File

@ -1,9 +0,0 @@
<svg width="56" height="34" viewBox="0 0 56 34" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.5969 10.1631C10.5974 10.0391 15.7672 9.87879 20.4653 17.1428C18.8096 6.44428 13.3966 1.28605 8.23842 0.585549C3.08019 -0.0512696 -0.995445 2.94178 0.21451 7.0811C1.17849 10.3311 3.5481 10.2576 6.5969 10.1631ZM21.8524 5.11735C23.0402 6.26212 24.5743 7.74056 23.7768 11.2204C26.4515 7.65424 26.4515 4.53383 25.1142 2.8781C23.8405 1.15869 21.739 0.840279 20.9112 2.36864C20.2528 3.57571 20.9534 4.25097 21.8524 5.11735ZM16.8356 19.2443C12.0266 18.485 10.1534 20.7026 8.70978 22.4116C7.61091 23.7126 6.76095 24.7188 5.05449 23.8931C2.88931 22.8742 3.14404 20.0722 5.3729 18.0981C7.53808 16.2513 11.7411 15.9329 16.8356 19.2443ZM21.5481 19.7538H23.9681V21.9826H21.5481V19.7538ZM21.0387 33.9548C20.6566 33.9548 20.2745 33.8911 19.8924 33.7638C19.5103 33.6364 19.1919 33.4454 18.8735 33.1906L19.8924 31.5349C20.0198 31.6623 20.1471 31.726 20.2745 31.7896C20.4019 31.8533 20.5929 31.8533 20.7203 31.8533C20.975 31.8533 21.1661 31.7896 21.2934 31.5986C21.4208 31.4712 21.5481 31.2802 21.5481 30.9618V22.8105H23.9681V30.7707C23.9681 31.2165 23.9044 31.6623 23.777 32.0444C23.6496 32.4265 23.3949 32.7449 23.1402 33.0633C22.8855 33.318 22.5671 33.5727 22.185 33.7001C21.8666 33.8275 21.4845 33.9548 21.0387 33.9548ZM28.0436 31.0255C27.2157 31.0255 26.6426 30.7708 26.1968 30.2613C25.7511 29.7518 25.56 28.9877 25.56 28.0324V22.9379H27.9799V27.523C27.9799 28.0324 28.0436 28.3508 28.2983 28.6056C28.4894 28.8603 28.7441 28.9877 29.1262 28.9877C29.4446 28.9877 29.763 28.924 30.0814 28.7329C30.3998 28.5419 30.6546 28.2872 30.9093 27.8414V22.9379H33.3292V28.1598C33.3292 28.4145 33.3929 28.5419 33.4566 28.6693C33.5202 28.7966 33.7113 28.8603 33.966 28.8603V30.8981C33.8492 30.9273 33.7458 30.9431 33.6496 30.9578C33.5361 30.9752 33.4326 30.991 33.3292 31.0255H32.8197C31.9919 31.0255 31.4824 30.7071 31.3551 30.0066L31.2277 29.4971C30.8456 30.0066 30.3998 30.3887 29.8904 30.6434C29.3172 30.8981 28.7441 31.0255 28.0436 31.0255ZM37.6596 19.7538H35.2397V21.9826H37.6596V19.7538ZM37.6596 22.8742H35.2397V30.8344H37.6596V22.8742ZM38.8695 26.8225C38.8695 26.2493 38.9332 25.7399 39.1879 25.2304C39.3789 24.721 39.6337 24.2752 40.0158 23.8931C40.3978 23.511 40.8436 23.1926 41.3531 23.0016C41.8625 22.7468 42.4993 22.6831 43.1362 22.6831C44.0914 22.6831 44.8556 22.8742 45.4924 23.2563C46.1292 23.6384 46.575 24.1478 46.8934 24.7846L44.5372 25.4852C44.2188 24.9757 43.773 24.721 43.1362 24.721C42.6267 24.721 42.1809 24.912 41.8625 25.2941C41.5441 25.6762 41.3531 26.1857 41.3531 26.8225C41.3531 27.1409 41.4168 27.3956 41.4804 27.6503C41.5441 27.9051 41.6715 28.1598 41.8625 28.3508C42.0536 28.5419 42.1809 28.6692 42.4357 28.7966C42.6267 28.924 42.8814 28.924 43.1362 28.924C43.4546 28.924 43.7093 28.8603 43.964 28.6692C44.2187 28.5419 44.4098 28.3508 44.5372 28.0961L46.8934 28.7966C46.575 29.4334 46.1292 29.9429 45.4924 30.325C44.8556 30.7071 44.0914 30.8981 43.1362 30.8981C42.4357 30.8981 41.8625 30.7707 41.3531 30.5797C40.8436 30.325 40.3342 30.0702 40.0158 29.6882C39.6337 29.3061 39.3789 28.8603 39.1879 28.3508C38.9968 27.9051 38.8695 27.3956 38.8695 26.8225ZM52.9433 24.912C53.2617 25.2304 53.4527 25.6125 53.5164 26.122H50.0776C50.1413 25.6125 50.3323 25.2304 50.6507 24.912C50.9054 24.5936 51.3512 24.4662 51.797 24.4662C52.2428 24.4662 52.6248 24.5936 52.9433 24.912ZM50.0776 30.7071C50.587 30.8981 51.1602 31.0255 51.8607 31.0255C52.7522 31.0255 53.5801 30.8344 54.0258 30.4523C54.6627 30.0702 55.1721 29.5608 55.4905 28.924L53.4527 28.3508C53.389 28.6692 53.1343 28.8603 52.8159 29.0513C52.4975 29.2424 52.1791 29.306 51.797 29.306C51.3512 29.306 50.9054 29.1787 50.587 28.8603C50.2686 28.6055 50.0776 28.1598 50.0139 27.6503H55.9363C56 27.523 56 27.3956 56 27.2682V26.8861C56 26.313 55.9363 25.8036 55.7453 25.2941C55.5542 24.7846 55.2995 24.3389 54.9174 23.9568C54.5353 23.5747 54.0895 23.32 53.5801 23.0652C53.0706 22.8742 52.4975 22.7468 51.797 22.7468C51.1602 22.7468 50.5233 22.8105 50.0139 23.0652C49.5044 23.2563 49.0587 23.5747 48.6766 23.9568C48.2945 24.3389 48.0397 24.7846 47.8487 25.2941C47.594 25.8036 47.5303 26.3767 47.5303 26.9498C47.5303 27.4593 47.6577 27.9687 47.8487 28.4782C48.0397 28.9876 48.2945 29.4334 48.6766 29.8155C49.0587 30.1976 49.5044 30.4523 50.0776 30.7071ZM25.56 16.8244C28.994 13.3543 31.8124 14.0288 33.992 14.5504C35.6523 14.9477 36.942 15.2563 37.8506 13.5766C38.9969 11.4751 37.0864 9.37365 34.1571 9.11892C31.2914 8.92787 27.7252 11.1567 25.56 16.8244Z" fill="url(#paint0_linear)"/>
<defs>
<linearGradient id="paint0_linear" x1="28" y1="0.5" x2="28" y2="33.9548" gradientUnits="userSpaceOnUse">
<stop stop-color="#FF9900"/>
<stop offset="1" stop-color="#FF7100"/>
</linearGradient>
</defs>
</svg>

+ 1
- 1
version.ini View File

@ -1 +1 @@
0.1.7
0.1.8

Write Preview
Loading…
Cancel
Save