Moved nav back to app.component and switched to routerLinks for true SPA

R-Plascencia · Mar 1, 2018 · 392c494 · 392c494
1 parent 8d4075f
commit 392c494
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 38 deletions.
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,24 +1,27 @@
-<!-- <nav class="navbar navbar-expand-lg" id="homenav">
-    <a class="navbar-brand" href="#">SRSLY</a>
+<nav class="navbar navbar-expand-lg" id="homenav">
+    <a class="navbar-brand" href="#" id="navbrand">
+        <i class="far fa-newspaper fa-2x"></i> 
+    </a>
+    <a href="#"><span class="align-top" style="color:ivory">SRSLY</span></a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
 
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav ml-auto">
-            <li class="nav-item">
-                <a class="nav-link" href="/sources" style="padding-right:15px;">
-                    <i class="fab fa-osi"></i>
-                    Browse By Source 
-                    <span class="sr-only">(current)</span>
-                </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="javascript:void(0)"><i class="far fa-question-circle"></i> About</a>
-            </li>
+        <li class="nav-item">
+            <a class="nav-link" routerLink="sources" style="padding-right:15px;">
+                <i class="fab fa-osi"></i>
+                Browse By Source 
+                <span class="sr-only">(current)</span>
+            </a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" routerLink="about"><i class="far fa-question-circle"></i> About</a>
+        </li>
         </ul>
     </div>
-</nav> -->
+</nav>
 
 <router-outlet></router-outlet>
 

diff --git a/src/index.html b/src/index.html
@@ -13,31 +13,6 @@
   <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
 </head>
 <body>
-  <nav class="navbar navbar-expand-lg" id="homenav">
-    <a class="navbar-brand" href="#" id="navbrand">
-      <i class="far fa-newspaper fa-2x"></i> 
-    </a>
-    <a href="#"><span class="align-top" style="color:ivory">SRSLY</span></a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-
-    <div class="collapse navbar-collapse" id="navbarSupportedContent">
-      <ul class="navbar-nav ml-auto">
-        <li class="nav-item">
-          <a class="nav-link" href="sources" style="padding-right:15px;">
-              <i class="fab fa-osi"></i>
-              Browse By Source 
-              <span class="sr-only">(current)</span>
-          </a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="about"><i class="far fa-question-circle"></i> About</a>
-        </li>
-      </ul>
-    </div>
-  </nav>
-
   <app-root></app-root>
 </body>
 </html>