Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
David-Moreira committed Oct 8, 2024
2 parents 5290fb8 + cd9cc38 commit b462a90
Show file tree
Hide file tree
Showing 263 changed files with 17,014 additions and 12,361 deletions.
7 changes: 7 additions & 0 deletions Blazorise.sln
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazorise.Captcha.ReCaptcha
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazorise.Charts.Zoom", "Source\Extensions\Blazorise.Charts.Zoom\Blazorise.Charts.Zoom.csproj", "{045536EC-BD97-409D-BDF7-C148B7C5AAFC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazorise.PdfViewer", "Source\Extensions\Blazorise.PdfViewer\Blazorise.PdfViewer.csproj", "{EAB7EC89-900A-4280-B24A-152B9DD2B503}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -405,6 +407,10 @@ Global
{045536EC-BD97-409D-BDF7-C148B7C5AAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{045536EC-BD97-409D-BDF7-C148B7C5AAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{045536EC-BD97-409D-BDF7-C148B7C5AAFC}.Release|Any CPU.Build.0 = Release|Any CPU
{EAB7EC89-900A-4280-B24A-152B9DD2B503}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EAB7EC89-900A-4280-B24A-152B9DD2B503}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EAB7EC89-900A-4280-B24A-152B9DD2B503}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EAB7EC89-900A-4280-B24A-152B9DD2B503}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -474,6 +480,7 @@ Global
{D24EA4EF-0AEC-43B2-BCDC-56229D60C285} = {9731051E-0AA7-411E-A76A-987854F034DA}
{2B4FD79A-42E2-4B81-828B-0799E4744ADA} = {9731051E-0AA7-411E-A76A-987854F034DA}
{045536EC-BD97-409D-BDF7-C148B7C5AAFC} = {9731051E-0AA7-411E-A76A-987854F034DA}
{EAB7EC89-900A-4280-B24A-152B9DD2B503} = {9731051E-0AA7-411E-A76A-987854F034DA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {205B3EA4-470F-45DA-911E-346AF7D0A9A5}
Expand Down
1 change: 1 addition & 0 deletions Demos/Blazorise.Demo/Blazorise.Demo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<ProjectReference Include="..\..\Source\Extensions\Blazorise.Video\Blazorise.Video.csproj" />
<ProjectReference Include="..\..\Source\Extensions\Blazorise.SignaturePad\Blazorise.SignaturePad.csproj" />
<ProjectReference Include="..\..\Source\Extensions\Blazorise.FluentValidation\Blazorise.FluentValidation.csproj" />
<ProjectReference Include="..\..\Source\Extensions\Blazorise.PdfViewer\Blazorise.PdfViewer.csproj" />
<ProjectReference Include="..\Apps\TodoApp\TodoApp.csproj" />
</ItemGroup>

Expand Down
98 changes: 26 additions & 72 deletions Demos/Blazorise.Demo/Components/SideMenu.razor
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<BarDropdownItem To="tests/paginations">Paginations</BarDropdownItem>
<BarDropdownItem To="tests/progressbars">Progress bars</BarDropdownItem>
<BarDropdownItem To="tests/ratings">Rating</BarDropdownItem>
<BarDropdownItem To="tests/skeleton">Skeletons</BarDropdownItem>
<BarDropdownItem To="tests/steps">Steps</BarDropdownItem>
<BarDropdownItem To="tests/tables">Tables</BarDropdownItem>
<BarDropdownItem To="tests/tabs">Tabs</BarDropdownItem>
Expand Down Expand Up @@ -290,79 +291,32 @@
Extensions
</BarDropdownToggle>
<BarDropdownMenu>
<BarDropdownItem To="tests/animate">
Animate
</BarDropdownItem>
<BarDropdownItem To="tests/autocomplete">
Autocomplete
</BarDropdownItem>
<BarDropdownItem To="tests/animate">Animate</BarDropdownItem>
<BarDropdownItem To="tests/autocomplete">Autocomplete</BarDropdownItem>
<BarDropdownItem To="tests/captcha">Captcha</BarDropdownItem>
<BarDropdownItem To="tests/charts">
Charts
</BarDropdownItem>
<BarDropdownItem To="tests/charts/annotations">
Charts Annotations
</BarDropdownItem>
<BarDropdownItem To="tests/charts/datalabels">
Charts Data Labels
</BarDropdownItem>
<BarDropdownItem To="tests/charts/zoom">
Charts Zoom
</BarDropdownItem>
<BarDropdownItem To="tests/cropper">
Cropper
</BarDropdownItem>
<BarDropdownItem To="tests/dropdownlist">
Dropdown List
</BarDropdownItem>
<BarDropdownItem To="tests/listview">
List View
</BarDropdownItem>
<BarDropdownItem To="tests/livecharts">
Live Charts
</BarDropdownItem>
<BarDropdownItem To="tests/loadingindicator">
Loading Indicator
</BarDropdownItem>
<BarDropdownItem To="tests/lottie-animation">
Lottie Animation
</BarDropdownItem>
<BarDropdownItem To="tests/markdown">
Markdown
</BarDropdownItem>
<BarDropdownItem To="tests/qrcode">
QR Code
</BarDropdownItem>
<BarDropdownItem To="tests/signaturepad">
SignaturePad
</BarDropdownItem>
<BarDropdownItem To="tests/repeater">
Repeater
</BarDropdownItem>
<BarDropdownItem To="tests/richtextedit">
RichTextEdit
</BarDropdownItem>
<BarDropdownItem To="tests/selectlist">
Select List
</BarDropdownItem>
<BarDropdownItem To="tests/snackbar">
Snackbar
</BarDropdownItem>
<BarDropdownItem To="tests/spinkit">
Spin Kit
</BarDropdownItem>
<BarDropdownItem To="tests/splitter">
Splitter
</BarDropdownItem>
<BarDropdownItem To="tests/treeview">
TreeView
</BarDropdownItem>
<BarDropdownItem To="tests/transferlist">
Transfer List
</BarDropdownItem>
<BarDropdownItem To="tests/video">
Video
</BarDropdownItem>
<BarDropdownItem To="tests/charts">Charts</BarDropdownItem>
<BarDropdownItem To="tests/charts/annotations">Charts Annotations</BarDropdownItem>
<BarDropdownItem To="tests/charts/datalabels">Charts Data Labels</BarDropdownItem>
<BarDropdownItem To="tests/charts/zoom">Charts Zoom</BarDropdownItem>
<BarDropdownItem To="tests/cropper">Cropper</BarDropdownItem>
<BarDropdownItem To="tests/dropdownlist">Dropdown List</BarDropdownItem>
<BarDropdownItem To="tests/listview">List View</BarDropdownItem>
<BarDropdownItem To="tests/livecharts">Live Charts</BarDropdownItem>
<BarDropdownItem To="tests/loadingindicator">Loading Indicator</BarDropdownItem>
<BarDropdownItem To="tests/lottie-animation">Lottie Animation</BarDropdownItem>
<BarDropdownItem To="tests/markdown">Markdown</BarDropdownItem>
<BarDropdownItem To="tests/pdfviewer">Pdf Viewer</BarDropdownItem>
<BarDropdownItem To="tests/qrcode">QR Code</BarDropdownItem>
<BarDropdownItem To="tests/repeater">Repeater</BarDropdownItem>
<BarDropdownItem To="tests/richtextedit">RichTextEdit</BarDropdownItem>
<BarDropdownItem To="tests/selectlist">Select List</BarDropdownItem>
<BarDropdownItem To="tests/signaturepad">SignaturePad</BarDropdownItem>
<BarDropdownItem To="tests/snackbar">Snackbar</BarDropdownItem>
<BarDropdownItem To="tests/spinkit">Spin Kit</BarDropdownItem>
<BarDropdownItem To="tests/splitter">Splitter</BarDropdownItem>
<BarDropdownItem To="tests/transferlist">Transfer List</BarDropdownItem>
<BarDropdownItem To="tests/treeview">TreeView</BarDropdownItem>
<BarDropdownItem To="tests/video">Video</BarDropdownItem>
</BarDropdownMenu>
</BarDropdown>
</BarItem>
Expand Down
1 change: 1 addition & 0 deletions Demos/Blazorise.Demo/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static IServiceCollection SetupDemoServices( this IServiceCollection serv
{
options.UseBubbleTheme = true;
options.UseShowTheme = true;
options.UseTables = true;
} )
.AddLoadingIndicator()
.AddBlazoriseFluentValidation()
Expand Down
15 changes: 14 additions & 1 deletion Demos/Blazorise.Demo/Pages/Tests/ChartsPage.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,20 @@ public partial class ChartsPage

ChartOptions chartOptions = new()
{
AspectRatio = 1.5
AspectRatio = 1.5,
Plugins = new ChartPlugins()
{
Tooltip = new ChartTooltip()
{
Enabled = true,
UsePointStyle = true,
Callbacks = new ChartTooltipCallbacks
{
Title = ( items ) => "Custom title: " + items[0].Parsed,
Label = ( item ) => "Custom label: " + item.Parsed,
}
}
}
};

LineChartOptions lineChartOptions = new()
Expand Down
44 changes: 44 additions & 0 deletions Demos/Blazorise.Demo/Pages/Tests/PdfViewerPage.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
@page "/tests/pdfviewer"
<Row>
<Column>
<Card Margin="Margin.Is4.OnY">
<CardHeader>
<CardTitle>PdfViewer</CardTitle>
</CardHeader>
<CardBody>
<PdfViewerContainer Height="Height.Rem(50)">
<PdfViewerToolbar />
<PdfViewer Source="@source" />
</PdfViewerContainer>
</CardBody>
</Card>
</Column>
</Row>
<Row>
<Column>
<Card Margin="Margin.Is4.OnY">
<CardHeader>
<CardTitle>As a standalone PdfViewer</CardTitle>
</CardHeader>
<CardBody>
<Button Color="Color.Primary" Clicked="@(()=>standalonePdfViewerRef.PreviousPage())">Previous page</Button>
<Button Color="Color.Primary" Clicked="@(()=>standalonePdfViewerRef.NextPage())">Next page</Button>
<Button Color="Color.Secondary" Clicked="@(()=>pageNumber = 5)">Go to Page 5</Button>
<Button Color="Color.Secondary" Clicked="@(()=>scale = 1)">Set Scale 1</Button>
<Button Color="Color.Secondary" Clicked="@(()=>scale = 2)">Set Scale 2</Button>
<Button Color="Color.Dark" Clicked="@(()=>standalonePdfViewerRef.Print())">Print</Button>
</CardBody>
<CardBody>
<Div Height="Height.Rem(50)" Overflow="Overflow.Auto">
<PdfViewer @ref="@standalonePdfViewerRef" Source="@source" @bind-PageNumber="@pageNumber" @bind-Scale="@scale" />
</Div>
</CardBody>
</Card>
</Column>
</Row>
@code {
string source = "https://raw.githubusercontent.com/mozilla/pdf.js/ba2edeae/web/compressed.tracemonkey-pldi-09.pdf";
PdfViewer standalonePdfViewerRef;
int pageNumber = 2;
double scale = 1;
}
7 changes: 4 additions & 3 deletions Demos/Blazorise.Demo/Pages/Tests/RichTextEditPage.razor
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<RichTextEditToolbarGroup>
<RichTextEditToolbarButton Action="RichTextEditAction.Link" />
<RichTextEditToolbarButton Action="RichTextEditAction.Image" />
<RichTextEditToolbarButton Action="RichTextEditAction.Table" />
</RichTextEditToolbarGroup>
<RichTextEditToolbarGroup Float="Float.End">
<Button Class="btn-icon" Size="Size.ExtraSmall" onClick="window.open('https://www.quilljs.com/','quilljs')"><Icon Name="IconName.InfoCircle" /></Button>
Expand All @@ -98,7 +99,7 @@
<CardTitle>Html Content Preview</CardTitle>
</CardHeader>
<CardBody>
@((MarkupString) contentAsHtml)
@((MarkupString)contentAsHtml)
</CardBody>
</Card>
</Column>
Expand Down Expand Up @@ -130,7 +131,7 @@
<CardTitle>Bubble theme</CardTitle>
</CardHeader>
<CardBody>
<Alert Visible>
<Alert Color="Color.Info" Visible>
<AlertMessage>Note:</AlertMessage>
<AlertDescription>Start typing and change format by key bindings or by selecting the text</AlertDescription>
</Alert>
Expand Down Expand Up @@ -164,7 +165,7 @@
<CloseButton />
</ModalHeader>
<ModalBody>
@((MarkupString) savedContent)
@((MarkupString)savedContent)
</ModalBody>
<ModalFooter>
<Button Color="Color.Primary" Clicked="(() => modalRef.Hide())">Ok</Button>
Expand Down
2 changes: 1 addition & 1 deletion Demos/Blazorise.Demo/Pages/Tests/SignaturePadPage.razor
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<CardTitle>Preview</CardTitle>
</CardHeader>
<CardBody>
<Image Source="@Image64" />
<Image Source="@Image64" Fluid />
</CardBody>
</Card>
</Column>
Expand Down
78 changes: 78 additions & 0 deletions Demos/Blazorise.Demo/Pages/Tests/SkeletonPage.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
@page "/tests/skeleton"
<Row>
<Column>
<Card Margin="Margin.Is4.OnY">
<CardHeader>
<CardTitle>Skeleton</CardTitle>
</CardHeader>
<CardBody>
<CardText>
In the example below, we take a typical card component and recreate it with placeholders applied to create a “loading card”. Size and proportions are the same between the two.
</CardText>
</CardBody>
</Card>
</Column>
</Row>
<Row>
<Column>
<Card Margin="Margin.Is4.FromBottom">
<CardBody>
<Row>
<Column ColumnSize="ColumnSize.Is4.OnTablet.Is3.OnWidescreen.Is12.OnMobile">
<Card>
<CardImage Source="_content/Blazorise.Demo/img/cards/image-1.jpg" Alt="Placeholder image">
</CardImage>
<CardBody>
<CardTitle Size="5">Card title</CardTitle>
<CardText>
Some quick example text to build on the card title and make up the bulk of the card's content.
</CardText>
<Button Color="Color.Primary">Button</Button>
</CardBody>
</Card>
</Column>
<Column ColumnSize="ColumnSize.Is4.OnTablet.Is3.OnWidescreen.Is12.OnMobile">
<Card>
<CardImage Source="_content/Blazorise.Demo/img/cards/image-2.jpg" Alt="Placeholder image">
</CardImage>
<CardBody>
<CardTitle Size="5">
<Skeleton>
<SkeletonItem ColumnSize="ColumnSize.Is6" />
</Skeleton>
</CardTitle>
<CardText>
<Skeleton Animation="SkeletonAnimation.Pulse">
<SkeletonItem ColumnSize="ColumnSize.Is7" />
<SkeletonItem ColumnSize="ColumnSize.Is4" />
<SkeletonItem ColumnSize="ColumnSize.Is4" />
<SkeletonItem ColumnSize="ColumnSize.Is6" />
<SkeletonItem ColumnSize="ColumnSize.Is8" />
</Skeleton>
</CardText>
<Button Color="Color.Primary">Button</Button>
</CardBody>
</Card>
</Column>
</Row>
</CardBody>
</Card>
</Column>
</Row>
<Row>
<Column>
<Card Margin="Margin.Is4.FromBottom">
<CardHeader>
<CardTitle>Table</CardTitle>
</CardHeader>
<CardBody>
<CardText>
<Code Tag>SkeletonTable</Code> allows you to scaffold a basic table structure by utilizing the rows and columns props to define the size of the table.
</CardText>
</CardBody>
<CardBody>
<SkeletonTable Rows="5" Columns="4" />
</CardBody>
</Card>
</Column>
</Row>
1 change: 1 addition & 0 deletions Demos/Blazorise.Demo/_Imports.razor
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@
@using Blazorise.Cropper
@using Blazorise.Shared.Models
@using Blazorise.SignaturePad
@using Blazorise.PdfViewer
@using TodoApp
5 changes: 4 additions & 1 deletion Documentation/Blazorise.Docs.Server/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ public void ConfigureServices( IServiceCollection services )
} )
.AddBootstrap5Providers()
.AddFontAwesomeIcons()
.AddBlazoriseRichTextEdit()
.AddBlazoriseRichTextEdit( options =>
{
options.UseTables = true;
} )
.AddBlazoriseFluentValidation()
.AddBlazoriseGoogleReCaptcha( x => x.SiteKey = Configuration[key: "ReCaptchaSiteKey"] );

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Documentation/Blazorise.Docs/Blazorise.Docs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<ProjectReference Include="..\..\Source\Extensions\Blazorise.Cropper\Blazorise.Cropper.csproj" />
<ProjectReference Include="..\..\Source\Extensions\Blazorise.SignaturePad\Blazorise.SignaturePad.csproj" />
<ProjectReference Include="..\..\Source\Extensions\Blazorise.Splitter\Blazorise.Splitter.csproj" />
<ProjectReference Include="..\..\Source\Extensions\Blazorise.PdfViewer\Blazorise.PdfViewer.csproj" />
<PackageReference Include="MailKit" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="MimeKit" Version="4.7.1" />
Expand Down
8 changes: 7 additions & 1 deletion Documentation/Blazorise.Docs/Components/DocsAttributes.razor
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@
@foreach ( var docsAttributesItem in DocsAttributesItems )
{
<TableRow @key="@docsAttributesItem">
<TableRowCell>
<TableRowCell TextOverflow="TextOverflow.NoWrap">
@if ( !string.IsNullOrEmpty( docsAttributesItem.ObsoleteMessage ) )
{
<Tooltip Text="@docsAttributesItem.ObsoleteMessage" Inline>
<Icon Name="IconName.ExclamationTriangle" TextColor="TextColor.Warning" />
</Tooltip>
}
<Code>@docsAttributesItem.Name</Code>
</TableRowCell>
<TableRowCell>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ public void Dispose()

[Parameter] public string Default { get; set; }

[Parameter] public string ObsoleteMessage { get; set; }

[Parameter] public RenderFragment ChildContent { get; set; }

#endregion
Expand Down
Loading

0 comments on commit b462a90

Please sign in to comment.