Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 0 additions & 24 deletions BootstrapBlazor.sln
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{02EA681E-C
README.zh-CN.md = README.zh-CN.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Shared", "src\BootstrapBlazor.Shared\BootstrapBlazor.Shared.csproj", "{A6E8F478-213E-44EC-BF4D-7C9342C3DEED}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazorAuto", "src\BootstrapBlazorAuto\BootstrapBlazorAuto\BootstrapBlazorAuto.csproj", "{2A69B4F8-7C7D-4AC3-BE13-B862DE078F6E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazorAuto.Client", "src\BootstrapBlazorAuto\BootstrapBlazorAuto.Client\BootstrapBlazorAuto.Client.csproj", "{7D3FFBD8-A43C-490F-92D1-4F669E7E550F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "auto", "auto", "{0C783146-82BE-4E81-99A2-EEFF356F1BCC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -108,18 +100,6 @@ Global
{01DA4687-0973-4CA6-97F5-04E0B8DD1B13}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01DA4687-0973-4CA6-97F5-04E0B8DD1B13}.Release|Any CPU.ActiveCfg = Release|Any CPU
{01DA4687-0973-4CA6-97F5-04E0B8DD1B13}.Release|Any CPU.Build.0 = Release|Any CPU
{A6E8F478-213E-44EC-BF4D-7C9342C3DEED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6E8F478-213E-44EC-BF4D-7C9342C3DEED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6E8F478-213E-44EC-BF4D-7C9342C3DEED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6E8F478-213E-44EC-BF4D-7C9342C3DEED}.Release|Any CPU.Build.0 = Release|Any CPU
{2A69B4F8-7C7D-4AC3-BE13-B862DE078F6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2A69B4F8-7C7D-4AC3-BE13-B862DE078F6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A69B4F8-7C7D-4AC3-BE13-B862DE078F6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2A69B4F8-7C7D-4AC3-BE13-B862DE078F6E}.Release|Any CPU.Build.0 = Release|Any CPU
{7D3FFBD8-A43C-490F-92D1-4F669E7E550F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D3FFBD8-A43C-490F-92D1-4F669E7E550F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D3FFBD8-A43C-490F-92D1-4F669E7E550F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D3FFBD8-A43C-490F-92D1-4F669E7E550F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -135,10 +115,6 @@ Global
{6D73FED6-0086-460B-84FA-1FA78176BF59} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD}
{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD}
{01DA4687-0973-4CA6-97F5-04E0B8DD1B13} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD}
{A6E8F478-213E-44EC-BF4D-7C9342C3DEED} = {A2182155-43ED-44C1-BF6F-1B70EBD2DFFE}
{2A69B4F8-7C7D-4AC3-BE13-B862DE078F6E} = {0C783146-82BE-4E81-99A2-EEFF356F1BCC}
{7D3FFBD8-A43C-490F-92D1-4F669E7E550F} = {0C783146-82BE-4E81-99A2-EEFF356F1BCC}
{0C783146-82BE-4E81-99A2-EEFF356F1BCC} = {A2182155-43ED-44C1-BF6F-1B70EBD2DFFE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0DCB0756-34FA-4FD0-AE1D-D3F08B5B3A6B}
Expand Down
76 changes: 73 additions & 3 deletions src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
Original file line number Diff line number Diff line change
@@ -1,24 +1,94 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<IsWebProject>true</IsWebProject>
<UserSecretsId>dd866c36-9a9b-4dda-bce0-44c91d3094cc</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<Content Remove="docs.json" />
<Content Remove="Locales\en-US.json" />
<Content Remove="Locales\zh-CN.json" />
<Content Remove="topology.json" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="docs.json" />
<EmbeddedResource Include="Locales\en-US.json" />
<EmbeddedResource Include="Locales\zh-CN.json" />
<EmbeddedResource Include="topology.json" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.AzureOpenAI" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.AzureTranslator" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.BaiduOcr" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.BarCode" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.BootstrapIcon.Extensions" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.DockView" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.Gantt" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Holiday" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.0.4" />
<PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.2" />
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.2" />
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.2" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.5" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="BootstrapBlazor.Middleware" Version="9.0.0" />
<PackageReference Include="Longbow.Logging" Version="9.0.0" />
<PackageReference Include="Longbow.Tasks" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\BootstrapBlazor.Shared\BootstrapBlazor.Shared.csproj" />
<ProjectReference Include="..\BootstrapBlazor\BootstrapBlazor.csproj" />
</ItemGroup>

<ItemGroup>
<Using Include="BootstrapBlazor.Components" />
<Using Include="BootstrapBlazor.Shared.Data" />
<Using Include="BootstrapBlazor.Server.Components.Components" />
<Using Include="BootstrapBlazor.Server.Components.Layout" />
<Using Include="BootstrapBlazor.Server.Data" />
<Using Include="BootstrapBlazor.Server.Extensions" />
<Using Include="BootstrapBlazor.Server.Services" />
<Using Include="Microsoft.AspNetCore.Components" />
<Using Include="Microsoft.Extensions.Configuration" />
<Using Include="Microsoft.Extensions.DependencyInjection" />
<Using Include="Microsoft.Extensions.Localization" />
<Using Include="Microsoft.Extensions.Logging" />
<Using Include="System.ComponentModel.DataAnnotations" />
<Using Include="System.Net.Http.Json" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/BootstrapBlazor.Server/Components/App.razor
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<link rel="stylesheet" href="@Assets["_content/BootstrapBlazor.BootstrapIcon/css/bootstrap.min.css"]" />
<link rel="stylesheet" href="@Assets["_content/BootstrapBlazor/css/bootstrap.blazor.bundle.min.css"]" />
<link rel="stylesheet" href="@Assets["_content/BootstrapBlazor/css/motronic.min.css"]" />
<link rel="stylesheet" href="@Assets["_content/BootstrapBlazor.Shared/BootstrapBlazor.Shared.bundle.scp.css"]" />
<link rel="stylesheet" href="@Assets["_content/BootstrapBlazor.Shared/css/site.css"]" />
<link rel="stylesheet" href="@Assets["BootstrapBlazor.Server.styles.css"]" />
<link rel="stylesheet" href="@Assets["css/site.css"]" />

<ImportMap></ImportMap>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// BarcodeGenerateSettings 组件
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using Microsoft.Extensions.Options;

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Microsoft.JSInterop;
using System.Globalization;

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// CustomPopConfirmContent 自定义组件
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// 自定义行组件
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using Microsoft.Extensions.Options;

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// CustomWinBoxContent 组件
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// DemoBlock 组件
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using BootstrapBlazor.Shared.Components.Samples.Table
@using BootstrapBlazor.Server.Components.Samples.Table
@inject IStringLocalizer<Foo> LocalizerFoo

<div class="col-12 col-sm-6">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// DemoTabItem 组件
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// DemoTabItem 组件
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using BootstrapBlazor.Shared.Components.Samples.Table
@using BootstrapBlazor.Server.Components.Samples.Table
@inject IStringLocalizer<Foo> LocalizerFoo
@inject IStringLocalizer<TablesEdit> Localizer

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// FooSortableListItem 组件
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// FooSortableListRightItem 组件
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

using BootstrapBlazor.Shared.Components.Samples;
using BootstrapBlazor.Server.Components.Samples;

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// 内部组件
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using Microsoft.Extensions.Options;

namespace BootstrapBlazor.Shared.Components.Components;
namespace BootstrapBlazor.Server.Components.Components;

/// <summary>
/// Header 组件
Expand Down Expand Up @@ -39,7 +39,7 @@ public partial class Header
[NotNull]
private string? TutorialsText { get; set; }

private string DownloadUrl => "https://github.com/dotnetcore/BootstrapBlazor/releases?wt.mc_id=DT-MVP-5004174";
private const string DownloadUrl = "https://github.com/dotnetcore/BootstrapBlazor/releases?wt.mc_id=DT-MVP-5004174";

private string _versionString = "";

Expand All @@ -58,5 +58,5 @@ protected override void OnInitialized()
_versionString = $"v{PackageVersionService.Version}";
}

private Task OnThemeChangedAsync(ThemeValue themeName) => InvokeVoidAsync("updateTheme", themeName);
private Task OnThemeChangedAsync(ThemeValue themeName) => InvokeVoidAsync("updateTheme", themeName, WebsiteOption.CurrentValue.AssetRootPath);
}
Loading
Loading