Merge template changes from devextreme-examples-template

Author: AlisherAmonulloev

ASP.NET Core/Readme.md

@@ -1,12 +1,23 @@
-# ASP.NET Core
+# ASP.NET Core DevExtreme Example
 
 ## Installation
 
-Download the example and use Visual Studio 2019 to open the project. 
+Download the example and use Visual Studio 2022 (or later) or Visual Studio Code to open the project. This project targets .NET 8.0. 
 
 ## Client-side resources and bundling
 
+<<<<<<< HEAD
 This project uses [NPM](https://www.npmjs.com/) and [Gulp.js](https://gulpjs.com/) to install client-side libraries. The project restores NPM packages before the first build. Then, Gulp bundles required scripts and CSS files into the resulting package during the first and every next build. 
+=======
+This project uses [NPM](https://www.npmjs.com/) and [Gulp.js](https://gulpjs.com/) to install client-side libraries. The project restores NPM packages before the first build. Then, Gulp bundles required scripts and CSS files into the resulting package during the first and every next build.
+
+The project includes:
+- DevExtreme 24.2.3
+- DevExtreme.AspNet.Core 24.2.*
+- DevExtreme.AspNet.Data 5.*
+- jQuery 3.7.1
+- Bootstrap 5.3.3 
+>>>>>>> template/25.1.2+
 
 The resulted bundles will be located in the `wwwroot` folder:
 * `css/vendor.css` - a file with all CSS styles.
@@ -19,11 +30,11 @@ The default bundle includes jQuery, Bootstrap, and DevExtreme.
 
 The main logic is located in the the `gulpfile.js` file at the root application level. The file contains two tasks:
 
-* the `add-resouces` task  
+* the `add-resources` task  
 
-    * copies JavaScript files located in the `scripts` array and adds them to `vendor.js`. The script bundle is moved to `wwwroot\scripts`.
-    * copies CSS styles located in the `styles` array and merges them into the `styles.css` bundle. Then, this bundle is moved to `wwwroot\styles`
-    * copies DevExtreme `fonts` and `icons` folders from NPM  to `wwwroot\styles`
+    * copies JavaScript files located in the `scripts` array and adds them to `vendor.js`. The script bundle is moved to `wwwroot\js`.
+    * copies CSS styles located in the `styles` array and merges them into the `vendor.css` bundle. Then, this bundle is moved to `wwwroot\css`
+    * copies DevExtreme `fonts` and `icons` folders from NPM  to `wwwroot\css`
 
 *  the `clean` task removes all previously created files (`vendor.js` and `vendor.css`) and folders (`icons` and `fonts`)
 
@@ -37,13 +48,32 @@ If you need to include more features, you can uncomment one of the following sec
 
 ## Code
 
-Take a look at the following files of this example to see the required code: 
+Take a look at the following files of this example to see the required code:
+
+**Controllers:**
+- `Controllers/HomeController.cs` - Main controller with Index action
+- `Controllers/SampleDataController.cs` - API controller for sample data
+
+**Models:**
+- `Models/SampleData.cs` - Sample data model
+- `Models/SampleOrder.cs` - Sample order model
+
+**Views:**
+- `Views/Home/Index.cshtml` - Main page with DevExtreme components
+- `Views/Shared/_Layout.cshtml` - Layout template
+- `Views/_ViewImports.cshtml` - Global imports
+- `Views/_ViewStart.cshtml` - View start configuration
 
-A list of files goes here
+**Configuration:**
+- `Program.cs` - Application entry point
+- `Startup.cs` - Service configuration
+- `gulpfile.js` - Build automation
+- `package.json` - NPM dependencies
+- `ASP.NET Core.csproj` - Project file
 
 ## Development server
 
-Use the Visual Studio `Run (F5)` command to run the project.
+Use the Visual Studio `Run (F5)` command or `dotnet run` command to run the project. The application will be available at `https://localhost:5001` (HTTPS) or `http://localhost:5000` (HTTP).
 
 ## Further help
 
@@ -53,6 +83,6 @@ The client-side API is based on jQuery [jQuery documentation](https://api.jquery
 * [Call Methods](https://js.devexpress.com/DevExtreme/Guide/jQuery_Components/Component_Configuration_Syntax/#Call_Methods)
 * [Get a UI Component Instance](https://js.devexpress.com/DevExtreme/Guide/jQuery_Components/Component_Configuration_Syntax/#Get_a_UI_Component_Instance)
 
-To get more help on DevExtreme submit an issue in the [Support Center](https://www.devexpress.com/Support/Center/Question/Create)
+To get more help on DevExtreme submit an issue in the [Support Center](https://supportcenter.devexpress.com/ticket/create)
 
 

ASP.NET Core/package-lock.json

@@ -4,7 +4,10 @@
   "private": true,
   "dependencies": {
     "jquery": "3.7.1",
+<<<<<<< HEAD
     "file-saver": "2.0.5",
+=======
+>>>>>>> template/25.1.2+
     "devextreme-dist": "^24.2.3",
     "devextreme-aspnet-data": "^5.0.0",
     "bootstrap": "^5.3.3"

ASP.NET Core/package.json

@@ -1,28 +1,35 @@
-# AngularTest
+# Angular DevExtreme Example
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 15.1.3.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 18.0.4 and includes DevExtreme Angular components version 24.2.3.
 
 ## Development server
 
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
+Run `npm start` or `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
 
 ## Code scaffolding
 
 Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
 
 ## Build
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
+Run `npm run build` or `ng build` to build the project. The build artifacts will be stored in the `dist/Angular/` directory.
 
 ## Running unit tests
 
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+Run `npm test` or `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Linting
+
+Run `npm run lint` to execute linting checks for TypeScript, CSS/SCSS, and HTML formatting.
+- `npm run lint-ts` - ESLint for TypeScript files
+- `npm run lint-css` - Stylelint for CSS/SCSS files  
+- `npm run lint-html` - Prettier for HTML formatting
 
 ## Running end-to-end tests
 
 Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
 
 ## Further help
 
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://v17.angular.io/cli) page.
-To get more help on DevExtreme submit an issue on [GitHub](https://github.com/DevExpress/devextreme/issues) or [Support Center](https://www.devexpress.com/Support/Center/Question/Create)
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
+To get more help on DevExtreme submit an issue on [GitHub](https://github.com/DevExpress/devextreme/issues) or [Support Center](https://supportcenter.devexpress.com/ticket/create)

Angular/README.md

@@ -1,12 +1,78 @@
-# React + TypeScript + Vite
+# React + TypeScript + Vite + DevExtreme
 
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+This template provides a minimal setup to get React working in Vite with HMR, ESLint rules, and DevExtreme components.
+
+This project includes:
+- React 18.2.0
+- TypeScript 5.8.2
+- Vite for fast development and building
+- DevExtreme React 24.2.3
+- Vitest for testing
+- ESLint and Stylelint for code quality
 
 Currently, two official plugins are available:
 
 - [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) for Fast Refresh
 - [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
 
+## Getting Started
+
+### Installation
+
+```bash
+npm install
+```
+
+### Development
+
+Start the development server:
+```bash
+npm run dev
+```
+
+The application will be available at `http://localhost:5173/`
+
+### Building
+
+Build the project for production:
+```bash
+npm run build
+```
+
+### Testing
+
+Run tests:
+```bash
+npm test
+npm run test:watch  # Run tests in watch mode
+```
+
+### Linting
+
+Run linting checks:
+```bash
+npm run lint      # Run all linting checks
+npm run lint-ts   # ESLint for TypeScript files
+npm run lint-css  # Stylelint for CSS files
+```
+
+## Code Structure
+
+**Source Files:**
+- `src/App.tsx` - Main React component with DevExtreme Button example
+- `src/App.test.tsx` - Tests for the main component
+- `src/main.tsx` - Application entry point
+- `src/App.css` - Component styles
+- `src/index.css` - Global styles
+- `src/setupTests.ts` - Test setup configuration
+- `src/vite-env.d.ts` - Vite environment type definitions
+
+**Configuration Files:**
+- `vite.config.ts` - Vite configuration
+- `package.json` - Dependencies and scripts
+- `tsconfig.json` - TypeScript configuration
+- `vitest.config.ts` - Vitest testing configuration
+
 ## Expanding the ESLint configuration
 
 If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
@@ -55,6 +121,8 @@ export default tseslint.config({
 
 ## Further help
 
-You can learn more about React in the [React documentation](https://18.react.dev/learn).
+You can learn more about React in the [React documentation](https://react.dev/learn).
+You can learn more about Vite in the [Vite documentation](https://vite.dev/).
+You can learn more about DevExtreme React components in the [DevExtreme React documentation](https://js.devexpress.com/React/).
 
-To get more help on DevExtreme submit an issue in the [Support Center](https://www.devexpress.com/Support/Center/Question/Create)
+To get more help on DevExtreme submit an issue in the [Support Center](https://supportcenter.devexpress.com/ticket/create)

React/README.md

@@ -8,9 +8,9 @@
     "build": "tsc -b && vite build",
     "test": "vitest",
     "test:watch": "vitest --watch",
-    "lint-js": "eslint .",
+    "lint-ts": "eslint .",
     "lint-css": "stylelint src/**/*.css --allow-empty-input",
-    "lint": "npm-run-all -p -c lint-js lint-css",
+    "lint": "npm-run-all -p -c lint-ts lint-css",
     "preview": "vite preview"
   },