Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-moz-osx-font-smoothing: grayscale;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-moz-osx-font-smoothing: grayscale;
}

Expand Down
8 changes: 4 additions & 4 deletions packages/devextreme-cli/src/utility/latest-versions.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const packageJson = require('../../package.json');
module.exports = {
'devextreme': '25.1.7',
'devextreme-react': '25.1.7',
'devextreme-vue': '25.1.7',
'devextreme': '25.2.3',
'devextreme-react': '25.2.3',
'devextreme-vue': '25.2.3',
'create-vite': '8.2.0',
'create-vue': '3.17.0',
'create-next-app': '16.0.10',
'create-next-app': '16.1.0',
'jose': '6.1.3',
'devextreme-cli': packageJson.version,
'devextreme-schematics': 'latest'
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
561 changes: 266 additions & 295 deletions packages/devextreme-cli/testing/app-template.test.shared.js

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions packages/devextreme-cli/testing/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ exports.viewports = {
}
};

exports.themes = {
material: 'material.blue',
generic: 'generic',
fluent: 'fluent.blue'
};

exports.layouts = [
'side-nav-outer-toolbar',
'side-nav-inner-toolbar'
Expand Down
36 changes: 0 additions & 36 deletions packages/devextreme-cli/testing/dev-server.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
const fs = require('fs');
const path = require('path');
const WebServer = require('./web-server');
const NextJsServer = require('./nextjs-server');

const runCommand = require('../src/utility/run-command');
const { themes, swatchModes, baseFontFamily } = require('./constants');

module.exports = class DevServer {
constructor(env, { port }) {
Expand Down Expand Up @@ -39,38 +37,4 @@ module.exports = class DevServer {
async setLayout(layout) {
this.env.setLayout(layout);
}

async setTheme(theme) {
if(this.currentTheme === theme) {
return;
}

Object.keys(swatchModes).forEach((modeName) => {
const mode = swatchModes[modeName];
const themeFilePath = path.join(this.env.appPath, `/src/themes/metadata.${modeName}.json`);

const data = fs.readFileSync(themeFilePath, 'utf8');
const metadata = JSON.parse(data);

const items = metadata.items
? metadata.items.filter(item => item.key !== baseFontFamily.key)
: [];
items.push(baseFontFamily);

metadata.items = items;
metadata.baseTheme = `${themes[theme]}.${mode}`;

fs.writeFileSync(themeFilePath, `${JSON.stringify(metadata, null, ' ')}\n`, 'utf8');
});

await runCommand('node', [
path.join(process.cwd(), 'index.js'),
'build'
], {
cwd: this.env.appPath,
forceNoCmd: true
});

this.currentTheme = theme;
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"dxversion": {
"type": "string",
"description": "The DevExtreme version",
"default": "25.1.7"
"default": "25.2.3"
},
"globalNgCliVersion": {
"type":"string",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ng-container *ngIf="isAuthenticated(); else unauthenticated">
@if (isAuthenticated()) {
<app-<%= layout %> title="{{appInfo.title}}">
<router-outlet></router-outlet>
<app-footer>
Expand All @@ -7,8 +7,6 @@
All trademarks or registered trademarks are property of their respective owners.
</app-footer>
</app-<%= layout %>>
</ng-container>

<ng-template #unauthenticated>
} @else {
<app-unauthenticated-content></app-unauthenticated-content>
</ng-template>
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
<app-side-navigation-menu
[compactMode]="!menuOpened"
[selectedItem]="selectedRoute"
[ngClass]="swatchClassName"
[class]="swatchClassName"
*dxTemplate="let dataMenu of 'panel'"
(selectedItemChanged)="navigationChanged($event)"
(openMenu)="navigationClick()">
<dx-toolbar id="navigation-header">
@if (minMenuSize !== 0) {
<dxi-toolbar-item
*ngIf="minMenuSize !== 0"
location="before"
cssClass="menu-button"
widget="dxButton"
Expand All @@ -27,6 +27,7 @@
onClick: toggleMenu
}">
</dxi-toolbar-item>
}
<dxi-toolbar-item
location="before"
cssClass="header-title"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<app-side-navigation-menu
[compactMode]="!menuOpened"
[selectedItem]="selectedRoute"
[ngClass]="swatchClassName"
[class]="swatchClassName"
*dxTemplate="let dataMenu of 'panel'"
(selectedItemChanged)="navigationChanged($event)"
(openMenu)="navigationClick()">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@
<ng-container *dxTemplate="let item of 'changePasswordTemplate'">
<div>
<span class="dx-button-text">
<ng-container *ngIf="loading; else notLoading">
@if (loading) {
<dx-load-indicator width="24px" height="24px" [visible]="true"></dx-load-indicator>
</ng-container>
<ng-template #notLoading>Continue</ng-template>
} @else {
<div>Continue</div>
}
</span>
</div>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
<ng-container *dxTemplate="let item of 'createAccountTemplate'">
<div>
<span class="dx-button-text">
<ng-container *ngIf="loading; else notLoading">
@if (loading) {
<dx-load-indicator width="24px" height="24px" [visible]="true"></dx-load-indicator>
</ng-container>

<ng-template #notLoading>Create a new account</ng-template>
} @else {
<div>Create a new account</div>
}
</span>
</div>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<header>
<dx-toolbar class="header-toolbar">
@if (menuToggleEnabled) {
<dxi-toolbar-item
*ngIf="menuToggleEnabled"
location="before"
widget="dxButton"
cssClass="menu-button"
Expand All @@ -11,18 +11,20 @@
onClick: toggleMenu
}">
</dxi-toolbar-item>
}
@if (title) {
<dxi-toolbar-item
location="before"
cssClass="header-title"
*ngIf="title"
[text]="title">
</dxi-toolbar-item>
}
<dxi-toolbar-item
location="after"
>
<ng-container *dxTemplate>
<div *dxTemplate>
<theme-switcher></theme-switcher>
</ng-container>
</div>
</dxi-toolbar-item>
<dxi-toolbar-item
location="after"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@
<ng-container *dxTemplate="let item of 'signInTemplate'">
<div>
<span class="dx-button-text">
<ng-container *ngIf="loading; else notLoading">
@if (loading) {
<dx-load-indicator width="24px" height="24px" [visible]="true"></dx-load-indicator>
</ng-container>
<ng-template #notLoading>Sign In</ng-template>
} @else {
<div>Sign In</div>
}
</span>
</div>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
<ng-container *dxTemplate="let item of 'resetPasswordTemplate'">
<div>
<span class="dx-button-text">
<ng-container *ngIf="loading; else notLoading">
@if (loading) {
<dx-load-indicator width="24px" height="24px" [visible]="true"></dx-load-indicator>
</ng-container>
<ng-template #notLoading>Reset my password</ng-template>
} @else {
<div>Reset my password</div>
}
</span>
</div>>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="user-panel">
@if (menuMode !== 'list') {
<dx-drop-down-button
*ngIf="menuMode !== 'list'"
stylingMode="text"
[icon]="'https://js.devexpress.com/Demos/WidgetsGallery/JSDemos/images/employees/06.png'"
[showArrowIcon]="false"
Expand All @@ -10,11 +10,12 @@
[elementAttr]="{class: 'user-button'}"
[dropDownOptions]="{width: '150px'}">
</dx-drop-down-button>
} @else {
<dx-list
*ngIf="menuMode === 'list'"
displayExpr="text"
keyExpr="id"
width="130"
[items]="menuItems">
</dx-list>
}
</div>
2 changes: 1 addition & 1 deletion packages/devextreme-schematics/src/install/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dxversion": {
"type": "string",
"description": "The DevExtreme version",
"default": "25.1.7"
"default": "25.2.3"
},
"project": {
"type": "string",
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-schematics/src/utility/latest-versions.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// TODO: implement
export const latestVersions = {
'devextreme': '25.1.7',
'devextreme-angular': '25.1.7',
'devextreme': '25.2.3',
'devextreme-angular': '25.2.3',
'devextreme-cli': 'latest',
'sass-embedded': '1.66.0'
};
Loading