layout

1 year ago · 0305e7825e
parent dbeebd370a
commit 0305e7825e
10 changed files with 27 additions and 70 deletions
--- a/MyFirstBlazor/BlazingPizza/App.razor
+++ b/MyFirstBlazor/BlazingPizza/App.razor
@ -1,9 +1,9 @@
 <Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
    <Found Context="routeData">
-        <RouteView RouteData="@routeData" />
+        <RouteView RouteData="@routeData" DefaultLayout="typeof(MainLayout)" />
    </Found>
    <NotFound>
-        <LayoutView>
+        <LayoutView Layout="typeof(MainLayout)">
            <p>Sorry, there's nothing at this address.</p>
        </LayoutView>
    </NotFound>
--- a/MyFirstBlazor/BlazingPizza/Pages/Checkout.razor
+++ b/MyFirstBlazor/BlazingPizza/Pages/Checkout.razor
@ -5,21 +5,6 @@
@inject HttpClient HttpClient
@inject NavigationManager NavigationManager

-<div class="top-bar">
-    <a class="logo" href="">
-        <img src="/img/logo.svg" />
-    </a>
-
-    <NavLink class="nav-tab" href="" Match="NavLinkMatch.All">
-        <img src="/img/pizza-slice.svg" />
-        <div>Get Pizza</div>
-    </NavLink>
-    <NavLink class="nav-tab" href="myorders">
-        <img src="img/bike.svg" />
-        <div>My orders</div>
-    </NavLink>
-</div>
-
 <div class="main">
    <div class="checkout-cols">
        <div class="checkout-order-details">
--- a/MyFirstBlazor/BlazingPizza/Pages/Index.razor
+++ b/MyFirstBlazor/BlazingPizza/Pages/Index.razor
@ -5,21 +5,6 @@
@inject NavigationManager NavigationManager
@inject OrderState OrderState

-<div class="top-bar">
-	<a class="logo" href="">
-		<img src="/img/logo.svg" />
-	</a>
-
-	<NavLink class="nav-tab" href="" Match="NavLinkMatch.All">
-		<img src="/img/pizza-slice.svg" />
-		<div>Get Pizza</div>
-	</NavLink>
-	<NavLink class="nav-tab" href="myorders">
-		<img src="img/bike.svg" />
-		<div>My orders</div>
-	</NavLink>
-</div>
-
 <div class="main">
 	<h1>Blazing Pizzas</h1>
 	<ul class="pizza-cards">
--- a/MyFirstBlazor/BlazingPizza/Pages/MyOrders.razor
+++ b/MyFirstBlazor/BlazingPizza/Pages/MyOrders.razor
@ -2,21 +2,6 @@
@inject HttpClient HttpClient
@inject NavigationManager NavigationManager

-<div class="top-bar">
-    <a class="logo" href="">
-        <img src="img/logo.svg" />
-    </a>
-
-    <NavLink class="nav-tab" href="" Match="NavLinkMatch.All">
-        <img src="/img/pizza-slice.svg" />
-        <div>Get Pizza</div>
-    </NavLink>
-    <NavLink class="nav-tab" href="myorders">
-        <img src="img/bike.svg" />
-        <div>My orders</div>
-    </NavLink>
-</div>
-
 <div class="main">
    @if (_ordersWithStatus == null)
    {
--- a/MyFirstBlazor/BlazingPizza/Pages/OrderDetail.razor
+++ b/MyFirstBlazor/BlazingPizza/Pages/OrderDetail.razor
@ -2,21 +2,6 @@
@inject HttpClient HttpClient
@inject NavigationManager NavigationManager

-<div class="top-bar">
-    <a class="logo" href="">
-        <img src="img/logo.svg" />
-    </a>
-
-    <NavLink class="nav-tab" href="" Match="NavLinkMatch.All">
-        <img src="/img/pizza-slice.svg" />
-        <div>Get Pizza</div>
-    </NavLink>
-    <NavLink class="nav-tab" href="myorders">
-        <img src="img/bike.svg" />
-        <div>My orders</div>
-    </NavLink>
-</div>
-
 <div class="main">
    @if (_invalidOrder)
    {
--- a/MyFirstBlazor/BlazingPizza/Pages/_Host.cshtml
+++ b/MyFirstBlazor/BlazingPizza/Pages/_Host.cshtml
@ -15,11 +15,7 @@
 </head>
 <body>

-    <div id="app">
-      <div class="content">
-        <component type="typeof(App)" render-mode="ServerPrerendered" />
-      </div>
-    </div>
+    <component type="typeof(App)" render-mode="ServerPrerendered" />

    <div id="blazor-error-ui">
        <environment include="Staging,Production">
--- a/MyFirstBlazor/BlazingPizza/Shared/MainLayout.razor
+++ b/MyFirstBlazor/BlazingPizza/Shared/MainLayout.razor
@ -1,6 +1,27 @@
@inherits LayoutComponentBase

-<div class="content">
-    @Body
-</div>
+<div id="app">
+
+    <header class="top-bar">
+        <a class="logo" href="">
+            <img src="img/logo.svg" />
+        </a>
+
+        <NavLink class="nav-tab" href="" Match="NavLinkMatch.All">
+            <img src="/img/pizza-slice.svg" />
+            <div>Get Pizza</div>
+        </NavLink>
+        <NavLink class="nav-tab" href="myorders">
+            <img src="img/bike.svg" />
+            <div>My orders</div>
+        </NavLink>
+    </header>

+    <div class="content">
+        @Body
+    </div>
+
+    <footer>
+        &copy; Blazing Pizza @DateTime.UtcNow.Year
+    </footer>
+</div>
--- a/MyFirstBlazor/BlazingPizza/pizza.db
+++ b/MyFirstBlazor/BlazingPizza/pizza.db
--- a/MyFirstBlazor/BlazingPizza/pizza.db-shm
+++ b/MyFirstBlazor/BlazingPizza/pizza.db-shm
--- a/MyFirstBlazor/BlazingPizza/pizza.db-wal
+++ b/MyFirstBlazor/BlazingPizza/pizza.db-wal