diff --git a/.gitignore b/.gitignore index ea5063c..0601263 100644 --- a/.gitignore +++ b/.gitignore @@ -306,5 +306,7 @@ TesterMetadata.xml */wwwroot/* +!*/wwwroot/css/ +*/wwwroot/css/* !*/wwwroot/css/Site.css *.DS_Store diff --git a/ASP.NET Core/.editorconfig b/ASP.NET Core/.editorconfig new file mode 100644 index 0000000..57b0882 --- /dev/null +++ b/ASP.NET Core/.editorconfig @@ -0,0 +1,264 @@ +# Remove the line below if you want to inherit .editorconfig settings from higher directories +root = true + +# All files +[*] +indent_style = space +indent_size = 4 +tab_width = 4 +charset = utf-8 +insert_final_newline = true +end_of_line = lf +trim_trailing_whitespace = true +guidelines = 120 + +# C# files +[*.cs] + +#### .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 = false +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_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 +dotnet_diagnostic.S1186.severity = none +dotnet_diagnostic.S6602.severity = none +dotnet_diagnostic.S6605.severity = none +dotnet_diagnostic.S6608.severity = none +dotnet_diagnostic.S2971.severity = none +dotnet_diagnostic.S4136.severity = none +dotnet_diagnostic.S1066.severity = none +dotnet_diagnostic.S3358.severity = none +dotnet_diagnostic.S6562.severity = none +dotnet_diagnostic.S3267.severity = none +dotnet_diagnostic.S6967.severity = none +dotnet_diagnostic.S1121.severity = suggestion +dotnet_diagnostic.S1144.severity = suggestion +dotnet_diagnostic.S2325.severity = suggestion +dotnet_diagnostic.S3963.severity = suggestion +dotnet_diagnostic.CA1826.severity = none + +# New line preferences +dotnet_style_allow_multiple_blank_lines_experimental = true +dotnet_style_allow_statement_immediately_after_block_experimental = true + +#### C# Coding Conventions #### + +# var preferences +csharp_style_var_elsewhere = false +csharp_style_var_for_built_in_types = false +csharp_style_var_when_type_is_apparent = false + +# Expression-bodied members +csharp_style_expression_bodied_accessors =true:suggestion +csharp_style_expression_bodied_constructors =false:silent +csharp_style_expression_bodied_indexers =true:suggestion +csharp_style_expression_bodied_lambdas =true:warning +csharp_style_expression_bodied_local_functions =true:suggestion +csharp_style_expression_bodied_methods =false:silent +csharp_style_expression_bodied_operators =false:silent +csharp_style_expression_bodied_properties =true:suggestion + +# 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_not_pattern = true +csharp_style_prefer_pattern_matching =true:suggestion +csharp_style_prefer_switch_expression = true + +# Null-checking preferences +csharp_style_conditional_delegate_call =true:warning + +# Modifier preferences +csharp_prefer_static_local_function = true +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async + +# Code-block preferences +csharp_prefer_braces = true +csharp_prefer_simple_using_statement = true +csharp_style_namespace_declarations = file_scoped:suggestion + +# 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_pattern_local_over_anonymous_function =true:silent +csharp_style_prefer_index_operator = true +csharp_style_prefer_range_operator = 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:warning + +# New line preferences +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true +csharp_style_allow_embedded_statements_on_same_line_experimental = true + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = false +csharp_new_line_before_else = false +csharp_new_line_before_finally = false +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = none +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 = no_change +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 = false +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 = false +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case + +# IDE0290 Use primary constructor +dotnet_diagnostic.IDE0290.severity = none + +[*.{cs,vb}] +dotnet_style_prefer_conditional_expression_over_assignment=true:suggestion +dotnet_style_prefer_conditional_expression_over_return=true:suggestion +dotnet_style_readonly_field=true:warning +dotnet_style_predefined_type_for_locals_parameters_members=true:warning +dotnet_style_parentheses_in_arithmetic_binary_operators=always_for_clarity:warning +dotnet_style_parentheses_in_other_binary_operators=always_for_clarity:warning +dotnet_style_parentheses_in_relational_binary_operators=always_for_clarity:warning +dotnet_style_qualification_for_field=false:suggestion +dotnet_style_qualification_for_property=false:suggestion +dotnet_style_qualification_for_method=false:suggestion +dotnet_style_qualification_for_event=false:suggestion + +[*.{json,eslintrc,xml,config}] +indent_size = 2 +tab_width = 2 + +[*.sh] +end_of_line = lf + +[*.{bat,cmd,sln}] +end_of_line = crlf + +[*.{*proj}] +indent_size = 2 +tab_width = 2 diff --git a/ASP.NET Core/ASP.NET Core.csproj b/ASP.NET Core/ASP.NET Core.csproj new file mode 100644 index 0000000..6bf9edc --- /dev/null +++ b/ASP.NET Core/ASP.NET Core.csproj @@ -0,0 +1,49 @@ + + + + net8.0 + $(ProjectDir)node_modules\ + $(ProjectDir)wwwroot\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ASP.NET Core/ASP.NET Core.sln b/ASP.NET Core/ASP.NET Core.sln new file mode 100644 index 0000000..86f6a29 --- /dev/null +++ b/ASP.NET Core/ASP.NET Core.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30330.147 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASP.NET Core", "ASP.NET Core.csproj", "{435CB7A8-3168-4BD2-815F-E54F708AF968}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {435CB7A8-3168-4BD2-815F-E54F708AF968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {435CB7A8-3168-4BD2-815F-E54F708AF968}.Debug|Any CPU.Build.0 = Debug|Any CPU + {435CB7A8-3168-4BD2-815F-E54F708AF968}.Release|Any CPU.ActiveCfg = Release|Any CPU + {435CB7A8-3168-4BD2-815F-E54F708AF968}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {08AFB133-D1F6-4FE9-A66A-586B96B002D0} + EndGlobalSection +EndGlobal diff --git a/ASP.NET Core/Controllers/HomeController.cs b/ASP.NET Core/Controllers/HomeController.cs new file mode 100644 index 0000000..735f2c1 --- /dev/null +++ b/ASP.NET Core/Controllers/HomeController.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using ASP_NET_Core.Models; + +namespace ASP_NET_Core.Controllers; +public class HomeController: Controller { + public IActionResult Index() { + return View(FormData.FormDataSource); + } + + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] + public IActionResult Error() { + return View(); + } +} diff --git a/ASP.NET Core/Models/FormData.cs b/ASP.NET Core/Models/FormData.cs new file mode 100644 index 0000000..a1c2163 --- /dev/null +++ b/ASP.NET Core/Models/FormData.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Dynamic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ASP_NET_Core.Models; + +static class FormData { + public static object FormDataSource = new { + Name = "John Heart", + Position = "CEO", + HireDate = (DateOnly?) new DateOnly(2012, 5, 13), + OfficeNumber = 901, + Phone = "+1(213) 555-9392", + Skype = "jheart_DX_skype", + Email = "jheart@dx-email.com", + Notes = "John has been in the Audio/Video industry since 1990.", + }; +} diff --git a/ASP.NET Core/Program.cs b/ASP.NET Core/Program.cs new file mode 100644 index 0000000..1539edf --- /dev/null +++ b/ASP.NET Core/Program.cs @@ -0,0 +1,37 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; + +namespace ASP_NET_Core; +public class Program { + public static void Main(string[] args) { + var builder = WebApplication.CreateBuilder(args); + + // Add services to the container. + builder.Services + .AddControllersWithViews() + .AddJsonOptions(options => options.JsonSerializerOptions.PropertyNamingPolicy = null); + + var app = builder.Build(); + + // Configure the HTTP request pipeline. + if(app.Environment.IsDevelopment()) { + app.UseDeveloperExceptionPage(); + } else { + app.UseExceptionHandler("/Home/Error"); + } + + app.UseStaticFiles(); + + app.UseRouting(); + + app.UseAuthorization(); + + app.MapControllerRoute( + name: "default", + pattern: "{controller=Home}/{action=Index}/{id?}" + ); + + app.Run(); + } +} diff --git a/ASP.NET Core/Readme.md b/ASP.NET Core/Readme.md new file mode 100644 index 0000000..f5a9485 --- /dev/null +++ b/ASP.NET Core/Readme.md @@ -0,0 +1,30 @@ +# ASP.NET Core DevExtreme Example + +For more information about this example check the [Readme](../README.md). + +## Build and Run + +Prerequisites: .NET 8 SDK and Node.js (for npm resource bundling). + +Restore and build: +```sh +dotnet restore +dotnet build +``` + +Run (HTTP, port 5000): +```sh +dotnet run +``` + +You can also use Visual Studio: F5 / Ctrl+F5. + +## Further help + +DevExtreme ASP.NET Core Razor syntax: https://docs.devexpress.com/AspNetCore/400574/devextreme-based-controls/concepts/razor-syntax +Client-side API basics: +* Get/Set properties: https://js.devexpress.com/DevExtreme/Guide/jQuery_Components/Component_Configuration_Syntax/#Get_and_Set_Properties +* Call methods: https://js.devexpress.com/DevExtreme/Guide/jQuery_Components/Component_Configuration_Syntax/#Call_Methods +* Get instance: https://js.devexpress.com/DevExtreme/Guide/jQuery_Components/Component_Configuration_Syntax/#Get_a_UI_Component_Instance + +To get more help with DevExtreme, submit a ticket through the [Support Center](https://supportcenter.devexpress.com/ticket/create). diff --git a/ASP.NET Core/Views/Home/Index.cshtml b/ASP.NET Core/Views/Home/Index.cshtml new file mode 100644 index 0000000..f80c0f1 --- /dev/null +++ b/ASP.NET Core/Views/Home/Index.cshtml @@ -0,0 +1,80 @@ +@using DevExtreme.AspNet.Mvc.Factories +@model object + +
+ @(Html.DevExtreme().Form() + .ID("form") + .FormData(Model) + .LabelLocation(FormLabelLocation.Top) + .ShowColonAfterLabel(false) + .Items(FormItems => { + FormItems.AddGroup().ColCount(2).Items(MainGroupItems => { + MainGroupItems.AddGroup().Caption("Employee").Items(PersonalInfoItems); + MainGroupItems.AddGroup().Caption("Personal Information").Items(ContactAndMiscItems); + }); + FormItems.AddButton().HorizontalAlignment(HorizontalAlignment.Center).ButtonOptions(Button => + Button.Text("Submit the Form").UseSubmitBehavior(true) + ); + }) + ) +
+ +@functions { + void PersonalInfoItems(FormItemsFactory Items) { + Items.AddSimple().DataField("Name").IsRequired(true); + Items.AddSimple().DataField("Position"); + Items.AddSimple().DataField("HireDate"); + Items.AddSimple().DataField("OfficeNumber").ValidationRules(Rules => + Rules.AddNumeric().Message("This field should contain a number") + ); + } + + void ContactAndMiscItems(FormItemsFactory Items) { + Items.AddTabbed().TabPanelOptions(Options => + Options.Height(280) + ).Tabs(Tabs => { + Tabs.Add().Title("Contacts").Items(ContactsItems => { + ContactsItems.AddSimple().DataField("Skype"); + ContactsItems.AddSimple().DataField("Phone"); + ContactsItems.AddSimple().DataField("Email").ValidationRules(Rules => + Rules.AddEmail().Message("This is not a valid Email") + ); + }); + Tabs.Add().Title("Note").Items(NoteItems => + NoteItems.AddSimple().DataField("Notes").Editor(Editor => Editor.TextArea()) + ); + }); + } +} + +@(Html.DevExtreme().CheckBox() + .ID("check-box") + .Text("Enable read-only mode") + .OnValueChanged("handleCheckBoxValueChanged") +) + + + + \ No newline at end of file diff --git a/ASP.NET Core/Views/Shared/Error.cshtml b/ASP.NET Core/Views/Shared/Error.cshtml new file mode 100644 index 0000000..117599a --- /dev/null +++ b/ASP.NET Core/Views/Shared/Error.cshtml @@ -0,0 +1,8 @@ +

An error occurred while the server was processing your request.

+ +

+ To display detailed information about the error, set the ASPNETCORE_ENVIRONMENT environment variable to Development and restart the app. +

+

+ The Development environment should not be enabled for deployed applications because it provides users access to exceptions that can contain sensitive information. +

\ No newline at end of file diff --git a/ASP.NET Core/Views/Shared/_Layout.cshtml b/ASP.NET Core/Views/Shared/_Layout.cshtml new file mode 100644 index 0000000..f5067e5 --- /dev/null +++ b/ASP.NET Core/Views/Shared/_Layout.cshtml @@ -0,0 +1,28 @@ + + + + + + + + + + + ASP_NET_Core + + + + + + + + + + + +
+ @RenderBody() +
+ + + \ No newline at end of file diff --git a/ASP.NET Core/Views/_ViewImports.cshtml b/ASP.NET Core/Views/_ViewImports.cshtml new file mode 100644 index 0000000..20b558f --- /dev/null +++ b/ASP.NET Core/Views/_ViewImports.cshtml @@ -0,0 +1,4 @@ +@using ASP_NET_Core +@namespace ASP_NET_Core.Models +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@using DevExtreme.AspNet.Mvc diff --git a/ASP.NET Core/Views/_ViewStart.cshtml b/ASP.NET Core/Views/_ViewStart.cshtml new file mode 100644 index 0000000..820a2f6 --- /dev/null +++ b/ASP.NET Core/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +} diff --git a/ASP.NET Core/appsettings.Development.json b/ASP.NET Core/appsettings.Development.json new file mode 100644 index 0000000..8983e0f --- /dev/null +++ b/ASP.NET Core/appsettings.Development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } +} diff --git a/ASP.NET Core/appsettings.json b/ASP.NET Core/appsettings.json new file mode 100644 index 0000000..d9d9a9b --- /dev/null +++ b/ASP.NET Core/appsettings.json @@ -0,0 +1,10 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*" +} diff --git a/ASP.NET Core/package-lock.json b/ASP.NET Core/package-lock.json new file mode 100644 index 0000000..b0356be --- /dev/null +++ b/ASP.NET Core/package-lock.json @@ -0,0 +1,440 @@ +{ + "name": "asp.net", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "asp.net", + "version": "1.0.0", + "dependencies": { + "bootstrap": "^5.3.7", + "devextreme-aspnet-data": "^5.1.0", + "devextreme-dist": "^26.1.3", + "jquery": "3.7.1" + } + }, + "node_modules/@babel/runtime": { + "version": "7.29.7", + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@devexpress/utils": { + "version": "2.1.1", + "license": "SEE LICENSE IN README.md", + "peer": true, + "dependencies": { + "tslib": "2.3.1" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "license": "MIT", + "peer": true, + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/remapping": { + "version": "2.3.5", + "license": "MIT", + "peer": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "license": "MIT", + "peer": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.31", + "license": "MIT", + "peer": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "license": "MIT", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, + "node_modules/@preact/signals-core": { + "version": "1.14.3", + "license": "MIT", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, + "node_modules/bootstrap": { + "version": "5.3.8", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "license": "MIT", + "peerDependencies": { + "@popperjs/core": "^2.11.8" + } + }, + "node_modules/core-js": { + "version": "3.49.0", + "hasInstallScript": true, + "license": "MIT", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "license": "MIT", + "peer": true + }, + "node_modules/csstype": { + "version": "3.2.3", + "license": "MIT", + "peer": true + }, + "node_modules/devexpress-diagram": { + "version": "2.2.29", + "license": "SEE LICENSE IN README.md", + "peer": true, + "dependencies": { + "@devexpress/utils": "^2.1.1", + "es6-object-assign": "^1.1.0" + } + }, + "node_modules/devexpress-gantt": { + "version": "4.1.69", + "license": "SEE LICENSE IN README.md", + "peer": true, + "dependencies": { + "@devexpress/utils": "^2.1.1", + "tslib": "2.3.1" + } + }, + "node_modules/devextreme": { + "version": "26.1.3", + "license": "SEE LICENSE IN README.md", + "peer": true, + "dependencies": { + "@babel/runtime": "^7.12.1", + "@preact/signals-core": "^1.8.0", + "devexpress-diagram": "2.2.29", + "devexpress-gantt": "4.1.69", + "devextreme-quill": "1.7.9", + "inferno": "^8.2.3", + "inferno-create-element": "^8.2.3", + "inferno-hydrate": "^8.2.3", + "jszip": "^3.10.1", + "rrule": "^2.7.1", + "unplugin": "^3.0.0", + "zod": "3.24.4", + "zod-to-json-schema": "3.24.6" + }, + "bin": { + "devextreme-bundler": "bin/bundler.js", + "devextreme-bundler-init": "bin/bundler-init.js", + "devextreme-license": "bin/devextreme-license.js" + } + }, + "node_modules/devextreme-aspnet-data": { + "version": "5.1.0", + "license": "MIT", + "peerDependencies": { + "devextreme": ">=18.1.0" + } + }, + "node_modules/devextreme-dist": { + "version": "26.1.3", + "resolved": "https://registry.npmjs.org/devextreme-dist/-/devextreme-dist-26.1.3.tgz", + "integrity": "sha512-cN+2yR3bK5uOnGHGg4ioIG95gKKqDuUnthbPVnRbpfvZczenD2kMbmdyLZkWbze7cDSfIcAiP4CLGMGhuPj/bg==", + "license": "SEE LICENSE IN LICENSE.md" + }, + "node_modules/devextreme-quill": { + "version": "1.7.9", + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "core-js": "^3.34.0", + "eventemitter3": "^4.0.7", + "lodash.clonedeep": "^4.5.0", + "lodash.merge": "^4.6.2", + "parchment": "^2.0.1", + "quill-delta": "^5.0.0" + } + }, + "node_modules/es6-object-assign": { + "version": "1.1.0", + "license": "MIT", + "peer": true + }, + "node_modules/eventemitter3": { + "version": "4.0.7", + "license": "MIT", + "peer": true + }, + "node_modules/fast-diff": { + "version": "1.3.0", + "license": "Apache-2.0", + "peer": true + }, + "node_modules/immediate": { + "version": "3.0.6", + "license": "MIT", + "peer": true + }, + "node_modules/inferno": { + "version": "8.2.3", + "hasInstallScript": true, + "license": "MIT", + "peer": true, + "dependencies": { + "csstype": "^3.1.2", + "inferno-vnode-flags": "8.2.3", + "opencollective-postinstall": "^2.0.3" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/inferno" + } + }, + "node_modules/inferno-create-element": { + "version": "8.2.3", + "license": "MIT", + "peer": true, + "dependencies": { + "inferno": "8.2.3" + } + }, + "node_modules/inferno-hydrate": { + "version": "8.2.3", + "license": "MIT", + "peer": true, + "dependencies": { + "inferno": "8.2.3" + } + }, + "node_modules/inferno-vnode-flags": { + "version": "8.2.3", + "license": "MIT", + "peer": true + }, + "node_modules/inherits": { + "version": "2.0.4", + "license": "ISC", + "peer": true + }, + "node_modules/isarray": { + "version": "1.0.0", + "license": "MIT", + "peer": true + }, + "node_modules/jquery": { + "version": "3.7.1", + "license": "MIT" + }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "license": "(MIT OR GPL-3.0-or-later)", + "peer": true, + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, + "node_modules/lie": { + "version": "3.3.0", + "license": "MIT", + "peer": true, + "dependencies": { + "immediate": "~3.0.5" + } + }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "license": "MIT", + "peer": true + }, + "node_modules/lodash.isequal": { + "version": "4.5.0", + "license": "MIT", + "peer": true + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "license": "MIT", + "peer": true + }, + "node_modules/opencollective-postinstall": { + "version": "2.0.3", + "license": "MIT", + "peer": true, + "bin": { + "opencollective-postinstall": "index.js" + } + }, + "node_modules/pako": { + "version": "1.0.11", + "license": "(MIT AND Zlib)", + "peer": true + }, + "node_modules/parchment": { + "version": "2.0.1", + "license": "BSD-3-Clause", + "peer": true + }, + "node_modules/picomatch": { + "version": "4.0.4", + "license": "MIT", + "peer": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "license": "MIT", + "peer": true + }, + "node_modules/quill-delta": { + "version": "5.1.0", + "license": "MIT", + "peer": true, + "dependencies": { + "fast-diff": "^1.3.0", + "lodash.clonedeep": "^4.5.0", + "lodash.isequal": "^4.5.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/readable-stream": { + "version": "2.3.8", + "license": "MIT", + "peer": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/rrule": { + "version": "2.8.1", + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/rrule/node_modules/tslib": { + "version": "2.8.1", + "license": "0BSD", + "peer": true + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "license": "MIT", + "peer": true + }, + "node_modules/setimmediate": { + "version": "1.0.5", + "license": "MIT", + "peer": true + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "license": "MIT", + "peer": true, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/tslib": { + "version": "2.3.1", + "license": "0BSD", + "peer": true + }, + "node_modules/unplugin": { + "version": "3.0.0", + "license": "MIT", + "peer": true, + "dependencies": { + "@jridgewell/remapping": "^2.3.5", + "picomatch": "^4.0.3", + "webpack-virtual-modules": "^0.6.2" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "license": "MIT", + "peer": true + }, + "node_modules/webpack-virtual-modules": { + "version": "0.6.2", + "license": "MIT", + "peer": true + }, + "node_modules/zod": { + "version": "3.24.4", + "license": "MIT", + "peer": true, + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } + }, + "node_modules/zod-to-json-schema": { + "version": "3.24.6", + "license": "ISC", + "peer": true, + "peerDependencies": { + "zod": "^3.24.1" + } + } + } +} diff --git a/ASP.NET Core/package.json b/ASP.NET Core/package.json new file mode 100644 index 0000000..572bcf5 --- /dev/null +++ b/ASP.NET Core/package.json @@ -0,0 +1,11 @@ +{ + "version": "1.0.0", + "name": "asp.net", + "private": true, + "dependencies": { + "jquery": "3.7.1", + "devextreme-dist": "^26.1.3", + "devextreme-aspnet-data": "^5.1.0", + "bootstrap": "^5.3.7" + } +} diff --git a/ASP.NET Core/wwwroot/css/Site.css b/ASP.NET Core/wwwroot/css/Site.css new file mode 100644 index 0000000..e69de29 diff --git a/Angular/angular.json b/Angular/angular.json index 7173529..fb05a00 100644 --- a/Angular/angular.json +++ b/Angular/angular.json @@ -36,7 +36,7 @@ "src/assets" ], "styles": [ - "node_modules/devextreme/dist/css/dx.material.blue.light.compact.css", + "node_modules/devextreme/dist/css/dx.fluent.blue.light.css", "src/styles.scss" ], "scripts": [] diff --git a/Angular/src/app/app.component.html b/Angular/src/app/app.component.html index 9f25bc9..e72546e 100644 --- a/Angular/src/app/app.component.html +++ b/Angular/src/app/app.component.html @@ -1,58 +1,57 @@ -
-
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + diff --git a/Angular/src/app/app.component.scss b/Angular/src/app/app.component.scss index 1c837fd..6b97df7 100644 --- a/Angular/src/app/app.component.scss +++ b/Angular/src/app/app.component.scss @@ -1,13 +1,9 @@ #form { padding: 10px; - border: 1px solid; + border: var(--dx-border-width) solid var(--dx-color-border); + border-radius: var(--dx-border-radius); } #check-box { margin-top: 10px; } - -#app-container { - width: 900px; - position: relative; -} diff --git a/Angular/src/app/app.component.ts b/Angular/src/app/app.component.ts index 099f83f..4c6bffb 100644 --- a/Angular/src/app/app.component.ts +++ b/Angular/src/app/app.component.ts @@ -2,8 +2,8 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; import notify from 'devextreme/ui/notify'; import { Employee, SubmitButtonOptions } from './app.types'; -import { DxFormModule } from 'devextreme-angular/ui/form'; -import { DxCheckBoxModule } from 'devextreme-angular/ui/check-box'; +import { DxFormModule, DxCheckBoxModule } from 'devextreme-angular'; +import 'devextreme/ui/text_area'; @Component({ selector: 'app-root', diff --git a/Angular/src/app/app.types.ts b/Angular/src/app/app.types.ts index bb62f85..cf4c899 100644 --- a/Angular/src/app/app.types.ts +++ b/Angular/src/app/app.types.ts @@ -1,7 +1,7 @@ export interface Employee { name: string; position: string; - hireDate: Date; + hireDate?: Date; officeNumber: number; phone: string; skype: string; diff --git a/React/src/App.css b/React/src/App.css index 1c837fd..6b97df7 100644 --- a/React/src/App.css +++ b/React/src/App.css @@ -1,13 +1,9 @@ #form { padding: 10px; - border: 1px solid; + border: var(--dx-border-width) solid var(--dx-color-border); + border-radius: var(--dx-border-radius); } #check-box { margin-top: 10px; } - -#app-container { - width: 900px; - position: relative; -} diff --git a/React/src/App.tsx b/React/src/App.tsx index 219a2f5..3563c79 100644 --- a/React/src/App.tsx +++ b/React/src/App.tsx @@ -1,6 +1,6 @@ import React, { useState, useCallback } from 'react'; import './App.css'; -import 'devextreme/dist/css/dx.material.blue.light.compact.css'; +import 'devextreme/dist/css/dx.fluent.blue.light.css'; import Form, { SimpleItem, GroupItem, @@ -14,8 +14,8 @@ import Form, { } from 'devextreme-react/form'; import CheckBox from 'devextreme-react/check-box'; import type { CheckBoxTypes } from 'devextreme-react/check-box'; -import 'devextreme-react/text-area'; import notify from 'devextreme/ui/notify'; +import 'devextreme/ui/text_area'; import type { Employee } from './types'; const employee: Employee = { @@ -48,7 +48,7 @@ function App(): JSX.Element { ); return ( -
+
- + @@ -85,15 +85,14 @@ function App(): JSX.Element { - - -
+ + ); } diff --git a/React/src/types.ts b/React/src/types.ts index 2f1eed2..e4b2806 100644 --- a/React/src/types.ts +++ b/React/src/types.ts @@ -1,7 +1,7 @@ export interface Employee { name: string; position: string; - hireDate: Date; + hireDate?: Date; officeNumber: number; phone: string; skype: string; diff --git a/Vue/src/App.vue b/Vue/src/App.vue index b5b3994..5d1d8af 100644 --- a/Vue/src/App.vue +++ b/Vue/src/App.vue @@ -1,5 +1,5 @@ diff --git a/Vue/src/components/FormContent.vue b/Vue/src/components/FormContent.vue index 94879ba..bc57797 100644 --- a/Vue/src/components/FormContent.vue +++ b/Vue/src/components/FormContent.vue @@ -1,62 +1,59 @@ @@ -15,11 +15,9 @@ -
-
-
-
-
-
+
+
+
+
diff --git a/jQuery/src/index.js b/jQuery/src/index.js index 9c44d90..aa631fa 100644 --- a/jQuery/src/index.js +++ b/jQuery/src/index.js @@ -37,7 +37,7 @@ $(() => { items: [{ itemType: 'tabbed', tabPanelOptions: { - height: 260, + height: 280, }, tabs: [{ title: 'Contacts',