Merge pull request #89 from edx/aehsan/logistration-renmaed-to-authn

fix: logistration renamed to authn
2021-01-28 14:06:36 +05:00 · 2021-01-28 13:08:25 +05:00 · 2021-01-28 12:58:14 +05:00 · 2021-01-28 12:52:31 +05:00 · 2021-01-28 12:34:54 +05:00 · 2021-01-28 12:27:17 +05:00
5 changed files with 44 additions and 37 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1660,13 +1660,13 @@
      }
    },
    "@edx/frontend-platform": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-1.8.0.tgz",
-      "integrity": "sha512-R4LGBKaSBWC9xxG3eTN78zw5CkBes4xQgazt78ApgenxzIoun+y0tdWyc/8PpjbKmyj0nACpsfARyeQy4rnGKA==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-1.8.1.tgz",
+      "integrity": "sha512-oHLSamyIDuCtdS7eDzLcYs4zsAOGf4uuywnnIKg1CnlEHzUrXnfmcajbNM3Wre5jJocGH+1qACuaGLELO+3sAQ==",
      "dev": true,
      "requires": {
        "@cospired/i18n-iso-languages": "2.1.2",
-        "axios": "0.18.1",
+        "axios": "0.21.1",
        "axios-cache-adapter": "^2.5.0",
        "form-urlencoded": "4.1.4",
        "glob": "7.1.6",
@@ -4294,13 +4294,20 @@
      "dev": true
    },
    "axios": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz",
-      "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
      "dev": true,
      "requires": {
-        "follow-redirects": "1.5.10",
-        "is-buffer": "^2.0.2"
+        "follow-redirects": "^1.10.0"
+      },
+      "dependencies": {
+        "follow-redirects": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
+          "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==",
+          "dev": true
+        }
      }
    },
    "axios-cache-adapter": {
@@ -11687,12 +11694,6 @@
      "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=",
      "dev": true
    },
-    "is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "dev": true
-    },
    "is-callable": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
@@ -17907,9 +17908,9 @@
      "dev": true
    },
    "react-redux": {
-      "version": "7.1.1",
-      "resolved": false,
-      "integrity": "sha512-QsW0vcmVVdNQzEkrgzh2W3Ksvr8cqpAv5FhEk7tNEft+5pp7rXxAudTz3VOPawRkLIepItpkEIyLcN/VVXzjTg==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.3.tgz",
+      "integrity": "sha512-uI1wca+ECG9RoVkWQFF4jDMqmaw0/qnvaSvOoL/GA4dNxf6LoV8sUAcNDvE5NWKs4hFpn0t6wswNQnY3f7HT3w==",
      "dev": true,
      "requires": {
        "@babel/runtime": "^7.5.5",
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
    "@commitlint/prompt-cli": "8.2.0",
    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
    "@edx/frontend-build": "5.4.0",
-    "@edx/frontend-platform": "1.8.0",
+    "@edx/frontend-platform": "1.8.1",
    "@edx/paragon": "12.0.5",
    "codecov": "3.7.2",
    "enzyme": "3.10.0",
@@ -49,7 +49,7 @@
    "prop-types": "15.7.2",
    "react": "16.9.0",
    "react-dom": "16.9.0",
-    "react-redux": "7.1.1",
+    "react-redux": "7.1.3",
    "react-router-dom": "5.1.2",
    "react-test-renderer": "16.9.0",
    "reactifex": "1.1.1",
--- a/src/Header.jsx
+++ b/src/Header.jsx
@@ -25,7 +25,7 @@ ensureConfig([

 subscribe(APP_CONFIG_INITIALIZED, () => {
  mergeConfig({
-    LOGISTRATION_MINIMAL_HEADER: !!process.env.LOGISTRATION_MINIMAL_HEADER,
+    AUTHN_MINIMAL_HEADER: !!process.env.AUTHN_MINIMAL_HEADER,
  }, 'Header additional config');
 });

@@ -84,9 +84,9 @@ function Header({ intl }) {
    loggedIn: authenticatedUser !== null,
    username: authenticatedUser !== null ? authenticatedUser.username : null,
    avatar: authenticatedUser !== null ? authenticatedUser.avatar : null,
-    mainMenu: getConfig().LOGISTRATION_MINIMAL_HEADER ? [] : mainMenu,
-    userMenu,
-    loggedOutItems: getConfig().LOGISTRATION_MINIMAL_HEADER ? [] : loggedOutItems,
+    mainMenu: getConfig().AUTHN_MINIMAL_HEADER ? [] : mainMenu,
+    userMenu: getConfig().AUTHN_MINIMAL_HEADER ? [] : userMenu,
+    loggedOutItems: getConfig().AUTHN_MINIMAL_HEADER ? [] : loggedOutItems,
  };

  return (
--- a/src/MobileHeader.jsx
+++ b/src/MobileHeader.jsx
@@ -91,6 +91,8 @@ class MobileHeader extends React.Component {
      stickyOnMobile,
      intl,
      mainMenu,
+      userMenu,
+      loggedOutItems,
    } = this.props;
    const logoProps = { src: logo, alt: logoAltText, href: logoDestination };
    const stickyClassName = stickyOnMobile ? 'sticky-top' : '';
@@ -125,19 +127,21 @@ class MobileHeader extends React.Component {
          { logoDestination === null ? <Logo className="logo" src={logo} alt={logoAltText} /> : <LinkedLogo className="logo" {...logoProps} itemType="http://schema.org/Organization" />}
        </div>
        <div className="w-100 d-flex justify-content-end align-items-center">
-          <Menu tag="nav" aria-label={intl.formatMessage(messages['header.label.secondary.nav'])} className="position-static">
-            <MenuTrigger
-              tag="button"
-              className="icon-button"
-              aria-label={intl.formatMessage(messages['header.label.account.menu'])}
-              title={intl.formatMessage(messages['header.label.account.menu'])}
-            >
-              <Avatar size="1.5rem" src={avatar} alt={username} />
-            </MenuTrigger>
-            <MenuContent tag="ul" className="nav flex-column pin-left pin-right border-top shadow py-2">
-              {loggedIn ? this.renderUserMenuItems() : this.renderLoggedOutItems()}
-            </MenuContent>
-          </Menu>
+          {userMenu.length > 0 || loggedOutItems.length > 0 ? (
+            <Menu tag="nav" aria-label={intl.formatMessage(messages['header.label.secondary.nav'])} className="position-static">
+              <MenuTrigger
+                tag="button"
+                className="icon-button"
+                aria-label={intl.formatMessage(messages['header.label.account.menu'])}
+                title={intl.formatMessage(messages['header.label.account.menu'])}
+              >
+                <Avatar size="1.5rem" src={avatar} alt={username} />
+              </MenuTrigger>
+              <MenuContent tag="ul" className="nav flex-column pin-left pin-right border-top shadow py-2">
+                {loggedIn ? this.renderUserMenuItems() : this.renderLoggedOutItems()}
+              </MenuContent>
+            </Menu>
+          ) : null}
        </div>
      </header>
    );
--- a/src/index.scss
+++ b/src/index.scss
@@ -32,6 +32,8 @@ $white: #fff;
 }

 .site-header-mobile {
+  height: 3rem;
+
  .nav-link {
    text-decoration: none;
    cursor: pointer;
Author	SHA1	Message	Date
Adeel Ehsan	0d64b19ac4	Merge pull request #89 from edx/aehsan/logistration-renmaed-to-authn fix: logistration renamed to authn	2021-01-28 14:06:36 +05:00
adeelehsan	9415709b81	fix: logistration renamed to authn	2021-01-28 13:08:25 +05:00
Adeel Ehsan	003d8ee1a7	Merge pull request #88 from edx/revert-87-aehsan/logistration_renmaed_to_authn Revert "logistration renamed to auth n"	2021-01-28 12:58:14 +05:00
Adeel Ehsan	18dd01d3d2	Revert "logistration renamed to auth n"	2021-01-28 12:52:31 +05:00
Adeel Ehsan	bdb1e03e4e	Merge pull request #87 from edx/aehsan/logistration_renmaed_to_authn logistration renamed to auth n	2021-01-28 12:34:54 +05:00
adeelehsan	5662e5daa3	logistration renamed to auth n	2021-01-28 12:27:17 +05:00
Renovate Bot	9306ce0783	chore(deps): update dependency react-redux to v7.1.3	2021-01-24 19:58:38 +00:00
Renovate Bot	f58ef0ace6	chore(deps): update dependency @edx/frontend-platform to v1.8.1	2021-01-10 13:50:47 +00:00
Waheed Ahmed	7de6ba4381	fix: logistration hide user menu icon on mobile screens (#84 ) VAN-227	2020-12-22 13:02:55 +05:00