From 56e810b936d18dcd355011ff155b9614e1af12e5 Mon Sep 17 00:00:00 2001 From: sijmen Date: Sun, 24 Mar 2024 16:34:34 +0000 Subject: [PATCH 1/3] Added sample code from surevelox:ns/blazor-sample. Made sure pagetitle is present on content page. Made content page handle when content is not present. --- OCBlazor/BlazorCms/BlazorCms.csproj | 29 +++++ OCBlazor/BlazorCms/NLog.config | 32 ++++++ OCBlazor/BlazorCms/Program.cs | 39 +++++++ .../BlazorCms/Properties/launchSettings.json | 27 +++++ OCBlazor/BlazorCms/appsettings.json | 9 ++ OCBlazor/BlazorCms/wwwroot/.placeholder | 1 + OCBlazor/OCBlazor.sln | 31 ++++++ OCBlazor/OCBlazorLib/App.razor | 17 +++ OCBlazor/OCBlazorLib/App.razor.css | 51 +++++++++ OCBlazor/OCBlazorLib/Layout/MainLayout.razor | 23 ++++ .../OCBlazorLib/Layout/MainLayout.razor.css | 96 ++++++++++++++++ OCBlazor/OCBlazorLib/Layout/NavMenu.razor | 23 ++++ OCBlazor/OCBlazorLib/Layout/NavMenu.razor.css | 104 ++++++++++++++++++ OCBlazor/OCBlazorLib/OCBlazorLib.csproj | 19 ++++ OCBlazor/OCBlazorLib/Pages/Content.razor | 50 +++++++++ OCBlazor/OCBlazorLib/Pages/Home.razor | 19 ++++ OCBlazor/OCBlazorLib/Routes.razor | 6 + OCBlazor/OCBlazorLib/_Imports.razor | 12 ++ OCBlazor/OCBlazorLib/wwwroot/background.png | Bin 0 -> 378 bytes .../OCBlazorLib/wwwroot/exampleJsInterop.js | 6 + OrchardCore.Samples.sln | 12 ++ 21 files changed, 606 insertions(+) create mode 100644 OCBlazor/BlazorCms/BlazorCms.csproj create mode 100644 OCBlazor/BlazorCms/NLog.config create mode 100644 OCBlazor/BlazorCms/Program.cs create mode 100644 OCBlazor/BlazorCms/Properties/launchSettings.json create mode 100644 OCBlazor/BlazorCms/appsettings.json create mode 100644 OCBlazor/BlazorCms/wwwroot/.placeholder create mode 100644 OCBlazor/OCBlazor.sln create mode 100644 OCBlazor/OCBlazorLib/App.razor create mode 100644 OCBlazor/OCBlazorLib/App.razor.css create mode 100644 OCBlazor/OCBlazorLib/Layout/MainLayout.razor create mode 100644 OCBlazor/OCBlazorLib/Layout/MainLayout.razor.css create mode 100644 OCBlazor/OCBlazorLib/Layout/NavMenu.razor create mode 100644 OCBlazor/OCBlazorLib/Layout/NavMenu.razor.css create mode 100644 OCBlazor/OCBlazorLib/OCBlazorLib.csproj create mode 100644 OCBlazor/OCBlazorLib/Pages/Content.razor create mode 100644 OCBlazor/OCBlazorLib/Pages/Home.razor create mode 100644 OCBlazor/OCBlazorLib/Routes.razor create mode 100644 OCBlazor/OCBlazorLib/_Imports.razor create mode 100644 OCBlazor/OCBlazorLib/wwwroot/background.png create mode 100644 OCBlazor/OCBlazorLib/wwwroot/exampleJsInterop.js diff --git a/OCBlazor/BlazorCms/BlazorCms.csproj b/OCBlazor/BlazorCms/BlazorCms.csproj new file mode 100644 index 0000000..542fbf3 --- /dev/null +++ b/OCBlazor/BlazorCms/BlazorCms.csproj @@ -0,0 +1,29 @@ + + + + net8.0 + InProcess + enable + enable + + + + + + + + + + + + + + + + + + + + + + diff --git a/OCBlazor/BlazorCms/NLog.config b/OCBlazor/BlazorCms/NLog.config new file mode 100644 index 0000000..49797bb --- /dev/null +++ b/OCBlazor/BlazorCms/NLog.config @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OCBlazor/BlazorCms/Program.cs b/OCBlazor/BlazorCms/Program.cs new file mode 100644 index 0000000..63c34d5 --- /dev/null +++ b/OCBlazor/BlazorCms/Program.cs @@ -0,0 +1,39 @@ +using OCBlazorLib; +using OrchardCore.Logging; + +var builder = WebApplication.CreateBuilder(args); + +builder.Host.UseNLogHost(); + +builder.Services + .AddOrchardCms() + .ConfigureServices(services => { + services.AddRazorComponents() + .AddInteractiveServerComponents() + ; + + }) + .Configure((app, routes, services) => { + app.UseStaticFiles(); + app.UseAntiforgery(); + routes.MapRazorComponents() + .AddInteractiveServerRenderMode() + ; + }) +; + +var app = builder.Build(); + +if (!app.Environment.IsDevelopment()) +{ + app.UseExceptionHandler("/Error"); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); +} + +app.UseHttpsRedirection(); +app.UseStaticFiles(); + +app.UseOrchardCore(); + +app.Run(); diff --git a/OCBlazor/BlazorCms/Properties/launchSettings.json b/OCBlazor/BlazorCms/Properties/launchSettings.json new file mode 100644 index 0000000..3c6bb3b --- /dev/null +++ b/OCBlazor/BlazorCms/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:8080", + "sslPort": 44300 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "BlazorCms": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/OCBlazor/BlazorCms/appsettings.json b/OCBlazor/BlazorCms/appsettings.json new file mode 100644 index 0000000..6d27889 --- /dev/null +++ b/OCBlazor/BlazorCms/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, +} diff --git a/OCBlazor/BlazorCms/wwwroot/.placeholder b/OCBlazor/BlazorCms/wwwroot/.placeholder new file mode 100644 index 0000000..46b134b --- /dev/null +++ b/OCBlazor/BlazorCms/wwwroot/.placeholder @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/OCBlazor/OCBlazor.sln b/OCBlazor/OCBlazor.sln new file mode 100644 index 0000000..74ddbdb --- /dev/null +++ b/OCBlazor/OCBlazor.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorCms", "BlazorCms\BlazorCms.csproj", "{32905CF1-43EB-47FC-860A-FB7D85AF2B76}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OCBlazorLib", "OCBlazorLib\OCBlazorLib.csproj", "{BA22F3E8-8A2E-4CDD-BF58-D2F0EABC4BD5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {32905CF1-43EB-47FC-860A-FB7D85AF2B76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32905CF1-43EB-47FC-860A-FB7D85AF2B76}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32905CF1-43EB-47FC-860A-FB7D85AF2B76}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32905CF1-43EB-47FC-860A-FB7D85AF2B76}.Release|Any CPU.Build.0 = Release|Any CPU + {BA22F3E8-8A2E-4CDD-BF58-D2F0EABC4BD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA22F3E8-8A2E-4CDD-BF58-D2F0EABC4BD5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA22F3E8-8A2E-4CDD-BF58-D2F0EABC4BD5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA22F3E8-8A2E-4CDD-BF58-D2F0EABC4BD5}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F08411E7-8491-4657-BF73-55E32435DAB7} + EndGlobalSection +EndGlobal diff --git a/OCBlazor/OCBlazorLib/App.razor b/OCBlazor/OCBlazorLib/App.razor new file mode 100644 index 0000000..05fd18f --- /dev/null +++ b/OCBlazor/OCBlazorLib/App.razor @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCBlazor/OCBlazorLib/App.razor.css b/OCBlazor/OCBlazorLib/App.razor.css new file mode 100644 index 0000000..d33aecd --- /dev/null +++ b/OCBlazor/OCBlazorLib/App.razor.css @@ -0,0 +1,51 @@ +html, body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +a, .btn-link { + color: #006bb7; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus { + box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb; +} + +.content { + padding-top: 1.1rem; +} + +h1:focus { + outline: none; +} + +.valid.modified:not([type=checkbox]) { + outline: 1px solid #26b050; +} + +.invalid { + outline: 1px solid #e50000; +} + +.validation-message { + color: #e50000; +} + +.blazor-error-boundary { + background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; + padding: 1rem 1rem 1rem 3.7rem; + color: white; +} + + .blazor-error-boundary::after { + content: "An error has occurred." + } + +.darker-border-checkbox.form-check-input { + border-color: #929292; +} diff --git a/OCBlazor/OCBlazorLib/Layout/MainLayout.razor b/OCBlazor/OCBlazorLib/Layout/MainLayout.razor new file mode 100644 index 0000000..0d6e343 --- /dev/null +++ b/OCBlazor/OCBlazorLib/Layout/MainLayout.razor @@ -0,0 +1,23 @@ +@inherits LayoutComponentBase + +
+
+ +
+ +
+
+ Learn Orchard +
+ +
+ @Body +
+
+
+ +
+ An unhandled error has occurred. + Reload + 🗙 +
\ No newline at end of file diff --git a/OCBlazor/OCBlazorLib/Layout/MainLayout.razor.css b/OCBlazor/OCBlazorLib/Layout/MainLayout.razor.css new file mode 100644 index 0000000..2293a59 --- /dev/null +++ b/OCBlazor/OCBlazorLib/Layout/MainLayout.razor.css @@ -0,0 +1,96 @@ +.page { + position: relative; + display: flex; + flex-direction: column; +} + +main { + flex: 1; +} + +.sidebar { + background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); +} + +.top-row { + background-color: #f7f7f7; + border-bottom: 1px solid #d6d5d5; + justify-content: flex-end; + height: 3.5rem; + display: flex; + align-items: center; +} + + .top-row ::deep a, .top-row ::deep .btn-link { + white-space: nowrap; + margin-left: 1.5rem; + text-decoration: none; + } + + .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 { + justify-content: space-between; + } + + .top-row ::deep a, .top-row ::deep .btn-link { + margin-left: 0; + } +} + +@media (min-width: 641px) { + .page { + flex-direction: row; + } + + .sidebar { + width: 250px; + height: 100vh; + position: sticky; + top: 0; + } + + .top-row { + position: sticky; + top: 0; + 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/OCBlazor/OCBlazorLib/Layout/NavMenu.razor b/OCBlazor/OCBlazorLib/Layout/NavMenu.razor new file mode 100644 index 0000000..12353f8 --- /dev/null +++ b/OCBlazor/OCBlazorLib/Layout/NavMenu.razor @@ -0,0 +1,23 @@ +
+
+ BlazorCMS +
+
+ + + +
+ +
diff --git a/OCBlazor/OCBlazorLib/Layout/NavMenu.razor.css b/OCBlazor/OCBlazorLib/Layout/NavMenu.razor.css new file mode 100644 index 0000000..a946112 --- /dev/null +++ b/OCBlazor/OCBlazorLib/Layout/NavMenu.razor.css @@ -0,0 +1,104 @@ +.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/OCBlazor/OCBlazorLib/OCBlazorLib.csproj b/OCBlazor/OCBlazorLib/OCBlazorLib.csproj new file mode 100644 index 0000000..ca0019d --- /dev/null +++ b/OCBlazor/OCBlazorLib/OCBlazorLib.csproj @@ -0,0 +1,19 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + diff --git a/OCBlazor/OCBlazorLib/Pages/Content.razor b/OCBlazor/OCBlazorLib/Pages/Content.razor new file mode 100644 index 0000000..63ebb23 --- /dev/null +++ b/OCBlazor/OCBlazorLib/Pages/Content.razor @@ -0,0 +1,50 @@ +@page "/content/{alias}" +@attribute [StreamRendering] +@using OrchardCore.ContentManagement.Models +@inject IContentHandleManager handleManager +@inject IContentManager contentManager +@inject ISiteService SiteService + +@ContentItem?.DisplayText - @Site?.SiteName + + +@if (Markup is null) +{ +

Loading...

+} +else +{ + +

@ContentItem?.DisplayText

+ @((MarkupString)Markup) + +} +@code +{ + [ParameterAttribute] + public string Alias { get; set; } + + protected ContentItem ContentItem { get; set; } + protected string Markup { get; set; } + protected ISite? Site { get; set; } + + protected override async Task OnInitializedAsync() + { + Site = await SiteService.GetSiteSettingsAsync(); + } + + protected override async Task OnParametersSetAsync() + { + string id = await handleManager.GetContentItemIdAsync($"alias:{Alias}"); + ContentItem = await contentManager.GetAsync(id, VersionOptions.Published); + if(ContentItem is not null) + { + var bodyAspect = await contentManager.PopulateAspectAsync(ContentItem); + Markup = bodyAspect?.Body.ToString() ?? "No content body was found"; + } + else + { + Markup = $"No content was found for this alias {Alias}"; + } + } +} \ No newline at end of file diff --git a/OCBlazor/OCBlazorLib/Pages/Home.razor b/OCBlazor/OCBlazorLib/Pages/Home.razor new file mode 100644 index 0000000..cc46904 --- /dev/null +++ b/OCBlazor/OCBlazorLib/Pages/Home.razor @@ -0,0 +1,19 @@ +@page "/home" + +@inject ISiteService SiteService + +Home - @Site?.SiteName + +

Hello, Orchard!

+ + Welcome to your new Blazor CMS app. + +@code { + protected ISite? Site { get; set; } + + protected override async Task OnInitializedAsync() + { + Site = await SiteService.GetSiteSettingsAsync(); + + } +} \ No newline at end of file diff --git a/OCBlazor/OCBlazorLib/Routes.razor b/OCBlazor/OCBlazorLib/Routes.razor new file mode 100644 index 0000000..d8647a3 --- /dev/null +++ b/OCBlazor/OCBlazorLib/Routes.razor @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCBlazor/OCBlazorLib/_Imports.razor b/OCBlazor/OCBlazorLib/_Imports.razor new file mode 100644 index 0000000..2a9b0a7 --- /dev/null +++ b/OCBlazor/OCBlazorLib/_Imports.razor @@ -0,0 +1,12 @@ +@using System.Net.Http +@using System.Net.Http.Json +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using static Microsoft.AspNetCore.Components.Web.RenderMode +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.JSInterop +@using OCBlazorLib +@using OrchardCore; +@using OrchardCore.ContentManagement; +@using OrchardCore.Settings; \ No newline at end of file diff --git a/OCBlazor/OCBlazorLib/wwwroot/background.png b/OCBlazor/OCBlazorLib/wwwroot/background.png new file mode 100644 index 0000000000000000000000000000000000000000..e15a3bde6e2bdb380df6a0b46d7ed00bdeb0aaa8 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^x**KK1SGdsl%54rjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwr2>%=KS^ie7oTIEF;HpS|GCbyPusHSqiXaCu3qf)82(9Gq&mZq2{Kq}M*X&MWtJ zSi1Jo7ZzfImg%g=t(qo=wsSR2lZoP(Rj#3wacN=q0?Br(rXzgZEGK2$ID{|A=5S{xJEuzSH>!M+7wSY6hB<=-E^*n0W7 S8wY^CX7F_Nb6Mw<&;$S{dxtsz literal 0 HcmV?d00001 diff --git a/OCBlazor/OCBlazorLib/wwwroot/exampleJsInterop.js b/OCBlazor/OCBlazorLib/wwwroot/exampleJsInterop.js new file mode 100644 index 0000000..ea8d76a --- /dev/null +++ b/OCBlazor/OCBlazorLib/wwwroot/exampleJsInterop.js @@ -0,0 +1,6 @@ +// This is a JavaScript module that is loaded on demand. It can export any number of +// functions, and may import other JavaScript modules if required. + +export function showPrompt(message) { + return prompt(message, 'Type anything here'); +} diff --git a/OrchardCore.Samples.sln b/OrchardCore.Samples.sln index 9864e2f..365fde2 100644 --- a/OrchardCore.Samples.sln +++ b/OrchardCore.Samples.sln @@ -21,6 +21,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DashboardApplication", "DashboardApplication\DashboardApplication.csproj", "{1E751DAB-8A21-48EB-96E4-F0ED9C999462}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OCBlazorLib", "OCBlazor\OCBlazorLib\OCBlazorLib.csproj", "{E7C06647-1E64-4B6F-9728-78F578B87404}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorCms", "OCBlazor\BlazorCms\BlazorCms.csproj", "{5A21FE91-A534-4AFB-BB70-DE1313F5CE5F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -47,6 +51,14 @@ Global {1E751DAB-8A21-48EB-96E4-F0ED9C999462}.Debug|Any CPU.Build.0 = Debug|Any CPU {1E751DAB-8A21-48EB-96E4-F0ED9C999462}.Release|Any CPU.ActiveCfg = Release|Any CPU {1E751DAB-8A21-48EB-96E4-F0ED9C999462}.Release|Any CPU.Build.0 = Release|Any CPU + {E7C06647-1E64-4B6F-9728-78F578B87404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E7C06647-1E64-4B6F-9728-78F578B87404}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E7C06647-1E64-4B6F-9728-78F578B87404}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E7C06647-1E64-4B6F-9728-78F578B87404}.Release|Any CPU.Build.0 = Release|Any CPU + {5A21FE91-A534-4AFB-BB70-DE1313F5CE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A21FE91-A534-4AFB-BB70-DE1313F5CE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A21FE91-A534-4AFB-BB70-DE1313F5CE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A21FE91-A534-4AFB-BB70-DE1313F5CE5F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 204b5d978fe4a9587d79037ba7a897c709c1784e Mon Sep 17 00:00:00 2001 From: sijmen Date: Sun, 24 Mar 2024 22:20:56 +0000 Subject: [PATCH 2/3] Inject NavigationManager and add interactive button In `App.razor`, the `NavigationManager` is now injected to dynamically set the `_baseUrl` variable, which is used to set the base href in the HTML head. A new interactive button has been added in `InteractiveButton.razor` that updates a feedback message with the current local time. The navigation menu in `NavMenu.razor` has been restructured, removing unnecessary div elements and adding a new navigation link to the "Base Url" page. A new page has been created in `BaseUrl.razor` to display various base URLs and an interactive button. --- OCBlazor/OCBlazorLib/App.razor | 19 ++++++- .../Components/InteractiveButton.razor | 15 +++++ OCBlazor/OCBlazorLib/Layout/NavMenu.razor | 46 +++++++++------- OCBlazor/OCBlazorLib/Pages/BaseUrl.razor | 55 +++++++++++++++++++ 4 files changed, 112 insertions(+), 23 deletions(-) create mode 100644 OCBlazor/OCBlazorLib/Components/InteractiveButton.razor create mode 100644 OCBlazor/OCBlazorLib/Pages/BaseUrl.razor diff --git a/OCBlazor/OCBlazorLib/App.razor b/OCBlazor/OCBlazorLib/App.razor index 05fd18f..b1b10bf 100644 --- a/OCBlazor/OCBlazorLib/App.razor +++ b/OCBlazor/OCBlazorLib/App.razor @@ -1,10 +1,12 @@ - +@inject NavigationManager NavManager + + - + @@ -14,4 +16,15 @@ - \ No newline at end of file + + +@code +{ + protected string _baseUrl = "/"; + + protected override void OnParametersSet() + { + base.OnParametersSet(); + _baseUrl = NavManager.BaseUri; + } +} \ No newline at end of file diff --git a/OCBlazor/OCBlazorLib/Components/InteractiveButton.razor b/OCBlazor/OCBlazorLib/Components/InteractiveButton.razor new file mode 100644 index 0000000..982d296 --- /dev/null +++ b/OCBlazor/OCBlazorLib/Components/InteractiveButton.razor @@ -0,0 +1,15 @@ +

Interactivity test

+ + +
+@_interactiveFeedback + +@code { + + protected string? _interactiveFeedback; + + protected void Clicked() + { + _interactiveFeedback = $"Clicked! [{DateTime.Now.ToLocalTime()}]"; + } +} diff --git a/OCBlazor/OCBlazorLib/Layout/NavMenu.razor b/OCBlazor/OCBlazorLib/Layout/NavMenu.razor index 12353f8..4b3a2e5 100644 --- a/OCBlazor/OCBlazorLib/Layout/NavMenu.razor +++ b/OCBlazor/OCBlazorLib/Layout/NavMenu.razor @@ -1,23 +1,29 @@ 
-
- BlazorCMS -
+
+ BlazorCMS
- - - -
-
+ +
+ + Base Url + +
+ +
diff --git a/OCBlazor/OCBlazorLib/Pages/BaseUrl.razor b/OCBlazor/OCBlazorLib/Pages/BaseUrl.razor new file mode 100644 index 0000000..7d45c74 --- /dev/null +++ b/OCBlazor/OCBlazorLib/Pages/BaseUrl.razor @@ -0,0 +1,55 @@ +@page "/baseurl" + +@using Microsoft.AspNetCore.Http +@using OrchardCore.Environment.Shell.Scope + +@inject ISiteService SiteService +@inject NavigationManager NavigationManager +@inject IHttpContextAccessor OrchardHelper + +BaseUrl - @Site?.SiteName + +

BaseUrl

+
    +
  • Shell scope request url prefix: @_baseUrlShellScope
    • +
  • Navigation Manager base URI: @_baseUrlNavigationManager
    • +
  • Http Context base PathBase: @_baseUrlHttpContext
    • +
  • Site Settings base Url: @_baseUrlSiteSettings
    • +
+ + + +@code { + + [CascadingParameter] + public HttpContext? HttpContext { get; set; } + + protected ISite? Site { get; set; } + + protected string? _baseUrlShellScope; + protected string? _baseUrlNavigationManager; + protected string? _baseUrlHttpContext; + protected string? _baseUrlSiteSettings; + + + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + Site = await SiteService.GetSiteSettingsAsync(); + + _baseUrlShellScope = ShellScope.Context.Settings.RequestUrlPrefix; + if (!String.IsNullOrEmpty(_baseUrlShellScope)) { _baseUrlShellScope = $"/{_baseUrlShellScope}/"; } + else { _baseUrlShellScope = "/"; } + + _baseUrlNavigationManager = NavigationManager.BaseUri; + + _baseUrlHttpContext = HttpContext?.Request.PathBase; + if (!String.IsNullOrEmpty(_baseUrlHttpContext)) { _baseUrlHttpContext = $"{_baseUrlHttpContext}/"; } + else { _baseUrlHttpContext = "/"; } + + _baseUrlSiteSettings = Site.BaseUrl; + if (String.IsNullOrEmpty(_baseUrlSiteSettings)) { _baseUrlSiteSettings = $"{_baseUrlSiteSettings}/"; } + } + + +} From 5d43bd058e82c5a8db092740f4020de3ca909133 Mon Sep 17 00:00:00 2001 From: Sijmen Koffeman Date: Wed, 3 Apr 2024 11:36:43 +0100 Subject: [PATCH 3/3] Remove IHttpContextAccessor from BaseUrl.razor Removed the `IHttpContextAccessor` dependency injection named `OrchardHelper` from the `BaseUrl.razor` file. This change simplifies the code and reduces dependencies. --- OCBlazor/OCBlazorLib/Pages/BaseUrl.razor | 1 - 1 file changed, 1 deletion(-) diff --git a/OCBlazor/OCBlazorLib/Pages/BaseUrl.razor b/OCBlazor/OCBlazorLib/Pages/BaseUrl.razor index 7d45c74..dec5c52 100644 --- a/OCBlazor/OCBlazorLib/Pages/BaseUrl.razor +++ b/OCBlazor/OCBlazorLib/Pages/BaseUrl.razor @@ -5,7 +5,6 @@ @inject ISiteService SiteService @inject NavigationManager NavigationManager -@inject IHttpContextAccessor OrchardHelper BaseUrl - @Site?.SiteName