Merge branch 'css_bootstrap_blazor'

# Conflicts:
#	RBLNews.Maui/MauiProgram.cs
#	RBLNews.Shared/Components/Pages/Home.razor
#	RBLNews.Shared/RBLNews.Shared.csproj
#	RBLNews.Shared/_Imports.razor
#	RBLNews.Web/Components/App.razor
#	RBLNews.Web/Components/_Imports.razor
#	RBLNews.Web/Program.cs

RBLNews.Maui/MauiProgram.cs

@@ -27,7 +27,7 @@ namespace RBLNews.Maui
             builder.Services.AddSingleton<AppLifecycleService>();
 
 #if DEBUG
-            builder.Services.AddBlazorWebViewDeveloperTools();
+    		builder.Services.AddBlazorWebViewDeveloperTools();
             builder.Logging.AddDebug();
 #endif
 

RBLNews.Maui/MauiProgram.cs.orig

@@ -0,0 +1,44 @@
+using CommunityToolkit.Maui;
+using CommunityToolkit.Maui.Markup;
+using Microsoft.Extensions.Logging;
+using RBLNews.Shared.Services;
+
+namespace RBLNews.Maui
+{
+    public static class MauiProgram
+    {
+        public static MauiApp CreateMauiApp()
+        {
+            var builder = MauiApp.CreateBuilder();
+            builder
+                .UseMauiApp<App>()
+                .UseMauiCommunityToolkit()
+                .UseMauiCommunityToolkitMarkup()
+                .ConfigureFonts(fonts =>
+                {
+                    //fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+                    fonts.AddFont("NanumMyeongjo-Regular.ttf", "NanumMyeongjoRegular");
+                });
+
+            builder.Services.AddMauiBlazorWebView();
+<<<<<<< HEAD
+
+#if DEBUG
+    		builder.Services.AddBlazorWebViewDeveloperTools();
+    		builder.Logging.AddDebug();
+=======
+            builder.Services.AddBlazorBootstrap();
+
+            builder.Services.AddSingleton<IFeedDataService, FeedDataService>();
+            builder.Services.AddSingleton<AppLifecycleService>();
+
+#if DEBUG
+            builder.Services.AddBlazorWebViewDeveloperTools();
+            builder.Logging.AddDebug();
+>>>>>>> css_bootstrap_blazor
+#endif
+
+            return builder.Build();
+        }
+    }
+}

RBLNews.Shared/Components/Routes.razor

@@ -3,4 +3,4 @@
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
-</Router>
+</Router>

RBLNews.Shared/RBLNews.Shared.csproj.orig

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
+  <ItemGroup>
+<<<<<<< HEAD
+=======
+    <PackageReference Include="Blazor.Bootstrap" Version="3.0.0" />
+    <PackageReference Include="CommunityToolkit.Maui" Version="9.0.3" />
+    <PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.1.0" />
+>>>>>>> css_bootstrap_blazor
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="RBLFeederCommon" Version="1.0.0" />
+  </ItemGroup>
+
+</Project>

RBLNews.Shared/_Imports.razor

@@ -1,4 +1,2 @@
-@* ANT CSS DESIGN IMPORT -------------------- *@
+@using BlazorBootstrap;
-@using BlazorBootstrap;
-
 @using Microsoft.AspNetCore.Components.Web

RBLNews.Shared/_Imports.razor.BASE

@@ -0,0 +1,4 @@
+@* ANT CSS DESIGN IMPORT -------------------- *@
+@using AntDesign
+
+@using Microsoft.AspNetCore.Components.Web

RBLNews.Shared/_Imports.razor.LOCAL

@@ -0,0 +1 @@
+@using Microsoft.AspNetCore.Components.Web

RBLNews.Shared/_Imports.razor.REMOTE

@@ -0,0 +1,4 @@
+@* ANT CSS DESIGN IMPORT -------------------- *@
+@using BlazorBootstrap;
+
+@using Microsoft.AspNetCore.Components.Web

RBLNews.Shared/_Imports.razor.orig

@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+@using Microsoft.AspNetCore.Components.Web
+=======
+@* ANT CSS DESIGN IMPORT -------------------- *@
+@using BlazorBootstrap;
+
+@using Microsoft.AspNetCore.Components.Web
+>>>>>>> css_bootstrap_blazor

RBLNews.Web/Components/App.razor.orig

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <base href="/" />
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet" />
+    @* <link href="_content/RBLNews.Shared/blazor.bootstrap.css" rel="stylesheet" /> *@
+
+    @* <link rel="stylesheet" href="_content/RBLNews.Shared/css/bootstrap/bootstrap.min.css" /> *@
+    @* <link rel="stylesheet" href="RBLNews.Web.styles.css" /> *@
+    <link rel="stylesheet" href="_content/RBLNews.Shared/css/app.css" />
+    <HeadOutlet @rendermode="InteractiveServer" />
+</head>
+
+<body>
+    <Routes @rendermode="InteractiveServer" />
+<<<<<<< HEAD
+=======
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
+    <!-- Add chart.js reference if chart components are used in your application. -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.0.1/chart.umd.js" integrity="sha512-gQhCDsnnnUfaRzD8k1L5llCCV6O9HN09zClIzzeJ8OJ9MpGmIlCxm+pdCkqTwqJ4JcjbojFr79rl2F1mzcoLMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <!-- Add chartjs-plugin-datalabels.min.js reference if chart components with data label feature is used in your application. -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-datalabels/2.2.0/chartjs-plugin-datalabels.min.js" integrity="sha512-JPcRR8yFa8mmCsfrw4TNte1ZvF1e3+1SdGMslZvmrzDYxS69J7J49vkFL8u6u8PlPJK+H3voElBtUCzaXj+6ig==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <!-- Add sortable.js reference if SortableList component is used in your application. -->
+    <script src="https://cdn.jsdelivr.net/npm/sortablejs@latest/Sortable.min.js"></script>
+>>>>>>> css_bootstrap_blazor
+    <script src="_framework/blazor.web.js"></script>
+</body>
+
+</html>

RBLNews.Web/Components/_Imports.razor

@@ -2,9 +2,7 @@
 @using RBLNews.Shared
 @using RBLNews.Shared.Components
 
-@* ANT CSS DESIGN IMPORT -------------------- *@
 @using BlazorBootstrap;
-
 @* DEFAULT IMPORTS -------------------------- *@
 @using System.Net.Http
 @using System.Net.Http.Json

RBLNews.Web/Components/_Imports.razor.BASE

@@ -0,0 +1,18 @@
+@* REFERENCE TO RCL PROJECT ---------------- *@
+@using RBLNews.Shared
+@using RBLNews.Shared.Components
+
+@* ANT CSS DESIGN IMPORT -------------------- *@
+@using AntDesign
+
+@* DEFAULT IMPORTS -------------------------- *@
+@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 RBLNews.Web
+@using RBLNews.Web.Components

RBLNews.Web/Components/_Imports.razor.LOCAL

@@ -0,0 +1,15 @@
+@* REFERENCE TO RCL PROJECT ---------------- *@
+@using RBLNews.Shared
+@using RBLNews.Shared.Components
+
+@* DEFAULT IMPORTS -------------------------- *@
+@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 RBLNews.Web
+@using RBLNews.Web.Components

RBLNews.Web/Components/_Imports.razor.REMOTE

@@ -0,0 +1,18 @@
+@* REFERENCE TO RCL PROJECT ---------------- *@
+@using RBLNews.Shared
+@using RBLNews.Shared.Components
+
+@* ANT CSS DESIGN IMPORT -------------------- *@
+@using BlazorBootstrap;
+
+@* DEFAULT IMPORTS -------------------------- *@
+@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 RBLNews.Web
+@using RBLNews.Web.Components

RBLNews.Web/Components/_Imports.razor.orig

@@ -0,0 +1,21 @@
+@* REFERENCE TO RCL PROJECT ---------------- *@
+@using RBLNews.Shared
+@using RBLNews.Shared.Components
+
+<<<<<<< HEAD
+=======
+@* ANT CSS DESIGN IMPORT -------------------- *@
+@using BlazorBootstrap;
+
+>>>>>>> css_bootstrap_blazor
+@* DEFAULT IMPORTS -------------------------- *@
+@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 RBLNews.Web
+@using RBLNews.Web.Components

RBLNews.Web/Program.cs.orig

@@ -0,0 +1,36 @@
+using RBLNews.Shared.Services;
+using RBLNews.Web.Components;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+builder.Services.AddRazorComponents()
+    .AddInteractiveServerComponents();
+<<<<<<< HEAD
+=======
+builder.Services.AddBlazorBootstrap();
+
+builder.Services.AddSingleton<IFeedDataService, FeedDataService>();
+builder.Services.AddSingleton<AppLifecycleService>();
+>>>>>>> css_bootstrap_blazor
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (!app.Environment.IsDevelopment())
+{
+    app.UseExceptionHandler("/Error", createScopeForErrors: true);
+    // 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.UseAntiforgery();
+
+app.MapRazorComponents<App>()
+    .AddInteractiveServerRenderMode()
+    .AddAdditionalAssemblies(typeof(RBLNews.Shared._Imports).Assembly);
+
+app.Run();