itob/RBLNews
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: itob:master
Branches Tags
itob:master
itob:development
itob:css_bootstrap_blazor
itob:16
itob:rc-0.0.14
itob:rc-0.0.6
itob:rc-0.0.5
itob:rc-0.0.4
itob:rc-0.0.3
itob:rc-0.0.1
itob:0.0.1
..
compare: itob:css_bootstrap_blazor
Branches Tags
itob:development
itob:master
itob:css_bootstrap_blazor
itob:16
itob:rc-0.0.14
itob:rc-0.0.6
itob:rc-0.0.5
itob:rc-0.0.4
itob:rc-0.0.3
itob:rc-0.0.1
itob:0.0.1

No commits in common. "master" and "css_bootstrap_blazor" have entirely different histories.
master ... css_bootst

16 changed files with 7 additions and 231 deletions
Show Stats Expand all files Collapse all files

2
RBLNews.Maui/MauiProgram.cs
View File

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

44
RBLNews.Maui/MauiProgram.cs.orig
View File

@ -1,44 +0,0 @@
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();
}
}
}

2
RBLNews.Shared/Components/Routes.razor
View File

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

26
RBLNews.Shared/RBLNews.Shared.csproj.orig
View File

@ -1,26 +0,0 @@
<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>

4
RBLNews.Shared/_Imports.razor
View File

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

4
RBLNews.Shared/_Imports.razor.BASE
View File

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

1
RBLNews.Shared/_Imports.razor.LOCAL
View File

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

4
RBLNews.Shared/_Imports.razor.REMOTE
View File

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

8
RBLNews.Shared/_Imports.razor.orig
View File

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

33
RBLNews.Web/Components/App.razor.orig
View File

@ -1,33 +0,0 @@
<!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>

2
RBLNews.Web/Components/_Imports.razor
View File

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

18
RBLNews.Web/Components/_Imports.razor.BASE
View File

@ -1,18 +0,0 @@
@* 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

15
RBLNews.Web/Components/_Imports.razor.LOCAL
View File

@ -1,15 +0,0 @@
@* 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

18
RBLNews.Web/Components/_Imports.razor.REMOTE
View File

@ -1,18 +0,0 @@
@* 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

21
RBLNews.Web/Components/_Imports.razor.orig
View File

@ -1,21 +0,0 @@
@* 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

36
RBLNews.Web/Program.cs.orig
View File

@ -1,36 +0,0 @@
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();