Merge branch 'hotfix/2.9.1'

marceloglacial · Jun 8, 2022 · 8f31ba1 · 8f31ba1 · vercel · Jun 8, 2022
2 parents 92ac17b + 147ca5d
commit 8f31ba1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/components/Footer/Footer.js b/components/Footer/Footer.js
@@ -37,11 +37,11 @@ const Footer = (props) => {
             </Link>
           </li>
           {menuContent.items.map((item) => {
-            const { ID, title, slug } = item;
+            const { ID, title, slug, url } = item;
             return (
               <li className={styles.menuLink} key={ID}>
-                <Link href={`/${slug}`} key={ID}>
-                  <a href={`/${slug}`}>{title}</a>
+                <Link href={`/${slug || url}`} key={ID}>
+                  <a href={`/${slug || url}`}>{title}</a>
                 </Link>
               </li>
             );
@@ -52,9 +52,7 @@ const Footer = (props) => {
         <ul
           className={`nav justify-content-center flex-column flex-md-row py-3 ${styles.copyrightMenu}`}
         >
-          <li className='nav-item' className='nav-link'>
-            Copyrights Brinca - {year}
-          </li>
+          <li className='nav-item nav-link'>Copyrights Brinca - {year}</li>
           <li className='nav-item'>
             <a href={`http://marceloglacial.com`} className='nav-link'>
               Developed by Marcelo Glacial

diff --git a/components/Header/HeaderNav.js b/components/Header/HeaderNav.js
@@ -21,7 +21,7 @@ const HeaderNav = (props) => {
   return (
     <ul className='navbar-nav ml-auto'>
       {menuContent.items.map((item) => {
-        const { ID, title, slug, child_items } = item;
+        const { ID, title, slug, url, child_items } = item;
         const hasSubMenu = child_items && isOpen;
         return (
           <li
@@ -30,8 +30,11 @@ const HeaderNav = (props) => {
             onMouseOver={() => child_items && setIsOpen(true)}
             onMouseLeave={() => child_items && setIsOpen(false)}
           >
-            <Link href={`/${slug}`} key={ID}>
-              <a className={`nav-link ${styles.topNavLink}`} href={`/${slug}`}>
+            <Link href={`/${slug || url}`} key={ID}>
+              <a
+                className={`nav-link ${styles.topNavLink}`}
+                href={`/${slug || url}`}
+              >
                 {title}
               </a>
             </Link>
@@ -40,10 +43,10 @@ const HeaderNav = (props) => {
                 {child_items.map((child, index) => {
                   return (
                     <li className={`nav-item ${styles.navSubItem}`} key={index}>
-                      <Link href={`/${child.slug}`} key={index}>
+                      <Link href={`/${child.slug || child.url}`} key={index}>
                         <a
                           className={`nav-link ${styles.topNavLink}`}
-                          href={`/${child.slug}`}
+                          href={`/${child.slug || child.url}`}
                         >
                           {child.title}
                         </a>