From f9e9c8e53bc42a5e6a77e9f0224603979d7554de Mon Sep 17 00:00:00 2001 From: gow1998 <115560712+gow1998@users.noreply.github.com> Date: Thu, 1 Jun 2023 11:34:33 +0530 Subject: [PATCH 1/6] questionset/v4/assestment/validate api is added --- ansible/roles/kong-api/defaults/main.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 25ae4e6f0..f83aa2c17 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -10280,3 +10280,24 @@ kong_apis: - name: opa-checks config.required: false config.enabled: false + +- name: questionSetAssesmentValidity + uris: "{{ questionset_prefix }}/v1/assestment/validate" + upstream_url: "{{ assessment_service_url }}/questionset/v4/assestment/validate" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - contentCreate + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + - name: opa-checks + config.required: false + config.enabled: false From d58bb17106122876112142af1c7634a9cc087a62 Mon Sep 17 00:00:00 2001 From: gow1998 <115560712+gow1998@users.noreply.github.com> Date: Thu, 1 Jun 2023 13:11:01 +0530 Subject: [PATCH 2/6] Removed the questionset/v1/assestment/validate --- ansible/roles/kong-api/defaults/main.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index f83aa2c17..8a93f5d53 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -10280,24 +10280,4 @@ kong_apis: - name: opa-checks config.required: false config.enabled: false - -- name: questionSetAssesmentValidity - uris: "{{ questionset_prefix }}/v1/assestment/validate" - upstream_url: "{{ assessment_service_url }}/questionset/v4/assestment/validate" - strip_uri: true - plugins: - - name: jwt - - name: cors - - "{{ statsd_pulgin }}" - - name: acl - config.whitelist: - - contentCreate - - name: rate-limiting - config.policy: local - config.hour: "{{ medium_rate_limit_per_hour }}" - config.limit_by: credential - - name: request-size-limiting - config.allowed_payload_size: "{{ medium_request_size_limit }}" - - name: opa-checks - config.required: false - config.enabled: false + From 4506c3f99131c99572fea2b2db5049c9ccf739e8 Mon Sep 17 00:00:00 2001 From: Bharath Kumar Date: Fri, 2 Jun 2023 09:48:36 +0530 Subject: [PATCH 3/6] login page changes --- ansible/artifacts/sunbird/login/login.ftl | 9 +- .../login/messages/messages_en.properties | 5 +- .../sunbird/login/resources/css/login.css | 144 ++++++- .../sunbird/login/resources/css/styles.css | 365 +++++++++--------- ansible/artifacts/sunbird/login/template.ftl | 12 +- 5 files changed, 332 insertions(+), 203 deletions(-) diff --git a/ansible/artifacts/sunbird/login/login.ftl b/ansible/artifacts/sunbird/login/login.ftl index 1a6090341..0cd999ef0 100644 --- a/ansible/artifacts/sunbird/login/login.ftl +++ b/ansible/artifacts/sunbird/login/login.ftl @@ -8,9 +8,8 @@
- -

${msg("loginDiksha")}

Login

+

${msg("loginDiksha")} *

${msg("mergeAccountMessage")}

${msg("migrateAccountMessage")}

@@ -30,12 +29,14 @@ <#elseif !realm.registrationEmailAsUsername>${msg("emailOrPhone")} <#else>${msg("email")} + * <#if usernameEditDisabled??> <#-- TODO: need to find alternative for prepopulating username --> @@ -48,10 +49,12 @@
@@ -64,7 +67,7 @@
<#if realm.resetPasswordAllowed> - ${msg("doForgotPassword")} + ${msg("forgotAccount")}
diff --git a/ansible/artifacts/sunbird/login/messages/messages_en.properties b/ansible/artifacts/sunbird/login/messages/messages_en.properties index 6ab91bf82..86565a07a 100644 --- a/ansible/artifacts/sunbird/login/messages/messages_en.properties +++ b/ansible/artifacts/sunbird/login/messages/messages_en.properties @@ -13,7 +13,7 @@ doNo=No doContinue=Continue doAccept=Accept doDecline=Decline -doForgotPassword=Forgot password? +doForgotPassword=Reset password doClickHere=Click here doImpersonate=Impersonate kerberosNotConfigured=Kerberos Not Configured @@ -53,6 +53,7 @@ recaptchaNotConfigured=Recaptcha is required, but not configured consentDenied=Consent denied. noAccount=Don''t have an account? +forgotAccount=Did you forget the password? username=Username or Mobile number goBack=<label { font-size: 14px; @@ -264,9 +270,13 @@ a{ color: #024f9d !important; } .registerLink{ - color: #024f9d; - font-weight: bold; - text-decoration: underline; + opacity: 1; + color: rgba(236,73,51,1); + font-size: 14px; + font-weight: 700; + font-style: normal; + letter-spacing: 0px; + text-align: right; } .registerLink:hover, .registerLink:focus{ @@ -386,7 +396,9 @@ h1, h2, h3, h4, h5, } .sb-btn-primary:hover { - background-color: #002e50; + background-color: #FFF5F3; + border-color: rgba(236,73,51,1); + color: rgba(236,73,51,1); } .sb-btn-success { @@ -453,7 +465,7 @@ h1, h2, h3, h4, h5, justify-content: center; height: 100%; padding: 32px; - background: #edf4f9; + /* background-image: linear-gradient(180deg, rgba(246, 170, 156, 1) 0%, rgba(253, 227, 222, 1) 100%) !important; */ } .container-wrapper { max-width: 328px; @@ -473,6 +485,19 @@ h1, h2, h3, h4, h5, .forgot-password { font-size:11px; color:#333; + display: flex; + justify-content: space-between; + width: 100%; + align-items: baseline; +} +.forgot-password p{ + opacity: 1; + color: rgba(0,0,0,1); + font-size: 14px; + font-weight: 400; + font-style: normal; + letter-spacing: 0px; + text-align: left; } .forgot-password:hover { color:#024f9d; @@ -602,9 +627,9 @@ h1, h2, h3, h4, h5, background-size: cover; background-repeat: no-repeat; min-height: 100vh; - background: url(../img/onboard_bg.svg) no-repeat center center fixed; + background: url(../img/bg.png) no-repeat center center fixed; background-size: cover; - + background-color: #000; } .fullpage-background-image{ max-width: 1008px !important; @@ -637,4 +662,93 @@ h1, h2, h3, h4, h5, input:focus-visible{ outline: 1px #fe0000 solid !important; border-radius: 5px; - } \ No newline at end of file + } + + + .kc-container-wrapper{ + /* opacity: 1; */ + /* background-image: linear-gradient(90deg, rgba(236, 80, 51, 1) 0%, rgba(253, 235, 232, 1) 100%); */ + } + .fullpage-background-image { + + background: #ffffff; + max-width: 661px !important; width: 100%; padding: 40px !important; /* box-shadow: 0 2px 16px 0 rgba(0,0,0,0.2) !important; */ border-radius: 8px !important; min-height: 480px; opacity: 1; + } + + .activeLabelColor{ color: #000000 !important; + } + + .forgetPasswordLink{ + color: #024f9d; + font-size: 12px; + line-height: 17px; + float: right; + color: rgba(236,73,51,1) !important; + font-size: 14px; + font-weight: 700; + font-style: normal; + letter-spacing: 0px; + text-align: right; + display: block !important; + } + + + .sb-btn-primary{ + border-color: rgba(236,73,51,1); + background-color: rgba(236,73,51,1); + color: white; + opacity: 1; + color: rgba(255,255,255,1); + font-size: 14px; + font-weight: 400; + font-style: normal; + letter-spacing: 0px; + text-align: center; + } + .registerLink { + color: rgba(236,73,51,1); + } +header .navigation { + display: flex; + justify-content: space-between; + align-items: center; + position: fixed; + min-height: 80px; + max-height: 80px; + min-width: 100%; + z-index: 10; + background: white; + border-bottom: 2px solid white; +} + +header .navigation .logo{ + margin-left: 20px; +} +header .navigation .logo img { + width: 291px; + height: 48px; +} +header .navigation .logo h1{ + color: #b1d4e0; + font-size: 30px; + line-height: 38px; +} +.info { + opacity: 1; + color: rgba(0,0,0,0.8); + font-family: "NotoSans"; + font-size: 14px; + font-weight: 400; + font-style: normal; + letter-spacing: 0px; +} +span.required { + color: #e55a28; + font-size: 14px; +} + + + + + + \ No newline at end of file diff --git a/ansible/artifacts/sunbird/login/resources/css/styles.css b/ansible/artifacts/sunbird/login/resources/css/styles.css index a4f1b022a..9f692f9c3 100644 --- a/ansible/artifacts/sunbird/login/resources/css/styles.css +++ b/ansible/artifacts/sunbird/login/resources/css/styles.css @@ -15,185 +15,186 @@ * limitations under the License. */ -@import url('../../keycloak/lib/zocial/zocial.css'); - -body { - background-color: #012951; - background-size: cover; - background-repeat: no-repeat; - color: #fff; - font-family: sans-serif; - /* text-shadow: 0px 0px 10px #000; */ - margin: 0px; -} - -a { - color: #fff; -} - -div#kc-logo { - background-image: url('../img/bkgrnd.png'); - background-repeat: no-repeat; - background-color: #fff; - background-size: contain; - height:110px; -} - -div#kc-locale { - display: none; -} - -div#kc-content { - position: absolute; - top: 30%; - left: 50%; - width: 550px; - margin-left: -225px; -} - -div#kc-form { - float: left; - width: 350px; -} - -div#kc-form label { - display: block; - font-size: 16px; -} - -div#info-area { - position: fixed; - bottom: 0; - left: 0; - margin-top: 40px; - background-color: rgba(0, 0, 0, 0.4); - padding: 20px; - width: 100%; -} - -div#info-area p { - margin-right: 30px; - display: inline; - text-shadow: none; -} - -input[type=text], input[type=password] { - color: #ddd; - font-size: 18px; - margin-bottom: 20px; - background-color: rgba(3,70,114,0.15); - border: 0px solid rgba(0,0,0,0.2); - box-shadow:inset 0 0 2px 2px rgba(0,0,0,0.15); - padding: 10px; - width: 296px; -} - -input[type=text]:hover, input[type=password]:hover { - background-color: rgba(3,70,114,0.4); -} - -input[type=submit] { - border: none; - background: #fff; - background: -moz-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)); - background: -ms-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)); - background: -o-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)); - box-shadow: 0px 0px 6px rgba(0,0,0,0.5); - /* color: rgba(0,0,0,0.6); */ - font-size: 14px; - font-weight: bold; - padding: 10px; - margin-top: 20px; - margin-right: 10px; - width: 150px; -} - -input[type=submit]:hover { - background-color: rgba(255,255,255,0.8); -} - -div#kc-form-options div { - display: inline; - margin-right: 20px; - font-size: 12px; -} - -div#kc-form-options div label { - font-size: 12px; -} - -div#kc-feedback { - box-shadow: 0px 0px 6px rgba(0,0,0,0.5); - position: fixed; - top: 0; - left: 0; - width: 100%; - text-align: center; -} - -div#kc-feedback-wrapper { - padding: 1em; -} - -div.feedback-success { - background-color: rgba(155,155,255,0.1); -} - -div.feedback-warning { - background-color: rgba(255,175,0,0.1); -} - -div.feedback-error { - background-color: rgba(255,0,0,0.1); -} - -div#kc-header { - display: none; -} - -div#kc-registration { - margin-bottom: 20px; -} - -div#social-login { - border-left: 1px solid rgba(255, 255, 255, 0.2); - float: right; - width: 150px; - padding: 20px 0 200px 40px; -} - -div.social-login span { - display: none; -} - -div#kc-social-providers ul { - list-style: none; - margin: 0; - padding: 0; -} - -div#kc-social-providers ul li { - margin-bottom: 20px; -} - -div#kc-social-providers ul li span { - display: inline; - width: 100px; -} - -a.zocial { - border: none; - background: -webkit-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)) !important; - background: -moz-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)) !important; - background: -ms-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)) !important; - background: -o-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)) !important; - box-shadow: 0px 0px 6px rgba(0,0,0,0.5); - color: rgba(0,0,0,0.6); - width: 130px; - text-shadow: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - padding-top: 0.2em; - padding-bottom: 0.2em; -} + @import url('../../keycloak/lib/zocial/zocial.css'); + + body { + background-color: #012951; + background-size: cover; + background-repeat: no-repeat; + color: #fff; + font-family: sans-serif; + /* text-shadow: 0px 0px 10px #000; */ + margin: 0px; + } + + a { + color: #fff; + } + + div#kc-logo { + background-image: url('../img/bkgrnd.png'); + background-repeat: no-repeat; + background-color: #fff; + background-size: contain; + height:110px; + } + + div#kc-locale { + display: none; + } + + div#kc-content { + position: absolute; + top: 30%; + left: 50%; + width: 550px; + margin-left: -225px; + } + + div#kc-form { + float: left; + width: 350px; + } + + div#kc-form label { + display: block; + font-size: 16px; + } + + div#info-area { + position: fixed; + bottom: 0; + left: 0; + margin-top: 40px; + background-color: rgba(0, 0, 0, 0.4); + padding: 20px; + width: 100%; + } + + div#info-area p { + margin-right: 30px; + display: inline; + text-shadow: none; + } + + input[type=text], input[type=password] { + color: #ddd; + font-size: 18px; + margin-bottom: 20px; + background-color: rgba(3,70,114,0.15); + border: 0px solid rgba(0,0,0,0.2); + box-shadow:inset 0 0 2px 2px rgba(0,0,0,0.15); + padding: 10px; + width: 296px; + } + + input[type=text]:hover, input[type=password]:hover { + background-color: rgba(3,70,114,0.4); + } + + input[type=submit] { + border: none; + background: #fff; + background: -moz-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)); + background: -ms-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)); + background: -o-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)); + box-shadow: 0px 0px 6px rgba(0,0,0,0.5); + /* color: rgba(0,0,0,0.6); */ + font-size: 14px; + font-weight: bold; + padding: 10px; + margin-top: 20px; + margin-right: 10px; + width: 150px; + } + + input[type=submit]:hover { + background-color: rgba(255,255,255,0.8); + } + + div#kc-form-options div { + display: inline; + margin-right: 20px; + font-size: 12px; + } + + div#kc-form-options div label { + font-size: 12px; + } + + div#kc-feedback { + box-shadow: 0px 0px 6px rgba(0,0,0,0.5); + position: fixed; + top: 0; + left: 0; + width: 100%; + text-align: center; + } + + div#kc-feedback-wrapper { + padding: 1em; + } + + div.feedback-success { + background-color: rgba(155,155,255,0.1); + } + + div.feedback-warning { + background-color: rgba(255,175,0,0.1); + } + + div.feedback-error { + background-color: rgba(255,0,0,0.1); + } + + div#kc-header { + display: none; + } + + div#kc-registration { + margin-bottom: 20px; + } + + div#social-login { + border-left: 1px solid rgba(255, 255, 255, 0.2); + float: right; + width: 150px; + padding: 20px 0 200px 40px; + } + + div.social-login span { + display: none; + } + + div#kc-social-providers ul { + list-style: none; + margin: 0; + padding: 0; + } + + div#kc-social-providers ul li { + margin-bottom: 20px; + } + + div#kc-social-providers ul li span { + display: inline; + width: 100px; + } + + a.zocial { + border: none; + background: -webkit-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)) !important; + background: -moz-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)) !important; + background: -ms-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)) !important; + background: -o-linear-gradient(top, rgba(255,255,255,0.8), rgba(255,255,255,0.1)) !important; + box-shadow: 0px 0px 6px rgba(0,0,0,0.5); + color: rgba(0,0,0,0.6); + width: 130px; + text-shadow: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + padding-top: 0.2em; + padding-bottom: 0.2em; + } + \ No newline at end of file diff --git a/ansible/artifacts/sunbird/login/template.ftl b/ansible/artifacts/sunbird/login/template.ftl index 1b4f1c3a8..4cd22fe9f 100644 --- a/ansible/artifacts/sunbird/login/template.ftl +++ b/ansible/artifacts/sunbird/login/template.ftl @@ -45,7 +45,17 @@
-
<#nested "header">
+
+
+ +
+
<#if realm.internationalizationEnabled> From 4ee815c31252a11f5abdadcf87c28487bcdbce26 Mon Sep 17 00:00:00 2001 From: Bharath Kumar Date: Fri, 2 Jun 2023 09:50:53 +0530 Subject: [PATCH 4/6] login page changes --- ansible/artifacts/sunbird/login/resources/css/login.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible/artifacts/sunbird/login/resources/css/login.css b/ansible/artifacts/sunbird/login/resources/css/login.css index 2052a81c1..70178f06d 100644 --- a/ansible/artifacts/sunbird/login/resources/css/login.css +++ b/ansible/artifacts/sunbird/login/resources/css/login.css @@ -489,6 +489,12 @@ h1, h2, h3, h4, h5, justify-content: space-between; width: 100%; align-items: baseline; + font-size: 12px; + line-height: 17px; + text-align: left; + display: flex; + align-items: baseline; + justify-content: space-between; } .forgot-password p{ opacity: 1; From 43ed7244f2eeeea6852a5c756e8c0d28c36de559 Mon Sep 17 00:00:00 2001 From: Bharath Kumar Date: Wed, 30 Aug 2023 18:57:59 +0530 Subject: [PATCH 5/6] changes in the redeme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7bc002857..2d28a0b0e 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ This repository contains the information and references needed to run [Sunbird]( ## Prerequisites This section should expand as open source contributions to support multiple run times increase over time. Presently, the software and reference steps consider the following tech stack: + Required: - Linux, preferably Ubuntu From 3ae709d2f8a7fe40f4159fd9c7e1005a91280c6a Mon Sep 17 00:00:00 2001 From: Bharath Kumar Date: Wed, 30 Aug 2023 19:30:51 +0530 Subject: [PATCH 6/6] changes in the login page --- ansible/artifacts/sunbird/login/login.ftl | 9 ++++-- .../sunbird/login/resources/css/login.css | 28 +++++++++++-------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ansible/artifacts/sunbird/login/login.ftl b/ansible/artifacts/sunbird/login/login.ftl index 0cd999ef0..287fe31ad 100644 --- a/ansible/artifacts/sunbird/login/login.ftl +++ b/ansible/artifacts/sunbird/login/login.ftl @@ -76,10 +76,15 @@
- <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??> + +
+ +
+ <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??>
- ${msg("noAccount")} ${msg("registerHere")} + +
diff --git a/ansible/artifacts/sunbird/login/resources/css/login.css b/ansible/artifacts/sunbird/login/resources/css/login.css index 70178f06d..a69323898 100644 --- a/ansible/artifacts/sunbird/login/resources/css/login.css +++ b/ansible/artifacts/sunbird/login/resources/css/login.css @@ -271,7 +271,6 @@ a{ } .registerLink{ opacity: 1; - color: rgba(236,73,51,1); font-size: 14px; font-weight: 700; font-style: normal; @@ -284,6 +283,13 @@ a{ outline:none; cursor: pointer; } +.register-btn:hover.registerLink{ + color: rgba(236,73,51,1); +} + +.register-btn { + color: rgba(236,73,51,1); +} .pointer { cursor: pointer; @@ -489,12 +495,6 @@ h1, h2, h3, h4, h5, justify-content: space-between; width: 100%; align-items: baseline; - font-size: 12px; - line-height: 17px; - text-align: left; - display: flex; - align-items: baseline; - justify-content: space-between; } .forgot-password p{ opacity: 1; @@ -697,8 +697,6 @@ h1, h2, h3, h4, h5, text-align: right; display: block !important; } - - .sb-btn-primary{ border-color: rgba(236,73,51,1); background-color: rgba(236,73,51,1); @@ -711,9 +709,6 @@ h1, h2, h3, h4, h5, letter-spacing: 0px; text-align: center; } - .registerLink { - color: rgba(236,73,51,1); - } header .navigation { display: flex; justify-content: space-between; @@ -727,6 +722,15 @@ header .navigation { border-bottom: 2px solid white; } +.register-lbl { + font-size: 11px; + color: #333; + display: flex; + justify-content: space-between; + width: 100%; + align-items: baseline; +} + header .navigation .logo{ margin-left: 20px; }