Skip to content

Commit

Permalink
Website Milestone 3 Complete
Browse files Browse the repository at this point in the history
  • Loading branch information
Robbieo authored and Robbieo committed Dec 4, 2019
1 parent 939dca0 commit 0e09575
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 63 deletions.
162 changes: 100 additions & 62 deletions Website/Pages/Menu.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,41 @@
@for (int i = 0; i < Model.Combos.Count; i++)
{
<div class="menu-item">
<h4 style="margin: 0">@Model.Combos[i]</h4>
<table>
<tr>
<th>Size</th>
<th>Price</th>
<th>Calories</th>
</tr>
<tr>
<td>Small</td>
<td>@Model.Combos[i].Price</td>
<td>@Model.Combos[i].Calories</td>
</tr>
<tr>
<td>Medium</td>
@{Model.Combos[i].Size = DinoDiner.Menu.Size.Medium;}
<td>@Model.Combos[i].Price</td>
<td>@Model.Combos[i].Calories</td>
</tr>
<tr>
<td>Large</td>
@{Model.Combos[i].Size = DinoDiner.Menu.Size.Large;}
<td>@Model.Combos[i].Price</td>
<td>@Model.Combos[i].Calories</td>
</tr>
</table>
<p>
<h4 style="margin: 0">@Model.Combos[i]</h4>
<br />Price - @Model.Combos[i].Price.ToString("c")
<br />Calories - @Model.Combos[i].Calories
<br />Ingredients -
@for (int j = 0; j < Model.Combos[i].Ingredients.Count; j++)
{
@if (j == Model.Combos[i].Ingredients.Count - 1)
Ingredients
<ul>
@for (int j = 0; j < Model.Combos[i].Ingredients.Count; j++)
{
<smaller>
<li>
@Model.Combos[i].Ingredients[j]
</smaller>
</li>
}
else
{
<smaller>
@Model.Combos[i].Ingredients[j],
</smaller>
}
}
</ul>
</p>
</div>
}
Expand All @@ -46,22 +61,15 @@
<h4 style="margin: 0">@Model.Entrees[i]</h4>
<br />Price - @Model.Entrees[i].Price.ToString("c")
<br />Calories - @Model.Entrees[i].Calories
<br />Ingredients -
@for (int j = 0; j < Model.Entrees[i].Ingredients.Count; j++)
{
@if (j == Model.Entrees[i].Ingredients.Count - 1)
<br />Ingredients
<ul>
@for (int j = 0; j < Model.Entrees[i].Ingredients.Count; j++)
{
<smaller>
<li>
@Model.Entrees[i].Ingredients[j]
</smaller>
</li>
}
else
{
<smaller>
@Model.Entrees[i].Ingredients[j],
</smaller>
}
}
</ul>
</p>
</div>
}
Expand All @@ -72,26 +80,41 @@
@for (int i = 0; i < Model.Sides.Count; i++)
{
<div class="menu-item">
<h4 style="margin: 0">@Model.Sides[i].Description.Substring(6)</h4>
<table>
<tr>
<th>Size</th>
<th>Price</th>
<th>Calories</th>
</tr>
<tr>
<td>Small</td>
<td>@Model.Sides[i].Price</td>
<td>@Model.Sides[i].Calories</td>
</tr>
<tr>
<td>Medium</td>
@{Model.Sides[i].Size = DinoDiner.Menu.Size.Medium;}
<td>@Model.Sides[i].Price</td>
<td>@Model.Sides[i].Calories</td>
</tr>
<tr>
<td>Large</td>
@{Model.Sides[i].Size = DinoDiner.Menu.Size.Large;}
<td>@Model.Sides[i].Price</td>
<td>@Model.Sides[i].Calories</td>
</tr>
</table>
<p>
<h4 style="margin: 0">@Model.Sides[i]</h4>
<br />Price - @Model.Sides[i].Price.ToString("c")
<br />Calories - @Model.Sides[i].Calories
<br />Ingredients -
@for (int j = 0; j < Model.Sides[i].Ingredients.Count; j++)
{
@if (j == Model.Sides[i].Ingredients.Count - 1)
<br />Ingredients
<ul>
@for (int j = 0; j < Model.Sides[i].Ingredients.Count; j++)
{
<smaller>
<li>
@Model.Sides[i].Ingredients[j]
</smaller>
</li>
}
else
{
<smaller>
@Model.Sides[i].Ingredients[j],
</smaller>
}
}
</ul>
</p>
</div>
}
Expand All @@ -102,27 +125,42 @@
@for (int i = 0; i < Model.Drinks.Count; i++)
{
<div class="menu-item">
<h4 style="margin: 0">@Model.Drinks[i].Description.Substring(6)</h4>
<table>
<tr>
<th>Size</th>
<th>Price</th>
<th>Calories</th>
</tr>
<tr>
<td>Small</td>
<td>@Model.Drinks[i].Price</td>
<td>@Model.Drinks[i].Calories</td>
</tr>
<tr>
<td>Medium</td>
@{Model.Drinks[i].Size = DinoDiner.Menu.Size.Medium;}
<td>@Model.Drinks[i].Price</td>
<td>@Model.Drinks[i].Calories</td>
</tr>
<tr>
<td>Large</td>
@{Model.Drinks[i].Size = DinoDiner.Menu.Size.Large;}
<td>@Model.Drinks[i].Price</td>
<td>@Model.Drinks[i].Calories</td>
</tr>
</table>
<p>
<h4 style="margin: 0">@Model.Drinks[i]</h4>
<br />Price - @Model.Drinks[i].Price.ToString("c")
<br />Calories - @Model.Drinks[i].Calories
<br />Ingredients -
@for (int j = 0; j < Model.Drinks[i].Ingredients.Count; j++)
{
@if (j == Model.Drinks[i].Ingredients.Count - 1)
Ingredients
<ul>
@for (int j = 0; j < Model.Drinks[i].Ingredients.Count; j++)
{
<smaller>
<li>
@Model.Drinks[i].Ingredients[j]
</smaller>
}
else
{
<smaller>
@Model.Drinks[i].Ingredients[j],
</smaller>
</li>
}
}
</p>
</ul>
</p>
</div>
}
}
Expand Down
2 changes: 1 addition & 1 deletion Website/Pages/Shared/_Layout.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Dino-Diner - @ViewData["Title"]</title>

<environment include="Development">
<link rel="stylesheet" href="~/css/site.css" />
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
</environment>
<environment exclude="Development">
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
Expand Down
5 changes: 5 additions & 0 deletions Website/wwwroot/css/site.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@ form {
min-width: 300px;
}

table, th, td {
border: 1px solid black;
}

#menu-container {
width: 95vw;
display: flex;
flex-direction: row;
justify-content: space-between
}

.banner {
Expand Down

0 comments on commit 0e09575

Please sign in to comment.