diff --git a/QRPay.sln b/QRPay.sln index ac5a0b7..9aab3fd 100644 --- a/QRPay.sln +++ b/QRPay.sln @@ -1,10 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 -VisualStudioVersion = 18.1.11304.174 d18.0 +VisualStudioVersion = 18.1.11304.174 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QRPayWeb", "QRPayWeb\QRPayWeb.csproj", "{FAB7CC2C-9167-44B9-84B9-3DEFEE32CCCB}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QRPay", "QRPay\QRPay.csproj", "{4568C485-BB58-42EF-9D66-7935D1F31FC8}" EndProject Global @@ -13,10 +11,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FAB7CC2C-9167-44B9-84B9-3DEFEE32CCCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FAB7CC2C-9167-44B9-84B9-3DEFEE32CCCB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FAB7CC2C-9167-44B9-84B9-3DEFEE32CCCB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FAB7CC2C-9167-44B9-84B9-3DEFEE32CCCB}.Release|Any CPU.Build.0 = Release|Any CPU {4568C485-BB58-42EF-9D66-7935D1F31FC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4568C485-BB58-42EF-9D66-7935D1F31FC8}.Debug|Any CPU.Build.0 = Debug|Any CPU {4568C485-BB58-42EF-9D66-7935D1F31FC8}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/QRPay/Layout/MainLayout.razor b/QRPay/Layout/MainLayout.razor index 76eb725..f1445ee 100644 --- a/QRPay/Layout/MainLayout.razor +++ b/QRPay/Layout/MainLayout.razor @@ -1,16 +1,6 @@ @inherits LayoutComponentBase -
- - +
-
- About -
- -
- @Body -
+ @Body
diff --git a/QRPay/Layout/MainLayout.razor.css b/QRPay/Layout/MainLayout.razor.css index ecf25e5..32a0f93 100644 --- a/QRPay/Layout/MainLayout.razor.css +++ b/QRPay/Layout/MainLayout.razor.css @@ -5,6 +5,8 @@ } main { + width: 100%; + max-width: 500px; flex: 1; } @@ -75,3 +77,16 @@ main { padding-right: 1.5rem !important; } } + +* { + box-sizing: border-box; +} + +.main-container { + min-height: 100vh; + background: linear-gradient(135deg, #2d5a27 0%, #4a7c59 100%); + display: flex; + align-items: center; + justify-content: center; + padding: 20px; +} diff --git a/QRPay/Layout/NavMenu.razor b/QRPay/Layout/NavMenu.razor deleted file mode 100644 index 9fa8a21..0000000 --- a/QRPay/Layout/NavMenu.razor +++ /dev/null @@ -1,39 +0,0 @@ - - - - -@code { - private bool collapseNavMenu = true; - - private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; - - private void ToggleNavMenu() - { - collapseNavMenu = !collapseNavMenu; - } -} diff --git a/QRPay/Layout/NavMenu.razor.css b/QRPay/Layout/NavMenu.razor.css deleted file mode 100644 index 617b89c..0000000 --- a/QRPay/Layout/NavMenu.razor.css +++ /dev/null @@ -1,83 +0,0 @@ -.navbar-toggler { - background-color: rgba(255, 255, 255, 0.1); -} - -.top-row { - min-height: 3.5rem; - background-color: rgba(0,0,0,0.4); -} - -.navbar-brand { - font-size: 1.1rem; -} - -.bi { - display: inline-block; - position: relative; - width: 1.25rem; - height: 1.25rem; - margin-right: 0.75rem; - top: -1px; - background-size: cover; -} - -.bi-house-door-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E"); -} - -.bi-plus-square-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E"); -} - -.bi-list-nested-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E"); -} - -.nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; -} - - .nav-item:first-of-type { - padding-top: 1rem; - } - - .nav-item:last-of-type { - padding-bottom: 1rem; - } - - .nav-item ::deep a { - color: #d7d7d7; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - } - -.nav-item ::deep a.active { - background-color: rgba(255,255,255,0.37); - color: white; -} - -.nav-item ::deep a:hover { - background-color: rgba(255,255,255,0.1); - color: white; -} - -@media (min-width: 641px) { - .navbar-toggler { - display: none; - } - - .collapse { - /* Never collapse the sidebar for wide screens */ - display: block; - } - - .nav-scrollable { - /* Allow sidebar to scroll for tall menus */ - height: calc(100vh - 3.5rem); - overflow-y: auto; - } -} diff --git a/QRPay/Pages/Counter.razor b/QRPay/Pages/Counter.razor deleted file mode 100644 index ef23cb3..0000000 --- a/QRPay/Pages/Counter.razor +++ /dev/null @@ -1,18 +0,0 @@ -@page "/counter" - -Counter - -

Counter

- -

Current count: @currentCount

- - - -@code { - private int currentCount = 0; - - private void IncrementCount() - { - currentCount++; - } -} diff --git a/QRPay/Pages/Home.razor b/QRPay/Pages/Home.razor index 12fc17d..46d20a1 100644 --- a/QRPay/Pages/Home.razor +++ b/QRPay/Pages/Home.razor @@ -1,80 +1,182 @@ @page "/" @using QRCoder @using SixLabors.ImageSharp.Formats -Home +@using System.ComponentModel.DataAnnotations +QRPay - QR Payment Generator -