Skip to content

Commit 079e5fe

Browse files
DuncanFaulknerDuncanFaulkner
authored
fix: remove unused FlexLayoutModule imports and replace with specific directives (#83)
1 parent ff16689 commit 079e5fe

File tree

35 files changed

+326
-188
lines changed

35 files changed

+326
-188
lines changed

‎projects/apps/updated-demo/src/app/pages/dashboard/dashboard.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { Component } from '@angular/core';
22
import { MatCardModule } from '@angular/material/card';
3-
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
43

54
@Component({
65
selector: 'app-dashboard',
7-
imports: [MatCardModule, FlexLayoutModule],
6+
imports: [MatCardModule],
87
template: `<h1>Ngx-Layout</h1> `,
98
styles: [``],
109
})

‎projects/apps/updated-demo/src/app/pages/grid/layout/layout.component.ts‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
1+
import { NgStyle } from '@angular/common';
12
import { Component } from '@angular/core';
23
import { MatCardModule } from '@angular/material/card';
3-
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
4+
import {
5+
GridAreaDirective,
6+
GridAreasDirective,
7+
GridColumnsDirective,
8+
GridGapDirective,
9+
} from '@ngbracket/ngx-layout';
10+
import { StyleDirective } from 'projects/libs/flex-layout/extended/style/style';
411

512
@Component({
613
selector: 'app-grid-layout',
7-
imports: [MatCardModule, FlexLayoutModule],
14+
imports: [
15+
MatCardModule,
16+
NgStyle,
17+
StyleDirective,
18+
GridAreaDirective,
19+
GridGapDirective,
20+
GridAreasDirective,
21+
GridColumnsDirective,
22+
],
823
template: ` <mat-card class="card-demo">
924
<mat-card-title>Basic Responsive Grid App</mat-card-title>
1025
<mat-card-content class="containerX">

‎projects/apps/updated-demo/src/app/pages/grid/minmax/minmax.component.ts‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
import { Component } from '@angular/core';
22
import { MatCardModule } from '@angular/material/card';
3-
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
3+
import {
4+
GridColumnDirective,
5+
GridColumnsDirective,
6+
GridGapDirective,
7+
GridRowDirective,
8+
} from '@ngbracket/ngx-layout';
49

510
@Component({
611
selector: 'app-minmax',
7-
imports: [MatCardModule, FlexLayoutModule],
12+
imports: [
13+
MatCardModule,
14+
GridGapDirective,
15+
GridColumnDirective,
16+
GridColumnsDirective,
17+
GridRowDirective,
18+
],
819
template: ` <mat-card class="card-demo">
920
<mat-card-title>Grid with Minmax</mat-card-title>
1021
<mat-card-content class="containerX">
@@ -32,8 +43,6 @@ import { FlexLayoutModule } from '@ngbracket/ngx-layout';
3243
styles: [
3344
`
3445
.box {
35-
/*background-color: #444;*/
36-
/*color: #fff;*/
3746
border-radius: 5px;
3847
padding: 20px;
3948
font-size: 150%;

‎projects/apps/updated-demo/src/app/pages/grid/nested/nested.component.ts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
import { Component } from '@angular/core';
22
import { MatCardModule } from '@angular/material/card';
3-
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
3+
import {
4+
GridColumnDirective,
5+
GridColumnsDirective,
6+
GridGapDirective,
7+
GridRowDirective,
8+
GridRowsDirective,
9+
} from '@ngbracket/ngx-layout';
410

511
@Component({
612
selector: 'app-nested',
7-
imports: [MatCardModule, FlexLayoutModule],
13+
imports: [
14+
MatCardModule,
15+
GridGapDirective,
16+
GridColumnsDirective,
17+
GridRowsDirective,
18+
GridColumnDirective,
19+
GridRowDirective,
20+
],
821
template: ` <mat-card class="card-demo">
922
<mat-card-title>Nested Grid</mat-card-title>
1023
<mat-card-content class="containerX">

‎projects/apps/updated-demo/src/app/pages/grid/overlay/overlay.component.ts‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
11
import { Component } from '@angular/core';
22
import { MatCardModule } from '@angular/material/card';
3-
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
3+
import {
4+
GridAreasDirective,
5+
GridColumnDirective,
6+
GridColumnsDirective,
7+
GridGapDirective,
8+
GridRowDirective,
9+
} from '@ngbracket/ngx-layout';
410

511
@Component({
612
selector: 'app-overlay',
7-
imports: [MatCardModule, FlexLayoutModule],
13+
imports: [
14+
MatCardModule,
15+
GridGapDirective,
16+
GridColumnsDirective,
17+
GridAreasDirective,
18+
GridAreasDirective,
19+
GridColumnDirective,
20+
GridRowDirective,
21+
],
822
template: ` <mat-card class="card-demo">
923
<mat-card-title>Grid with Overlay</mat-card-title>
1024
<mat-card-content class="containerX">

‎projects/apps/updated-demo/src/app/pages/grid/position/position.component.ts‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
import { Component } from '@angular/core';
22
import { MatCardModule } from '@angular/material/card';
3-
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
3+
import {
4+
GridAreaDirective,
5+
GridAreasDirective,
6+
GridColumnsDirective,
7+
GridGapDirective,
8+
} from '@ngbracket/ngx-layout';
49

510
@Component({
611
selector: 'app-position',
7-
imports: [MatCardModule, FlexLayoutModule],
12+
imports: [
13+
MatCardModule,
14+
GridGapDirective,
15+
GridColumnsDirective,
16+
GridAreasDirective,
17+
GridAreaDirective,
18+
],
819
template: `<mat-card class="card-demo">
920
<mat-card-title>Grid with Positioning</mat-card-title>
1021
<mat-card-content class="containerX">

‎projects/apps/updated-demo/src/app/pages/layout/align-self/align-self.component.ts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
import { Component } from '@angular/core';
22
import { MatCardModule } from '@angular/material/card';
3-
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
3+
import {
4+
FlexAlignDirective,
5+
FlexDirective,
6+
LayoutAlignDirective,
7+
LayoutDirective,
8+
LayoutGapDirective,
9+
} from '@ngbracket/ngx-layout';
410

511
const ALIGN_OPTIONS = ['auto', 'start', 'center', 'baseline', 'end', 'stretch'];
612

713
@Component({
814
selector: 'app-align-self',
9-
imports: [MatCardModule, FlexLayoutModule],
15+
imports: [
16+
MatCardModule,
17+
FlexAlignDirective,
18+
FlexDirective,
19+
LayoutDirective,
20+
LayoutGapDirective,
21+
LayoutAlignDirective,
22+
],
1023
template: ` <mat-card class="card-demo">
1124
<mat-card-title>Flex with Align-Self</mat-card-title>
1225
<mat-card-subtitle

‎projects/apps/updated-demo/src/app/pages/layout/alignment/alignment.component.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,23 @@ import { FormsModule } from '@angular/forms';
33
import { MatButtonModule } from '@angular/material/button';
44
import { MatCardModule } from '@angular/material/card';
55
import { MatRadioModule } from '@angular/material/radio';
6-
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
6+
import { FlexDirective, ShowHideDirective } from '@ngbracket/ngx-layout';
7+
import { LayoutAlignDirective } from 'projects/libs/flex-layout/flex/layout-align/layout-align';
8+
import { LayoutDirective } from 'projects/libs/flex-layout/flex/layout/layout';
79

810
@Component({
911
selector: 'app-alignment',
1012
imports: [
1113
FormsModule,
14+
FlexDirective,
15+
LayoutAlignDirective,
16+
LayoutDirective,
17+
FlexDirective,
18+
LayoutDirective,
19+
LayoutAlignDirective,
20+
ShowHideDirective,
1221
MatRadioModule,
1322
MatCardModule,
14-
FlexLayoutModule,
1523
MatButtonModule,
1624
],
1725
template: ` <mat-card class="card-demo">

‎projects/apps/updated-demo/src/app/pages/layout/attribute-values/attribute-values.component.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import { Component } from '@angular/core';
22
import { MatCardModule } from '@angular/material/card';
3-
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
3+
import { FlexDirective, LayoutDirective } from '@ngbracket/ngx-layout';
44

55
@Component({
66
selector: 'app-attribute-values',
7-
imports: [MatCardModule, FlexLayoutModule],
7+
imports: [
8+
MatCardModule,
9+
FlexDirective,
10+
LayoutDirective,
11+
FlexDirective,
12+
LayoutDirective,
13+
],
814
template: `<mat-card class="card-demo">
915
<mat-card-title>Flex Attribute Values</mat-card-title>
1016
<mat-card-subtitle

‎projects/apps/updated-demo/src/app/pages/layout/direction/direction.component.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,21 @@ import { Direction } from '@angular/cdk/bidi';
22
import { Component } from '@angular/core';
33
import { MatButtonModule } from '@angular/material/button';
44
import { MatCardModule } from '@angular/material/card';
5-
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
5+
import {
6+
FlexOffsetDirective,
7+
LayoutDirective,
8+
LayoutGapDirective,
9+
} from '@ngbracket/ngx-layout';
610

711
@Component({
812
selector: 'app-direction',
9-
imports: [MatCardModule, MatButtonModule, FlexLayoutModule],
13+
imports: [
14+
MatCardModule,
15+
MatButtonModule,
16+
LayoutDirective,
17+
LayoutGapDirective,
18+
FlexOffsetDirective,
19+
],
1020
template: `
1121
<mat-card class="card-demo">
1222
<mat-card-title>Direction support for RTL</mat-card-title>

0 commit comments

Comments
 (0)