Menu changes

noahc3 · Aug 16, 2018 · 6ce3160 · 6ce3160
1 parent 519d712
commit 6ce3160
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 54 deletions.
diff --git a/SDSetupBlazor/Pages/FAQ.cshtml b/SDSetupBlazor/Pages/FAQ.cshtml
@@ -1,23 +1,5 @@
 @page "/faq"
 
-<div class="ui secondary pointing menu red">
-	<a href="/" class="item">
-		Home
-	</a>
-	<a href="/switch" class="item">
-		Switch
-	</a>
-	<a href="/faq" class="active item">
-		FAQ
-	</a>
-	<a href="https://github.com/noahc3/SDSetup" class="item">
-		Source
-	</a>
-	<a href="https://github.com/noahc3/SDSetup/issues" class="item">
-		Issues
-	</a>
-</div>
-
 <h1 style="text-align:center">Frequently Asked Questions</h1>
 <h4 style="text-align:center">And other things that aren't questions but you might want to know</h4>
 

diff --git a/SDSetupBlazor/Pages/Index.cshtml b/SDSetupBlazor/Pages/Index.cshtml
@@ -1,23 +1,7 @@
 @page "/"
 @inject Microsoft.AspNetCore.Blazor.Services.IUriHelper UriHelper
 
-<div class="ui secondary pointing menu red">
-	<a href="/" class="active item">
-		Home
-	</a>
-	<a href="/switch" class="item">
-		Switch
-	</a>
-	<a href="/faq" class="item">
-		FAQ
-	</a>
-	<a href="https://github.com/noahc3/SDSetup" class="item">
-		Source
-	</a>
-	<a href="https://github.com/noahc3/SDSetup/issues" class="item">
-		Issues
-	</a>
-</div>
+
 
 <h1 style="text-align:center">Homebrew SD Setup</h1>
 

diff --git a/SDSetupBlazor/Pages/Switch.cshtml b/SDSetupBlazor/Pages/Switch.cshtml
@@ -3,23 +3,6 @@
 @if (!gettingZip) {
 
 <div>
-	<div class="ui secondary pointing menu red">
-		<a href="/" class="item">
-			Home
-		</a>
-		<a href="/switch" class="active item">
-			Switch
-		</a>
-		<a href="/faq" class="item">
-			FAQ
-		</a>
-		<a href="https://github.com/noahc3/SDSetup" class="item">
-			Source
-		</a>
-		<a href="https://github.com/noahc3/SDSetup/issues" class="item">
-			Issues
-		</a>
-	</div>
 
 	@if (zipDoneMessage == true) {
 		<div class="ui success message">

diff --git a/SDSetupBlazor/Shared/MainLayout.cshtml b/SDSetupBlazor/Shared/MainLayout.cshtml
@@ -1,11 +1,29 @@
 @inherits BlazorLayoutComponent
+@inject Microsoft.AspNetCore.Blazor.Services.IUriHelper UriHelper
 
 <div class="main" style="min-height:100%;height:auto">
+
+	<div class="ui menu stackable red">
+		<a href="/" class="@(GetRelativePath().ToLower() == "" ? "active" : "") item">Home</a>
+		<a href="/switch" class="@(GetRelativePath().ToLower() == "switch" ? "active" : "") item">Switch</a>
+		<a href="/faq" class="@(GetRelativePath().ToLower() == "faq" ? "active" : "") item">FAQ</a>
+		<div class="right menu">
+			<a href="https://github.com/noahc3/SDSetup/issues" class="ui item">Issues</a>
+			<a href="https://github.com/noahc3/SDSetup" class="ui item">Source</a>
+		</div>
+	</div>
+
 	<div class="container" style="padding-bottom:1.5rem">
 		<div class="content px-4">
 			@Body
 		</div>
 	</div>
 	<h5 style="text-align:center">Made by noahc3</h5>
 	<h5 style="text-align:center;color:#d4d4d4;margin-bottom:1.5em">2018.08.16.01</h5>
-</div>
+</div>
+
+@functions {  
+	private string GetRelativePath() {
+		return UriHelper.ToBaseRelativePath(UriHelper.GetBaseUri(), UriHelper.GetAbsoluteUri());
+	}
+}
diff --git a/SDSetupBlazor/wwwroot/index.html b/SDSetupBlazor/wwwroot/index.html
@@ -25,7 +25,7 @@
 		<p></p>
 	</app>
 
-	<script src="libs/jquery-1.10.2.js"></script>
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 	<script src="libs/FileSaver.js"></script>
 	<script src="libs/jszip.js"></script>
 	<script src="scripts/methods.js"></script>
@@ -59,5 +59,6 @@
 			return true;
 		};
 	</script>
+	<script src="/scripts/menu.js"></script>
 </body>
 </html>
diff --git a/SDSetupBlazor/wwwroot/scripts/menu.js b/SDSetupBlazor/wwwroot/scripts/menu.js
@@ -0,0 +1,11 @@
+window.menu_interop = {
+	interop_registerClick: function () {
+		console.log("fucking haha");
+		$('.ui .item').on('click', function () {
+			console.log("fucking haha numero dos");
+			$('.ui .item').removeClass('active');
+			$(this).addClass('active');
+		});
+		return 1;
+	}
+};