Merge pull request #2 from Very-Solid-Economic-Organization/Shin's-Pl…

…ayground Blazor and Radzen set up
Very-Solid-Economic-Organization · Feb 18, 2024 · 40a355b · 40a355b
2 parents b9b1caf + f30eab7
commit 40a355b
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 10 deletions.
diff --git a/VSOP.Application/VSOP.Application.csproj b/VSOP.Application/VSOP.Application.csproj
@@ -16,6 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="FluentValidation" Version="11.9.0" />
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.0" />
     <PackageReference Include="MediatR" Version="12.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />

diff --git a/...WebApp/Components/Layout/MainLayout.razor → ...SOP.WebApp.Client/Layout/MainLayout.razor b/...WebApp/Components/Layout/MainLayout.razor → ...SOP.WebApp.Client/Layout/MainLayout.razor
@@ -1,5 +1,6 @@
 @inherits LayoutComponentBase
 
+<RadzenComponents />
 <div class="page">
     <div class="sidebar">
         <NavMenu />

diff --git a/...pp/Components/Layout/MainLayout.razor.css → ...WebApp.Client/Layout/MainLayout.razor.css b/...pp/Components/Layout/MainLayout.razor.css → ...WebApp.Client/Layout/MainLayout.razor.css
diff --git a/...OP.WebApp/Components/Layout/NavMenu.razor → ...p/VSOP.WebApp.Client/Layout/NavMenu.razor b/...OP.WebApp/Components/Layout/NavMenu.razor → ...p/VSOP.WebApp.Client/Layout/NavMenu.razor
@@ -1,6 +1,6 @@
 <div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
-        <a class="navbar-brand" href="">VSOP.WebApp</a>
+        <a class="navbar-brand" href="">VSOP</a>
     </div>
 </div>
 

diff --git a/...ebApp/Components/Layout/NavMenu.razor.css → ...OP.WebApp.Client/Layout/NavMenu.razor.css b/...ebApp/Components/Layout/NavMenu.razor.css → ...OP.WebApp.Client/Layout/NavMenu.razor.css
diff --git a/VSOP.WebApp/VSOP.WebApp.Client/Pages/Counter.razor b/VSOP.WebApp/VSOP.WebApp.Client/Pages/Counter.razor
@@ -1,5 +1,4 @@
 @page "/counter"
-@rendermode InteractiveWebAssembly
 
 <PageTitle>Counter</PageTitle>
 

diff --git a/...p/VSOP.WebApp/Components/Pages/Home.razor → ...ebApp/VSOP.WebApp.Client/Pages/Home.razor b/...p/VSOP.WebApp/Components/Pages/Home.razor → ...ebApp/VSOP.WebApp.Client/Pages/Home.razor
diff --git a/...SOP.WebApp/Components/Pages/Weather.razor → ...pp/VSOP.WebApp.Client/Pages/Weather.razor b/...SOP.WebApp/Components/Pages/Weather.razor → ...pp/VSOP.WebApp.Client/Pages/Weather.razor
@@ -1,5 +1,4 @@
 @page "/weather"
-@attribute [StreamRendering]
 
 <PageTitle>Weather</PageTitle>
 
@@ -41,7 +40,7 @@ else
 
     protected override async Task OnInitializedAsync()
     {
-        // Simulate asynchronous loading to demonstrate streaming rendering
+        // Simulate asynchronous loading to demonstrate a loading indicator
         await Task.Delay(500);
 
         var startDate = DateOnly.FromDateTime(DateTime.Now);

diff --git a/VSOP.WebApp/VSOP.WebApp.Client/Program.cs b/VSOP.WebApp/VSOP.WebApp.Client/Program.cs
@@ -1,12 +1,17 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Radzen;
 
 namespace VSOP.WebApp.Client
 {
     internal class Program
     {
         static async Task Main(string[] args)
         {
+
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
+            builder.Services.AddTransient(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+
+            builder.Services.AddRadzenComponents();
 
             await builder.Build().RunAsync();
         }

diff --git a/...ebApp/VSOP.WebApp/Components/Routes.razor → VSOP.WebApp/VSOP.WebApp.Client/Routes.razor b/...ebApp/VSOP.WebApp/Components/Routes.razor → VSOP.WebApp/VSOP.WebApp.Client/Routes.razor
@@ -1,4 +1,4 @@
-<Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Client._Imports).Assembly }">
+<Router AppAssembly="typeof(Program).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
         <FocusOnNavigate RouteData="routeData" Selector="h1" />

diff --git a/VSOP.WebApp/VSOP.WebApp.Client/VSOP.WebApp.Client.csproj b/VSOP.WebApp/VSOP.WebApp.Client/VSOP.WebApp.Client.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
+    <PackageReference Include="Radzen.Blazor" Version="4.24.7" />
   </ItemGroup>
 
 </Project>
diff --git a/VSOP.WebApp/VSOP.WebApp.Client/_Imports.razor b/VSOP.WebApp/VSOP.WebApp.Client/_Imports.razor
@@ -7,3 +7,5 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
 @using VSOP.WebApp.Client
+@using Radzen
+@using Radzen.Blazor
diff --git a/VSOP.WebApp/VSOP.WebApp/Components/App.razor b/VSOP.WebApp/VSOP.WebApp/Components/App.razor
@@ -7,14 +7,16 @@
     <base href="/" />
     <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
     <link rel="stylesheet" href="app.css" />
-    <link rel="stylesheet" href="VSOP.WebApp.styles.css" />
+    <link rel="stylesheet" href="VSOP.WebApp.styles.css" />   
+    <link rel="stylesheet" href="_content/Radzen.Blazor/css/material-base.css">
     <link rel="icon" type="image/png" href="favicon.png" />
-    <HeadOutlet />
+    <HeadOutlet @rendermode="InteractiveWebAssembly" />
 </head>
 
 <body>
-    <Routes />
+    <Routes @rendermode="InteractiveWebAssembly" />
     <script src="_framework/blazor.web.js"></script>
+    <script src="_content/Radzen.Blazor/Radzen.Blazor.js"></script>
 </body>
 
-</html>
+</html>
diff --git a/VSOP.WebApp/VSOP.WebApp/Program.cs b/VSOP.WebApp/VSOP.WebApp/Program.cs
@@ -1,4 +1,5 @@
 using Microsoft.OpenApi.Models;
+using Radzen;
 using System.Reflection;
 using VSOP.Application;
 using VSOP.Persistence;
@@ -12,6 +13,7 @@ public static void Main(string[] args)
         {
             var builder = WebApplication.CreateBuilder(args);
 
+
             builder.Services.AddControllers();
 
             #region SolutionDI's
@@ -22,6 +24,7 @@ public static void Main(string[] args)
             // Add services to the container.
             builder.Services.AddRazorComponents()
                 .AddInteractiveWebAssemblyComponents();
+            builder.Services.AddRadzenComponents();
 
 
             builder.Services.AddEndpointsApiExplorer();