diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..fc2933b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,226 @@ +# 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 = tab +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 = true +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 +dotnet_style_collection_initializer = true +dotnet_style_explicit_tuple_names = true +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true +dotnet_style_object_initializer = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true +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 +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 + +# 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 +csharp_style_var_for_built_in_types = true +csharp_style_var_when_type_is_apparent = true + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true +csharp_style_expression_bodied_constructors = false +csharp_style_expression_bodied_indexers = true +csharp_style_expression_bodied_lambdas = true +csharp_style_expression_bodied_local_functions = false +csharp_style_expression_bodied_methods = false +csharp_style_expression_bodied_operators = false +csharp_style_expression_bodied_properties = true + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true +csharp_style_pattern_matching_over_is_with_cast_check = true +csharp_style_prefer_extended_property_pattern = true +csharp_style_prefer_not_pattern = true +csharp_style_prefer_pattern_matching = true +csharp_style_prefer_switch_expression = true + +# Null-checking preferences +csharp_style_conditional_delegate_call = true + +# Modifier preferences +csharp_prefer_static_local_function = true +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 + +# Code-block preferences +csharp_prefer_braces = when_multiline +csharp_prefer_simple_using_statement = true +csharp_style_namespace_declarations = file_scoped +csharp_style_prefer_method_group_conversion = true +csharp_style_prefer_top_level_statements = true + +# Expression-level preferences +csharp_prefer_simple_default_expression = true +csharp_style_deconstructed_variable_declaration = true +csharp_style_implicit_object_creation_when_type_is_apparent = true +csharp_style_inlined_variable_declaration = true +csharp_style_prefer_index_operator = true +csharp_style_prefer_local_over_anonymous_function = true +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_range_operator = true +csharp_style_prefer_tuple_swap = true +csharp_style_prefer_utf8_string_literals = true +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable +csharp_style_unused_value_expression_statement_preference = discard_variable + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace + +# New line preferences +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false +csharp_style_allow_embedded_statements_on_same_line_experimental = false + +#### 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 = false + +#### 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 diff --git a/Common.Types.Middleware/Common.Types.Middleware.csproj b/Common.Types.Middleware/Common.Types.Middleware.csproj deleted file mode 100644 index 217fffd..0000000 --- a/Common.Types.Middleware/Common.Types.Middleware.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net7.0 - enable - enable - Common.Types - - - - - - - - diff --git a/Common.Types.Model/Common.Types.Model.csproj b/Common.Types.Model/Common.Types.Model.csproj deleted file mode 100644 index 5c4b483..0000000 --- a/Common.Types.Model/Common.Types.Model.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net7.0 - enable - enable - Common.Types - - - - - - - - diff --git a/Common.Types.Model/Routes.cs b/Common.Types.Model/Routes.cs deleted file mode 100644 index 92b7922..0000000 --- a/Common.Types.Model/Routes.cs +++ /dev/null @@ -1,19 +0,0 @@ -using C = Common.CommonRoutes; - -namespace Common.Types -{ - public static class Routes - { - public const string CommonTypes = "commonTypes"; - - public const string TaxRates = $"{C.Management}/{CommonTypes}/taxRates"; - public const string Countries = $"{C.Management}/{CommonTypes}/countries"; - public const string Continents = $"{C.Management}/{CommonTypes}/continents"; - public const string ContinentCountries = $"{C.Management}/{CommonTypes}/continents/countries"; - public const string Banks = $"{C.Management}/{CommonTypes}/banks"; - public const string BankAccounts = $"{C.Management}/{CommonTypes}/bankAccounts"; - public const string Currencies = $"{C.Management}/{CommonTypes}/currencies"; - public const string PostalCodes = $"{C.Management}/{CommonTypes}/postalCodes"; - public const string MeasureUnits = $"{C.Management}/{CommonTypes}/measureUnits"; - } -} diff --git a/Common.Types/Common.Types.csproj b/Common.Types/Common.Types.csproj deleted file mode 100644 index d713fed..0000000 --- a/Common.Types/Common.Types.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - net7.0 - enable - enable - $(MSBuildProjectName.Replace(" ", "_")) - - - - - - - - - - - diff --git a/Common.Types/Security/Claims.cs b/Common.Types/Security/Claims.cs deleted file mode 100644 index 23dbe0e..0000000 --- a/Common.Types/Security/Claims.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Common.Types.Security -{ - internal static class Claims - { - public const string Delete = "Common Delete"; - public const string Read = "Common Read"; - public const string Add = "Common Add"; - public const string Modify = "Common Modify"; - } -} diff --git a/Common.Types.Client/ClientBootstrapper.cs b/Connected.Common.Types.Client/ClientBootstrapper.cs similarity index 85% rename from Common.Types.Client/ClientBootstrapper.cs rename to Connected.Common.Types.Client/ClientBootstrapper.cs index 86c4a0d..137c4ce 100644 --- a/Common.Types.Client/ClientBootstrapper.cs +++ b/Connected.Common.Types.Client/ClientBootstrapper.cs @@ -1,9 +1,9 @@ -using Common.Types.TaxRates; +using Connected.Common.Types.TaxRates; using Connected.Startup; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.DependencyInjection; -namespace Common.Types; +namespace Connected.Common.Types; public class ClientBootstrapper : IStartup { diff --git a/Common.Types.Client/Common.Types.Client.csproj b/Connected.Common.Types.Client/Connected.Common.Types.Client.csproj similarity index 67% rename from Common.Types.Client/Common.Types.Client.csproj rename to Connected.Common.Types.Client/Connected.Common.Types.Client.csproj index 6f62c7f..7a95249 100644 --- a/Common.Types.Client/Common.Types.Client.csproj +++ b/Connected.Common.Types.Client/Connected.Common.Types.Client.csproj @@ -4,12 +4,12 @@ net7.0 enable enable - Common.Types + Connected.Common.Types - + diff --git a/Common.Types.Client/TaxRates/TaxRate.cs b/Connected.Common.Types.Client/TaxRates/TaxRate.cs similarity index 87% rename from Common.Types.Client/TaxRates/TaxRate.cs rename to Connected.Common.Types.Client/TaxRates/TaxRate.cs index e1c8743..d266096 100644 --- a/Common.Types.Client/TaxRates/TaxRate.cs +++ b/Connected.Common.Types.Client/TaxRates/TaxRate.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Common.Types.TaxRates; +namespace Connected.Common.Types.TaxRates; /// /// This is the client implementation if the . diff --git a/Common.Types.Client/TaxRates/TaxRateService.cs b/Connected.Common.Types.Client/TaxRates/TaxRateService.cs similarity index 97% rename from Common.Types.Client/TaxRates/TaxRateService.cs rename to Connected.Common.Types.Client/TaxRates/TaxRateService.cs index 194968d..638815c 100644 --- a/Common.Types.Client/TaxRates/TaxRateService.cs +++ b/Connected.Common.Types.Client/TaxRates/TaxRateService.cs @@ -4,7 +4,7 @@ using Connected.Remote; using Connected.ServiceModel; using Connected.Services; -namespace Common.Types.TaxRates; +namespace Connected.Common.Types.TaxRates; /// /// This is the client implementation of the . diff --git a/Connected.Common.Types.Middleware/Connected.Common.Types.Middleware.csproj b/Connected.Common.Types.Middleware/Connected.Common.Types.Middleware.csproj new file mode 100644 index 0000000..a19448b --- /dev/null +++ b/Connected.Common.Types.Middleware/Connected.Common.Types.Middleware.csproj @@ -0,0 +1,15 @@ + + + + net7.0 + enable + enable + Connected.Common.Types + + + + + + + + diff --git a/Common.Types.Middleware/Currencies/ICurrencyFormatterMiddleware.cs b/Connected.Common.Types.Middleware/Currencies/ICurrencyFormatterMiddleware.cs similarity index 59% rename from Common.Types.Middleware/Currencies/ICurrencyFormatterMiddleware.cs rename to Connected.Common.Types.Middleware/Currencies/ICurrencyFormatterMiddleware.cs index 3585e6a..248d54b 100644 --- a/Common.Types.Middleware/Currencies/ICurrencyFormatterMiddleware.cs +++ b/Connected.Common.Types.Middleware/Currencies/ICurrencyFormatterMiddleware.cs @@ -1,7 +1,6 @@ -using Common.Types.Currencies; -using Connected; +using Connected.Common.Types.Currencies; -namespace Common.Types.Middleware.Currencies; +namespace Connected.Common.Types.Middleware.Currencies; public interface ICurrencyFormatterMiddleware : IMiddleware { diff --git a/Common.Types.Model/BankAccounts/BankAccountArgs.cs b/Connected.Common.Types.Model/BankAccounts/BankAccountArgs.cs similarity index 80% rename from Common.Types.Model/BankAccounts/BankAccountArgs.cs rename to Connected.Common.Types.Model/BankAccounts/BankAccountArgs.cs index 088f938..ed448e4 100644 --- a/Common.Types.Model/BankAccounts/BankAccountArgs.cs +++ b/Connected.Common.Types.Model/BankAccounts/BankAccountArgs.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.ComponentModel.DataAnnotations; +using Connected.Annotations; using Connected.Data; using Connected.ServiceModel; -using System.ComponentModel.DataAnnotations; -namespace Common.Types.BankAccounts; +namespace Connected.Common.Types.BankAccounts; public class BankAccountInsertArgs : Dto { diff --git a/Common.Types.Model/BankAccounts/IBankAccount.cs b/Connected.Common.Types.Model/BankAccounts/IBankAccount.cs similarity index 82% rename from Common.Types.Model/BankAccounts/IBankAccount.cs rename to Connected.Common.Types.Model/BankAccounts/IBankAccount.cs index 4e3029d..eeaf53f 100644 --- a/Common.Types.Model/BankAccounts/IBankAccount.cs +++ b/Connected.Common.Types.Model/BankAccounts/IBankAccount.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Common.Types.BankAccounts; +namespace Connected.Common.Types.BankAccounts; public interface IBankAccount : IPrimaryKey { diff --git a/Common.Types.Model/BankAccounts/IBankAccountService.cs b/Connected.Common.Types.Model/BankAccounts/IBankAccountService.cs similarity index 89% rename from Common.Types.Model/BankAccounts/IBankAccountService.cs rename to Connected.Common.Types.Model/BankAccounts/IBankAccountService.cs index 287e529..9af961b 100644 --- a/Common.Types.Model/BankAccounts/IBankAccountService.cs +++ b/Connected.Common.Types.Model/BankAccounts/IBankAccountService.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.Collections.Immutable; +using Connected.Annotations; using Connected.Notifications; using Connected.ServiceModel; -using System.Collections.Immutable; -namespace Common.Types.BankAccounts; +namespace Connected.Common.Types.BankAccounts; [Service] [ServiceUrl(Routes.BankAccounts)] diff --git a/Common.Types.Model/Banks/BankArgs.cs b/Connected.Common.Types.Model/Banks/BankArgs.cs similarity index 78% rename from Common.Types.Model/Banks/BankArgs.cs rename to Connected.Common.Types.Model/Banks/BankArgs.cs index 0e178b8..747c311 100644 --- a/Common.Types.Model/Banks/BankArgs.cs +++ b/Connected.Common.Types.Model/Banks/BankArgs.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.ComponentModel.DataAnnotations; +using Connected.Annotations; using Connected.Data; using Connected.ServiceModel; -using System.ComponentModel.DataAnnotations; -namespace Common.Types.Banks; +namespace Connected.Common.Types.Banks; public class InsertBankArgs : Dto { diff --git a/Common.Types.Model/Banks/IBank.cs b/Connected.Common.Types.Model/Banks/IBank.cs similarity index 82% rename from Common.Types.Model/Banks/IBank.cs rename to Connected.Common.Types.Model/Banks/IBank.cs index 02e4484..418e2b2 100644 --- a/Common.Types.Model/Banks/IBank.cs +++ b/Connected.Common.Types.Model/Banks/IBank.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Common.Types.Banks; +namespace Connected.Common.Types.Banks; public interface IBank : IPrimaryKey { diff --git a/Common.Types.Model/Banks/IBankService.cs b/Connected.Common.Types.Model/Banks/IBankService.cs similarity index 88% rename from Common.Types.Model/Banks/IBankService.cs rename to Connected.Common.Types.Model/Banks/IBankService.cs index b9ee88c..2071f49 100644 --- a/Common.Types.Model/Banks/IBankService.cs +++ b/Connected.Common.Types.Model/Banks/IBankService.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.Collections.Immutable; +using Connected.Annotations; using Connected.Notifications; using Connected.ServiceModel; -using System.Collections.Immutable; -namespace Common.Types.Banks; +namespace Connected.Common.Types.Banks; [Service] [ServiceUrl(Routes.Banks)] diff --git a/Common.Types.Model/Common - Backup.Types.Model.csproj b/Connected.Common.Types.Model/Connected.Common.Types.Model.csproj similarity index 65% rename from Common.Types.Model/Common - Backup.Types.Model.csproj rename to Connected.Common.Types.Model/Connected.Common.Types.Model.csproj index bb4fcea..3ed87a3 100644 --- a/Common.Types.Model/Common - Backup.Types.Model.csproj +++ b/Connected.Common.Types.Model/Connected.Common.Types.Model.csproj @@ -4,11 +4,11 @@ net7.0 enable enable - $(MSBuildProjectName.Replace(" ", "_")) + Connected.Common.Types - + diff --git a/Common.Types.Model/Continent/ContinentArgs.cs b/Connected.Common.Types.Model/Continent/ContinentArgs.cs similarity index 67% rename from Common.Types.Model/Continent/ContinentArgs.cs rename to Connected.Common.Types.Model/Continent/ContinentArgs.cs index ed6a324..7e362f5 100644 --- a/Common.Types.Model/Continent/ContinentArgs.cs +++ b/Connected.Common.Types.Model/Continent/ContinentArgs.cs @@ -1,8 +1,8 @@ -using Connected.Annotations; +using System.ComponentModel.DataAnnotations; +using Connected.Annotations; using Connected.ServiceModel; -using System.ComponentModel.DataAnnotations; -namespace Common.Types.Continent; +namespace Connected.Common.Types.Continent; public class InsertContinentArgs : Dto { diff --git a/Common.Types.Model/Continent/Countries/ContinentCountryArgs.cs b/Connected.Common.Types.Model/Continent/Countries/ContinentCountryArgs.cs similarity index 79% rename from Common.Types.Model/Continent/Countries/ContinentCountryArgs.cs rename to Connected.Common.Types.Model/Continent/Countries/ContinentCountryArgs.cs index f8174c0..670408e 100644 --- a/Common.Types.Model/Continent/Countries/ContinentCountryArgs.cs +++ b/Connected.Common.Types.Model/Continent/Countries/ContinentCountryArgs.cs @@ -1,7 +1,7 @@ using Connected.Annotations; using Connected.ServiceModel; -namespace Common.Types.Continent.Countries; +namespace Connected.Common.Types.Continent.Countries; public class InsertContinentCountryArgs : Dto { diff --git a/Common.Types.Model/Continent/Countries/IContinentCountry.cs b/Connected.Common.Types.Model/Continent/Countries/IContinentCountry.cs similarity index 72% rename from Common.Types.Model/Continent/Countries/IContinentCountry.cs rename to Connected.Common.Types.Model/Continent/Countries/IContinentCountry.cs index a1eb464..399d319 100644 --- a/Common.Types.Model/Continent/Countries/IContinentCountry.cs +++ b/Connected.Common.Types.Model/Continent/Countries/IContinentCountry.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Common.Types.Continent.Countries; +namespace Connected.Common.Types.Continent.Countries; public interface IContinentCountry : IPrimaryKey { diff --git a/Common.Types.Model/Continent/Countries/IContinentCountryService.cs b/Connected.Common.Types.Model/Continent/Countries/IContinentCountryService.cs similarity index 91% rename from Common.Types.Model/Continent/Countries/IContinentCountryService.cs rename to Connected.Common.Types.Model/Continent/Countries/IContinentCountryService.cs index 6de38bf..e3df41d 100644 --- a/Common.Types.Model/Continent/Countries/IContinentCountryService.cs +++ b/Connected.Common.Types.Model/Continent/Countries/IContinentCountryService.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.Collections.Immutable; +using Connected.Annotations; using Connected.Notifications; using Connected.ServiceModel; -using System.Collections.Immutable; -namespace Common.Types.Continent.Countries; +namespace Connected.Common.Types.Continent.Countries; [Service] [ServiceUrl(Routes.ContinentCountries)] diff --git a/Common.Types.Model/Continent/IContinent.cs b/Connected.Common.Types.Model/Continent/IContinent.cs similarity index 70% rename from Common.Types.Model/Continent/IContinent.cs rename to Connected.Common.Types.Model/Continent/IContinent.cs index b6c389c..88656c1 100644 --- a/Common.Types.Model/Continent/IContinent.cs +++ b/Connected.Common.Types.Model/Continent/IContinent.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Common.Types.Continent; +namespace Connected.Common.Types.Continent; public interface IContinent : IPrimaryKey { diff --git a/Common.Types.Model/Continent/IContinentService.cs b/Connected.Common.Types.Model/Continent/IContinentService.cs similarity index 88% rename from Common.Types.Model/Continent/IContinentService.cs rename to Connected.Common.Types.Model/Continent/IContinentService.cs index e0de3f2..7aa3f2e 100644 --- a/Common.Types.Model/Continent/IContinentService.cs +++ b/Connected.Common.Types.Model/Continent/IContinentService.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.Collections.Immutable; +using Connected.Annotations; using Connected.Notifications; using Connected.ServiceModel; -using System.Collections.Immutable; -namespace Common.Types.Continent; +namespace Connected.Common.Types.Continent; [Service] [ServiceUrl(Routes.Continents)] diff --git a/Common.Types.Model/Countries/CountryArgs.cs b/Connected.Common.Types.Model/Countries/CountryArgs.cs similarity index 77% rename from Common.Types.Model/Countries/CountryArgs.cs rename to Connected.Common.Types.Model/Countries/CountryArgs.cs index 51c1a61..145f5a4 100644 --- a/Common.Types.Model/Countries/CountryArgs.cs +++ b/Connected.Common.Types.Model/Countries/CountryArgs.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.ComponentModel.DataAnnotations; +using Connected.Annotations; using Connected.Data; using Connected.ServiceModel; -using System.ComponentModel.DataAnnotations; -namespace Common.Types.Countries; +namespace Connected.Common.Types.Countries; public class InsertCountryArgs : Dto { diff --git a/Common.Types.Model/Countries/ICountry.cs b/Connected.Common.Types.Model/Countries/ICountry.cs similarity index 81% rename from Common.Types.Model/Countries/ICountry.cs rename to Connected.Common.Types.Model/Countries/ICountry.cs index 60b906a..052c311 100644 --- a/Common.Types.Model/Countries/ICountry.cs +++ b/Connected.Common.Types.Model/Countries/ICountry.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Common.Types.Countries; +namespace Connected.Common.Types.Countries; public interface ICountry : IPrimaryKey { diff --git a/Common.Types.Model/Countries/ICountryService.cs b/Connected.Common.Types.Model/Countries/ICountryService.cs similarity index 89% rename from Common.Types.Model/Countries/ICountryService.cs rename to Connected.Common.Types.Model/Countries/ICountryService.cs index 2215333..91fade2 100644 --- a/Common.Types.Model/Countries/ICountryService.cs +++ b/Connected.Common.Types.Model/Countries/ICountryService.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.Collections.Immutable; +using Connected.Annotations; using Connected.Notifications; using Connected.ServiceModel; -using System.Collections.Immutable; -namespace Common.Types.Countries; +namespace Connected.Common.Types.Countries; [Service] [ServiceUrl(Routes.Countries)] diff --git a/Common.Types.Model/Currencies/CurrencyArgs.cs b/Connected.Common.Types.Model/Currencies/CurrencyArgs.cs similarity index 84% rename from Common.Types.Model/Currencies/CurrencyArgs.cs rename to Connected.Common.Types.Model/Currencies/CurrencyArgs.cs index e05aeae..8db4442 100644 --- a/Common.Types.Model/Currencies/CurrencyArgs.cs +++ b/Connected.Common.Types.Model/Currencies/CurrencyArgs.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.ComponentModel.DataAnnotations; +using Connected.Annotations; using Connected.Data; using Connected.ServiceModel; -using System.ComponentModel.DataAnnotations; -namespace Common.Types.Currencies; +namespace Connected.Common.Types.Currencies; public class CurrencyInsertArgs : Dto { diff --git a/Common.Types.Model/Currencies/ICurrency.cs b/Connected.Common.Types.Model/Currencies/ICurrency.cs similarity index 82% rename from Common.Types.Model/Currencies/ICurrency.cs rename to Connected.Common.Types.Model/Currencies/ICurrency.cs index 972eeae..aa2e3eb 100644 --- a/Common.Types.Model/Currencies/ICurrency.cs +++ b/Connected.Common.Types.Model/Currencies/ICurrency.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Common.Types.Currencies; +namespace Connected.Common.Types.Currencies; public interface ICurrency : IPrimaryKey { diff --git a/Common.Types.Model/Currencies/ICurrencyService.cs b/Connected.Common.Types.Model/Currencies/ICurrencyService.cs similarity index 89% rename from Common.Types.Model/Currencies/ICurrencyService.cs rename to Connected.Common.Types.Model/Currencies/ICurrencyService.cs index e6081e8..0f9ae26 100644 --- a/Common.Types.Model/Currencies/ICurrencyService.cs +++ b/Connected.Common.Types.Model/Currencies/ICurrencyService.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.Collections.Immutable; +using Connected.Annotations; using Connected.Notifications; using Connected.ServiceModel; -using System.Collections.Immutable; -namespace Common.Types.Currencies; +namespace Connected.Common.Types.Currencies; [Service] [ServiceUrl(Routes.Currencies)] diff --git a/Common.Types.Model/MeasureUnits/IMeasureUnit.cs b/Connected.Common.Types.Model/MeasureUnits/IMeasureUnit.cs similarity index 80% rename from Common.Types.Model/MeasureUnits/IMeasureUnit.cs rename to Connected.Common.Types.Model/MeasureUnits/IMeasureUnit.cs index 7cdfb22..a9b7845 100644 --- a/Common.Types.Model/MeasureUnits/IMeasureUnit.cs +++ b/Connected.Common.Types.Model/MeasureUnits/IMeasureUnit.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Common.Types.MeasureUnits; +namespace Connected.Common.Types.MeasureUnits; public interface IMeasureUnit : IPrimaryKey { diff --git a/Common.Types.Model/MeasureUnits/IMeasureUnitService.cs b/Connected.Common.Types.Model/MeasureUnits/IMeasureUnitService.cs similarity index 88% rename from Common.Types.Model/MeasureUnits/IMeasureUnitService.cs rename to Connected.Common.Types.Model/MeasureUnits/IMeasureUnitService.cs index 8bf2880..3c72535 100644 --- a/Common.Types.Model/MeasureUnits/IMeasureUnitService.cs +++ b/Connected.Common.Types.Model/MeasureUnits/IMeasureUnitService.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.Collections.Immutable; +using Connected.Annotations; using Connected.Notifications; using Connected.ServiceModel; -using System.Collections.Immutable; -namespace Common.Types.MeasureUnits; +namespace Connected.Common.Types.MeasureUnits; [Service] [ServiceUrl(Routes.MeasureUnits)] diff --git a/Common.Types.Model/MeasureUnits/MeasureUnitArgs.cs b/Connected.Common.Types.Model/MeasureUnits/MeasureUnitArgs.cs similarity index 79% rename from Common.Types.Model/MeasureUnits/MeasureUnitArgs.cs rename to Connected.Common.Types.Model/MeasureUnits/MeasureUnitArgs.cs index f54131e..70d571e 100644 --- a/Common.Types.Model/MeasureUnits/MeasureUnitArgs.cs +++ b/Connected.Common.Types.Model/MeasureUnits/MeasureUnitArgs.cs @@ -1,8 +1,8 @@ -using Connected.Data; +using System.ComponentModel.DataAnnotations; +using Connected.Data; using Connected.ServiceModel; -using System.ComponentModel.DataAnnotations; -namespace Common.Types.MeasureUnits; +namespace Connected.Common.Types.MeasureUnits; public class MeasureUnitInsertArgs : Dto { diff --git a/Common.Types.Model/MicroService.cs b/Connected.Common.Types.Model/MicroService.cs similarity index 100% rename from Common.Types.Model/MicroService.cs rename to Connected.Common.Types.Model/MicroService.cs diff --git a/Common.Types.Model/PostalCodes/IPostalCode.cs b/Connected.Common.Types.Model/PostalCodes/IPostalCode.cs similarity index 80% rename from Common.Types.Model/PostalCodes/IPostalCode.cs rename to Connected.Common.Types.Model/PostalCodes/IPostalCode.cs index a77b892..11fb498 100644 --- a/Common.Types.Model/PostalCodes/IPostalCode.cs +++ b/Connected.Common.Types.Model/PostalCodes/IPostalCode.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Common.Types.PostalCodes; +namespace Connected.Common.Types.PostalCodes; public interface IPostalCode : IPrimaryKey { diff --git a/Common.Types.Model/PostalCodes/IPostalCodeService.cs b/Connected.Common.Types.Model/PostalCodes/IPostalCodeService.cs similarity index 91% rename from Common.Types.Model/PostalCodes/IPostalCodeService.cs rename to Connected.Common.Types.Model/PostalCodes/IPostalCodeService.cs index c768539..ae6d7d4 100644 --- a/Common.Types.Model/PostalCodes/IPostalCodeService.cs +++ b/Connected.Common.Types.Model/PostalCodes/IPostalCodeService.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.Collections.Immutable; +using Connected.Annotations; using Connected.Notifications; using Connected.ServiceModel; -using System.Collections.Immutable; -namespace Common.Types.PostalCodes; +namespace Connected.Common.Types.PostalCodes; [Service] [ServiceUrl(Routes.PostalCodes)] diff --git a/Common.Types.Model/PostalCodes/PostalCodeArgs.cs b/Connected.Common.Types.Model/PostalCodes/PostalCodeArgs.cs similarity index 84% rename from Common.Types.Model/PostalCodes/PostalCodeArgs.cs rename to Connected.Common.Types.Model/PostalCodes/PostalCodeArgs.cs index f12d5f1..842096e 100644 --- a/Common.Types.Model/PostalCodes/PostalCodeArgs.cs +++ b/Connected.Common.Types.Model/PostalCodes/PostalCodeArgs.cs @@ -1,9 +1,9 @@ -using Connected.Annotations; +using System.ComponentModel.DataAnnotations; +using Connected.Annotations; using Connected.Data; using Connected.ServiceModel; -using System.ComponentModel.DataAnnotations; -namespace Common.Types.PostalCodes; +namespace Connected.Common.Types.PostalCodes; public class PostalCodeInsertArgs : Dto { diff --git a/Connected.Common.Types.Model/Routes.cs b/Connected.Common.Types.Model/Routes.cs new file mode 100644 index 0000000..52288b7 --- /dev/null +++ b/Connected.Common.Types.Model/Routes.cs @@ -0,0 +1,18 @@ +using C = Connected.Common.CommonRoutes; + +namespace Connected.Common.Types; + +public static class Routes +{ + public const string CommonTypes = "commonTypes"; + + public const string TaxRates = $"{C.Management}/{CommonTypes}/taxRates"; + public const string Countries = $"{C.Management}/{CommonTypes}/countries"; + public const string Continents = $"{C.Management}/{CommonTypes}/continents"; + public const string ContinentCountries = $"{C.Management}/{CommonTypes}/continents/countries"; + public const string Banks = $"{C.Management}/{CommonTypes}/banks"; + public const string BankAccounts = $"{C.Management}/{CommonTypes}/bankAccounts"; + public const string Currencies = $"{C.Management}/{CommonTypes}/currencies"; + public const string PostalCodes = $"{C.Management}/{CommonTypes}/postalCodes"; + public const string MeasureUnits = $"{C.Management}/{CommonTypes}/measureUnits"; +} diff --git a/Common.Types.Model/TaxRates/ITaxRate.cs b/Connected.Common.Types.Model/TaxRates/ITaxRate.cs similarity index 96% rename from Common.Types.Model/TaxRates/ITaxRate.cs rename to Connected.Common.Types.Model/TaxRates/ITaxRate.cs index c38ad31..7a28576 100644 --- a/Common.Types.Model/TaxRates/ITaxRate.cs +++ b/Connected.Common.Types.Model/TaxRates/ITaxRate.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Common.Types.TaxRates; +namespace Connected.Common.Types.TaxRates; /// /// Represents an entity which contains information about tax rate. diff --git a/Common.Types.Model/TaxRates/ITaxRateService.cs b/Connected.Common.Types.Model/TaxRates/ITaxRateService.cs similarity index 98% rename from Common.Types.Model/TaxRates/ITaxRateService.cs rename to Connected.Common.Types.Model/TaxRates/ITaxRateService.cs index 42f3903..1ab7046 100644 --- a/Common.Types.Model/TaxRates/ITaxRateService.cs +++ b/Connected.Common.Types.Model/TaxRates/ITaxRateService.cs @@ -3,7 +3,7 @@ using Connected.Annotations; using Connected.Notifications; using Connected.ServiceModel; -namespace Common.Types.TaxRates; +namespace Connected.Common.Types.TaxRates; /// /// The service used to manipulate with the entity. diff --git a/Common.Types.Model/TaxRates/TaxRateArgs.cs b/Connected.Common.Types.Model/TaxRates/TaxRateArgs.cs similarity index 89% rename from Common.Types.Model/TaxRates/TaxRateArgs.cs rename to Connected.Common.Types.Model/TaxRates/TaxRateArgs.cs index 8c18f39..69a144d 100644 --- a/Common.Types.Model/TaxRates/TaxRateArgs.cs +++ b/Connected.Common.Types.Model/TaxRates/TaxRateArgs.cs @@ -1,8 +1,8 @@ -using Connected.Annotations; +using System.ComponentModel.DataAnnotations; +using Connected.Annotations; using Connected.ServiceModel; -using System.ComponentModel.DataAnnotations; -namespace Common.Types.TaxRates; +namespace Connected.Common.Types.TaxRates; /// /// The arguments class for methods. diff --git a/Common.Types.Tests/Common.Types.Tests.csproj b/Connected.Common.Types.Tests/Connected.Common.Types.Tests.csproj similarity index 81% rename from Common.Types.Tests/Common.Types.Tests.csproj rename to Connected.Common.Types.Tests/Connected.Common.Types.Tests.csproj index 5a21ae0..2aca654 100644 --- a/Common.Types.Tests/Common.Types.Tests.csproj +++ b/Connected.Common.Types.Tests/Connected.Common.Types.Tests.csproj @@ -7,7 +7,7 @@ false - Common.Types + Connected.Common.Types @@ -19,7 +19,7 @@ - + diff --git a/Common.Types.Tests/InstanceFaker.cs b/Connected.Common.Types.Tests/InstanceFaker.cs similarity index 100% rename from Common.Types.Tests/InstanceFaker.cs rename to Connected.Common.Types.Tests/InstanceFaker.cs diff --git a/Common.Types.Tests/TaxRates/Ops/DeleteTests.cs b/Connected.Common.Types.Tests/TaxRates/Ops/DeleteTests.cs similarity index 97% rename from Common.Types.Tests/TaxRates/Ops/DeleteTests.cs rename to Connected.Common.Types.Tests/TaxRates/Ops/DeleteTests.cs index 38b4e32..1b7ec5a 100644 --- a/Common.Types.Tests/TaxRates/Ops/DeleteTests.cs +++ b/Connected.Common.Types.Tests/TaxRates/Ops/DeleteTests.cs @@ -1,11 +1,12 @@ -using Connected.Entities; +using Connected.Common.Types.TaxRates; +using Connected.Entities; using Connected.Entities.Storage; using Connected.Notifications.Events; using Connected.ServiceModel; using Connected.ServiceModel.Transactions; using Moq; -using static Common.Types.TaxRates.TaxRateOps; +using static Connected.Common.Types.TaxRates.TaxRateOps; namespace Common.Types.TaxRates.Ops; diff --git a/Common.Types.Tests/TaxRates/Ops/InsertTests.cs b/Connected.Common.Types.Tests/TaxRates/Ops/InsertTests.cs similarity index 98% rename from Common.Types.Tests/TaxRates/Ops/InsertTests.cs rename to Connected.Common.Types.Tests/TaxRates/Ops/InsertTests.cs index a1f5a2a..1b008b1 100644 --- a/Common.Types.Tests/TaxRates/Ops/InsertTests.cs +++ b/Connected.Common.Types.Tests/TaxRates/Ops/InsertTests.cs @@ -1,4 +1,6 @@ -using Connected.Data; +using System.Reflection; +using Connected.Common.Types.TaxRates; +using Connected.Data; using Connected.Entities; using Connected.Entities.Annotations; using Connected.Entities.Storage; @@ -6,8 +8,7 @@ using Connected.Notifications.Events; using Connected.ServiceModel; using Connected.ServiceModel.Transactions; using Moq; -using System.Reflection; -using static Common.Types.TaxRates.TaxRateOps; +using static Connected.Common.Types.TaxRates.TaxRateOps; namespace Common.Types.TaxRates.Ops; diff --git a/Common.Types.Tests/TaxRates/Ops/LookupTests.cs b/Connected.Common.Types.Tests/TaxRates/Ops/LookupTests.cs similarity index 97% rename from Common.Types.Tests/TaxRates/Ops/LookupTests.cs rename to Connected.Common.Types.Tests/TaxRates/Ops/LookupTests.cs index 128a41c..4c1a7e6 100644 --- a/Common.Types.Tests/TaxRates/Ops/LookupTests.cs +++ b/Connected.Common.Types.Tests/TaxRates/Ops/LookupTests.cs @@ -1,8 +1,9 @@ -using Connected.Entities; -using Connected.ServiceModel; -using System.Collections.Immutable; +using System.Collections.Immutable; using System.Data; -using Lookup = Common.Types.TaxRates.TaxRateOps.Lookup; +using Connected.Common.Types.TaxRates; +using Connected.Entities; +using Connected.ServiceModel; +using Lookup = Connected.Common.Types.TaxRates.TaxRateOps.Lookup; namespace Common.Types.TaxRates.Ops; diff --git a/Common.Types.Tests/TaxRates/Ops/QueryTests.cs b/Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs similarity index 95% rename from Common.Types.Tests/TaxRates/Ops/QueryTests.cs rename to Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs index d3b8515..b985684 100644 --- a/Common.Types.Tests/TaxRates/Ops/QueryTests.cs +++ b/Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs @@ -1,7 +1,7 @@ -using Connected.Entities; +using System.Collections.Immutable; +using Connected.Entities; using Connected.ServiceModel; -using System.Collections.Immutable; -using static Common.Types.TaxRates.TaxRateOps; +using static Connected.Common.Types.TaxRates.TaxRateOps; namespace Common.Types.TaxRates.Ops; diff --git a/Common.Types.Tests/TaxRates/Ops/SelectByRateTests.cs b/Connected.Common.Types.Tests/TaxRates/Ops/SelectByRateTests.cs similarity index 96% rename from Common.Types.Tests/TaxRates/Ops/SelectByRateTests.cs rename to Connected.Common.Types.Tests/TaxRates/Ops/SelectByRateTests.cs index 3ef79f4..6eee5a0 100644 --- a/Common.Types.Tests/TaxRates/Ops/SelectByRateTests.cs +++ b/Connected.Common.Types.Tests/TaxRates/Ops/SelectByRateTests.cs @@ -1,5 +1,6 @@ -using Connected.Entities; -using static Common.Types.TaxRates.TaxRateOps; +using Connected.Common.Types.TaxRates; +using Connected.Entities; +using static Connected.Common.Types.TaxRates.TaxRateOps; namespace Common.Types.TaxRates.Ops; diff --git a/Common.Types.Tests/TaxRates/Ops/SelectTests.cs b/Connected.Common.Types.Tests/TaxRates/Ops/SelectTests.cs similarity index 96% rename from Common.Types.Tests/TaxRates/Ops/SelectTests.cs rename to Connected.Common.Types.Tests/TaxRates/Ops/SelectTests.cs index e558e77..ce5bdcd 100644 --- a/Common.Types.Tests/TaxRates/Ops/SelectTests.cs +++ b/Connected.Common.Types.Tests/TaxRates/Ops/SelectTests.cs @@ -1,6 +1,7 @@ -using Connected.Entities; +using Connected.Common.Types.TaxRates; +using Connected.Entities; using Connected.ServiceModel; -using static Common.Types.TaxRates.TaxRateOps; +using static Connected.Common.Types.TaxRates.TaxRateOps; namespace Common.Types.TaxRates.Ops; diff --git a/Common.Types.Tests/TaxRates/Ops/TaxRateSamples.cs b/Connected.Common.Types.Tests/TaxRates/Ops/TaxRateSamples.cs similarity index 95% rename from Common.Types.Tests/TaxRates/Ops/TaxRateSamples.cs rename to Connected.Common.Types.Tests/TaxRates/Ops/TaxRateSamples.cs index d5c5fd5..8dd679c 100644 --- a/Common.Types.Tests/TaxRates/Ops/TaxRateSamples.cs +++ b/Connected.Common.Types.Tests/TaxRates/Ops/TaxRateSamples.cs @@ -1,4 +1,5 @@ -using Connected.Entities; +using Connected.Common.Types.TaxRates; +using Connected.Entities; namespace Common.Types.TaxRates.Ops; diff --git a/Common.Types.Tests/TaxRates/Ops/UpdateTests.cs b/Connected.Common.Types.Tests/TaxRates/Ops/UpdateTests.cs similarity index 98% rename from Common.Types.Tests/TaxRates/Ops/UpdateTests.cs rename to Connected.Common.Types.Tests/TaxRates/Ops/UpdateTests.cs index 74a9b87..93d55d5 100644 --- a/Common.Types.Tests/TaxRates/Ops/UpdateTests.cs +++ b/Connected.Common.Types.Tests/TaxRates/Ops/UpdateTests.cs @@ -1,12 +1,13 @@ -using Connected.Entities.Storage; +using System.Data; +using System.Linq.Expressions; +using Connected.Common.Types.TaxRates; +using Connected.Entities.Storage; using Connected.Notifications.Events; using Connected.ServiceModel; using Connected.ServiceModel.Transactions; using Moq; -using System.Data; -using System.Linq.Expressions; -using static Common.Types.TaxRates.TaxRateOps; using static Common.Types.TestUtils; +using static Connected.Common.Types.TaxRates.TaxRateOps; namespace Common.Types.TaxRates.Ops; diff --git a/Common.Types.Tests/TaxRates/TaxRateTests.cs b/Connected.Common.Types.Tests/TaxRates/TaxRateTests.cs similarity index 86% rename from Common.Types.Tests/TaxRates/TaxRateTests.cs rename to Connected.Common.Types.Tests/TaxRates/TaxRateTests.cs index d79c364..026a701 100644 --- a/Common.Types.Tests/TaxRates/TaxRateTests.cs +++ b/Connected.Common.Types.Tests/TaxRates/TaxRateTests.cs @@ -1,6 +1,7 @@ -using Connected.Entities.Annotations; +using System.Reflection; +using Connected.Common.Types.TaxRates; +using Connected.Entities.Annotations; using Connected.Entities.Consistency; -using System.Reflection; namespace Common.Types.TaxRates; diff --git a/Common.Types.Tests/TestUtils.cs b/Connected.Common.Types.Tests/TestUtils.cs similarity index 100% rename from Common.Types.Tests/TestUtils.cs rename to Connected.Common.Types.Tests/TestUtils.cs diff --git a/Common.Types.Tests/Usings.cs b/Connected.Common.Types.Tests/Usings.cs similarity index 100% rename from Common.Types.Tests/Usings.cs rename to Connected.Common.Types.Tests/Usings.cs diff --git a/Common.Types.UI/Bootstrapper.cs b/Connected.Common.Types.UI/Bootstrapper.cs similarity index 91% rename from Common.Types.UI/Bootstrapper.cs rename to Connected.Common.Types.UI/Bootstrapper.cs index d126e84..c9d9fa3 100644 --- a/Common.Types.UI/Bootstrapper.cs +++ b/Connected.Common.Types.UI/Bootstrapper.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.DependencyInjection; -namespace Common.Types; +namespace Connected.Common.Types; public class Bootstrapper : IStartup { diff --git a/Common.Types.UI/Common.Types.UI.csproj b/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj similarity index 55% rename from Common.Types.UI/Common.Types.UI.csproj rename to Connected.Common.Types.UI/Connected.Common.Types.UI.csproj index 5bd472b..9f998e0 100644 --- a/Common.Types.UI/Common.Types.UI.csproj +++ b/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj @@ -4,27 +4,31 @@ net7.0 enable enable - Common.Types + Connected.Common.Types + + + + + + + - + + - + - - - - - + diff --git a/Common.Types.UI/Routes.cs b/Connected.Common.Types.UI/Routes.cs similarity index 66% rename from Common.Types.UI/Routes.cs rename to Connected.Common.Types.UI/Routes.cs index 8257a55..aa1756f 100644 --- a/Common.Types.UI/Routes.cs +++ b/Connected.Common.Types.UI/Routes.cs @@ -1,10 +1,8 @@ -using S = Connected.UIRoutes; - -namespace Common.Types; +namespace Connected.Common.Types; public static class CommonTypesUIRoutes { - public const string CommonTypes = $"{S.Management}/commonTypes"; + public const string CommonTypes = $"/management/commonTypes"; public const string TaxRates = $"{CommonTypes}/taxRates"; public const string TaxRatesAdd = $"{CommonTypes}/taxRates/add"; diff --git a/Common.Types.UI/TaxRates/Components/TaxRateAdd.razor b/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor similarity index 93% rename from Common.Types.UI/TaxRates/Components/TaxRateAdd.razor rename to Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor index abfe1a8..5da15f3 100644 --- a/Common.Types.UI/TaxRates/Components/TaxRateAdd.razor +++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor @@ -1,6 +1,6 @@ @using Connected.Components; -@inherits UIComponent +@inherits UIComposition

TaxRateAdd

diff --git a/Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs b/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs similarity index 87% rename from Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs rename to Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs index 1d3427a..0e53647 100644 --- a/Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs +++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs @@ -1,9 +1,9 @@ using Connected.Components; using Microsoft.AspNetCore.Components; -namespace Common.Types.TaxRates.Components; +namespace Connected.Common.Types.TaxRates.Components; -public partial class TaxRateAdd : UIComponent +public partial class TaxRateAdd : UIComposition { public TaxRateAdd() { diff --git a/Common.Types.UI/TaxRates/Components/TaxRateEdit.razor b/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor similarity index 93% rename from Common.Types.UI/TaxRates/Components/TaxRateEdit.razor rename to Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor index a9438e4..95cbf27 100644 --- a/Common.Types.UI/TaxRates/Components/TaxRateEdit.razor +++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor @@ -1,6 +1,6 @@ @using Connected.Components; -@inherits UIComponent +@inherits UIComposition

TaxRateEditForm

diff --git a/Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs b/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs similarity index 88% rename from Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs rename to Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs index e6508d9..94c72fd 100644 --- a/Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs +++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs @@ -2,9 +2,9 @@ using Connected.ServiceModel; using Microsoft.AspNetCore.Components; -namespace Common.Types.TaxRates.Components; +namespace Connected.Common.Types.TaxRates.Components; -public partial class TaxRateEdit : UIComponent +public partial class TaxRateEdit : UIComposition { [Parameter] public int Id { get; set; } diff --git a/Common.Types.UI/TaxRates/Components/TaxRatesList.razor b/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor similarity index 96% rename from Common.Types.UI/TaxRates/Components/TaxRatesList.razor rename to Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor index f36e213..c0f0744 100644 --- a/Common.Types.UI/TaxRates/Components/TaxRatesList.razor +++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor @@ -1,6 +1,6 @@ @using Connected.Components; -@inherits UIComponent +@inherits UIComposition @if (DataSource is null) { diff --git a/Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs b/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs similarity index 90% rename from Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs rename to Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs index 6ac5609..341a015 100644 --- a/Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs +++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs @@ -4,9 +4,9 @@ using Connected.Notifications; using Connected.ServiceModel; using Microsoft.AspNetCore.Components; -namespace Common.Types.TaxRates.Components; +namespace Connected.Common.Types.TaxRates.Components; -public partial class TaxRatesList : UIComponent +public partial class TaxRatesList : UIComposition { private ImmutableList? DataSource { get; set; } diff --git a/Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor b/Connected.Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor similarity index 100% rename from Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor rename to Connected.Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor diff --git a/Common.Types.UI/TaxRates/Pages/TaxRateEditPage.razor b/Connected.Common.Types.UI/TaxRates/Pages/TaxRateEditPage.razor similarity index 100% rename from Common.Types.UI/TaxRates/Pages/TaxRateEditPage.razor rename to Connected.Common.Types.UI/TaxRates/Pages/TaxRateEditPage.razor diff --git a/Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor b/Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor similarity index 61% rename from Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor rename to Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor index 9edf046..1075c25 100644 --- a/Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor +++ b/Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor @@ -1,10 +1,10 @@ @attribute [Route(CommonTypesUIRoutes.TaxRates)] -@using Common.Types.TaxRates.Components; +@using Connected.Common.Types.TaxRates.Components; @using Connected.Components; -@using Connected.Layouts; +@using Connected.UI.Layouts; -@inherits UIComponent +@inherits UIComposition @layout DefaultLayout

Tax rates

diff --git a/Common.Types.UI/_Imports.razor b/Connected.Common.Types.UI/_Imports.razor similarity index 100% rename from Common.Types.UI/_Imports.razor rename to Connected.Common.Types.UI/_Imports.razor diff --git a/Common.Types.sln b/Connected.Common.Types.sln similarity index 51% rename from Common.Types.sln rename to Connected.Common.Types.sln index 0c67299..89101b1 100644 --- a/Common.Types.sln +++ b/Connected.Common.Types.sln @@ -5,35 +5,37 @@ VisualStudioVersion = 17.4.32916.344 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{20087506-E20F-4FD6-ADFB-9D7ADBBD3998}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Types.Client", "Common.Types.Client\Common.Types.Client.csproj", "{B94A8E27-3682-4321-9BF7-F0A2D775E905}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Client", "Connected.Common.Types.Client\Connected.Common.Types.Client.csproj", "{B94A8E27-3682-4321-9BF7-F0A2D775E905}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Types.Middleware", "Common.Types.Middleware\Common.Types.Middleware.csproj", "{72B591CC-DAC3-4F9A-A95C-67C265FB4E93}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Middleware", "Connected.Common.Types.Middleware\Connected.Common.Types.Middleware.csproj", "{72B591CC-DAC3-4F9A-A95C-67C265FB4E93}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Types", "Common.Types\Common.Types.csproj", "{EDDF95B7-236C-4F87-A9F0-1BC5A7FA9980}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types", "Connected.Common.Types\Connected.Common.Types.csproj", "{EDDF95B7-236C-4F87-A9F0-1BC5A7FA9980}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Types.UI", "Common.Types.UI\Common.Types.UI.csproj", "{62A9D5D4-942B-40DA-AA9C-CF3D48339B60}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.UI", "Connected.Common.Types.UI\Connected.Common.Types.UI.csproj", "{62A9D5D4-942B-40DA-AA9C-CF3D48339B60}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\Framework\Connected.Data\Connected.Data.csproj", "{29DC3FA3-643B-4E92-B176-C6594960AD4B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\Connected\Connected.csproj", "{B19801B5-7C84-4669-92AF-7581ABBDE259}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Middleware", "..\Framework\Connected.Middleware\Connected.Middleware.csproj", "{1E4DFB97-CD50-4836-8B62-46D6FBDF924C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Client", "..\Connected\Connected.Client\Connected.Client.csproj", "{EA8DA8CF-9DE4-4815-93C3-ED92A6B5E64D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\Framework\Connected.Services\Connected.Services.csproj", "{90AD4721-1C34-4B9A-9515-6AFC095F55E8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Model", "Connected.Common.Types.Model\Connected.Common.Types.Model.csproj", "{DB82BD88-23C1-4E8A-9E48-92848E1942C0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\Connected\Connected.csproj", "{B19801B5-7C84-4669-92AF-7581ABBDE259}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Tests", "Connected.Common.Types.Tests\Connected.Common.Types.Tests.csproj", "{AEF4D71A-C334-4E13-AECD-8EEA06872BB0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.UI", "..\Connected\Connected.UI\Connected.UI.csproj", "{105164C0-685F-420F-B822-D59965244E51}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Model", "..\connected.common\Connected.Common.Model\Connected.Common.Model.csproj", "{51A89A04-8FA6-498C-966D-67D09840A22F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Client", "..\Connected\Connected.Client\Connected.Client.csproj", "{EA8DA8CF-9DE4-4815-93C3-ED92A6B5E64D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\connected.framework\Connected.Data\Connected.Data.csproj", "{D803081E-5C23-437D-AB90-A40FE6572804}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\Connected.Entities\Connected.Entities.csproj", "{B026AF4F-106D-4198-A9F5-AEE456970877}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Types.Model", "Common.Types.Model\Common.Types.Model.csproj", "{DB82BD88-23C1-4E8A-9E48-92848E1942C0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Middleware", "..\connected.framework\Connected.Middleware\Connected.Middleware.csproj", "{D35000E2-AB75-42B7-B270-63804CB999A0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Model", "..\Common\Common.Model\Common.Model.csproj", "{03D41846-3257-4097-9145-21DDA9546833}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "..\connected.framework\Connected.Runtime\Connected.Runtime.csproj", "{00737C68-21CC-4FD0-9D29-965386AC16D6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "..\Framework\Connected.Runtime\Connected.Runtime.csproj", "{7E147EBC-5B8C-462F-B736-545167935CB3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\Connected.Services\Connected.Services.csproj", "{14DB124B-AE34-4D92-A734-EA18103EF96C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Types.Tests", "Common.Types.Tests\Common.Types.Tests.csproj", "{AEF4D71A-C334-4E13-AECD-8EEA06872BB0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "..\connected.components\Connected.Components\Connected.Components.csproj", "{8FB259E5-77B8-4357-831C-C381EA26E2A1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\Framework\Connected.Entities\Connected.Entities.csproj", "{E52DDB90-5F33-4189-8D72-81DE8165ADE6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.UI", "..\connected\Connected.UI\Connected.UI.csproj", "{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -57,26 +59,10 @@ Global {62A9D5D4-942B-40DA-AA9C-CF3D48339B60}.Debug|Any CPU.Build.0 = Debug|Any CPU {62A9D5D4-942B-40DA-AA9C-CF3D48339B60}.Release|Any CPU.ActiveCfg = Release|Any CPU {62A9D5D4-942B-40DA-AA9C-CF3D48339B60}.Release|Any CPU.Build.0 = Release|Any CPU - {29DC3FA3-643B-4E92-B176-C6594960AD4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29DC3FA3-643B-4E92-B176-C6594960AD4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29DC3FA3-643B-4E92-B176-C6594960AD4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29DC3FA3-643B-4E92-B176-C6594960AD4B}.Release|Any CPU.Build.0 = Release|Any CPU - {1E4DFB97-CD50-4836-8B62-46D6FBDF924C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E4DFB97-CD50-4836-8B62-46D6FBDF924C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E4DFB97-CD50-4836-8B62-46D6FBDF924C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E4DFB97-CD50-4836-8B62-46D6FBDF924C}.Release|Any CPU.Build.0 = Release|Any CPU - {90AD4721-1C34-4B9A-9515-6AFC095F55E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90AD4721-1C34-4B9A-9515-6AFC095F55E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90AD4721-1C34-4B9A-9515-6AFC095F55E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90AD4721-1C34-4B9A-9515-6AFC095F55E8}.Release|Any CPU.Build.0 = Release|Any CPU {B19801B5-7C84-4669-92AF-7581ABBDE259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B19801B5-7C84-4669-92AF-7581ABBDE259}.Debug|Any CPU.Build.0 = Debug|Any CPU {B19801B5-7C84-4669-92AF-7581ABBDE259}.Release|Any CPU.ActiveCfg = Release|Any CPU {B19801B5-7C84-4669-92AF-7581ABBDE259}.Release|Any CPU.Build.0 = Release|Any CPU - {105164C0-685F-420F-B822-D59965244E51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {105164C0-685F-420F-B822-D59965244E51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {105164C0-685F-420F-B822-D59965244E51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {105164C0-685F-420F-B822-D59965244E51}.Release|Any CPU.Build.0 = Release|Any CPU {EA8DA8CF-9DE4-4815-93C3-ED92A6B5E64D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EA8DA8CF-9DE4-4815-93C3-ED92A6B5E64D}.Debug|Any CPU.Build.0 = Debug|Any CPU {EA8DA8CF-9DE4-4815-93C3-ED92A6B5E64D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -85,36 +71,57 @@ Global {DB82BD88-23C1-4E8A-9E48-92848E1942C0}.Debug|Any CPU.Build.0 = Debug|Any CPU {DB82BD88-23C1-4E8A-9E48-92848E1942C0}.Release|Any CPU.ActiveCfg = Release|Any CPU {DB82BD88-23C1-4E8A-9E48-92848E1942C0}.Release|Any CPU.Build.0 = Release|Any CPU - {03D41846-3257-4097-9145-21DDA9546833}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03D41846-3257-4097-9145-21DDA9546833}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03D41846-3257-4097-9145-21DDA9546833}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03D41846-3257-4097-9145-21DDA9546833}.Release|Any CPU.Build.0 = Release|Any CPU - {7E147EBC-5B8C-462F-B736-545167935CB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E147EBC-5B8C-462F-B736-545167935CB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E147EBC-5B8C-462F-B736-545167935CB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E147EBC-5B8C-462F-B736-545167935CB3}.Release|Any CPU.Build.0 = Release|Any CPU {AEF4D71A-C334-4E13-AECD-8EEA06872BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AEF4D71A-C334-4E13-AECD-8EEA06872BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU {AEF4D71A-C334-4E13-AECD-8EEA06872BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU {AEF4D71A-C334-4E13-AECD-8EEA06872BB0}.Release|Any CPU.Build.0 = Release|Any CPU - {E52DDB90-5F33-4189-8D72-81DE8165ADE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E52DDB90-5F33-4189-8D72-81DE8165ADE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E52DDB90-5F33-4189-8D72-81DE8165ADE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E52DDB90-5F33-4189-8D72-81DE8165ADE6}.Release|Any CPU.Build.0 = Release|Any CPU + {51A89A04-8FA6-498C-966D-67D09840A22F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {51A89A04-8FA6-498C-966D-67D09840A22F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {51A89A04-8FA6-498C-966D-67D09840A22F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {51A89A04-8FA6-498C-966D-67D09840A22F}.Release|Any CPU.Build.0 = Release|Any CPU + {D803081E-5C23-437D-AB90-A40FE6572804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D803081E-5C23-437D-AB90-A40FE6572804}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D803081E-5C23-437D-AB90-A40FE6572804}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D803081E-5C23-437D-AB90-A40FE6572804}.Release|Any CPU.Build.0 = Release|Any CPU + {B026AF4F-106D-4198-A9F5-AEE456970877}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B026AF4F-106D-4198-A9F5-AEE456970877}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B026AF4F-106D-4198-A9F5-AEE456970877}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B026AF4F-106D-4198-A9F5-AEE456970877}.Release|Any CPU.Build.0 = Release|Any CPU + {D35000E2-AB75-42B7-B270-63804CB999A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D35000E2-AB75-42B7-B270-63804CB999A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D35000E2-AB75-42B7-B270-63804CB999A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D35000E2-AB75-42B7-B270-63804CB999A0}.Release|Any CPU.Build.0 = Release|Any CPU + {00737C68-21CC-4FD0-9D29-965386AC16D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {00737C68-21CC-4FD0-9D29-965386AC16D6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {00737C68-21CC-4FD0-9D29-965386AC16D6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {00737C68-21CC-4FD0-9D29-965386AC16D6}.Release|Any CPU.Build.0 = Release|Any CPU + {14DB124B-AE34-4D92-A734-EA18103EF96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14DB124B-AE34-4D92-A734-EA18103EF96C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14DB124B-AE34-4D92-A734-EA18103EF96C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14DB124B-AE34-4D92-A734-EA18103EF96C}.Release|Any CPU.Build.0 = Release|Any CPU + {8FB259E5-77B8-4357-831C-C381EA26E2A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8FB259E5-77B8-4357-831C-C381EA26E2A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8FB259E5-77B8-4357-831C-C381EA26E2A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8FB259E5-77B8-4357-831C-C381EA26E2A1}.Release|Any CPU.Build.0 = Release|Any CPU + {3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {29DC3FA3-643B-4E92-B176-C6594960AD4B} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} - {1E4DFB97-CD50-4836-8B62-46D6FBDF924C} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} - {90AD4721-1C34-4B9A-9515-6AFC095F55E8} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} {B19801B5-7C84-4669-92AF-7581ABBDE259} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} - {105164C0-685F-420F-B822-D59965244E51} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} {EA8DA8CF-9DE4-4815-93C3-ED92A6B5E64D} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} - {03D41846-3257-4097-9145-21DDA9546833} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} - {7E147EBC-5B8C-462F-B736-545167935CB3} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} - {E52DDB90-5F33-4189-8D72-81DE8165ADE6} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} + {51A89A04-8FA6-498C-966D-67D09840A22F} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} + {D803081E-5C23-437D-AB90-A40FE6572804} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} + {B026AF4F-106D-4198-A9F5-AEE456970877} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} + {D35000E2-AB75-42B7-B270-63804CB999A0} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} + {00737C68-21CC-4FD0-9D29-965386AC16D6} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} + {14DB124B-AE34-4D92-A734-EA18103EF96C} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} + {8FB259E5-77B8-4357-831C-C381EA26E2A1} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} + {3A5FB71E-F6F7-46F0-9173-24745E0EDA25} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4C661325-1729-4560-89F9-E2B51B111B72} diff --git a/Connected.Common.Types/Connected.Common.Types.csproj b/Connected.Common.Types/Connected.Common.Types.csproj new file mode 100644 index 0000000..ccc0206 --- /dev/null +++ b/Connected.Common.Types/Connected.Common.Types.csproj @@ -0,0 +1,18 @@ + + + + net7.0 + enable + enable + $(MSBuildProjectName.Replace(" ", "_")) + + + + + + + + + + + diff --git a/Common.Types/Continents/Countries/ContinentCountry.cs b/Connected.Common.Types/Continents/Countries/ContinentCountry.cs similarity index 67% rename from Common.Types/Continents/Countries/ContinentCountry.cs rename to Connected.Common.Types/Continents/Countries/ContinentCountry.cs index ba68d74..032d8c6 100644 --- a/Common.Types/Continents/Countries/ContinentCountry.cs +++ b/Connected.Common.Types/Continents/Countries/ContinentCountry.cs @@ -1,9 +1,9 @@ -using Common.Types.Continent.Countries; -using Connected.Annotations; +using Connected.Annotations; +using Connected.Common.Types.Continent.Countries; using Connected.Entities; using Connected.Entities.Annotations; -namespace Common.Types.Continents.Countries; +namespace Connected.Common.Types.Continents.Countries; [Table(Schema = SchemaAttribute.TypesSchema)] internal record ContinentCountry : Entity, IContinentCountry diff --git a/Common.Types/Continents/Countries/ContinentCountryCache.cs b/Connected.Common.Types/Continents/Countries/ContinentCountryCache.cs similarity index 85% rename from Common.Types/Continents/Countries/ContinentCountryCache.cs rename to Connected.Common.Types/Continents/Countries/ContinentCountryCache.cs index 7519030..d7a05b4 100644 --- a/Common.Types/Continents/Countries/ContinentCountryCache.cs +++ b/Connected.Common.Types/Continents/Countries/ContinentCountryCache.cs @@ -1,6 +1,6 @@ using Connected.Entities.Caching; -namespace Common.Types.Continents.Countries; +namespace Connected.Common.Types.Continents.Countries; internal interface IContinentCountryCache : IEntityCacheClient { } internal class ContinentCountryCache : EntityCacheClient, IContinentCountryCache diff --git a/Common.Types/Continents/Countries/ContinentCountryService.cs b/Connected.Common.Types/Continents/Countries/ContinentCountryService.cs similarity index 84% rename from Common.Types/Continents/Countries/ContinentCountryService.cs rename to Connected.Common.Types/Continents/Countries/ContinentCountryService.cs index eb8002f..94c2879 100644 --- a/Common.Types/Continents/Countries/ContinentCountryService.cs +++ b/Connected.Common.Types/Continents/Countries/ContinentCountryService.cs @@ -1,9 +1,9 @@ -using Common.Types.Continent.Countries; +using System.Collections.Immutable; +using Connected.Common.Types.Continent.Countries; using Connected.ServiceModel; using Connected.Services; -using System.Collections.Immutable; -namespace Common.Types.Continents.Countries; +namespace Connected.Common.Types.Continents.Countries; internal class ContinentCountryService : EntityService, IContinentCountryService { diff --git a/Common.Types/Continents/Countries/ContinentProtector.cs b/Connected.Common.Types/Continents/Countries/ContinentProtector.cs similarity index 82% rename from Common.Types/Continents/Countries/ContinentProtector.cs rename to Connected.Common.Types/Continents/Countries/ContinentProtector.cs index 5aa9e7b..ebd3227 100644 --- a/Common.Types/Continents/Countries/ContinentProtector.cs +++ b/Connected.Common.Types/Continents/Countries/ContinentProtector.cs @@ -1,12 +1,12 @@ -using Common.Types.Continent; -using Common.Types.Countries; +using Connected.Common.Types.Continent; +using Connected.Common.Types.Countries; using Connected.Data.DataProtection; using Connected.Data.EntityProtection; using Connected.Entities; using Connected.Middleware; using Connected.Validation; -namespace Common.Types.Continents.Countries; +namespace Connected.Common.Types.Continents.Countries; internal class ContinentProtector : MiddlewareComponent, IEntityProtector { diff --git a/Common.Types/Countries/Country.cs b/Connected.Common.Types/Countries/Country.cs similarity index 91% rename from Common.Types/Countries/Country.cs rename to Connected.Common.Types/Countries/Country.cs index 60f9c55..390f1a3 100644 --- a/Common.Types/Countries/Country.cs +++ b/Connected.Common.Types/Countries/Country.cs @@ -2,7 +2,7 @@ using Connected.Entities.Annotations; using Connected.Entities.Consistency; -namespace Common.Types.Countries; +namespace Connected.Common.Types.Countries; [Table(Schema = SchemaAttribute.TypesSchema)] internal record Country : ConsistentEntity, ICountry diff --git a/Common.Types/Countries/CountryCache.cs b/Connected.Common.Types/Countries/CountryCache.cs similarity index 89% rename from Common.Types/Countries/CountryCache.cs rename to Connected.Common.Types/Countries/CountryCache.cs index e9897b2..90a41c0 100644 --- a/Common.Types/Countries/CountryCache.cs +++ b/Connected.Common.Types/Countries/CountryCache.cs @@ -1,6 +1,6 @@ using Connected.Entities.Caching; -namespace Common.Types.Countries; +namespace Connected.Common.Types.Countries; internal interface ICountryCache : IEntityCacheClient { } /// diff --git a/Common.Types/Countries/CountryOps.cs b/Connected.Common.Types/Countries/CountryOps.cs similarity index 98% rename from Common.Types/Countries/CountryOps.cs rename to Connected.Common.Types/Countries/CountryOps.cs index ed83991..5ffb2ea 100644 --- a/Common.Types/Countries/CountryOps.cs +++ b/Connected.Common.Types/Countries/CountryOps.cs @@ -1,12 +1,11 @@ using System.Collections.Immutable; -using Connected; using Connected.Entities; using Connected.Entities.Storage; using Connected.Notifications.Events; using Connected.ServiceModel; using Connected.Services; -namespace Common.Types.Countries; +namespace Connected.Common.Types.Countries; internal sealed class QueryCountries : ServiceFunction?> { diff --git a/Common.Types/Countries/CountryService.cs b/Connected.Common.Types/Countries/CountryService.cs similarity index 91% rename from Common.Types/Countries/CountryService.cs rename to Connected.Common.Types/Countries/CountryService.cs index a6ac653..bf6b354 100644 --- a/Common.Types/Countries/CountryService.cs +++ b/Connected.Common.Types/Countries/CountryService.cs @@ -1,10 +1,10 @@ -using Common.Types.Security; +using System.Collections.Immutable; +using Connected.Common.Types.Security; using Connected.ServiceModel; using Connected.Services; using Connected.Services.Annotations; -using System.Collections.Immutable; -namespace Common.Types.Countries; +namespace Connected.Common.Types.Countries; internal sealed class CountryService : EntityService, ICountryService { diff --git a/Common.Types/Countries/CountryValidator.cs b/Connected.Common.Types/Countries/CountryValidator.cs similarity index 97% rename from Common.Types/Countries/CountryValidator.cs rename to Connected.Common.Types/Countries/CountryValidator.cs index 8e905d6..a134edd 100644 --- a/Common.Types/Countries/CountryValidator.cs +++ b/Connected.Common.Types/Countries/CountryValidator.cs @@ -1,7 +1,7 @@ using Connected.Middleware; using Connected.Validation; -namespace Common.Types.Countries; +namespace Connected.Common.Types.Countries; internal class CountryValidator : MiddlewareComponent, IValidator { diff --git a/Common.Types/Currencies/DefaultCurrencyFormatterMiddleware.cs b/Connected.Common.Types/Currencies/DefaultCurrencyFormatterMiddleware.cs similarity index 84% rename from Common.Types/Currencies/DefaultCurrencyFormatterMiddleware.cs rename to Connected.Common.Types/Currencies/DefaultCurrencyFormatterMiddleware.cs index 012f4a0..cfe1897 100644 --- a/Common.Types/Currencies/DefaultCurrencyFormatterMiddleware.cs +++ b/Connected.Common.Types/Currencies/DefaultCurrencyFormatterMiddleware.cs @@ -1,9 +1,9 @@ -using Common.Types.Middleware.Currencies; +using System.Globalization; +using Connected.Common.Types.Middleware.Currencies; using Connected.Interop; using Connected.Middleware; -using System.Globalization; -namespace Common.Types.Currencies; +namespace Connected.Common.Types.Currencies; internal class DefaultCurrencyFormatterMiddleware : MiddlewareComponent, ICurrencyFormatterMiddleware { diff --git a/Connected.Common.Types/Security/Claims.cs b/Connected.Common.Types/Security/Claims.cs new file mode 100644 index 0000000..45cb97f --- /dev/null +++ b/Connected.Common.Types/Security/Claims.cs @@ -0,0 +1,9 @@ +namespace Connected.Common.Types.Security; + +internal static class Claims +{ + public const string Delete = "Common Delete"; + public const string Read = "Common Read"; + public const string Add = "Common Add"; + public const string Modify = "Common Modify"; +} diff --git a/Common.Types/ServerStartup.cs b/Connected.Common.Types/ServerStartup.cs similarity index 70% rename from Common.Types/ServerStartup.cs rename to Connected.Common.Types/ServerStartup.cs index 7f0683d..ab4bf36 100644 --- a/Common.Types/ServerStartup.cs +++ b/Connected.Common.Types/ServerStartup.cs @@ -1,13 +1,11 @@ using System.Runtime.CompilerServices; - -using Connected; using Connected.Annotations; [assembly: MicroService(MicroServiceType.Service)] -[assembly: InternalsVisibleTo("Common.Types.Tests")] +[assembly: InternalsVisibleTo("Connected.Common.Types.Tests")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] -namespace Common.Types; +namespace Connected.Common.Types; internal class ServerStartup : Startup { diff --git a/Common.Types/TaxRates/TaxRate.cs b/Connected.Common.Types/TaxRates/TaxRate.cs similarity index 95% rename from Common.Types/TaxRates/TaxRate.cs rename to Connected.Common.Types/TaxRates/TaxRate.cs index 94fa67b..6a072f8 100644 --- a/Common.Types/TaxRates/TaxRate.cs +++ b/Connected.Common.Types/TaxRates/TaxRate.cs @@ -2,7 +2,7 @@ using Connected.Entities.Annotations; using Connected.Entities.Concurrency; -namespace Common.Types.TaxRates; +namespace Connected.Common.Types.TaxRates; /// /// The entity. diff --git a/Common.Types/TaxRates/TaxRateCache.cs b/Connected.Common.Types/TaxRates/TaxRateCache.cs similarity index 95% rename from Common.Types/TaxRates/TaxRateCache.cs rename to Connected.Common.Types/TaxRates/TaxRateCache.cs index a36d2d9..e1706aa 100644 --- a/Common.Types/TaxRates/TaxRateCache.cs +++ b/Connected.Common.Types/TaxRates/TaxRateCache.cs @@ -1,6 +1,6 @@ using Connected.Entities.Caching; -namespace Common.Types.TaxRates; +namespace Connected.Common.Types.TaxRates; /// /// This is the contract for the typed cache. Using contracts for diff --git a/Common.Types/TaxRates/TaxRateOps.cs b/Connected.Common.Types/TaxRates/TaxRateOps.cs similarity index 99% rename from Common.Types/TaxRates/TaxRateOps.cs rename to Connected.Common.Types/TaxRates/TaxRateOps.cs index 8ed5c24..5416bc3 100644 --- a/Common.Types/TaxRates/TaxRateOps.cs +++ b/Connected.Common.Types/TaxRates/TaxRateOps.cs @@ -5,7 +5,7 @@ using Connected.Notifications.Events; using Connected.ServiceModel; using Connected.Services; -namespace Common.Types.TaxRates; +namespace Connected.Common.Types.TaxRates; internal class TaxRateOps { diff --git a/Common.Types/TaxRates/TaxRateService.cs b/Connected.Common.Types/TaxRates/TaxRateService.cs similarity index 96% rename from Common.Types/TaxRates/TaxRateService.cs rename to Connected.Common.Types/TaxRates/TaxRateService.cs index c920ed2..78b8648 100644 --- a/Common.Types/TaxRates/TaxRateService.cs +++ b/Connected.Common.Types/TaxRates/TaxRateService.cs @@ -1,10 +1,10 @@ -using Common.Types.Security; +using System.Collections.Immutable; +using Connected.Common.Types.Security; using Connected.ServiceModel; using Connected.Services; using Connected.Services.Annotations; -using System.Collections.Immutable; -namespace Common.Types.TaxRates; +namespace Connected.Common.Types.TaxRates; /// /// The implementation class for service. diff --git a/Common.Types/TaxRates/TaxRatesValidators.cs b/Connected.Common.Types/TaxRates/TaxRatesValidators.cs similarity index 97% rename from Common.Types/TaxRates/TaxRatesValidators.cs rename to Connected.Common.Types/TaxRates/TaxRatesValidators.cs index 85599bb..80fb657 100644 --- a/Common.Types/TaxRates/TaxRatesValidators.cs +++ b/Connected.Common.Types/TaxRates/TaxRatesValidators.cs @@ -2,7 +2,7 @@ using Connected.Middleware; using Connected.Validation; -namespace Common.Types.TaxRates; +namespace Connected.Common.Types.TaxRates; /// /// Business logic validator for the arguments.