fix: Missed favicon in Safari (#1080 )

Co-authored-by: Stanislav Lunyachek <lunyachek@MacBook-Pro-M1.local>
fix: fixed spacing in tablet version (quince.master) (#1107 )
2023-12-08 10:07:31 +05:00 · 2023-11-28 11:41:06 +05:00 · 2023-11-27 12:26:56 +05:00 · 2023-11-22 16:38:24 +05:00 · 2023-11-17 09:25:29 -03:00 · 2023-10-18 11:23:16 +05:00
35 changed files with 79 additions and 85 deletions
--- a/.env
+++ b/.env
@@ -15,7 +15,7 @@ SEGMENT_KEY=''
 SITE_NAME=null
 INFO_EMAIL=''
 # ***** Cookies *****
-REGISTER_CONVERSION_COOKIE_NAME=null
+USER_RETENTION_COOKIE_NAME=null
 # ***** Links *****
 LOGIN_ISSUE_SUPPORT_LINK=''
 AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK=null
--- a/.env.development
+++ b/.env.development
@@ -20,7 +20,6 @@ SEGMENT_KEY=''
 SITE_NAME='Your Platform Name Here'
 INFO_EMAIL='info@example.com'
 # ***** Cookies *****
-REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
 SESSION_COOKIE_DOMAIN='localhost'
 USER_INFO_COOKIE_NAME='edx-user-info'
 # ***** Links *****
--- a/.env.test
+++ b/.env.test
@@ -16,6 +16,5 @@ ORDER_HISTORY_URL='http://localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEGMENT_KEY=''
 SITE_NAME='Your Platform Name Here'
-REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
 APP_ID=''
 MFE_CONFIG_API_URL=''
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
      "license": "AGPL-3.0",
      "dependencies": {
        "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
-        "@edx/frontend-platform": "^5.0.0",
+        "@edx/frontend-platform": "^5.5.4",
        "@edx/paragon": "20.46.2",
        "@fortawesome/fontawesome-svg-core": "6.4.2",
        "@fortawesome/free-brands-svg-icons": "6.4.2",
@@ -3350,9 +3350,9 @@
      }
    },
    "node_modules/@edx/frontend-platform": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-5.0.0.tgz",
-      "integrity": "sha512-DD9/B4rnC3BKPiWlbEFF1JIYFbWC6vUBKTyN8sf4khi4DNhhWhsobk+iNeCWNzF9UgCPRbniIqesdV1F9NXNZw==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-5.5.4.tgz",
+      "integrity": "sha512-Yum+oST7XfDwDnDhBnzeR/mjp6O+G0g+5AZtIJ1BdTKQH1z9FObfim/pfoiI9STiYlguVpeWMkzWuca/QMLO/Q==",
      "dependencies": {
        "@cospired/i18n-iso-languages": "4.1.0",
        "@formatjs/intl-pluralrules": "4.3.3",
@@ -3380,7 +3380,7 @@
      },
      "peerDependencies": {
        "@edx/frontend-build": ">= 8.1.0 || ^12.9.0-alpha.1",
-        "@edx/paragon": ">= 10.0.0 < 21.0.0",
+        "@edx/paragon": ">= 10.0.0 < 22.0.0",
        "prop-types": "^15.7.2",
        "react": "^16.9.0 || ^17.0.0",
        "react-dom": "^16.9.0 || ^17.0.0",
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
  },
  "dependencies": {
    "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
-    "@edx/frontend-platform": "^5.0.0",
+    "@edx/frontend-platform": "^5.5.4",
    "@edx/paragon": "20.46.2",
    "@fortawesome/fontawesome-svg-core": "6.4.2",
    "@fortawesome/free-brands-svg-icons": "6.4.2",
--- a/public/index.html
+++ b/public/index.html
@@ -4,6 +4,7 @@
      <title>Authn | <%= process.env.SITE_NAME %></title>
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <link rel="shortcut icon" href="<%=htmlWebpackPlugin.options.FAVICON_URL%>" type="image/x-icon" />
      <script src="https://cdnjs.cloudflare.com/ajax/libs/iframe-resizer/4.3.6/iframeResizer.contentWindow.min.js"
              integrity="sha512-R7Piufj0/o6jG9ZKrAvS2dblFr2kkuG4XVQwStX+/4P+KwOLUXn2DXy0l1AJDxxqGhkM/FJllZHG2PKOAheYzg=="
              crossorigin="anonymous"
--- a/src/base-container/components/default-layout/MediumLayout.jsx
+++ b/src/base-container/components/default-layout/MediumLayout.jsx
@@ -23,13 +23,15 @@ const MediumLayout = () => {
            <div>
              <h1
                className={classNames(
-                  'display-1 text-white mt-5 mb-5 mr-2',
+                  'display-1 text-white mt-5 mb-5 mr-2 main-heading',
                  { 'ml-4.5': getConfig().SITE_NAME !== 'edX' },
                )}
              >
-                <span className="mr-2">{formatMessage(messages['start.learning'])}</span>
-                <span className="text-accent-a d-inline-block">
-                  {formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+                <span>
+                  {formatMessage(messages['start.learning'])}{' '}
+                  <span className="text-accent-a d-inline-block">
+                    {formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+                  </span>
                </span>
              </h1>
            </div>
--- a/src/base-container/components/default-layout/SmallLayout.jsx
+++ b/src/base-container/components/default-layout/SmallLayout.jsx
@@ -17,17 +17,18 @@ const SmallLayout = () => {
        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
          <Image className="logo-small" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
        </Hyperlink>
-        <div className="d-flex align-items-center mb-3 mt-3 mr-3">
+        <div className="d-flex align-items-center m-3.5">
          <div className={classNames({ 'small-yellow-line mr-n2.5': getConfig().SITE_NAME === 'edX' })} />
          <h1
            className={classNames(
              'text-white mt-3.5 mb-3.5',
-              { 'ml-4.5': getConfig().SITE_NAME !== 'edX' },
            )}
          >
-            <span className="mr-1">{formatMessage(messages['start.learning'])}</span>
-            <span className="text-accent-a d-inline-block">
-              {formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+            <span>
+              {formatMessage(messages['start.learning'])}{' '}
+              <span className="text-accent-a d-inline-block">
+                {formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+              </span>
            </span>
          </h1>
        </div>
--- a/src/base-container/components/welcome-page-layout/SmallLayout.jsx
+++ b/src/base-container/components/welcome-page-layout/SmallLayout.jsx
@@ -16,7 +16,7 @@ const SmallLayout = ({ username }) => {
      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
        <Image className="logo-small" alt={getConfig().SITE_NAME} src={getConfig().LOGO_URL} />
      </Hyperlink>
-      <div className="d-flex align-items-center mb-3 mt-3 mr-3">
+      <div className="d-flex align-items-center m-3.5">
        <div className="small-yellow-line mt-4.5" />
        <div>
          <h1 className="h5 data-hj-suppress">
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,7 +1,7 @@
 const configuration = {
  // Cookies related configs
  SESSION_COOKIE_DOMAIN: process.env.SESSION_COOKIE_DOMAIN,
-  REGISTER_CONVERSION_COOKIE_NAME: process.env.REGISTER_CONVERSION_COOKIE_NAME || null,
+  USER_RETENTION_COOKIE_NAME: process.env.USER_RETENTION_COOKIE_NAME || '',
  // Features
  DISABLE_ENTERPRISE_LOGIN: process.env.DISABLE_ENTERPRISE_LOGIN || '',
  ENABLE_DYNAMIC_REGISTRATION_FIELDS: process.env.ENABLE_DYNAMIC_REGISTRATION_FIELDS || false,
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "كلمة مرورك الحالية لا تستسجيب لمتطلبات الأمان الجديدة. لقد أرسلنا للتو رسالة لإعادة ضبط كلمة المرور إلى عنوان البريد الإلكتروني المرتبط بهذا الحساب. شكرًا لك على مساعدتنا في الحفاظ على سلامة بياناتك.",
  "account.locked.out.message.1": "لحماية حسابك، تم إقفاله مؤقتًا. حاول مرة أخرى بعد 30 دقيقة.",
  "enterprise.login.btn.text": "بيانات الشركة أو المدرسة",
-  "username.or.email.format.validation.less.chars.message": "يجب أن يحتوي اسم المستخدم أو البريد الإلكتروني على 3 أحرف على الأقل.",
+  "username.or.email.format.validation.less.chars.message": "يجب أن يحتوي اسم المستخدم أو البريد الإلكتروني على 2 أحرف على الأقل.",
  "email.validation.message": "أدخل اسم المستخدم أو البريد الإلكتروني الخاص بك",
  "password.validation.message": "لم يتم استيفاء معايير كلمة المرور",
  "account.activation.success.message.title": "نجح الأمر! لقد قمت بتفعيل حسابك.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "تمت إعادة ضبط كلمة المرور.",
  "reset.password.success": "تمت إعادة ضبط كلمة مرورك. سجل الدخول إلى حسابك.",
  "rate.limit.error": "حدث خطأ بسبب كثرة الطلبات. رجاءً حاول مرة أخرى بعد مضي بعض الوقت."
-}
+}
--- a/src/i18n/messages/de.json
+++ b/src/i18n/messages/de.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
  "enterprise.login.btn.text": "Company or school credentials",
-  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 2 characters.",
  "email.validation.message": "Enter your username or email",
  "password.validation.message": "Password criteria has not been met",
  "account.activation.success.message.title": "Success! You have activated your account.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Password reset complete.",
  "reset.password.success": "Your password has been reset. Sign in to your account.",
  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
-}
+}
--- a/src/i18n/messages/de_DE.json
+++ b/src/i18n/messages/de_DE.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "Ihr aktuelles Passwort entspricht nicht den neuen Sicherheitsanforderungen. Wir haben gerade eine Nachricht zum Zurücksetzen des Passworts an die mit diesem Konto verknüpfte E-Mail-Adresse gesendet. Vielen Dank, dass Sie uns helfen, Ihre Daten zu schützen.",
  "account.locked.out.message.1": "Um Ihr Konto zu schützen, wurde es vorübergehend gesperrt. Versuchen Sie es in 30 Minuten erneut.",
  "enterprise.login.btn.text": "Arbeits- oder Schulzeugnisse",
-  "username.or.email.format.validation.less.chars.message": "Benutzername oder E-Mail müssen mindestens 3 Zeichen lang sein.",
+  "username.or.email.format.validation.less.chars.message": "Benutzername oder E-Mail müssen mindestens 2 Zeichen lang sein.",
  "email.validation.message": "Geben Sie Ihren Benutzernamen oder Ihre E-Mail-Adresse ein",
  "password.validation.message": "Die Passwortkriterien wurden nicht erfüllt",
  "account.activation.success.message.title": "Super! Sie haben Ihr Konto aktiviert.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Zurücksetzen des Passworts abgeschlossen.",
  "reset.password.success": "Ihr Passwort wurde zurückgesetzt. Melden Sie sich bei Ihrem Konto an.",
  "rate.limit.error": "Aufgrund zu vieler Anfragen ist ein Fehler aufgetreten. Bitte versuchen Sie es nach einiger Zeit erneut."
-}
+}
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "Tu contraseña actual no cumple con los nuevos requisitos de seguridad. Acabamos de enviar un mensaje de restablecimiento de contraseña a la dirección de correo electrónico asociada a esta cuenta. Gracias por ayudarnos a mantener tus datos seguros.",
  "account.locked.out.message.1": "Para proteger tu cuenta, se ha bloqueado temporalmente. Inténtalo de nuevo en 30 minutos.",
  "enterprise.login.btn.text": "Credenciales de la empresa o de la institución ",
-  "username.or.email.format.validation.less.chars.message": "El nombre de usuario o el correo electrónico deben tener al menos 3 caracteres.",
+  "username.or.email.format.validation.less.chars.message": "El nombre de usuario o el correo electrónico deben tener al menos 2 caracteres.",
  "email.validation.message": "Introduce tu nombre de usuario o correo electrónico",
  "password.validation.message": "No se han cumplido los criterios de la contraseña",
  "account.activation.success.message.title": "Ha sido un éxito. Has activado tu cuenta.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Restablecimiento de la contraseña completado.",
  "reset.password.success": "Tu contraseña ha sido restablecida. Acceda a tu cuenta.",
  "rate.limit.error": "Se ha producido un error debido a demasiadas solicitudes. Por favor, inténtalo de nuevo después de algún tiempo."
-}
+}
--- a/src/i18n/messages/fa_IR.json
+++ b/src/i18n/messages/fa_IR.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "گذرواژه فعلی شما الزامات امنیتی جدید را برآورده نمی‌کند. ما فقط یک پیام بازتنظیم گذرواژه به نشانی رایانامه مرتبط با این حساب کاربری ارسال کردیم. از اینکه به ما کمک می‌کنید تا داده‌های شما را ایمن نگه دارید متشکریم.",
  "account.locked.out.message.1": "حساب کاربری شما، به دلیل حفاظت، به‌طور موقت قفل شده است. 30 دقیقه دیگر دوباره امتحان کنید.",
  "enterprise.login.btn.text": "اعتبار دانشکده یا شرکت",
-  "username.or.email.format.validation.less.chars.message": "نام کاربری یا نشانی رایانامه حداقل باید 3 نویسه داشته باشد",
+  "username.or.email.format.validation.less.chars.message": "نام کاربری یا نشانی رایانامه حداقل باید 2 نویسه داشته باشد",
  "email.validation.message": "نام کاربری یا رایانامه خود را وارد کنید",
  "password.validation.message": "معیارهای گذرواژه رعایت نشده است",
  "account.activation.success.message.title": "موفق شدید! شما حساب کاربری خود را فعال کردید.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "بازتنظیم گذرواژه  تکمیل شد.",
  "reset.password.success": "گذرواژه شما بازتنظیم شد. وارد حساب کاربری خود شوید",
  "rate.limit.error": "به دلیل درخواست‌های زیاد، خطایی روی داده است. لطفا بعد از مدتی دوباره امتحان کنید."
-}
+}
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "Votre mot de passe actuel ne répond pas aux nouvelles exigences de sécurité. Nous venons d'envoyer un message de réinitialisation de mot de passe à l'adresse courriel associée à ce compte. Merci de nous aider à protéger vos données.",
  "account.locked.out.message.1": "Pour protéger votre compte, il a été temporairement verrouillé. Réessayez dans 30 minutes.",
  "enterprise.login.btn.text": "Identifiants de la compagnie ou de l'école",
-  "username.or.email.format.validation.less.chars.message": "Le nom d'utilisateur ou l'adresse courriel doit comporter au moins 3 caractères.",
+  "username.or.email.format.validation.less.chars.message": "Le nom d'utilisateur ou l'adresse courriel doit comporter au moins 2 caractères.",
  "email.validation.message": "Entrez votre nom d'utilisateur ou votre adresse courriel",
  "password.validation.message": "Les critères de mot de passe n'ont pas été remplis",
  "account.activation.success.message.title": "Succès! Vous avez activé votre compte.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Réinitialisation du mot de passe complétée.",
  "reset.password.success": "Votre mot de passe a été réinitialisé. Connectez-vous à votre compte.",
  "rate.limit.error": "Une erreur s'est produite en raison d'un trop grand nombre de demandes. Veuillez réessayer après un certain temps."
-}
+}
--- a/src/i18n/messages/fr_CA.json
+++ b/src/i18n/messages/fr_CA.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "Votre mot de passe actuel ne répond pas aux nouvelles exigences de sécurité. Nous venons d'envoyer un message de réinitialisation de mot de passe à l'adresse courriel associée à ce compte. Merci de nous aider à protéger vos données.",
  "account.locked.out.message.1": "Pour protéger votre compte, il a été temporairement verrouillé. Réessayez dans 30 minutes.",
  "enterprise.login.btn.text": "Informations d'identification de la compagnie ou de l'école",
-  "username.or.email.format.validation.less.chars.message": "Le nom d'utilisateur ou l'adresse courriel doit comporter au moins 3 caractères.",
+  "username.or.email.format.validation.less.chars.message": "Le nom d'utilisateur ou l'adresse courriel doit comporter au moins 2 caractères.",
  "email.validation.message": "Entrez votre nom d'utilisateur ou votre adresse courriel",
  "password.validation.message": "Les critères de mot de passe n'ont pas été remplis",
  "account.activation.success.message.title": "Succès! Vous avez activé votre compte.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Réinitialisation du mot de passe complétée.",
  "reset.password.success": "Votre mot de passe a été réinitialisé. Connectez-vous à votre compte.",
  "rate.limit.error": "Une erreur s'est produite en raison d'un trop grand nombre de demandes. Veuillez réessayer après un certain temps."
-}
+}
--- a/src/i18n/messages/hi.json
+++ b/src/i18n/messages/hi.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
  "enterprise.login.btn.text": "Company or school credentials",
-  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 2 characters.",
  "email.validation.message": "Enter your username or email",
  "password.validation.message": "Password criteria has not been met",
  "account.activation.success.message.title": "Success! You have activated your account.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Password reset complete.",
  "reset.password.success": "Your password has been reset. Sign in to your account.",
  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
-}
+}
--- a/src/i18n/messages/it.json
+++ b/src/i18n/messages/it.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
  "enterprise.login.btn.text": "Company or school credentials",
-  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 2 characters.",
  "email.validation.message": "Enter your username or email",
  "password.validation.message": "Password criteria has not been met",
  "account.activation.success.message.title": "Success! You have activated your account.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Password reset complete.",
  "reset.password.success": "Your password has been reset. Sign in to your account.",
  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
-}
+}
--- a/src/i18n/messages/it_IT.json
+++ b/src/i18n/messages/it_IT.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "La tua password attuale non soddisfa i nuovi requisiti di sicurezza. Abbiamo appena inviato un messaggio di reimpostazione della password all&#39;indirizzo e-mail associato a questo account. Grazie per averci aiutato a mantenere i tuoi dati al sicuro.",
  "account.locked.out.message.1": "Per proteggere il tuo account, è stato temporaneamente bloccato. Riprova tra 30 minuti.",
  "enterprise.login.btn.text": "Credenziali aziendali o scolastiche",
-  "username.or.email.format.validation.less.chars.message": "Il nome utente o l&#39;e-mail deve contenere almeno 3 caratteri.",
+  "username.or.email.format.validation.less.chars.message": "Il nome utente o l&#39;e-mail deve contenere almeno 2 caratteri.",
  "email.validation.message": "Inserisci il tuo nome utente o e-mail",
  "password.validation.message": "I criteri della password non sono stati soddisfatti",
  "account.activation.success.message.title": "Completato correttamente! Hai attivato il tuo account. ",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Ripristino della password completato.",
  "reset.password.success": "La tua password è stata resettata. Accedi al tuo account.",
  "rate.limit.error": "Si è verificato un errore dovuto alle troppe richieste. Prova di nuovo più tardi."
-}
+}
--- a/src/i18n/messages/pt.json
+++ b/src/i18n/messages/pt.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
  "enterprise.login.btn.text": "Company or school credentials",
-  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 2 characters.",
  "email.validation.message": "Enter your username or email",
  "password.validation.message": "Password criteria has not been met",
  "account.activation.success.message.title": "Success! You have activated your account.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Password reset complete.",
  "reset.password.success": "Your password has been reset. Sign in to your account.",
  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
-}
+}
--- a/src/i18n/messages/pt_PT.json
+++ b/src/i18n/messages/pt_PT.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "A sua palavra-passe atual não satisfaz os novos requisitos de segurança. Acabámos de enviar uma mensagem de redefinição da palavra-passe para o endereço de email associado a esta conta. Obrigado por nos ajudar a manter os seus dados em segurança.",
  "account.locked.out.message.1": "Para proteger sua conta, esta foi temporariamente bloqueada. Tente novamente dentro de 30 minutos.",
  "enterprise.login.btn.text": "Credenciais da empresa ou escola",
-  "username.or.email.format.validation.less.chars.message": "O nome de utilizador ou email deve ter pelo menos 3 carateres.",
+  "username.or.email.format.validation.less.chars.message": "O nome de utilizador ou email deve ter pelo menos 2 carateres.",
  "email.validation.message": "Insira o seu nome de utilizador ou email",
  "password.validation.message": "Os critérios de palavra-passe não foram cumpridos",
  "account.activation.success.message.title": "Sucesso! Você ativou a sua conta.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Redefinição de palavra-passe concluída",
  "reset.password.success": "A sua palavra-passe foi redefinida. Inicie sessão na sua conta.",
  "rate.limit.error": "Ocorreu um erro devido a demasiados pedidos. Por favor, tente novamente após algum tempo."
-}
+}
--- a/src/i18n/messages/ru.json
+++ b/src/i18n/messages/ru.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
  "enterprise.login.btn.text": "Company or school credentials",
-  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 2 characters.",
  "email.validation.message": "Enter your username or email",
  "password.validation.message": "Password criteria has not been met",
  "account.activation.success.message.title": "Success! You have activated your account.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Password reset complete.",
  "reset.password.success": "Your password has been reset. Sign in to your account.",
  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
-}
+}
--- a/src/i18n/messages/uk.json
+++ b/src/i18n/messages/uk.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
  "enterprise.login.btn.text": "Company or school credentials",
-  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 2 characters.",
  "email.validation.message": "Enter your username or email",
  "password.validation.message": "Password criteria has not been met",
  "account.activation.success.message.title": "Success! You have activated your account.",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "Password reset complete.",
  "reset.password.success": "Your password has been reset. Sign in to your account.",
  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
-}
+}
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -71,7 +71,7 @@
  "non.compliant.password.message": "您当前的密码不符合新的安全要求。我们刚刚向与此帐户关联的电子邮件地址发送了密码重置邮件。感谢您帮助我们保护您的数据安全。",
  "account.locked.out.message.1": "为了保护您的帐户，它已被暂时锁定。请在 30 分钟后重试。",
  "enterprise.login.btn.text": "单位或学校证书",
-  "username.or.email.format.validation.less.chars.message": "用户名或电子邮件必须至少包含 3 个字符。",
+  "username.or.email.format.validation.less.chars.message": "用户名或电子邮件必须至少包含 2 个字符。",
  "email.validation.message": "输入您的用户名或电子邮件",
  "password.validation.message": "未满足密码条件",
  "account.activation.success.message.title": "成功！您已激活您的帐户。",
@@ -177,4 +177,4 @@
  "reset.password.success.heading": "密码重置完成。",
  "reset.password.success": "您的密码已重置。登录到您的帐户。",
  "rate.limit.error": "由于请求过多而发生错误。请稍后重试。"
-}
+}
--- a/src/login/LoginPage.jsx
+++ b/src/login/LoginPage.jsx
@@ -147,7 +147,7 @@ class LoginPage extends React.Component {

    if (email === '') {
      errors.emailOrUsername = this.props.intl.formatMessage(messages['email.validation.message']);
-    } else if (email.length < 3) {
+    } else if (email.length < 2) {
      errors.emailOrUsername = this.props.intl.formatMessage(messages['username.or.email.format.validation.less.chars.message']);
    } else {
      errors.emailOrUsername = '';
--- a/src/login/messages.jsx
+++ b/src/login/messages.jsx
@@ -71,8 +71,8 @@ const messages = defineMessages({
  },
  'username.or.email.format.validation.less.chars.message': {
    id: 'username.or.email.format.validation.less.chars.message',
-    defaultMessage: 'Username or email must have at least 3 characters.',
-    description: 'Validation message that appears when username or email address is less than 3 characters',
+    defaultMessage: 'Username or email must have at least 2 characters.',
+    description: 'Validation message that appears when username or email address is less than 2 characters',
  },
  'email.validation.message': {
    id: 'email.validation.message',
--- a/src/login/tests/LoginPage.test.jsx
+++ b/src/login/tests/LoginPage.test.jsx
@@ -128,14 +128,14 @@ describe('LoginPage', () => {
    expect(store.dispatch).toHaveBeenCalledWith(loginRequestFailure({ errorCode: 'invalid-form' }));
  });

-  it('should match state for invalid email (less than 3 characters), on form submission', () => {
-    const errorState = { emailOrUsername: 'Username or email must have at least 3 characters.', password: '' };
+  it('should match state for invalid email (less than 2 characters), on form submission', () => {
+    const errorState = { emailOrUsername: 'Username or email must have at least 2 characters.', password: '' };
    store.dispatch = jest.fn(store.dispatch);

    const loginPage = (mount(reduxWrapper(<IntlLoginPage {...props} />))).find('LoginPage');

    loginPage.find('input#password').simulate('change', { target: { value: 'test', name: 'password' } });
-    loginPage.find('input#emailOrUsername').simulate('change', { target: { value: 'te', name: 'email' } });
+    loginPage.find('input#emailOrUsername').simulate('change', { target: { value: 't', name: 'email' } });
    loginPage.find('button.btn-brand').simulate('click');

    expect(loginPage.state('errors')).toEqual(errorState);
--- a/src/recommendations/ProductCard/BaseCard/index.jsx
+++ b/src/recommendations/ProductCard/BaseCard/index.jsx
@@ -39,8 +39,8 @@ const BaseCard = ({
        />
        <Card.Header
          className="mt-2"
-          title={truncateText(title)}
-          subtitle={truncateText(subtitle)}
+          title={truncateText(title, 50)}
+          subtitle={truncateText(subtitle, 30)}
        />
        <Card.Section className="d-flex">
          <div className="product-badge">
--- a/src/recommendations/data/utils.js
+++ b/src/recommendations/data/utils.js
@@ -47,7 +47,9 @@ export const getVariant = (productType) => (

 export const createCodeFriendlyProduct = (type) => type?.replace(/\s+/g, '-').replace(/'/g, '').toLowerCase();

-export const truncateText = (input) => (input?.length > 50 ? `${input.substring(0, 50)}...` : input);
+export const truncateText = (input, textLength) => (
+  input?.length > textLength ? `${input.substring(0, textLength)}...` : input
+);

 export const filterLocationRestriction = (products, countryCode) => products.filter((product) => {
  if (product.locationRestriction) {
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -172,26 +172,11 @@ const RegistrationPage = (props) => {

  useEffect(() => {
    if (registrationResult.success) {
+      // This event is used by GTM
      sendTrackEvent('edx.bi.user.account.registered.client', {});

-      // Optimizely registration conversion event
-      window.optimizely = window.optimizely || [];
-      window.optimizely.push({
-        type: 'event',
-        eventName: 'authn-registration-conversion',
-      });
-
-      // We probably don't need this cookie because this fires the same event as
-      // above for optimizely using GTM.
-      setCookie(getConfig().REGISTER_CONVERSION_COOKIE_NAME, true);
      // This is used by the "User Retention Rate Event" on GTM
-      setCookie('authn-returning-user');
-
-      // Fire GTM event used for integration with impact.com
-      window.dataLayer = window.dataLayer || [];
-      window.dataLayer.push({
-        event: 'ImpactRegistrationEvent',
-      });
+      setCookie(getConfig().USER_RETENTION_COOKIE_NAME, true);
    }
  }, [registrationResult]);

--- a/src/register/RegistrationPage.test.jsx
+++ b/src/register/RegistrationPage.test.jsx
@@ -59,7 +59,7 @@ describe('RegistrationPage', () => {
  mergeConfig({
    PRIVACY_POLICY: 'https://privacy-policy.com',
    TOS_AND_HONOR_CODE: 'https://tos-and-honot-code.com',
-    REGISTER_CONVERSION_COOKIE_NAME: process.env.REGISTER_CONVERSION_COOKIE_NAME,
+    USER_RETENTION_COOKIE_NAME: 'authn-returning-user',
  });

  let props = {};
@@ -527,7 +527,7 @@ describe('RegistrationPage', () => {
      expect(registrationPage.find('input#password').length).toEqual(0);
    });

-    it('should check registration conversion cookie', () => {
+    it('should check user retention cookie', () => {
      store = mockStore({
        ...initialState,
        register: {
@@ -539,7 +539,7 @@ describe('RegistrationPage', () => {
      });

      renderer.create(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
-      expect(document.cookie).toMatch(`${getConfig().REGISTER_CONVERSION_COOKIE_NAME}=true`);
+      expect(document.cookie).toMatch(`${getConfig().USER_RETENTION_COOKIE_NAME}=true`);
    });

    it('should redirect to url returned in registration result after successful account creation', () => {
--- a/src/register/components/ConfigurableRegistrationForm.test.jsx
+++ b/src/register/components/ConfigurableRegistrationForm.test.jsx
@@ -44,7 +44,6 @@ describe('ConfigurableRegistrationForm', () => {
  mergeConfig({
    PRIVACY_POLICY: 'https://privacy-policy.com',
    TOS_AND_HONOR_CODE: 'https://tos-and-honot-code.com',
-    REGISTER_CONVERSION_COOKIE_NAME: process.env.REGISTER_CONVERSION_COOKIE_NAME,
  });

  let props = {};
--- a/src/register/data/utils.js
+++ b/src/register/data/utils.js
@@ -1,4 +1,4 @@
-import { snakeCaseObject } from '@edx/frontend-platform';
+import { getConfig, snakeCaseObject } from '@edx/frontend-platform';

 import { LETTER_REGEX, NUMBER_REGEX } from '../../data/constants';
 import messages from '../messages';
@@ -44,11 +44,12 @@ export const isFormValid = (
    }
  });

-  if (!configurableFormFields?.country?.displayValue) {
-    fieldErrors.country = formatMessage(messages['empty.country.field.error']);
-    isValid = false;
+  if (getConfig().SHOW_CONFIGURABLE_EDX_FIELDS) {
+    if (!configurableFormFields?.country?.displayValue) {
+      fieldErrors.country = formatMessage(messages['empty.country.field.error']);
+      isValid = false;
+    }
  }
-
  Object.keys(fieldDescriptions).forEach(key => {
    if (key === 'country' && !configurableFormFields.country.displayValue) {
      fieldErrors[key] = formatMessage(messages['empty.country.field.error']);
--- a/src/sass/_base_component.scss
+++ b/src/sass/_base_component.scss
@@ -38,6 +38,11 @@
  max-width: 320px;
 }

+.main-heading {
+  position: relative;
+  z-index: 2;
+}
+
 .complete-your-profile {
  font-weight: 700;
  line-height: 1;
Author	SHA1	Message	Date
Stanislav	48122ff99d	fix: Missed favicon in Safari (#1080 ) Co-authored-by: Stanislav Lunyachek <lunyachek@MacBook-Pro-M1.local>	2023-12-08 10:07:31 +05:00
vladislavkeblysh	3153cff4ff	fix: fixed spacing in tablet version (quince.master) (#1107 )	2023-11-28 11:41:06 +05:00
Ihor Romaniuk	919d98df79	fix: content centering and z-index position on adaptation (#1093 )	2023-11-27 12:26:56 +05:00
Stanislav	c7adcecb8a	fix: Enabling the ability to log in with a username consisting of 2 characters (#1098 ) Co-authored-by: Stanislav Lunyachek <lunyachek@MacBook-Pro-M1.local>	2023-11-22 16:38:24 +05:00
Ghassan Maslamani	db4eeac266	fix: form submission when country is not requried (#1099 ) When country is not required to submit, the displayValue check will always return true. This fixes it by only check it if it's needed through the config `SHOW_CONFIGURABLE_EDX_FIELDS` This issue might has been discoverd at edx.org becuase edx.org requires the Country to be filled when creating an account, however this is not the case for Open edX by default, hence the issue reported below Ref: openedx/wg-build-test-release/issues/318	2023-11-17 09:25:29 -03:00
Syed Ali Abbas Zaidi	60e2119116	chore: bump frontend-platform (#1076 )	2023-10-18 11:23:16 +05:00
Zainab Amir	7b4714a22a	feat: fix recommendations card subtitle (#1070 )	2023-10-06 15:58:29 +05:00
Zainab Amir	332d6abee7	feat: updated default value for USER_RETENTION_COOKIE_NAME (#1059 ) Moved the value to internal configuration VAN-1624	2023-09-12 14:10:43 +05:00
Zainab Amir	4df13cf0b7	feat: remove optimizely event (#1051 ) VAN-1624	2023-09-12 13:32:29 +05:00