Skip to content

Commit f34a527

Browse files
committed
[Feature] Rebuild the Form element
1 parent b74626c commit f34a527

13 files changed

+34
-22
lines changed

src/renderer/app/layout/layout.routing.ts

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ const LAYOUT_ROUTES: Routes = [
4343
path: 'scrollbar',
4444
loadChildren: () => import('../pages/component/scrollbar/scrollbar.module').then(m => m.ScrollbarModule)
4545
},
46-
{
47-
path: 'datepicker',
48-
loadChildren: () => import('../pages/component/datepicker/datepicker.module').then(m => m.DatepickerModule)
49-
},
5046
{
5147
path: 'carousel',
5248
loadChildren: () => import('../pages/component/carousel/carousel.module').then(m => m.CarouselComponentModule)
@@ -63,10 +59,6 @@ const LAYOUT_ROUTES: Routes = [
6359
path: 'sortable',
6460
loadChildren: () => import('../pages/component/sortable/sortable.module').then(m => m.SortableComponentModule)
6561
},
66-
{
67-
path: 'rating',
68-
loadChildren: () => import('../pages/component/rating/rating.module').then(m => m.RatingComponentModule)
69-
},
7062
{
7163
path: 'alert',
7264
loadChildren: () => import('../pages/component/alert/alert.module').then(m => m.AlertsComponentModule)
@@ -83,10 +75,6 @@ const LAYOUT_ROUTES: Routes = [
8375
path: 'typeahead',
8476
loadChildren: () => import('../pages/component/typeahead/typeahead.module').then(m => m.TypeaheadComponentModule)
8577
},
86-
{
87-
path: 'timepicker',
88-
loadChildren: () => import('../pages/component/timepicker/timepicker.module').then(m => m.TimepickerComponentModule)
89-
},
9078
{
9179
path: 'accordion',
9280
loadChildren: () => import('../pages/component/accordion/accordion.module').then(m => m.AccordionComponentModule)
@@ -101,6 +89,23 @@ const LAYOUT_ROUTES: Routes = [
10189
}
10290
]
10391
},
92+
{
93+
path: 'form',
94+
children: [
95+
{
96+
path: 'datepicker',
97+
loadChildren: () => import('../pages/form/datepicker/datepicker.module').then(m => m.DatepickerModule)
98+
},
99+
{
100+
path: 'timepicker',
101+
loadChildren: () => import('../pages/form/timepicker/timepicker.module').then(m => m.TimepickerComponentModule)
102+
},
103+
{
104+
path: 'rating',
105+
loadChildren: () => import('../pages/form/rating/rating.module').then(m => m.RatingComponentModule)
106+
}
107+
]
108+
},
104109
{
105110
path: 'directive',
106111
children: [

src/renderer/app/layout/navigation/navigation.component.html

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
<li routerLinkActive="navigation__active">
2727
<a [routerLink]="['/component/scrollbar']"><i class="fa fa-bars"></i> Scrollbar</a>
2828
</li>
29-
<li routerLinkActive="navigation__active">
30-
<a [routerLink]="['/component/datepicker']"><i class="fa fa-clock-o"></i> Datepicker</a>
31-
</li>
3229
<li routerLinkActive="navigation__active">
3330
<a [routerLink]="['/component/carousel']"><i class="fa fa-calculator"></i> Carousel</a>
3431
</li>
@@ -41,9 +38,6 @@
4138
<li routerLinkActive="navigation__active">
4239
<a [routerLink]="['/component/sortable']"><i class="fa fa-sort"></i> Sortable</a>
4340
</li>
44-
<li routerLinkActive="navigation__active">
45-
<a [routerLink]="['/component/rating']"><i class="fa fa-random"></i> Rating</a>
46-
</li>
4741
<li routerLinkActive="navigation__active">
4842
<a [routerLink]="['/component/alert']"><i class="fa fa-warning"></i> Alert</a>
4943
</li>
@@ -56,9 +50,6 @@
5650
<li routerLinkActive="navigation__active">
5751
<a [routerLink]="['/component/typeahead']"><i class="fa fa-tty"></i> Typeahead</a>
5852
</li>
59-
<li routerLinkActive="navigation__active">
60-
<a [routerLink]="['/component/timepicker']"><i class="fa fa-times-circle"></i> Timepicker</a>
61-
</li>
6253
<li routerLinkActive="navigation__active">
6354
<a [routerLink]="['/component/accordion']"><i class="fa fa-universal-access"></i> Accordion</a>
6455
</li>
@@ -70,6 +61,21 @@
7061
</li>
7162
</ul>
7263
</li>
64+
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
65+
<a (click)="toggleNavigationSub('Form', $event)">
66+
<i class="zmdi zmdi-text-format"></i> Form</a>
67+
<ul [@toggleHeight]="navigationSubState.Form">
68+
<li routerLinkActive="navigation__active">
69+
<a [routerLink]="['/form/timepicker']"><i class="fa fa-times-circle"></i> Timepicker</a>
70+
</li>
71+
<li routerLinkActive="navigation__active">
72+
<a [routerLink]="['/form/datepicker']"><i class="fa fa-clock-o"></i> Datepicker</a>
73+
</li>
74+
<li routerLinkActive="navigation__active">
75+
<a [routerLink]="['/form/rating']"><i class="fa fa-random"></i> Rating</a>
76+
</li>
77+
</ul>
78+
</li>
7379
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
7480
<a (click)="toggleNavigationSub('Directive', $event)">
7581
<i class="zmdi zmdi-chart"></i> Directive</a>

src/renderer/app/layout/navigation/navigation.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ export class NavigationComponent implements OnInit {
2727
Icon: 'inactive',
2828
Component: 'inactive',
2929
Directive: 'inactive',
30-
Error: 'inactive'
30+
Error: 'inactive',
31+
Form: 'inactive'
3132
};
3233

3334
constructor(private navigationService: NavigationService) {

src/renderer/app/pages/component/datepicker/datepicker.component.html renamed to src/renderer/app/pages/form/datepicker/datepicker.component.html

File renamed without changes.

src/renderer/app/pages/component/datepicker/datepicker.component.ts renamed to src/renderer/app/pages/form/datepicker/datepicker.component.ts

File renamed without changes.

src/renderer/app/pages/component/datepicker/datepicker.module.ts renamed to src/renderer/app/pages/form/datepicker/datepicker.module.ts

File renamed without changes.

src/renderer/app/pages/component/rating/rating.component.html renamed to src/renderer/app/pages/form/rating/rating.component.html

File renamed without changes.

src/renderer/app/pages/component/rating/rating.component.scss renamed to src/renderer/app/pages/form/rating/rating.component.scss

File renamed without changes.

src/renderer/app/pages/component/rating/rating.component.ts renamed to src/renderer/app/pages/form/rating/rating.component.ts

File renamed without changes.

src/renderer/app/pages/component/rating/rating.module.ts renamed to src/renderer/app/pages/form/rating/rating.module.ts

File renamed without changes.

0 commit comments

Comments
 (0)