Skip to content

Commit e7b68f5

Browse files
GRIMMR3AP3RMarkPieszak
GRIMMR3AP3R
authored and
MarkPieszak
committed
style(code): update code formatting, style and ng fix
This has an updated editorconfig to ensure C# styling. Project files have been updated with better code styling. There are a bunch of other little tweaks but the best fix is bringing back the use of NG. With this fix ng g c blah\blah will no longer bark about "skip-import option to skip importing components in NgModule". The problem was Angluar.json didn't convert properly.
1 parent 5923909 commit e7b68f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1370
-1134
lines changed

‎.editorconfig

+187-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,196 @@
1-
# http://editorconfig.org
2-
1+
###############################
2+
# Core EditorConfig Options #
3+
###############################
34
root = true
45

6+
# All files
57
[*]
6-
charset = utf-8
78
indent_style = space
8-
indent_size = 2
9-
end_of_line = lf
9+
10+
# Code files
11+
[*.{cs,csx,vb,vbx}]
12+
indent_size = 4
1013
insert_final_newline = true
11-
trim_trailing_whitespace = true
14+
charset = utf-8-bom
1215

1316
[*.md]
1417
insert_final_newline = false
1518
trim_trailing_whitespace = false
19+
20+
###############################
21+
# .NET Coding Conventions #
22+
###############################
23+
24+
# Solution Files
25+
[*.sln]
26+
indent_style = tab
27+
28+
# XML Project Files
29+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
30+
indent_size = 2
31+
32+
# Configuration Files
33+
[*.{json,xml,yml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}]
34+
indent_size = 2
35+
36+
# Dotnet Code Style Settings
37+
# See https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
38+
# See http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers
39+
[*.{cs,csx,cake,vb}]
40+
dotnet_sort_system_directives_first = true:warning
41+
dotnet_style_coalesce_expression = true:warning
42+
dotnet_style_collection_initializer = true:warning
43+
dotnet_style_explicit_tuple_names = true:warning
44+
dotnet_style_null_propagation = true:warning
45+
dotnet_style_object_initializer = true:warning
46+
dotnet_style_predefined_type_for_locals_parameters_members = true:warning
47+
dotnet_style_predefined_type_for_member_access = true:warning
48+
dotnet_style_qualification_for_event = true:warning
49+
dotnet_style_qualification_for_field = true:warning
50+
dotnet_style_qualification_for_method = true:warning
51+
dotnet_style_qualification_for_property = true:warning
52+
53+
# Naming Symbols
54+
# constant_fields - Define constant fields
55+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
56+
dotnet_naming_symbols.constant_fields.required_modifiers = const
57+
# non_private_readonly_fields - Define public, internal and protected readonly fields
58+
dotnet_naming_symbols.non_private_readonly_fields.applicable_accessibilities = public, internal, protected
59+
dotnet_naming_symbols.non_private_readonly_fields.applicable_kinds = field
60+
dotnet_naming_symbols.non_private_readonly_fields.required_modifiers = readonly
61+
# static_readonly_fields - Define static and readonly fields
62+
dotnet_naming_symbols.static_readonly_fields.applicable_kinds = field
63+
dotnet_naming_symbols.static_readonly_fields.required_modifiers = static, readonly
64+
# private_readonly_fields - Define private readonly fields
65+
dotnet_naming_symbols.private_readonly_fields.applicable_accessibilities = private
66+
dotnet_naming_symbols.private_readonly_fields.applicable_kinds = field
67+
dotnet_naming_symbols.private_readonly_fields.required_modifiers = readonly
68+
# public_internal_fields - Define public and internal fields
69+
dotnet_naming_symbols.public_internal_fields.applicable_accessibilities = public, internal
70+
dotnet_naming_symbols.public_internal_fields.applicable_kinds = field
71+
# private_protected_fields - Define private and protected fields
72+
dotnet_naming_symbols.private_protected_fields.applicable_accessibilities = private, protected
73+
dotnet_naming_symbols.private_protected_fields.applicable_kinds = field
74+
# public_symbols - Define any public symbol
75+
dotnet_naming_symbols.public_symbols.applicable_accessibilities = public, internal, protected, protected_internal
76+
dotnet_naming_symbols.public_symbols.applicable_kinds = method, property, event, delegate
77+
# parameters - Defines any parameter
78+
dotnet_naming_symbols.parameters.applicable_kinds = parameter
79+
# non_interface_types - Defines class, struct, enum and delegate types
80+
dotnet_naming_symbols.non_interface_types.applicable_kinds = class, struct, enum, delegate
81+
# interface_types - Defines interfaces
82+
dotnet_naming_symbols.interface_types.applicable_kinds = interface
83+
84+
# Naming Styles
85+
# camel_case - Define the camelCase style
86+
dotnet_naming_style.camel_case.capitalization = camel_case
87+
# pascal_case - Define the Pascal_case style
88+
dotnet_naming_style.pascal_case.capitalization = pascal_case
89+
# first_upper - The first character must start with an upper-case character
90+
dotnet_naming_style.first_upper.capitalization = first_word_upper
91+
# prefix_interface_interface_with_i - Interfaces must be PascalCase and the first character of an interface must be an 'I'
92+
dotnet_naming_style.prefix_interface_interface_with_i.capitalization = pascal_case
93+
dotnet_naming_style.prefix_interface_interface_with_i.required_prefix = I
94+
95+
# Naming Rules
96+
# Constant fields must be PascalCase
97+
dotnet_naming_rule.constant_fields_must_be_pascal_case.severity = warning
98+
dotnet_naming_rule.constant_fields_must_be_pascal_case.symbols = constant_fields
99+
dotnet_naming_rule.constant_fields_must_be_pascal_case.style = pascal_case
100+
# Public, internal and protected readonly fields must be PascalCase
101+
dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.severity = warning
102+
dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.symbols = non_private_readonly_fields
103+
dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.style = pascal_case
104+
# Static readonly fields must be PascalCase
105+
dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.severity = warning
106+
dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.symbols = static_readonly_fields
107+
dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.style = pascal_case
108+
# Private readonly fields must be camelCase
109+
dotnet_naming_rule.private_readonly_fields_must_be_camel_case.severity = warning
110+
dotnet_naming_rule.private_readonly_fields_must_be_camel_case.symbols = private_readonly_fields
111+
dotnet_naming_rule.private_readonly_fields_must_be_camel_case.style = camel_case
112+
# Public and internal fields must be PascalCase
113+
dotnet_naming_rule.public_internal_fields_must_be_pascal_case.severity = warning
114+
dotnet_naming_rule.public_internal_fields_must_be_pascal_case.symbols = public_internal_fields
115+
dotnet_naming_rule.public_internal_fields_must_be_pascal_case.style = pascal_case
116+
# Private and protected fields must be camelCase
117+
dotnet_naming_rule.private_protected_fields_must_be_camel_case.severity = warning
118+
dotnet_naming_rule.private_protected_fields_must_be_camel_case.symbols = private_protected_fields
119+
dotnet_naming_rule.private_protected_fields_must_be_camel_case.style = camel_case
120+
# Public members must be capitalized
121+
dotnet_naming_rule.public_members_must_be_capitalized.severity = warning
122+
dotnet_naming_rule.public_members_must_be_capitalized.symbols = public_symbols
123+
dotnet_naming_rule.public_members_must_be_capitalized.style = first_upper
124+
# Parameters must be camelCase
125+
dotnet_naming_rule.parameters_must_be_camel_case.severity = warning
126+
dotnet_naming_rule.parameters_must_be_camel_case.symbols = parameters
127+
dotnet_naming_rule.parameters_must_be_camel_case.style = camel_case
128+
# Class, struct, enum and delegates must be PascalCase
129+
dotnet_naming_rule.non_interface_types_must_be_pascal_case.severity = warning
130+
dotnet_naming_rule.non_interface_types_must_be_pascal_case.symbols = non_interface_types
131+
dotnet_naming_rule.non_interface_types_must_be_pascal_case.style = pascal_case
132+
# Interfaces must be PascalCase and start with an 'I'
133+
dotnet_naming_rule.interface_types_must_be_prefixed_with_i.severity = warning
134+
dotnet_naming_rule.interface_types_must_be_prefixed_with_i.symbols = interface_types
135+
dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style = prefix_interface_interface_with_i
136+
137+
# C# Code Style Settings
138+
# See https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
139+
# See http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers
140+
[*.{cs,csx,cake}]
141+
# Indentation Options
142+
csharp_indent_block_contents = true:warning
143+
csharp_indent_braces = false:warning
144+
csharp_indent_case_contents = true:warning
145+
csharp_indent_labels = no_change:warning
146+
csharp_indent_switch_labels = true:warning
147+
# Style Options
148+
csharp_style_conditional_delegate_call = true:warning
149+
csharp_style_expression_bodied_accessors = true:warning
150+
csharp_style_expression_bodied_constructors = true:warning
151+
csharp_style_expression_bodied_indexers = true:warning
152+
csharp_style_expression_bodied_methods = true:warning
153+
csharp_style_expression_bodied_operators = true:warning
154+
csharp_style_expression_bodied_properties = true:warning
155+
csharp_style_inlined_variable_declaration = true:warning
156+
csharp_style_pattern_matching_over_as_with_null_check = true:warning
157+
csharp_style_pattern_matching_over_is_with_cast_check = true:warning
158+
csharp_style_throw_expression = true:warning
159+
csharp_style_var_elsewhere = true:warning
160+
csharp_style_var_for_built_in_types = true:warning
161+
csharp_style_var_when_type_is_apparent = true:warning
162+
# New Line Options
163+
csharp_new_line_before_catch = true:warning
164+
csharp_new_line_before_else = true:warning
165+
csharp_new_line_before_finally = true:warning
166+
csharp_new_line_before_members_in_anonymous_types = true:warning
167+
csharp_new_line_before_members_in_object_initializers = true:warning
168+
# BUG: Warning level cannot be set https://github.com/dotnet/roslyn/issues/18010
169+
csharp_new_line_before_open_brace = all
170+
csharp_new_line_between_query_expression_clauses = true:warning
171+
# Spacing Options
172+
csharp_space_after_cast = false:warning
173+
csharp_space_after_colon_in_inheritance_clause = true:warning
174+
csharp_space_after_comma = true:warning
175+
csharp_space_after_dot = false:warning
176+
csharp_space_after_keywords_in_control_flow_statements = true:warning
177+
csharp_space_after_semicolon_in_for_statement = true:warning
178+
csharp_space_around_binary_operators = before_and_after:warning
179+
csharp_space_around_declaration_statements = do_not_ignore:warning
180+
csharp_space_before_colon_in_inheritance_clause = true:warning
181+
csharp_space_before_comma = false:warning
182+
csharp_space_before_dot = false:warning
183+
csharp_space_before_semicolon_in_for_statement = false:warning
184+
csharp_space_before_open_square_brackets = false:warning
185+
csharp_space_between_empty_square_brackets = false:warning
186+
csharp_space_between_method_declaration_name_and_open_parenthesis = false:warning
187+
csharp_space_between_method_declaration_parameter_list_parentheses = false:warning
188+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false:warning
189+
csharp_space_between_method_call_name_and_opening_parenthesis = false:warning
190+
csharp_space_between_method_call_parameter_list_parentheses = false:warning
191+
csharp_space_between_method_call_empty_parameter_list_parentheses = false:warning
192+
csharp_space_between_parentheses = expressions:warning
193+
csharp_space_between_square_brackets = false:warning
194+
# Wrapping Options
195+
csharp_preserve_single_line_blocks = true:warning
196+
csharp_preserve_single_line_statements = false:warning

‎ClientApp/app/_styles.scss

+14-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
$body-bg: #f1f1f1;
22
$body-color: #111;
3-
$theme-colors: ( "primary": #216DAD);
4-
$theme-colors: ( "accent": #669ECD);
3+
$theme-colors: (
4+
'primary': #216dad
5+
);
6+
$theme-colors: (
7+
'accent': #669ecd
8+
);
59

6-
7-
@import "~bootstrap/scss/bootstrap";
10+
@import '~bootstrap/scss/bootstrap';
811
.panel {
9-
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12);
12+
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14),
13+
0 1px 5px 0 rgba(0, 0, 0, 0.12);
1014
height: 100%;
1115
flex: 1;
12-
background-color: rgba(255, 255, 255, .30);
13-
border-radius: .25rem;
16+
background-color: rgba(255, 255, 255, 0.3);
17+
border-radius: 0.25rem;
1418
.title {
1519
background-color: #86afd0;
16-
color: #FFFFFF;
20+
color: #ffffff;
1721
text-align: center;
18-
border-top-left-radius: .25rem;
19-
border-top-right-radius: .25rem;
22+
border-top-left-radius: 0.25rem;
23+
border-top-right-radius: 0.25rem;
2024
}
2125
.body {
2226
display: flex;

‎ClientApp/app/_variables.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import "styles";
2-
$header-height:50px;
3-
$menu-max-width:25%;
1+
@import 'styles';
2+
$header-height: 50px;
3+
$menu-max-width: 25%;
44
$navbar-default-bg: #312312;
55
$light-orange: #ff8c00;
66
$navbar-default-color: $light-orange;

‎ClientApp/app/app.component.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "variables";
1+
@import 'variables';
22
/* *** Overall APP Styling can go here ***
33
--------------------------------------------
44
Note: This Component has ViewEncapsulation.None so the styles will bleed out
@@ -15,7 +15,7 @@ body {
1515
}
1616

1717
h1 {
18-
border-bottom: 3px theme-color("accent") solid;
18+
border-bottom: 3px theme-color('accent') solid;
1919
font-size: 24px;
2020
}
2121

@@ -40,7 +40,7 @@ ul li {
4040
blockquote {
4141
margin: 25px 10px;
4242
padding: 10px 35px 10px 10px;
43-
border-left: 10px color("green") solid;
43+
border-left: 10px color('green') solid;
4444
background: $gray-100;
4545
}
4646

@@ -57,7 +57,7 @@ blockquote a:hover {
5757
margin-left: $menu-max-width;
5858
}
5959
h1 {
60-
border-bottom: 5px #4189C7 solid;
60+
border-bottom: 5px #4189c7 solid;
6161
font-size: 36px;
6262
}
6363
h2 {

0 commit comments

Comments
 (0)