kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2362 from sbwalker/dev

Browse Source 
add Site option for specifying a Hosting Model of Blazor Hybrid
This commit is contained in:
Shaun Walker 2022-08-15 09:32:42 -04:00 committed by GitHub
commit 633e4acf0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Oqtane.Client/Modules/Admin/Site/Index.razor
View File

@ -228,6 +228,7 @@
<select id="runtime" class="form-select" @bind="@_runtime" required> <select id="runtime" class="form-select" @bind="@_runtime" required>
<option value="Server">@SharedLocalizer["BlazorServer"]</option> <option value="Server">@SharedLocalizer["BlazorServer"]</option>
<option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option> <option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
<option value="Hybrid">@SharedLocalizer["BlazorHybrid"]</option>
</select> </select>
</div> </div>
</div> </div>

1
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -89,6 +89,7 @@ else
<select id="runtime" class="form-select" @bind="@_runtime" required> <select id="runtime" class="form-select" @bind="@_runtime" required>
<option value="Server">@SharedLocalizer["BlazorServer"]</option> <option value="Server">@SharedLocalizer["BlazorServer"]</option>
<option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option> <option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
<option value="Hybrid">@SharedLocalizer["BlazorHybrid"]</option>
</select> </select>
</div> </div>
</div> </div>

3
Oqtane.Client/Resources/SharedResources.resx
View File

@ -318,6 +318,9 @@
<data name="BlazorWebAssembly" xml:space="preserve"> <data name="BlazorWebAssembly" xml:space="preserve">
<value>Blazor WebAssembly</value> <value>Blazor WebAssembly</value>
</data> </data>
<data name="BlazorHybrid" xml:space="preserve">
<value>Blazor Hybrid</value>
</data>
<data name="Settings" xml:space="preserve"> <data name="Settings" xml:space="preserve">
<value>Settings</value> <value>Settings</value>
</data> </data>

10
Oqtane.Maui/Main.razor
View File

@ -1,5 +1,3 @@
@inherits ErrorBoundary
<DynamicComponent Type="@ComponentType" Parameters="@Parameters"></DynamicComponent> <DynamicComponent Type="@ComponentType" Parameters="@Parameters"></DynamicComponent>
@code { @code {
@ -11,16 +9,10 @@
Parameters = new Dictionary<string, object>(); Parameters = new Dictionary<string, object>();
Parameters.Add(new KeyValuePair<string, object>("AntiForgeryToken", "")); Parameters.Add(new KeyValuePair<string, object>("AntiForgeryToken", ""));
Parameters.Add(new KeyValuePair<string, object>("Runtime", "Hybrid")); Parameters.Add(new KeyValuePair<string, object>("Runtime", "Hybrid"));
Parameters.Add(new KeyValuePair<string, object>("RenderMode", "Hybrid")); Parameters.Add(new KeyValuePair<string, object>("RenderMode", ""));
Parameters.Add(new KeyValuePair<string, object>("VisitorId", -1)); Parameters.Add(new KeyValuePair<string, object>("VisitorId", -1));
Parameters.Add(new KeyValuePair<string, object>("RemoteIPAddress", "")); Parameters.Add(new KeyValuePair<string, object>("RemoteIPAddress", ""));
Parameters.Add(new KeyValuePair<string, object>("AuthorizationToken", "")); Parameters.Add(new KeyValuePair<string, object>("AuthorizationToken", ""));
} }
protected override async Task OnErrorAsync(Exception exception)
{
await base.OnErrorAsync(exception);
return;
}
} }

2
Oqtane.Server/Pages/_Host.cshtml
View File

@ -46,7 +46,7 @@
{ {
<script src="_framework/blazor.webassembly.js"></script> <script src="_framework/blazor.webassembly.js"></script>
} }
else @if (Model.Runtime == "Server")
{ {
<script src="_framework/blazor.server.js"></script> <script src="_framework/blazor.server.js"></script>
} }

4
Oqtane.Server/Pages/_Host.cshtml.cs
View File

@ -112,7 +112,7 @@ namespace Oqtane.Pages
} }
var site = _sites.GetSite(alias.SiteId); var site = _sites.GetSite(alias.SiteId);
if (site != null && !site.IsDeleted) if (site != null && !site.IsDeleted && site.Runtime != "Hybrid")
{ {
Route route = new Route(url, alias.Path); Route route = new Route(url, alias.Path);
@ -225,7 +225,7 @@ namespace Oqtane.Pages
} }
else else
{ {
Message = "Site Is Either Disabled Or Not Configured Correctly"; Message = "Site Is Disabled";
} }
} }
else else