Skip to content

Commit

Permalink
code cleanup (#295)
Browse files Browse the repository at this point in the history
* File scoped namespaces and code cleanup

* .editorconfig included

* Modal Service - Refactor

* Charts - Refactor

* Models and Extensions - Cleanup

* EventArguments - cleanup

* Form Components - Code cleanup

* Grid - Code cleanup

* accordion - code cleanup

* Alerts - code cleanup

* Badge - code cleanup

* Breadcrumb code cleanup

* Modal - cleanup

* Button - code cleanup

* Callout - code cleanup

* Charts - code cleanup

* Collapse - code cleanup

* Confirm dialog - code cleanup

* Offcanvas - code cleanup

* Pagination - code cleanup

* Placeholders - code cleanup

* Preload - code cleanup

* Progress - code cleanup

* Sidebar - code cleanup

* Tabs - code cleanup

* Tooltip - code cleanup

* Toasts - code cleanup
  • Loading branch information
gvreddy04 authored Jul 23, 2023
1 parent cc7314e commit 5c50be2
Show file tree
Hide file tree
Showing 110 changed files with 6,951 additions and 7,177 deletions.
290 changes: 290 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,290 @@
# Remove the line below if you want to inherit .editorconfig settings from higher directories
root = true

# C# files
[*.cs]

#### Core EditorConfig Options ####

# Indentation and spacing
indent_size = 4
indent_style = space
tab_width = 4

# New line preferences
end_of_line = crlf
insert_final_newline = false

#### .NET Coding Conventions ####

# Organize usings
dotnet_separate_import_directive_groups = false
dotnet_sort_system_directives_first = false
file_header_template = unset

# this. and Me. preferences
dotnet_style_qualification_for_event = false
dotnet_style_qualification_for_field = false
dotnet_style_qualification_for_method = false
dotnet_style_qualification_for_property = false

# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true
dotnet_style_predefined_type_for_member_access = true

# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity

# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members

# Expression-level preferences
dotnet_style_coalesce_expression = true:silent
dotnet_style_collection_initializer = true
dotnet_style_explicit_tuple_names = true
dotnet_style_namespace_match_folder = true
dotnet_style_null_propagation = true:silent
dotnet_style_object_initializer = true
dotnet_style_operator_placement_when_wrapping = beginning_of_line
dotnet_style_prefer_auto_properties = true:suggestion
dotnet_style_prefer_compound_assignment = true
dotnet_style_prefer_conditional_expression_over_assignment = true
dotnet_style_prefer_conditional_expression_over_return = true
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
dotnet_style_prefer_inferred_anonymous_type_member_names = true
dotnet_style_prefer_inferred_tuple_names = true
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
dotnet_style_prefer_simplified_boolean_expressions = true
dotnet_style_prefer_simplified_interpolation = true

# Field preferences
dotnet_style_readonly_field = true

# Parameter preferences
dotnet_code_quality_unused_parameters = all:silent

# Suppression preferences
dotnet_remove_unnecessary_suppression_exclusions = none

# New line preferences
dotnet_style_allow_multiple_blank_lines_experimental = false
dotnet_style_allow_statement_immediately_after_block_experimental = false

#### C# Coding Conventions ####

# var preferences
csharp_style_var_elsewhere = true:silent
csharp_style_var_for_built_in_types = true:silent
csharp_style_var_when_type_is_apparent = true:silent

# Expression-bodied members
csharp_style_expression_bodied_accessors = true:silent
csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_lambdas = true:silent
csharp_style_expression_bodied_local_functions = false:silent
csharp_style_expression_bodied_methods = true:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_properties = true:silent

# Pattern matching preferences
csharp_style_pattern_matching_over_as_with_null_check = true:silent
csharp_style_pattern_matching_over_is_with_cast_check = true:silent
csharp_style_prefer_extended_property_pattern = true:suggestion
csharp_style_prefer_not_pattern = true:silent
csharp_style_prefer_pattern_matching = true:silent
csharp_style_prefer_switch_expression = true:suggestion

# Null-checking preferences
csharp_style_conditional_delegate_call = true:silent

# Modifier preferences
csharp_prefer_static_local_function = true:suggestion
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
csharp_style_prefer_readonly_struct = true:suggestion
csharp_style_prefer_readonly_struct_member = true:suggestion

# Code-block preferences
csharp_prefer_braces = when_multiline:silent
csharp_prefer_simple_using_statement = true:suggestion
csharp_style_namespace_declarations = file_scoped:silent
csharp_style_prefer_method_group_conversion = true:silent
csharp_style_prefer_top_level_statements = true:silent

# Expression-level preferences
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_deconstructed_variable_declaration = true:silent
csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
csharp_style_inlined_variable_declaration = true:silent
csharp_style_prefer_index_operator = true:suggestion
csharp_style_prefer_local_over_anonymous_function = true:suggestion
csharp_style_prefer_null_check_over_type_check = true:silent
csharp_style_prefer_range_operator = true:suggestion
csharp_style_prefer_tuple_swap = true:suggestion
csharp_style_prefer_utf8_string_literals = true:suggestion
csharp_style_throw_expression = true:suggestion
csharp_style_unused_value_assignment_preference = discard_variable:silent
csharp_style_unused_value_expression_statement_preference = discard_variable:silent

# 'using' directive preferences
csharp_using_directive_placement = outside_namespace:silent

# New line preferences
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false:silent
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = false:silent
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = false:silent
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:silent
csharp_style_allow_embedded_statements_on_same_line_experimental = false:silent

#### C# Formatting Rules ####

# New line preferences
csharp_new_line_before_catch = true
csharp_new_line_before_else = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_open_brace = all
csharp_new_line_between_query_expression_clauses = true

# Indentation preferences
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_case_contents_when_block = true
csharp_indent_labels = one_less_than_current
csharp_indent_switch_labels = true

# Space preferences
csharp_space_after_cast = false
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_around_binary_operators = before_and_after
csharp_space_around_declaration_statements = false
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

# Wrapping preferences
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = true

#### Naming styles ####

# Naming rules

dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i

dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case

dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case

# Symbol specifications

dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.interface.required_modifiers =

dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.types.required_modifiers =

dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.non_field_members.required_modifiers =

# Naming styles

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case

dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case

[*.{cs,vb}]
dotnet_style_operator_placement_when_wrapping = beginning_of_line
tab_width = 4
indent_size = 4
end_of_line = crlf
dotnet_style_coalesce_expression = true:silent
dotnet_style_null_propagation = true:silent
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
dotnet_style_prefer_auto_properties = true:suggestion
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_compound_assignment = true:suggestion
dotnet_style_prefer_simplified_interpolation = true:suggestion
dotnet_style_namespace_match_folder = true:suggestion
dotnet_style_readonly_field = true:suggestion
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
dotnet_style_predefined_type_for_member_access = true:silent
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
dotnet_style_allow_multiple_blank_lines_experimental = false:silent
dotnet_style_allow_statement_immediately_after_block_experimental = false:silent
dotnet_code_quality_unused_parameters = all:silent
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
dotnet_style_qualification_for_field = false:silent
dotnet_style_qualification_for_property = false:silent
dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_event = false:silent

# Customizations
[*.{cs,vb}]
dotnet_diagnostic.IDE0058.severity = none

[*.{cs,vb}]
dotnet_diagnostic.IDE0062.severity = none

[*.{cs,vb}]
dotnet_diagnostic.IDE0130.severity = none

[*.{cs,vb}]
dotnet_diagnostic.IDE0036.severity = none

[*.{cs,vb}]
dotnet_diagnostic.IDE0016.severity = none

# var preferences - override
csharp_style_var_elsewhere = true
csharp_style_var_for_built_in_types = true
csharp_style_var_when_type_is_apparent = true

# exclude file
[BootstrapIconProvider.cs]
generated_code = true
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div>Add <code>AutoHide="true"</code> parameter to hide the Blazor Toasts after the delay. The default delay is 5000 milliseconds, be sure to update the delay timeout so that users have enough time to read the toast.</div>
<Demo Type="typeof(Toasts_Demo_03_A_Auto_Hide)" />

<SectionHeading Size="HeadingSize.H2" Text="Auto hide individual messages" PageUrl="@pageUrl" HashTagName="auto-hide-individual-messages" />
<SectionHeading Size="HeadingSize.H2" Text="Enable auto hide for individual messages" PageUrl="@pageUrl" HashTagName="enable-auto-hide-for-individual-messages" />
<div class="mb-3">Set <code>AutoHide="true"</code> property on <code>ToastMessage</code> to hide individual Blazor Toast message after the delay. The default delay is 5000 milliseconds, be sure to update the delay timeout so that users have enough time to read the toast.</div>
<div>In the below example, <code>AutoHide="false"</code> for <b>Danger</b> and <b>Warning</b> messages.</div>
<Demo Type="typeof(Toasts_Demo_03_B_Auto_Hide_Individual_Messages)" />
Expand Down
2 changes: 1 addition & 1 deletion BlazorBootstrap.Demo.Hosted/Client/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using BlazorBootstrap.Demo.Hosted.Client;
using BlazorBootstrap;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;

var builder = WebAssemblyHostBuilder.CreateDefault(args);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
builder.AddAttribute(301, "class", "highlight show-code-only");
builder.OpenElement(400, "pre");
builder.OpenElement(401, "code");
builder.AddAttribute(402, "class", $"language-{Language ?? GetLanguageFromFileExtension() ?? "cshtml"}" );
builder.AddAttribute(402, "class", $"language-{Language ?? GetLanguageFromFileExtension() ?? "cshtml"}");
if (code != null)
{
builder.AddContent(403, code.Trim());
Expand Down
6 changes: 3 additions & 3 deletions BlazorBootstrap.Demo.Hosted/Client/Usings.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
global using System.Linq.Expressions;
global using BlazorBootstrap.Demo.Hosted.Client;
global using BlazorBootstrap.Demo.Hosted.Client.Shared;
global using System.Linq.Expressions;
global using System.Net.Http.Json;
global using BlazorBootstrap.Demo.Hosted.Client;
global using BlazorBootstrap.Demo.Hosted.Client.Shared;
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div>Add <code>AutoHide="true"</code> parameter to hide the Blazor Toasts after the delay. The default delay is 5000 milliseconds, be sure to update the delay timeout so that users have enough time to read the toast.</div>
<Demo Type="typeof(Toasts_Demo_03_A_Auto_Hide)" />

<SectionHeading Size="HeadingSize.H2" Text="Auto hide individual messages" PageUrl="@pageUrl" HashTagName="auto-hide-individual-messages" />
<SectionHeading Size="HeadingSize.H2" Text="Enable auto hide for individual messages" PageUrl="@pageUrl" HashTagName="enable-auto-hide-for-individual-messages" />
<div class="mb-3">Set <code>AutoHide="true"</code> property on <code>ToastMessage</code> to hide individual Blazor Toast message after the delay. The default delay is 5000 milliseconds, be sure to update the delay timeout so that users have enough time to read the toast.</div>
<div>In the below example, <code>AutoHide="false"</code> for <b>Danger</b> and <b>Warning</b> messages.</div>
<Demo Type="typeof(Toasts_Demo_03_B_Auto_Hide_Individual_Messages)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
builder.AddAttribute(301, "class", "highlight show-code-only");
builder.OpenElement(400, "pre");
builder.OpenElement(401, "code");
builder.AddAttribute(402, "class", $"language-{Language ?? GetLanguageFromFileExtension() ?? "cshtml"}" );
builder.AddAttribute(402, "class", $"language-{Language ?? GetLanguageFromFileExtension() ?? "cshtml"}");
if (code != null)
{
builder.AddContent(403, code.Trim());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div>Add <code>AutoHide="true"</code> parameter to hide the Blazor Toasts after the delay. The default delay is 5000 milliseconds, be sure to update the delay timeout so that users have enough time to read the toast.</div>
<Demo Type="typeof(Toasts_Demo_03_A_Auto_Hide)" />

<SectionHeading Size="HeadingSize.H2" Text="Auto hide individual messages" PageUrl="@pageUrl" HashTagName="auto-hide-individual-messages" />
<SectionHeading Size="HeadingSize.H2" Text="Enable auto hide for individual messages" PageUrl="@pageUrl" HashTagName="enable-auto-hide-for-individual-messages" />
<div class="mb-3">Set <code>AutoHide="true"</code> property on <code>ToastMessage</code> to hide individual Blazor Toast message after the delay. The default delay is 5000 milliseconds, be sure to update the delay timeout so that users have enough time to read the toast.</div>
<div>In the below example, <code>AutoHide="false"</code> for <b>Danger</b> and <b>Warning</b> messages.</div>
<Demo Type="typeof(Toasts_Demo_03_B_Auto_Hide_Individual_Messages)" />
Expand Down
2 changes: 1 addition & 1 deletion BlazorBootstrap.Demo/Shared/Components/CodeSnippet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
builder.AddAttribute(301, "class", "highlight show-code-only");
builder.OpenElement(400, "pre");
builder.OpenElement(401, "code");
builder.AddAttribute(402, "class", $"language-{Language ?? GetLanguageFromFileExtension() ?? "cshtml"}" );
builder.AddAttribute(402, "class", $"language-{Language ?? GetLanguageFromFileExtension() ?? "cshtml"}");
if (code != null)
{
builder.AddContent(403, code.Trim());
Expand Down
7 changes: 2 additions & 5 deletions blazorbootstrap/Base/BaseAfterRenderComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public abstract class BaseAfterRenderComponent : ComponentBase, IDisposable, IAs
/// <summary>
/// A stack of functions to execute after the rendering.
/// </summary>
private Queue<Func<Task>> executeAfterRenderQueue;
private Queue<Func<Task>>? executeAfterRenderQueue;

#endregion

Expand Down Expand Up @@ -46,10 +46,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
}

/// <inheritdoc/>
public void Dispose()
{
Dispose(true);
}
public void Dispose() => Dispose(true);

/// <summary>
/// Releases the unmanaged resources used by the <see cref="BaseComponent"/> and optionally releases the managed resources.
Expand Down
Loading

0 comments on commit 5c50be2

Please sign in to comment.