diff --git a/BlazorMdc.sln b/BlazorMdc.sln index c86dec744..8991605c3 100644 --- a/BlazorMdc.sln +++ b/BlazorMdc.sln @@ -5,36 +5,72 @@ VisualStudioVersion = 16.0.29827.131 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorMdc", "src\BlazorMdc\BlazorMdc.csproj", "{18F89AD9-B647-4928-9C88-6FE17D96355A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demonstration", "samples\Demonstration\Demonstration.csproj", "{E3256AE1-339B-4365-9E2C-66D71C22BDD6}" - ProjectSection(ProjectDependencies) = postProject - {18F89AD9-B647-4928-9C88-6FE17D96355A} = {18F89AD9-B647-4928-9C88-6FE17D96355A} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{510C6FFC-D13D-431C-B5B5-897B7BDA3C29}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{24CEE271-A626-4366-893B-90942D79D569}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorMdc.Demo.Blazor", "samples\BlazorMdc.Demo.Blazor\BlazorMdc.Demo.Blazor.csproj", "{E6356325-F767-4C25-BDCA-005C45144C80}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorMdc.Demo.CommonUI", "samples\BlazorMdc.Demo.CommonUI\BlazorMdc.Demo.CommonUI.csproj", "{E19D106A-7368-46CB-B8FB-08465F927A79}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorMdc.Demo.WebServer", "samples\BlazorMdc.Demo.WebServer\BlazorMdc.Demo.WebServer.csproj", "{538DF864-828F-470C-AE74-7345272F5EEF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solutionitems", "solutionitems", "{9BF202BD-226D-4058-92D9-B9D0B23F96E6}" + ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore + LICENSE.md = LICENSE.md + README.md = README.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug_CSB|Any CPU = Debug_CSB|Any CPU + Debug_SSB|Any CPU = Debug_SSB|Any CPU + Release_CSB|Any CPU = Release_CSB|Any CPU + Release_SSB|Any CPU = Release_SSB|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {18F89AD9-B647-4928-9C88-6FE17D96355A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18F89AD9-B647-4928-9C88-6FE17D96355A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18F89AD9-B647-4928-9C88-6FE17D96355A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18F89AD9-B647-4928-9C88-6FE17D96355A}.Release|Any CPU.Build.0 = Release|Any CPU - {E3256AE1-339B-4365-9E2C-66D71C22BDD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3256AE1-339B-4365-9E2C-66D71C22BDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3256AE1-339B-4365-9E2C-66D71C22BDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3256AE1-339B-4365-9E2C-66D71C22BDD6}.Release|Any CPU.Build.0 = Release|Any CPU + {18F89AD9-B647-4928-9C88-6FE17D96355A}.Debug_CSB|Any CPU.ActiveCfg = Debug_CSB|Any CPU + {18F89AD9-B647-4928-9C88-6FE17D96355A}.Debug_CSB|Any CPU.Build.0 = Debug_CSB|Any CPU + {18F89AD9-B647-4928-9C88-6FE17D96355A}.Debug_SSB|Any CPU.ActiveCfg = Debug_SSB|Any CPU + {18F89AD9-B647-4928-9C88-6FE17D96355A}.Debug_SSB|Any CPU.Build.0 = Debug_SSB|Any CPU + {18F89AD9-B647-4928-9C88-6FE17D96355A}.Release_CSB|Any CPU.ActiveCfg = Release_CSB|Any CPU + {18F89AD9-B647-4928-9C88-6FE17D96355A}.Release_CSB|Any CPU.Build.0 = Release_CSB|Any CPU + {18F89AD9-B647-4928-9C88-6FE17D96355A}.Release_SSB|Any CPU.ActiveCfg = Release_SSB|Any CPU + {18F89AD9-B647-4928-9C88-6FE17D96355A}.Release_SSB|Any CPU.Build.0 = Release_SSB|Any CPU + {E6356325-F767-4C25-BDCA-005C45144C80}.Debug_CSB|Any CPU.ActiveCfg = Debug_CSB|Any CPU + {E6356325-F767-4C25-BDCA-005C45144C80}.Debug_CSB|Any CPU.Build.0 = Debug_CSB|Any CPU + {E6356325-F767-4C25-BDCA-005C45144C80}.Debug_SSB|Any CPU.ActiveCfg = Debug_SSB|Any CPU + {E6356325-F767-4C25-BDCA-005C45144C80}.Debug_SSB|Any CPU.Build.0 = Debug_SSB|Any CPU + {E6356325-F767-4C25-BDCA-005C45144C80}.Release_CSB|Any CPU.ActiveCfg = Release_CSB|Any CPU + {E6356325-F767-4C25-BDCA-005C45144C80}.Release_CSB|Any CPU.Build.0 = Release_CSB|Any CPU + {E6356325-F767-4C25-BDCA-005C45144C80}.Release_SSB|Any CPU.ActiveCfg = Release_SSB|Any CPU + {E6356325-F767-4C25-BDCA-005C45144C80}.Release_SSB|Any CPU.Build.0 = Release_SSB|Any CPU + {E19D106A-7368-46CB-B8FB-08465F927A79}.Debug_CSB|Any CPU.ActiveCfg = Debug_CSB|Any CPU + {E19D106A-7368-46CB-B8FB-08465F927A79}.Debug_CSB|Any CPU.Build.0 = Debug_CSB|Any CPU + {E19D106A-7368-46CB-B8FB-08465F927A79}.Debug_SSB|Any CPU.ActiveCfg = Debug_SSB|Any CPU + {E19D106A-7368-46CB-B8FB-08465F927A79}.Debug_SSB|Any CPU.Build.0 = Debug_SSB|Any CPU + {E19D106A-7368-46CB-B8FB-08465F927A79}.Release_CSB|Any CPU.ActiveCfg = Release_CSB|Any CPU + {E19D106A-7368-46CB-B8FB-08465F927A79}.Release_CSB|Any CPU.Build.0 = Release_CSB|Any CPU + {E19D106A-7368-46CB-B8FB-08465F927A79}.Release_SSB|Any CPU.ActiveCfg = Release_SSB|Any CPU + {E19D106A-7368-46CB-B8FB-08465F927A79}.Release_SSB|Any CPU.Build.0 = Release_SSB|Any CPU + {538DF864-828F-470C-AE74-7345272F5EEF}.Debug_CSB|Any CPU.ActiveCfg = Debug_CSB|Any CPU + {538DF864-828F-470C-AE74-7345272F5EEF}.Debug_CSB|Any CPU.Build.0 = Debug_CSB|Any CPU + {538DF864-828F-470C-AE74-7345272F5EEF}.Debug_SSB|Any CPU.ActiveCfg = Debug_SSB|Any CPU + {538DF864-828F-470C-AE74-7345272F5EEF}.Debug_SSB|Any CPU.Build.0 = Debug_SSB|Any CPU + {538DF864-828F-470C-AE74-7345272F5EEF}.Release_CSB|Any CPU.ActiveCfg = Release_CSB|Any CPU + {538DF864-828F-470C-AE74-7345272F5EEF}.Release_CSB|Any CPU.Build.0 = Release_CSB|Any CPU + {538DF864-828F-470C-AE74-7345272F5EEF}.Release_SSB|Any CPU.ActiveCfg = Release_SSB|Any CPU + {538DF864-828F-470C-AE74-7345272F5EEF}.Release_SSB|Any CPU.Build.0 = Release_SSB|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {18F89AD9-B647-4928-9C88-6FE17D96355A} = {510C6FFC-D13D-431C-B5B5-897B7BDA3C29} - {E3256AE1-339B-4365-9E2C-66D71C22BDD6} = {24CEE271-A626-4366-893B-90942D79D569} + {E6356325-F767-4C25-BDCA-005C45144C80} = {24CEE271-A626-4366-893B-90942D79D569} + {E19D106A-7368-46CB-B8FB-08465F927A79} = {24CEE271-A626-4366-893B-90942D79D569} + {538DF864-828F-470C-AE74-7345272F5EEF} = {24CEE271-A626-4366-893B-90942D79D569} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6EFB30DD-ABFD-4A38-96E1-D309BB538E62} diff --git a/README.md b/README.md index 6758261f6..1088385b6 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,19 @@ BlazorMdc is forked from [Steve Sanderson's](https://blog.stevensanderson.com/) _TBD_ +## Demonstration from local build +If you have cloned the repository and are building from source there is a project under 'samples' that should be selected as the startup project. That project is BlazorMDC.Demo.WebServer. + +There are four implemented solution configurations: + +| Configuration | Notes | +| :------------ | :---- | +| `Debug_CSB` | This is a debug build. It defines two constants, DEBUG, and ClientSideBlazor. It executes using WASM. | +|`Debug_SSB`|Also a debug build, defines DEBUG abd ServerSideBlazor. It executes in the context of the web server and the the client being displayed by RPC| +|`Release_xSB`|These two (x=C or S) configurations are the same as the debug versions but are built as release and the DEBUG constant is replaced by RELEASE.| + +The home page of the demonstration application shows the execution environment as well as the build mode. + ## Components The following is a list of components, but lacks documentation on how they are used. Since forking from [RazorComponents.MaterialDesign](https://github.com/SteveSandersonMS/RazorComponents.MaterialDesign), some components await review - these are highlighed. diff --git a/samples/BlazorMdc.Demo.Blazor/BlazorMdc.Demo.Blazor.csproj b/samples/BlazorMdc.Demo.Blazor/BlazorMdc.Demo.Blazor.csproj new file mode 100644 index 000000000..79e1054fa --- /dev/null +++ b/samples/BlazorMdc.Demo.Blazor/BlazorMdc.Demo.Blazor.csproj @@ -0,0 +1,39 @@ + + + + + netstandard2.1 + Exe + 7.3 + 3.0 + + Debug_CSB;Debug_SSB;Release_CSB;Release_SSB + + + + ClientSideBlazor;DEBUG; + + + + ServerSideBlazor;DEBUG; + + + + ClientSideBlazor;RELEASE; + + + + ServerSideBlazor;RELEASE + + + + + + + + + + + + + diff --git a/samples/BlazorMdc.Demo.Blazor/Program.cs b/samples/BlazorMdc.Demo.Blazor/Program.cs new file mode 100644 index 000000000..6c4125cb0 --- /dev/null +++ b/samples/BlazorMdc.Demo.Blazor/Program.cs @@ -0,0 +1,22 @@ +using BlazorMdc.Demo.CommonUI; + +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using Microsoft.Extensions.DependencyInjection; + +using System.Threading.Tasks; + +namespace BlazorMdc.Demo.Blazor +{ + public class Program + { + public static async Task Main(string[] args) + { + var builder = WebAssemblyHostBuilder.CreateDefault(args); + builder.RootComponents.Add("app"); + + builder.Services.AddBaseAddressHttpClient(); + + await builder.Build().RunAsync(); + } + } +} diff --git a/samples/BlazorMdc.Demo.Blazor/Properties/launchSettings.json b/samples/BlazorMdc.Demo.Blazor/Properties/launchSettings.json new file mode 100644 index 000000000..f10826bbb --- /dev/null +++ b/samples/BlazorMdc.Demo.Blazor/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:59810/", + "sslPort": 44316 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "BlazorMdc.Demo.Blazor": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:5001;http://localhost:5000" + } + } +} \ No newline at end of file diff --git a/samples/Demonstration/App.razor b/samples/BlazorMdc.Demo.CommonUI/App.razor similarity index 85% rename from samples/Demonstration/App.razor rename to samples/BlazorMdc.Demo.CommonUI/App.razor index 6f67a6ea6..112d809e3 100644 --- a/samples/Demonstration/App.razor +++ b/samples/BlazorMdc.Demo.CommonUI/App.razor @@ -1,4 +1,4 @@ - + diff --git a/samples/BlazorMdc.Demo.CommonUI/BlazorMdc.Demo.CommonUI.csproj b/samples/BlazorMdc.Demo.CommonUI/BlazorMdc.Demo.CommonUI.csproj new file mode 100644 index 000000000..a49912709 --- /dev/null +++ b/samples/BlazorMdc.Demo.CommonUI/BlazorMdc.Demo.CommonUI.csproj @@ -0,0 +1,36 @@ + + + + true + 7.3 + Library + BlazorMdc.Demo.CommonUI + netstandard2.1 + + 3.0 + true + + Debug_CSB;Debug_SSB;Release_CSB;Release_SSB + + + + ClientSideBlazor;DEBUG; + + + + ServerSideBlazor;DEBUG; + + + + ClientSideBlazor;RELEASE; + + + + ServerSideBlazor;RELEASE + + + + + + + diff --git a/samples/Demonstration/Pages/AutocompleteSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/AutocompleteSample.razor similarity index 100% rename from samples/Demonstration/Pages/AutocompleteSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/AutocompleteSample.razor diff --git a/samples/Demonstration/Pages/ButtonSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/ButtonSample.razor similarity index 100% rename from samples/Demonstration/Pages/ButtonSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/ButtonSample.razor diff --git a/samples/Demonstration/Pages/CardSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/CardSample.razor similarity index 100% rename from samples/Demonstration/Pages/CardSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/CardSample.razor diff --git a/samples/Demonstration/Pages/CascadingDefaultsSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/CascadingDefaultsSample.razor similarity index 100% rename from samples/Demonstration/Pages/CascadingDefaultsSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/CascadingDefaultsSample.razor diff --git a/samples/Demonstration/Pages/CheckboxSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/CheckboxSample.razor similarity index 100% rename from samples/Demonstration/Pages/CheckboxSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/CheckboxSample.razor diff --git a/samples/Demonstration/Pages/DatePickerSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/DatePickerSample.razor similarity index 100% rename from samples/Demonstration/Pages/DatePickerSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/DatePickerSample.razor diff --git a/samples/Demonstration/Pages/DialogSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/DialogSample.razor similarity index 100% rename from samples/Demonstration/Pages/DialogSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/DialogSample.razor diff --git a/samples/Demonstration/Pages/Index.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/Index.razor similarity index 55% rename from samples/Demonstration/Pages/Index.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/Index.razor index 6a2e19f06..0b1c6069f 100644 --- a/samples/Demonstration/Pages/Index.razor +++ b/samples/BlazorMdc.Demo.CommonUI/Pages/Index.razor @@ -1,12 +1,10 @@ @page "/" -@using System.Runtime.InteropServices -

Hello, world!

This sample demonstrates the use of RazorComponents.MaterialDesign components.

-

Currently executing on @runtime.

+

Currently executing on @runtime built in @mode mode.

@@ -14,9 +12,3 @@ {

A spacing paragraph to test scrolling and the top menu's scroll behaviour.

} - -@code { - string runtime = RuntimeInformation.IsOSPlatform(OSPlatform.Create("WEBASSEMBLY")) - ? "Mono WebAssembly" - : ".NET Core"; -} diff --git a/samples/BlazorMdc.Demo.CommonUI/Pages/Index.razor.cs b/samples/BlazorMdc.Demo.CommonUI/Pages/Index.razor.cs new file mode 100644 index 000000000..7690df551 --- /dev/null +++ b/samples/BlazorMdc.Demo.CommonUI/Pages/Index.razor.cs @@ -0,0 +1,21 @@ +using System.Runtime.InteropServices; + +namespace BlazorMdc.Demo.CommonUI.Pages +{ + public partial class Index + { + string runtime = RuntimeInformation.IsOSPlatform(OSPlatform.Create("WEBASSEMBLY")) + ? "Mono WebAssembly" + : ".NET Core"; + + string mode; + public Index() + { +#if DEBUG + mode = "debug"; +#else + mode = "release"; +#endif + } + } +} diff --git a/samples/Demonstration/Pages/ListSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/ListSample.razor similarity index 100% rename from samples/Demonstration/Pages/ListSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/ListSample.razor diff --git a/samples/Demonstration/Pages/MenuSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/MenuSample.razor similarity index 100% rename from samples/Demonstration/Pages/MenuSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/MenuSample.razor diff --git a/samples/Demonstration/Pages/NumericFieldSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/NumericFieldSample.razor similarity index 100% rename from samples/Demonstration/Pages/NumericFieldSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/NumericFieldSample.razor diff --git a/samples/Demonstration/Pages/ProgressSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/ProgressSample.razor similarity index 100% rename from samples/Demonstration/Pages/ProgressSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/ProgressSample.razor diff --git a/samples/Demonstration/Pages/RadioButtonsSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/RadioButtonsSample.razor similarity index 100% rename from samples/Demonstration/Pages/RadioButtonsSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/RadioButtonsSample.razor diff --git a/samples/Demonstration/Pages/SelectSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/SelectSample.razor similarity index 100% rename from samples/Demonstration/Pages/SelectSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/SelectSample.razor diff --git a/samples/Demonstration/Pages/SwitchSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/SwitchSample.razor similarity index 100% rename from samples/Demonstration/Pages/SwitchSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/SwitchSample.razor diff --git a/samples/Demonstration/Pages/TabBarSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/TabBarSample.razor similarity index 100% rename from samples/Demonstration/Pages/TabBarSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/TabBarSample.razor diff --git a/samples/Demonstration/Pages/TextAreaSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/TextAreaSample.razor similarity index 100% rename from samples/Demonstration/Pages/TextAreaSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/TextAreaSample.razor diff --git a/samples/Demonstration/Pages/TextFieldSample.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/TextFieldSample.razor similarity index 100% rename from samples/Demonstration/Pages/TextFieldSample.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/TextFieldSample.razor diff --git a/samples/Demonstration/Pages/_Imports.razor b/samples/BlazorMdc.Demo.CommonUI/Pages/_Imports.razor similarity index 100% rename from samples/Demonstration/Pages/_Imports.razor rename to samples/BlazorMdc.Demo.CommonUI/Pages/_Imports.razor diff --git a/samples/Demonstration/Properties/launchSettings.json b/samples/BlazorMdc.Demo.CommonUI/Properties/launchSettings.json similarity index 100% rename from samples/Demonstration/Properties/launchSettings.json rename to samples/BlazorMdc.Demo.CommonUI/Properties/launchSettings.json diff --git a/samples/Demonstration/Shared/MainLayout.razor b/samples/BlazorMdc.Demo.CommonUI/Shared/MainLayout.razor similarity index 100% rename from samples/Demonstration/Shared/MainLayout.razor rename to samples/BlazorMdc.Demo.CommonUI/Shared/MainLayout.razor diff --git a/samples/Demonstration/_Imports.razor b/samples/BlazorMdc.Demo.CommonUI/_Imports.razor similarity index 70% rename from samples/Demonstration/_Imports.razor rename to samples/BlazorMdc.Demo.CommonUI/_Imports.razor index f684411e5..abd9e7430 100644 --- a/samples/Demonstration/_Imports.razor +++ b/samples/BlazorMdc.Demo.CommonUI/_Imports.razor @@ -1,10 +1,10 @@ @using System.Net.Http @using Microsoft.AspNetCore.Authorization -@using Microsoft.AspNetCore.Components.Authorization @using Microsoft.AspNetCore.Components.Forms @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web @using Microsoft.JSInterop @using BlazorMdc.Components -@using Demonstration -@using Demonstration.Shared +@using BlazorMdc.Demo.CommonUI +@using BlazorMdc.Demo.CommonUI.Pages +@using BlazorMdc.Demo.CommonUI.Shared diff --git a/samples/Demonstration/wwwroot/css/bootstrap/bootstrap.min.css b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from samples/Demonstration/wwwroot/css/bootstrap/bootstrap.min.css rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/samples/Demonstration/wwwroot/css/bootstrap/bootstrap.min.css.map b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from samples/Demonstration/wwwroot/css/bootstrap/bootstrap.min.css.map rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/samples/Demonstration/wwwroot/css/open-iconic/FONT-LICENSE b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from samples/Demonstration/wwwroot/css/open-iconic/FONT-LICENSE rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/samples/Demonstration/wwwroot/css/open-iconic/ICON-LICENSE b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from samples/Demonstration/wwwroot/css/open-iconic/ICON-LICENSE rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/samples/Demonstration/wwwroot/css/open-iconic/README.md b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/README.md similarity index 100% rename from samples/Demonstration/wwwroot/css/open-iconic/README.md rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/README.md diff --git a/samples/Demonstration/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from samples/Demonstration/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/samples/Demonstration/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from samples/Demonstration/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/samples/Demonstration/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from samples/Demonstration/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/samples/Demonstration/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from samples/Demonstration/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/samples/Demonstration/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from samples/Demonstration/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/samples/Demonstration/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from samples/Demonstration/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/samples/Demonstration/wwwroot/css/site.css b/samples/BlazorMdc.Demo.CommonUI/wwwroot/css/site.css similarity index 100% rename from samples/Demonstration/wwwroot/css/site.css rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/css/site.css diff --git a/samples/Demonstration/wwwroot/favicon.ico b/samples/BlazorMdc.Demo.CommonUI/wwwroot/favicon.ico similarity index 100% rename from samples/Demonstration/wwwroot/favicon.ico rename to samples/BlazorMdc.Demo.CommonUI/wwwroot/favicon.ico diff --git a/samples/BlazorMdc.Demo.WebServer/BlazorMdc.Demo.WebServer.csproj b/samples/BlazorMdc.Demo.WebServer/BlazorMdc.Demo.WebServer.csproj new file mode 100644 index 000000000..f51f6ef79 --- /dev/null +++ b/samples/BlazorMdc.Demo.WebServer/BlazorMdc.Demo.WebServer.csproj @@ -0,0 +1,36 @@ + + + + netcoreapp3.1 + + BlazorMdc.Demo.WebServer + + Debug_CSB;Debug_SSB;Release_CSB;Release_SSB + + + + ClientSideBlazor;DEBUG; + + + + ServerSideBlazor;DEBUG; + + + + ClientSideBlazor;RELEASE; + + + + ServerSideBlazor;RELEASE + + + + + + + + + + + + diff --git a/samples/BlazorMdc.Demo.WebServer/Pages/Error.razor b/samples/BlazorMdc.Demo.WebServer/Pages/Error.razor new file mode 100644 index 000000000..95f3af4ce --- /dev/null +++ b/samples/BlazorMdc.Demo.WebServer/Pages/Error.razor @@ -0,0 +1,16 @@ +@page "/Error" + + +

Error.

+

An error occurred while processing your request.

+ +

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. +

\ No newline at end of file diff --git a/samples/BlazorMdc.Demo.WebServer/Pages/index_csb.cshtml b/samples/BlazorMdc.Demo.WebServer/Pages/index_csb.cshtml new file mode 100644 index 000000000..86e147b52 --- /dev/null +++ b/samples/BlazorMdc.Demo.WebServer/Pages/index_csb.cshtml @@ -0,0 +1,43 @@ +@page "/index_csb" +@namespace BlazorMdc.Demo.WebServer +@using BlazorMdc.Demo.CommonUI +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers + + + + + + + BlazorMdc Demo (CSB) + + + + + + + + + + + + + + + + +
+ + An error has occurred. This application may no longer respond until reloaded. + + + An unhandled exception has occurred. See browser dev tools for details. + + Reload + 🗙 +
+ + + + + + diff --git a/samples/BlazorMdc.Demo.WebServer/Pages/index_ssb.cshtml b/samples/BlazorMdc.Demo.WebServer/Pages/index_ssb.cshtml new file mode 100644 index 000000000..a76b10723 --- /dev/null +++ b/samples/BlazorMdc.Demo.WebServer/Pages/index_ssb.cshtml @@ -0,0 +1,43 @@ +@page "/index_ssb" +@namespace BlazorMdc.Demo.WebServer +@using BlazorMdc.Demo.CommonUI +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers + + + + + + + BlazorMdc Demo (SSB) + + + + + + + + + + + + + + + + +
+ + An error has occurred. This application may no longer respond until reloaded. + + + An unhandled exception has occurred. See browser dev tools for details. + + Reload + 🗙 +
+ + + + + + diff --git a/samples/BlazorMdc.Demo.WebServer/Properties/launchSettings.json b/samples/BlazorMdc.Demo.WebServer/Properties/launchSettings.json new file mode 100644 index 000000000..dabbac8f5 --- /dev/null +++ b/samples/BlazorMdc.Demo.WebServer/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:60292", + "sslPort": 44336 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Demonstration": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/samples/Demonstration/Program.cs b/samples/BlazorMdc.Demo.WebServer/Startup/Program.cs similarity index 95% rename from samples/Demonstration/Program.cs rename to samples/BlazorMdc.Demo.WebServer/Startup/Program.cs index 697cd5e95..d101d28f2 100644 --- a/samples/Demonstration/Program.cs +++ b/samples/BlazorMdc.Demo.WebServer/Startup/Program.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace Demonstration +namespace BlazorMdc.Demo.WebServer { public class Program { diff --git a/samples/Demonstration/Startup.cs b/samples/BlazorMdc.Demo.WebServer/Startup/Startup.cs similarity index 84% rename from samples/Demonstration/Startup.cs rename to samples/BlazorMdc.Demo.WebServer/Startup/Startup.cs index 5054f7d0b..4a7c5d879 100644 --- a/samples/Demonstration/Startup.cs +++ b/samples/BlazorMdc.Demo.WebServer/Startup/Startup.cs @@ -10,7 +10,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -namespace Demonstration +namespace BlazorMdc.Demo.WebServer { public class Startup { @@ -35,6 +35,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); +#if ClientSideBlazor + app.UseWebAssemblyDebugging(); +#endif } else { @@ -46,12 +49,20 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) app.UseHttpsRedirection(); app.UseStaticFiles(); +#if ClientSideBlazor + app.UseBlazorFrameworkFiles(); +#endif + app.UseRouting(); app.UseEndpoints(endpoints => { +#if ClientSideBlazor + endpoints.MapFallbackToPage("/index_csb"); +#else endpoints.MapBlazorHub(); - endpoints.MapFallbackToPage("/_Host"); + endpoints.MapFallbackToPage("/index_ssb"); +#endif }); } } diff --git a/samples/Demonstration/appsettings.Development.json b/samples/BlazorMdc.Demo.WebServer/appsettings.Development.json similarity index 100% rename from samples/Demonstration/appsettings.Development.json rename to samples/BlazorMdc.Demo.WebServer/appsettings.Development.json diff --git a/samples/Demonstration/appsettings.json b/samples/BlazorMdc.Demo.WebServer/appsettings.json similarity index 100% rename from samples/Demonstration/appsettings.json rename to samples/BlazorMdc.Demo.WebServer/appsettings.json diff --git a/samples/Demonstration/Demonstration.csproj b/samples/Demonstration/Demonstration.csproj deleted file mode 100644 index 64ed3af5c..000000000 --- a/samples/Demonstration/Demonstration.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp3.1 - Demonstration - - - - - - - diff --git a/samples/Demonstration/Pages/_Host.cshtml b/samples/Demonstration/Pages/_Host.cshtml deleted file mode 100644 index 57144097e..000000000 --- a/samples/Demonstration/Pages/_Host.cshtml +++ /dev/null @@ -1,42 +0,0 @@ -@page "/" -@namespace Demonstration.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@{ - Layout = null; -} - - - - - - - BlazorMdc Demo - - - - - - - - - - - - - - -
- - An error has occurred. This application may no longer respond until reloaded. - - - An unhandled exception has occurred. See browser dev tools for details. - - Reload - 🗙 -
- - - - - diff --git a/src/BlazorMdc/BlazorMdc.csproj b/src/BlazorMdc/BlazorMdc.csproj index cf6b748c6..246655386 100644 --- a/src/BlazorMdc/BlazorMdc.csproj +++ b/src/BlazorMdc/BlazorMdc.csproj @@ -3,6 +3,24 @@ netstandard2.1 3.0 + + Debug_CSB;Debug_SSB;Release_CSB;Release_SSB + + + + ClientSideBlazor;DEBUG; + + + + ServerSideBlazor;DEBUG; + + + + ClientSideBlazor;RELEASE; + + + + ServerSideBlazor;RELEASE