diff --git a/.env.development b/.env.development index f4b40d7e..a9ae648c 100644 --- a/.env.development +++ b/.env.development @@ -9,6 +9,10 @@ LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference' LMS_BASE_URL='http://localhost:18000' LOGIN_URL='http://localhost:1999/login' LOGOUT_URL='http://localhost:18000/logout' +LOGO_URL=https://edx-cdn.org/v3/default/logo.svg +LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg +LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg +FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico MARKETING_SITE_BASE_URL='http://localhost:18000' ORDER_HISTORY_URL='http://localhost:1996/orders' REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh' diff --git a/.env.test b/.env.test index 82561857..c99e1b99 100644 --- a/.env.test +++ b/.env.test @@ -7,6 +7,10 @@ LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference' LMS_BASE_URL='http://localhost:18000' LOGIN_URL='http://localhost:18000/login' LOGOUT_URL='http://localhost:18000/logout' +LOGO_URL=https://edx-cdn.org/v3/default/logo.svg +LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg +LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg +FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico MARKETING_SITE_BASE_URL='http://localhost:18000' ORDER_HISTORY_URL='http://localhost:1996/orders' REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh' diff --git a/package-lock.json b/package-lock.json index 18247b03..6ca06efe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2632,9 +2632,9 @@ } }, "@edx/frontend-component-header": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-2.0.5.tgz", - "integrity": "sha512-eiIT2RXgPt3BoMwtc/2MdMencWfuRcgye5QyjFhp40a2krQOi98aUM5C3d72Zphvzl5yekxP2s2QYidIg5BssA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-2.2.0.tgz", + "integrity": "sha512-wxB4ynotFIEPzKYG9c8ktYw5dteEV88pjojftCln0tOBXAQMbOFfFVq5oRL7r+VG/a0JrIpnWT5wY17rU/4LBQ==", "requires": { "babel-polyfill": "6.26.0", "react-responsive": "8.0.3", @@ -2642,24 +2642,27 @@ } }, "@edx/frontend-platform": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-1.3.7.tgz", - "integrity": "sha512-cVSwpbgbP/886uOxIINPWHe6sLpqFf4wOm0g+dIi2ygxMMdNd8PRGOdpTnRHmpIqaDKPku4ybNPybF/B9IrB1Q==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-1.8.0.tgz", + "integrity": "sha512-R4LGBKaSBWC9xxG3eTN78zw5CkBes4xQgazt78ApgenxzIoun+y0tdWyc/8PpjbKmyj0nACpsfARyeQy4rnGKA==", "requires": { "@cospired/i18n-iso-languages": "2.1.2", "axios": "0.18.1", + "axios-cache-adapter": "^2.5.0", "form-urlencoded": "4.1.4", "glob": "7.1.6", "history": "4.10.1", "i18n-iso-countries": "4.3.1", "jwt-decode": "2.2.0", + "localforage": "^1.9.0", + "localforage-memoryStorageDriver": "^0.9.2", "lodash.camelcase": "4.3.0", "lodash.memoize": "4.1.2", "lodash.merge": "4.6.2", "lodash.snakecase": "4.1.1", "pubsub-js": "1.7.0", "react-intl": "2.9.0", - "universal-cookie": "4.0.3" + "universal-cookie": "4.0.4" }, "dependencies": { "form-urlencoded": { @@ -3593,11 +3596,6 @@ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==" }, - "@types/object-assign": { - "version": "4.0.30", - "resolved": "https://registry.npmjs.org/@types/object-assign/-/object-assign-4.0.30.tgz", - "integrity": "sha1-iUk3HVqZ9Dge4PHfCpt6GH4H5lI=" - }, "@types/prop-types": { "version": "15.7.3", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", @@ -4693,6 +4691,15 @@ "is-buffer": "^2.0.2" } }, + "axios-cache-adapter": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/axios-cache-adapter/-/axios-cache-adapter-2.5.0.tgz", + "integrity": "sha512-YcMPdMoqmSLoZx7A5YD/PdYGuX6/Y9M2tHBhaIXvXrPeGgNnbW7nb3+uArWlT53WGHLfclnu2voMmS7jGXVg6A==", + "requires": { + "cache-control-esm": "1.0.0", + "lodash": "^4.17.11" + } + }, "axobject-query": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.1.2.tgz", @@ -6030,6 +6037,11 @@ "unset-value": "^1.0.0" } }, + "cache-control-esm": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cache-control-esm/-/cache-control-esm-1.0.0.tgz", + "integrity": "sha512-Fa3UV4+eIk4EOih8FTV6EEsVKO0W5XWtNs6FC3InTfVz+EjurjPfDXY5wZDo/lxjDxg5RjNcurLyxEJBcEUx9g==" + }, "cacheable-request": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", @@ -12326,6 +12338,11 @@ "is-cwebp-readable": "^2.0.1" } }, + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" + }, "immer": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz", @@ -12648,9 +12665,9 @@ "integrity": "sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==" }, "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" }, "is-callable": { "version": "1.1.4", @@ -13840,6 +13857,14 @@ "type-check": "~0.3.2" } }, + "lie": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", + "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=", + "requires": { + "immediate": "~3.0.5" + } + }, "lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", @@ -13891,6 +13916,22 @@ } } }, + "localforage": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz", + "integrity": "sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g==", + "requires": { + "lie": "3.1.1" + } + }, + "localforage-memoryStorageDriver": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/localforage-memoryStorageDriver/-/localforage-memoryStorageDriver-0.9.2.tgz", + "integrity": "sha1-Lg9/8qyw6f9egsUsni6z1juZjTA=", + "requires": { + "localforage": ">=1.4.0" + } + }, "locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", @@ -21141,14 +21182,12 @@ } }, "universal-cookie": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.3.tgz", - "integrity": "sha512-YbEHRs7bYOBTIWedTR9koVEe2mXrq+xdjTJZcoKJK/pQaE6ni28ak2AKXFpevb+X6w3iU5SXzWDiJkmpDRb9qw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz", + "integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==", "requires": { "@types/cookie": "^0.3.3", - "@types/object-assign": "^4.0.30", - "cookie": "^0.4.0", - "object-assign": "^4.1.1" + "cookie": "^0.4.0" } }, "universalify": { diff --git a/package.json b/package.json index 9c97d24a..f66dc1fb 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ "url": "https://github.com/edx/frontend-app-logistration/issues" }, "dependencies": { - "@edx/frontend-component-header": "2.0.5", - "@edx/frontend-platform": "1.3.7", + "@edx/frontend-component-header": "^2.2.0", + "@edx/frontend-platform": "^1.8.0", "@edx/paragon": "^12.0.5", "@fortawesome/fontawesome-svg-core": "1.2.30", "@fortawesome/free-brands-svg-icons": "5.11.2", diff --git a/src/logistration/messages.jsx b/src/logistration/messages.jsx index bb428dec..eb4bd58f 100644 --- a/src/logistration/messages.jsx +++ b/src/logistration/messages.jsx @@ -19,7 +19,7 @@ const messages = defineMessages({ }, 'logistration.forgot.password.link': { id: 'logistration.forgot.password.link', - defaultMessage: 'Forgot password?', + defaultMessage: 'Forgot my password', description: 'Forgot password link', }, 'logistration.already.have.an.edx.account': {