From 8ade343f8a1f40a075db5dff4ac9e8f00e0f0fec Mon Sep 17 00:00:00 2001 From: guemjalee Date: Wed, 18 Dec 2024 15:47:55 +0100 Subject: [PATCH 1/4] update project --- CS/BlazorAppSpreadsheet.sln | 22 + .../BlazorAppSpreadsheet.csproj} | 12 +- .../Code/DocumentGenerator.cs | 4 +- .../Code/DocumentService.cs | 5 +- CS/BlazorAppSpreadsheet/Components/App.razor | 22 + .../Components/Layout/MainLayout.razor | 24 + .../Components/Layout}/MainLayout.razor.css | 42 +- .../Components/Layout/NavMenu.razor | 30 + .../Components/Layout/NavMenu.razor.css | 105 + .../Components/Pages/Counter.razor | 16 + .../Components/Pages/Error.razor | 36 + .../Components/Pages/Home.razor} | 22 +- .../Components/Pages/Weather.razor | 64 + .../Components/Routes.razor | 6 + .../Components}/_Imports.razor | 7 +- .../Controllers/ExportController.cs | 20 +- .../LoanAmortizationScheduleTemplate.xltx | Bin CS/BlazorAppSpreadsheet/Program.cs | 42 + .../appsettings.Development.json | 1 - .../appsettings.json | 0 .../wwwroot/app.css} | 43 +- .../wwwroot}/bootstrap/bootstrap.min.css | 0 .../wwwroot}/bootstrap/bootstrap.min.css.map | 0 CS/BlazorAppSpreadsheet/wwwroot/favicon.png | Bin 0 -> 1148 bytes CS/BlazorApp_SpreadsheetDocumentAPI.sln | 25 - CS/BlazorApp_SpreadsheetDocumentAPI/App.razor | 12 - .../Pages/Error.cshtml | 42 - .../Pages/Error.cshtml.cs | 27 - .../Pages/_Host.cshtml | 8 - .../Pages/_Layout.cshtml | 34 - .../Program.cs | 33 - .../Shared/MainLayout.razor | 12 - .../wwwroot/css/blazing-berry/bootstrap.css | 12986 ---------------- .../css/blazing-berry/bootstrap.min.css | 6 - .../wwwroot/css/open-iconic/FONT-LICENSE | 86 - .../wwwroot/css/open-iconic/ICON-LICENSE | 21 - .../wwwroot/css/open-iconic/README.md | 114 - .../font/css/open-iconic-bootstrap.min.css | 1 - .../open-iconic/font/fonts/open-iconic.eot | Bin 28196 -> 0 bytes .../open-iconic/font/fonts/open-iconic.otf | Bin 20996 -> 0 bytes .../open-iconic/font/fonts/open-iconic.svg | 543 - .../open-iconic/font/fonts/open-iconic.ttf | Bin 28028 -> 0 bytes .../open-iconic/font/fonts/open-iconic.woff | Bin 14984 -> 0 bytes .../wwwroot/favicon.ico | Bin 5430 -> 0 bytes README.md | 28 +- 45 files changed, 471 insertions(+), 14030 deletions(-) create mode 100644 CS/BlazorAppSpreadsheet.sln rename CS/{BlazorApp_SpreadsheetDocumentAPI/BlazorApp_SpreadsheetDocumentAPI.csproj => BlazorAppSpreadsheet/BlazorAppSpreadsheet.csproj} (81%) rename CS/{BlazorApp_SpreadsheetDocumentAPI => BlazorAppSpreadsheet}/Code/DocumentGenerator.cs (99%) rename CS/{BlazorApp_SpreadsheetDocumentAPI => BlazorAppSpreadsheet}/Code/DocumentService.cs (97%) create mode 100644 CS/BlazorAppSpreadsheet/Components/App.razor create mode 100644 CS/BlazorAppSpreadsheet/Components/Layout/MainLayout.razor rename CS/{BlazorApp_SpreadsheetDocumentAPI/Shared => BlazorAppSpreadsheet/Components/Layout}/MainLayout.razor.css (56%) create mode 100644 CS/BlazorAppSpreadsheet/Components/Layout/NavMenu.razor create mode 100644 CS/BlazorAppSpreadsheet/Components/Layout/NavMenu.razor.css create mode 100644 CS/BlazorAppSpreadsheet/Components/Pages/Counter.razor create mode 100644 CS/BlazorAppSpreadsheet/Components/Pages/Error.razor rename CS/{BlazorApp_SpreadsheetDocumentAPI/Pages/Index.razor => BlazorAppSpreadsheet/Components/Pages/Home.razor} (87%) create mode 100644 CS/BlazorAppSpreadsheet/Components/Pages/Weather.razor create mode 100644 CS/BlazorAppSpreadsheet/Components/Routes.razor rename CS/{BlazorApp_SpreadsheetDocumentAPI => BlazorAppSpreadsheet/Components}/_Imports.razor (72%) rename CS/{BlazorApp_SpreadsheetDocumentAPI => BlazorAppSpreadsheet}/Controllers/ExportController.cs (83%) rename CS/{BlazorApp_SpreadsheetDocumentAPI => BlazorAppSpreadsheet}/Data/LoanAmortizationScheduleTemplate.xltx (100%) create mode 100644 CS/BlazorAppSpreadsheet/Program.cs rename CS/{BlazorApp_SpreadsheetDocumentAPI => BlazorAppSpreadsheet}/appsettings.Development.json (82%) rename CS/{BlazorApp_SpreadsheetDocumentAPI => BlazorAppSpreadsheet}/appsettings.json (100%) rename CS/{BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/site.css => BlazorAppSpreadsheet/wwwroot/app.css} (81%) rename CS/{BlazorApp_SpreadsheetDocumentAPI/wwwroot/css => BlazorAppSpreadsheet/wwwroot}/bootstrap/bootstrap.min.css (100%) rename CS/{BlazorApp_SpreadsheetDocumentAPI/wwwroot/css => BlazorAppSpreadsheet/wwwroot}/bootstrap/bootstrap.min.css.map (100%) create mode 100644 CS/BlazorAppSpreadsheet/wwwroot/favicon.png delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI.sln delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/App.razor delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/Pages/Error.cshtml delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/Pages/Error.cshtml.cs delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/Pages/_Host.cshtml delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/Pages/_Layout.cshtml delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/Program.cs delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/Shared/MainLayout.razor delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/blazing-berry/bootstrap.css delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/blazing-berry/bootstrap.min.css delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/open-iconic/FONT-LICENSE delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/open-iconic/ICON-LICENSE delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/open-iconic/README.md delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/open-iconic/font/fonts/open-iconic.eot delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/open-iconic/font/fonts/open-iconic.otf delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/open-iconic/font/fonts/open-iconic.svg delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/css/open-iconic/font/fonts/open-iconic.woff delete mode 100644 CS/BlazorApp_SpreadsheetDocumentAPI/wwwroot/favicon.ico diff --git a/CS/BlazorAppSpreadsheet.sln b/CS/BlazorAppSpreadsheet.sln new file mode 100644 index 0000000..213b45d --- /dev/null +++ b/CS/BlazorAppSpreadsheet.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35527.113 d17.12 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorAppSpreadsheet", "BlazorAppSpreadsheet\BlazorAppSpreadsheet.csproj", "{320F556D-39EC-4DB7-BC8B-5561F93279DF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {320F556D-39EC-4DB7-BC8B-5561F93279DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {320F556D-39EC-4DB7-BC8B-5561F93279DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {320F556D-39EC-4DB7-BC8B-5561F93279DF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {320F556D-39EC-4DB7-BC8B-5561F93279DF}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/CS/BlazorApp_SpreadsheetDocumentAPI/BlazorApp_SpreadsheetDocumentAPI.csproj b/CS/BlazorAppSpreadsheet/BlazorAppSpreadsheet.csproj similarity index 81% rename from CS/BlazorApp_SpreadsheetDocumentAPI/BlazorApp_SpreadsheetDocumentAPI.csproj rename to CS/BlazorAppSpreadsheet/BlazorAppSpreadsheet.csproj index 8ef6353..cd143e3 100644 --- a/CS/BlazorApp_SpreadsheetDocumentAPI/BlazorApp_SpreadsheetDocumentAPI.csproj +++ b/CS/BlazorAppSpreadsheet/BlazorAppSpreadsheet.csproj @@ -1,17 +1,21 @@ - + net8.0 enable enable + - - + + + + Always - \ No newline at end of file + + diff --git a/CS/BlazorApp_SpreadsheetDocumentAPI/Code/DocumentGenerator.cs b/CS/BlazorAppSpreadsheet/Code/DocumentGenerator.cs similarity index 99% rename from CS/BlazorApp_SpreadsheetDocumentAPI/Code/DocumentGenerator.cs rename to CS/BlazorAppSpreadsheet/Code/DocumentGenerator.cs index 933aa6c..7e6cf4a 100644 --- a/CS/BlazorApp_SpreadsheetDocumentAPI/Code/DocumentGenerator.cs +++ b/CS/BlazorAppSpreadsheet/Code/DocumentGenerator.cs @@ -2,7 +2,7 @@ using System.Drawing; using DevExpress.Spreadsheet; -namespace BlazorApp_SpreadsheetDocumentAPI +namespace BlazorAppSpreadsheet { public class LoanAmortizationScheduleGenerator { @@ -203,4 +203,4 @@ void SpecifyPrintOptions() Sheet.PrintOptions.FitToHeight = 0; } } -} +} \ No newline at end of file diff --git a/CS/BlazorApp_SpreadsheetDocumentAPI/Code/DocumentService.cs b/CS/BlazorAppSpreadsheet/Code/DocumentService.cs similarity index 97% rename from CS/BlazorApp_SpreadsheetDocumentAPI/Code/DocumentService.cs rename to CS/BlazorAppSpreadsheet/Code/DocumentService.cs index a1d5829..ef0640b 100644 --- a/CS/BlazorApp_SpreadsheetDocumentAPI/Code/DocumentService.cs +++ b/CS/BlazorAppSpreadsheet/Code/DocumentService.cs @@ -1,9 +1,10 @@ using System; using System.IO; using System.Threading.Tasks; +using BlazorAppSpreadsheet; using DevExpress.Spreadsheet; -namespace BlazorApp_SpreadsheetDocumentAPI +namespace BlazorAppSpreadsheet { public class DocumentService { @@ -58,4 +59,4 @@ async Task GenerateDocumentAsync(double loanAmount, return workbook; } } -} +} \ No newline at end of file diff --git a/CS/BlazorAppSpreadsheet/Components/App.razor b/CS/BlazorAppSpreadsheet/Components/App.razor new file mode 100644 index 0000000..1e1e6f5 --- /dev/null +++ b/CS/BlazorAppSpreadsheet/Components/App.razor @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/CS/BlazorAppSpreadsheet/Components/Layout/MainLayout.razor b/CS/BlazorAppSpreadsheet/Components/Layout/MainLayout.razor new file mode 100644 index 0000000..dc66d74 --- /dev/null +++ b/CS/BlazorAppSpreadsheet/Components/Layout/MainLayout.razor @@ -0,0 +1,24 @@ +@inherits LayoutComponentBase + +
+
+ +
+ +
+
+ About + +
+ +
+ @Body +
+
+
+ +
+ An unhandled error has occurred. + Reload + 🗙 +
diff --git a/CS/BlazorApp_SpreadsheetDocumentAPI/Shared/MainLayout.razor.css b/CS/BlazorAppSpreadsheet/Components/Layout/MainLayout.razor.css similarity index 56% rename from CS/BlazorApp_SpreadsheetDocumentAPI/Shared/MainLayout.razor.css rename to CS/BlazorAppSpreadsheet/Components/Layout/MainLayout.razor.css index 551e4b2..038baf1 100644 --- a/CS/BlazorApp_SpreadsheetDocumentAPI/Shared/MainLayout.razor.css +++ b/CS/BlazorAppSpreadsheet/Components/Layout/MainLayout.razor.css @@ -21,26 +21,27 @@ main { align-items: center; } - .top-row ::deep a, .top-row .btn-link { + .top-row ::deep a, .top-row ::deep .btn-link { white-space: nowrap; margin-left: 1.5rem; + text-decoration: none; } - .top-row a:first-child { + .top-row ::deep a:hover, .top-row ::deep .btn-link:hover { + text-decoration: underline; + } + + .top-row ::deep a:first-child { overflow: hidden; text-overflow: ellipsis; } @media (max-width: 640.98px) { - .top-row:not(.auth) { - display: none; - } - - .top-row.auth { + .top-row { justify-content: space-between; } - .top-row a, .top-row .btn-link { + .top-row ::deep a, .top-row ::deep .btn-link { margin-left: 0; } } @@ -63,8 +64,33 @@ main { z-index: 1; } + .top-row.auth ::deep a:first-child { + flex: 1; + text-align: right; + width: 0; + } + .top-row, article { padding-left: 2rem !important; padding-right: 1.5rem !important; } } + +#blazor-error-ui { + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + + #blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; + } diff --git a/CS/BlazorAppSpreadsheet/Components/Layout/NavMenu.razor b/CS/BlazorAppSpreadsheet/Components/Layout/NavMenu.razor new file mode 100644 index 0000000..91d7228 --- /dev/null +++ b/CS/BlazorAppSpreadsheet/Components/Layout/NavMenu.razor @@ -0,0 +1,30 @@ +
+
+ BlazorAppSpreadsheet +
+
+ + + +
+ +
+ diff --git a/CS/BlazorAppSpreadsheet/Components/Layout/NavMenu.razor.css b/CS/BlazorAppSpreadsheet/Components/Layout/NavMenu.razor.css new file mode 100644 index 0000000..4e15395 --- /dev/null +++ b/CS/BlazorAppSpreadsheet/Components/Layout/NavMenu.razor.css @@ -0,0 +1,105 @@ +.navbar-toggler { + appearance: none; + cursor: pointer; + width: 3.5rem; + height: 2.5rem; + color: white; + position: absolute; + top: 0.5rem; + right: 1rem; + border: 1px solid rgba(255, 255, 255, 0.1); + background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1); +} + +.navbar-toggler:checked { + background-color: rgba(255, 255, 255, 0.5); +} + +.top-row { + 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 .nav-link { + color: #d7d7d7; + background: none; + border: none; + border-radius: 4px; + height: 3rem; + display: flex; + align-items: center; + line-height: 3rem; + width: 100%; + } + +.nav-item ::deep a.active { + background-color: rgba(255,255,255,0.37); + color: white; +} + +.nav-item ::deep .nav-link:hover { + background-color: rgba(255,255,255,0.1); + color: white; +} + +.nav-scrollable { + display: none; +} + +.navbar-toggler:checked ~ .nav-scrollable { + display: block; +} + +@media (min-width: 641px) { + .navbar-toggler { + display: none; + } + + .nav-scrollable { + /* Never collapse the sidebar for wide screens */ + display: block; + + /* Allow sidebar to scroll for tall menus */ + height: calc(100vh - 3.5rem); + overflow-y: auto; + } +} diff --git a/CS/BlazorAppSpreadsheet/Components/Pages/Counter.razor b/CS/BlazorAppSpreadsheet/Components/Pages/Counter.razor new file mode 100644 index 0000000..d9deb80 --- /dev/null +++ b/CS/BlazorAppSpreadsheet/Components/Pages/Counter.razor @@ -0,0 +1,16 @@ +@page "/counter" +@rendermode InteractiveServer + +Counter + +

Counter

+ +

Current count: @currentCount

+ + + +@code { + private int currentCount = 0; + + private void IncrementCount() => currentCount++; +} diff --git a/CS/BlazorAppSpreadsheet/Components/Pages/Error.razor b/CS/BlazorAppSpreadsheet/Components/Pages/Error.razor new file mode 100644 index 0000000..576cc2d --- /dev/null +++ b/CS/BlazorAppSpreadsheet/Components/Pages/Error.razor @@ -0,0 +1,36 @@ +@page "/Error" +@using System.Diagnostics + +Error + +

Error.

+

An error occurred while processing your request.

+ +@if (ShowRequestId) +{ +

+ Request ID: @RequestId +

+} + +

Development Mode

+

+ Swapping to Development environment will display more detailed information about the error that occurred. +

+

+ The Development environment shouldn't be enabled for deployed applications. + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development + and restarting the app. +

+ +@code{ + [CascadingParameter] + private HttpContext? HttpContext { get; set; } + + private string? RequestId { get; set; } + private bool ShowRequestId => !string.IsNullOrEmpty(RequestId); + + protected override void OnInitialized() => + RequestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier; +} diff --git a/CS/BlazorApp_SpreadsheetDocumentAPI/Pages/Index.razor b/CS/BlazorAppSpreadsheet/Components/Pages/Home.razor similarity index 87% rename from CS/BlazorApp_SpreadsheetDocumentAPI/Pages/Index.razor rename to CS/BlazorAppSpreadsheet/Components/Pages/Home.razor index 72711cd..7c144db 100644 --- a/CS/BlazorApp_SpreadsheetDocumentAPI/Pages/Index.razor +++ b/CS/BlazorAppSpreadsheet/Components/Pages/Home.razor @@ -1,4 +1,7 @@ @page "/" +@rendermode InteractiveServer +@using System.Globalization +@using Microsoft.AspNetCore.WebUtilities @inject DocumentService DocumentService @inject IJSRuntime JS @@ -8,10 +11,11 @@ @@ -66,14 +70,14 @@