From 9ed3794694bd684b1651538c9dc03681e3dab305 Mon Sep 17 00:00:00 2001
From: Kira Jiroux Learn about building Web apps with ASP.NET Core. Use this page to detail your site's privacy policy.
- Request ID: >(Convert.ToString(response.Result));
}
- else
- {
- TempData["error"] = response?.Message;
- }
return View(list);
}
diff --git a/PokemonSleep.Web/Models/ErrorViewModel.cs b/PokemonSleep.Web/Models/ErrorViewModel.cs
new file mode 100644
index 0000000..30ddd9c
--- /dev/null
+++ b/PokemonSleep.Web/Models/ErrorViewModel.cs
@@ -0,0 +1,9 @@
+namespace PokemonSleep.Web.Models
+{
+ public class ErrorViewModel
+ {
+ public string? RequestId { get; set; }
+
+ public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+ }
+}
diff --git a/PokemonSleepWeb/PokemonSleepWeb/Models/PokemonDto.cs b/PokemonSleep.Web/Models/PokemonDto.cs
similarity index 85%
rename from PokemonSleepWeb/PokemonSleepWeb/Models/PokemonDto.cs
rename to PokemonSleep.Web/Models/PokemonDto.cs
index 6ff634b..923b7e4 100644
--- a/PokemonSleepWeb/PokemonSleepWeb/Models/PokemonDto.cs
+++ b/PokemonSleep.Web/Models/PokemonDto.cs
@@ -1,4 +1,4 @@
-namespace PokemonSleepWeb.Models
+namespace PokemonSleep.Web.Models
{
public class PokemonDto
{
diff --git a/PokemonSleepWeb/PokemonSleepWeb/Models/PokemonNatureDto.cs b/PokemonSleep.Web/Models/PokemonNatureDto.cs
similarity index 87%
rename from PokemonSleepWeb/PokemonSleepWeb/Models/PokemonNatureDto.cs
rename to PokemonSleep.Web/Models/PokemonNatureDto.cs
index d9c112d..3ac1b71 100644
--- a/PokemonSleepWeb/PokemonSleepWeb/Models/PokemonNatureDto.cs
+++ b/PokemonSleep.Web/Models/PokemonNatureDto.cs
@@ -1,4 +1,4 @@
-namespace PokemonSleepWeb.Models
+namespace PokemonSleep.Web.Models
{
public class PokemonNatureDto
{
diff --git a/PokemonSleepWeb/PokemonSleepWeb/Models/PokemonSubskillDto.cs b/PokemonSleep.Web/Models/PokemonSubskillDto.cs
similarity index 87%
rename from PokemonSleepWeb/PokemonSleepWeb/Models/PokemonSubskillDto.cs
rename to PokemonSleep.Web/Models/PokemonSubskillDto.cs
index d807003..17cf256 100644
--- a/PokemonSleepWeb/PokemonSleepWeb/Models/PokemonSubskillDto.cs
+++ b/PokemonSleep.Web/Models/PokemonSubskillDto.cs
@@ -1,4 +1,4 @@
-namespace PokemonSleepWeb.Models
+namespace PokemonSleep.Web.Models
{
public class PokemonSubskillDto
{
diff --git a/PokemonSleepWeb/PokemonSleepWeb/Models/RequestDto.cs b/PokemonSleep.Web/Models/RequestDto.cs
similarity index 72%
rename from PokemonSleepWeb/PokemonSleepWeb/Models/RequestDto.cs
rename to PokemonSleep.Web/Models/RequestDto.cs
index 26043ee..e3afe65 100644
--- a/PokemonSleepWeb/PokemonSleepWeb/Models/RequestDto.cs
+++ b/PokemonSleep.Web/Models/RequestDto.cs
@@ -1,6 +1,6 @@
-using static PokemonSleepWeb.Utility.StaticDetails;
+using static PokemonSleep.Web.Utility.StaticDetails;
-namespace PokemonSleepWeb.Models
+namespace PokemonSleep.Web.Models
{
public class RequestDto
{
diff --git a/PokemonSleepWeb/PokemonSleepWeb/Models/ResponseDto.cs b/PokemonSleep.Web/Models/ResponseDto.cs
similarity index 83%
rename from PokemonSleepWeb/PokemonSleepWeb/Models/ResponseDto.cs
rename to PokemonSleep.Web/Models/ResponseDto.cs
index df54014..d124397 100644
--- a/PokemonSleepWeb/PokemonSleepWeb/Models/ResponseDto.cs
+++ b/PokemonSleep.Web/Models/ResponseDto.cs
@@ -1,4 +1,4 @@
-namespace PokemonSleepWeb.Models
+namespace PokemonSleep.Web.Models
{
public class ResponseDto
{
diff --git a/PokemonSleepWeb/PokemonSleepWeb/PokemonSleepWeb.csproj b/PokemonSleep.Web/PokemonSleep.Web.csproj
similarity index 61%
rename from PokemonSleepWeb/PokemonSleepWeb/PokemonSleepWeb.csproj
rename to PokemonSleep.Web/PokemonSleep.Web.csproj
index b0c6578..a97e685 100644
--- a/PokemonSleepWeb/PokemonSleepWeb/PokemonSleepWeb.csproj
+++ b/PokemonSleep.Web/PokemonSleep.Web.csproj
@@ -7,8 +7,6 @@
Welcome
+ @ViewData["Title"]
+
+Error.
An error occurred while processing your request.
-@if (ShowRequestId)
+@if (Model.ShowRequestId)
{
@RequestId
+ Request ID: @Model.RequestId
`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\n\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n\n// Abbreviations\n//\n// 1. Duplicate behavior to the data-bs-* attribute for our tooltip plugin\n// 2. Add the correct text decoration in Chrome, Edge, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Prevent the text-decoration to be skipped.\n\nabbr[title],\nabbr[data-bs-original-title] { // 1\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n text-decoration-skip-ink: none; // 4\n}\n\n\n// Address\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\n\n// Lists\n\nol,\nul {\n padding-left: 2rem;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\n// 1. Undo browser default\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // 1\n}\n\n\n// Blockquote\n\nblockquote {\n margin: 0 0 1rem;\n}\n\n\n// Strong\n//\n// Add the correct font weight in Chrome, Edge, and Safari\n\nb,\nstrong {\n font-weight: $font-weight-bolder;\n}\n\n\n// Small\n//\n// Add the correct font size in all browsers\n\nsmall {\n @include font-size($small-font-size);\n}\n\n\n// Mark\n\nmark {\n padding: $mark-padding;\n background-color: $mark-bg;\n}\n\n\n// Sub and Sup\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n\nsub,\nsup {\n position: relative;\n @include font-size($sub-sup-font-size);\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n// Links\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n\n &:hover {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([class]) {\n &,\n &:hover {\n color: inherit;\n text-decoration: none;\n }\n}\n\n\n// Code\n\npre,\ncode,\nkbd,\nsamp {\n font-family: $font-family-code;\n @include font-size(1em); // Correct the odd `em` font sizing in all browsers.\n direction: ltr #{\"/* rtl:ignore */\"};\n unicode-bidi: bidi-override;\n}\n\n// 1. Remove browser default top margin\n// 2. Reset browser default of `1em` to use `rem`s\n// 3. Don't allow content to break outside\n\npre {\n display: block;\n margin-top: 0; // 1\n margin-bottom: 1rem; // 2\n overflow: auto; // 3\n @include font-size($code-font-size);\n color: $pre-color;\n\n // Account for some code outputs that place code tags in pre tags\n code {\n @include font-size(inherit);\n color: inherit;\n word-break: normal;\n }\n}\n\ncode {\n @include font-size($code-font-size);\n color: $code-color;\n word-wrap: break-word;\n\n // Streamline the style when inside anchors to avoid broken underline and more\n a > & {\n color: inherit;\n }\n}\n\nkbd {\n padding: $kbd-padding-y $kbd-padding-x;\n @include font-size($kbd-font-size);\n color: $kbd-color;\n background-color: $kbd-bg;\n @include border-radius($border-radius-sm);\n\n kbd {\n padding: 0;\n @include font-size(1em);\n font-weight: $nested-kbd-font-weight;\n }\n}\n\n\n// Figures\n//\n// Apply a consistent margin strategy (matches our type styles).\n\nfigure {\n margin: 0 0 1rem;\n}\n\n\n// Images and content\n\nimg,\nsvg {\n vertical-align: middle;\n}\n\n\n// Tables\n//\n// Prevent double borders\n\ntable {\n caption-side: bottom;\n border-collapse: collapse;\n}\n\ncaption {\n padding-top: $table-cell-padding-y;\n padding-bottom: $table-cell-padding-y;\n color: $table-caption-color;\n text-align: left;\n}\n\n// 1. Removes font-weight bold by inheriting\n// 2. Matches default `