Skip to content

Commit e4dc611

Browse files
VasilyStrelyaevajivanyandevdxvladislavvolkovalexslavrGoodDayForSurf
authored
chore: merge dev to master (#272)
* Dev: Update dev to catch up with current master (#260) * Add new chat component (#238) * Add new chat component * Fix lint errors * Update devextreme to 24.2.3. Update angular to v17 (#239) * Update text on import bootstrap variables (#241) * Update devextreme packages to 24.2.5 (#244) * Fix capitalization of SaaS theme name + update year in the footer (#245) * Use titlecase pipe only for base name of theme * Use a calculated year * Update devextreme packages to 24.2.6 (#247) * Bump DevExtreme version to 24.2.7 (#251) --------- Co-authored-by: volvl <dxvladislavvolkov@users.noreply.github.com> Co-authored-by: Alex Lavrov <36633600+alexslavr@users.noreply.github.com> Co-authored-by: Aliullov Vlad <91639107+GoodDayForSurf@users.noreply.github.com> Co-authored-by: EugeniyKiyashko <EugeniyKiyashko@users.noreply.github.com> * Stepper: Add Stepper component to the ThemeBuilder (#256) * Add new chat component (#238) * Add new chat component * Fix lint errors * Update devextreme to 24.2.3. Update angular to v17 (#239) * Update text on import bootstrap variables (#241) * Update devextreme packages to 24.2.5 (#244) * Fix capitalization of SaaS theme name + update year in the footer (#245) * Use titlecase pipe only for base name of theme * Use a calculated year * Update devextreme packages to 24.2.6 (#247) * add(Stepper): Add Stepper component to ThemeBuilder * fix(stepper): Fix css inconsistencies * fix(stepper): remove badge wrapper logic in preview page along with css fixes * fix(stepper): Move badge into a new folder 'shared' * fix(preview): Move preview item titles into a seperate component * fix(stepper): Add vertical separators between control inputs * fix(seperator): fix seperator color * fix(stepper): minor fixes in stepper * fix(formatting): add missing lines * feat: Bump devextreme package version to 25 --------- Co-authored-by: volvl <dxvladislavvolkov@users.noreply.github.com> Co-authored-by: Alex Lavrov <36633600+alexslavr@users.noreply.github.com> Co-authored-by: Aliullov Vlad <91639107+GoodDayForSurf@users.noreply.github.com> * CardView ThemeBuilder (#263) * implement * Improve cardview demo * revert theme-builder.service.ts * use new datasource * show options in all themes * lint * fix build * update cardview sample * apply demo changes 2 * fix left-menu.aliases.ts * change editing popup height * Fix popup heights * import cardview properties from framework package * Cardview - Remove nested tags (#264) * fix * show pager when collapsed * hide pager when collapsed * make 3 columns appear in collapsed state * fix popup size * Dev: update Stepper left-menu aliases groups (#265) * Stepper: update left-menu aliases groups * Stepper: fix typo * fix(formatting): Fix trailing comma issue --------- Co-authored-by: Arman Jivanyan <arman.jivanyan@devexpress.com> * CardView - fix lint; rename Header Item sections; make left-menu wider (#266) * fix lint * change section names + make left-menu wider * fix search button position + fix dark menu width * Add map to exports (#268) --------- Co-authored-by: Arman Jivanyan <arman.jivanyan@devexpress.com> Co-authored-by: volvl <dxvladislavvolkov@users.noreply.github.com> Co-authored-by: Alex Lavrov <36633600+alexslavr@users.noreply.github.com> Co-authored-by: Aliullov Vlad <91639107+GoodDayForSurf@users.noreply.github.com> Co-authored-by: EugeniyKiyashko <EugeniyKiyashko@users.noreply.github.com> Co-authored-by: Eldar Iusupzhanov <84278206+Tucchhaa@users.noreply.github.com> Co-authored-by: Anna Shakhova <68295572+anna-shakhova@users.noreply.github.com>
1 parent a2a05a4 commit e4dc611

72 files changed

Lines changed: 690 additions & 56 deletions

Some content is hidden

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

‎package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"@angular/router": "17.3.12",
2323
"@ngtools/webpack": "17.3.11",
2424
"core-js": "^2.5.4",
25-
"devextreme": "24.2.7",
26-
"devextreme-angular": "24.2.7",
27-
"devextreme-themebuilder": "24.2.7",
25+
"devextreme": "25.1-next",
26+
"devextreme-angular": "25.1-next",
27+
"devextreme-themebuilder": "25.1-next",
2828
"file-saver": "^2.0.2",
2929
"jszip": "^3.2.2",
3030
"jszip-utils": "^0.1.0",

‎src/app/app.module.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ import {
2323
DxTextAreaModule,
2424
DxTextBoxModule,
2525
DxTooltipModule,
26-
DxValidatorModule
26+
DxValidatorModule,
27+
DxStepperModule,
28+
DxCardViewModule
2729
} from 'devextreme-angular';
2830

2931
import { AppLayoutComponent } from './layouts/app-layout/app-layout.component';
@@ -134,10 +136,12 @@ import { IconTmInfoComponent } from './icons/icon-tm-info/icon-tm-info.component
134136
DxButtonModule,
135137
DxScrollViewModule,
136138
DxDataGridModule,
139+
DxCardViewModule,
137140
DxPopupModule,
138141
DxCheckBoxModule,
139142
DxRadioGroupModule,
140143
DxValidatorModule,
144+
DxStepperModule,
141145
DxLoadPanelModule,
142146
ReactiveFormsModule,
143147
PreviewModule,

‎src/app/layouts/header/export-popup/export-popup.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ export class ExportPopupComponent implements OnInit {
3535

3636
viewIndex = 0;
3737

38-
mainWidgets: string[] = ['Scheduler', 'Diagram', 'Gantt', 'DataGrid', 'PivotGrid', 'TreeList', 'Chat'];
38+
mainWidgets: string[] = ['Scheduler', 'Diagram', 'Gantt', 'DataGrid', 'PivotGrid', 'TreeList', 'CardView', 'Chat'];
3939
widgetGroups: any[] = [{
4040
group: 'Navigation and Layout',
41-
widgets: ['Tabs', 'Toolbar', 'Menu', 'TreeView', 'TileView', 'Accordion', 'ContextMenu', 'TabPanel', 'MultiView', 'Drawer', 'Box', 'ResponsiveBox', 'Splitter', 'Map']
41+
widgets: ['Tabs', 'Toolbar', 'Menu', 'TreeView', 'TileView', 'Accordion', 'ContextMenu', 'TabPanel', 'MultiView', 'Drawer', 'Box', 'ResponsiveBox', 'Splitter', 'Stepper', 'Map']
4242
}, {
4343
group: 'Forms and Editors',
4444
widgets: ['Form', 'CheckBox', 'Calendar', 'Validation', 'Switch', 'TextBox', 'DropDownBox', 'Autocomplete', 'DateBox', 'DateRangeBox', 'SelectBox', 'NumberBox', 'Slider', 'RangeSlider', 'Lookup', 'TagBox', 'RadioGroup', 'ColorBox', 'HtmlEditor']

‎src/app/left-menu/left-menu.aliases.ts‎

Lines changed: 134 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,100 @@ export class LeftMenuAlias {
1515
equivalents: 'dxDataGrid, data grid, dx-data-grid, dxTreeList, dx-tree-list',
1616
regs: [/datagrid-/i],
1717
route: 'grids'
18+
}, {
19+
name: 'Card View',
20+
isNew: true,
21+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
22+
route: 'cardview',
23+
groups: [{
24+
name: 'Common Settings',
25+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
26+
regs: [
27+
/cardview-fluent-common/i,
28+
/cardview-generic-common/i,
29+
/cardview-material-common/i
30+
]
31+
}, {
32+
name: 'Card',
33+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
34+
regs: [
35+
/cardview-fluent-card(?!--)(?!.*--highlighted)/i,
36+
/cardview-generic-card(?!--)(?!.*--highlighted)/i,
37+
/cardview-material-card(?!--)(?!.*--highlighted)/i
38+
]
39+
}, {
40+
name: 'Card (Selected)',
41+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
42+
regs: [
43+
/cardview-fluent-card--selected/i,
44+
/cardview-generic-card--selected/i,
45+
/cardview-material-card--selected/i
46+
]
47+
}, {
48+
name: 'Header Item',
49+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
50+
regs: [
51+
/cardview-fluent-header-panel__item(?!--)/i,
52+
/cardview-generic-header-panel__item(?!--)/i,
53+
/cardview-material-header-panel__item(?!--)/i
54+
]
55+
}, {
56+
name: 'Header Item (Hovered)',
57+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
58+
regs: [
59+
/cardview-fluent-header-panel__item--hovered/i,
60+
/cardview-generic-header-panel__item--hovered/i,
61+
/cardview-material-header-panel__item--hovered/i
62+
]
63+
}, {
64+
name: 'Header Item (Drag Ghost)',
65+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
66+
regs: [
67+
/cardview-fluent-header-panel__item--disabled/i,
68+
/cardview-generic-header-panel__item--disabled/i,
69+
/cardview-material-header-panel__item--disabled/i
70+
]
71+
}, {
72+
name: 'Header Item (Drag Active)',
73+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
74+
regs: [
75+
/cardview-fluent-header-panel__item--dragged/i,
76+
/cardview-generic-header-panel__item--dragged/i,
77+
/cardview-material-header-panel__item--dragged/i
78+
]
79+
}, {
80+
name: 'Header Drop Zone',
81+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
82+
regs: [
83+
/cardview-fluent-header-panel__dropzone/i,
84+
/cardview-generic-header-panel__dropzone/i,
85+
/cardview-material-header-panel__dropzone/i
86+
]
87+
}, {
88+
name: 'Filter Panel',
89+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
90+
regs: [
91+
/cardview-fluent-filter-panel/i,
92+
/cardview-generic-filter-panel/i,
93+
/cardview-material-filter-panel/i
94+
]
95+
}, {
96+
name: 'Empty View',
97+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
98+
regs: [
99+
/cardview-fluent-nodata-view/i,
100+
/cardview-generic-nodata-view/i,
101+
/cardview-material-nodata-view/i
102+
]
103+
}, {
104+
name: 'Highlights In Search',
105+
equivalents: 'dxCardView, card view, dx-card-view, dxCardView, dx-card-view',
106+
regs: [
107+
/cardview-fluent-card__content__field-value--highlighted/i,
108+
/cardview-generic-card__content__field-value--highlighted/i,
109+
/cardview-material-card__content__field-value--highlighted/i
110+
]
111+
}]
18112
}, {
19113
name: 'Pivot Grid',
20114
equivalents: 'dxPivotGrid, dx-pivot-grid',
@@ -150,27 +244,27 @@ export class LeftMenuAlias {
150244
equivalents: 'Chat, dxChat, dx-chat',
151245
route: 'chat',
152246
groups: [{
153-
name: 'BASIC SETTINGS',
247+
name: 'Basic Settings',
154248
equivalents: 'Chat, dxChat, dx-chat',
155249
regs: [/chat-background-color/i, /chat-border-color/i]
156250
}, {
157-
name: 'AVATAR',
251+
name: 'Avatar',
158252
equivalents: 'Chat, dxChat, dx-chat',
159253
regs: [/chat-avatar-color/i, /chat-avatar-background-color/i]
160254
}, {
161-
name: 'MESSAGE BUBBLE',
255+
name: 'Message bubble',
162256
equivalents: 'Chat, dxChat, dx-chat',
163257
regs: [/chat-bubble-color-primary/i, /chat-bubble-background-color-primary/i, /chat-bubble-color-secondary/i, /chat-bubble-background-color-secondary/i, /chat-information-color/i]
164258
}, {
165-
name: 'SYSTEM INFO',
259+
name: 'System Info',
166260
equivalents: 'Chat, dxChat, dx-chat',
167261
regs: [/chat-information-author-name-color/i, /chat-information-timestamp-color/i, /chat-messagelist-day-header-color/i, /chat-alertlist-color/i]
168262
}, {
169-
name: 'EMPTY VIEW',
263+
name: 'Empty View',
170264
equivalents: 'Chat, dxChat, dx-chat',
171265
regs: [/chat-messagelist-empty-icon-color/i, /chat-messagelist-empty-icon-background-color/i, /chat-messagelist-empty-message-color/i, /chat-messagelist-empty-prompt-color/i]
172266
}, {
173-
name: 'TYPING INDICATOR',
267+
name: 'Typing Indicator',
174268
equivalents: 'Chat, dxChat, dx-chat',
175269
regs: [/chat-typingindicator-color/i, /chat-typingindicator-bubble-bg-color/i, /chat-typingindicator-circle-bg-color-center/, /chat-typingindicator-circle-bg-color$/]
176270
}]
@@ -189,6 +283,40 @@ export class LeftMenuAlias {
189283
equivalents: 'dxMenu, dx-menu',
190284
regs: [/menu/i],
191285
route: 'navigations.menu'
286+
}, {
287+
name: 'Stepper',
288+
isNew: true,
289+
equivalents: 'Stepper, dxStepper, dx-stepper',
290+
route: 'stepper',
291+
groups: [{
292+
name: 'Common Settings',
293+
equivalents: 'Stepper, dxStepper, dx-stepper',
294+
regs: [/stepper-step-accent-/i, /stepper-step-danger-/i, /stepper-step-invalid-label-color/i, /stepper-step-shadow-/i]
295+
}, {
296+
name: 'Pending Step',
297+
equivalents: 'Stepper, dxStepper, dx-stepper',
298+
regs: [/stepper-step-base-/i]
299+
}, {
300+
name: 'Completed Step',
301+
equivalents: 'Stepper, dxStepper, dx-stepper',
302+
regs: [/stepper-step-selected-/i]
303+
}, {
304+
name: 'Pending Invalid Step',
305+
equivalents: 'Stepper, dxStepper, dx-stepper',
306+
regs: [/stepper-step-invalid-(?!selected-|label-color)/i]
307+
}, {
308+
name: 'Completed Invalid Step',
309+
equivalents: 'Stepper, dxStepper, dx-stepper',
310+
regs: [/stepper-step-invalid-selected-/i]
311+
}, {
312+
name: 'Disabled Step',
313+
equivalents: 'Stepper, dxStepper, dx-stepper',
314+
regs: [/stepper-step-disabled-/i]
315+
}, {
316+
name: 'Connector',
317+
equivalents: 'Stepper, dxStepper, dx-stepper',
318+
regs: [/stepper-connector-/i]
319+
}]
192320
}, {
193321
name: 'Tabs',
194322
equivalents: 'TabBar, Segmented Control, dxTabs, dx-tabs',

‎src/app/left-menu/main/left-menu.component.css‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:host {
22
display: block;
33
height: 100%;
4-
width: 240px;
4+
width: 250px;
55
border-right: 1px solid #e3e7ea;
66
}
77

@@ -15,7 +15,7 @@
1515
top: 0;
1616
z-index: 2;
1717
left: 0;
18-
width: 241px;
18+
width: 251px;
1919
height: 100%;
2020
background-color: #505050;
2121
color: #fff;
@@ -24,7 +24,7 @@
2424
}
2525

2626
.left-menu .dark-menu.closed {
27-
left: -241px;
27+
left: -251px;
2828
}
2929

3030
.left-menu .dark-menu .scroll-container {
@@ -38,6 +38,8 @@
3838
font-size: 14px;
3939
padding: 8px 24px;
4040
cursor: pointer;
41+
display: flex;
42+
justify-content: space-between;
4143
}
4244

4345
.left-menu .dark-menu .menu-item:first-child {
@@ -72,7 +74,7 @@
7274
}
7375

7476
.left-menu .working-area {
75-
width: 240px;
77+
width: 250px;
7678
background-color: #fafbfb;
7779
height: 100%;
7880
overflow: hidden;
@@ -113,7 +115,7 @@
113115
box-sizing: border-box;
114116
position: absolute;
115117
height: 40px;
116-
left: 200px;
118+
left: 210px;
117119
top: 0;
118120
background-color: #fafbfb
119121
}
@@ -126,7 +128,7 @@
126128
}
127129

128130
.left-menu .working-area .name.top .search-container {
129-
width: 241px;
131+
width: 251px;
130132
border-bottom: 1px solid #e3e7ea;
131133
transition: left 200ms;
132134
}
@@ -162,7 +164,7 @@
162164
.left-menu .working-area .scroll-container {
163165
top: 44px;
164166
bottom: 0;
165-
width: 240px;
167+
width: 250px;
166168
position: absolute;
167169
}
168170

‎src/app/left-menu/main/left-menu.component.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
(click)="selectComponent(menuItem.route)"
6060
>
6161
{{ menuItem.name }}
62+
<app-badge *ngIf="menuItem.isNew">New</app-badge>
6263
</div>
6364
</dx-scroll-view>
6465
</div>

‎src/app/preview/cardview/cardview.component.css‎

Whitespace-only changes.

‎src/app/preview/cardview/cardview.component.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<dx-card-view #cardView></dx-card-view>

0 commit comments

Comments
 (0)