Skip to content

Commit 9960b1e

Browse files
GoodDayForSurfGoodDayForSurf
committed
wip. update account form changes
1 parent 4bbe882 commit 9960b1e

File tree

5 files changed

+45
-45
lines changed

5 files changed

+45
-45
lines changed

‎packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/change-password-form/change-password-form.component.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33

44
<dxi-form-item dataField="password" editorType="dxTextBox"
55
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Password', mode: 'password' }">
6-
<dxi-validation-rule type="required" message="Password is required"></dxi-validation-rule>
7-
<dxo-label [visible]="false"></dxo-label>
6+
<dxi-form-validation-rule type="required" message="Password is required"></dxi-form-validation-rule>
7+
<dxo-form-label [visible]="false"></dxo-form-label>
88
</dxi-form-item>
99

1010
<dxi-form-item dataField="confirmedPassword" editorType="dxTextBox"
1111
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Confirm Password', mode: 'password' }">
12-
<dxi-validation-rule type="required" message="Password is required"></dxi-validation-rule>
13-
<dxi-validation-rule type="custom" message="Passwords do not match" [validationCallback]="confirmPassword">
14-
</dxi-validation-rule>
15-
<dxo-label [visible]="false"></dxo-label>
12+
<dxi-form-validation-rule type="required" message="Password is required"></dxi-form-validation-rule>
13+
<dxi-form-validation-rule type="custom" message="Passwords do not match" [validationCallback]="confirmPassword">
14+
</dxi-form-validation-rule>
15+
<dxo-form-label [visible]="false"></dxo-form-label>
1616
</dxi-form-item>
1717

1818
<dxi-form-item itemType="button">
19-
<dxo-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'changePasswordTemplate'">
20-
</dxo-button-options>
19+
<dxo-form-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'changePasswordTemplate'">
20+
</dxo-form-button-options>
2121
</dxi-form-item>
2222

2323
<ng-container *dxTemplate="let item of 'changePasswordTemplate'">

‎packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/create-account-form/create-account-form.component.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@
33

44
<dxi-form-item dataField="email" editorType="dxTextBox"
55
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Email', mode: 'email' }">
6-
<dxi-validation-rule type="required" message="Email is required"></dxi-validation-rule>
7-
<dxi-validation-rule type="email" message="Email is invalid"></dxi-validation-rule>
8-
<dxo-label [visible]="false"></dxo-label>
6+
<dxi-form-validation-rule type="required" message="Email is required"></dxi-form-validation-rule>
7+
<dxi-form-validation-rule type="email" message="Email is invalid"></dxi-form-validation-rule>
8+
<dxo-form-label [visible]="false"></dxo-form-label>
99
</dxi-form-item>
1010

11-
<dxi-item dataField="password" editorType="dxTextBox"
11+
<dxi-from-item dataField="password" editorType="dxTextBox"
1212
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Password', mode: 'password' }">
13-
<dxi-validation-rule type="required" message="Password is required"></dxi-validation-rule>
14-
<dxo-label [visible]="false"></dxo-label>
15-
</dxi-item>
13+
<dxi-form-validation-rule type="required" message="Password is required"></dxi-form-validation-rule>
14+
<dxo-form-label [visible]="false"></dxo-form-label>
15+
</dxi-from-item>
1616

17-
<dxi-item dataField="confirmedPassword" editorType="dxTextBox"
17+
<dxi-from-item dataField="confirmedPassword" editorType="dxTextBox"
1818
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Confirm Password', mode: 'password' }">
19-
<dxi-validation-rule type="required" message="Password is required"></dxi-validation-rule>
20-
<dxi-validation-rule type="custom" message="Passwords do not match" [validationCallback]="confirmPassword">
21-
</dxi-validation-rule>
22-
<dxo-label [visible]="false"></dxo-label>
23-
</dxi-item>
19+
<dxi-form-validation-rule type="required" message="Password is required"></dxi-form-validation-rule>
20+
<dxi-form-validation-rule type="custom" message="Passwords do not match" [validationCallback]="confirmPassword">
21+
</dxi-form-validation-rule>
22+
<dxo-form-label [visible]="false"></dxo-form-label>
23+
</dxi-from-item>
2424

25-
<dxi-item>
25+
<dxi-from-item>
2626
<div class='policy-info'>
2727
By creating an account, you agree to the <a routerLink="#">Terms of Service</a> and <a routerLink="#">Privacy
2828
Policy</a>
2929
</div>
30-
</dxi-item>
30+
</dxi-from-item>
3131

32-
<dxi-item itemType="button">
33-
<dxo-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'createAccountTemplate'">
34-
</dxo-button-options>
35-
</dxi-item>
32+
<dxi-from-item itemType="button">
33+
<dxo-form-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'createAccountTemplate'">
34+
</dxo-form-button-options>
35+
</dxi-from-item>
3636

3737
<ng-container *dxTemplate="let item of 'createAccountTemplate'">
3838
<div>

‎packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/login-form/login-form.component.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33

44
<dxi-form-item dataField="email" editorType="dxTextBox"
55
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Email', mode: 'email' }">
6-
<dxi-validation-rule type="required" message="Email is required"></dxi-validation-rule>
7-
<dxi-validation-rule type="email" message="Email is invalid"></dxi-validation-rule>
8-
<dxo-label [visible]="false"></dxo-label>
6+
<dxi-form-validation-rule type="required" message="Email is required"></dxi-form-validation-rule>
7+
<dxi-form-validation-rule type="email" message="Email is invalid"></dxi-form-validation-rule>
8+
<dxo-form-label [visible]="false"></dxo-form-label>
99
</dxi-form-item>
1010

1111
<dxi-form-item dataField="password" editorType="dxTextBox"
1212
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Password', mode: 'password' }">
13-
<dxi-validation-rule type="required" message="Password is required"></dxi-validation-rule>
14-
<dxo-label [visible]="false"></dxo-label>
13+
<dxi-form-validation-rule type="required" message="Password is required"></dxi-form-validation-rule>
14+
<dxo-form-label [visible]="false"></dxo-form-label>
1515
</dxi-form-item>
1616

1717
<dxi-form-item dataField="rememberMe" editorType="dxCheckBox"
1818
[editorOptions]="{ text: 'Remember me', elementAttr: { class: 'form-text' } }">
19-
<dxo-label [visible]="false"></dxo-label>
19+
<dxo-form-label [visible]="false"></dxo-form-label>
2020
</dxi-form-item>
2121

2222
<dxi-form-item itemType="button">
23-
<dxo-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'signInTemplate'">
24-
</dxo-button-options>
23+
<dxo-form-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'signInTemplate'">
24+
</dxo-form-button-options>
2525
</dxi-form-item>
2626

2727
<ng-container *dxTemplate="let item of 'signInTemplate'">

‎packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/reset-password-form/reset-password-form.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
<dxi-form-item dataField="email" editorType="dxTextBox"
55
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Email', mode: 'email' }">
6-
<dxi-validation-rule type="required" message="Email is required"></dxi-validation-rule>
7-
<dxi-validation-rule type="email" message="Email is invalid"></dxi-validation-rule>
8-
<dxo-label [visible]="false"></dxo-label>
6+
<dxi-form-validation-rule type="required" message="Email is required"></dxi-form-validation-rule>
7+
<dxi-form-validation-rule type="email" message="Email is invalid"></dxi-form-validation-rule>
8+
<dxo-form-label [visible]="false"></dxo-form-label>
99
</dxi-form-item>
1010

1111
<dxi-form-item itemType="button">
12-
<dxo-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'resetPasswordTemplate'"
12+
<dxo-form-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'resetPasswordTemplate'"
1313
[elementAttr]="{ class: 'submit-button' }">
14-
</dxo-button-options>
14+
</dxo-form-button-options>
1515
</dxi-form-item>
1616

1717
<ng-container *dxTemplate="let item of 'resetPasswordTemplate'">

‎packages/devextreme-schematics/src/add-sample-views/files/pages/tasks/tasks.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ <h2>Tasks</h2>
99
[columnAutoWidth]="true"
1010
[columnHidingEnabled]="true">
1111

12-
<dxo-paging [pageSize]="10"></dxo-paging>
13-
<dxo-pager [showPageSizeSelector]="true" [showInfo]="true"></dxo-pager>
14-
<dxo-filter-row [visible]="true"></dxo-filter-row>
12+
<dxo-data-grid-paging [pageSize]="10"></dxo-data-grid-paging>
13+
<dxo-data-grid-pager [showPageSizeSelector]="true" [showInfo]="true"></dxo-data-grid-pager>
14+
<dxo-data-grid-filter-row [visible]="true"></dxo-data-grid-filter-row>
1515

1616
<dxi-data-grid-column
1717
dataField="Task_ID"
@@ -33,11 +33,11 @@ <h2>Tasks</h2>
3333
dataField="Task_Priority"
3434
caption="Priority"
3535
[hidingPriority]="5">
36-
<dxo-lookup
36+
<dxo-data-grid-lookup
3737
[dataSource]="priority"
3838
valueExpr="value"
3939
displayExpr="name">
40-
</dxo-lookup>
40+
</dxo-data-grid-lookup>
4141
</dxi-data-grid-column>
4242
<dxi-data-grid-column
4343
dataField="ResponsibleEmployee.Employee_Full_Name"

0 commit comments

Comments
 (0)