Compare commits

..

270 Commits

Author SHA1 Message Date
renovate[bot]
5a3cd93a09 fix(deps): update dependency algoliasearch to v4.23.3 2024-04-11 06:45:25 +00:00
renovate[bot]
d989eba0e1 fix(deps): update dependency @openedx/paragon to v22.2.1 2024-04-11 04:10:33 +00:00
renovate[bot]
00f8ee9c85 chore(deps): update dependency @openedx/frontend-build to v13.1.4 2024-04-11 01:50:57 +00:00
renovate[bot]
01b14d6d30 fix(deps): update font awesome to v6.5.2 2024-04-10 21:29:13 +00:00
renovate[bot]
35dbca7bd1 fix(deps): update dependency @edx/frontend-platform to v7.1.3 2024-04-10 19:15:33 +00:00
renovate[bot]
73579ec53d chore(deps): update dependency babel-plugin-formatjs to v10.5.14 2024-04-10 17:38:23 +00:00
Syed Sajjad Hussain Shah
90ae870a93 fix: codecov not running on PRs (#1213) 2024-04-03 11:28:39 +05:00
Zainab Amir
e9af062ff1 fix: resolve console warnings in tests (#1212) 2024-04-01 01:33:50 -07:00
Syed Sajjad Hussain Shah
60a6c97e22 fix: codecov not running on PRs (#1211) 2024-04-01 11:30:54 +05:00
mubbsharanwar
cd8474465b perf: use useSelector with granular approach in registration component to minimize rendrening 2024-04-01 10:42:55 +05:00
Samir Sabri
2d37b8b0bf feat!: remove Transifex calls for OEP-58 (#1085) 2024-03-20 09:31:09 -04:00
renovate[bot]
05c2caa4d9 fix(deps): update dependency core-js to v3.36.1 2024-03-20 03:45:13 +00:00
renovate[bot]
535a8c543f fix(deps): update dependency @edx/frontend-platform to v7.1.2 2024-03-20 02:22:44 +00:00
Dmytro
dc90cf9ce5 fix: Registration with password that doesn't meet the requirements (#1184)
* fix: Registration with password that doesn't meet the requirements
---------

Co-authored-by: Dima Alipov <dimaalipov@MacBook-Pro-Dima.local>
Co-authored-by: Syed Sajjad  Hussain Shah <ssajjad@2u.com>
2024-03-15 11:53:42 +05:00
Attiya Ishaque
36354761cc feat: Remove simplify registration experiment code (#1194) 2024-03-15 10:58:54 +05:00
renovate[bot]
f53add81f3 fix(deps): update react-router monorepo to v6.22.3 2024-03-08 12:18:55 +00:00
renovate[bot]
bca59ebd40 fix(deps): update dependency algoliasearch-helper to v3.16.3 2024-03-08 10:45:07 +00:00
renovate[bot]
dcb5da42b0 fix(deps): update dependency @edx/frontend-platform to v7.1.1 2024-03-08 06:51:41 +00:00
renovate[bot]
b346c22b57 chore(deps): update codecov/codecov-action action to v4 (#1172)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-07 19:28:01 -08:00
Zainab Amir
8be350e35f Fix TPA skeleton loader (#1189)
* feat: update TPA skeleton
* fix: Prevent wrong appearance of skeleton after second tab click

---------

Co-authored-by: Stanislav Lunyachek <lunyachek@MacBook-Pro-M1.local>
2024-03-06 06:11:54 -08:00
Syed Sajjad Hussain Shah
6695fb6f61 fix: move country field to simplify registration second step (#1195) 2024-03-06 12:21:56 +05:00
Syed Sajjad Hussain Shah
be5b0bb461 fix: invalid form submit btn event error (#1191) 2024-03-05 14:57:10 +05:00
Syed Sajjad Hussain Shah
5f93278326 feat: add invalid form submit click event: (#1190) 2024-03-05 13:13:30 +05:00
Blue
488644f50d fix: remove rebrand experiment from authn (#1187)
Description:
Remove rebrand experiment code from Authn
VAN-1858
2024-03-04 16:14:41 +05:00
Hina Khadim
56bab26018 fix: browser header showing null and replace authn with Authentication (#1185) 2024-03-04 00:53:26 -08:00
Attiya Ishaque
ca42f3851d fix: Fix post registration recommendations card issue (#1183) 2024-03-01 15:25:56 +05:00
Syed Sajjad Hussain Shah
e4bddc2db0 fix: remove password field duplicate validation (#1181) 2024-02-29 17:47:13 +05:00
Syed Sajjad Hussain Shah
8aeacaa001 fix: fix error banner alert (#1180) 2024-02-29 12:14:52 +05:00
Syed Sajjad Hussain Shah
80435d3e5b fix: change submit cta text for experiment (#1179) 2024-02-29 11:25:43 +05:00
Syed Sajjad Hussain Shah
d6c5415c9a feat: add submit btn click event (#1178) 2024-02-28 11:38:07 +05:00
Zainab Amir
0306763eeb feat: update code owner information (#1177) 2024-02-27 06:40:48 -08:00
Zainab Amir
e4ac1288a9 feat: add submit btn click event for default register page (#1176)
Co-authored-by: Syed Sajjad  Hussain Shah <ssajjad@2u.com>
2024-02-27 01:24:52 -08:00
Attiya Ishaque
e1f489838c fix: browser header showing null (#1168) 2024-02-27 12:52:25 +05:00
Syed Sajjad Hussain Shah
9b046146a0 fix: fix simplify registration experiment bugs (#1175) 2024-02-27 10:12:16 +05:00
Syed Sajjad Hussain Shah
e0d605582e fix: fix simplify registration experiment bugs (#1174) 2024-02-26 18:54:16 +05:00
Blue
21b5a01cab fix: Update custom SSO buttons to use brand colors (#1165)
Description: Update custom SSO buttons to use brand colors
VAN-1838
2024-02-26 18:51:12 +05:00
Syed Sajjad Hussain Shah
955ea6485f fix: update comment (#1173) 2024-02-26 17:50:19 +05:00
Syed Sajjad Hussain Shah
9f8a1af7e3 feat: simplify registration experiment (#1164) 2024-02-26 17:22:24 +05:00
renovate[bot]
e617a3ba40 fix(deps): update react-router monorepo to v6.22.1 2024-02-26 12:16:52 +00:00
renovate[bot]
fb3f962039 fix(deps): update dependency react-loading-skeleton to v3.4.0 2024-02-26 11:25:17 +00:00
renovate[bot]
64da54f17c fix(deps): update dependency core-js to v3.36.0 2024-02-26 11:15:39 +00:00
renovate[bot]
74741a1be6 fix(deps): update dependency @edx/frontend-platform to v7.1.0 2024-02-26 10:46:33 +00:00
Stanislav
e9aaf7024a fix: Enabling the ability to log in with a username consisting of 2 characters (#1073)
Co-authored-by: Stanislav Lunyachek <lunyachek@MacBook-Pro-M1.local>
2024-02-15 15:07:24 +05:00
Blue
e3d96385ee fix: remove username and bring in name field for embedded case (#1163)
Description:
Remove username and bring in name field in case embedded registration
VAN-1824
2024-02-14 16:39:31 +05:00
Blue
dc266a613e fix: replace username with name in base component and on welcome page (#1161)
* fix: replace username with fullName in base component and on welcome page
Description: Replace username with name in welcome page component
VAN-1824
2024-02-14 12:12:43 +05:00
Syed Sajjad Hussain Shah
1b5755664c chore: upgrade paragon to v22.1.1 (#1162) 2024-02-14 11:15:26 +05:00
Zainab Amir
02bd8abcd1 feat: update default authn settings (#1160)
At present, Authn MFE doesn't work out of the box with
devstack settings. These changes allow authn to work with
default devstack settings.
2024-02-13 00:54:26 -08:00
Blue
a6e96f5ed1 fix: update paragone and country field (#1157)
Description: Update Paragon version and changed the country field implementation as per documentation
VAN-1814
2024-02-09 16:40:41 +05:00
Attiya Ishaque
872aa48675 feat: modifying the base container in authn (#1153) 2024-02-09 16:15:22 +05:00
Blue
60efe3cbb7 feat: removal of country code selection event (#1129)
Revert country code selection event

VAN-1793
Co-authored-by: Zainab Amir <zainab.amir@arbisoft.com>
2024-02-07 06:09:48 -08:00
Muhammad Abdullah Waheed
167f86c283 fix: updated frontend-build to latest version to fix sharp issue (#1154) 2024-02-06 14:50:41 +05:00
Blue
02d14a6359 fix: country field is not populated on page load (#1151)
Description: Country field is not populated when page load
VAN-1795
2024-02-01 11:20:34 +05:00
Omar Al-Ithawi
a6a473ee5c feat: tutor-mfe compatiblilty for atlas pull (#1152)
- install atlas
 - remove `--filter` to pull all languages by default
 - use ATLAS_OPTIONS to allow custom `--filter`
 - include frontend-platform in `atlas pull`

Refs: FC-0012 OEP-58
2024-01-30 13:05:02 -05:00
renovate[bot]
8be469680d fix(deps): update react-router monorepo to v6.21.3 2024-01-26 11:41:55 +00:00
renovate[bot]
45e84d3f9c fix(deps): update font awesome to v6.5.1 2024-01-26 09:39:53 +00:00
renovate[bot]
d6d71587c7 chore(deps): update dependency babel-plugin-formatjs to v10.5.13 2024-01-26 08:46:38 +00:00
renovate[bot]
6b70692dd4 fix(deps): update dependency redux-saga to v1.3.0 2024-01-26 04:43:47 +00:00
renovate[bot]
a056f241b5 fix(deps): update dependency core-js to v3.35.1 2024-01-26 00:44:08 +00:00
renovate[bot]
115ce8d7c6 fix(deps): update dependency classnames to v2.5.1 2024-01-25 22:09:32 +00:00
renovate[bot]
6e58c13ef5 fix(deps): update dependency @redux-devtools/extension to v3.3.0 2024-01-25 18:00:44 +00:00
renovate[bot]
65e29a021b chore(deps): update dependency jest to v29.7.0 2024-01-25 14:48:39 +00:00
renovate[bot]
6c91f01226 chore(deps): update dependency eslint-plugin-import to v2.29.1 2024-01-25 10:34:20 +00:00
renovate[bot]
36a9ebef8c fix(deps): update dependency regenerator-runtime to v0.14.1 2024-01-25 06:02:01 +00:00
renovate[bot]
5c921fb983 fix(deps): update dependency form-urlencoded to v6.1.4 2024-01-25 04:14:27 +00:00
renovate[bot]
98699b08ad chore(deps): update dependency babel-plugin-formatjs to v10.5.12 2024-01-25 00:39:42 +00:00
renovate[bot]
1f3d1d1aee fix(deps): update dependency algoliasearch-helper to v3.16.2 2024-01-24 22:48:51 +00:00
Brian Smith
fc60d9f7d1 chore(deps): update paragon and frontend-build to openedx scope (#1132) 2024-01-24 10:10:13 -05:00
Zainab Amir
ad7099ad38 Refactor login page to use functional component (#899)
* refactor: zamir/van 1390/add basic login form (#894)
Description: login refactor

* feat: add basic login form
* feat: remove cookie logic from login page

* refactor: refactor social auth, tpahint and institution login (#895)

* feat: add basic login form

* feat: add error handling

* refactor: refactor social auth, tpahint and institution login

Description:

Refactor the following flows:
1 - Institution login
2 - SSO login
3 - Tpahint

VAN-1391

---------

Co-authored-by: Zainab Amir <zainab.amir@arbisoft.com>

* fix: tests and lint issues (#905)

* feat: add tests

* fix: rebase this branch with master
Description:
Rebase with master branch
VAN-1413

* chore: update variable name

* fix: fix When using tpa-hint don't show the login form
Description: When using tpa-hint don't show the login form
VAN-1801

---------

Co-authored-by: Blue <ahtesham-quraish@users.noreply.github.com>
Co-authored-by: ahtesham-quraish <ahtesham.quraish@gmail.com>
2024-01-24 10:44:31 +05:00
mubbsharanwar
2ea9301c5e refactor: depreciate enzyme
move unit test from enzyme to RTL

VAN-1792
2024-01-17 12:37:01 +05:00
Blue
b9b4492de9 feat: check how many users update country on registration form after we auto populate it with IP (#1127)
Description: Check how many users update country on registration form after we auto populate it with IP.
VAN-1793
2024-01-16 12:35:54 +05:00
Attiya Ishaque
d74b5c49d9 feat: add work experience property to the welcome page event (#1125) 2024-01-11 16:00:43 +05:00
Syed Sajjad Hussain Shah
27545ea4b6 refactor: move login unit tests to RTL (#1123)
fix: migrate login tests to RTL
Description:
Migrate login unit tests to RTL
VAN-1770

Co-authored-by: ahtesham-quraish <ahtesham.quraish@gmail.com>
2024-01-05 17:16:31 +05:00
Attiya Ishaque
db3655c843 fix: Migrate Registration tests to RTL (#1122) 2024-01-04 14:33:48 +05:00
Attiya Ishaque
10a10c8ed9 fix: Migrate forgot password and reset password tests to RTL (#1115) 2023-12-26 17:03:27 +05:00
Attiya Ishaque
800a5fc6be fix: Migrate common components tests to RTL (#1117) 2023-12-20 15:25:33 +05:00
Attiya Ishaque
924488c29b fix: Migrate welcome page and recommendations tests to RTL (#1116) 2023-12-19 15:57:51 +05:00
Attiya Ishaque
dae050ecb3 fix: country field error is updated (#1108) 2023-12-08 13:35:03 +05:00
Stanislav
3a31cf33e2 fix: Missed favicon in Safari (#1077)
Co-authored-by: Stanislav Lunyachek <lunyachek@MacBook-Pro-M1.local>
2023-12-08 10:06:39 +05:00
renovate[bot]
66a0d5d840 chore(deps): update dependency iframe-resizer to v4.3.9 2023-12-04 15:34:52 +00:00
renovate[bot]
26caf857bf chore(deps): update dependency babel-plugin-formatjs to v10.5.10 2023-12-04 13:50:50 +00:00
renovate[bot]
fa34eae800 chore(deps): update dependency @edx/frontend-build to v13.0.8 2023-12-04 11:48:51 +00:00
vladislavkeblysh
644b16580d fix: fixed spacing in tablet version (#1062) 2023-11-28 10:47:53 +05:00
Ihor Romaniuk
479dac8397 fix: content centering and z-index position on adaptation (#1094) 2023-11-27 11:44:03 +05:00
Attiya Ishaque
c097b5b831 fix: moved registration tests to specfic files. (#1104) 2023-11-22 13:54:56 +05:00
Moncef Abboud
78722f3e73 feat: implement SHOW_REGISTRATION_LINKS setting 2023-11-21 18:54:39 +05:00
edx-transifex-bot
7f8a270770 chore(i18n): update translations (#1106)
Co-authored-by: Jenkins <sre+jenkins@edx.org>
2023-11-20 12:09:20 +05:00
Syed Sajjad Hussain Shah
4ff14c8731 fix: fix duplicate mfe context calls and cookie set exc (#1103) 2023-11-16 10:44:29 +05:00
edx-transifex-bot
a957973105 chore(i18n): update translations (#1101)
Co-authored-by: Jenkins <sre+jenkins@edx.org>
Co-authored-by: Syed Sajjad Hussain Shah <52817156+syedsajjadkazmii@users.noreply.github.com>
2023-11-15 12:25:29 +05:00
Blue
f0b855d87e fix: add spinner while loading the optional fields in embadded exp (#1102)
Description:
Add spinner while loading the optional fields in embadded exp
VAN-1658
2023-11-14 18:32:39 +05:00
Ghassan Maslamani
446649735d 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-13 12:14:34 -05:00
Mashal Malik
397c237e30 refactor: updated README file to reflect template changes (#1089)
* refactor: updated README file to reflect template changes

* refactor: updated README file to reflect template changes

* refactor: updated README file to reflect template changes

* refactor: update readMe file
2023-11-01 10:58:30 +05:00
Feanil Patel
e10d6b6384 docs: Update the security e-mail address.
This repository is now managed by the Axim Collaborative and security issues
with it should be reported to security@openedx.org instead of security@edx.org

This work is being done as a part of https://github.com/openedx/wg-security/issues/16
2023-10-31 12:42:02 -04:00
Feanil Patel
38c186d5a7 chore: Update to the new version of brand-openedx in the new scope. (#1083)
Part of https://github.com/openedx/axim-engineering/issues/23

This updates the brand alias to point to the package at the `openedx`
scope.  This does not impact imports because this package is used via an
alias.
2023-10-20 17:28:31 -04:00
Syed Ali Abbas Zaidi
55c320a88a chore: bump frontend-platform (#1076) 2023-10-17 12:02:54 +05:00
Muhammad Abdullah Waheed
6ec0a22194 feat: babel-plugin-react-intl to babel-plugin-formatjs migration (#1067)
* feat: babel-plugin-react-intl to babel-plugin-formatjs migration

* fix: upgraded frontend-build to fix security issue
2023-10-13 09:28:29 +05:00
Syed Sajjad Hussain Shah
7bae030713 fix: name field validations (#1069) 2023-10-11 09:44:03 +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
Syed Sajjad Hussain Shah
512deae883 fix: recs skip btn event gets cancelled on redirection (#1058) 2023-09-08 15:37:33 +05:00
Syed Sajjad Hussain Shah
2d11477037 fix: post registration recommendations eventing (#1057) 2023-09-08 15:04:38 +05:00
Zainab Amir
5e15969f4a Recommendations v2 (#1040)
* feat: add personalized recommendations (#1024)

* use Algolia for personalized recommendations
* show personalized recommendations to use that have consented
to functional cookies
* update tests

VAN-1599

* Revert "fix: special characters in redirect url getting decoded to space (#1029)" (#1030)

This reverts commit fc62241332.

* feat: update recommendations page design (#1036)

VAN-1598

* feat: add events for recommendations (#1039)

* feat: remove static recommendations

---------

Co-authored-by: Syed Sajjad Hussain Shah <52817156+syedsajjadkazmii@users.noreply.github.com>
2023-09-08 12:08:41 +05:00
Syed Sajjad Hussain Shah
37e811d7e5 fix: updated optional fields check based on updated response (#1055) 2023-09-07 09:31:19 +05:00
Mashal Malik
a35a1d1ba6 refactor: updated lock file version check to use new workflow (#1048)
Co-authored-by: Muhammad Abdullah Waheed <42172960+abdullahwaheed@users.noreply.github.com>
2023-09-06 14:58:18 +05:00
Syed Sajjad Hussain Shah
41a9c89d71 fix: password validation with correct password value on icon blur (#1054) 2023-09-05 17:52:35 +05:00
Syed Sajjad Hussain Shah
d469102cee refactor: registration component refactoring (#1050)
* refactor: registration component refactoring

* fix: refactored constants
2023-09-05 13:52:25 +05:00
edx-transifex-bot
c685bdd373 chore(i18n): update translations (#1052)
Co-authored-by: Jenkins <sre+jenkins@edx.org>
2023-09-04 16:23:08 +05:00
Emad Rad
daa7ae4d73 feat: Add persian language (#1020)
Co-authored-by: Zainab Amir <zainab.amir@arbisoft.com>
2023-08-30 13:09:40 +05:00
Zainab Amir
c5caaeba60 feat: add registration conversion event (#1049) 2023-08-29 15:22:07 +05:00
Syed Sajjad Hussain Shah
a473d79554 fix: forms data persistence issue (#1046) 2023-08-25 17:48:49 +05:00
Zainab Amir
1b5aa106ab feat: remove hydrate call (#1043) 2023-08-24 12:29:48 +05:00
renovate[bot]
d8b5653224 chore(deps): update dependency @edx/frontend-build to v12.9.8 2023-08-15 22:16:13 +00:00
renovate[bot]
4cc4ff6c4b fix(deps): update react-router monorepo to v6.15.0 2023-08-15 20:09:53 +00:00
renovate[bot]
48a3c57e5f fix(deps): update dependency @edx/paragon to v20.46.2 2023-08-15 15:29:28 +00:00
Syed Ali Abbas Zaidi
efdefc300e feat: upgrade react router to v6 (#936) 2023-08-15 17:23:34 +05:00
Syed Sajjad Hussain Shah
9730a4f55d Revert "fix: special characters in redirect url getting decoded to space (#1029)" (#1030)
This reverts commit fc62241332.
2023-08-15 15:45:31 +05:00
Syed Sajjad Hussain Shah
fc62241332 fix: special characters in redirect url getting decoded to space (#1029) 2023-08-15 13:24:27 +05:00
renovate[bot]
0846001b6d fix(deps): update dependency regenerator-runtime to v0.14.0 2023-08-08 01:57:57 +00:00
renovate[bot]
90658722e1 fix(deps): update dependency @edx/paragon to v20.46.0 2023-08-04 23:08:50 +00:00
renovate[bot]
240752c6cd fix(deps): update dependency @edx/paragon to v20.45.7 2023-08-04 04:27:28 +00:00
renovate[bot]
429d4547e4 fix(deps): update font awesome to v6.4.2 2023-08-03 08:52:23 +00:00
renovate[bot]
e278b5f74a chore(deps): update dependency @edx/frontend-build to v12.9.4 2023-08-02 19:32:04 +00:00
renovate[bot]
a723058bc1 fix(deps): update dependency @edx/paragon to v20.45.6 2023-08-01 16:20:29 +00:00
Shahbaz Shabbir
59fa7d5de3 fix: update username suggestions placement 2023-08-01 19:37:07 +05:00
renovate[bot]
60578189bd fix(deps): update dependency @edx/frontend-platform to v4.6.1 2023-08-01 14:15:25 +00:00
Syed Sajjad Hussain Shah
82cd11e01e refactor: refactor recs dir (#1012) 2023-07-31 16:36:47 +05:00
Blue
4a10540d4a fix: redirection issue fix (#1011)
Description:
Fixed redirection issue
VAN-1573
2023-07-31 15:29:05 +05:00
Blue
aeda262fb0 fix: add location resitriction for popular and trending courses (#1010)
Description:
Filter courses on the basis of location

VAN-1573
2023-07-31 14:47:22 +05:00
Mubbshar Anwar
dff3903617 fix: track event fire multiple times (#1009)
The recommendations group event was firing multiple times due to useEffect dependency because registrationResult is setting in above two useEffects.

VAN-1569
2023-07-31 13:00:53 +05:00
renovate[bot]
1399caf003 chore(deps): update dependency eslint-plugin-import to v2.28.0 2023-07-28 10:31:50 +00:00
renovate[bot]
2dfb6bc528 fix(deps): update dependency core-js to v3.32.0 2023-07-28 01:38:08 +00:00
Mubbshar Anwar
a392395876 feat: Add segments events (#1001)
Add segments events to track popular and trending recommendations stats.

VAN-1569

Co-authored-by: Syed Sajjad Hussain Shah <52817156+syedsajjadkazmii@users.noreply.github.com>
2023-07-27 17:04:08 +05:00
renovate[bot]
5542311c95 chore(deps): update dependency jest to v29.6.2 (#1004)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-27 15:13:30 +05:00
Zainab Amir
21e6bb6eec feat: update static recommendation placement (#1002)
* feat: update static recommendation placement
* refactor: clean recommendation code (#1003)

---------

Co-authored-by: Syed Sajjad Hussain Shah <52817156+syedsajjadkazmii@users.noreply.github.com>
2023-07-27 15:04:56 +05:00
Shahbaz Shabbir
bfa7874108 fix: add popular and trending products lists (#1000) 2023-07-27 10:54:57 +05:00
mubbsharanwar
423958c899 feat: setup optimizely experiment
Setup optimizely experiment for popular and trending recommendations for post registration experience

VAN-1566
2023-07-26 18:30:38 +05:00
Blue
cb380a2031 feat: design change for recommendations (#997)
Description:

Design change for recommendations in which covered all the card type

VAN-1564
2023-07-26 10:49:47 +05:00
renovate[bot]
f4e89efdb4 chore(deps): update dependency @edx/frontend-build to v12.9.3 2023-07-25 12:57:49 +00:00
Mubbshar Anwar
f5cb7a1dbd feat: param based redirection (#993)
On welcome page CTA click redirection would be based on next query param.

VAN-1535
2023-07-25 16:03:41 +05:00
Syed Sajjad Hussain Shah
72e601948c fix: fix accessibility issues in register embedded experience (#996)
VAN-1541, VAN-1551, VAN-1543
2023-07-24 16:18:30 +05:00
renovate[bot]
29e30981ae fix(deps): update dependency @edx/paragon to v20.45.5 2023-07-21 17:03:18 +00:00
Zainab Amir
06a61e6a22 feat: add user retention cookie (#992) 2023-07-21 11:16:14 +05:00
renovate[bot]
1c83020b43 fix(deps): update dependency algoliasearch to v4.19.1 2023-07-20 16:50:53 +00:00
Mubbshar Anwar
fa4a0ac2d5 feat: param based cta and redirection (#984)
Register CTA label and authn redirection would be based on query params.

VAN-1535
2023-07-20 11:43:32 +05:00
renovate[bot]
2addf57cbd chore(deps): update dependency @edx/frontend-build to v12.9.2 2023-07-19 21:50:55 +00:00
renovate[bot]
d521fd20ec fix(deps): update dependency @edx/paragon to v20.45.4 2023-07-19 15:32:23 +00:00
renovate[bot]
38d44ac586 fix(deps): update dependency algoliasearch to v4.19.0 2023-07-18 22:47:36 +00:00
renovate[bot]
4768306f53 chore(deps): update dependency @edx/frontend-build to v12.9.1 2023-07-18 18:39:05 +00:00
renovate[bot]
6c6b527dfc fix(deps): update dependency @edx/paragon to v20.45.3 2023-07-18 12:39:08 +00:00
renovate[bot]
e14c9bd1b7 chore(deps): update dependency @edx/frontend-build to v12.8.67 2023-07-18 07:02:32 +00:00
dependabot[bot]
a2bdc4031b chore(deps): bump semver from 5.7.1 to 5.7.2 (#981)
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-07-17 19:04:57 +05:00
renovate[bot]
8f38eb9e3a fix(deps): update dependency @edx/paragon to v20.45.2 2023-07-17 13:38:21 +00:00
renovate[bot]
c22aa58904 chore(deps): update dependency @edx/frontend-build to v12.8.66 2023-07-17 10:59:27 +00:00
edx-transifex-bot
067bddf892 chore(i18n): update translations (#978)
* chore(i18n): update translations
* feat: add base container tests (#979)

---------

Co-authored-by: Jenkins <sre+jenkins@edx.org>
Co-authored-by: Zainab Amir <zainab.amir@arbisoft.com>
2023-07-17 13:50:14 +05:00
Syed Sajjad Hussain Shah
7e4bccbc29 fix: fix rebrand experiment issue (#976) 2023-07-14 19:14:58 +05:00
renovate[bot]
f39bb35dc8 chore(deps): update dependency @edx/frontend-build to v12.8.64 2023-07-14 03:27:26 +00:00
renovate[bot]
0d760c04b7 chore(deps): update dependency @edx/frontend-build to v12.8.63 2023-07-13 00:22:45 +00:00
renovate[bot]
6f113542f5 chore(deps): update dependency @edx/frontend-build to v12.8.62 2023-07-12 11:26:38 +00:00
renovate[bot]
1e4c342703 chore(deps): update dependency @edx/frontend-build to v12.8.61 2023-07-11 15:33:06 +00:00
renovate[bot]
3ce0585d7e fix(deps): update dependency core-js to v3.31.1 2023-07-11 06:59:31 +00:00
renovate[bot]
5bf6dd6361 fix(deps): update dependency algoliasearch to v4.18.0 2023-07-11 03:33:41 +00:00
renovate[bot]
929abdff69 chore(deps): update dependency jest to v29.6.1 2023-07-11 00:57:30 +00:00
renovate[bot]
f295d69e76 fix(deps): update dependency react-loading-skeleton to v3.3.1 2023-07-10 21:54:41 +00:00
renovate[bot]
32a4c55e4a chore(deps): update dependency babel-plugin-formatjs to v10.5.3 2023-07-10 20:32:20 +00:00
renovate[bot]
615ba91bdb chore(deps): update dependency @edx/frontend-build to v12.8.60 2023-07-10 16:39:31 +00:00
renovate[bot]
dfb2f89a36 fix(deps): update dependency @edx/paragon to v20.45.0 2023-07-10 13:44:30 +00:00
Mashal Malik
c9783234cc feat: update react & react-dom to v17 (#938)
* feat: update react & react-dom to v17

* chore: add enzyme adapter pkg to devDep

* refactor: updated paragon & snapshots

* build: update frontend-platform

---------

Co-authored-by: Bilal Qamar <59555732+BilalQamar95@users.noreply.github.com>
2023-07-10 15:48:14 +05:00
Zainab Amir
0513e6c2de chore: add configs to env file (#962) 2023-06-28 23:40:41 +05:00
Zainab Amir
3cdc0234ef fix: height of image for larger layout (#961) 2023-06-28 20:06:57 +05:00
Zainab Amir
e06d12be07 feat: add optimizely web to authn (#960) 2023-06-28 16:52:25 +05:00
Zainab Amir
56394881fc feat: Add image layout for base container (#959)
- Added image layout base container
- Added config for optimizely experiment
2023-06-28 16:05:26 +05:00
Zainab Amir
61056240c4 refactor: base component name and folder structure (#958) 2023-06-27 14:17:04 +05:00
Zainab Amir
a59e7c548c Revert "feat: hide privacy banner for embedded form (#954)" (#955)
This reverts commit f63d7674e2.
2023-06-23 10:20:44 +05:00
Zainab Amir
f63d7674e2 feat: hide privacy banner for embedded form (#954) 2023-06-22 15:14:18 +05:00
Zainab Amir
fa3a70e9a9 Revert "feat: fire identify call and register event" (#953)
* Revert "feat: fire identify call and register event (#951)
2023-06-22 11:59:22 +05:00
Syed Sajjad Hussain Shah
b817a8d122 fix: hide zendesk widget for embedded experience (#952) 2023-06-21 17:39:07 +05:00
Syed Sajjad Hussain Shah
2a6668cef3 feat: fire identify call and register event (#951)
VAN-1499
2023-06-21 15:36:58 +05:00
Zainab Amir
a802821ae9 feat: keep username suggestion for embedded experience (#950)
* feat: keep username suggestion for embedded experience
2023-06-21 10:30:26 +05:00
Syed Sajjad Hussain Shah
9e13141f6b fix: render embedded experience through pathname (#949) 2023-06-19 13:44:30 +05:00
Blue
4b64ce2534 fix: make host param compulsory (#948)
Description

Make host param compulsory and host should grab from query params when calling postMessage api

VAN-1485
2023-06-16 14:44:34 +05:00
Blue
c550069e11 fix: avoid validations on blur event (#946)
Description:

When authn is embedded in iframe then validations should not runs on blur event it should only run when button is clicked.

VAN-1481
2023-06-16 10:33:59 +05:00
Mubbshar Anwar
1e10e9c89c feat: registration conversion events (#942)
Passing variant property to registration and progressive profiling events to calculate on ramp conversion rate.

VAN-1478
2023-06-16 09:42:04 +05:00
Zainab Amir
cd6c1c0e42 feat: update welcome page logic (#947) 2023-06-15 17:09:52 +05:00
Zainab Amir
5edcee9eb9 feat: allow welcome page to load for embedded experience (#944) 2023-06-15 15:46:34 +05:00
Syed Sajjad Hussain Shah
d41c06b1fd feat: allow embedded experience to open register page for authenticated users (#945)
VAN-1482
2023-06-15 14:42:09 +05:00
Blue
2a2c5abc81 fix: redirect user to welcome page (#939) (#941)
Description
Redirect the user to welcome page after registration, as Authn is embedded in iframe which is located in Hubspot so we call window.postMessage function from Authn which let the Hubspot knows about redirect URL and then reload the welcome page in parent window.

VAN-1474
2023-06-15 12:29:04 +05:00
Syed Sajjad Hussain Shah
ccdd648603 feat: add iframe resizer script (#943)
VAN-1475
2023-06-14 14:43:09 +05:00
Blue
5c1ea04970 fix: change registration form for onramp (#939)
Description:
In this we have changed the regirstation form on the basis of embed query param and hide the multiple things

VAN-1476
2023-06-13 16:10:39 +05:00
Attiya Ishaque
5ebd22f088 fix: remove survery cookie (#937) 2023-06-08 18:56:00 +05:00
Attiya Ishaque
5aec091156 fix: fix console errors on running test (#930) 2023-06-02 17:49:40 +05:00
renovate[bot]
68993cc21f fix(deps): update dependency @edx/paragon to v20.40.2 2023-06-01 11:16:17 +00:00
renovate[bot]
404fc2b36b fix(deps): update dependency @edx/paragon to v20.40.1 2023-05-31 22:04:26 +00:00
renovate[bot]
7bb06d0bfa fix(deps): update dependency @edx/frontend-platform to v4.5.1 2023-05-30 06:52:39 +00:00
renovate[bot]
abbb64b9c7 fix(deps): update dependency @edx/paragon to v20.40.0 2023-05-30 00:53:33 +00:00
renovate[bot]
99ca582c1a fix(deps): update dependency @edx/frontend-platform to v4.5.0 2023-05-29 10:19:49 +00:00
renovate[bot]
3e4cfc1573 fix(deps): update dependency @edx/paragon to v20.39.3 2023-05-29 08:09:07 +00:00
renovate[bot]
5437e1b7e9 chore(deps): update dependency @edx/frontend-build to v12.8.38 2023-05-29 03:58:43 +00:00
Attiya Ishaque
4d33cd7d69 fix: fix design issue in user name suggestion field (#922) 2023-05-24 18:32:02 +05:00
Attiya Ishaque
cb82e94b53 refactor: BEM convention for modules (#907) 2023-05-23 17:21:29 +05:00
renovate[bot]
dbe14ccedf fix(deps): update dependency @edx/frontend-platform to v4.4.0 2023-05-23 00:09:52 +00:00
renovate[bot]
841edf2d24 fix(deps): update dependency @edx/paragon to v20.39.2 2023-05-22 20:34:23 +00:00
Blue
0c375cc50c refactor: BEM convention for common components (#914)
Description:
Need to apply BEM comvention for common components

VAN-1425
2023-05-22 10:47:53 +05:00
renovate[bot]
50072887d0 fix(deps): update dependency @edx/paragon to v20.39.1 2023-05-19 17:49:26 +00:00
Attiya Ishaque
976814d846 fix: fix console error in login and register's test (#909) 2023-05-19 12:39:52 +05:00
Blue
c22024cf66 refactor: BEM convention for reset password (#906)
Description:

Need to implement BEM convention for reset password page

VAN-1423
2023-05-19 11:16:49 +05:00
Syed Sajjad Hussain Shah
829a219b9f fix: bugs in country field (#913)
VAN-1415
2023-05-19 10:03:39 +05:00
renovate[bot]
13d572ab28 fix(deps): update dependency @edx/paragon to v20.39.0 2023-05-18 15:00:59 +00:00
renovate[bot]
c0c2ffa122 fix(deps): update dependency @edx/paragon to v20.37.0 2023-05-17 21:17:46 +00:00
Syed Sajjad Hussain Shah
84c563fda3 refactor: use paragon Autosuggest field for country field (#911)
VAN-1415

Co-authored-by: Syed Sajjad  Hussain Shah <syed.sajjad@H7FKF7K6XD.local>
2023-05-17 13:13:04 +05:00
Syed Sajjad Hussain Shah
97720d6a46 Revert "refactor: use paragon Autosuggest field for country field (#904)" (#910)
This reverts commit 386982d9c4.
2023-05-17 12:31:21 +05:00
Syed Sajjad Hussain Shah
386982d9c4 refactor: use paragon Autosuggest field for country field (#904)
VAN-1415

Co-authored-by: Syed Sajjad  Hussain Shah <syed.sajjad@H7FKF7K6XD.local>
2023-05-17 12:11:27 +05:00
renovate[bot]
cb38a2a148 fix(deps): update dependency @edx/paragon to v20.36.2 2023-05-16 19:17:29 +00:00
renovate[bot]
07f19209bf fix(deps): update dependency @edx/frontend-platform to v4.3.0 2023-05-16 02:33:21 +00:00
renovate[bot]
69c0ca13fc fix(deps): update dependency @edx/paragon to v20.36.1 2023-05-15 18:26:20 +00:00
Jenkins
e49c50f55c chore(i18n): update translations 2023-05-14 11:16:53 -04:00
Syed Sajjad Hussain Shah
f0105f0094 Revert "refactor: use paragon Autosuggest field for country field (#897)" (#900)
This reverts commit 3c89afea4a.
2023-05-12 13:01:22 +05:00
Syed Sajjad Hussain Shah
3c89afea4a refactor: use paragon Autosuggest field for country field (#897)
VAN-1415

Co-authored-by: Syed Sajjad  Hussain Shah <syed.sajjad@H7FKF7K6XD.local>
2023-05-12 12:45:29 +05:00
renovate[bot]
848f574f3f fix(deps): update dependency @edx/paragon to v20.36.0 2023-05-11 04:41:23 +00:00
Blue
ec9e34cea4 fix: add departments in Zendesk widget (#896)
Description:
Add departments list in Zendesk widget configurations

VAN-1426
2023-05-10 16:58:26 +05:00
Omar Al-Ithawi
f9069df4e6 feat: use atlas in make pull_translations (#890)
Changes
-------
 - Move all i18n imports into `src/i18n/index.js` so `intl-imports.js` can
   override it with latest translations
 - Add `atlas` into `make pull_translations` when `OPENEDX_ATLAS_PULL`
   environment variable is set.

Refs: [FC-0012 project](https://openedx.atlassian.net/l/cp/XGS0iCcQ) implementing Translation Infrastructure OEP-58.
2023-05-09 11:12:36 -04:00
renovate[bot]
9035f3eb7e fix(deps): update dependency core-js to v3.30.2 2023-05-08 05:14:07 +00:00
renovate[bot]
e197e788d1 fix(deps): update dependency @edx/paragon to v20.34.0 2023-05-05 19:58:17 +00:00
renovate[bot]
49d33522a8 chore(deps): update dependency @edx/frontend-build to v12.8.27 2023-05-05 17:21:17 +00:00
renovate[bot]
06f0ec3c0b chore(deps): update dependency @edx/frontend-build to v12.8.22 2023-05-04 21:04:47 +00:00
Attiya Ishaque
54319c6949 fix: remove cookie policy banner from authn (#888) 2023-05-04 17:12:21 +05:00
renovate[bot]
86f875ec3e chore(deps): update dependency @edx/frontend-build to v12.8.17 2023-05-03 00:45:13 +00:00
renovate[bot]
754a6ddb12 fix(deps): update dependency @edx/paragon to v20.33.0 2023-05-02 19:39:19 +00:00
Shahbaz Shabbir
62e8f75b96 fix: eliminate the usage of extra OR condition in MFE context API (#882) 2023-05-02 19:17:28 +05:00
Shahbaz Shabbir
c0deb663a6 chore: upgrade the query-string version to 7.1.3 (#869) 2023-05-02 17:08:35 +05:00
Zainab Amir
ce28add152 fix: conditionally initialize optimizely (#862) 2023-05-02 16:11:55 +05:00
renovate[bot]
5f89315947 chore(deps): update dependency babel-plugin-formatjs to v10.5.1 2023-05-01 08:06:15 +00:00
renovate[bot]
56dd194a1a fix(deps): update dependency @edx/paragon to v20.32.3 2023-04-28 08:31:27 +00:00
Attiya Ishaque
adcdcc4c8b chore: remove fortawesome/free-regular-svg-icons package (#867) 2023-04-26 18:39:06 +05:00
renovate[bot]
7fd45f089d chore(deps): update dependency @edx/frontend-build to v12.8.16 2023-04-26 06:17:05 +00:00
renovate[bot]
65d82b2080 fix(deps): update dependency @edx/paragon to v20.32.0 2023-04-24 14:10:11 +00:00
renovate[bot]
f771935e20 fix(deps): update dependency @edx/paragon to v20.31.1 2023-04-24 00:46:26 +00:00
renovate[bot]
70c255fc4f fix(deps): update font awesome to v6.4.0 2023-04-21 00:49:33 +00:00
renovate[bot]
bd1396fc54 fix(deps): update dependency @edx/frontend-platform to v4.2.0 2023-04-20 18:20:03 +00:00
Stanislav
cba5395d5c fix: Remove horizontal scroll in windows (#760) 2023-04-20 17:55:05 +05:00
Zainab Amir
b42c09d919 chore: remove unused lodash dependency (#870) 2023-04-20 14:51:40 +05:00
Blue
b7af2356fa fix: Remove extract-react-intl-messages (#865)
Remove unused package extract-react-intl-messages from package.json

VAN-1378
2023-04-20 14:32:11 +05:00
Syed Sajjad Hussain Shah
22d477e55f fix: import/no-cycle eslint issue (#875)
VAN-1388

Co-authored-by: Syed Sajjad  Hussain Shah <syed.sajjad@H7FKF7K6XD.local>
2023-04-20 12:33:40 +05:00
renovate[bot]
dfa69c27bb chore(deps): update dependency babel-plugin-formatjs to v10.5.0 2023-04-20 05:12:27 +00:00
renovate[bot]
6b78158db2 fix(deps): update dependency reselect to v4.1.8 2023-04-19 23:28:48 +00:00
renovate[bot]
c92cac0eed fix(deps): update dependency react-loading-skeleton to v3.2.1 2023-04-19 19:35:03 +00:00
Attiya Ishaque
b2dce920fa chore: remove semver-regex package (#868) 2023-04-19 20:42:59 +05:00
Attiya Ishaque
44cec762fb fix: replace faSignInAlt with paragon icon (#863) 2023-04-19 16:33:54 +05:00
Shahbaz Shabbir
a98188ead8 fix: change keys to camelCase for mfe_context response (PR# 835) (#857) 2023-04-19 13:03:26 +05:00
Syed Sajjad Hussain Shah
294b1a469f chore: remove sanitize-html package (#866)
VAN-1381

Co-authored-by: Syed Sajjad  Hussain Shah <syed.sajjad@H7FKF7K6XD.local>
2023-04-19 12:21:10 +05:00
Syed Sajjad Hussain Shah
ebed588c1c chore: remove react-onclickoutside package (#864)
VAN-1380

Co-authored-by: Syed Sajjad  Hussain Shah <syed.sajjad@H7FKF7K6XD.local>
2023-04-18 15:13:10 +05:00
Blue
46f8217e1a fix: reset-password code coverage (#855)
Improve the code coverage of reset-password component

VAN-1369
2023-04-18 13:24:59 +05:00
Blue
9ab23cf485 Merge pull request #849 from openedx/ahtesham/VAN-1368/test-coverage-registation
fix: registration test coverage
2023-04-17 15:46:20 +05:00
ahtesham-quraish
7790660fe8 fix: registration test coverage
Increase test coverage of registration flow

VAN-1368
2023-04-17 15:37:53 +05:00
Jenkins
1dd2726beb chore(i18n): update translations 2023-04-16 11:16:49 -04:00
renovate[bot]
ba9ce89d1b fix(deps): update dependency core-js to v3.30.1 2023-04-14 21:03:27 +00:00
renovate[bot]
c9082ac709 chore(deps): update dependency @edx/frontend-build to v12.8.10 2023-04-14 16:39:01 +00:00
renovate[bot]
27c8fa8986 fix(deps): update dependency @edx/frontend-platform to v4.1.0 2023-04-14 16:28:37 +00:00
Syed Sajjad Hussain Shah
a04289d71b Revert "fix: change keys to camelCase for mfe_context response (#835)" (#856)
This reverts commit b0745de672.
2023-04-14 14:43:01 +05:00
Blue
321859e0f5 Merge pull request #854 from openedx/ahtesham/1349/update-conditional-logic
fix: remove conditional logic
2023-04-13 14:34:20 +05:00
ahtesham-quraish
4b4bf413c1 fix: remove conditional logic
Remove conditional logic from autoupdate label as it does not run on master push

VAN-1349
2023-04-13 14:21:14 +05:00
renovate[bot]
06c4f75b4a chore(deps): update dependency eslint-plugin-import to v2.27.5 (#811)
* chore(deps): update dependency eslint-plugin-import to v2.27.5

* fix: fix eslint tests

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: attiyaishaque <atiya.ishaq@arbisoft.com>
2023-04-13 13:41:10 +05:00
Attiya Ishaque
12dd97af61 fix: [VAN-1367] Remove Optimizely web from Authn (#843) 2023-04-13 12:54:29 +05:00
Zainab Amir
8e77197459 fix: update pull translation command (#852) 2023-04-13 12:23:48 +05:00
Zainab Amir
3cc64cada6 fix: nested components in CountryField (#851) 2023-04-13 12:05:32 +05:00
Yoiber
3ac5874df1 chore(i18n): add more languages (#747) 2023-04-13 11:24:38 +05:00
Shahbaz Shabbir
107dd6f360 fix: Update eslint configuration and resolve linting errors and test failures (#847) 2023-04-12 22:52:49 +05:00
Blue
347e0cd336 Merge pull request #850 from openedx/ahtesham/VAN-1349/update-github-token
fix: update github token
2023-04-12 12:20:07 +05:00
ahtesham-quraish
2ba6058ec7 fix: update github token
update github token in autoupdate workflow

VAN-1349
2023-04-12 12:08:59 +05:00
Blue
683aa258b8 Merge pull request #825 from openedx/ahtesham/VAN-1349/add-label-support
fix: add new flag in autoupdate action
2023-04-12 11:59:22 +05:00
ahtesham-quraish
d7ad7e314d fix: add new flag in autoupdate action
trigger autoupdate workflow when autoupdate label is added

VAN-1349
2023-04-12 11:53:53 +05:00
215 changed files with 18452 additions and 19121 deletions

14
.env
View File

@@ -15,22 +15,28 @@ SEGMENT_KEY=''
SITE_NAME=null
INFO_EMAIL=''
# ***** Cookies *****
REGISTER_CONVERSION_COOKIE_NAME=null
USER_SURVEY_COOKIE_NAME=null
USER_RETENTION_COOKIE_NAME=null
# ***** Links *****
LOGIN_ISSUE_SUPPORT_LINK=''
AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK=null
POST_REGISTRATION_REDIRECT_URL=''
SEARCH_CATALOG_URL=''
# ***** Features flags *****
DISABLE_ENTERPRISE_LOGIN=''
ENABLE_COOKIE_POLICY_BANNER=''
ENABLE_DYNAMIC_REGISTRATION_FIELDS=''
ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN=''
ENABLE_PERSONALIZED_RECOMMENDATIONS=''
ENABLE_POST_REGISTRATION_RECOMMENDATIONS=''
MARKETING_EMAILS_OPT_IN=''
SHOW_CONFIGURABLE_EDX_FIELDS=''
ENABLE_IMAGE_LAYOUT=''
# ***** Zendesk related keys *****
ZENDESK_KEY=''
ZENDESK_LOGO_URL=''
# ***** Base Container Images *****
BANNER_IMAGE_LARGE=''
BANNER_IMAGE_MEDIUM=''
BANNER_IMAGE_SMALL=''
BANNER_IMAGE_EXTRA_SMALL=''
# ***** Miscellaneous *****
APP_ID=''
MFE_CONFIG_API_URL=''

View File

@@ -19,17 +19,23 @@ REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
SEGMENT_KEY=''
SITE_NAME='Your Platform Name Here'
INFO_EMAIL='info@example.com'
# ***** Features *****
ENABLE_DYNAMIC_REGISTRATION_FIELDS='true'
ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN='true'
# ***** Cookies *****
REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
SESSION_COOKIE_DOMAIN='localhost'
USER_INFO_COOKIE_NAME='edx-user-info'
USER_SURVEY_COOKIE_NAME='openedx-user-survey-type'
# ***** Links *****
LOGIN_ISSUE_SUPPORT_LINK='http://localhost:18000/login-issue-support-url'
TOS_AND_HONOR_CODE='http://localhost:18000/honor'
TOS_LINK='http://localhost:18000/tos'
PRIVACY_POLICY='http://localhost:18000/privacy'
AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK='http://localhost:1999/welcome'
# ***** Base Container Images *****
BANNER_IMAGE_LARGE=''
BANNER_IMAGE_MEDIUM=''
BANNER_IMAGE_SMALL=''
BANNER_IMAGE_EXTRA_SMALL=''
# ***** Miscellaneous *****
APP_ID=''
MFE_CONFIG_API_URL=''

View File

@@ -1,5 +1,4 @@
# Copy these to the .env.private to enable edX specific functionality on local system
ENABLE_COOKIE_POLICY_BANNER='true'
ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN='true'
MARKETING_EMAILS_OPT_IN='true'
SHOW_CONFIGURABLE_EDX_FIELDS='true'

View File

@@ -16,7 +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'
USER_SURVEY_COOKIE_NAME='openedx-user-survey-type'
REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
APP_ID=''
MFE_CONFIG_API_URL=''

View File

@@ -1,12 +1,12 @@
// eslint-disable-next-line import/no-extraneous-dependencies
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');
module.exports = createConfig('eslint', {
rules: {
// Temporarily update the 'indent', 'template-curly-spacing' and
// 'no-multiple-empty-lines' rules since they are causing eslint
// to fail for no apparent reason since upgrading
// @edx/frontend-build from v3 to v5:
// @openedx/frontend-build from v3 to v5:
// - TypeError: Cannot read property 'range' of null
indent: [
'error',
@@ -48,7 +48,5 @@ module.exports = createConfig('eslint', {
},
],
'function-paren-newline': 'off',
'no-import-assign': 'off',
'react/no-unstable-nested-components': 'off',
},
});

View File

@@ -25,5 +25,5 @@ Include a link to the sandbox for design changes or screenshot for before and af
#### Post-merge Checklist
* [ ] Deploy the changes to prod after verifying on stage or ask **@openedx/vanguards** to do it.
* [ ] Deploy the changes to prod after verifying on stage or ask **@openedx/2u-vanguards** to do it.
* [ ] 🎉 🙌 Celebrate! Thanks for your contribution.

View File

@@ -3,14 +3,18 @@ on:
push:
branches:
- master
pull_request:
types: [ labeled ]
branches:
- master
jobs:
autoupdate:
name: autoupdate
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
steps:
- uses: docker://chinthakagodawita/autoupdate-action:v1
env:
GITHUB_TOKEN: "${{ secrets.CC_GITHUB_TOKEN }}"
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
DRY_RUN: "false"
PR_FILTER: "labelled"
PR_LABELS: "autoupdate"

View File

@@ -10,4 +10,4 @@ on:
jobs:
version-check:
uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
uses: openedx/.github/.github/workflows/lockfile-check.yml@master

1
.gitignore vendored
View File

@@ -18,3 +18,4 @@ temp/babel-plugin-react-intl
*~
/temp
/.vscode
src/i18n/messages

View File

@@ -1,9 +0,0 @@
[main]
host = https://www.transifex.com
[o:open-edx:p:edx-platform:r:frontend-app-authn]
file_filter = src/i18n/messages/<lang>.json
source_file = src/i18n/transifex_input.json
source_lang = en
type = KEYVALUEJSON

View File

@@ -1,2 +1,2 @@
# The following users are the owners of all frontend-app-authn files
* @openedx/vanguards
* @openedx/2u-vanguards

View File

@@ -1,19 +1,17 @@
export TRANSIFEX_RESOURCE = frontend-app-authn
transifex_langs = "ar,fr,es_419,zh_CN,it_IT,pt_PT,de_DE,uk,ru,hi"
intl_imports = ./node_modules/.bin/intl-imports.js
transifex_utils = ./node_modules/.bin/transifex-utils.js
i18n = ./src/i18n
transifex_input = $(i18n)/transifex_input.json
# This directory must match .babelrc .
transifex_temp = ./temp/babel-plugin-react-intl
transifex_temp = ./temp/babel-plugin-formatjs
precommit:
npm run lint
npm audit
requirements:
npm install
npm ci
i18n.extract:
# Pulling display strings from .jsx files into .json files...
@@ -31,22 +29,31 @@ detect_changed_source_translations:
# Checking for changed translations...
git diff --exit-code $(i18n)
# Pushes translations to Transifex. You must run make extract_translations first.
push_translations:
# Pushing strings to Transifex...
tx push -s
# Fetching hashes from Transifex...
./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
# Writing out comments to file...
$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
# Pushing comments to Transifex...
./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
# Pulls translations from Transifex.
pull_translations:
tx pull -t -f --mode reviewed --languages=$(transifex_langs)
rm -rf src/i18n/messages
mkdir src/i18n/messages
cd src/i18n/messages \
&& atlas pull $(ATLAS_OPTIONS) \
translations/paragon/src/i18n/messages:paragon \
translations/frontend-platform/src/i18n/messages:frontend-platform \
translations/frontend-app-authn/src/i18n/messages:frontend-app-authn
# This target is used by CI.
$(intl_imports) paragon frontend-platform frontend-app-authn
# This target is used by Travis.
validate-no-uncommitted-package-lock-changes:
# Checking for package-lock.json changes...
git diff --exit-code package-lock.json
.PHONY: validate
validate:
make validate-no-uncommitted-package-lock-changes
npm run i18n_extract
npm run lint -- --max-warnings 0
npm run test
npm run build
.PHONY: validate.ci
validate.ci:
npm ci
make validate

View File

@@ -1,12 +1,12 @@
##################
frontend-app-authn
##################
|Build Status| |ci-badge| |Codecov| |semantic-release|
frontend-app-authn
====================
Please tag **@openedx/vanguards** on any PRs or issues. Thanks!
Introduction
------------
********
Purpose
********
This is a micro-frontend application responsible for the login, registration and password reset functionality.
@@ -22,9 +22,12 @@ This is a micro-frontend application responsible for the login, registration and
- Progressive profiling page
***************
Getting Started
***************
Installation
------------
============
This MFE is bundled with `Devstack <https://github.com/openedx/devstack>`_, see the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ section for setup instructions.
@@ -46,7 +49,7 @@ This MFE is bundled with `Devstack <https://github.com/openedx/devstack>`_, see
**Note:** Follow `Enable social auth locally <docs/how_tos/enable_social_auth.rst>`_ for enabling Social Sign-on Buttons (SSO) locally
Environment Variables/Setup Notes
---------------------------------
=================================
This MFE is configured via environment variables supplied at build time. All micro-frontends have a shared set of required environment variables, as documented in the Open edX Developer Guide under `Required Environment Variables <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
@@ -112,12 +115,13 @@ The authentication micro-frontend also requires the following additional variabl
- Name of MFE, this will be used by the API to get runtime configurations for the specific micro frontend. For a frontend repo `frontend-app-appName`, use `appName` as APP_ID.
- ``authn`` | ``''``
* - ``ENABLE_COOKIE_POLICY_BANNER``
- Enables support for displaying the cookies acceptance banner.
- ``true`` | ``''`` (empty strings are falsy)
* - ``ENABLE_IMAGE_LAYOUT``
- Enables the image layout feature within the authn. When set to True, this feature allows the inclusion of images in the base container layout. For more details on configuring this feature, please refer to the `Modifying base container <docs/how_tos/modifying_base_container.rst>`_.
- ``true`` | ``''`` (empty strings are falsy)
edX-specific Environment Variables
**********************************
==================================
Furthermore, there are several edX-specific environment variables that enable integrations with closed-source services private to the edX organization, and might be unsupported in Open edX.
@@ -141,7 +145,8 @@ For more information see the document: `Micro-frontend applications in Open
edX <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
How To Contribute
------------
=================
Contributions are very welcome, and strongly encouraged! We've
put together `some documentation that describes our contribution process <https://edx.readthedocs.org/projects/edx-developer-guide/en/latest/process/index.html>`_.
@@ -152,34 +157,58 @@ can find it it at `PULL_REQUEST_TEMPLATE.md <https://github.com/openedx/frontend
This project is currently accepting all types of contributions, bug fixes and security fixes.
Open edX Code of Conduct
------------------------
Getting Help
============
If you're having trouble, we have discussion forums at
https://discuss.openedx.org where you can connect with others in the community.
Our real-time conversations are on Slack. You can request a `Slack
invitation`_, then join our `community Slack workspace`_. Because this is a
frontend repository, the best place to discuss it would be in the `#wg-frontend
channel`_.
For anything non-trivial, the best path is to open an issue in this repository
with as many details about the issue you are facing as you can provide.
https://github.com/openedx/frontend-app-authn/issues
For more information about these options, see the `Getting Help`_ page.
.. _Slack invitation: https://openedx.org/slack
.. _community Slack workspace: https://openedx.slack.com/
.. _#wg-frontend channel: https://openedx.slack.com/archives/C04BM6YC7A6
.. _Getting Help: https://openedx.org/community/connect
The Open edX Code of Conduct
============================
All community members are expected to follow the `Open edX Code of Conduct <https://openedx.org/code-of-conduct/>`_.
People
------
======
The assigned maintainers for this component and other project details may be
found in `Backstage <https://backstage.openedx.org/catalog/default/group/vanguards>`_. Backstage pulls this data from the ``catalog-info.yaml``
found in `Backstage <https://backstage.openedx.org/catalog/default/group/2u-vanguards>`_. Backstage pulls this data from the ``catalog-info.yaml``
file in this repo.
Reporting Security Issues
-------------------------
=========================
Please do not report security issues in public. Please email security@edx.org.
Please do not report security issues in public. Please email security@openedx.org.
Known Issues
------------
============
None
License
-------
=======
The code in this repository is licensed under the GNU Affero General Public License v3.0, unless
otherwise noted.
Please see `LICENSE <https://github.com/openedx/frontend-app-authn/blob/master/LICENSE>`_ for details.
==============================
.. |Build Status| image:: https://api.travis-ci.com/edx/frontend-app-authn.svg?branch=master

View File

@@ -13,6 +13,6 @@ metadata:
annotations:
openedx.org/arch-interest-groups: ""
spec:
owner: group:vanguards
owner: group:2u-vanguards
type: 'service'
lifecycle: 'production'

View File

@@ -0,0 +1,39 @@
========================================
Modifying the Base Container in Authn
========================================
The base container in Authn serves as the fundamental layout structure for rendering different components based on configurations. This document outlines the process for modifying the base container to accommodate changes or customize layouts as needed.
Understanding Base Container Versions
--------------------------------------
The base container supports two main versions:
- **Default Layout:** The default layout is the standard layout used when specific configurations do not dictate otherwise.
.. image:: ../images/default_layout.png
- **Image Layout:** The image layout is an alternative layout option that can be enabled based on configurations.
.. image:: ../images/image_layout.png
Enabling the Image Layout
---------------------------
To activate the image layout feature, navigate to your .env file and update the configurations:
**Update Configuration**
Locate the ``ENABLE_IMAGE_LAYOUT`` parameter and set its value to ``true``. Additionally, ensure that the Image configuration settings are provided. Your overall configurations should resemble the following:
.. code-block::
# ***** Image Layout Configuration *****
ENABLE_IMAGE_LAYOUT = True # Set to True to enable image layout feature
# ***** Base Container Images *****
BANNER_IMAGE_LARGE='' # Path to the large banner image
BANNER_IMAGE_MEDIUM='' # Path to the medium-sized banner image
BANNER_IMAGE_SMALL='' # Path to the small banner image
BANNER_IMAGE_EXTRA_SMALL='' # Path to the extra-small banner image
This allows for the customization and adaptation of the base container layout according to specific requirements.

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 MiB

View File

@@ -1,4 +1,4 @@
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');
module.exports = createConfig('jest', {
setupFiles: [

View File

@@ -3,6 +3,6 @@
nick: Authn MFE
oeps: {}
owner: openedx/vanguards
owner: openedx/2u-vanguards
openedx-release:
ref: master

20524
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -11,7 +11,7 @@
],
"scripts": {
"build": "fedx-scripts webpack",
"i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
"i18n_extract": "fedx-scripts formatjs extract",
"lint": "fedx-scripts eslint --ext .js --ext .jsx .",
"snapshot": "fedx-scripts jest --updateSnapshot",
"start": "fedx-scripts webpack-dev-server --progress",
@@ -32,60 +32,54 @@
"url": "https://github.com/openedx/frontend-app-authn/issues"
},
"dependencies": {
"@edx/brand": "npm:@edx/brand-openedx@1.2.0",
"@edx/frontend-component-cookie-policy-banner": "2.2.2",
"@edx/frontend-platform": "4.2.0",
"@edx/paragon": "20.30.1",
"@fortawesome/fontawesome-svg-core": "6.2.1",
"@fortawesome/free-brands-svg-icons": "6.2.1",
"@fortawesome/free-regular-svg-icons": "6.2.1",
"@fortawesome/free-solid-svg-icons": "6.2.1",
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/frontend-platform": "7.1.3",
"@edx/openedx-atlas": "^0.6.0",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-brands-svg-icons": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
"@fortawesome/react-fontawesome": "0.2.0",
"@openedx/paragon": "^22.1.1",
"@optimizely/react-sdk": "^2.9.1",
"@redux-devtools/extension": "3.2.5",
"@redux-devtools/extension": "3.3.0",
"@testing-library/react": "^12.1.5",
"@testing-library/react-hooks": "^8.0.1",
"algoliasearch": "^4.14.3",
"classnames": "2.3.2",
"core-js": "3.30.0",
"extract-react-intl-messages": "4.1.1",
"algoliasearch-helper": "^3.14.0",
"classnames": "2.5.1",
"core-js": "3.36.1",
"fastest-levenshtein": "1.0.16",
"form-urlencoded": "6.1.0",
"lodash.camelcase": "4.3.0",
"lodash.snakecase": "4.1.1",
"form-urlencoded": "6.1.4",
"prop-types": "15.8.1",
"query-string": "5.1.1",
"react": "16.14.0",
"react-dom": "16.14.0",
"query-string": "7.1.3",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-helmet": "6.1.0",
"react-loading-skeleton": "3.2.0",
"react-onclickoutside": "6.13.0",
"react-loading-skeleton": "3.4.0",
"react-redux": "7.2.9",
"react-responsive": "8.2.0",
"react-router": "5.3.4",
"react-router-dom": "5.3.4",
"react-router": "6.22.3",
"react-router-dom": "6.22.3",
"react-zendesk": "^0.1.13",
"redux": "4.2.0",
"redux-logger": "3.0.6",
"redux-mock-store": "1.5.4",
"redux-saga": "1.2.3",
"redux-saga": "1.3.0",
"redux-thunk": "2.4.2",
"regenerator-runtime": "0.13.11",
"reselect": "4.1.7",
"sanitize-html": "2.10.0",
"semver-regex": "3.1.4",
"regenerator-runtime": "0.14.1",
"reselect": "4.1.8",
"universal-cookie": "4.0.4"
},
"devDependencies": {
"@edx/browserslist-config": "^1.1.1",
"@edx/frontend-build": "12.8.6",
"@edx/reactifex": "1.1.0",
"babel-plugin-formatjs": "10.4.0",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.7",
"eslint-plugin-import": "2.26.0",
"@openedx/frontend-build": "13.1.4",
"babel-plugin-formatjs": "10.5.14",
"eslint-plugin-import": "2.29.1",
"glob": "7.2.3",
"history": "5.3.0",
"husky": "7.0.4",
"jest": "29.5.0",
"react-test-renderer": "16.14.0"
"jest": "29.7.0",
"react-test-renderer": "^17.0.2"
}
}

View File

@@ -1,10 +1,15 @@
<!doctype html>
<html lang="en-us">
<head>
<title>Authn | <%= process.env.SITE_NAME %></title>
<title><%= (process.env.SITE_NAME && process.env.SITE_NAME != 'null') ? 'Authentication | ' + process.env.SITE_NAME : 'Authentication' %></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" />
<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.9/iframeResizer.contentWindow.min.js"
integrity="sha512-mdT/HQRzoRP4laVz49Mndx6rcCGA3IhuyhP3gaY0E9sZPkwbtDk9ttQIq9o8qGCf5VvJv1Xsy3k2yTjfUoczqw=="
crossorigin="anonymous"
referrerpolicy="no-referrer">
</script>
<% if (process.env.OPTIMIZELY_URL) { %>
<script
src="<%= process.env.OPTIMIZELY_URL %>"

View File

@@ -3,10 +3,10 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { AppProvider } from '@edx/frontend-platform/react';
import { Helmet } from 'react-helmet';
import { Redirect, Route, Switch } from 'react-router-dom';
import { Navigate, Route, Routes } from 'react-router-dom';
import {
Logistration, NotFoundPage, registerIcons, UnAuthOnlyRoute, Zendesk,
EmbeddedRegistrationRoute, NotFoundPage, registerIcons, UnAuthOnlyRoute, Zendesk,
} from './common-components';
import configureStore from './data/configureStore';
import {
@@ -15,14 +15,18 @@ import {
PAGE_NOT_FOUND,
PASSWORD_RESET_CONFIRM,
RECOMMENDATIONS,
REGISTER_EMBEDDED_PAGE,
REGISTER_PAGE,
RESET_PAGE,
} from './data/constants';
import { updatePathWithQueryParams } from './data/utils';
import { ForgotPasswordPage } from './forgot-password';
import Logistration from './logistration/Logistration';
import { ProgressiveProfiling } from './progressive-profiling';
import { RecommendationsPage } from './recommendations';
import { RegistrationPage } from './register';
import { ResetPasswordPage } from './reset-password';
import './index.scss';
registerIcons();
@@ -33,21 +37,26 @@ const MainApp = () => (
<link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
</Helmet>
{getConfig().ZENDESK_KEY && <Zendesk />}
<Switch>
<Route exact path="/">
<Redirect to={updatePathWithQueryParams(REGISTER_PAGE)} />
</Route>
<UnAuthOnlyRoute exact path={LOGIN_PAGE} render={() => <Logistration selectedPage={LOGIN_PAGE} />} />
<UnAuthOnlyRoute exact path={REGISTER_PAGE} component={Logistration} />
<UnAuthOnlyRoute exact path={RESET_PAGE} component={ForgotPasswordPage} />
<Route exact path={PASSWORD_RESET_CONFIRM} component={ResetPasswordPage} />
<Route exact path={AUTHN_PROGRESSIVE_PROFILING} component={ProgressiveProfiling} />
<Route exact path={RECOMMENDATIONS} component={RecommendationsPage} />
<Route path={PAGE_NOT_FOUND} component={NotFoundPage} />
<Route path="*">
<Redirect to={PAGE_NOT_FOUND} />
</Route>
</Switch>
<Routes>
<Route path="/" element={<Navigate replace to={updatePathWithQueryParams(REGISTER_PAGE)} />} />
<Route
path={REGISTER_EMBEDDED_PAGE}
element={<EmbeddedRegistrationRoute><RegistrationPage /></EmbeddedRegistrationRoute>}
/>
<Route
path={LOGIN_PAGE}
element={
<UnAuthOnlyRoute><Logistration selectedPage={LOGIN_PAGE} /></UnAuthOnlyRoute>
}
/>
<Route path={REGISTER_PAGE} element={<UnAuthOnlyRoute><Logistration /></UnAuthOnlyRoute>} />
<Route path={RESET_PAGE} element={<UnAuthOnlyRoute><ForgotPasswordPage /></UnAuthOnlyRoute>} />
<Route path={PASSWORD_RESET_CONFIRM} element={<ResetPasswordPage />} />
<Route path={AUTHN_PROGRESSIVE_PROFILING} element={<ProgressiveProfiling />} />
<Route path={RECOMMENDATIONS} element={<RecommendationsPage />} />
<Route path={PAGE_NOT_FOUND} element={<NotFoundPage />} />
<Route path="*" element={<Navigate replace to={PAGE_NOT_FOUND} />} />
</Routes>
</AppProvider>
);

View File

@@ -1,55 +0,0 @@
import React from 'react';
import CookiePolicyBanner from '@edx/frontend-component-cookie-policy-banner';
import { getConfig } from '@edx/frontend-platform';
import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
import { getLocale } from '@edx/frontend-platform/i18n';
import { breakpoints } from '@edx/paragon';
import classNames from 'classnames';
import PropTypes from 'prop-types';
import MediaQuery from 'react-responsive';
import AuthLargeLayout from './AuthLargeLayout';
import AuthMediumLayout from './AuthMediumLayout';
import AuthSmallLayout from './AuthSmallLayout';
import LargeLayout from './LargeLayout';
import MediumLayout from './MediumLayout';
import SmallLayout from './SmallLayout';
const BaseComponent = ({ children, showWelcomeBanner }) => {
const authenticatedUser = showWelcomeBanner ? getAuthenticatedUser() : null;
const username = authenticatedUser ? authenticatedUser.username : null;
return (
<>
{getConfig().ENABLE_COOKIE_POLICY_BANNER ? <CookiePolicyBanner languageCode={getLocale()} /> : null}
<div className="col-md-12 extra-large-screen-top-stripe" />
<div className="layout">
<MediaQuery maxWidth={breakpoints.small.maxWidth - 1}>
{authenticatedUser ? <AuthSmallLayout username={username} /> : <SmallLayout />}
</MediaQuery>
<MediaQuery minWidth={breakpoints.medium.minWidth} maxWidth={breakpoints.large.maxWidth - 1}>
{authenticatedUser ? <AuthMediumLayout username={username} /> : <MediumLayout />}
</MediaQuery>
<MediaQuery minWidth={breakpoints.extraLarge.minWidth} maxWidth={breakpoints.extraExtraLarge.maxWidth}>
{authenticatedUser ? <AuthLargeLayout username={username} /> : <LargeLayout />}
</MediaQuery>
<div className={classNames('content', { 'align-items-center mt-0': authenticatedUser })}>
{children}
</div>
</div>
</>
);
};
BaseComponent.defaultProps = {
showWelcomeBanner: false,
};
BaseComponent.propTypes = {
children: PropTypes.node.isRequired,
showWelcomeBanner: PropTypes.bool,
};
export default BaseComponent;

View File

@@ -1,2 +0,0 @@
/* eslint-disable import/prefer-default-export */
export { default as BaseComponent } from './BaseComponent';

View File

@@ -1,52 +0,0 @@
import React from 'react';
import { IntlProvider } from '@edx/frontend-platform/i18n';
import { mount } from 'enzyme';
import LargeLayout from '../LargeLayout';
import MediumLayout from '../MediumLayout';
import SmallLayout from '../SmallLayout';
describe('ScreenLayout', () => {
it('should display the form, pass as a child in SmallScreenLayout', () => {
const smallScreen = mount(
<IntlProvider locale="en">
<div>
<SmallLayout />
<form>
<input type="text" />
</form>
</div>
</IntlProvider>,
);
expect(smallScreen.find('form').exists()).toEqual(true);
});
it('should display the form, pass as a child in MediumScreenLayout', () => {
const mediumScreen = mount(
<IntlProvider locale="en">
<div>
<MediumLayout />
<form>
<input type="text" />
</form>
</div>
</IntlProvider>,
);
expect(mediumScreen.find('form').exists()).toEqual(true);
});
it('should display the form, pass as a child in LargeScreenLayout', () => {
const largeScreen = mount(
<IntlProvider locale="en">
<div>
<LargeLayout />
<form>
<input type="text" />
</form>
</div>
</IntlProvider>,
);
expect(largeScreen.find('form').exists()).toEqual(true);
});
});

View File

@@ -0,0 +1,50 @@
import React from 'react';
import { IntlProvider } from '@edx/frontend-platform/i18n';
import { render, screen } from '@testing-library/react';
import { DefaultLargeLayout, DefaultMediumLayout, DefaultSmallLayout } from './index';
describe('Default Layout tests', () => {
it('should display the form passed as a child in SmallScreenLayout', () => {
render(
<IntlProvider locale="en">
<div>
<DefaultSmallLayout />
<form aria-label="form">
<input type="text" />
</form>
</div>
</IntlProvider>,
);
expect(screen.getByRole('form')).toBeDefined();
});
it('should display the form passed as a child in MediumScreenLayout', () => {
render(
<IntlProvider locale="en">
<div>
<DefaultMediumLayout />
<form aria-label="form">
<input type="text" />
</form>
</div>
</IntlProvider>,
);
expect(screen.getByRole('form')).toBeDefined();
});
it('should display the form passed as a child in LargeScreenLayout', () => {
render(
<IntlProvider locale="en">
<div>
<DefaultLargeLayout />
<form aria-label="form">
<input type="text" />
</form>
</div>
</IntlProvider>,
);
expect(screen.getByRole('form')).toBeDefined();
});
});

View File

@@ -2,7 +2,7 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Hyperlink, Image } from '@edx/paragon';
import { Hyperlink, Image } from '@openedx/paragon';
import classNames from 'classnames';
import messages from './messages';

View File

@@ -2,7 +2,7 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Hyperlink, Image } from '@edx/paragon';
import { Hyperlink, Image } from '@openedx/paragon';
import classNames from 'classnames';
import messages from './messages';

View File

@@ -2,7 +2,7 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Hyperlink, Image } from '@edx/paragon';
import { Hyperlink, Image } from '@openedx/paragon';
import classNames from 'classnames';
import messages from './messages';

View File

@@ -0,0 +1,3 @@
export { default as DefaultLargeLayout } from './LargeLayout';
export { default as DefaultMediumLayout } from './MediumLayout';
export { default as DefaultSmallLayout } from './SmallLayout';

View File

@@ -0,0 +1,16 @@
import { defineMessages } from '@edx/frontend-platform/i18n';
const messages = defineMessages({
'start.learning': {
id: 'start.learning',
defaultMessage: 'Start learning',
description: 'Header text for logistration MFE pages',
},
'with.site.name': {
id: 'with.site.name',
defaultMessage: 'with {siteName}',
description: 'Header text with site name for logistration MFE pages',
},
});
export default messages;

View File

@@ -0,0 +1,34 @@
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Hyperlink, Image } from '@openedx/paragon';
import messages from './messages';
const ExtraSmallLayout = () => {
const { formatMessage } = useIntl();
return (
<span
className="w-100 bg-primary-500 banner__image extra-small-layout"
style={{ backgroundImage: `url(${getConfig().BANNER_IMAGE_EXTRA_SMALL})` }}
>
<Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
<Image className="company-logo" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
</Hyperlink>
<div className="ml-4.5 mr-1 pb-3.5 pt-3.5">
<h1 className="banner__heading">
<span className="text-light-500">
{formatMessage(messages['your.career.turning.point'])}{' '}
</span>
<span className="text-warning-300">
{formatMessage(messages['is.here'])}
</span>
</h1>
</div>
</span>
);
};
export default ExtraSmallLayout;

View File

@@ -0,0 +1,35 @@
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Hyperlink, Image } from '@openedx/paragon';
import './index.scss';
import messages from './messages';
const LargeLayout = () => {
const { formatMessage } = useIntl();
return (
<div
className="w-50 bg-primary-500 banner__image large-layout"
style={{ backgroundImage: `url(${getConfig().BANNER_IMAGE_LARGE})` }}
>
<Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
<Image className="company-logo position-absolute" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
</Hyperlink>
<div className="min-vh-100 p-5 d-flex align-items-end">
<h1 className="display-2 mw-sm mb-3 d-flex flex-column flex-shrink-0 justify-content-center">
<span className="text-light-500">
{formatMessage(messages['your.career.turning.point'])}
</span>
<span className="text-warning-300">
{formatMessage(messages['is.here'])}
</span>
</h1>
</div>
</div>
);
};
export default LargeLayout;

View File

@@ -0,0 +1,35 @@
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Hyperlink, Image } from '@openedx/paragon';
import './index.scss';
import messages from './messages';
const MediumLayout = () => {
const { formatMessage } = useIntl();
return (
<div
className="w-100 mb-3 bg-primary-500 banner__image medium-layout"
style={{ backgroundImage: `url(${getConfig().BANNER_IMAGE_MEDIUM})` }}
>
<Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
<Image className="company-logo" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
</Hyperlink>
<div className="ml-5 pb-4 pt-4">
<h1 className="display-2 banner__heading">
<span className="text-light-500">
{formatMessage(messages['your.career.turning.point'])}{' '}
</span>
<span className="text-warning-300 d-inline-block">
{formatMessage(messages['is.here'])}
</span>
</h1>
</div>
</div>
);
};
export default MediumLayout;

View File

@@ -0,0 +1,34 @@
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Hyperlink, Image } from '@openedx/paragon';
import messages from './messages';
const SmallLayout = () => {
const { formatMessage } = useIntl();
return (
<span
className="w-100 bg-primary-500 banner__image small-layout"
style={{ backgroundImage: `url(${getConfig().BANNER_IMAGE_SMALL})` }}
>
<Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
<Image className="company-logo" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
</Hyperlink>
<div className="ml-5 mr-1 pb-3.5 pt-3.5">
<h1 className="display-2">
<span className="text-light-500">
{formatMessage(messages['your.career.turning.point'])}{' '}
</span>
<span className="text-warning-300">
{formatMessage(messages['is.here'])}
</span>
</h1>
</div>
</span>
);
};
export default SmallLayout;

View File

@@ -0,0 +1,4 @@
export { default as ImageLargeLayout } from './LargeLayout';
export { default as ImageMediumLayout } from './MediumLayout';
export { default as ImageSmallLayout } from './SmallLayout';
export { default as ImageExtraSmallLayout } from './ExtraSmallLayout';

View File

@@ -0,0 +1,37 @@
.company-logo {
width: 71px;
margin-top: 2rem;
margin-left: 1.5rem;
}
@media (max-width: 576px) {
.company-logo {
width: 44.67px;
margin-top: 1.25rem;
margin-left: 1.5rem;
}
}
.banner__image {
background-size: cover;
background-repeat: no-repeat;
border:none;
}
@media (min-width: 464px) and (max-width: 575.98px) {
.banner__heading {
font-size: 60px;
font-weight: 700;
line-height: 60px;
letter-spacing: -1.2px;
}
}
@media (min-width: 768px) and (max-width: 800px) {
.banner__heading {
font-size: 60px !important;
font-weight: 700 !important;
line-height: 60px !important;
letter-spacing: -2px !important;
}
}

View File

@@ -0,0 +1,16 @@
import { defineMessages } from '@edx/frontend-platform/i18n';
const messages = defineMessages({
'your.career.turning.point': {
id: 'your.career.turning.point',
defaultMessage: 'Your career turning point',
description: 'Part of the heading "Your career turning point is here." shown on Authn MFE',
},
'is.here': {
id: 'is.here',
defaultMessage: 'is here.',
description: 'Part of the heading "Your career turning point is here." shown on Authn MFE',
},
});
export default messages;

View File

@@ -2,12 +2,12 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Hyperlink, Image } from '@edx/paragon';
import { Hyperlink, Image } from '@openedx/paragon';
import PropTypes from 'prop-types';
import messages from './messages';
const AuthLargeLayout = ({ username }) => {
const LargeLayout = ({ fullName }) => {
const { formatMessage } = useIntl();
return (
@@ -20,7 +20,7 @@ const AuthLargeLayout = ({ username }) => {
<div className="large-screen-left-container mr-n4.5 large-yellow-line mt-5" />
<div>
<h1 className="welcome-to-platform data-hj-suppress">
{formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
{formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, fullName })}
</h1>
<h2 className="complete-your-profile">
{formatMessage(messages['complete.your.profile.1'])}
@@ -42,8 +42,8 @@ const AuthLargeLayout = ({ username }) => {
);
};
AuthLargeLayout.propTypes = {
username: PropTypes.string.isRequired,
LargeLayout.propTypes = {
fullName: PropTypes.string.isRequired,
};
export default AuthLargeLayout;
export default LargeLayout;

View File

@@ -2,12 +2,12 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Hyperlink, Image } from '@edx/paragon';
import { Hyperlink, Image } from '@openedx/paragon';
import PropTypes from 'prop-types';
import messages from './messages';
const AuthMediumLayout = ({ username }) => {
const MediumLayout = ({ fullName }) => {
const { formatMessage } = useIntl();
return (
@@ -22,7 +22,7 @@ const AuthMediumLayout = ({ username }) => {
<div className="medium-yellow-line mt-5 mr-n2" />
<div>
<h1 className="h3 data-hj-suppress mw-320">
{formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
{formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, fullName })}
</h1>
<h2 className="display-1">
{formatMessage(messages['complete.your.profile.1'])}
@@ -45,8 +45,8 @@ const AuthMediumLayout = ({ username }) => {
);
};
AuthMediumLayout.propTypes = {
username: PropTypes.string.isRequired,
MediumLayout.propTypes = {
fullName: PropTypes.string.isRequired,
};
export default AuthMediumLayout;
export default MediumLayout;

View File

@@ -2,12 +2,12 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Hyperlink, Image } from '@edx/paragon';
import { Hyperlink, Image } from '@openedx/paragon';
import PropTypes from 'prop-types';
import messages from './messages';
const AuthSmallLayout = ({ username }) => {
const SmallLayout = ({ fullName }) => {
const { formatMessage } = useIntl();
return (
@@ -20,7 +20,7 @@ const AuthSmallLayout = ({ username }) => {
<div className="small-yellow-line mt-4.5" />
<div>
<h1 className="h5 data-hj-suppress">
{formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
{formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, fullName })}
</h1>
<h2 className="h1">
{formatMessage(messages['complete.your.profile.1'])}
@@ -34,8 +34,8 @@ const AuthSmallLayout = ({ username }) => {
);
};
AuthSmallLayout.propTypes = {
username: PropTypes.string.isRequired,
SmallLayout.propTypes = {
fullName: PropTypes.string.isRequired,
};
export default AuthSmallLayout;
export default SmallLayout;

View File

@@ -0,0 +1,3 @@
export { default as AuthLargeLayout } from './LargeLayout';
export { default as AuthMediumLayout } from './MediumLayout';
export { default as AuthSmallLayout } from './SmallLayout';

View File

@@ -1,17 +1,11 @@
import { defineMessages } from '@edx/frontend-platform/i18n';
const messages = defineMessages({
'start.learning': {
id: 'start.learning',
defaultMessage: 'Start learning',
description: 'Header text for logistration MFE pages',
'welcome.to.platform': {
id: 'welcome.to.platform',
defaultMessage: 'Welcome to {siteName}, {fullName}!',
description: 'Welcome message that appears on progressive profile page',
},
'with.site.name': {
id: 'with.site.name',
defaultMessage: 'with {siteName}',
description: 'Header text with site name for logistration MFE pages',
},
// authenticated user base component text
'complete.your.profile.1': {
id: 'complete.your.profile.1',
defaultMessage: 'Complete',
@@ -22,11 +16,6 @@ const messages = defineMessages({
defaultMessage: 'your profile',
description: 'part of text "complete your profile"',
},
'welcome.to.platform': {
id: 'welcome.to.platform',
defaultMessage: 'Welcome to {siteName}, {username}!',
description: 'Welcome message that appears on progressive profile page',
},
});
export default messages;

View File

@@ -0,0 +1,72 @@
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { breakpoints } from '@openedx/paragon';
import classNames from 'classnames';
import PropTypes from 'prop-types';
import MediaQuery from 'react-responsive';
import { DefaultLargeLayout, DefaultMediumLayout, DefaultSmallLayout } from './components/default-layout';
import {
ImageExtraSmallLayout, ImageLargeLayout, ImageMediumLayout, ImageSmallLayout,
} from './components/image-layout';
import { AuthLargeLayout, AuthMediumLayout, AuthSmallLayout } from './components/welcome-page-layout';
const BaseContainer = ({ children, showWelcomeBanner, fullName }) => {
const enableImageLayout = getConfig().ENABLE_IMAGE_LAYOUT;
if (enableImageLayout) {
return (
<div className="layout">
<MediaQuery maxWidth={breakpoints.extraSmall.maxWidth - 1}>
{showWelcomeBanner ? <AuthSmallLayout fullName={fullName} /> : <ImageExtraSmallLayout />}
</MediaQuery>
<MediaQuery minWidth={breakpoints.small.minWidth} maxWidth={breakpoints.small.maxWidth - 1}>
{showWelcomeBanner ? <AuthSmallLayout fullName={fullName} /> : <ImageSmallLayout />}
</MediaQuery>
<MediaQuery minWidth={breakpoints.medium.minWidth} maxWidth={breakpoints.large.maxWidth - 1}>
{showWelcomeBanner ? <AuthMediumLayout fullName={fullName} /> : <ImageMediumLayout />}
</MediaQuery>
<MediaQuery minWidth={breakpoints.extraLarge.minWidth}>
{showWelcomeBanner ? <AuthLargeLayout fullName={fullName} /> : <ImageLargeLayout />}
</MediaQuery>
<div className={classNames('content', { 'align-items-center mt-0': showWelcomeBanner })}>
{children}
</div>
</div>
);
}
return (
<>
<div className="col-md-12 extra-large-screen-top-stripe" />
<div className="layout">
<MediaQuery maxWidth={breakpoints.small.maxWidth - 1}>
{showWelcomeBanner ? <AuthSmallLayout fullName={fullName} /> : <DefaultSmallLayout />}
</MediaQuery>
<MediaQuery minWidth={breakpoints.medium.minWidth} maxWidth={breakpoints.large.maxWidth - 1}>
{showWelcomeBanner ? <AuthMediumLayout fullName={fullName} /> : <DefaultMediumLayout />}
</MediaQuery>
<MediaQuery minWidth={breakpoints.extraLarge.minWidth}>
{showWelcomeBanner ? <AuthLargeLayout fullName={fullName} /> : <DefaultLargeLayout />}
</MediaQuery>
<div className={classNames('content', { 'align-items-center mt-0': showWelcomeBanner })}>
{children}
</div>
</div>
</>
);
};
BaseContainer.defaultProps = {
showWelcomeBanner: false,
fullName: null,
};
BaseContainer.propTypes = {
children: PropTypes.node.isRequired,
showWelcomeBanner: PropTypes.bool,
fullName: PropTypes.string,
};
export default BaseContainer;

View File

@@ -0,0 +1,46 @@
import React from 'react';
import { mergeConfig } from '@edx/frontend-platform';
import { IntlProvider } from '@edx/frontend-platform/i18n';
import { render } from '@testing-library/react';
import { Context as ResponsiveContext } from 'react-responsive';
import BaseContainer from '../index';
const LargeScreen = {
wrappingComponent: ResponsiveContext.Provider,
wrappingComponentProps: { value: { width: 1200 } },
};
describe('Base component tests', () => {
it('should show default layout', () => {
const { container } = render(
<IntlProvider locale="en">
<BaseContainer>
<div>Test Content</div>
</BaseContainer>
</IntlProvider>,
LargeScreen,
);
expect(container.querySelector('.banner__image')).toBeNull();
expect(container.querySelector('.large-screen-svg-primary')).toBeDefined();
});
it('renders Image layout when ENABLE_IMAGE_LAYOUT configuration is enabled', () => {
mergeConfig({
ENABLE_IMAGE_LAYOUT: true,
});
const { container } = render(
<IntlProvider locale="en">
<BaseContainer showWelcomeBanner={false}>
<div>Test Content</div>
</BaseContainer>
</IntlProvider>,
LargeScreen,
);
expect(container.querySelector('.banner__image')).toBeDefined();
});
});

View File

@@ -0,0 +1,28 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Navigate } from 'react-router-dom';
import { PAGE_NOT_FOUND } from '../data/constants';
import { isHostAvailableInQueryParams } from '../data/utils';
/**
* This wrapper redirects the requester to embedded register page only if host
* query param is present.
*/
const EmbeddedRegistrationRoute = ({ children }) => {
const registrationEmbedded = isHostAvailableInQueryParams();
// Show registration page for embedded experience even if the user is authenticated
if (registrationEmbedded) {
return children;
}
return <Navigate to={PAGE_NOT_FOUND} replace />;
};
EmbeddedRegistrationRoute.propTypes = {
children: PropTypes.node.isRequired,
};
export default EmbeddedRegistrationRoute;

View File

@@ -2,15 +2,16 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import {
Button, Form,
} from '@edx/paragon';
import { faSignInAlt } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
Icon,
} from '@openedx/paragon';
import { Login } from '@openedx/paragon/icons';
import PropTypes from 'prop-types';
import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
import messages from './messages';
import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
/**
* This component renders the Single sign-on (SSO) button only for the tpa provider passed
@@ -18,7 +19,8 @@ import messages from './messages';
const EnterpriseSSO = (props) => {
const { formatMessage } = useIntl();
const tpaProvider = props.provider;
const disablePublicAccountCreation = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false;
const hideRegistrationLink = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false
|| getConfig().SHOW_REGISTRATION_LINKS === false;
const handleSubmit = (e, url) => {
e.preventDefault();
@@ -47,16 +49,18 @@ const EnterpriseSSO = (props) => {
>
{tpaProvider.iconImage ? (
<div aria-hidden="true">
<img className="icon-image" src={tpaProvider.iconImage} alt={`icon ${tpaProvider.name}`} />
<img className="btn-tpa__image-icon" src={tpaProvider.iconImage} alt={`icon ${tpaProvider.name}`} />
<span className="pl-2" aria-hidden="true">{ tpaProvider.name }</span>
</div>
)
: (
<>
<div className="font-container" aria-hidden="true">
<FontAwesomeIcon
icon={SUPPORTED_ICON_CLASSES.includes(tpaProvider.iconClass) ? ['fab', tpaProvider.iconClass] : faSignInAlt}
/>
<div className="btn-tpa__font-container" aria-hidden="true">
{SUPPORTED_ICON_CLASSES.includes(tpaProvider.iconClass) ? (
<FontAwesomeIcon icon={['fab', tpaProvider.iconClass]} />)
: (
<Icon className="h-75" src={Login} />
)}
</div>
<span className="pl-2" aria-hidden="true">{ tpaProvider.name }</span>
</>
@@ -71,7 +75,7 @@ const EnterpriseSSO = (props) => {
className="w-100"
onClick={(e) => handleClick(e)}
>
{disablePublicAccountCreation
{hideRegistrationLink
? formatMessage(messages['enterprisetpa.login.button.text.public.account.creation.disabled'])
: formatMessage(messages['enterprisetpa.login.button.text'])}
</Button>

View File

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
import {
Form, TransitionReplace,
} from '@edx/paragon';
} from '@openedx/paragon';
import PropTypes from 'prop-types';
const FormGroup = (props) => {
@@ -27,7 +27,7 @@ const FormGroup = (props) => {
readOnly={props.readOnly}
type={props.type}
aria-invalid={props.errorMessage !== ''}
className="form-field"
className="form-group__form-field"
autoComplete={props.autoComplete}
spellCheck={props.spellCheck}
name={props.name}

View File

@@ -2,8 +2,8 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Button, Hyperlink, Icon } from '@edx/paragon';
import { Institution } from '@edx/paragon/icons';
import { Button, Hyperlink, Icon } from '@openedx/paragon';
import { Institution } from '@openedx/paragon/icons';
import PropTypes from 'prop-types';
import messages from './messages';
@@ -42,7 +42,7 @@ const InstitutionLogistration = props => {
<>
<div className="d-flex justify-content-left mb-4 mt-2">
<div className="flex-column">
<h4 className="mb-2 font-weight-bold institute-heading">
<h4 className="mb-2 font-weight-bold institutions__heading">
{headingTitle}
</h4>
<p className="mb-2">
@@ -57,7 +57,7 @@ const InstitutionLogistration = props => {
<tr key={provider} className="pgn__data-table-row">
<td>
<Hyperlink
className="btn nav-item p-0 mb-1 secondary-provider-link"
className="btn nav-item p-0 mb-1 institutions--provider-link"
destination={lmsBaseUrl + provider.loginUrl}
>
{provider.name}

View File

@@ -1,41 +1,103 @@
import React, { useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { useIntl } from '@edx/frontend-platform/i18n';
import {
Form, Icon, IconButton, OverlayTrigger, Tooltip, useToggle,
} from '@edx/paragon';
} from '@openedx/paragon';
import {
Check, Remove, Visibility, VisibilityOff,
} from '@edx/paragon/icons';
} from '@openedx/paragon/icons';
import PropTypes from 'prop-types';
import { LETTER_REGEX, NUMBER_REGEX } from '../data/constants';
import messages from './messages';
import { LETTER_REGEX, NUMBER_REGEX } from '../data/constants';
import { clearRegistrationBackendError, fetchRealtimeValidations } from '../register/data/actions';
import { validatePasswordField } from '../register/data/utils';
const PasswordField = (props) => {
const { formatMessage } = useIntl();
const dispatch = useDispatch();
const validationApiRateLimited = useSelector(state => state.register.validationApiRateLimited);
const [isPasswordHidden, setHiddenTrue, setHiddenFalse] = useToggle(true);
const [showTooltip, setShowTooltip] = useState(false);
const handleBlur = (e) => {
if (props.handleBlur) { props.handleBlur(e); }
const { name, value } = e.target;
if (name === props.name && e.relatedTarget?.name === 'passwordIcon') {
return; // Do not run validations on password icon click
}
let passwordValue = value;
if (name === 'passwordIcon') {
// To validate actual password value when onBlur is triggered by focusing out the password icon
passwordValue = props.value;
}
if (props.handleBlur) {
props.handleBlur({
target: {
name: props.name,
value: passwordValue,
},
});
}
setShowTooltip(props.showRequirements && false);
if (props.handleErrorChange) { // If rendering from register page
const fieldError = validatePasswordField(passwordValue, formatMessage);
if (fieldError) {
props.handleErrorChange('password', fieldError);
} else if (!validationApiRateLimited) {
dispatch(fetchRealtimeValidations({ password: passwordValue }));
}
}
};
const handleFocus = (e) => {
if (e.target?.name === 'passwordIcon') {
return; // Do not clear error on password icon focus
}
if (props.handleFocus) {
props.handleFocus(e);
}
if (props.handleErrorChange) {
props.handleErrorChange('password', '');
dispatch(clearRegistrationBackendError('password'));
}
setTimeout(() => setShowTooltip(props.showRequirements && true), 150);
};
const HideButton = (
<IconButton onFocus={handleFocus} onBlur={handleBlur} name="password" src={VisibilityOff} iconAs={Icon} onClick={setHiddenTrue} size="sm" variant="secondary" alt={formatMessage(messages['hide.password'])} />
<IconButton
onFocus={handleFocus}
onBlur={handleBlur}
name="passwordIcon"
src={VisibilityOff}
iconAs={Icon}
onClick={setHiddenTrue}
size="sm"
variant="secondary"
alt={formatMessage(messages['hide.password'])}
/>
);
const ShowButton = (
<IconButton onFocus={handleFocus} onBlur={handleBlur} name="password" src={Visibility} iconAs={Icon} onClick={setHiddenFalse} size="sm" variant="secondary" alt={formatMessage(messages['show.password'])} />
<IconButton
onFocus={handleFocus}
onBlur={handleBlur}
name="passwordIcon"
src={Visibility}
iconAs={Icon}
onClick={setHiddenFalse}
size="sm"
variant="secondary"
alt={formatMessage(messages['show.password'])}
/>
);
const placement = window.innerWidth < 768 ? 'top' : 'left';
const tooltip = (
<Tooltip id={`password-requirement-${placement}`}>
@@ -59,7 +121,7 @@ const PasswordField = (props) => {
<OverlayTrigger key="tooltip" placement={placement} overlay={tooltip} show={showTooltip}>
<Form.Control
as="input"
className="form-field"
className="form-group__form-field"
type={isPasswordHidden ? 'password' : 'text'}
name={props.name}
value={props.value}
@@ -76,7 +138,7 @@ const PasswordField = (props) => {
{props.errorMessage !== '' && (
<Form.Control.Feedback key="error" className="form-text-size" hasIcon={false} feedback-for={props.name} type="invalid">
{props.errorMessage}
<span className="sr-only">{formatMessage(messages['password.sr.only.helping.text'])}</span>
{props.showScreenReaderText && <span className="sr-only">{formatMessage(messages['password.sr.only.helping.text'])}</span>}
</Form.Control.Feedback>
)}
</Form.Group>
@@ -89,7 +151,9 @@ PasswordField.defaultProps = {
handleBlur: null,
handleFocus: null,
handleChange: () => {},
handleErrorChange: null,
showRequirements: true,
showScreenReaderText: true,
autoComplete: null,
};
@@ -100,10 +164,12 @@ PasswordField.propTypes = {
handleBlur: PropTypes.func,
handleFocus: PropTypes.func,
handleChange: PropTypes.func,
handleErrorChange: PropTypes.func,
name: PropTypes.string.isRequired,
showRequirements: PropTypes.bool,
value: PropTypes.string.isRequired,
autoComplete: PropTypes.string,
showScreenReaderText: PropTypes.bool,
};
export default PasswordField;

View File

@@ -1,14 +1,15 @@
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import PropTypes from 'prop-types';
import { Redirect } from 'react-router-dom';
import { Navigate } from 'react-router-dom';
import { AUTHN_PROGRESSIVE_PROFILING, RECOMMENDATIONS } from '../data/constants';
import {
AUTHN_PROGRESSIVE_PROFILING, RECOMMENDATIONS, REDIRECT,
} from '../data/constants';
import { setCookie } from '../data/utils';
const RedirectLogistration = (props) => {
const {
authenticatedUser,
finishAuthUrl,
redirectUrl,
redirectToProgressiveProfilingPage,
@@ -17,6 +18,8 @@ const RedirectLogistration = (props) => {
redirectToRecommendationsPage,
educationLevel,
userId,
registrationEmbedded,
host,
} = props;
let finalRedirectUrl = '';
@@ -35,15 +38,24 @@ const RedirectLogistration = (props) => {
if (redirectToProgressiveProfilingPage) {
// TODO: Do we still need this cookie?
setCookie('van-504-returning-user', true);
if (registrationEmbedded) {
window.parent.postMessage({
action: REDIRECT,
redirectUrl: getConfig().POST_REGISTRATION_REDIRECT_URL,
}, host);
return null;
}
const registrationResult = { redirectUrl: finalRedirectUrl, success };
return (
<Redirect to={{
pathname: AUTHN_PROGRESSIVE_PROFILING,
state: {
<Navigate
to={AUTHN_PROGRESSIVE_PROFILING}
state={{
registrationResult,
optionalFields,
},
}}
authenticatedUser,
}}
replace
/>
);
}
@@ -52,14 +64,14 @@ const RedirectLogistration = (props) => {
if (redirectToRecommendationsPage) {
const registrationResult = { redirectUrl: finalRedirectUrl, success };
return (
<Redirect to={{
pathname: RECOMMENDATIONS,
state: {
<Navigate
to={RECOMMENDATIONS}
state={{
registrationResult,
educationLevel,
userId,
},
}}
}}
replace
/>
);
}
@@ -71,6 +83,7 @@ const RedirectLogistration = (props) => {
};
RedirectLogistration.defaultProps = {
authenticatedUser: {},
educationLevel: null,
finishAuthUrl: null,
success: false,
@@ -79,9 +92,12 @@ RedirectLogistration.defaultProps = {
optionalFields: {},
redirectToRecommendationsPage: false,
userId: null,
registrationEmbedded: false,
host: '',
};
RedirectLogistration.propTypes = {
authenticatedUser: PropTypes.shape({}),
educationLevel: PropTypes.string,
finishAuthUrl: PropTypes.string,
success: PropTypes.bool,
@@ -90,6 +106,8 @@ RedirectLogistration.propTypes = {
optionalFields: PropTypes.shape({}),
redirectToRecommendationsPage: PropTypes.bool,
userId: PropTypes.number,
registrationEmbedded: PropTypes.bool,
host: PropTypes.string,
};
export default RedirectLogistration;

View File

@@ -2,12 +2,13 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { faSignInAlt } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { Icon } from '@openedx/paragon';
import { Login } from '@openedx/paragon/icons';
import PropTypes from 'prop-types';
import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
import messages from './messages';
import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
const SocialAuthProviders = (props) => {
const { formatMessage } = useIntl();
@@ -31,14 +32,16 @@ const SocialAuthProviders = (props) => {
>
{provider.iconImage ? (
<div aria-hidden="true">
<img className="icon-image" src={provider.iconImage} alt={`icon ${provider.name}`} />
<img className="btn-tpa__image-icon" src={provider.iconImage} alt={`icon ${provider.name}`} />
</div>
)
: (
<div className="font-container" aria-hidden="true">
<FontAwesomeIcon
icon={SUPPORTED_ICON_CLASSES.includes(provider.iconClass) ? ['fab', provider.iconClass] : faSignInAlt}
/>
<div className="btn-tpa__font-container" aria-hidden="true">
{SUPPORTED_ICON_CLASSES.includes(provider.iconClass) ? (
<FontAwesomeIcon icon={['fab', provider.iconClass]} />)
: (
<Icon className="h-75" src={Login} />
)}
</div>
)}
<span id="provider-name" className="notranslate mr-auto pl-2" aria-hidden="true">{provider.name}</span>

View File

@@ -2,17 +2,23 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import {
Hyperlink, Icon,
} from '@openedx/paragon';
import { Institution } from '@openedx/paragon/icons';
import classNames from 'classnames';
import PropTypes from 'prop-types';
import Skeleton from 'react-loading-skeleton';
import messages from './messages';
import {
ENTERPRISE_LOGIN_URL, LOGIN_PAGE, PENDING_STATE, REGISTER_PAGE,
} from '../data/constants';
import {
RenderInstitutionButton,
SocialAuthProviders,
} from '../common-components';
import {
PENDING_STATE, REGISTER_PAGE,
} from '../data/constants';
import messages from './messages';
} from './index';
/**
* This component renders the Single sign-on (SSO) buttons for the providers passed.
@@ -20,33 +26,59 @@ import messages from './messages';
const ThirdPartyAuth = (props) => {
const { formatMessage } = useIntl();
const {
providers, secondaryProviders, currentProvider, handleInstitutionLogin, thirdPartyAuthApiStatus,
providers,
secondaryProviders,
currentProvider,
handleInstitutionLogin,
thirdPartyAuthApiStatus,
isLoginPage,
} = props;
const isInstitutionAuthActive = !!secondaryProviders.length && !currentProvider;
const isSocialAuthActive = !!providers.length && !currentProvider;
const isEnterpriseLoginDisabled = getConfig().DISABLE_ENTERPRISE_LOGIN;
const enterpriseLoginURL = getConfig().LMS_BASE_URL + ENTERPRISE_LOGIN_URL;
return (
<>
{((isEnterpriseLoginDisabled && isInstitutionAuthActive) || isSocialAuthActive) && (
<div className="mt-4 mb-3 h4">
{formatMessage(messages['registration.other.options.heading'])}
{isLoginPage
? formatMessage(messages['login.other.options.heading'])
: formatMessage(messages['registration.other.options.heading'])}
</div>
)}
{(isLoginPage && !isEnterpriseLoginDisabled && isSocialAuthActive) && (
<Hyperlink
className={classNames(
'btn btn-link btn-sm text-body p-0',
{ 'mb-0': thirdPartyAuthApiStatus === PENDING_STATE },
{ 'mb-4': thirdPartyAuthApiStatus !== PENDING_STATE },
)}
destination={enterpriseLoginURL}
>
<Icon src={Institution} className="institute-icon" />
{formatMessage(messages['enterprise.login.btn.text'])}
</Hyperlink>
)}
{thirdPartyAuthApiStatus === PENDING_STATE ? (
<Skeleton className="tpa-skeleton" height={36} count={2} />
<div className="mt-4">
<Skeleton className="tpa-skeleton" height={36} count={2} />
</div>
) : (
<>
{(isEnterpriseLoginDisabled && isInstitutionAuthActive) && (
<RenderInstitutionButton
onSubmitHandler={handleInstitutionLogin}
buttonTitle={formatMessage(messages['register.institution.login.button'])}
buttonTitle={formatMessage(messages['institution.login.button'])}
/>
)}
{isSocialAuthActive && (
<div className="row m-0">
<SocialAuthProviders socialAuthProviders={providers} referrer={REGISTER_PAGE} />
<SocialAuthProviders
socialAuthProviders={providers}
referrer={isLoginPage ? LOGIN_PAGE : REGISTER_PAGE}
/>
</div>
)}
</>
@@ -59,7 +91,8 @@ ThirdPartyAuth.defaultProps = {
currentProvider: null,
providers: [],
secondaryProviders: [],
thirdPartyAuthApiStatus: 'pending',
thirdPartyAuthApiStatus: PENDING_STATE,
isLoginPage: false,
};
ThirdPartyAuth.propTypes = {
@@ -86,6 +119,7 @@ ThirdPartyAuth.propTypes = {
}),
),
thirdPartyAuthApiStatus: PropTypes.string,
isLoginPage: PropTypes.bool,
};
export default ThirdPartyAuth;

View File

@@ -2,11 +2,11 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Alert } from '@edx/paragon';
import { Alert } from '@openedx/paragon';
import PropTypes from 'prop-types';
import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
import messages from './messages';
import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
const ThirdPartyAuthAlert = (props) => {
const { formatMessage } = useIntl();

View File

@@ -1,16 +1,18 @@
import React, { useEffect, useState } from 'react';
import { useEffect, useState } from 'react';
import { getConfig } from '@edx/frontend-platform';
import { fetchAuthenticatedUser, getAuthenticatedUser } from '@edx/frontend-platform/auth';
import { Route } from 'react-router-dom';
import PropTypes from 'prop-types';
import { DEFAULT_REDIRECT_URL } from '../data/constants';
import {
DEFAULT_REDIRECT_URL,
} from '../data/constants';
/**
* This wrapper redirects the requester to our default redirect url if they are
* already authenticated.
*/
const UnAuthOnlyRoute = (props) => {
const UnAuthOnlyRoute = ({ children }) => {
const [authUser, setAuthUser] = useState({});
const [isReady, setIsReady] = useState(false);
@@ -27,10 +29,14 @@ const UnAuthOnlyRoute = (props) => {
return null;
}
return <Route {...props} />;
return children;
}
return null;
};
UnAuthOnlyRoute.propTypes = {
children: PropTypes.node.isRequired,
};
export default UnAuthOnlyRoute;

View File

@@ -5,6 +5,7 @@ import { useIntl } from '@edx/frontend-platform/i18n';
import Zendesk from 'react-zendesk';
import messages from './messages';
import { REGISTER_EMBEDDED_PAGE } from '../data/constants';
const ZendeskHelp = () => {
const { formatMessage } = useIntl();
@@ -16,6 +17,9 @@ const ZendeskHelp = () => {
},
chat: {
suppress: false,
departments: {
enabled: ['account settings', 'billing and payments', 'certificates', 'deadlines', 'errors and technical issues', 'other', 'proctoring'],
},
},
contactForm: {
ticketForms: [
@@ -45,6 +49,10 @@ const ZendeskHelp = () => {
},
};
if (window.location.pathname === REGISTER_EMBEDDED_PAGE) {
return null;
}
return (
<Zendesk defer zendeskKey={getConfig().ZENDESK_KEY} {...setting} />
);

View File

@@ -1,11 +1,15 @@
import { COMPLETE_STATE, PENDING_STATE } from '../../data/constants';
import { THIRD_PARTY_AUTH_CONTEXT, THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG } from './actions';
import { COMPLETE_STATE, FAILURE_STATE, PENDING_STATE } from '../../data/constants';
export const defaultState = {
fieldDescriptions: {},
optionalFields: {},
optionalFields: {
fields: {},
extended_profile: [],
},
thirdPartyAuthApiStatus: null,
thirdPartyAuthContext: {
autoSubmitRegForm: false,
currentProvider: null,
finishAuthUrl: null,
countryCode: null,
@@ -13,6 +17,7 @@ export const defaultState = {
secondaryProviders: [],
pipelineUserDetails: null,
errorMessage: null,
welcomePageRedirectUrl: null,
},
};
@@ -26,7 +31,7 @@ const reducer = (state = defaultState, action = {}) => {
case THIRD_PARTY_AUTH_CONTEXT.SUCCESS: {
return {
...state,
fieldDescriptions: action.payload.fieldDescriptions.fields,
fieldDescriptions: action.payload.fieldDescriptions?.fields,
optionalFields: action.payload.optionalFields,
thirdPartyAuthContext: action.payload.thirdPartyAuthContext,
thirdPartyAuthApiStatus: COMPLETE_STATE,
@@ -35,7 +40,11 @@ const reducer = (state = defaultState, action = {}) => {
case THIRD_PARTY_AUTH_CONTEXT.FAILURE:
return {
...state,
thirdPartyAuthApiStatus: COMPLETE_STATE,
thirdPartyAuthApiStatus: FAILURE_STATE,
thirdPartyAuthContext: {
...state.thirdPartyAuthContext,
errorMessage: null,
},
};
case THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG:
return {

View File

@@ -1,7 +1,6 @@
import { logError } from '@edx/frontend-platform/logging';
import { call, put, takeEvery } from 'redux-saga/effects';
import { setCountryFromThirdPartyAuthContext } from '../../register/data/actions';
import {
getThirdPartyAuthContextBegin,
getThirdPartyAuthContextFailure,
@@ -11,6 +10,7 @@ import {
import {
getThirdPartyAuthContext,
} from './service';
import { setCountryFromThirdPartyAuthContext } from '../../register/data/actions';
export function* fetchThirdPartyAuthContext(action) {
try {

View File

@@ -18,8 +18,8 @@ export async function getThirdPartyAuthContext(urlParams) {
throw (e);
});
return {
fieldDescriptions: data.registrationFields || data.registration_fields,
optionalFields: data.optionalFields || data.optional_fields,
thirdPartyAuthContext: data.contextData || data.context_data,
fieldDescriptions: data.registrationFields || {},
optionalFields: data.optionalFields || {},
thirdPartyAuthContext: data.contextData || {},
};
}

View File

@@ -58,7 +58,7 @@ describe('common components reducer', () => {
providers: [],
secondaryProviders: [],
pipelineUserDetails: null,
errorMessage: 'An error occured',
errorMessage: 'An error occurred',
},
};

View File

@@ -1,5 +1,6 @@
export { default as RedirectLogistration } from './RedirectLogistration';
export { default as registerIcons } from './RegisterFaIcons';
export { default as EmbeddedRegistrationRoute } from './EmbeddedRegistrationRoute';
export { default as UnAuthOnlyRoute } from './UnAuthOnlyRoute';
export { default as NotFoundPage } from './NotFoundPage';
export { default as SocialAuthProviders } from './SocialAuthProviders';
@@ -11,5 +12,4 @@ export { default as saga } from './data/sagas';
export { storeName } from './data/selectors';
export { default as FormGroup } from './FormGroup';
export { default as PasswordField } from './PasswordField';
export { default as Logistration } from './Logistration';
export { default as Zendesk } from './Zendesk';

View File

@@ -112,6 +112,26 @@ const messages = defineMessages({
description: 'Select ticket form',
defaultMessage: 'Please choose your request type:',
},
'registration.other.options.heading': {
id: 'registration.other.options.heading',
defaultMessage: 'Or register with:',
description: 'A message that appears above third party auth providers i.e saml, google, facebook etc',
},
'institution.login.button': {
id: 'institution.login.button',
defaultMessage: 'Institution/campus credentials',
description: 'shows institutions list',
},
'login.other.options.heading': {
id: 'login.other.options.heading',
defaultMessage: 'Or sign in with:',
description: 'Text that appears above other sign in options like social auth buttons',
},
'enterprise.login.btn.text': {
id: 'enterprise.login.btn.text',
defaultMessage: 'Company or school credentials',
description: 'Company or school login link text.',
},
});
export default messages;

View File

@@ -0,0 +1,78 @@
/* eslint-disable import/no-import-module-exports */
/* eslint-disable react/function-component-definition */
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { render } from '@testing-library/react';
import { act } from 'react-dom/test-utils';
import { PAGE_NOT_FOUND, REGISTER_EMBEDDED_PAGE } from '../../data/constants';
import EmbeddedRegistrationRoute from '../EmbeddedRegistrationRoute';
import {
MemoryRouter, Route, BrowserRouter as Router, Routes,
} from 'react-router-dom';
const RRD = require('react-router-dom');
// Just render plain div with its children
// eslint-disable-next-line react/prop-types
RRD.BrowserRouter = ({ children }) => <div>{ children }</div>;
module.exports = RRD;
const TestApp = () => (
<Router>
<div>
<Routes>
<Route
path={REGISTER_EMBEDDED_PAGE}
element={<EmbeddedRegistrationRoute><span>Embedded Register Page</span></EmbeddedRegistrationRoute>}
/>
<Route
path={PAGE_NOT_FOUND}
element={<span>Page not found</span>}
/>
</Routes>
</div>
</Router>
);
describe('EmbeddedRegistrationRoute', () => {
const routerWrapper = () => (
<MemoryRouter initialEntries={[REGISTER_EMBEDDED_PAGE]}>
<TestApp />
</MemoryRouter>
);
afterEach(() => {
jest.clearAllMocks();
});
it('should not render embedded register page if host query param is not available in the url', async () => {
let embeddedRegistrationPage = null;
await act(async () => {
const { container } = await render(routerWrapper());
embeddedRegistrationPage = container;
});
const renderedPage = embeddedRegistrationPage.querySelector('span');
expect(renderedPage.textContent).toBe('Page not found');
});
it('should render embedded register page if host query param is available in the url (embedded)', async () => {
delete window.location;
window.location = {
href: getConfig().BASE_URL.concat(REGISTER_EMBEDDED_PAGE),
search: '?host=http://localhost/host-websit',
};
let embeddedRegistrationPage = null;
await act(async () => {
const { container } = await render(routerWrapper());
embeddedRegistrationPage = container;
});
const renderedPage = embeddedRegistrationPage.querySelector('span');
expect(renderedPage).toBeTruthy();
expect(renderedPage.textContent).toBe('Embedded Register Page');
});
});

View File

@@ -1,9 +1,13 @@
import React from 'react';
import { Provider } from 'react-redux';
import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
import { mount } from 'enzyme';
import { fireEvent, render } from '@testing-library/react';
import { act } from 'react-dom/test-utils';
import { MemoryRouter } from 'react-router-dom';
import configureStore from 'redux-mock-store';
import { fetchRealtimeValidations } from '../../register/data/actions';
import FormGroup from '../FormGroup';
import PasswordField from '../PasswordField';
@@ -17,19 +21,42 @@ describe('FormGroup', () => {
};
it('should show help text on field focus', () => {
const formGroup = mount(<FormGroup {...props} />);
expect(formGroup.find('.pgn-transition-replace-group').find('div#email-1').exists()).toBeFalsy();
const { queryByText, getByLabelText } = render(<FormGroup {...props} />);
const emailInput = getByLabelText('Email');
formGroup.find('input#email').simulate('focus');
expect(formGroup.find('.pgn-transition-replace-group').find('div#email-1').text()).toEqual('Email field help text');
expect(queryByText('Email field help text')).toBeNull();
fireEvent.focus(emailInput);
const helpText = queryByText('Email field help text');
expect(helpText).toBeTruthy();
expect(helpText.textContent).toEqual('Email field help text');
});
});
describe('PasswordField', () => {
const mockStore = configureStore();
const IntlPasswordField = injectIntl(PasswordField);
let props = {};
let store = {};
const reduxWrapper = children => (
<IntlProvider locale="en">
<MemoryRouter>
<Provider store={store}>{children}</Provider>
</MemoryRouter>
</IntlProvider>
);
const initialState = {
register: {
validationApiRateLimited: false,
},
};
beforeEach(() => {
store = mockStore(initialState);
props = {
floatingLabel: 'Password',
name: 'password',
@@ -39,25 +66,29 @@ describe('PasswordField', () => {
});
it('should show/hide password on icon click', () => {
const passwordField = mount(<IntlProvider locale="en"><IntlPasswordField {...props} /></IntlProvider>);
const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordInput = getByLabelText('Password');
passwordField.find('button[aria-label="Show password"]').simulate('click');
expect(passwordField.find('input').prop('type')).toEqual('text');
const showPasswordButton = getByLabelText('Show password');
fireEvent.click(showPasswordButton);
expect(passwordInput.type).toBe('text');
passwordField.find('button[aria-label="Hide password"]').simulate('click');
expect(passwordField.find('input').prop('type')).toEqual('password');
const hidePasswordButton = getByLabelText('Hide password');
fireEvent.click(hidePasswordButton);
expect(passwordInput.type).toBe('password');
});
it('should show password requirement tooltip on focus', async () => {
const passwordField = mount(<IntlProvider locale="en"><IntlPasswordField {...props} /></IntlProvider>);
const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordInput = getByLabelText('Password');
jest.useFakeTimers();
await act(async () => {
passwordField.find('input').simulate('focus');
fireEvent.focus(passwordInput);
jest.runAllTimers();
});
passwordField.update();
const passwordRequirementTooltip = document.querySelector('#password-requirement-left');
expect(passwordField.find('#password-requirement-left').exists()).toBeTruthy();
expect(passwordRequirementTooltip).toBeTruthy();
});
it('should show all password requirement checks as failed', async () => {
@@ -65,31 +96,195 @@ describe('PasswordField', () => {
...props,
value: '',
};
const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordInput = getByLabelText('Password');
jest.useFakeTimers();
const passwordField = mount(<IntlProvider locale="en"><IntlPasswordField {...props} /></IntlProvider>);
await act(async () => {
passwordField.find('input').simulate('focus');
fireEvent.focus(passwordInput);
jest.runAllTimers();
});
passwordField.update();
expect(passwordField.find('#letter-check span').prop('className')).toEqual('pgn__icon mr-1 text-light-700');
expect(passwordField.find('#number-check span').prop('className')).toEqual('pgn__icon mr-1 text-light-700');
expect(passwordField.find('#characters-check span').prop('className')).toEqual('pgn__icon mr-1 text-light-700');
const letterCheckIcon = document.querySelector('#letter-check span');
const numberCheckIcon = document.querySelector('#number-check span');
const charactersCheckIcon = document.querySelector('#characters-check span');
expect(letterCheckIcon).toBeTruthy();
expect(letterCheckIcon.className).toContain('pgn__icon mr-1 text-light-700');
expect(numberCheckIcon).toBeTruthy();
expect(numberCheckIcon.className).toContain('pgn__icon mr-1 text-light-700');
expect(charactersCheckIcon).toBeTruthy();
expect(charactersCheckIcon.className).toContain('pgn__icon mr-1 text-light-700');
});
it('should update password requirement checks', async () => {
const passwordField = mount(<IntlProvider locale="en"><IntlPasswordField {...props} /></IntlProvider>);
const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordInput = getByLabelText('Password');
jest.useFakeTimers();
await act(async () => {
passwordField.find('input').simulate('focus');
fireEvent.focus(passwordInput);
jest.runAllTimers();
});
passwordField.update();
expect(passwordField.find('#letter-check span').prop('className')).toEqual('pgn__icon text-success mr-1');
expect(passwordField.find('#number-check span').prop('className')).toEqual('pgn__icon text-success mr-1');
expect(passwordField.find('#characters-check span').prop('className')).toEqual('pgn__icon text-success mr-1');
const letterCheckIcon = document.querySelector('#letter-check span');
const numberCheckIcon = document.querySelector('#number-check span');
const charactersCheckIcon = document.querySelector('#characters-check span');
expect(letterCheckIcon).toBeTruthy();
expect(letterCheckIcon.className).toContain('pgn__icon text-success mr-1');
expect(numberCheckIcon).toBeTruthy();
expect(numberCheckIcon.className).toContain('pgn__icon text-success mr-1');
expect(charactersCheckIcon).toBeTruthy();
expect(charactersCheckIcon.className).toContain('pgn__icon text-success mr-1');
});
it('should not run validations when blur is fired on password icon click', () => {
const { container, getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordInput = container.querySelector('input[name="password"]');
const passwordIcon = getByLabelText('Show password');
fireEvent.blur(passwordInput, {
target: {
name: 'password',
value: 'invalid',
},
relatedTarget: passwordIcon,
});
expect(container.querySelector('div[feedback-for="password"]')).toBeNull();
});
it('should call props handle blur if available', () => {
props = {
...props,
handleBlur: jest.fn(),
};
const { container } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordInput = container.querySelector('input[name="password"]');
fireEvent.blur(passwordInput, {
target: {
name: 'password',
value: '',
},
});
expect(props.handleBlur).toHaveBeenCalledTimes(1);
});
it('should run validations on blur event when rendered from register page', () => {
props = {
...props,
handleErrorChange: jest.fn(),
};
const { container } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordInput = container.querySelector('input[name="password"]');
fireEvent.blur(passwordInput, {
target: {
name: 'password',
value: '',
},
});
expect(props.handleErrorChange).toHaveBeenCalledTimes(1);
expect(props.handleErrorChange).toHaveBeenCalledWith(
'password',
'Password criteria has not been met',
);
});
it('should not clear error when focus is fired on password icon click when rendered from register page', () => {
props = {
...props,
handleErrorChange: jest.fn(),
};
const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordIcon = getByLabelText('Show password');
fireEvent.focus(passwordIcon, {
target: {
name: 'passwordIcon',
value: '',
},
});
expect(props.handleErrorChange).toHaveBeenCalledTimes(0);
});
it('should clear error when focus is fired on password icon click when rendered from register page', () => {
props = {
...props,
handleErrorChange: jest.fn(),
};
const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordIcon = getByLabelText('Show password');
fireEvent.focus(passwordIcon, {
target: {
name: 'password',
value: 'invalid',
},
});
expect(props.handleErrorChange).toHaveBeenCalledTimes(1);
expect(props.handleErrorChange).toHaveBeenCalledWith(
'password',
'',
);
});
it('should run backend validations when frontend validations pass on blur when rendered from register page', () => {
store.dispatch = jest.fn(store.dispatch);
props = {
...props,
handleErrorChange: jest.fn(),
};
const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordField = getByLabelText('Password');
fireEvent.blur(passwordField, {
target: {
name: 'password',
value: 'password123',
},
});
expect(store.dispatch).toHaveBeenCalledWith(fetchRealtimeValidations({ password: 'password123' }));
});
it('should use password value from prop when password icon is focused out (blur due to icon)', () => {
store.dispatch = jest.fn(store.dispatch);
props = {
...props,
value: 'testPassword',
handleErrorChange: jest.fn(),
handleBlur: jest.fn(),
};
const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
const passwordIcon = getByLabelText('Show password');
fireEvent.blur(passwordIcon, {
target: {
name: 'passwordIcon',
value: undefined,
},
});
expect(props.handleBlur).toHaveBeenCalledTimes(1);
expect(props.handleBlur).toHaveBeenCalledWith({
target: {
name: 'password',
value: 'testPassword',
},
});
});
});

View File

@@ -1,271 +0,0 @@
import React from 'react';
import { Provider } from 'react-redux';
import { getConfig, mergeConfig } from '@edx/frontend-platform';
import * as analytics from '@edx/frontend-platform/analytics';
import * as auth from '@edx/frontend-platform/auth';
import { configure, injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
import { mount } from 'enzyme';
import { MemoryRouter } from 'react-router-dom';
import configureStore from 'redux-mock-store';
import { COMPLETE_STATE, LOGIN_PAGE } from '../../data/constants';
import { backupRegistrationForm } from '../../register/data/actions';
import { clearThirdPartyAuthContextErrorMessage } from '../data/actions';
import { RenderInstitutionButton } from '../InstitutionLogistration';
import Logistration from '../Logistration';
jest.mock('@edx/frontend-platform/analytics');
jest.mock('@edx/frontend-platform/auth');
analytics.sendPageEvent = jest.fn();
const mockStore = configureStore();
const IntlLogistration = injectIntl(Logistration);
describe('Logistration', () => {
let store = {};
const secondaryProviders = {
id: 'saml-test',
name: 'Test University',
loginUrl: '/dummy-auth',
registerUrl: '/dummy_auth',
};
const reduxWrapper = children => (
<IntlProvider locale="en">
<MemoryRouter>
<Provider store={store}>{children}</Provider>
</MemoryRouter>
</IntlProvider>
);
beforeEach(() => {
auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3, username: 'test-user' }));
configure({
loggingService: { logError: jest.fn() },
config: {
ENVIRONMENT: 'production',
LANGUAGE_PREFERENCE_COOKIE_NAME: 'yum',
},
messages: { 'es-419': {}, de: {}, 'en-us': {} },
});
});
it('should render registration page', () => {
mergeConfig({
ALLOW_PUBLIC_ACCOUNT_CREATION: true,
});
store = mockStore({
register: {
registrationResult: { success: false, redirectUrl: '' },
registrationError: {},
},
commonComponents: {
thirdPartyAuthContext: {
providers: [],
secondaryProviders: [],
},
},
});
const logistration = mount(reduxWrapper(<IntlLogistration />));
expect(logistration.find('#main-content').find('RegistrationPage').exists()).toBeTruthy();
});
it('should render login page', () => {
store = mockStore({
login: {
loginResult: { success: false, redirectUrl: '' },
},
commonComponents: {
thirdPartyAuthContext: {
providers: [],
secondaryProviders: [],
},
},
});
const props = { selectedPage: LOGIN_PAGE };
const logistration = mount(reduxWrapper(<IntlLogistration {...props} />));
expect(logistration.find('#main-content').find('LoginPage').exists()).toBeTruthy();
});
it('should render only login page when public account creation is disabled', () => {
mergeConfig({
ALLOW_PUBLIC_ACCOUNT_CREATION: false,
DISABLE_ENTERPRISE_LOGIN: 'true',
});
store = mockStore({
login: {
loginResult: { success: false, redirectUrl: '' },
},
commonComponents: {
thirdPartyAuthContext: {
currentProvider: null,
finishAuthUrl: null,
providers: [],
secondaryProviders: [secondaryProviders],
},
thirdPartyAuthApiStatus: COMPLETE_STATE,
},
});
const props = { selectedPage: LOGIN_PAGE };
const logistration = mount(reduxWrapper(<IntlLogistration {...props} />));
// verifying sign in heading for institution login false
expect(logistration.find('#main-content').find('h3').text()).toEqual('Sign in');
// verifying tabs heading for institution login true
logistration.find(RenderInstitutionButton).simulate('click', { institutionLogin: true });
expect(logistration.find('#controlled-tab').exists()).toBeTruthy();
});
it('should display institution login option when secondary providers are present', () => {
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: 'true',
ALLOW_PUBLIC_ACCOUNT_CREATION: 'true',
});
store = mockStore({
login: {
loginResult: { success: false, redirectUrl: '' },
},
commonComponents: {
thirdPartyAuthContext: {
currentProvider: null,
finishAuthUrl: null,
providers: [],
secondaryProviders: [secondaryProviders],
},
thirdPartyAuthApiStatus: COMPLETE_STATE,
},
});
const props = { selectedPage: LOGIN_PAGE };
const logistration = mount(reduxWrapper(<IntlLogistration {...props} />));
expect(logistration.text().includes('Institution/campus credentials')).toBe(true);
// on clicking "Institution/campus credentials" button, it should display institution login page
logistration.find(RenderInstitutionButton).simulate('click', { institutionLogin: true });
expect(logistration.text().includes('Test University')).toBe(true);
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: '',
});
});
it('send tracking and page events when institutional login button is clicked', () => {
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: 'true',
});
store = mockStore({
login: {
loginResult: { success: false, redirectUrl: '' },
},
commonComponents: {
thirdPartyAuthContext: {
currentProvider: null,
finishAuthUrl: null,
providers: [],
secondaryProviders: [secondaryProviders],
},
thirdPartyAuthApiStatus: COMPLETE_STATE,
},
});
const props = { selectedPage: LOGIN_PAGE };
const logistration = mount(reduxWrapper(<IntlLogistration {...props} />));
logistration.find(RenderInstitutionButton).simulate('click', { institutionLogin: true });
expect(analytics.sendTrackEvent).toHaveBeenCalledWith('edx.bi.institution_login_form.toggled', { category: 'user-engagement' });
expect(analytics.sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'institution_login');
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: '',
});
});
it('should not display institution register button', () => {
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: 'true',
});
store = mockStore({
register: {
registrationResult: { success: false, redirectUrl: '' },
registrationError: {},
},
commonComponents: {
thirdPartyAuthContext: {
currentProvider: null,
finishAuthUrl: null,
providers: [],
secondaryProviders: [secondaryProviders],
},
thirdPartyAuthApiStatus: COMPLETE_STATE,
},
});
delete window.location;
window.location = { hostname: getConfig().SITE_NAME, href: getConfig().BASE_URL };
const root = mount(reduxWrapper(<IntlLogistration />));
root.find(RenderInstitutionButton).simulate('click', { institutionLogin: true });
expect(root.text().includes('Test University')).toBe(true);
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: '',
});
});
it('should fire action to backup registration form on tab click', () => {
store = mockStore({
login: {
loginResult: { success: false, redirectUrl: '' },
},
register: {
registrationResult: { success: false, redirectUrl: '' },
registrationError: {},
},
commonComponents: {
thirdPartyAuthContext: {
providers: [],
secondaryProviders: [],
},
},
});
store.dispatch = jest.fn(store.dispatch);
const logistration = mount(reduxWrapper(<IntlLogistration />));
logistration.find('a[data-rb-event-key="/login"]').simulate('click');
expect(store.dispatch).toHaveBeenCalledWith(backupRegistrationForm());
});
it('should clear tpa context errorMessage tab click', () => {
store = mockStore({
login: {
loginResult: { success: false, redirectUrl: '' },
},
register: {
registrationResult: { success: false, redirectUrl: '' },
registrationError: {},
},
commonComponents: {
thirdPartyAuthContext: {
providers: [],
secondaryProviders: [],
},
},
});
store.dispatch = jest.fn(store.dispatch);
const logistration = mount(reduxWrapper(<IntlLogistration />));
logistration.find('a[data-rb-event-key="/login"]').simulate('click');
expect(store.dispatch).toHaveBeenCalledWith(clearThirdPartyAuthContextErrorMessage());
});
});

View File

@@ -2,15 +2,21 @@
/* eslint-disable react/function-component-definition */
import React from 'react';
import * as auth from '@edx/frontend-platform/auth';
import { mount } from 'enzyme';
import { fetchAuthenticatedUser, getAuthenticatedUser } from '@edx/frontend-platform/auth';
import { render } from '@testing-library/react';
import { act } from 'react-dom/test-utils';
import { UnAuthOnlyRoute } from '..';
import { LOGIN_PAGE } from '../../data/constants';
import { REGISTER_PAGE } from '../../data/constants';
import { MemoryRouter, BrowserRouter as Router, Switch } from 'react-router-dom';
import {
MemoryRouter, Route, BrowserRouter as Router, Routes,
} from 'react-router-dom';
jest.mock('@edx/frontend-platform/auth');
jest.mock('@edx/frontend-platform/auth', () => ({
getAuthenticatedUser: jest.fn(),
fetchAuthenticatedUser: jest.fn(),
}));
const RRD = require('react-router-dom');
// Just render plain div with its children
@@ -21,16 +27,16 @@ module.exports = RRD;
const TestApp = () => (
<Router>
<div>
<Switch>
<UnAuthOnlyRoute path={LOGIN_PAGE} render={() => (<span>Login Page</span>)} />
</Switch>
<Routes>
<Route path={REGISTER_PAGE} element={<UnAuthOnlyRoute><span>Register Page</span></UnAuthOnlyRoute>} />
</Routes>
</div>
</Router>
);
describe('UnAuthOnlyRoute', () => {
const routerWrapper = () => (
<MemoryRouter initialEntries={[LOGIN_PAGE]}>
<MemoryRouter initialEntries={[REGISTER_PAGE]}>
<TestApp />
</MemoryRouter>
);
@@ -39,25 +45,30 @@ describe('UnAuthOnlyRoute', () => {
jest.clearAllMocks();
});
it('should have called with forceRefresh true', () => {
it('should have called with forceRefresh true', async () => {
const user = {
username: 'gonzo',
other: 'data',
};
auth.getAuthenticatedUser = jest.fn(() => user);
auth.fetchAuthenticatedUser = jest.fn(() => ({ then: () => auth.getAuthenticatedUser() }));
mount(routerWrapper());
getAuthenticatedUser.mockReturnValue(user);
fetchAuthenticatedUser.mockReturnValueOnce(Promise.resolve(user));
expect(auth.fetchAuthenticatedUser).toBeCalledWith({ forceRefresh: true });
await act(async () => {
await render(routerWrapper());
});
expect(fetchAuthenticatedUser).toBeCalledWith({ forceRefresh: true });
});
it('should have called with forceRefresh false', () => {
auth.getAuthenticatedUser = jest.fn(() => null);
auth.fetchAuthenticatedUser = jest.fn(() => ({ then: () => auth.getAuthenticatedUser() }));
it('should have called with forceRefresh false', async () => {
getAuthenticatedUser.mockReturnValue(null);
fetchAuthenticatedUser.mockReturnValueOnce(Promise.resolve(null));
mount(routerWrapper());
await act(async () => {
await render(routerWrapper());
});
expect(auth.fetchAuthenticatedUser).toBeCalledWith({ forceRefresh: false });
expect(fetchAuthenticatedUser).toBeCalledWith({ forceRefresh: false });
});
});

View File

@@ -10,25 +10,27 @@ exports[`SocialAuthProviders should match social auth provider with default icon
>
<div
aria-hidden="true"
className="font-container"
className="btn-tpa__font-container"
>
<svg
aria-hidden="true"
className="svg-inline--fa fa-right-to-bracket "
data-icon="right-to-bracket"
data-prefix="fas"
focusable="false"
role="img"
style={Object {}}
viewBox="0 0 512 512"
xmlns="http://www.w3.org/2000/svg"
<span
className="pgn__icon h-75"
>
<path
d="M352 96h64c17.7 0 32 14.3 32 32V384c0 17.7-14.3 32-32 32H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h64c53 0 96-43 96-96V128c0-53-43-96-96-96H352c-17.7 0-32 14.3-32 32s14.3 32 32 32zm-7.5 177.4c4.8-4.5 7.5-10.8 7.5-17.4s-2.7-12.9-7.5-17.4l-144-136c-7-6.6-17.2-8.4-26-4.6s-14.5 12.5-14.5 22v72H32c-17.7 0-32 14.3-32 32v64c0 17.7 14.3 32 32 32H160v72c0 9.6 5.7 18.2 14.5 22s19 2 26-4.6l144-136z"
fill="currentColor"
style={Object {}}
/>
</svg>
<svg
aria-hidden={true}
fill="none"
focusable={false}
height={24}
role="img"
viewBox="0 0 24 24"
width={24}
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M11 7 9.6 8.4l2.6 2.6H2v2h10.2l-2.6 2.6L11 17l5-5-5-5zm9 12h-8v2h10V3H12v2h8v14z"
fill="currentColor"
/>
</svg>
</span>
</div>
<span
aria-hidden="true"
@@ -55,7 +57,7 @@ exports[`SocialAuthProviders should match social auth provider with iconClass sn
>
<div
aria-hidden="true"
className="font-container"
className="btn-tpa__font-container"
>
<svg
aria-hidden="true"
@@ -104,7 +106,7 @@ Array [
>
<img
alt="icon Apple"
className="icon-image"
className="btn-tpa__image-icon"
src="https://edx.devstack.lms/logo.png"
/>
</div>
@@ -133,7 +135,7 @@ Array [
>
<img
alt="icon Facebook"
className="icon-image"
className="btn-tpa__image-icon"
src="https://edx.devstack.lms/facebook-logo.png"
/>
</div>

View File

@@ -20,6 +20,17 @@ exports[`Zendesk Help should match login page third party auth alert message sna
},
},
"chat": Object {
"departments": Object {
"enabled": Array [
"account settings",
"billing and payments",
"certificates",
"deadlines",
"errors and technical issues",
"other",
"proctoring",
],
},
"suppress": false,
},
"contactForm": Object {

View File

@@ -1,29 +1,39 @@
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_SURVEY_COOKIE_NAME: process.env.USER_SURVEY_COOKIE_NAME || null,
USER_RETENTION_COOKIE_NAME: process.env.USER_RETENTION_COOKIE_NAME || '',
// Features
DISABLE_ENTERPRISE_LOGIN: process.env.DISABLE_ENTERPRISE_LOGIN || '',
ENABLE_COOKIE_POLICY_BANNER: process.env.ENABLE_COOKIE_POLICY_BANNER || false,
ENABLE_DYNAMIC_REGISTRATION_FIELDS: process.env.ENABLE_DYNAMIC_REGISTRATION_FIELDS || false,
ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN: process.env.ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN || false,
ENABLE_PERSONALIZED_RECOMMENDATIONS: process.env.ENABLE_PERSONALIZED_RECOMMENDATIONS || false,
ENABLE_POST_REGISTRATION_RECOMMENDATIONS: process.env.ENABLE_POST_REGISTRATION_RECOMMENDATIONS || false,
MARKETING_EMAILS_OPT_IN: process.env.MARKETING_EMAILS_OPT_IN || '',
SHOW_CONFIGURABLE_EDX_FIELDS: process.env.SHOW_CONFIGURABLE_EDX_FIELDS || false,
SHOW_REGISTRATION_LINKS: process.env.SHOW_REGISTRATION_LINKS !== 'false',
ENABLE_IMAGE_LAYOUT: process.env.ENABLE_IMAGE_LAYOUT || false,
// Links
ACTIVATION_EMAIL_SUPPORT_LINK: process.env.ACTIVATION_EMAIL_SUPPORT_LINK || null,
AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK: process.env.AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK || null,
LOGIN_ISSUE_SUPPORT_LINK: process.env.LOGIN_ISSUE_SUPPORT_LINK || null,
PASSWORD_RESET_SUPPORT_LINK: process.env.PASSWORD_RESET_SUPPORT_LINK || null,
POST_REGISTRATION_REDIRECT_URL: process.env.POST_REGISTRATION_REDIRECT_URL || '',
PRIVACY_POLICY: process.env.PRIVACY_POLICY || null,
SEARCH_CATALOG_URL: process.env.SEARCH_CATALOG_URL || null,
TOS_AND_HONOR_CODE: process.env.TOS_AND_HONOR_CODE || null,
TOS_LINK: process.env.TOS_LINK || null,
// Miscellaneous
// Base container images
BANNER_IMAGE_LARGE: process.env.BANNER_IMAGE_LARGE || '',
BANNER_IMAGE_MEDIUM: process.env.BANNER_IMAGE_MEDIUM || '',
BANNER_IMAGE_SMALL: process.env.BANNER_IMAGE_SMALL || '',
BANNER_IMAGE_EXTRA_SMALL: process.env.BANNER_IMAGE_EXTRA_SMALL || '',
// Recommendation constants
GENERAL_RECOMMENDATIONS: process.env.GENERAL_RECOMMENDATIONS || '[]',
// Miscellaneous
INFO_EMAIL: process.env.INFO_EMAIL || '',
ZENDESK_KEY: process.env.ZENDESK_KEY,
ZENDESK_LOGO_URL: process.env.ZENDESK_LOGO_URL,
ALGOLIA_APP_ID: process.env.ALGOLIA_APP_ID || '',
ALGOLIA_SEARCH_API_KEY: process.env.ALGOLIA_SEARCH_API_KEY || '',
};
export default configuration;

20
src/data/algolia.js Normal file
View File

@@ -0,0 +1,20 @@
import { getConfig } from '@edx/frontend-platform';
import algoliasearch from 'algoliasearch';
// initialize Algolia workers
const initializeSearchClient = () => algoliasearch(
getConfig().ALGOLIA_APP_ID,
getConfig().ALGOLIA_SEARCH_API_KEY,
);
const getLocationRestrictionFilter = (userCountry) => {
if (userCountry) {
return `NOT blocked_in:"${userCountry}" AND (allowed_in:"null" OR allowed_in:"${userCountry}")`;
}
return '';
};
export {
initializeSearchClient,
getLocationRestrictionFilter,
};

View File

@@ -1,6 +1,7 @@
// URL Paths
export const LOGIN_PAGE = '/login';
export const REGISTER_PAGE = '/register';
export const REGISTER_EMBEDDED_PAGE = '/register-embedded';
export const RESET_PAGE = '/reset';
export const AUTHN_PROGRESSIVE_PROFILING = '/welcome';
export const DEFAULT_REDIRECT_URL = '/dashboard';
@@ -23,16 +24,16 @@ export const PENDING_STATE = 'pending';
export const COMPLETE_STATE = 'complete';
export const FAILURE_STATE = 'failure';
export const FORBIDDEN_STATE = 'forbidden';
export const EMBEDDED = 'embedded';
// Regex
export const LETTER_REGEX = /[a-zA-Z]/;
export const NUMBER_REGEX = /\d/;
export const VALID_EMAIL_REGEX = '(^[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+(\\.[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+)*'
+ '|^"([\\001-\\010\\013\\014\\016-\\037!#-\\[\\]-\\177]|\\\\[\\001-\\011\\013\\014\\016-\\177])*"'
+ ')@((?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\\.)+)(?:[A-Z0-9-]{2,63})'
+ '|\\[(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\]$';
export const LETTER_REGEX = /[a-zA-Z]/;
export const NUMBER_REGEX = /\d/;
export const INVALID_NAME_REGEX = /[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)?/gi; // eslint-disable-line no-useless-escape
// Query string parameters that can be passed to LMS to manage
// things like auto-enrollment upon login and registration.
export const AUTH_PARAMS = ['course_id', 'enrollment_action', 'course_mode', 'email_opt_in', 'purchase_workflow', 'next', 'save_for_later', 'register_for_free', 'track', 'is_account_recovery'];
export const AUTH_PARAMS = ['course_id', 'enrollment_action', 'course_mode', 'email_opt_in', 'purchase_workflow', 'next', 'register_for_free', 'track', 'is_account_recovery', 'variant', 'host', 'cta'];
export const REDIRECT = 'redirect';

3
src/data/oneTrust.js Normal file
View File

@@ -0,0 +1,3 @@
const isOneTrustFunctionalCookieEnabled = () => !!window?.OnetrustActiveGroups?.includes('C0003');
export default isOneTrustFunctionalCookieEnabled;

View File

@@ -4,8 +4,14 @@ import {
const OPTIMIZELY_SDK_KEY = process.env.OPTIMIZELY_FULL_STACK_SDK_KEY;
const optimizely = createInstance({
sdkKey: OPTIMIZELY_SDK_KEY,
});
const getOptimizelyInstance = () => {
if (OPTIMIZELY_SDK_KEY) {
return createInstance({
sdkKey: OPTIMIZELY_SDK_KEY,
});
}
export default optimizely;
return null;
};
export default getOptimizelyInstance();

View File

@@ -0,0 +1,16 @@
import { getLocationRestrictionFilter } from '../algolia';
describe('algoliaUtilsTests', () => {
it('test getLocationRestrictionFilter returns filter if country is passed', () => {
const countryCode = 'PK';
const filter = getLocationRestrictionFilter(countryCode);
const expectedFilter = `NOT blocked_in:"${countryCode}" AND (allowed_in:"null" OR allowed_in:"${countryCode}")`;
expect(filter).toEqual(expectedFilter);
});
it('test getLocationRestrictionFilter returns empty string if country is not passed', () => {
const countryCode = '';
const filter = getLocationRestrictionFilter(countryCode);
const expectedFilter = '';
expect(filter).toEqual(expectedFilter);
});
});

View File

@@ -0,0 +1,52 @@
import { getConfig } from '@edx/frontend-platform';
import Cookies from 'universal-cookie';
import { setCookie } from '../utils';
// Mock getConfig function
jest.mock('@edx/frontend-platform', () => ({
getConfig: jest.fn(),
}));
// Mock Cookies class
jest.mock('universal-cookie');
describe('setCookie function', () => {
beforeEach(() => {
jest.clearAllMocks();
});
it('should set a cookie with default options', () => {
getConfig.mockReturnValue({ SESSION_COOKIE_DOMAIN: 'example.com' });
setCookie('testCookie', 'testValue');
expect(Cookies).toHaveBeenCalled();
expect(Cookies).toHaveBeenCalledWith();
expect(Cookies.prototype.set).toHaveBeenCalledWith('testCookie', 'testValue', {
domain: 'example.com',
path: '/',
});
});
it('should set a cookie with specified expiry', () => {
getConfig.mockReturnValue({ SESSION_COOKIE_DOMAIN: 'example.com' });
const expiry = new Date('2023-12-31');
setCookie('testCookie', 'testValue', expiry);
expect(Cookies).toHaveBeenCalled();
expect(Cookies).toHaveBeenCalledWith();
expect(Cookies.prototype.set).toHaveBeenCalledWith('testCookie', 'testValue', {
domain: 'example.com',
path: '/',
expires: expiry,
});
});
it('should not set a cookie if cookieName is undefined', () => {
setCookie(undefined, 'testValue');
expect(Cookies).not.toHaveBeenCalled();
});
});

View File

@@ -1,5 +1,5 @@
import { LOGIN_PAGE } from '../constants';
import { updatePathWithQueryParams } from './dataUtils';
import { updatePathWithQueryParams } from '../utils/dataUtils';
describe('updatePathWithQueryParams', () => {
it('should append query params into the path', () => {

View File

@@ -1,4 +1,4 @@
import AsyncActionType from './reduxUtils';
import AsyncActionType from '../utils/reduxUtils';
describe('AsyncActionType', () => {
it('should return well formatted action strings', () => {

View File

@@ -1,21 +1,13 @@
import { getConfig } from '@edx/frontend-platform';
import Cookies from 'universal-cookie';
export function setCookie(cookieName, cookieValue, cookieExpiry) {
const cookies = new Cookies();
const options = { domain: getConfig().SESSION_COOKIE_DOMAIN, path: '/' };
if (cookieExpiry) {
options.expires = cookieExpiry;
}
cookies.set(cookieName, cookieValue, options);
}
export default function setSurveyCookie(surveyType) {
const cookieName = getConfig().USER_SURVEY_COOKIE_NAME;
if (cookieName) {
const signupTimestamp = (new Date()).getTime();
// set expiry to exactly 24 hours from now
const cookieExpiry = new Date(signupTimestamp + 1 * 864e5);
setCookie(cookieName, surveyType, cookieExpiry);
export default function setCookie(cookieName, cookieValue, cookieExpiry) {
if (cookieName) { // To avoid setting getting exception when setting cookie with undefined names.
const cookies = new Cookies();
const options = { domain: getConfig().SESSION_COOKIE_DOMAIN, path: '/' };
if (cookieExpiry) {
options.expires = cookieExpiry;
}
cookies.set(cookieName, cookieValue, options);
}
}

View File

@@ -76,3 +76,8 @@ export const windowScrollTo = (options) => {
return window.scrollTo(options.top, options.left);
};
export const isHostAvailableInQueryParams = () => {
const queryParams = getAllPossibleQueryParams();
return 'host' in queryParams;
};

View File

@@ -1,10 +1,11 @@
export {
getTpaProvider,
getTpaHint,
updatePathWithQueryParams,
getAllPossibleQueryParams,
getActivationStatus,
isHostAvailableInQueryParams,
updatePathWithQueryParams,
windowScrollTo,
} from './dataUtils';
export { default as AsyncActionType } from './reduxUtils';
export { default as setSurveyCookie, setCookie } from './cookies';
export { default as setCookie } from './cookies';

View File

@@ -1,6 +1,6 @@
import { useEffect, useState } from 'react';
import { breakpoints } from '@edx/paragon';
import { breakpoints } from '@openedx/paragon';
/**
* A react hook used to determine if the current window is mobile or not.

View File

@@ -1,7 +1,7 @@
import React from 'react';
import { Form, Icon } from '@edx/paragon';
import { ExpandMore } from '@edx/paragon/icons';
import { Form, Icon } from '@openedx/paragon';
import { ExpandMore } from '@openedx/paragon/icons';
import PropTypes from 'prop-types';
const FormFieldRenderer = (props) => {

View File

@@ -1,7 +1,7 @@
import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { mount } from 'enzyme';
import { fireEvent, render } from '@testing-library/react';
import FieldRenderer from '../FieldRenderer';
@@ -25,16 +25,17 @@ describe('FieldRendererTests', () => {
type: 'select',
label: 'Year of Birth',
name: 'yob-field',
options: [['1997', 1997], ['1998', 1998]],
options: [['1997', '1997'], ['1998', '1998']],
};
const fieldRenderer = mount(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
const field = fieldRenderer.find('select#yob-field');
field.simulate('change', { target: { value: 1997 } });
const { container } = render(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
const input = container.querySelector('select#yob-field');
const label = container.querySelector('label');
fireEvent.change(input, { target: { value: 1997 } });
expect(field.type()).toEqual('select');
expect(fieldRenderer.find('label').text()).toEqual('Year of Birth');
expect(value).toEqual(1997);
expect(input.type).toEqual('select-one');
expect(label.textContent).toContain(fieldData.label);
expect(value).toEqual('1997');
});
it('should return null if no options are provided for select field', () => {
@@ -44,8 +45,8 @@ describe('FieldRendererTests', () => {
name: 'yob-field',
};
const fieldRenderer = mount(<FieldRenderer fieldData={fieldData} onChangeHandler={() => {}} />);
expect(fieldRenderer.html()).toBeNull();
const { container } = render(<FieldRenderer fieldData={fieldData} onChangeHandler={() => {}} />);
expect(container.innerHTML).toEqual('');
});
it('should render textarea field', () => {
@@ -55,12 +56,13 @@ describe('FieldRendererTests', () => {
name: 'goals-field',
};
const fieldRenderer = mount(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
const field = fieldRenderer.find('#goals-field').last();
field.simulate('change', { target: { value: 'These are my goals.' } });
const { container } = render(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
const input = container.querySelector('#goals-field');
const label = container.querySelector('label');
fireEvent.change(input, { target: { value: 'These are my goals.' } });
expect(field.type()).toEqual('textarea');
expect(fieldRenderer.find('label').text()).toEqual('Why do you want to join this platform?');
expect(input.type).toEqual(fieldData.type);
expect(label.textContent).toContain('Why do you want to join this platform?');
expect(value).toEqual('These are my goals.');
});
@@ -71,12 +73,13 @@ describe('FieldRendererTests', () => {
name: 'company-field',
};
const fieldRenderer = mount(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
const field = fieldRenderer.find('#company-field').last();
field.simulate('change', { target: { value: 'ABC' } });
const { container } = render(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
const input = container.querySelector('input#company-field');
const label = container.querySelector('label');
fireEvent.change(input, { target: { value: 'ABC' } });
expect(field.type()).toEqual('input');
expect(fieldRenderer.find('label').text()).toEqual('Company');
expect(input.type).toEqual(fieldData.type);
expect(label.textContent).toContain(fieldData.label);
expect(value).toEqual('ABC');
});
@@ -87,12 +90,13 @@ describe('FieldRendererTests', () => {
name: 'marketing-emails-opt-in-field',
};
const fieldRenderer = mount(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
const field = fieldRenderer.find('input#marketing-emails-opt-in-field');
field.simulate('change', { target: { checked: true, type: 'checkbox' } });
const { container } = render(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
const input = container.querySelector('input#marketing-emails-opt-in-field');
const label = container.querySelector('label');
fireEvent.click(input);
expect(field.prop('type')).toEqual('checkbox');
expect(fieldRenderer.find('label').text()).toEqual(fieldData.label);
expect(input.type).toEqual(fieldData.type);
expect(label.textContent).toContain(fieldData.label);
expect(value).toEqual(true);
});
@@ -101,8 +105,8 @@ describe('FieldRendererTests', () => {
type: 'unknown',
};
const fieldRenderer = mount(<FieldRenderer fieldData={fieldData} onChangeHandler={() => {}} />);
expect(fieldRenderer.html()).toBeNull();
const { container } = render(<FieldRenderer fieldData={fieldData} onChangeHandler={() => {}} />);
expect(container.innerHTML).toContain('');
});
it('should run onBlur and onFocus functions for a field if given', () => {
@@ -117,7 +121,7 @@ describe('FieldRendererTests', () => {
functionValue = `${e.target.name} focussed`;
};
const fieldRenderer = mount(
const { container } = render(
<FieldRenderer
handleFocus={onFocus}
handleBlur={onBlur}
@@ -126,19 +130,19 @@ describe('FieldRendererTests', () => {
onChangeHandler={changeHandler}
/>,
);
const field = fieldRenderer.find('#test-field').last();
const input = container.querySelector('#test-field');
field.simulate('focus');
fireEvent.focus(input);
expect(functionValue).toEqual('test-field focussed');
field.simulate('blur');
fireEvent.blur(input);
expect(functionValue).toEqual('test-field blurred');
});
it('should render error message for required text fields', () => {
const fieldData = { type: 'text', label: 'First Name', name: 'first-name-field' };
const fieldRenderer = mount(
const { container } = render(
<FieldRenderer
isRequired
fieldData={fieldData}
@@ -147,7 +151,7 @@ describe('FieldRendererTests', () => {
/>,
);
expect(fieldRenderer.find('.form-text-size').last().text()).toEqual('Enter your first name');
expect(container.querySelector(`#${fieldData.name}-error`).textContent).toEqual('Enter your first name');
});
it('should render error message for required select fields', () => {
@@ -155,7 +159,7 @@ describe('FieldRendererTests', () => {
type: 'select', label: 'Preference', name: 'preference-field', options: [['a', 'Opt 1'], ['b', 'Opt 2']],
};
const fieldRenderer = mount(
const { container } = render(
<FieldRenderer
isRequired
fieldData={fieldData}
@@ -164,13 +168,13 @@ describe('FieldRendererTests', () => {
/>,
);
expect(fieldRenderer.find('.form-text-size').last().text()).toEqual('Select your preference');
expect(container.querySelector(`#${fieldData.name}-error`).textContent).toEqual('Select your preference');
});
it('should render error message for required textarea fields', () => {
const fieldData = { type: 'textarea', label: 'Goals', name: 'goals-field' };
const fieldRenderer = mount(
const { container } = render(
<FieldRenderer
isRequired
fieldData={fieldData}
@@ -179,13 +183,13 @@ describe('FieldRendererTests', () => {
/>,
);
expect(fieldRenderer.find('.form-text-size').last().text()).toEqual('Tell us your goals');
expect(container.querySelector(`#${fieldData.name}-error`).textContent).toEqual('Tell us your goals');
});
it('should render error message for required checkbox fields', () => {
const fieldData = { type: 'checkbox', label: 'Honor Code', name: 'honor-code-field' };
const fieldRenderer = mount(
const { container } = render(
<FieldRenderer
isRequired
fieldData={fieldData}
@@ -194,6 +198,6 @@ describe('FieldRendererTests', () => {
/>,
);
expect(fieldRenderer.find('.form-text-size').last().text()).toEqual('You must agree to our Honor Code');
expect(container.querySelector(`#${fieldData.name}-error`).textContent).toEqual('You must agree to our Honor Code');
});
});

View File

@@ -2,15 +2,15 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
import { Alert } from '@edx/paragon';
import { CheckCircle, Error } from '@edx/paragon/icons';
import { Alert } from '@openedx/paragon';
import { CheckCircle, Error } from '@openedx/paragon/icons';
import PropTypes from 'prop-types';
import messages from './messages';
import {
COMPLETE_STATE, FORBIDDEN_STATE, FORM_SUBMISSION_ERROR, INTERNAL_SERVER_ERROR,
} from '../data/constants';
import { PASSWORD_RESET } from '../reset-password/data/constants';
import messages from './messages';
const ForgotPasswordAlert = (props) => {
const { formatMessage } = useIntl();

View File

@@ -11,20 +11,20 @@ import {
StatefulButton,
Tab,
Tabs,
} from '@edx/paragon';
import { ChevronLeft } from '@edx/paragon/icons';
} from '@openedx/paragon';
import { ChevronLeft } from '@openedx/paragon/icons';
import PropTypes from 'prop-types';
import { Helmet } from 'react-helmet';
import { Redirect } from 'react-router-dom';
import { useNavigate } from 'react-router-dom';
import { BaseComponent } from '../base-component';
import { FormGroup } from '../common-components';
import { DEFAULT_STATE, LOGIN_PAGE, VALID_EMAIL_REGEX } from '../data/constants';
import { updatePathWithQueryParams, windowScrollTo } from '../data/utils';
import { forgotPassword, setForgotPasswordFormData } from './data/actions';
import { forgotPasswordResultSelector } from './data/selectors';
import ForgotPasswordAlert from './ForgotPasswordAlert';
import messages from './messages';
import BaseContainer from '../base-container';
import { FormGroup } from '../common-components';
import { DEFAULT_STATE, LOGIN_PAGE, VALID_EMAIL_REGEX } from '../data/constants';
import { updatePathWithQueryParams, windowScrollTo } from '../data/utils';
const ForgotPasswordPage = (props) => {
const platformName = getConfig().SITE_NAME;
@@ -38,7 +38,7 @@ const ForgotPasswordPage = (props) => {
const [bannerEmail, setBannerEmail] = useState('');
const [formErrors, setFormErrors] = useState('');
const [validationError, setValidationError] = useState(emailValidationError);
const [key, setKey] = useState('');
const navigate = useNavigate();
useEffect(() => {
sendPageEvent('login_and_registration', 'reset');
@@ -95,19 +95,16 @@ const ForgotPasswordPage = (props) => {
);
return (
<BaseComponent>
<BaseContainer>
<Helmet>
<title>{formatMessage(messages['forgot.password.page.title'],
{ siteName: getConfig().SITE_NAME })}
</title>
</Helmet>
<div>
<Tabs activeKey="" id="controlled-tab" onSelect={(k) => setKey(k)}>
<Tabs activeKey="" id="controlled-tab" onSelect={(key) => navigate(updatePathWithQueryParams(key))}>
<Tab title={tabTitle} eventKey={LOGIN_PAGE} />
</Tabs>
{ key && (
<Redirect to={updatePathWithQueryParams(key)} />
)}
<div id="main-content" className="main-content">
<Form id="forget-password-form" name="forget-password-form" className="mw-xs">
<ForgotPasswordAlert email={bannerEmail} emailError={formErrors} status={status} />
@@ -133,7 +130,7 @@ const ForgotPasswordPage = (props) => {
name="submit-forget-password"
type="submit"
variant="brand"
className="forgot-password-button-width"
className="forgot-password--button"
state={submitState}
labels={{
default: formatMessage(messages['forgot.password.page.submit.button']),
@@ -163,7 +160,7 @@ const ForgotPasswordPage = (props) => {
</Form>
</div>
</div>
</BaseComponent>
</BaseContainer>
);
};

View File

@@ -1,6 +1,6 @@
import { FORGOT_PASSWORD, FORGOT_PASSWORD_PERSIST_FORM_DATA } from './actions';
import { INTERNAL_SERVER_ERROR, PENDING_STATE } from '../../data/constants';
import { PASSWORD_RESET_FAILURE } from '../../reset-password/data/actions';
import { FORGOT_PASSWORD, FORGOT_PASSWORD_PERSIST_FORM_DATA } from './actions';
export const defaultState = {
status: '',

View File

@@ -1,15 +1,12 @@
import React from 'react';
import { Provider } from 'react-redux';
import CookiePolicyBanner from '@edx/frontend-component-cookie-policy-banner';
import { mergeConfig } from '@edx/frontend-platform';
import * as analytics from '@edx/frontend-platform/analytics';
import * as auth from '@edx/frontend-platform/auth';
import { configure, injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
import { mount } from 'enzyme';
import { createMemoryHistory } from 'history';
import { act } from 'react-dom/test-utils';
import { MemoryRouter, Router } from 'react-router-dom';
import {
fireEvent, render, screen,
} from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import configureStore from 'redux-mock-store';
import { INTERNAL_SERVER_ERROR, LOGIN_PAGE } from '../../data/constants';
@@ -17,14 +14,20 @@ import { PASSWORD_RESET } from '../../reset-password/data/constants';
import { setForgotPasswordFormData } from '../data/actions';
import ForgotPasswordPage from '../ForgotPasswordPage';
jest.mock('@edx/frontend-platform/analytics');
jest.mock('@edx/frontend-platform/auth');
const mockedNavigator = jest.fn();
analytics.sendPageEvent = jest.fn();
jest.mock('@edx/frontend-platform/analytics', () => ({
sendPageEvent: jest.fn(),
sendTrackEvent: jest.fn(),
}));
jest.mock('@edx/frontend-platform/auth');
jest.mock('react-router-dom', () => ({
...(jest.requireActual('react-router-dom')),
useNavigate: () => mockedNavigator,
}));
const IntlForgotPasswordPage = injectIntl(ForgotPasswordPage);
const mockStore = configureStore();
const history = createMemoryHistory();
const initialState = {
forgotPassword: {
@@ -51,7 +54,12 @@ describe('ForgotPasswordPage', () => {
beforeEach(() => {
store = mockStore(initialState);
auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3, username: 'test-user' }));
jest.mock('@edx/frontend-platform/auth', () => ({
getAuthenticatedUser: jest.fn(() => ({
userId: 3,
username: 'test-user',
})),
}));
configure({
loggingService: { logError: jest.fn() },
config: {
@@ -65,31 +73,39 @@ describe('ForgotPasswordPage', () => {
status: null,
};
});
const findByTextContent = (container, text) => Array.from(container.querySelectorAll('*')).find(
element => element.textContent === text,
);
it('not should display need other help signing in button', () => {
const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
expect(wrapper.find('#forgot-password').exists()).toBeFalsy();
const { queryByTestId } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const forgotPasswordButton = queryByTestId('forgot-password');
expect(forgotPasswordButton).toBeNull();
});
it('should display need other help signing in button', () => {
mergeConfig({
LOGIN_ISSUE_SUPPORT_LINK: '/support',
});
const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
expect(wrapper.find('#forgot-password').first().text()).toEqual('Need help signing in?');
render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const forgotPasswordButton = screen.findByText('Need help signing in?');
expect(forgotPasswordButton).toBeDefined();
});
it('should display email validation error message', async () => {
const validationMessage = 'We were unable to contact you.Enter a valid email address below.';
const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
wrapper.find('input#email').simulate(
'change', { target: { value: 'invalid-email', name: 'email' } },
);
await act(async () => { await wrapper.find('button.btn-brand').simulate('click'); });
wrapper.update();
const emailInput = screen.getByLabelText('Email');
expect(wrapper.find('.alert-danger').text()).toEqual(validationMessage);
fireEvent.change(emailInput, { target: { value: 'invalid-email' } });
const submitButton = screen.getByText('Submit');
fireEvent.click(submitButton);
const alertElements = container.querySelectorAll('.alert-danger');
const validationErrors = alertElements[0].textContent;
expect(validationErrors).toBe(validationMessage);
});
it('should show alert on server error', () => {
@@ -98,19 +114,25 @@ describe('ForgotPasswordPage', () => {
});
const expectedMessage = 'We were unable to contact you.'
+ 'An error has occurred. Try refreshing the page, or check your internet connection.';
const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
expect(wrapper.find('#validation-errors').first().text()).toEqual(expectedMessage);
const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const alertElements = container.querySelectorAll('.alert-danger');
const validationErrors = alertElements[0].textContent;
expect(validationErrors).toBe(expectedMessage);
});
it('should display empty email validation message', async () => {
const validationMessage = 'We were unable to contact you.Enter your email below.';
const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
await act(async () => { await forgotPasswordPage.find('button.btn-brand').simulate('click'); });
const submitButton = screen.getByText('Submit');
fireEvent.click(submitButton);
forgotPasswordPage.update();
expect(forgotPasswordPage.find('.alert-danger').text()).toEqual(validationMessage);
const alertElements = container.querySelectorAll('.alert-danger');
const validationErrors = alertElements[0].textContent;
expect(validationErrors).toBe(validationMessage);
});
it('should display request in progress error message', () => {
@@ -119,18 +141,22 @@ describe('ForgotPasswordPage', () => {
forgotPassword: { status: 'forbidden' },
});
const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
expect(forgotPasswordPage.find('.alert-danger').text()).toEqual(rateLimitMessage);
const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const alertElements = container.querySelectorAll('.alert-danger');
const validationErrors = alertElements[0].textContent;
expect(validationErrors).toBe(rateLimitMessage);
});
it('should not display any error message on change event', () => {
const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const emailInput = forgotPasswordPage.find('input#email');
emailInput.simulate('change', { target: { value: 'invalid-email', name: 'email' } });
forgotPasswordPage.update();
const emailInput = screen.getByLabelText('Email');
expect(forgotPasswordPage.find('#email-invalid-feedback').exists()).toEqual(false);
fireEvent.change(emailInput, { target: { value: 'invalid-email' } });
const errorElement = screen.queryByTestId('email-invalid-feedback');
expect(errorElement).toBeNull();
});
it('should set error in redux store on onBlur', () => {
@@ -146,8 +172,11 @@ describe('ForgotPasswordPage', () => {
};
store.dispatch = jest.fn(store.dispatch);
const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
forgotPasswordPage.find('input#email').simulate('blur');
render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const emailInput = screen.getByLabelText('Email');
fireEvent.blur(emailInput);
expect(store.dispatch).toHaveBeenCalledWith(setForgotPasswordFormData(forgotPasswordFormData));
});
@@ -158,9 +187,9 @@ describe('ForgotPasswordPage', () => {
emailValidationError: validationMessage,
email: '',
};
const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
forgotPasswordPage.update();
expect(forgotPasswordPage.find('.pgn__form-text-invalid').text()).toEqual(validationMessage);
const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const validationElement = container.querySelector('.pgn__form-text-invalid');
expect(validationElement.textContent).toEqual(validationMessage);
});
it('should clear error in redux store on onFocus', () => {
@@ -175,8 +204,12 @@ describe('ForgotPasswordPage', () => {
};
store.dispatch = jest.fn(store.dispatch);
const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
forgotPasswordPage.find('input#email').simulate('focus');
render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const emailInput = screen.getByLabelText('Email');
fireEvent.focus(emailInput);
expect(store.dispatch).toHaveBeenCalledWith(setForgotPasswordFormData(forgotPasswordFormData));
});
@@ -186,14 +219,9 @@ describe('ForgotPasswordPage', () => {
emailValidationError: '',
email: '',
};
const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
forgotPasswordPage.update();
expect(forgotPasswordPage.find('#email-invalid-feedback').exists()).toEqual(false);
});
it('check cookie rendered', () => {
const forgotPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
expect(forgotPage.find(<CookiePolicyBanner />)).toBeTruthy();
render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const errorElement = screen.queryByTestId('email-invalid-feedback');
expect(errorElement).toBeNull();
});
it('should display success message after email is sent', () => {
@@ -203,12 +231,16 @@ describe('ForgotPasswordPage', () => {
status: 'complete',
},
});
const successMessage = 'Check your emailWe sent an email to with instructions to reset your password. If you do not '
+ 'receive a password reset message after 1 minute, verify that you entered the correct email address,'
+ ' or check your spam folder. If you need further assistance, contact technical support.';
const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
expect(wrapper.find('.alert-success').text()).toEqual(successMessage);
const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const successElement = findByTextContent(container, successMessage);
expect(successElement).toBeDefined();
expect(successElement.textContent).toEqual(successMessage);
});
it('should display invalid password reset link error', () => {
@@ -222,20 +254,20 @@ describe('ForgotPasswordPage', () => {
+ 'This password reset link is invalid. It may have been used already. '
+ 'Enter your email below to receive a new link.';
const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
expect(wrapper.find('.alert-danger').text()).toEqual(successMessage);
const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
const successElement = findByTextContent(container, successMessage);
expect(successElement).toBeDefined();
expect(successElement.textContent).toEqual(successMessage);
});
it('should redirect onto login page', async () => {
const forgotPasswordPage = mount(reduxWrapper(
<Router history={history}>
<IntlForgotPasswordPage {...props} />
</Router>,
));
const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
await act(async () => { await forgotPasswordPage.find('nav').find('a').first().simulate('click'); });
const navElement = container.querySelector('nav');
const anchorElement = navElement.querySelector('a');
fireEvent.click(anchorElement);
forgotPasswordPage.update();
expect(history.location.pathname).toEqual(LOGIN_PAGE);
expect(mockedNavigator).toHaveBeenCalledWith(LOGIN_PAGE);
});
});

1
src/i18n/index.js Normal file
View File

@@ -0,0 +1 @@
export default [];

View File

@@ -1,41 +0,0 @@
import arMessages from './messages/ar.json';
import caMessages from './messages/ca.json';
// no need to import en messages-- they are in the defaultMessage field
import dedeMessages from './messages/de_DE.json';
import es419Messages from './messages/es_419.json';
import frMessages from './messages/fr.json';
import heMessages from './messages/he.json';
import hiMessages from './messages/hi.json';
import idMessages from './messages/id.json';
import ititMessages from './messages/it_IT.json';
import kokrMessages from './messages/ko_kr.json';
import plMessages from './messages/pl.json';
import ptbrMessages from './messages/pt_br.json';
import ptptMessages from './messages/pt_PT.json';
import ruMessages from './messages/ru.json';
import thMessages from './messages/th.json';
import ukMessages from './messages/uk.json';
import zhcnMessages from './messages/zh_CN.json';
const messages = {
ar: arMessages,
es: es419Messages, // Prospectus uses es language code for spanish, added `es` option and pointed to es-419 strings.
'es-419': es419Messages,
fr: frMessages,
'zh-cn': zhcnMessages,
'it-it': ititMessages,
'pt-pt': ptptMessages,
'de-de': dedeMessages,
ca: caMessages,
he: heMessages,
id: idMessages,
'ko-kr': kokrMessages,
pl: plMessages,
'pt-br': ptbrMessages,
ru: ruMessages,
th: thMessages,
uk: ukMessages,
hi: hiMessages,
};
export default messages;

View File

@@ -1,166 +0,0 @@
{
"start.learning": "ابدأ التعلم ",
"with.site.name": "مع {siteName}",
"complete.your.profile.1": "أكمل",
"complete.your.profile.2": "ملفك الشخصي",
"welcome.to.platform": "أهلا بك {username} في {siteName}",
"institution.login.page.sub.heading": "اختر مؤسستك من القائمة أدناه",
"logistration.sign.in": "تسجيل الدخول",
"logistration.register": "التسجيل",
"enterprisetpa.title.heading": "هل ترغب في تسجيل الدخول باستخدام بيانات {providerName} الخاصة بك؟",
"enterprisetpa.login.button.text": "أرِني وسائل أخرى لتسجيل الدخول أو للتسجيل",
"enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
"sso.sign.in.with": "تسجيل الدخول باستخدام {providerName}",
"sso.create.account.using": "إنشاء حساب باستخدام {providerName}",
"show.password": "إظهار كلمة المرور",
"hide.password": "اخفاء كلمة المرور",
"one.letter": "حرف واحد",
"one.number": "رقم واحد",
"eight.characters": "8 رموز",
"password.sr.only.helping.text": "يجب أن تحتوي كلمة المرور على الأقل 8 رموز، منها حرف واحد و رقم واحد على الأقل.",
"tpa.alert.heading": "انتهينا تقريبا!",
"login.third.party.auth.account.not.linked": "لقد نجحت في تسجيل الدخول إلى {currentProvider}، لكن حسابك على {currentProvider} غير موصول بأي حساب على {platformName}. لوصل حساباتك، سجّل الدخول الآن باستخدام كلمة مرورك على {platformName}.",
"register.third.party.auth.account.not.linked": "لقد سجلت دخولك بنجاح إلى {currentProvider}! نحتاج فقط قليلاً بعدُ من المعلومات قبل أن تبدأ التعلم مع {platformName}.",
"registration.using.tpa.form.heading": "إتمام إنشاء حسابك",
"zendesk.supportTitle": "edX Support",
"zendesk.selectTicketForm": "Please choose your request type:",
"error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في العنوان. رجاءً تحقق من العنوان و حاول مجددًا.",
"forgot.password.confirmation.message": "لقد أرسلنا بريدًا إلكترونيًا إلى {email} به إرشادات لإعادة ضبط كلمة المرور الخاصة بك. إن لم تستلم رسالة إعادة ضبط كلمة المرور بعد دقيقة واحدة، فتحقق من إدخال عنوان البريد الإلكتروني الصحيح، أو تفقد مجلد الرسائل غير المرغوب فيها. إن احتجت مزيدًا من المساعدة، {supportLink}.",
"forgot.password.page.title": "نسيت كلمة المرور | {siteName}",
"forgot.password.page.heading": "إعادة ضبط كلمة المرور",
"forgot.password.page.instructions": "رجاءً أدخل عنوان بريدك الإلكتروني أدناه وسنرسل إليك بريدًا به إرشادات بخصوص كيفية إعادة ضبط كلمة مرورك.",
"forgot.password.page.invalid.email.message": "أدخل عنوان بريد إلكتروني صحيح",
"forgot.password.page.email.field.label": "البريد الإلكتروني",
"forgot.password.page.submit.button": "إرسال",
"forgot.password.error.alert.title.": "لم نتمكن من الاتصال بك.",
"forgot.password.error.message.title": "حدث خطأ ما.",
"forgot.password.request.in.progress.message": "طلبك السابق قيد التنفيذ، يرجى المحاولة مرة أخرى بعد لحظات قليلة.",
"forgot.password.empty.email.field.error": "أدخل بريدك الإلكتروني",
"forgot.password.email.help.text": "عنوان البريد الإلكتروني الذي استخدمته للتسجيل في {platformName}",
"confirmation.message.title": "تفقّد بريدك الإلكتروني",
"confirmation.support.link": "اتصل بالدعم الفني",
"need.help.sign.in.text": "هل تحتاج مساعدة في تسجيل الدخول؟",
"additional.help.text": "للمزيد من المساعدة، اتصل بدعم {platformName} على ",
"sign.in.text": "تسجيل الدخول",
"extend.field.errors": "{emailError} أدناه.",
"invalid.token.heading": "رابط إعادة ضبط كلمة المرور غير صالح",
"invalid.token.error.message": "رابط إعادة ضبط كلمة المرور هذا غير صالح. قد يكون مستعمَلا من قبل. أدخل بريدك الإلكتروني أدناه لتلقي رابط جديد.",
"token.validation.rate.limit.error.heading": "طلبات أكثر مما ينبغي",
"token.validation.rate.limit.error": "حدث خطأ بسبب كثرة الطلبات. رجاءً حاول مرة أخرى بعد مضي بعض الوقت.",
"token.validation.internal.sever.error.heading": "فشل في التحقق من صحة الشارة",
"token.validation.internal.sever.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
"internal.server.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
"account.activation.error.message": "شي ما لم يسر على ما يرام، يرجى {supportLink} لحل هذه المشكلة.",
"login.inactive.user.error": "أنت بحاجة لتفعيل حسابك من أجل تسجيل الدخول{lineBreak}\n{lineBreak}لقد أرسلنا للتو رابطًا للتفعيل إلى {email}. إن لم تتلقّ بريدًا إلكترونيا، تفقّد مجلدات الرسائل غير المرغوب فيها أو {supportLink}.",
"allowed.domain.login.error": "كونك مستخدمًا على {allowedDomain}، فإن عليك تسجيل الدخول باستخدام {tpaLink} الخاص بـ {allowedDomain} .",
"login.incorrect.credentials.error.attempts.text.1": "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور التي أدخلتها غير صحيحة. لديك {remainingAttempts, plural,\n one {محاولة واحدة}\n two {محاولتان}\n few {# محاولات}\n many {# محاولة}\n other {# محاولة}\n} أخرى لتسجيل الدخول قبل أن يتم إقفال حسابك مؤقتًا.",
"login.incorrect.credentials.error.attempts.text.2": "إن نسيت كلمة مرورك، {resetLink}",
"account.locked.out.message.2": "لتكون في مأمن، يمكنك {resetLink} قبل تكرار المحاولة.",
"login.incorrect.credentials.error.with.reset.link": "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور التي أدخلتها غير صحيحة. يرجى تكرار المحاولة أو {resetLink}.",
"login.page.title": "تسجيل الدخول | {siteName}",
"login.user.identity.label": "اسم المستخدم أو البريد الإلكتروني",
"login.password.label": "كلمة المرور",
"sign.in.button": "تسجيل الدخول",
"forgot.password": "نسيت كلمة المرور",
"institution.login.button": "بيانات المؤسسة / الجامعة",
"institution.login.page.title": "تسجيل الدخول باستخدام بيانات المؤسسة / الجامعة",
"login.other.options.heading": "أو قم بتسجيل الدخول باستخدام:",
"non.compliant.password.title": "لقد غيرنا متطلبات أمان كلمة المرور مؤخرًا",
"non.compliant.password.message": "كلمة مرورك الحالية لا تستسجيب لمتطلبات الأمان الجديدة. لقد أرسلنا للتو رسالة لإعادة ضبط كلمة المرور إلى عنوان البريد الإلكتروني المرتبط بهذا الحساب. شكرًا لك على مساعدتنا في الحفاظ على سلامة بياناتك.",
"account.locked.out.message.1": "لحماية حسابك، تم إقفاله مؤقتًا. حاول مرة أخرى بعد 30 دقيقة.",
"enterprise.login.btn.text": "بيانات الشركة أو المدرسة",
"username.or.email.format.validation.less.chars.message": "يجب أن يحتوي اسم المستخدم أو البريد الإلكتروني على 2 أحرف على الأقل.",
"email.validation.message": "أدخل اسم المستخدم أو البريد الإلكتروني الخاص بك",
"password.validation.message": "لم يتم استيفاء معايير كلمة المرور",
"account.activation.success.message.title": "نجح الأمر! لقد قمت بتفعيل حسابك.",
"account.activation.success.message": "ستصلك الآن تحديثات وتنبيهات عبر البريد الإلكتروني منا تتعلق بالمساقات التي قمت بالتسجيل فيها. قم بتسجيل الدخول للمتابعة.",
"account.activation.info.message": "هذا الحساب مفعَّل من قبل.",
"account.activation.error.message.title": "لا يمكن تفعيل حسابك",
"account.activation.support.link": "الاتصال بالدعم",
"account.confirmation.success.message.title": "نجحت العملية! لقد أكدت بريدك الإلكتروني.",
"account.confirmation.success.message": "سجل دخولك للمتابعة.",
"account.confirmation.info.message": "هذا البريد الإلكتروني مؤكد من قبل.",
"account.confirmation.error.message.title": "لا يمكن تأكيد بريدك الإلكتروني",
"tpa.account.link": "حساب {provider}",
"internal.server.error.message": "حدث خطأ ما. جرّب تحديث الصفحة أو تحقق من اتصالك بالانترنت.",
"login.rate.limit.reached.message": "كثرت محاولات تسجيل الدخول الفاشلة. رجاءً أعد المحاولة لاحقًا.",
"login.failure.header.title": "لم نتمكّن من تسجيل دخولك.",
"contact.support.link": "اتصل بدعم {platformName}",
"login.incorrect.credentials.error": "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور التي أدخلتها غير صحيحة. حاول مرة اخرى.",
"login.form.invalid.error.message": "رجاءً املأ الحقول أدناه.",
"login.incorrect.credentials.error.reset.link.text": "إعادة ضبط كلمه المرور",
"login.incorrect.credentials.error.before.account.blocked.text": "انقر هنا لإعادة ضبطها.",
"password.security.nudge.title": "أمان كلمة المرور",
"password.security.block.title": "مطلوب تغيير كلمة المرور",
"password.security.nudge.body": "اكتشف نظامنا أن كلمة مرورك ضعيفة. ننصحك بتغييرها حتى يظل حسابك آمنًا.",
"password.security.block.body": "اكتشف نظامنا أن كلمة مرورك صعيفة. غيّر كلمة مرورك حتى يظل حسابك آمنًا.",
"password.security.close.button": "إغلاق",
"password.security.redirect.to.reset.password.button": "إعادة ضبط كلمة المرور",
"progressive.profiling.page.title": "Welcome | {siteName}",
"progressive.profiling.page.heading": "بعض الأسئلة الموجهة لك ستساعدنا كي نزداد ذكاءً.",
"optional.fields.information.link": "معرفة المزيد عن كيفية استخدامنا لهذه المعلومات.",
"optional.fields.submit.button": "إرسال",
"optional.fields.skip.button": "التخطي مؤقتا",
"optional.fields.next.button": "Next",
"continue.to.platform": "المواصلة إلى {platformName}",
"modal.title": "شكرا لإعلامنا.",
"modal.description": "إن غيرت رأيك، قيمكنك إكمال ملفك الشخصي ضمن الإعدادات في أي وقت.",
"welcome.page.error.heading": "لم نتمكن من تحديث ملفك الشخصي",
"welcome.page.error.message": "حدث خطأ ما. يمكنك إكمال ملفك الشخصي ضمن الإعدادات في أي وقت.",
"recommendation.page.title": "Recommendations | {siteName}",
"recommendation.page.heading": "We have a few recommendations to get you started.",
"recommendation.skip.button": "Skip for now",
"register.page.title": "التسجيل | {siteName}",
"registration.fullname.label": "الاسم الكامل",
"registration.email.label": "البريد الإلكتروني",
"registration.username.label": "اسم المستخدم العامّ",
"registration.password.label": "كلمة المرور",
"registration.country.label": "البلد / المنطقة",
"registration.opt.in.label": "أوافق على تلقّي رسائل تسويقية من {siteName}.",
"help.text.name": "سيتم استخدام هذا الاسم في أي شهادات تحصل عليها.",
"help.text.username.1": "الاسم الذي ستُعرَف به في مساقاتك.",
"help.text.username.2": "لا يمكن تغيير هذا لاحقًا.",
"help.text.email": "لتفعيل الحساب و التحديثات الهامة",
"create.account.for.free.button": "إنشاء حساب مجانا",
"registration.other.options.heading": "أو سجل باستخدام:",
"register.institution.login.button": "بيانات المؤسسة / الجامعة",
"register.institution.login.page.title": "التسجيل باستخدام بيانات المؤسسة / الجامعة",
"empty.name.field.error": "أدخل اسمك الكامل",
"empty.email.field.error": "أدخل بريدك الإلكتروني",
"empty.username.field.error": "يجب أن يتكون اسم المستخدم من 2 إلى 30 حرفًا",
"empty.password.field.error": "لم يتم استيفاء معايير كلمة المرور",
"empty.country.field.error": "حدد بلدك أو منطقة إقامتك",
"email.do.not.match": "عناوين البريد الإلكتروني غير متطابقة.",
"email.invalid.format.error": "أدخل بريدا إلكترونيا صحيحا",
"username.validation.message": "يجب أن يتكون اسم المستخدم من 2 إلى 30 حرفًا",
"name.validation.message": "أدخل اسمًا صحيحا",
"username.format.validation.message": "يمكن أن تحتوي أسماء المستخدمين فقط على أحرف (A-Z، a-z)، و أرقام (0-9)، و أسطر سفلية (_)، و واصلات (-). لا يمكن أن تحتوي أسماء المستخدمين على مسافات",
"registration.request.failure.header": "لم نتمكّن من إنشاء حسابك.",
"registration.empty.form.submission.error": "رجاءً تحقّق من أجوبتك و حاول مجددا.",
"registration.request.server.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
"registration.rate.limit.error": "كثرت محاولات التسجيل الفاشلة. أعد المحاولة لاحقًا.",
"registration.tpa.session.expired": "نفد وقت التسجيل باستخدام {provider}.",
"terms.of.service.and.honor.code": "شروط الخدمة وميثاق الشرف الأكاديمي",
"privacy.policy": "سياسة الخصوصية",
"honor.code": "ميثاق الشرف الأكاديمي",
"terms.of.service": "شروط الخدمة",
"registration.username.suggestion.label": "مقترح:",
"did.you.mean.alert.text": "هل تقصد",
"register.page.terms.of.service.and.honor.code": "بإنشاءك حسابًا، فإنك توافق على {tosAndHonorCode} و تقر بأن {platformName} و كل عضو يعالج بياناتك الشخصية وفقًا لـ{privacyPolicy}.",
"register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
"register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
"sign.in": "تسجيل الدخول",
"reset.password.page.title": "إعادة ضبط كلمة المرور | {siteName}",
"reset.password": "إعادة ضبط كلمة المرور",
"reset.password.page.instructions": "قم بإدخال و تأكيد كلمة مرورك.",
"new.password.label": "كلمة المرور الجديدة",
"confirm.password.label": "تأكيد كلمة المرور",
"passwords.do.not.match": "كلمتا المرور غير متطابقتين",
"confirm.your.password": "تأكيد كلمة مرورك",
"reset.password.failure.heading": "لم نتمكن من إعادة ضبط كلمة مرورك.",
"reset.password.form.submission.error": "رجاءً تحقق من أجوبتك وحاول مجددًا.",
"reset.server.rate.limit.error": "طلبات أكثر مما ينبغي.",
"reset.password.success.heading": "تمت إعادة ضبط كلمة المرور.",
"reset.password.success": "تمت إعادة ضبط كلمة مرورك. سجل الدخول إلى حسابك.",
"rate.limit.error": "حدث خطأ بسبب كثرة الطلبات. رجاءً حاول مرة أخرى بعد مضي بعض الوقت."
}

View File

@@ -1 +0,0 @@
{}

View File

@@ -1,166 +0,0 @@
{
"start.learning": "Beginne zu lernen",
"with.site.name": "mit {siteName}",
"complete.your.profile.1": "Vervollständige",
"complete.your.profile.2": "dein Profil",
"welcome.to.platform": "Willkommen bei {siteName}, {username}!",
"institution.login.page.sub.heading": "Wählen Sie Ihre Institution aus der folgenden Liste aus",
"logistration.sign.in": "Anmelden",
"logistration.register": "Registrieren",
"enterprisetpa.title.heading": "Möchten Sie sich mit Ihren {providerName}-Anmeldedaten anmelden?",
"enterprisetpa.login.button.text": "Andere Möglichkeiten für die Anmeldung oder Registrierung",
"enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
"sso.sign.in.with": "Melden Sie sich mit {providerName} an",
"sso.create.account.using": "Erstellen Sie ein Konto mit {providerName}",
"show.password": "Passwort anzeigen",
"hide.password": "Passwort verbergen",
"one.letter": "1 Buchstabe",
"one.number": "1 Nummer",
"eight.characters": "8 Charaktere",
"password.sr.only.helping.text": "Das Passwort muss mindestens 8 Zeichen, mindestens einen Buchstaben und mindestens eine Zahl enthalten",
"tpa.alert.heading": "Fast fertig!",
"login.third.party.auth.account.not.linked": "Sie haben sich erfolgreich bei {currentProvider} angemeldet, aber Ihr {currentProvider}-Konto hat kein verknüpftes {platformName}-Konto. Um Ihre Konten zu verknüpfen, melden Sie sich jetzt mit Ihrem {platformName}-Passwort an.",
"register.third.party.auth.account.not.linked": "Sie haben sich erfolgreich bei {currentProvider} angemeldet! Wir brauchen nur ein paar mehr Informationen, bevor Sie anfangen, mit {platformName} zu lernen.",
"registration.using.tpa.form.heading": "Beenden Sie die Erstellung Ihres Kontos",
"zendesk.supportTitle": "edX Support",
"zendesk.selectTicketForm": "Please choose your request type:",
"error.notfound.message": "Die gesuchte Seite ist nicht verfügbar oder es liegt ein Fehler in der URL vor. Bitte überprüfen Sie die URL und versuchen Sie es erneut.",
"forgot.password.confirmation.message": "Wir haben eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passworts an {email} gesendet. Wenn Sie nach 1 Minute keine Nachricht zum Zurücksetzen des Passworts erhalten, überprüfen Sie, ob Sie die richtige E-Mail-Adresse eingegeben haben, oder überprüfen Sie Ihren Spam-Ordner. Wenn Sie weitere Hilfe benötigen, {supportLink}.",
"forgot.password.page.title": "Passwort vergessen | {siteName}",
"forgot.password.page.heading": "Passwort zurücksetzen",
"forgot.password.page.instructions": "Bitte geben Sie unten Ihre E-Mail-Adresse ein und wir senden Ihnen eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passworts.",
"forgot.password.page.invalid.email.message": "Geben sie eine gültige E-Mail-Adresse an",
"forgot.password.page.email.field.label": "E-Mail Adresse",
"forgot.password.page.submit.button": "Einreichen",
"forgot.password.error.alert.title.": "Wir konnten Sie nicht kontaktieren.",
"forgot.password.error.message.title": "Ein Fehler ist aufgetreten.",
"forgot.password.request.in.progress.message": "Ihre vorherige Anfrage ist in Bearbeitung, bitte versuchen Sie es in wenigen Augenblicken erneut.",
"forgot.password.empty.email.field.error": "Geben sie ihre E-Mail Adresse ein",
"forgot.password.email.help.text": "Die E-Mail-Adresse, mit der Sie sich bei {platformName} registriert haben",
"confirmation.message.title": "Prüfen Sie Ihr E-Mail-Postfach",
"confirmation.support.link": "wenden Sie sich an den technischen Support",
"need.help.sign.in.text": "Brauchen Sie Hilfe bei der Anmeldung?",
"additional.help.text": "Wenden Sie sich für weitere Hilfe an den {platformName}-Support unter",
"sign.in.text": "Anmelden",
"extend.field.errors": "{emailError} unten.",
"invalid.token.heading": "Ungültiger Link zum Zurücksetzen des Passworts",
"invalid.token.error.message": "Dieser Link zum Zurücksetzen des Passwortes ist ungültig. Möglicherweise wurde es bereits verwendet. Geben Sie unten Ihre E-Mail-Adresse ein, um einen neuen Link zu erhalten.",
"token.validation.rate.limit.error.heading": "Zu viele Anfragen",
"token.validation.rate.limit.error": "Aufgrund von zu vieler Anfragen ist ein Fehler aufgetreten. Bitte versuchen Sie es nach einiger Zeit erneut.",
"token.validation.internal.sever.error.heading": "Token-Validierungsfehler",
"token.validation.internal.sever.error": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
"internal.server.error": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
"account.activation.error.message": "Etwas ist schief gelaufen, bitte {supportLink} um dieses Problem zu lösen.",
"login.inactive.user.error": "Um sich anzumelden, müssen Sie Ihr Konto aktivieren.{lineBreak} {lineBreak}Wir haben gerade einen Aktivierungslink an {email} gesendet. Wenn Sie keine E-Mail erhalten, überprüfen Sie Ihre Spam-Ordner oder {supportLink}.",
"allowed.domain.login.error": "Als {allowedDomain}-Benutzer müssen Sie sich mit Ihrem {allowedDomain} {tpaLink} anmelden.",
"login.incorrect.credentials.error.attempts.text.1": "Der eingegebene Benutzername, die E-Mail oder das Passwort ist falsch. Sie haben {remainingAttempts} weitere Anmeldeversuche, bevor Ihr Konto vorübergehend gesperrt wird.",
"login.incorrect.credentials.error.attempts.text.2": "Wenn Sie Ihr Passwort vergessen haben, {resetLink}",
"account.locked.out.message.2": "Um auf der sicheren Seite zu sein, können Sie {resetLink} tun, bevor Sie es erneut versuchen.",
"login.incorrect.credentials.error.with.reset.link": "Der eingegebene Benutzername, die E-Mail-Adresse oder das Passwort ist falsch. Bitte versuchen Sie es erneut oder {resetLink}.",
"login.page.title": "Anmelden | {siteName}",
"login.user.identity.label": "Benutzername oder E-Mail-Adresse",
"login.password.label": "Passwort",
"sign.in.button": "Anmelden",
"forgot.password": "Passwort vergessen",
"institution.login.button": "Zeugnisse der Institution/des Campus",
"institution.login.page.title": "Melden Sie sich mit Institutions-/Campus-Anmeldeinformationen an",
"login.other.options.heading": "Oder melden Sie sich an mit:",
"non.compliant.password.title": "Wir haben kürzlich unsere Passwortanforderungen geändert",
"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 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.",
"account.activation.success.message": "Sie erhalten jetzt E-Mail-Updates und Benachrichtigungen von uns in Bezug auf die Kurse, für die Sie eingeschrieben sind. Melden Sie sich an, um fortzufahren.",
"account.activation.info.message": "Dieses Konto wurde bereits aktiviert.",
"account.activation.error.message.title": "Ihr Konto konnte nicht aktiviert werden",
"account.activation.support.link": "kontaktieren Sie den Support",
"account.confirmation.success.message.title": "Super! Sie haben Ihre E-Mail bestätigt.",
"account.confirmation.success.message": "Melden Sie sich an, um fortzufahren.",
"account.confirmation.info.message": "Diese E-Mail-Adresse wurde bereits bestätigt.",
"account.confirmation.error.message.title": "Ihre E-Mail-Adresse konnte nicht bestätigt werden",
"tpa.account.link": "{provider}-Konto",
"internal.server.error.message": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
"login.rate.limit.reached.message": "Zu viele fehlgeschlagene Anmeldeversuche. Bitte versuche es später noch einmal.",
"login.failure.header.title": "Wir konnten Sie leider nicht einloggen.",
"contact.support.link": "Wenden Sie sich an den Support der {platformName}",
"login.incorrect.credentials.error": "Der eingegebene Benutzername, die E-Mail-Adresse oder das Passwort ist falsch. Bitte versuche es erneut.",
"login.form.invalid.error.message": "Bitte füllen Sie die unten stehenden Felder aus.",
"login.incorrect.credentials.error.reset.link.text": "Setzen Sie Ihr Passwort zurück",
"login.incorrect.credentials.error.before.account.blocked.text": "Klicken Sie hier, um es zurückzusetzen.",
"password.security.nudge.title": "Passwortsicherheit",
"password.security.block.title": "Passwortänderung erforderlich",
"password.security.nudge.body": "Unser System hat festgestellt, dass Ihr Passwort angreifbar ist. Wir empfehlen Ihnen, es zu ändern, damit Ihr Konto sicher bleibt.",
"password.security.block.body": "Unser System hat festgestellt, dass Ihr Passwort angreifbar ist. Ändern Sie Ihr Passwort, damit Ihr Konto sicher bleibt.",
"password.security.close.button": "Schließen",
"password.security.redirect.to.reset.password.button": "Setzen Sie Ihr Passwort zurück",
"progressive.profiling.page.title": "Welcome | {siteName}",
"progressive.profiling.page.heading": "Ein paar Fragen an Sie helfen uns, schlauer zu werden.",
"optional.fields.information.link": "Erfahren Sie mehr darüber, wie wir diese Informationen verwenden.",
"optional.fields.submit.button": "Einreichen",
"optional.fields.skip.button": "Überspringen",
"optional.fields.next.button": "Weiter",
"continue.to.platform": "Weiter zu {platformName}",
"modal.title": "Danke, dass Sie uns das mitteilen.",
"modal.description": "Sie können Ihr Profil jederzeit in den Einstellungen vervollständigen, wenn Sie Ihre Meinung ändern.",
"welcome.page.error.heading": "Wir konnten Ihr Profil nicht aktualisieren",
"welcome.page.error.message": "Ein Fehler ist aufgetreten. Sie können Ihr Profil jederzeit in den Einstellungen vervollständigen.",
"recommendation.page.title": "Empfehlungen | {siteName}",
"recommendation.page.heading": "Wir haben ein paar Empfehlungen für den Einstieg.",
"recommendation.skip.button": "Überspringen",
"register.page.title": "Registrieren | {siteName}",
"registration.fullname.label": "Vollständiger Name",
"registration.email.label": "E-Mail-Adresse",
"registration.username.label": "Öffentlicher Benutzername",
"registration.password.label": "Passwort",
"registration.country.label": "Land/Region",
"registration.opt.in.label": "Ich stimme zu, dass {siteName} mir Marketingmitteilungen senden darf.",
"help.text.name": "Dieser Name wird von allen Zertifikaten verwendet, die Sie erwerben.",
"help.text.username.1": "Der Name, der Sie in Ihren Kursen identifiziert.",
"help.text.username.2": "Dies kann später nicht mehr geändert werden.",
"help.text.email": "Für die Kontoaktivierung und wichtige Updates",
"create.account.for.free.button": "Erstellen Sie kostenlos ein Benutzerkonto",
"registration.other.options.heading": "Oder registrieren Sie sich bei:",
"register.institution.login.button": "Zeugnisse der Institution/des Campus",
"register.institution.login.page.title": "Registrieren Sie sich mit Institutions-/Campus-Anmeldeinformationen",
"empty.name.field.error": "Geben Sie Ihren vollständigen Namen ein",
"empty.email.field.error": "Geben Sie Ihre E-Mail-Adresse ein",
"empty.username.field.error": "Der Benutzername muss zwischen 2 und 30 Zeichen lang sein",
"empty.password.field.error": "Kennwortkriterien wurden nicht erfüllt",
"empty.country.field.error": "Wählen Sie das Land oder die Region Ihres Wohnsitzes aus",
"email.do.not.match": "Die E-Mail-Adressen stimmen nicht überein.",
"email.invalid.format.error": "Geben sie eine gültige E-Mail-Adresse an",
"username.validation.message": "Der Benutzername muss zwischen 2 und 30 Zeichen lang sein",
"name.validation.message": "Geben Sie einen gültigen Namen ein",
"username.format.validation.message": "Benutzernamen dürfen nur Buchstaben (AZ, az), Ziffern (0-9), Unterstriche (_) und Bindestriche (-) enthalten. Benutzernamen dürfen keine Leerzeichen enthalten",
"registration.request.failure.header": "Wir konnten Ihr Konto leider nicht erstellen.",
"registration.empty.form.submission.error": "Bitte überprüfen Sie Ihre Antworten und versuchen Sie es erneut.",
"registration.request.server.error": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
"registration.rate.limit.error": "Zu viele fehlgeschlagene Registrierungsversuche. Versuchen Sie es später noch einmal.",
"registration.tpa.session.expired": "Die Registrierung mit {provider} ist abgelaufen.",
"terms.of.service.and.honor.code": "Nutzungsbedingungen und Verhaltenskodex",
"privacy.policy": "Datenschutzbestimmungen",
"honor.code": "Verhaltenskodex",
"terms.of.service": "Nutzungsbedingungen",
"registration.username.suggestion.label": "Empfohlen:",
"did.you.mean.alert.text": "Meinten Sie",
"register.page.terms.of.service.and.honor.code": "Wenn Sie ein Konto erstellen, stimmen Sie den {tosAndHonorCode} zu und erkennen an, dass {platformName} und jedes \nMitglied Ihre personenbezogenen Daten in Übereinstimmung mit den {privacyPolicy} verarbeitet.",
"register.page.honor.code": "Ich stimme den {platformName} {tosAndHonorCode} zu",
"register.page.terms.of.service": "Ich stimme den {platformName} {termsOfService} zu",
"sign.in": "Anmelden",
"reset.password.page.title": "Passwort zurücksetzen | {siteName}",
"reset.password": "Passwort zurücksetzen",
"reset.password.page.instructions": "Neues Passwort eingeben und bestätigen",
"new.password.label": "Neues Passwort",
"confirm.password.label": "Kennwort bestätigen",
"passwords.do.not.match": "Passwörter stimmen nicht überein",
"confirm.your.password": "Bestätigen Sie Ihr Passwort",
"reset.password.failure.heading": "Wir konnten Ihr Passwort nicht zurücksetzen.",
"reset.password.form.submission.error": "Bitte überprüfen Sie Ihre Antworten und versuchen Sie es erneut.",
"reset.server.rate.limit.error": "Zu viele Anfragen.",
"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."
}

View File

@@ -1,166 +0,0 @@
{
"start.learning": "Empieza a aprender",
"with.site.name": "con {siteName}",
"complete.your.profile.1": "Completado",
"complete.your.profile.2": "tu perfil ",
"welcome.to.platform": "¡Bienvenido a {siteName}, {username}!",
"institution.login.page.sub.heading": "Selecciona tu institución de la lista siguiente",
"logistration.sign.in": "Iniciar sesión",
"logistration.register": "Registrarse",
"enterprisetpa.title.heading": "¿Deseas iniciar sesión con tus credenciales de {providerName}?",
"enterprisetpa.login.button.text": "Mostrar otras formas de iniciar sesión o de registrarme",
"enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
"sso.sign.in.with": "Inicio de sesión con {providerName}",
"sso.create.account.using": "Crear una cuenta con {providerName}",
"show.password": "Mostrar contraseña",
"hide.password": "Ocultar contraseña",
"one.letter": "1 letra",
"one.number": "1 número",
"eight.characters": "8 caracteres",
"password.sr.only.helping.text": "La contraseña debe contener al menos 8 caracteres, al menos una letra y al menos un número",
"tpa.alert.heading": "¡Ya casi has terminado!",
"login.third.party.auth.account.not.linked": "Te has registrado correctamente en {currentProvider}, pero tu cuenta de {currentProvider} no tiene una cuenta de {platformName} asociada. Para asociar tus cuentas, inicia sesión ahora usando tu contraseña de {platformName}.",
"register.third.party.auth.account.not.linked": "¡Has iniciado sesión con éxito en {currentProvider}! Sólo necesitamos un poco más de información antes de que empieces a aprender con {platformName}.",
"registration.using.tpa.form.heading": "Termina de crear tu cuenta",
"zendesk.supportTitle": "edX Support",
"zendesk.selectTicketForm": "Please choose your request type:",
"error.notfound.message": "La página que estas buscando no está disponible o hay un error en la URL. Por favor, verifica la URL y vuelve a intentarlo.",
"forgot.password.confirmation.message": "Hemos enviado un correo electrónico a {email} con instrucciones para restablecer tu contraseña.\n Si no recibes un mensaje de restablecimiento de contraseña después de 1 minuto, verifica que has introducido\n la dirección de correo electrónico correcta, o comprueba tu carpeta de correo no deseado. Si necesitas más ayuda, {supportLink}.",
"forgot.password.page.title": "Olvidé la contraseña | {siteName}",
"forgot.password.page.heading": "Restablecer mi contraseña",
"forgot.password.page.instructions": "Por favor, introduce tu dirección de correo electrónico y te enviaremos un correo electrónico con instrucciones sobre cómo restablecer tu contraseña.",
"forgot.password.page.invalid.email.message": "Introduce una dirección de correo electrónico válida",
"forgot.password.page.email.field.label": "Correo electrónico",
"forgot.password.page.submit.button": "Enviar",
"forgot.password.error.alert.title.": "No hemos podido entrar en contacto contigo.",
"forgot.password.error.message.title": "Ha ocurrido un error.",
"forgot.password.request.in.progress.message": "Su solicitud anterior está en progreso, por favor inténtalo de nuevo en unos minutos.",
"forgot.password.empty.email.field.error": "Introduce tu email",
"forgot.password.email.help.text": "El correo electrónico que utilizaste para registrarte en {platformName}",
"confirmation.message.title": "Verifica tu correo electrónico",
"confirmation.support.link": "entra en contacto con el equipo de soporte técnico",
"need.help.sign.in.text": "¿Necesitas ayuda para iniciar sesión?",
"additional.help.text": "Para obtener ayuda adicional, comuníquese con el soporte de {platformName} en",
"sign.in.text": "Iniciar sesión",
"extend.field.errors": "{emailError} a continuación.",
"invalid.token.heading": "Enlace de restablecimiento de contraseña inválido",
"invalid.token.error.message": "Este enlace para restablecer la contraseña no es válido. Es posible que ya haya sido utilizado. Introduce tu correo electrónico para recibir un nuevo enlace.",
"token.validation.rate.limit.error.heading": "Demasiadas solicitudes",
"token.validation.rate.limit.error": "Se ha producido un error debido a demasiadas solicitudes. Por favor, inténtalo de nuevo después de algún tiempo.",
"token.validation.internal.sever.error.heading": "Fallo de validación del token",
"token.validation.internal.sever.error": "Se ha producido un error. Intenta actualizar la página o verifica tu conexión a Internet.",
"internal.server.error": "Se ha producido un error. Intenta actualizar la página o verifica tu conexión a Internet.",
"account.activation.error.message": "Algo no funcionó correctamente, por favor {supportLink} para resolver este problema.",
"login.inactive.user.error": "Para iniciar sesión, debes activar tu cuenta..{lineBreak}\n {lineBreak} Acabamos de enviar un enlace de activación a {email}. Si no recibes un correo electrónico,\n revisa tus carpetas de spam o {supportLink}.",
"allowed.domain.login.error": "Como usuario {allowedDomain}, debe iniciar sesión con su {allowedDomain} {tpaLink}.",
"login.incorrect.credentials.error.attempts.text.1": "El nombre de usuario, el email o la contraseña que has introducido son incorrectos. Tienes {remainingAttempts} intentos más de inicio de sesión\n antes de que tu cuenta se bloquee temporalmente.",
"login.incorrect.credentials.error.attempts.text.2": "Si has olvidado tu contraseña, {resetLink}",
"account.locked.out.message.2": "Para estar seguro, puedes {resetLink} antes de volver a intentarlo.",
"login.incorrect.credentials.error.with.reset.link": "El nombre de usuario, el correo electrónico o la contraseña que has introducido son incorrectos. Por favor, inténtalo de nuevo o {resetLink}.",
"login.page.title": "Login | {siteName}",
"login.user.identity.label": "Nombre de usuario o correo electrónico",
"login.password.label": "Contraseña",
"sign.in.button": "Iniciar sesión",
"forgot.password": "Olvidé mi contraseña",
"institution.login.button": "Credenciales de la institución/campus",
"institution.login.page.title": "Iniciar sesión con las credenciales de la institución/campus",
"login.other.options.heading": "O bien, inicia sesión con:",
"non.compliant.password.title": "Recientemente hemos cambiado los requisitos de las contraseñas",
"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 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.",
"account.activation.success.message": "Ahora recibirás por correo electrónico actualizaciones y alertas relacionadas con los cursos en los que estás inscrito. Inicia sesión para continuar.",
"account.activation.info.message": "La cuenta ya ha sido activada.",
"account.activation.error.message.title": "Tu cuenta no ha podido ser activada",
"account.activation.support.link": "contacta al equipo de soporte de edX",
"account.confirmation.success.message.title": "¡Éxito! Has confirmado tu correo electrónico.",
"account.confirmation.success.message": "Inicia sesión para continuar.",
"account.confirmation.info.message": "Este correo electrónico ya ha sido confirmado.",
"account.confirmation.error.message.title": "Tu correo electrónico no pudo ser confirmado",
"tpa.account.link": "{provider} cuenta",
"internal.server.error.message": "Se ha producido un error. Intenta actualizar la página o comprueba tu conexión a Internet.",
"login.rate.limit.reached.message": "Demasiados intentos fallidos de inicio de sesión. Inténtelo de nuevo más tarde.",
"login.failure.header.title": "No se ha podido iniciar tu sesión.",
"contact.support.link": "entrar en contacto con el soporte de {platformName}",
"login.incorrect.credentials.error": "El nombre de usuario, el correo electrónico o la contraseña que has introducido son incorrectos. Por favor, inténtalo de nuevo.",
"login.form.invalid.error.message": "Por favor, complete los siguientes campos.",
"login.incorrect.credentials.error.reset.link.text": "restablecer la contraseña",
"login.incorrect.credentials.error.before.account.blocked.text": "Pulse aquí para restablecerla.",
"password.security.nudge.title": "Seguridad de contraseña",
"password.security.block.title": "Cambio de contraseña requerido",
"password.security.nudge.body": "Nuestro sistema detectó que su contraseña es vulnerable. Le recomendamos que lo cambie para que su cuenta se mantenga segura.",
"password.security.block.body": "Nuestro sistema detectó que su contraseña es vulnerable. Cambie su contraseña para que su cuenta permanezca segura.",
"password.security.close.button": "Cerrar",
"password.security.redirect.to.reset.password.button": "Restablece tu contraseña",
"progressive.profiling.page.title": "Welcome | {siteName}",
"progressive.profiling.page.heading": "Unas cuantas preguntas para ti nos ayudarán a mejorar.",
"optional.fields.information.link": "Aprende más sobre cómo usamos esta información.",
"optional.fields.submit.button": "Enviar",
"optional.fields.skip.button": "Saltar por ahora ",
"optional.fields.next.button": "Siguiente",
"continue.to.platform": "Continuar a {platformName}",
"modal.title": "Gracias por informarnos.",
"modal.description": "Puedes completar tu perfil en los ajustes en cualquier momento si cambias de opinión.",
"welcome.page.error.heading": "No hemos podido actualizar tu perfil",
"welcome.page.error.message": "Se ha producido un error. Puedes completar tu perfil en los ajustes en cualquier momento.",
"recommendation.page.title": "Recomendaciones | {siteName}",
"recommendation.page.heading": "Tenemos algunas recomendaciones para empezar.",
"recommendation.skip.button": "Saltar por ahora ",
"register.page.title": "Register | {siteName}",
"registration.fullname.label": "Nombre completo",
"registration.email.label": "Correo electrónico",
"registration.username.label": "Nombre de usuario público",
"registration.password.label": "Contraseña",
"registration.country.label": "País/Región",
"registration.opt.in.label": "Acepto que {siteName} pueda enviarme mensajes de marketing.",
"help.text.name": "Este nombre será utilizado por los certificados que obtengas.",
"help.text.username.1": "El nombre que te identificará en tus cursos.",
"help.text.username.2": "Esto no puede modificarse posteriormente.",
"help.text.email": "Para la activación de la cuenta y las actualizaciones importantes",
"create.account.for.free.button": "Crea una cuenta gratis",
"registration.other.options.heading": "O regístrese con:",
"register.institution.login.button": "Credenciales de la institución/campus",
"register.institution.login.page.title": "Registro con credenciales de la institución/campus",
"empty.name.field.error": "Introduce tu nombre completo",
"empty.email.field.error": "Introduce tu email",
"empty.username.field.error": "El nombre de usuario debe tener entre 2 y 30 caracteres",
"empty.password.field.error": "No se han cumplido los criterios de la contraseña",
"empty.country.field.error": "Selecciona tu país o región de residencia",
"email.do.not.match": "Los correos electrónicos no son iguales.",
"email.invalid.format.error": "Introduce una dirección de correo electrónico válida",
"username.validation.message": "El nombre de usuario debe tener entre 2 y 30 caracteres",
"name.validation.message": "Introduce un nombre válido",
"username.format.validation.message": "Los nombres de usuario solo pueden contener letras (A-Z, a-z), números (0-9), guiones bajos (_) y guiones (-). Los nombres de usuario no pueden contener espacios",
"registration.request.failure.header": "No pudimos crear tu cuenta.",
"registration.empty.form.submission.error": "Por favor, verifica tus respuestas y vuelve a intentarlo.",
"registration.request.server.error": "Se ha producido un error. Intenta actualizar la página o comprueba tu conexión a Internet.",
"registration.rate.limit.error": "Demasiados intentos de registro fallidos. Vuelve a intentarlo más tarde.",
"registration.tpa.session.expired": "Inscripción usando {provider} ha expirado.",
"terms.of.service.and.honor.code": "Condiciones de servicio y código de honor",
"privacy.policy": "Política de privacidad ",
"honor.code": "Código de Honor",
"terms.of.service": "Términos de servicio",
"registration.username.suggestion.label": "Se recomienda:",
"did.you.mean.alert.text": "¿Quieres decir",
"register.page.terms.of.service.and.honor.code": "Al crear una cuenta, aceptas el {tosAndHonorCode} y reconoces que {platformName} y cada\n Miembro procesa tus datos personales de acuerdo con la {privacyPolicy}.",
"register.page.honor.code": "Acepto las {platformName} {tosAndHonorCode}",
"register.page.terms.of.service": "Acepto las {platformName} {termsOfService}",
"sign.in": "Iniciar sesión",
"reset.password.page.title": "Restablecer contraseña | {siteName}",
"reset.password": "Restablecer mi contraseña",
"reset.password.page.instructions": "Ingresa y confirma tu nueva contraseña.",
"new.password.label": "Nueva contraseña",
"confirm.password.label": "Confirmar contraseña",
"passwords.do.not.match": "Las contraseñas no coinciden",
"confirm.your.password": "Confirma tu contraseña",
"reset.password.failure.heading": "No hemos podido restablecer tu contraseña.",
"reset.password.form.submission.error": "Por favor, verifica tus respuestas y vuelve a intentarlo.",
"reset.server.rate.limit.error": "Demasiadas solicitudes.",
"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."
}

View File

@@ -1,166 +0,0 @@
{
"start.learning": "Démarrer l'apprentissage",
"with.site.name": "avec {siteName}",
"complete.your.profile.1": "Terminé",
"complete.your.profile.2": "votre profil",
"welcome.to.platform": "Bienvenue sur {siteName}, {username}!",
"institution.login.page.sub.heading": "Sélectionner votre institution dans la liste ci-dessous",
"logistration.sign.in": "Connectez-vous",
"logistration.register": "S'inscrire",
"enterprisetpa.title.heading": "Souhaitez-vous vous connecter à l'aide de vos identifiants {providerName} ?",
"enterprisetpa.login.button.text": "Montrez-moi d'autres méthodes pour me connecter ou m'inscrire",
"enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
"sso.sign.in.with": "Connectez-vous avec {providerName}",
"sso.create.account.using": "Créer un compte avec {providerName}",
"show.password": "Afficher le mot de passe",
"hide.password": "Cacher le mot de passe ",
"one.letter": "1 letter",
"one.number": "1 number",
"eight.characters": "8 characters",
"password.sr.only.helping.text": "Le mot de passe doit contenir au moins 8 caractères, au moins une lettre et au moins un chiffre",
"tpa.alert.heading": "Presque fini !",
"login.third.party.auth.account.not.linked": "Vous vous êtes connecté avec succès à {currentProvider}, mais votre compte {currentProvider} n'a pas de compte relié à {platformName}. Pour lier vos comptes, connectez-vous en utilisant votre mot de passe {platformName}.",
"register.third.party.auth.account.not.linked": "Vous vous êtes connecté avec succès à {currentProvider} ! Nous avons juste besoin d'un peu plus d'informations avant que vous commenciez à apprendre avec {platformName}.",
"registration.using.tpa.form.heading": "Terminer la création de votre compte",
"zendesk.supportTitle": "edX Support",
"zendesk.selectTicketForm": "Please choose your request type:",
"error.notfound.message": "La page que vous recherchez n'est pas disponible ou il y a une erreur dans l'URL. Veuillez vérifier l'URL et réessayer.",
"forgot.password.confirmation.message": "Nous avons envoyé un courriel à {email} avec des instructions pour réinitialiser votre mot de passe.\n Si vous ne recevez pas de message de réinitialisation de mot de passe après 1 minute, vérifiez que vous avez saisi\nl'adresse courriel correctement, ou vérifiez votre dossier de courriel indésirable. Si vous avez besoin d'aide supplémentaire, {supportLink}.",
"forgot.password.page.title": " Mot de passe oublié | {siteName}",
"forgot.password.page.heading": "Réinitialiser le mot de passe",
"forgot.password.page.instructions": "Veuillez entrer votre adresse courriel ci-dessous et nous vous enverrons un courriel avec les instructions pour réinitialiser votre mot de passe.",
"forgot.password.page.invalid.email.message": "Enter a valid email address",
"forgot.password.page.email.field.label": "Email",
"forgot.password.page.submit.button": "Envoyez",
"forgot.password.error.alert.title.": "Nous n'avons pas pu vous contacter.",
"forgot.password.error.message.title": "Une erreur est survenue.",
"forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
"forgot.password.empty.email.field.error": "Saisissez votre courriel",
"forgot.password.email.help.text": "L'adresse courriel que vous avez utilisée pour vous inscrire sur {platformName}",
"confirmation.message.title": "Vérifiez votre email",
"confirmation.support.link": "contacter le support technique",
"need.help.sign.in.text": "Besoin d'aide pour vous enregistrer?",
"additional.help.text": "For additional help, contact {platformName} support at ",
"sign.in.text": "Connectez-vous",
"extend.field.errors": "{emailError} ci-dessous.",
"invalid.token.heading": "Lien de réinitialisation du mot de passe non valide",
"invalid.token.error.message": "Ce lien de réinitialisation de mot de passe n'est pas valide. Il a peut-être déjà été utilisé. Entrez votre courriel ci-dessous pour recevoir un nouveau lien.",
"token.validation.rate.limit.error.heading": "Trop de demandes",
"token.validation.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.",
"token.validation.internal.sever.error.heading": "Échec de la validation du jeton",
"token.validation.internal.sever.error": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
"internal.server.error": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
"account.activation.error.message": "Une erreur s'est produite, veuillez {supportLink} pour résoudre ce problème.",
"login.inactive.user.error": "Pour vous connecter, vous devez activer votre compte.{lineBreak}\n {lineBreak}Nous venons d'envoyer un lien d'activation à {email}. Si vous ne recevez pas de courriel,\n vérifiez vos dossiers de spam ou {supportLink}.",
"allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
"login.incorrect.credentials.error.attempts.text.1": "Le nom d'utilisateur, le courriel ou le mot de passe que vous avez entré est incorrect. Vous avez {remainingAttempts} tentatives\n de connexion avant que votre compte soit temporairement verrouillé.",
"login.incorrect.credentials.error.attempts.text.2": "Si vous avez oublié votre mot de passe, {resetLink}",
"account.locked.out.message.2": "Par mesure de sécurité, vous pouvez {resetLink} avant de réessayer.",
"login.incorrect.credentials.error.with.reset.link": "Le nom d'utilisateur, l'adresse courriel ou le mot de passe que vous avez saisis sont incorrects. Veuillez réessayer ou {resetLink}.",
"login.page.title": "Connexion | {siteName}",
"login.user.identity.label": "Nom d'utilisateur ou courriel",
"login.password.label": "Mot de passe",
"sign.in.button": "Connectez-vous",
"forgot.password": "Mot de passe oublié",
"institution.login.button": "Identifiants de l'établissement/du campus",
"institution.login.page.title": "Connectez vous avec les crédentiels d'institution ou de campus",
"login.other.options.heading": "Ou se connecter avec :",
"non.compliant.password.title": "Nous avons récemment modifié nos exigences en matière de mot de passe",
"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 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.",
"account.activation.success.message": "Vous recevrez maintenant des mises à jour par courriel et des alertes de notre part concernant les cours auxquels vous êtes inscrit. Connectez-vous pour continuer.",
"account.activation.info.message": "Ce compte a déjà été activé.",
"account.activation.error.message.title": "Votre compte n'a pas pu être activé",
"account.activation.support.link": "contacter le support",
"account.confirmation.success.message.title": "Succès ! Vous avez confirmé votre courriel.",
"account.confirmation.success.message": "Se connecter pour continuer.",
"account.confirmation.info.message": "Ce courriel a déjà été confirmé.",
"account.confirmation.error.message.title": "Votre courriel ne peut pas être confirmé.",
"tpa.account.link": "{provider} account",
"internal.server.error.message": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
"login.rate.limit.reached.message": "Trop de tentatives de connexion échouées. Réessayez plus tard.",
"login.failure.header.title": "Nous n'avons pas pu vous connecter.",
"contact.support.link": "veuillez contacter le support {platformName}",
"login.incorrect.credentials.error": "Le nom d'utilisateur, l'adresse courriel ou le mot de passe que vous avez saisis sont incorrects. Veuillez réessayer.",
"login.form.invalid.error.message": "Veuillez remplir les champs ci-dessous.",
"login.incorrect.credentials.error.reset.link.text": "réinitialiser votre mot de passe",
"login.incorrect.credentials.error.before.account.blocked.text": "cliquez ici pour le réinitialiser.",
"password.security.nudge.title": "Sécurité du mot de passe",
"password.security.block.title": "Changement de mot de passe requis",
"password.security.nudge.body": "Notre système a détecté que votre mot de passe est vulnérable. Nous vous recommandons de le modifier afin que votre compte reste sécurisé.",
"password.security.block.body": "Notre système a détecté que votre mot de passe est vulnérable. Changez votre mot de passe afin que votre compte reste sécurisé.",
"password.security.close.button": "Fermer",
"password.security.redirect.to.reset.password.button": "Réinitialiser votre mot de passe",
"progressive.profiling.page.title": "Welcome | {siteName}",
"progressive.profiling.page.heading": "Quelques questions pour vous nous aideront à devenir plus intelligents.",
"optional.fields.information.link": "En savoir plus sur la façon dont nous utilisons ces informations.",
"optional.fields.submit.button": "Envoyez",
"optional.fields.skip.button": "Ignorer pour l'instant",
"optional.fields.next.button": "Next",
"continue.to.platform": "Continuer vers {platformName}",
"modal.title": "Merci de nous en informer.",
"modal.description": "Vous pouvez compléter votre profil dans les paramètres à tout moment si vous changez d'avis.",
"welcome.page.error.heading": "Nous n'avons pas pu mettre à jour votre profil",
"welcome.page.error.message": "Une erreur s'est produite. Vous pouvez compléter votre profil dans les paramètres à tout moment.",
"recommendation.page.title": "Recommendations | {siteName}",
"recommendation.page.heading": "We have a few recommendations to get you started.",
"recommendation.skip.button": "Skip for now",
"register.page.title": "S'inscrire | {siteName}",
"registration.fullname.label": "Nom complet",
"registration.email.label": "Email",
"registration.username.label": "Nom d'utilisateur public",
"registration.password.label": "Mot de passe",
"registration.country.label": "Pays/Région",
"registration.opt.in.label": "{siteName} peux m'envoyer des messages de marketing.",
"help.text.name": "Ce nom sera utilisé pour toutes les attestations que vous obtiendrez.",
"help.text.username.1": "Le nom qui vous identifiera dans vos cours.",
"help.text.username.2": "Cela ne peut pas être modifié ultérieurement.",
"help.text.email": "Pour l'activation du compte et les mises à jour importantes",
"create.account.for.free.button": "Créer un compte gratuitement",
"registration.other.options.heading": "Ou inscrivez-vous avec :",
"register.institution.login.button": "Identifiants de l'établissement/du campus",
"register.institution.login.page.title": "Inscription avec les crédentiels d'institution ou de campus",
"empty.name.field.error": "Saisissez votre nom complet",
"empty.email.field.error": "Saisissez votre courriel",
"empty.username.field.error": "Le nom d'utilisateur doit comporter entre 2 et 30 caractères",
"empty.password.field.error": "Les critères de mot de passe n'ont pas été remplis",
"empty.country.field.error": "Sélectionnez votre pays ou région de résidence",
"email.do.not.match": "The email addresses do not match.",
"email.invalid.format.error": "Enter a valid email address",
"username.validation.message": "Le nom d'utilisateur doit comporter entre 2 et 30 caractères",
"name.validation.message": "Enter a valid name",
"username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
"registration.request.failure.header": "Nous n'avons pas pu créer votre compte.",
"registration.empty.form.submission.error": "Veuillez vérifier vos réponses et réessayer.",
"registration.request.server.error": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
"registration.rate.limit.error": "Trop de tentatives d'inscriptions ont échoué. Réessayez plus tard.",
"registration.tpa.session.expired": "L'inscription avec {provider} a échouée.",
"terms.of.service.and.honor.code": "Conditions d'utilisation et Code d'honneur",
"privacy.policy": "Politique de confidentialité",
"honor.code": "Code d'honneur",
"terms.of.service": " Conditions d'utilisation",
"registration.username.suggestion.label": "Suggéré :",
"did.you.mean.alert.text": "Vouliez-vous dire",
"register.page.terms.of.service.and.honor.code": "En créant un compte, vous acceptez le {tosAndHonorCode} et vous reconnaissez que {platformName} et chaque\n membre peut traiter vos données personnelles conformément à la {privacyPolicy}.",
"register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
"register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
"sign.in": "Connectez-vous",
"reset.password.page.title": "Réinitialiser le mot de passe | {siteName}",
"reset.password": "Réinitialiser le mot de passe",
"reset.password.page.instructions": "Saisir et confirmer votre nouveau mot de passe.",
"new.password.label": "Nouveau mot de passe",
"confirm.password.label": "Confirmer le mot de passe",
"passwords.do.not.match": "Les mots de passe ne correspondent pas",
"confirm.your.password": "Confirmer votre mot de passe",
"reset.password.failure.heading": "Nous n'avons pas pu réinitialiser votre mot de passe.",
"reset.password.form.submission.error": "Veuillez vérifier vos réponses et réessayer.",
"reset.server.rate.limit.error": "Trop de demandes.",
"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."
}

View File

@@ -1 +0,0 @@
{}

View File

@@ -1,166 +0,0 @@
{
"start.learning": "Start learning",
"with.site.name": "with {siteName}",
"complete.your.profile.1": "Complete",
"complete.your.profile.2": "your profile",
"welcome.to.platform": "Welcome to {siteName}, {username}!",
"institution.login.page.sub.heading": "Choose your institution from the list below",
"logistration.sign.in": "Sign in",
"logistration.register": "Register",
"enterprisetpa.title.heading": "Would you like to sign in using your {providerName} credentials?",
"enterprisetpa.login.button.text": "Show me other ways to sign in or register",
"enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
"sso.sign.in.with": "Sign in with {providerName}",
"sso.create.account.using": "Create account using {providerName}",
"show.password": "Show password",
"hide.password": "Hide password",
"one.letter": "1 letter",
"one.number": "1 number",
"eight.characters": "8 characters",
"password.sr.only.helping.text": "Password must contain at least 8 characters, at least one letter, and at least one number",
"tpa.alert.heading": "Almost done!",
"login.third.party.auth.account.not.linked": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
"register.third.party.auth.account.not.linked": "You've successfully signed into {currentProvider}! We just need a little more information before you start learning with {platformName}.",
"registration.using.tpa.form.heading": "Finish creating your account",
"zendesk.supportTitle": "edX Support",
"zendesk.selectTicketForm": "Please choose your request type:",
"error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
"forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password.\n If you do not receive a password reset message after 1 minute, verify that you entered\n the correct email address, or check your spam folder. If you need further assistance, {supportLink}.",
"forgot.password.page.title": "Forgot Password | {siteName}",
"forgot.password.page.heading": "Reset password",
"forgot.password.page.instructions": "Please enter your email address below and we will send you an email with instructions on how to reset your password.",
"forgot.password.page.invalid.email.message": "Enter a valid email address",
"forgot.password.page.email.field.label": "Email",
"forgot.password.page.submit.button": "Submit",
"forgot.password.error.alert.title.": "We were unable to contact you.",
"forgot.password.error.message.title": "An error occurred.",
"forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
"forgot.password.empty.email.field.error": "Enter your email",
"forgot.password.email.help.text": "The email address you used to register with {platformName}",
"confirmation.message.title": "Check your email",
"confirmation.support.link": "contact technical support",
"need.help.sign.in.text": "Need help signing in?",
"additional.help.text": "For additional help, contact {platformName} support at ",
"sign.in.text": "Sign in",
"extend.field.errors": "{emailError} below.",
"invalid.token.heading": "Invalid password reset link",
"invalid.token.error.message": "This password reset link is invalid. It may have been used already. Enter your email below to receive a new link.",
"token.validation.rate.limit.error.heading": "Too many requests",
"token.validation.rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
"token.validation.internal.sever.error.heading": "Token validation failure",
"token.validation.internal.sever.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
"internal.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
"account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
"login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n check your spam folders or {supportLink}.",
"allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
"login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in\n attempts before your account is temporarily locked.",
"login.incorrect.credentials.error.attempts.text.2": "If you've forgotten your password, {resetLink}",
"account.locked.out.message.2": "To be on the safe side, you can {resetLink} before trying again.",
"login.incorrect.credentials.error.with.reset.link": "The username, email, or password you entered is incorrect. Please try again or {resetLink}.",
"login.page.title": "Login | {siteName}",
"login.user.identity.label": "Username or email",
"login.password.label": "Password",
"sign.in.button": "Sign in",
"forgot.password": "Forgot password",
"institution.login.button": "Institution/campus credentials",
"institution.login.page.title": "Sign in with institution/campus credentials",
"login.other.options.heading": "Or sign in with:",
"non.compliant.password.title": "We recently changed our password requirements",
"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 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.",
"account.activation.success.message": "You will now receive email updates and alerts from us related to the courses you are enrolled in. Sign in to continue.",
"account.activation.info.message": "This account has already been activated.",
"account.activation.error.message.title": "Your account could not be activated",
"account.activation.support.link": "contact support",
"account.confirmation.success.message.title": "Success! You have confirmed your email.",
"account.confirmation.success.message": "Sign in to continue.",
"account.confirmation.info.message": "This email has already been confirmed.",
"account.confirmation.error.message.title": "Your email could not be confirmed",
"tpa.account.link": "{provider} account",
"internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
"login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
"login.failure.header.title": "We couldn't sign you in.",
"contact.support.link": "contact {platformName} support",
"login.incorrect.credentials.error": "The username, email, or password you entered is incorrect. Please try again.",
"login.form.invalid.error.message": "Please fill in the fields below.",
"login.incorrect.credentials.error.reset.link.text": "reset your password",
"login.incorrect.credentials.error.before.account.blocked.text": "click here to reset it.",
"password.security.nudge.title": "Password security",
"password.security.block.title": "Password change required",
"password.security.nudge.body": "Our system detected that your password is vulnerable. We recommend you change it so that your account stays secure.",
"password.security.block.body": "Our system detected that your password is vulnerable. Change your password so that your account stays secure.",
"password.security.close.button": "Close",
"password.security.redirect.to.reset.password.button": "Reset your password",
"progressive.profiling.page.title": "Welcome | {siteName}",
"progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
"optional.fields.information.link": "Learn more about how we use this information.",
"optional.fields.submit.button": "Submit",
"optional.fields.skip.button": "Skip for now",
"optional.fields.next.button": "Next",
"continue.to.platform": "Continue to {platformName}",
"modal.title": "Thanks for letting us know.",
"modal.description": "You can complete your profile in settings at any time if you change your mind.",
"welcome.page.error.heading": "We couldn't update your profile",
"welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time.",
"recommendation.page.title": "Recommendations | {siteName}",
"recommendation.page.heading": "We have a few recommendations to get you started.",
"recommendation.skip.button": "Skip for now",
"register.page.title": "Register | {siteName}",
"registration.fullname.label": "Full name",
"registration.email.label": "Email",
"registration.username.label": "Public username",
"registration.password.label": "Password",
"registration.country.label": "Country/Region",
"registration.opt.in.label": "I agree that {siteName} may send me marketing messages.",
"help.text.name": "This name will be used by any certificates that you earn.",
"help.text.username.1": "The name that will identify you in your courses.",
"help.text.username.2": "This can not be changed later.",
"help.text.email": "For account activation and important updates",
"create.account.for.free.button": "Create an account for free",
"registration.other.options.heading": "Or register with:",
"register.institution.login.button": "Institution/campus credentials",
"register.institution.login.page.title": "Register with institution/campus credentials",
"empty.name.field.error": "Enter your full name",
"empty.email.field.error": "Enter your email",
"empty.username.field.error": "Username must be between 2 and 30 characters",
"empty.password.field.error": "Password criteria has not been met",
"empty.country.field.error": "Select your country or region of residence",
"email.do.not.match": "The email addresses do not match.",
"email.invalid.format.error": "Enter a valid email address",
"username.validation.message": "Username must be between 2 and 30 characters",
"name.validation.message": "Enter a valid name",
"username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
"registration.request.failure.header": "We couldn't create your account.",
"registration.empty.form.submission.error": "Please check your responses and try again.",
"registration.request.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
"registration.rate.limit.error": "Too many failed registration attempts. Try again later.",
"registration.tpa.session.expired": "Registration using {provider} has timed out.",
"terms.of.service.and.honor.code": "Terms of Service and Honor Code",
"privacy.policy": "Privacy Policy",
"honor.code": "Honor Code",
"terms.of.service": "Terms of Service",
"registration.username.suggestion.label": "Suggested:",
"did.you.mean.alert.text": "Did you mean",
"register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each\n Member process your personal data in accordance with the {privacyPolicy}.",
"register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
"register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
"sign.in": "Sign in",
"reset.password.page.title": "Reset Password | {siteName}",
"reset.password": "Reset password",
"reset.password.page.instructions": "Enter and confirm your new password.",
"new.password.label": "New password",
"confirm.password.label": "Confirm password",
"passwords.do.not.match": "Passwords do not match",
"confirm.your.password": "Confirm your password",
"reset.password.failure.heading": "We couldn't reset your password.",
"reset.password.form.submission.error": "Please check your responses and try again.",
"reset.server.rate.limit.error": "Too many requests.",
"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."
}

View File

@@ -1 +0,0 @@
{}

View File

@@ -1,166 +0,0 @@
{
"start.learning": "Inizia a imparare",
"with.site.name": "con {siteName}",
"complete.your.profile.1": "Completata",
"complete.your.profile.2": "Il tuo profilo",
"welcome.to.platform": "Benvenuto in {siteName}, {username}!",
"institution.login.page.sub.heading": "Scegli il tuo istituto dall&#39;elenco sottostante",
"logistration.sign.in": "Accedi",
"logistration.register": "Registrazione",
"enterprisetpa.title.heading": "Vuoi accedere utilizzando le credenziali {providerName}?",
"enterprisetpa.login.button.text": "Mostrami altre modalità di accesso o registrazione",
"enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
"sso.sign.in.with": "Accedi con {providerName}",
"sso.create.account.using": "Crea un account utilizzando {providerName}",
"show.password": "Mostra password",
"hide.password": "Nascondi password",
"one.letter": "1 lettera",
"one.number": "1 numero",
"eight.characters": "8 caratteri",
"password.sr.only.helping.text": "La password deve contenere almeno 8 caratteri, almeno una lettera e almeno un numero",
"tpa.alert.heading": "Quasi fatto!",
"login.third.party.auth.account.not.linked": "Hai correttamente effettuato l'accesso in {currentProvider}, ma il tuo account {currentProvider} non ha un account {platformName} ad esso abbinato. Per collegare i tuoi account accesi utilizzando la password {platformName}. ",
"register.third.party.auth.account.not.linked": "Hai eseguito correttamente l&#39;accesso a {a03f0f8cfb85cz0}! Abbiamo solo bisogno di un po&#39; più di informazioni prima di iniziare a imparare con {platformName}.",
"registration.using.tpa.form.heading": "Completa la creazione del tuo account",
"zendesk.supportTitle": "edX Support",
"zendesk.selectTicketForm": "Please choose your request type:",
"error.notfound.message": "La pagina che stai cercando non è disponibile o si è verificato un errore nell'URL. Controlla l'URL e riprova. ",
"forgot.password.confirmation.message": "Abbiamo inviato un&#39;email a {email} con le istruzioni per reimpostare la password. Se non ricevi un messaggio di reimpostazione della password dopo 1 minuto, verifica di aver inserito l&#39;indirizzo e-mail corretto o controlla la cartella spam. Se hai bisogno di ulteriore assistenza, {supportLink}.",
"forgot.password.page.title": "Dimenticato la password | {siteName}",
"forgot.password.page.heading": "Resetta la password",
"forgot.password.page.instructions": "Inserisci il tuo indirizzo e-mail qui sotto e ti invieremo un&#39;e-mail con le istruzioni su come reimpostare la tua password.",
"forgot.password.page.invalid.email.message": "Inserisci un indirizzo email valido",
"forgot.password.page.email.field.label": "Email",
"forgot.password.page.submit.button": "Invia",
"forgot.password.error.alert.title.": "Non siamo stati in grado di contattarti.",
"forgot.password.error.message.title": "Si è verificato un errore. ",
"forgot.password.request.in.progress.message": "La tua richiesta precedente è in corso di elaborazione, riprova tra qualche istante. ",
"forgot.password.empty.email.field.error": "Inserisci il tuo indirizzo email",
"forgot.password.email.help.text": "L'indirizzo email che hai utilizzato per registrarti con {platformName}",
"confirmation.message.title": "Controlla la tua casella di posta",
"confirmation.support.link": "contatta il supporto tecnico",
"need.help.sign.in.text": "Hai bisogno di aiuto per l'accesso? ",
"additional.help.text": "Per ulteriore assistenza, contattare l&#39;assistenza {platformName} all&#39;indirizzo",
"sign.in.text": "Accedi",
"extend.field.errors": "{emailError} di seguito.",
"invalid.token.heading": "Link di ripristino della password non valido",
"invalid.token.error.message": "Questo link per reimpostare la password non è valido. Potrebbe essere stato già utilizzato. Inserisci la tua email qui sotto per ricevere un nuovo link.",
"token.validation.rate.limit.error.heading": "Troppe richieste",
"token.validation.rate.limit.error": "Si è verificato un errore dovuto alle troppe richieste. Prova di nuovo più tardi.",
"token.validation.internal.sever.error.heading": "Errore di convalida del token",
"token.validation.internal.sever.error": "Si è verificato un errore. Prova ad aggiornare la pagina oppure verifica la connessione internet.",
"internal.server.error": "Si è verificato un errore. Prova ad aggiornare la pagina oppure verifica la connessione internet.",
"account.activation.error.message": "Si è verificato un errore, seleziona {supportLink} per risolvere il problema. ",
"login.inactive.user.error": "Per accedere, devi attivare il tuo account.{lineBreak} {lineBreak}Abbiamo appena inviato un link di attivazione a {email}. Se non ricevi un'email, controlla la cartella della posta indesiderata oppure seleziona {supportLink}.",
"allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
"login.incorrect.credentials.error.attempts.text.1": "Il nome utente, l&#39;e-mail o la password che hai inserito non sono corretti. Hai {remainingAttempts} più tentativi di accesso prima che il tuo account venga temporaneamente bloccato.",
"login.incorrect.credentials.error.attempts.text.2": "Se hai dimenticato la password, {resetLink}",
"account.locked.out.message.2": "Per sicurezza, puoi {resetLink} prima di riprovare.",
"login.incorrect.credentials.error.with.reset.link": "Il nome utente, l&#39;e-mail o la password inseriti non sono corretti. Riprova o {resetLink}.",
"login.page.title": "Accesso | {siteName}",
"login.user.identity.label": "Nome utente o email ",
"login.password.label": "Password",
"sign.in.button": "Accedi",
"forgot.password": "Password dimenticata",
"institution.login.button": "Credenziali dell&#39;istituto/campus",
"institution.login.page.title": "Accedi con le credenziali dell'istituzione/campus",
"login.other.options.heading": "Oppure accedi con:",
"non.compliant.password.title": "Abbiamo di recente modificato i requisiti per la password ",
"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 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. ",
"account.activation.success.message": "A breve ti invieremo avvisi e aggiornamenti via email relativi al corso a cui ti sei iscritto. Accedi per proseguire.",
"account.activation.info.message": "Questo account è già stato attivato.",
"account.activation.error.message.title": "Impossibile attivare il tuo account.",
"account.activation.support.link": "contatta il supporto",
"account.confirmation.success.message.title": "Successo! Hai confermato la tua email.",
"account.confirmation.success.message": "Accedi per continuare.",
"account.confirmation.info.message": "Questa email è già stata confermata.",
"account.confirmation.error.message.title": "Impossibile confermare la tua email",
"tpa.account.link": "{provider} account",
"internal.server.error.message": "Si è verificato un errore. Prova ad aggiornare la pagina oppure verifica la connessione internet.",
"login.rate.limit.reached.message": "Troppi tentativi di login falliti. Riprova più tardi.",
"login.failure.header.title": "Impossibile autorizzare il tuo accesso.",
"contact.support.link": "contatta il supporto {platformName} ",
"login.incorrect.credentials.error": "Il nome utente, l&#39;e-mail o la password inseriti non sono corretti. Per favore riprova.",
"login.form.invalid.error.message": "Si prega di compilare i campi sottostanti.",
"login.incorrect.credentials.error.reset.link.text": "reimposta la tua password",
"login.incorrect.credentials.error.before.account.blocked.text": "clicca qui per ripristinarlo.",
"password.security.nudge.title": "Sicurezza della password",
"password.security.block.title": "È richiesta la modifica della password",
"password.security.nudge.body": "Il nostro sistema ha rilevato che la tua password è vulnerabile. Ti consigliamo di cambiarlo in modo che il tuo account rimanga sicuro.",
"password.security.block.body": "Il nostro sistema ha rilevato che la tua password è vulnerabile. Cambia la tua password in modo che il tuo account rimanga sicuro.",
"password.security.close.button": "Chiudi",
"password.security.redirect.to.reset.password.button": "Ripristina la tua password",
"progressive.profiling.page.title": "Welcome | {siteName}",
"progressive.profiling.page.heading": "Alcune domande per te ci aiuteranno a diventare più intelligenti.",
"optional.fields.information.link": "Ulteriori informazioni su come utilizziamo queste informazioni.",
"optional.fields.submit.button": "Invia",
"optional.fields.skip.button": "Salta per ora",
"optional.fields.next.button": "Next",
"continue.to.platform": "Continua con {platformName}",
"modal.title": "Grazie per averci fatto sapere.",
"modal.description": "Puoi completare il tuo profilo nelle impostazioni in qualsiasi momento se cambi idea.",
"welcome.page.error.heading": "Impossibile aggiornare il tuo profilo",
"welcome.page.error.message": "Si è verificato un errore. Puoi completare il tuo profilo nelle impostazioni in qualsiasi momento.",
"recommendation.page.title": "Recommendations | {siteName}",
"recommendation.page.heading": "We have a few recommendations to get you started.",
"recommendation.skip.button": "Skip for now",
"register.page.title": "Registrazione | {siteName}",
"registration.fullname.label": "Nome e Cognome",
"registration.email.label": "Email",
"registration.username.label": "Nome utente pubblico",
"registration.password.label": "Password",
"registration.country.label": "Paese/regione",
"registration.opt.in.label": "Accetto che {siteName} possa inviarmi messaggi di marketing.",
"help.text.name": "Questo nome verrà utilizzato per tutti i certificati conseguiti.",
"help.text.username.1": "Il nome che ti identificherà nei tuoi corsi.",
"help.text.username.2": "Questo non può essere modificato in seguito.",
"help.text.email": "Per l&#39;attivazione dell&#39;account e aggiornamenti importanti",
"create.account.for.free.button": "Crea un account gratis",
"registration.other.options.heading": "Oppure registrati con:",
"register.institution.login.button": "Credenziali dell&#39;istituto/campus",
"register.institution.login.page.title": "Registrati con le credenziali dell'istituzione/campus",
"empty.name.field.error": "Inserisci il tuo nome e cognome",
"empty.email.field.error": "Inserisci il tuo indirizzo email",
"empty.username.field.error": "Il nome utente deve essere compreso tra 2 e 30 caratteri",
"empty.password.field.error": "I criteri della password non sono stati soddisfatti",
"empty.country.field.error": "Seleziona il tuo paese o regione di residenza",
"email.do.not.match": "Gli indirizzi email non corrispondono.",
"email.invalid.format.error": "Inserisci un indirizzo email valido",
"username.validation.message": "Il nome utente deve essere compreso tra 2 e 30 caratteri",
"name.validation.message": "Inserisci un nome valido",
"username.format.validation.message": "I nomi utente possono contenere solo lettere (AZ, az), numeri (0-9), trattini bassi (_) e trattini (-). I nomi utente non possono contenere spazi",
"registration.request.failure.header": "Impossibile creare il tuo account.",
"registration.empty.form.submission.error": "Controlla le tue risposte e riprova.",
"registration.request.server.error": "Si è verificato un errore. Prova ad aggiornare la pagina oppure verifica la connessione internet.",
"registration.rate.limit.error": "Troppi tentativi di registrazione non riusciti. Prova di nuovo più tardi.",
"registration.tpa.session.expired": "La registrazione mediante {provider} è andata in timeout.",
"terms.of.service.and.honor.code": "Termini e Condizioni del Servizio",
"privacy.policy": "Informativa sulla privacy",
"honor.code": "Codice d'Onore",
"terms.of.service": "Termini di Servizio",
"registration.username.suggestion.label": "Suggerito:",
"did.you.mean.alert.text": "Intendevi",
"register.page.terms.of.service.and.honor.code": "Creando un account, accetti il {tosAndHonorCode} e riconosci che {platformName} e ciascun Membro trattano i tuoi dati personali in conformità con l' {privacyPolicy}.",
"register.page.honor.code": "Accetto {platformName} {tosAndHonorCode}",
"register.page.terms.of.service": "Accetto {platformName} {termsOfService}",
"sign.in": "Accedi",
"reset.password.page.title": "Ripristina password | {siteName}",
"reset.password": "Resetta la password",
"reset.password.page.instructions": "Immettere e confermare la nuova password. ",
"new.password.label": "Nuova password",
"confirm.password.label": "Conferma password",
"passwords.do.not.match": "le passwords non corrispondono",
"confirm.your.password": "Conferma la tua password",
"reset.password.failure.heading": "Impossibile ripristinare la tua password.",
"reset.password.form.submission.error": "Controlla le tue risposte e riprova.",
"reset.server.rate.limit.error": "Troppe richieste.",
"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."
}

View File

@@ -1 +0,0 @@
{}

Some files were not shown because too many files have changed in this diff Show More