Merge pull request #1447 from ASU/update-header-footer

Update header to include fontawesome and fix navbar scrolling issue

Author: scott-williams-az

packages/app-degree-pages/vite.config.js

@@ -22,11 +22,11 @@ export default defineConfig({
         },
     },
     },
-    minify: false,
+    minify: true,
   },
   esbuild: {
-    legalComments: 'none',
-    keepNames: true,
+    legalComments: 'eof',
+    keepNames: false,
   },
   define: {
     process: {env: {NODE_ENV: process.env.NODE_ENV}},

packages/app-webdir-ui/vite.config.js

@@ -24,7 +24,7 @@ export default defineConfig({
     minify: true,
   },
   esbuild: {
-    legalComments: 'none',
+    legalComments: 'eof',
     keepNames: false,
   },
   define: {

packages/component-header-footer/package.json

@@ -45,11 +45,13 @@
     "postdocs": "node ../../scripts/process-readme-props.js",
     "build-storybook": "storybook build -o ../../build/$npm_package_name"
   },
-  "peerDependencies": {
+  "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/free-brands-svg-icons": "^6.4.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
-    "@fortawesome/react-fontawesome": "^0.2.0",
+    "@fortawesome/react-fontawesome": "^0.2.0"
+  },
+  "peerDependencies": {
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },

packages/component-header-footer/src/header/header.js

@@ -19,10 +19,10 @@ import { Header, HeaderDiv } from "./header.styles";
  */
 
 const ASUHeader = ({
-  isPartner,
+  isPartner = false,
   navTree: rawNavTree,
   title,
-  baseUrl,
+  baseUrl = "/",
   parentOrg,
   parentOrgUrl,
   partnerLogo,
@@ -34,9 +34,9 @@ const ASUHeader = ({
   logoutLink,
   onLogoutClick,
   buttons,
-  breakpoint,
+  breakpoint = "Xl",
   animateTitle,
-  expandOnHover,
+  expandOnHover = false,
   mobileNavTree: rawMobileNavTree,
   searchUrl,
   site,
@@ -90,7 +90,7 @@ const ASUHeader = ({
     const Wrapper = renderDiv === "true" ? HeaderDiv : Header;
 
     return (
-      <Wrapper id="asuHeader" ref={headerRef}>
+      <Wrapper id="asuHeader" ref={headerRef} breakpoint={breakpoint}>
         <HeaderMain />
       </Wrapper>
     );
@@ -130,11 +130,4 @@ const ASUHeader = ({
 
 ASUHeader.propTypes = { ...HeaderPropTypes };
 
-ASUHeader.defaultProps = {
-  isPartner: false,
-  baseUrl: "/",
-  breakpoint: "Xl",
-  expandOnHover: false,
-};
-
 export { ASUHeader };

yarn.lock

@@ -348,6 +348,10 @@ __metadata:
     "@babel/plugin-syntax-jsx": "npm:^7.14.5"
     "@babel/plugin-transform-react-jsx": "npm:^7.13.12"
     "@babel/plugin-transform-runtime": "npm:^7.14.5"
+    "@fortawesome/fontawesome-svg-core": "npm:^6.4.2"
+    "@fortawesome/free-brands-svg-icons": "npm:^6.4.2"
+    "@fortawesome/free-solid-svg-icons": "npm:^6.4.2"
+    "@fortawesome/react-fontawesome": "npm:^0.2.0"
     "@storybook/addon-a11y": "npm:^7.6.14"
     "@storybook/addon-essentials": "npm:^7.6.14"
     "@storybook/addon-links": "npm:^7.6.14"
@@ -382,10 +386,6 @@ __metadata:
     webpack-filter-warnings-plugin: "npm:^1.2.1"
     webpack-merge: "npm:^5.8.0"
   peerDependencies:
-    "@fortawesome/fontawesome-svg-core": ^6.4.2
-    "@fortawesome/free-brands-svg-icons": ^6.4.2
-    "@fortawesome/free-solid-svg-icons": ^6.4.2
-    "@fortawesome/react-fontawesome": ^0.2.0
     react: ^18.3.1
     react-dom: ^18.3.1
   languageName: unknown