diff --git a/MissNationBlazorHybrid/MauiProgram.cs b/MissNationBlazorHybrid/MauiProgram.cs index cf351cd..f246f9b 100644 --- a/MissNationBlazorHybrid/MauiProgram.cs +++ b/MissNationBlazorHybrid/MauiProgram.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.Logging; + namespace MissNationBlazorHybrid { public static class MauiProgram @@ -16,8 +17,21 @@ namespace MissNationBlazorHybrid builder.Services.AddMauiBlazorWebView(); + builder.Services.AddLocalization(); + var handler = new HttpClientHandler(); + handler.ServerCertificateCustomValidationCallback = (message, certificate, chain, sslPolicyErrors) => true; + var client = new HttpClient(handler); + + /*Windows*/ + client.BaseAddress = new Uri("https://localhost:7183"); + + /*Android*/ + //client.BaseAddress = new Uri("https://10.0.2.2:7183"); + + builder.Services.AddSingleton(sp => client); + #if DEBUG - builder.Services.AddBlazorWebViewDeveloperTools(); + builder.Services.AddBlazorWebViewDeveloperTools(); builder.Logging.AddDebug(); #endif diff --git a/MissNationBlazorHybrid/wwwroot/index.html b/MissNationBlazorHybrid/wwwroot/index.html index b124487..31e5d95 100644 --- a/MissNationBlazorHybrid/wwwroot/index.html +++ b/MissNationBlazorHybrid/wwwroot/index.html @@ -8,7 +8,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -59,40 +59,42 @@ + + + + + - + diff --git a/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj b/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj index 03911bd..f4a8d51 100644 --- a/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj +++ b/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj @@ -20,5 +20,8 @@ + + false + diff --git a/MissNationBlazorWASM/Client/wwwroot/index.html b/MissNationBlazorWASM/Client/wwwroot/index.html index 34076ca..31e5d95 100644 --- a/MissNationBlazorWASM/Client/wwwroot/index.html +++ b/MissNationBlazorWASM/Client/wwwroot/index.html @@ -59,6 +59,7 @@ + @@ -93,7 +94,7 @@ - + diff --git a/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj b/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj index dc7f174..225c567 100644 --- a/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj +++ b/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj @@ -18,4 +18,7 @@ true + + false + diff --git a/MissNationBlazorWASM/Server/Program.cs b/MissNationBlazorWASM/Server/Program.cs index 7cac68a..19ae9fe 100644 --- a/MissNationBlazorWASM/Server/Program.cs +++ b/MissNationBlazorWASM/Server/Program.cs @@ -19,7 +19,7 @@ else app.UseHsts(); } -app.UseHttpsRedirection(); +//app.UseHttpsRedirection(); app.UseBlazorFrameworkFiles(); app.UseStaticFiles(new StaticFileOptions() { diff --git a/MissNationBlazorWASM/Server/Properties/PublishProfiles/FolderProfile.pubxml b/MissNationBlazorWASM/Server/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 0000000..37d81c3 --- /dev/null +++ b/MissNationBlazorWASM/Server/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,17 @@ + + + + + false + false + true + Release + Any CPU + FileSystem + C:\REPOS\MissNationPublish + FileSystem + <_TargetId>Folder + + \ No newline at end of file diff --git a/MissNationSharedUI/MissNationSharedUI.csproj b/MissNationSharedUI/MissNationSharedUI.csproj index 8cdddb8..1b8ecd8 100644 --- a/MissNationSharedUI/MissNationSharedUI.csproj +++ b/MissNationSharedUI/MissNationSharedUI.csproj @@ -13,6 +13,7 @@ + diff --git a/MissNationSharedUI/Shared/Components/Layout/CorporateNavbarComponent.razor b/MissNationSharedUI/Shared/Components/Layout/CorporateNavbarComponent.razor index 56ec8d1..d7f3bf9 100644 --- a/MissNationSharedUI/Shared/Components/Layout/CorporateNavbarComponent.razor +++ b/MissNationSharedUI/Shared/Components/Layout/CorporateNavbarComponent.razor @@ -1,6 +1,6 @@