Merge pull request #7 from k1nsej/menu

Menu
jespermhl · May 22, 2024 · 6a25f96 · 6a25f96
2 parents 1ed5361 + d52e234
commit 6a25f96
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/components/menu.html b/components/menu.html
@@ -16,13 +16,13 @@
       <div class="collapse navbar-collapse" id="navbarNav">
          <ul class="navbar-nav">
             <li class="nav-item">
-               <a id="homeLink" class="nav-link" href="#"> Home </a>
+               <a id="homeLink" class="nav-link" href="/"> Home </a>
             </li>
             <li class="nav-item">
-               <a id="aboutLink" class="nav-link" href="#">About Me</a>
+               <a id="aboutLink" class="nav-link" href="/aboutme/">About Me</a>
             </li>
             <li class="nav-item">
-               <a id="colophonLink" class="nav-link" href="#">Colophon</a>
+               <a id="colophonLink" class="nav-link" href="/colophon/">Colophon</a>
             </li>
             <li class="nav-item dropdown">
                <a
@@ -36,12 +36,12 @@
                </a>
                <ul class="dropdown-menu">
                   <li>
-                     <a id="nsbLink" class="dropdown-item" href="#"
+                     <a id="nsbLink" class="dropdown-item" href="/notsoberry/"
                         >Not so Berry</a
                      >
                   </li>
                   <li>
-                     <a id="rtrLink" class="dropdown-item" href="#"
+                     <a id="rtrLink" class="dropdown-item" href="/ragstoriches/"
                         >Rags to Riches</a
                      >
                   </li>
@@ -51,88 +51,88 @@
                <a
                   id="expansionPacksLink"
                   class="nav-link dropdown-toggle"
-                  href="#"
+                  href="/expansionpacks/"
                   role="button"
                   data-bs-toggle="dropdown"
                   aria-expanded="false">
                   Expansion Packs
                </a>
                <ul class="dropdown-menu">
                   <li>
-                     <a id="forRentLink" class="dropdown-item" href="#"
+                     <a id="forRentLink" class="dropdown-item" href="/forrent/"
                         >For Rent</a
                      >
                   </li>
                   <li>
-                     <a id="horseRanchLink" class="dropdown-item" href="#"
+                     <a id="horseRanchLink" class="dropdown-item" href="/horseranch/"
                         >Horse Ranch</a
                      >
                   </li>
                   <li>
-                     <a id="growingTogetherLink" class="dropdown-item" href="#"
+                     <a id="growingTogetherLink" class="dropdown-item" href="/growingtogether/"
                         >Growing Together</a
                      >
                   </li>
                   <li>
-                     <a id="highSchoolYearsLink" class="dropdown-item" href="#"
+                     <a id="highSchoolYearsLink" class="dropdown-item" href="/highschoolyears/"
                         >High School Years</a
                      >
                   </li>
                   <li>
-                     <a id="cottageLivingLink" class="dropdown-item" href="#"
+                     <a id="cottageLivingLink" class="dropdown-item" href="/cottageliving/"
                         >Cottage Living</a
                      >
                   </li>
                   <li>
-                     <a id="snowEscapeLink" class="dropdown-item" href="#"
-                        >Snow Escape</a
+                     <a id="snowEscapeLink" class="dropdown-item" href="/snowyescape/"
+                        >Snowy Escape</a
                      >
                   </li>
                   <li>
-                     <a id="ecoLifestyleLink" class="dropdown-item" href="#"
+                     <a id="ecoLifestyleLink" class="dropdown-item" href="/ecolifestyle/"
                         >Eco Lifestyle</a
                      >
                   </li>
                   <li>
                      <a
                         id="discoverUniversityLink"
                         class="dropdown-item"
-                        href="#"
+                        href="/discoveruniversity/"
                         >Discover University</a
                      >
                   </li>
                   <li>
-                     <a id="islandLivingLink" class="dropdown-item" href="#"
+                     <a id="islandLivingLink" class="dropdown-item" href="/islandliving/"
                         >Island Living</a
                      >
                   </li>
                   <li>
-                     <a id="getFamousLink" class="dropdown-item" href="#"
+                     <a id="getFamousLink" class="dropdown-item" href="/getfamous/"
                         >Get Famous</a
                      >
                   </li>
                   <li>
-                     <a id="seasonsLink" class="dropdown-item" href="#"
+                     <a id="seasonsLink" class="dropdown-item" href="/seasons/"
                         >Seasons</a
                      >
                   </li>
                   <li>
-                     <a id="catsDogsLink" class="dropdown-item" href="#"
+                     <a id="catsDogsLink" class="dropdown-item" href="/catsanddogs/"
                         >Cats & Dogs</a
                      >
                   </li>
                   <li>
-                     <a id="cityLivingLink" class="dropdown-item" href="#"
+                     <a id="cityLivingLink" class="dropdown-item" href="/cityliving/"
                         >City Living</a
                      >
                   </li>
                   <li>
-                     <a id="getTogetherLink" class="dropdown-item" href="#"
+                     <a id="getTogetherLink" class="dropdown-item" href="/gettogether/"
                         >Get Together</a
                      >
                   </li>
                   <li>
-                     <a id="getToWorkLink" class="dropdown-item" href="#"
+                     <a id="getToWorkLink" class="dropdown-item" href="/gettowork/"
                         >Get to Work</a
                      >
                   </li>

diff --git a/scripts/menufooter.js b/scripts/menufooter.js
@@ -30,6 +30,8 @@ function addActiveClassToNavLinks() {
    console.log(currentUrl);
    currentUrl = currentUrl.replace("index.html", "");
    console.log(currentUrl);
+   currentUrl = currentUrl.replace("simsinfo.netlify.app", "");
+   console.log(currentUrl);
 
    fetch("/scripts/menulinks.json")
       .then((response) => response.json())