Merge pull request #378 from edx/jlajoie/ENT-3302

fix: ENTERPRISE_LEARNER_PORTAL_HOSTNAME added for header updates
2020-08-06 07:25:49 -04:00 · 2020-08-06 07:09:53 -04:00 · 2020-07-21 09:24:54 -04:00 · 2020-04-26 11:11:35 +00:00 · 2020-04-21 13:06:15 -04:00
5 changed files with 42 additions and 25 deletions
--- a/.env
+++ b/.env
@@ -16,6 +16,7 @@ SITE_NAME=null
 USER_INFO_COOKIE_NAME=null
 APPLE_APP_STORE_URL=null
 CONTACT_URL=null
+ENTERPRISE_LEARNER_PORTAL_HOSTNAME=null
 ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM=null
 ENTERPRISE_MARKETING_URL=null
 ENTERPRISE_MARKETING_UTM_CAMPAIGN=null
--- a/.env.development
+++ b/.env.development
@@ -8,7 +8,7 @@ ECOMMERCE_BASE_URL='http://localhost:18130'
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
 LOGIN_URL='http://localhost:18000/login'
-LOGOUT_URL='http://localhost:18000/login'
+LOGOUT_URL='http://localhost:18000/logout'
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 ORDER_HISTORY_URL='localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
@@ -17,6 +17,7 @@ SITE_NAME='edX'
 USER_INFO_COOKIE_NAME='edx-user-info'
 APPLE_APP_STORE_URL='https://www.apple.com/ios/app-store/'
 CONTACT_URL='http://localhost:18000/contact'
+ENTERPRISE_LEARNER_PORTAL_HOSTNAME='http://localhost:8080'
 ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM='Footer'
 ENTERPRISE_MARKETING_URL='http://example.com'
 ENTERPRISE_MARKETING_UTM_CAMPAIGN='my_campaign'
--- a/.env.test
+++ b/.env.test
@@ -6,7 +6,7 @@ ECOMMERCE_BASE_URL='http://localhost:18130'
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
 LOGIN_URL='http://localhost:18000/login'
-LOGOUT_URL='http://localhost:18000/login'
+LOGOUT_URL='http://localhost:18000/logout'
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 ORDER_HISTORY_URL='localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
--- a/package-lock.json
+++ b/package-lock.json
@@ -1558,28 +1558,28 @@
      }
    },
    "@edx/frontend-component-footer": {
-      "version": "10.0.7",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-10.0.7.tgz",
-      "integrity": "sha512-CCEjGToWhkhfAcgr27Y660y7Sg7qiHfC+SV83dcAQnK47m5fwLQaJZZ9PRwbotXZZ/Ynmqpltd9Lgk7JQ7p0eg==",
+      "version": "10.0.9",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-10.0.9.tgz",
+      "integrity": "sha512-8qRxr/TvFibB1CI6bzj0Yn/Ky7MIvSVdSGNfF/njWfJKX1HSJHhRM4GonTUMBX8mWybdD4wfaJqrDlCT0F6Qqg==",
      "requires": {
-        "@fortawesome/fontawesome-svg-core": "1.2.27",
+        "@fortawesome/fontawesome-svg-core": "1.2.28",
        "@fortawesome/free-brands-svg-icons": "5.8.2",
        "@fortawesome/free-regular-svg-icons": "5.8.2",
        "@fortawesome/free-solid-svg-icons": "5.8.2",
-        "@fortawesome/react-fontawesome": "0.1.8"
+        "@fortawesome/react-fontawesome": "0.1.9"
      },
      "dependencies": {
        "@fortawesome/fontawesome-common-types": {
-          "version": "0.2.27",
-          "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.27.tgz",
-          "integrity": "sha512-97GaByGaXDGMkzcJX7VmR/jRJd8h1mfhtA7RsxDBN61GnWE/PPCZhOdwG/8OZYktiRUF0CvFOr+VgRkJrt6TWg=="
+          "version": "0.2.28",
+          "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.28.tgz",
+          "integrity": "sha512-gtis2/5yLdfI6n0ia0jH7NJs5i/Z/8M/ZbQL6jXQhCthEOe5Cr5NcQPhgTvFxNOtURE03/ZqUcEskdn2M+QaBg=="
        },
        "@fortawesome/fontawesome-svg-core": {
-          "version": "1.2.27",
-          "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.27.tgz",
-          "integrity": "sha512-sOD3DKynocnHYpuw2sLPnTunDj7rLk91LYhi2axUYwuGe9cPCw7Bsu9EWtVdNJP+IYgTCZIbyARKXuy5K/nv+Q==",
+          "version": "1.2.28",
+          "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.28.tgz",
+          "integrity": "sha512-4LeaNHWvrneoU0i8b5RTOJHKx7E+y7jYejplR7uSVB34+mp3Veg7cbKk7NBCLiI4TyoWS1wh9ZdoyLJR8wSAdg==",
          "requires": {
-            "@fortawesome/fontawesome-common-types": "^0.2.27"
+            "@fortawesome/fontawesome-common-types": "^0.2.28"
          }
        },
        "@fortawesome/free-brands-svg-icons": {
@@ -1605,6 +1605,14 @@
          "requires": {
            "@fortawesome/fontawesome-common-types": "^0.2.18"
          }
+        },
+        "@fortawesome/react-fontawesome": {
+          "version": "0.1.9",
+          "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.9.tgz",
+          "integrity": "sha512-49V3WNysLZU5fZ3sqSuys4nGRytsrxJktbv3vuaXkEoxv22C6T7TEG0TW6+nqVjMnkfCQd5xOnmJoZHMF78tOw==",
+          "requires": {
+            "prop-types": "^15.7.2"
+          }
        }
      }
    },
@@ -2428,6 +2436,12 @@
        "loader-utils": "^1.2.3"
      }
    },
+    "@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true
+    },
    "@types/babel__core": {
      "version": "7.1.3",
      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz",
@@ -5002,9 +5016,9 @@
      "dev": true
    },
    "codecov": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.6.5.tgz",
-      "integrity": "sha512-v48WuDMUug6JXwmmfsMzhCHRnhUf8O3duqXvltaYJKrO1OekZWpB/eH6iIoaxMl8Qli0+u3OxptdsBOYiD7VAQ==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.7.1.tgz",
+      "integrity": "sha512-JHWxyPTkMLLJn9SmKJnwAnvY09kg2Os2+Ux+GG7LwZ9g8gzDDISpIN5wAsH1UBaafA/yGcd3KofMaorE8qd6Lw==",
      "dev": true,
      "requires": {
        "argv": "0.0.2",
@@ -10477,19 +10491,20 @@
      }
    },
    "http-proxy-agent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.0.tgz",
-      "integrity": "sha512-GX0FA6+IcDf4Oxc/FBWgYj4zKgo/DnZrksaG9jyuQLExs6xlX+uI5lcA8ymM3JaZTRrF/4s2UX19wJolyo7OBA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
      "dev": true,
      "requires": {
+        "@tootallnate/once": "1",
        "agent-base": "6",
        "debug": "4"
      },
      "dependencies": {
        "agent-base": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
-          "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz",
+          "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==",
          "dev": true,
          "requires": {
            "debug": "4"
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
    "ie 11"
  ],
  "dependencies": {
-    "@edx/frontend-component-footer": "10.0.7",
+    "@edx/frontend-component-footer": "10.0.9",
    "@edx/frontend-component-header": "2.0.5",
    "@edx/frontend-platform": "1.1.14",
    "@edx/paragon": "7.1.3",
@@ -80,7 +80,7 @@
    "@commitlint/cli": "8.2.0",
    "@commitlint/config-angular": "8.2.0",
    "@edx/frontend-build": "2.0.6",
-    "codecov": "3.6.5",
+    "codecov": "3.7.1",
    "enzyme": "3.10.0",
    "enzyme-adapter-react-16": "1.15.2",
    "es-check": "5.0.0",
Author	SHA1	Message	Date
Jeff LaJoie	73df912f29	Merge pull request #378 from edx/jlajoie/ENT-3302 fix: ENTERPRISE_LEARNER_PORTAL_HOSTNAME added for header updates	2020-08-06 07:25:49 -04:00
Jeff LaJoie	d64e497407	fix: ENTERPRISE_LEARNER_PORTAL_HOSTNAME added for header updates	2020-08-06 07:09:53 -04:00
dependabot[bot]	3725a36b30	build(deps-dev): bump codecov from 3.6.5 to 3.7.1 (#376 ) Bumps [codecov](https://github.com/codecov/codecov-node) from 3.6.5 to 3.7.1. - [Release notes](https://github.com/codecov/codecov-node/releases) - [Commits](https://github.com/codecov/codecov-node/compare/v3.6.5...v3.7.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-07-21 09:24:54 -04:00
Renovate Bot	3cd6999886	fix(deps): update dependency @edx/frontend-component-footer to v10.0.9	2020-04-26 11:11:35 +00:00
David Joy	3ff2a0a359	fix: fixing LOGOUT_URL for dev and test (#374 )	2020-04-21 13:06:15 -04:00