Skip to content

Feature/css generator #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Feature/css generator #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
185c276
Bugfix for charts larger than most;
Lucasharskamp May 29, 2024
21d914b
Coding rework for readability, performance and preventing bugs.
Lucasharskamp Jun 3, 2024
cf9d2c2
Added extra readonly checks
Lucasharskamp Jun 3, 2024
b820e00
Added Bootstrap CSS generator (v0.1)
Lucasharskamp Jun 4, 2024
3da54cf
Added a ton more coloring options
Lucasharskamp Jun 6, 2024
f892ae3
CSS generator finalized (V1)
Lucasharskamp Jun 10, 2024
508cef7
Merge commit
Lucasharskamp Jun 10, 2024
f5e2083
fixes for merge commit
Lucasharskamp Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

public partial class MainLayout : MainLayoutBase
{
internal override IEnumerable<NavItem> GetNavItems()
internal override IReadOnlyCollection<NavItem> GetNavItems()
{
navItems ??= new List<NavItem>
NavItems ??= new List<NavItem>
{
new (){ Id = "1", Text = "Getting Started", Href = "/getting-started", IconName = IconName.HouseDoorFill },

Expand All @@ -14,6 +14,7 @@ internal override IEnumerable<NavItem> GetNavItems()

new (){ Id = "3", Text = "Content", IconName = IconName.BodyText, IconColor = IconColor.Primary },
new (){ Id = "300", Text = "Icons", Href = "/icons", IconName = IconName.PersonSquare, ParentId = "3" },
new (){ Id = "301", Text = "CSS Generator", Href = "/customcss", IconName = IconName.WrenchAdjustableCircle, ParentId = "3" },

new (){ Id = "4", Text = "Forms", IconName = IconName.InputCursorText, IconColor = IconColor.Success },
new (){ Id = "400", Text = "Auto Complete", Href = "/autocomplete", IconName = IconName.InputCursorText, ParentId = "4" },
Expand Down Expand Up @@ -84,6 +85,6 @@ internal override IEnumerable<NavItem> GetNavItems()
new (){ Id = "700", Text = "Modal Service", Href = "/modal-service", IconName = IconName.WindowStack, ParentId = "7" },
};

return navItems;
return NavItems;
}
}
72 changes: 33 additions & 39 deletions BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,49 @@

public class MainLayoutBase : LayoutComponentBase
{
private string version = default!;
private string docsUrl = default!;
private string blogUrl = default!;
private string githubUrl = default!;
private string twitterUrl = default!;
private string linkedInUrl = default!;
private string openCollectiveUrl = default!;
private string githubIssuesUrl = default!;
private string githubDiscussionsUrl = default!;
private string stackoverflowUrl = default!;

internal Sidebar2 sidebar2 = default!;
internal IEnumerable<NavItem> navItems = default!;
internal IReadOnlyCollection<NavItem>? NavItems;

[Inject] public IConfiguration Configuration { get; set; } = default!;

protected override void OnInitialized()
{
version = $"v{Configuration["version"]}"; // example: v0.6.1
docsUrl = $"{Configuration["urls:docs"]}";
blogUrl = $"{Configuration["urls:blog"]}";
githubUrl = $"{Configuration["urls:github"]}";
twitterUrl = $"{Configuration["urls:twitter"]}";
linkedInUrl = $"{Configuration["urls:linkedin"]}";
openCollectiveUrl = $"{Configuration["urls:opencollective"]}";
githubIssuesUrl = $"{Configuration["urls:github_issues"]}";
githubDiscussionsUrl = $"{Configuration["urls:github_discussions"]}";
stackoverflowUrl = $"{Configuration["urls:stackoverflow"]}";
Version = $"v{Configuration["version"]}"; // example: v0.6.1
DocsUrl = $"{Configuration["urls:docs"]}";
BlogUrl = $"{Configuration["urls:blog"]}";
GithubUrl = $"{Configuration["urls:github"]}";
TwitterUrl = $"{Configuration["urls:twitter"]}";
LinkedInUrl = $"{Configuration["urls:linkedin"]}";
OpenCollectiveUrl = $"{Configuration["urls:opencollective"]}";
GithubIssuesUrl = $"{Configuration["urls:github_issues"]}";
GithubDiscussionsUrl = $"{Configuration["urls:github_discussions"]}";
StackoverflowUrl = $"{Configuration["urls:stackoverflow"]}";
base.OnInitialized();
}

internal virtual async Task<Sidebar2DataProviderResult> Sidebar2DataProvider(Sidebar2DataProviderRequest request)
internal virtual Task<Sidebar2DataProviderResult> Sidebar2DataProvider()
{
if (navItems is null)
navItems = GetNavItems();

return await Task.FromResult(request.ApplyTo(navItems));
return Task.FromResult(Sidebar2DataProviderRequest.ApplyTo(NavItems));
}
internal virtual IReadOnlyCollection<NavItem> GetNavItems() => new List<NavItem>();

public string Version { get; private set; } = default!;

public string DocsUrl { get; private set; } = default!;

public string BlogUrl { get; private set; } = default!;

public string GithubUrl { get; private set; } = default!;

public string TwitterUrl { get; private set; } = default!;

public string LinkedInUrl { get; private set; } = default!;

public string OpenCollectiveUrl { get; private set; } = default!;

public string GithubIssuesUrl { get; private set; } = default!;

public string GithubDiscussionsUrl { get; private set; } = default!;

internal virtual IEnumerable<NavItem> GetNavItems() => new List<NavItem>();

public string Version => version;
public string DocsUrl => docsUrl;
public string BlogUrl => blogUrl;
public string GithubUrl => githubUrl;
public string TwitterUrl => twitterUrl;
public string LinkedInUrl => linkedInUrl;
public string OpenCollectiveUrl => openCollectiveUrl;
public string GithubIssuesUrl => githubIssuesUrl;
public string GithubDiscussionsUrl => githubDiscussionsUrl;
public string StackoverflowUrl => stackoverflowUrl;
public string StackoverflowUrl { get; private set; } = default!;
}
24 changes: 12 additions & 12 deletions ...CL/Components/Pages/Accordion/Accordion_Demo_06_Show_Hide_Individual_AccordionItems.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
@code {
private Accordion accordion1 = default!;

private async Task ShowFirstAccordionItemAsync() => await accordion1.ShowFirstAccordionItemAsync();
private async Task ShowSecondAccordionItemAsync() => await accordion1.ShowAccordionItemByIndexAsync(1);
private async Task ShowThirdAccordionItemAsync() => await accordion1.ShowAccordionItemByIndexAsync(2);
private async Task ShowProductsAccordionItemAsync() => await accordion1.ShowAccordionItemByNameAsync("Products");
private async Task ShowFaqsAccordionItemAsync() => await accordion1.ShowAccordionItemByNameAsync("FAQ");
private async Task ShowLastAccordionItemAsync() => await accordion1.ShowLastAccordionItemAsync();
private async Task HideFirstAccordionItemAsync() => await accordion1.HideFirstAccordionItemAsync();
private async Task HideSecondAccordionItemAsync() => await accordion1.HideAccordionItemByIndexAsync(1);
private async Task HideThirdAccordionItemAsync() => await accordion1.HideAccordionItemByIndexAsync(2);
private async Task HideProductsAccordionItemAsync() => await accordion1.HideAccordionItemByNameAsync("Products");
private async Task HideFaqsAccordionItemAsync() => await accordion1.HideAccordionItemByNameAsync("FAQ");
private async Task HideLastAccordionItemAsync() => await accordion1.HideLastAccordionItemAsync();
private Task ShowFirstAccordionItemAsync() => accordion1.ShowFirstAccordionItemAsync();
private Task ShowSecondAccordionItemAsync() => accordion1.ShowAccordionItemByIndexAsync(1);
private Task ShowThirdAccordionItemAsync() => accordion1.ShowAccordionItemByIndexAsync(2);
private Task ShowProductsAccordionItemAsync() => accordion1.ShowAccordionItemByNameAsync("Products");
private Task ShowFaqsAccordionItemAsync() => accordion1.ShowAccordionItemByNameAsync("FAQ");
private Task ShowLastAccordionItemAsync() => accordion1.ShowLastAccordionItemAsync();
private Task HideFirstAccordionItemAsync() => accordion1.HideFirstAccordionItemAsync();
private Task HideSecondAccordionItemAsync() => accordion1.HideAccordionItemByIndexAsync(1);
private Task HideThirdAccordionItemAsync() => accordion1.HideAccordionItemByIndexAsync(2);
private Task HideProductsAccordionItemAsync() => accordion1.HideAccordionItemByNameAsync("Products");
private Task HideFaqsAccordionItemAsync() => accordion1.HideAccordionItemByNameAsync("FAQ");
private Task HideLastAccordionItemAsync() => accordion1.HideLastAccordionItemAsync();
}
3 changes: 1 addition & 2 deletions BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_05_Dismissing_B.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Alert @ref="warningAlert" Color="AlertColor.Warning">
<strong>Holy guacamole!</strong> You should check in on some of those fields below. <Button Color="ButtonColor.Primary" @onclick="CloseAlert">Close</Button>
<strong>Holy guacamole!</strong> You should check in on some of those fields below. <Button Color="ButtonColor.Primary" @onclick="(async () => await warningAlert.CloseAsync())">Close</Button>
</Alert>

@code {
Alert warningAlert = default!;
private async Task CloseAlert() => await warningAlert.CloseAsync();
}
21 changes: 16 additions & 5 deletions ...rap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_02_Horizontal_BarChart.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,27 @@
};
datasets.Add(dataset1);

chartData = new ChartData { Labels = labels, Datasets = datasets };
chartData = new ChartData {
Labels = labels,
Datasets = datasets,
};

barChartOptions = new BarChartOptions();
barChartOptions.Responsive = true;
barChartOptions.Interaction = new Interaction { Mode = InteractionMode.Y };
barChartOptions.IndexAxis = "y";

barChartOptions.Scales.X!.Title = new ChartAxesTitle { Text = "Visitors", Display = true };
barChartOptions.Scales.Y!.Title = new ChartAxesTitle { Text = "Browser", Display = true };

barChartOptions.Scales = new Scales
{
X = new ChartAxes()
{
Title = new ChartAxesTitle() { Text = "Visitors", Display = true }
},
Y = new ChartAxes()
{
Title = new ChartAxesTitle() { Text = "Browser", Display = true }
},
};

barChartOptions.Plugins.Legend.Display = false;
}

Expand Down
19 changes: 13 additions & 6 deletions ...tstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_03_Stacked_BarChart.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,19 @@
barChartOptions.Responsive = true;
barChartOptions.Interaction = new Interaction { Mode = InteractionMode.Y };
barChartOptions.IndexAxis = "y";

barChartOptions.Scales.X!.Title = new ChartAxesTitle { Text = "Visitors", Display = true };
barChartOptions.Scales.Y!.Title = new ChartAxesTitle { Text = "Browser", Display = true };

barChartOptions.Scales.X.Stacked = true;
barChartOptions.Scales.Y.Stacked = true;
barChartOptions.Scales = new Scales
{
X = new ChartAxes()
{
Stacked = true,
Title = new ChartAxesTitle() { Text = "Visitors", Display = true }
},
Y = new ChartAxes()
{
Stacked = true,
Title = new ChartAxesTitle() { Text = "Browser", Display = true }
},
};

barChartOptions.Plugins.Title!.Text = "Operating system";
barChartOptions.Plugins.Title.Display = true;
Expand Down
20 changes: 14 additions & 6 deletions BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_04_Locale.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,20 @@
barChartOptions.Responsive = true;
barChartOptions.Interaction = new Interaction { Mode = InteractionMode.Y };
barChartOptions.IndexAxis = "y";

barChartOptions.Scales.X!.Title = new ChartAxesTitle { Text = "Visitors", Display = true };
barChartOptions.Scales.Y!.Title = new ChartAxesTitle { Text = "Browser", Display = true };

barChartOptions.Scales.X.Stacked = true;
barChartOptions.Scales.Y.Stacked = true;

barChartOptions.Scales = new Scales
{
X = new ChartAxes()
{
Stacked = true,
Title = new ChartAxesTitle() { Text = "Visitors", Display = true }
},
Y = new ChartAxes()
{
Stacked = true,
Title = new ChartAxesTitle() { Text = "Browser", Display = true }
},
};

barChartOptions.Plugins.Title!.Text = "Operating system";
barChartOptions.Plugins.Title.Display = true;
Expand Down
21 changes: 15 additions & 6 deletions ...Components/Pages/Charts/BarCharts/BarChart_Demo_05_Stacked_BarChart_with_Datalabels.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,24 @@
barChartOptions.Responsive = true;
barChartOptions.Interaction = new Interaction { Mode = InteractionMode.Y };
barChartOptions.IndexAxis = "y";

barChartOptions.Scales.X!.Title = new ChartAxesTitle { Text = "Visitors", Display = true };
barChartOptions.Scales.Y!.Title = new ChartAxesTitle { Text = "Browser", Display = true };

barChartOptions.Scales.X.Stacked = true;
barChartOptions.Scales.Y.Stacked = true;

barChartOptions.Scales = new Scales
{
X = new ChartAxes()
{
Stacked = true,
Title = new ChartAxesTitle() { Text = "Visitors", Display = true }
},
Y = new ChartAxes()
{
Stacked = true,
Title = new ChartAxesTitle() { Text = "Browser", Display = true }
},
};

barChartOptions.Plugins.Title!.Text = "Operating system";
barChartOptions.Plugins.Title.Display = true;

}

protected override async Task OnAfterRenderAsync(bool firstRender)
Expand Down
3 changes: 1 addition & 2 deletions ...trap.Demo.RCL/Components/Pages/Charts/DoughnutCharts/DoughnutChart_Demo_01_Examples.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
foreach (var dataset in chartData.Datasets)
{
if (dataset is DoughnutChartDataset doughnutChartDataset
&& doughnutChartDataset is not null
&& doughnutChartDataset.Data is not null)
&& doughnutChartDataset?.Data != null)
{
var count = doughnutChartDataset.Data.Count;

Expand Down
3 changes: 1 addition & 2 deletions ...rBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_01_A_Examples.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
foreach (var dataset in chartData.Datasets)
{
if (dataset is LineChartDataset lineChartDataset
&& lineChartDataset is not null
&& lineChartDataset.Data is not null)
&& lineChartDataset?.Data != null)
{
var count = lineChartDataset.Data.Count;

Expand Down
14 changes: 12 additions & 2 deletions ...rBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_01_B_Examples.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,19 @@
lineChartOptions = new();
lineChartOptions.Responsive = true;
lineChartOptions.Interaction = new Interaction { Mode = InteractionMode.Index };

lineChartOptions.Scales = new Scales
{
X = new ChartAxes()
{
Title = new ChartAxesTitle() { Text = "Visitors", Display = true }
},
Y = new ChartAxes()
{
Title = new ChartAxesTitle() { Text = "Browser", Display = true }
},
};

lineChartOptions.Scales.X!.Title = new ChartAxesTitle { Text = "2019", Display = true };
lineChartOptions.Scales.Y!.Title = new ChartAxesTitle { Text = "Visitors", Display = true };

lineChartOptions.Plugins.Title!.Text = "Operating system";
lineChartOptions.Plugins.Title.Display = true;
Expand Down
14 changes: 12 additions & 2 deletions BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_02_Locale.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,18 @@
lineChartOptions.Responsive = true;
lineChartOptions.Interaction = new Interaction { Mode = InteractionMode.Index };

lineChartOptions.Scales.X!.Title = new ChartAxesTitle { Text = "2019", Display = true };
lineChartOptions.Scales.Y!.Title = new ChartAxesTitle { Text = "Visitors", Display = true };
lineChartOptions.Scales = new Scales
{
X = new ChartAxes()
{
Title = new ChartAxesTitle() { Text = "Visitors", Display = true }
},
Y = new ChartAxes()
{
Title = new ChartAxesTitle() { Text = "Browser", Display = true }
},
};


lineChartOptions.Plugins.Title!.Text = "Operating system";
lineChartOptions.Plugins.Title.Display = true;
Expand Down
24 changes: 19 additions & 5 deletions ....Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_03_Dynamically_add_data.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,27 @@

options.Interaction.Mode = InteractionMode.Index;

options.Plugins.Title = new ChartPluginsTitle { Text = "WORM", Display = true, Font = new ChartFont { Size = 20 } };
options.Plugins.Title = new ChartPluginsTitle()
{
Text = "WORM",
Display = true,
Font = new ChartFont() { Size = 20 }
};

options.Responsive = true;

options.Scales.X!.Title = new ChartAxesTitle { Text = "Overs", Display = true };
options.Scales.Y!.Title = new ChartAxesTitle { Text = "Runs", Display = true };
options.Scales.Y.SuggestedMax = 150;

options.Scales = new Scales
{
X = new ChartAxes()
{
Title = new ChartAxesTitle() { Text = "Over", Display = true }
},
Y = new ChartAxes()
{
Title = new ChartAxesTitle() { Text = "Runs", Display = true },
SuggestedMax = 150
},
};

return options;
}
Expand Down
16 changes: 13 additions & 3 deletions ...rBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_04_Datalabels.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,20 @@

lineChartOptions = new();
lineChartOptions.Responsive = true;
lineChartOptions.Interaction = new Interaction { Mode = InteractionMode.Index };
lineChartOptions.Interaction = new Interaction { Mode = InteractionMode.Index };

lineChartOptions.Scales = new Scales
{
X = new ChartAxes()
{
Title = new ChartAxesTitle() { Text = "2019", Display = true }
},
Y = new ChartAxes()
{
Title = new ChartAxesTitle() { Text = "Visitors", Display = true }
},
};

lineChartOptions.Scales.X!.Title = new ChartAxesTitle { Text = "2019", Display = true };
lineChartOptions.Scales.Y!.Title = new ChartAxesTitle { Text = "Visitors", Display = true };

lineChartOptions.Plugins.Title!.Text = "Operating system";
lineChartOptions.Plugins.Title.Display = true;
Expand Down
Loading
Loading