Release 3.5.0 rc2

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "images/proxy/nginx-lua-prometheus"]
+	path = images/proxy/nginx-lua-prometheus
+	url = https://github.com/knyar/nginx-lua-prometheus.git

ansible/api-manager.yml

@@ -1,6 +1,8 @@
 ---
 - name: Kong API
   become: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
   hosts: "{{groups['swarm-manager-1'][0]}}"
   roles:
     - {role: kong-api, tags: ['kong-api']}

ansible/artifacts-download.yml

@@ -4,7 +4,7 @@
   vars_files:
     - "{{inventory_dir}}/secrets.yml"
   environment:
-    AZURE_STORAGE_ACCOUNT: "{{ artifact_azure_account_name }}"
-    AZURE_STORAGE_KEY: "{{ artifact_azure_account_key }}"
+    AZURE_STORAGE_ACCOUNT: "{{ sunbird_artifact_storage_account_name }}"
+    AZURE_STORAGE_SAS_TOKEN: "{{ sunbird_artifact_storage_account_sas }}"
   roles:
     - artifacts-download-azure

ansible/artifacts-upload.yml

@@ -4,7 +4,7 @@
   vars_files:
     - "{{inventory_dir}}/secrets.yml"
   environment:
-    AZURE_STORAGE_ACCOUNT: "{{ artifact_azure_account_name }}"
-    AZURE_STORAGE_KEY: "{{ artifact_azure_account_key }}"
+    AZURE_STORAGE_ACCOUNT: "{{ sunbird_artifact_storage_account_name }}"
+    AZURE_STORAGE_SAS_TOKEN: "{{ sunbird_artifact_storage_account_sas }}"
   roles:
     - artifacts-upload-azure

ansible/artifacts/sunbird/login/info.ftl

@@ -3,23 +3,17 @@
     <#if section = "title">
     ${message.summary}
     <#elseif section = "form">
-    <div class="ui raised shadow container segment fullpage-background-image">
-        <div class="ui three column grid stackable">
-            <div class="ui column tablet only computer only"></div>
-            <div class="ui column height-fix">
+    <div class="fullpage-background-image">
+        <div class="container-wrapper">
+            <div>
                 <div id="kc-info-message">
                     <p class="instruction">${message.summary}</p>
                     <#if skipLink??>
                     <#else>
-                        <#if pageRedirectUri??>
-                            <p><a href="${pageRedirectUri}">${msg("backToApplication")}</a></p>
-                        <#elseif client.baseUrl??>
-                            <p><a href="${client.baseUrl}">${msg("backToApplication")}</a></p>
-                        </#if>
+                    <p><a onclick="javascript:backToApplication()" class="sb-btn sb-btn-normal sb-btn-outline-primary mt-16 line-height-normal">${msg("backToApplication")}</a></p>
                     </#if>
                 </div>
             </div>
-            <div class="ui column tablet only computer only"></div>
         </div>
     </div>
     </#if>

ansible/artifacts/sunbird/login/login-page-expired.ftl

@@ -3,16 +3,16 @@
     <#if section = "title">
         ${msg("pageExpiredTitle")}
     <#elseif section = "form">
-     <div class="ui raised shadow container segment fullpage-background-image">
-        <div class="ui three column grid stackable">
-            <div class="ui column tablet only computer only"></div>
-            <div class="ui column mt-127 height-fix">
-			<p id="instruction1" class="instruction">
-				${msg("pageExpiredMsg1")} <a id="loginRestartLink" href="${url.loginRestartFlowUrl}">${msg("doClickHere")}</a>.
-				${msg("pageExpiredMsg2")} <a id="loginContinueLink" href="${url.loginAction}">${msg("doClickHere")}</a>.
-			</p>
+     <div class="fullpage-background-image">
+        <div class="container-wrapper">
+			<div id="instruction1" class="instruction textCenter">
+            <p>${msg("pageExpiredMsg1")} <br>
+                <a id="loginRestartLink" class="sb-btn sb-btn-normal sb-btn-outline-primary mt-16 line-height-normal" href="${url.loginRestartFlowUrl}">${msg("doClickHere")}</a></p>
+				<p class="mt-16">
+                ${msg("pageExpiredMsg2")} <br>
+                <a id="loginContinueLink" class="sb-btn sb-btn-normal sb-btn-outline-primary mt-16 line-height-normal" href="${url.loginAction}">${msg("doClickHere")}</a>
+                </p>
 			</div>
-			<div class="ui column tablet only computer only"></div>
 		</div>
     </#if>
 </@layout.registrationLayout>

ansible/artifacts/sunbird/login/login-reset-password.ftl

@@ -4,26 +4,24 @@
         ${msg("emailForgotTitle")}
     <#elseif section = "form">
     <meta content="width=device-width, initial-scale=1" name="viewport" />
-    <div class="ui raised shadow container segment fullpage-background-image">
-        <div class="ui three column grid stackable">
-            <div class="ui column tablet only computer only"></div>
-            <div class="ui column height-fix">
-                <div class="ui header centered">
+    <div class="fullpage-background-image">
+        <div class="container-wrapper">
+                <div class="ui header centered mb-8">
                     <img onerror="" alt="">
-                    <div class="signInHead mt-27">${msg("emailForgotTitle")}</div>
+                    <div class="signInHead">${msg("emailForgotTitle")}</div>
                 </div>
-                <div class="ui content center justfy textCenter">
+                <div class="ui content center justfy textCenter mt-24">
                     ${msg("enterEmailPhonenumberToGetCode")}
                 </div>
-                <div class="ui content center justfy textCenter mt-8 mb-28">
+                <div class="ui content center justfy textCenter mt-8 mb-16">
                     <#if message?has_content>
                         <div class="ui text ${message.type}">
                             ${message.summary}
                         </div>
                     </#if>
                 </div>
                 <form id="kc-reset-password-form" class="ui form" method="POST" action="${url.loginAction}">
-                    <div class="field mb-36">
+                    <div class="field mb-24">
                         <label id="usernameLabel" for="username" class="">
                             <#if !realm.loginWithEmailAllowed>
                                 ${msg("username")}
@@ -41,16 +39,14 @@
                         <input type="text" id="username" class="mt-8" name="username" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" autofocus/>
                     </div>
                     <div class="field">
-                        <button id="login" class="ui fluid submit button">
+                        <button id="login" class="sb-btn sb-btn-normal sb-btn-primary width-100">
                         ${msg("doReset")}
                         </button>
                     </div>
                 </form>
-                <div class="${properties.kcFormOptionsWrapperClass!} signUpMsg mb-56 mt-45 textCenter">
-                    <span><a id="versionLink" class="backToLogin" onclick="javascript:makeDivUnclickable()" href="${url.loginUrl}"><span class="fs-14"><< </span> ${msg("backToLogin")}</a></span>
+                <div class="${properties.kcFormOptionsWrapperClass!} signUpMsg mb-56 mt-24 textCenter">
+                   <a id="versionLink" class="sb-btn sb-btn-normal sb-btn-outline-primary" onclick="javascript:makeDivUnclickable()" href="${url.loginUrl}">${msg("backToLogin")}</a>
                 </div>
-            </div>
-            <div class="ui column tablet only computer only"></div>
         </div>
     </div>
     <#elseif section = "info" >

ansible/artifacts/sunbird/login/login-update-password.ftl

@@ -3,15 +3,13 @@
     <#if section = "title">
         ${msg("updatePasswordTitle")}
     <#elseif section = "form">
-    <div class="ui raised shadow container segment fullpage-background-image">
-        <div class="ui three column grid stackable">
-            <div class="ui column tablet only computer only"></div>
-            <div class="ui column height-fix">
+    <div class="fullpage-background-image">
+        <div class="container-wrapper">
                 <div class="ui header centered mb-18">
                     <img onerror="" alt="">
                     <div class="signInHead mt-27">${msg("newPasswordTitle")}</div>
                 </div>
-                <div class="ui content center justfy textCenter mb-36 loginupdate">
+                <div class="ui content center justfy textCenter mb-24 loginupdate">
                     <#if message?has_content>
                         <div class="ui text ${message.type}">
                             ${message.summary}
@@ -28,10 +26,11 @@
                         </label>
                         <div class="ui search">
                             <div class="ui mt-8 icon input">
-                                <input class="" type="password" id="password-new" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" name="password-new" autocomplete="off" />    
+                                <input class="" type="password" id="password-new" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" name="password-new" autocomplete="off" onkeydown="javascript:validatePassword()"/>    
                                 <i class="eye icon link" onclick="viewPassword(this)"></i>
                                 <!--i id="preview-hide" class="eye slash icon hide link"></i-->
                             </div>
+                            <div id="passwd-error-msg" class="ui text passwdchk">Your password must contain a minimum of 8 characters. It must include numerals, lower and upper case alphabets and special characters, without any spaces</div>
                         </div>
                     </div>
                     <div class="field">
@@ -41,10 +40,11 @@
                         <label id="password-confirmLabelPlaceholder" class="activeLabelColor hide" for="password-confirm">
                             ${msg("passwordConfirm")}
                         </label>
-                        <input type="password" class="mt-8" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" id="password-confirm" name="password-confirm" autocomplete="off" />
+                        <input type="password" class="mt-8" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" id="password-confirm" name="password-confirm" autocomplete="off" onkeydown="javascript:matchPassword()"/>
+                        <div id="passwd-match-error-msg" class="ui text confpasswderr hide">Passwords do not match</div>
                     </div>
                     <div class="field">
-                        <button id="login" class="ui fluid button submit mt-36" onclick="javascript:makeDivUnclickable()">
+                        <button id="login" class="sb-btn sb-btn-normal sb-btn-primary width-100 mt-36" onclick="javascript:makeDivUnclickable()">
                             ${msg("doReset")}
                         </button>
                     </div>
@@ -56,8 +56,6 @@
                         </a>
                     </span>
                  </div-->
-            </div>
-            <div class="ui column tablet only computer only"></div>
         </div>
     </div>
     </#if>

ansible/artifacts/sunbird/login/login.ftl

@@ -5,17 +5,16 @@
     <#elseif section = "header">
     <#elseif section = "form">
     <#if realm.password>
-    <div class="ui raised shadow container segment fullpage-background-image">
-        <div class="ui three column grid stackable">
-            <div class="ui column tablet only computer only"></div>
-            <div class="ui column height-fix">
-                <div class="ui header centered">
+    <div class="fullpage-background-image">
+    <div class="container-wrapper">
+                <div class="ui header centered mb-8">
                     <img onerror="" alt="">
-                    <div id="signIn" class="signInHead mt-27">${msg("loginDiksha")}</div>
+                    <div id="signIn" class="signInHead mt-8 mb-8">${msg("loginDiksha")}</div>
+                    <p class="subtitle">Login</p>
                 </div>
                 <p id="mergeAccountMessage" class="hide mb-0 textCenter">${msg("mergeAccountMessage")}</p>
                 <p id="migrateAccountMessage" class="hide mb-0 textCenter">${msg("migrateAccountMessage")}</p>
-                <div class="formMsg mb-28 textCenter">
+                <div class="formMsg textCenter mt-8">
                 <#if message?has_content>
                     <div id="error-summary" class="ui text ${message.type}">
                         ${message.summary}
@@ -24,7 +23,7 @@
                     <div id="success-msg" class="ui text success hide">suceess</div>
                     <div id="error-msg" class="ui text error hide">error</div>
                 </div>
-                <form id="kc-form-login" onsubmit="login.disabled = true; return true;" class="ui form" method="POST" action="${url.loginAction}">
+                <form id="kc-form-login"  onsubmit="login.disabled = true; return true;" class="ui form mt-16" method="POST" action="${url.loginAction}">
                     <div class="field">
                         <label id="usernameLabel" for="username" class="">
                             <#if !realm.loginWithEmailAllowed>${msg("username")}
@@ -38,32 +37,49 @@
                             <#else>${msg("email")}
                             </#if>
                         </label>
-                        <#if usernameEditDisabled??>
-                          <#-- TODO: need to find alternative for prepopulating username -->
-                        <input class="mt-8" id="username" name="username" type="text" disabled />
+                         <#if usernameEditDisabled??>
+                         <#-- TODO: need to find alternative for prepopulating username -->
+                        <input class="mt-8" id="username" name="username" placeholder="Enter your email / mobile number" type="text" disabled />
                         <#else>
-                        <input class="mt-8" id="username" name="username" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" type="text" autofocus autocomplete="off" />                        </#if>
+                        <input class="mt-8" id="username" name="username" placeholder="Enter your email / mobile number" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" type="text" autofocus autocomplete="off" />
+                        </#if>
                     </div>
-                    <div class="field">
+                    <div class="field mb-8">
                         <div>
                             <label id="passwordLabel" for="password" class="">
                                 ${msg("password")}
                             </label>
-                            <#if realm.resetPasswordAllowed>
-                                <a id="fgtKeycloakFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:storeLocation(); javascript:makeDivUnclickable()" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a>
-                                <div id="fgtPortalFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:forgetPassword('/recover/identify/account');javascript:makeDivUnclickable()">${msg("doForgotPassword")}</div>
-                            </#if>
+
                             <label id="passwordLabelPlaceholder" for="password" class="activeLabelColor hide">
                                 ${msg("placeholderForPassword")}
                             </label>
                         </div>
-                        <input class=" mt-8" id="password" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" name="password" type="password" autocomplete="off" />
+                        <input placeholder="${msg('passwordPlaceholder')}" class=" mt-8" id="password" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" name="password" type="password" autocomplete="off" />
                     <span class="ui text error hide" id="inCorrectPasswordError">${msg("inCorrectPasswordError")}</span>
                     </div>
-                    <div class="field">
-                        <button id="login" class="mt-16 sb-btn sb-btn-normal sb-btn-primary width-100">${msg("doLogIn")}</button>
+                    <div class="remember-forgot-row">
+                    <div class="sb-checkbox sb-checkbox-secondary hide">
+                        <input type="checkbox" id="rememberme" name="rememberme">
+                        <label for="rememberme">Remember Me</label>
+                    </div>
+                    <div class="forgot-password">
+                      <#if realm.resetPasswordAllowed>
+                        <a id="fgtKeycloakFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:storeLocation(); javascript:makeDivUnclickable()" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a>
+                        <div id="fgtPortalFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:forgetPassword('/recover/identify/account');javascript:makeDivUnclickable()">${msg("doForgotPassword")}</div>
+                      </#if>
+                    </div>
                     </div>
 
+                    <div class="field mb-8">
+                        <button id="login" class="mt-24 sb-btn sb-btn-normal sb-btn-primary width-100">${msg("login")}</button>
+                    </div>
+                  <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??>
+                    <div id="kc-registration" class="field">
+                                <div class="ui content signUpMsg">
+                                    ${msg("noAccount")} <span id="signup" tabindex="0" class="registerLink" onclick=navigate('self')>${msg("registerHere")}</span>
+                                </div>
+                    </div>
+                  </#if>
                     <div id="selfSingUp" class="hide">
                         <p class="or my-16 textCenter">OR</p>
                         <div class="field">
@@ -76,28 +92,22 @@
                                     </#list>
                                 </div-->
                             </#if>
-							<button type="button" id="stateButton" class="sb-btn sb-btn-normal sb-btn-success width-100 mb-16" onclick="navigate('state')">
-								${msg("doSignWithState")}
-							</button>
-                            <button type="button" class="sb-btn sb-btn-normal sb-btn-outline-primary width-100 d-flex flex-ai-center flex-jc-center" onclick="navigate('google')">
-                            <img class="signInWithGoogle" src="${url.resourcesPath}/img/google.png">
-                            ${msg("doLogIn")} ${msg("doSignWithGoogle")}
+                            <button type="button" class="sb-btn sb-btn-normal sb-btn-primary width-100 mb-16 btn-signInWithGoogle" onclick="navigate('google')">
+                            <img class="signInWithGoogle" src="${url.resourcesPath}/img/google.svg">
+                            ${msg("signIn")} ${msg("doSignWithGoogle")}
+                            </button>
+                            <button type="button" id="stateButton" class="sb-btn sb-btn-outline-gray sb-btn-normal width-100" onclick="navigate('state')">
+                                ${msg("doSignWithState")}
                             </button>
                         </div>
-                        <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??>
-                            <div id="kc-registration" class="field">
-                                <div class="ui content signUpMsg">
-                                    ${msg("noAccount")} <span id="signup" tabindex="0" class="registerLink" onclick=navigate('self')>${msg("registerHere")}</span>
-                                </div>
-                            </div>
-                        </#if>
                     </div>
                 </form>
-                 <a id="goBack" class="textCenter mt-16 hide cursor-pointer">${msg("goBack")}</a>
-            </div>
-            <div class="ui column tablet only computer only"></div>
-        </div>
+                <a id="goBack" class="textCenter mt-16 hide cursor-pointer">${msg("goBack")}</a>
+            <!-- <button id="goBack" class="sb-btn sb-btn-normal sb-btn-link sb-btn-link-primary back-btn hide" type="button">
+            <img src="${url.resourcesPath}/img/arrow_back.png" width="12" /> <span class="ml-4">${msg("goBack")}</span>
+                </button> -->
+    </div>
     </div>
     </#if>
 </#if>
-</@layout.registrationLayout>
+</@layout.registrationLayout>