Skip to content

Commit aa6359b

Browse files
mledourmledour
committed
Merge branch 'release/0.4.0'
2 parents 5388b05 + 2e478c5 commit aa6359b

31 files changed

+585
-394
lines changed

‎demo/src/app/+form/input-text/input-text.component.html‎

Lines changed: 84 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,88 @@
1-
<p>
2-
Input {{test}}
3-
</p>
1+
<mk-input-group>
2+
<mk-input-group-label>Input icons</mk-input-group-label>
3+
<mk-input-group-addon-left><i class="fa fa-warning"></i></mk-input-group-addon-left>
4+
<mk-input-group-addon-right><i class="fa fa-check"></i></mk-input-group-addon-right>
5+
<mk-input-group-content><input mkInputText value="toto" class="toto form-control"/></mk-input-group-content>
6+
</mk-input-group>
7+
<!--<div class="row">
8+
<div class="col-md-4 col-xs-12">
9+
<mk-box [isCollapsable]="false" [isRemovable]="false" header="Basic Input">
10+
<mk-input-text name="input-name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" #name="ngModel" minlength="4" maxlength="5" required placeholder="placeholder">
11+
<mk-input-text-label>Input label {{test}}</mk-input-text-label>
12+
</mk-input-text>
13+
</mk-box>
14+
</div>
15+
<div class="col-md-4 col-xs-12">
16+
<mk-box [isCollapsable]="false" [isRemovable]="false" header="Input with addons">
17+
<mk-input-text name="name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" addonLeft="@" addonRight="$" #name="ngModel" minlength="4" maxlength="5" required placeholder="toto">
18+
<mk-input-text-label>Input addons</mk-input-text-label>
19+
</mk-input-text>
20+
</mk-box>
21+
</div>
22+
<div class="col-md-4 col-xs-12">
23+
<mk-box [isCollapsable]="false" [isRemovable]="false" header="Input with icons">
24+
<mk-input-text name="name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" #name="ngModel" minlength="4" maxlength="5" required placeholder="toto">
25+
<mk-input-text-label>Input icons</mk-input-text-label>
26+
<mk-input-text-addon-left><i class="fa fa-warning"></i></mk-input-text-addon-left>
27+
<mk-input-text-addon-right><i class="fa fa-check"></i></mk-input-text-addon-right>
28+
</mk-input-text>
29+
</mk-box>
30+
</div>
31+
</div>
432
5-
<form>
6-
<div class="row">
7-
<mk-input-text name="name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" addonLeftIcon="fa fa-envelope" addonRight="$" #name="ngModel" minlength="4" maxlength="5" required size="large" placeholder="toto" wrapperClasses="col-xs-3 form-group">
8-
<mk-input-text-label><i class="fa fa-bell-o"></i> Input with warning</mk-input-text-label>
9-
<mk-input-text-addon-left>$</mk-input-text-addon-left>
10-
</mk-input-text>
11-
</div>
12-
</form>
33+
<div class="row">
34+
<div class="col-md-12">
35+
<mk-box [isCollapsable]="false" [isRemovable]="false" header="Input width">
36+
<mk-input-text name="input-name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" #name="ngModel" minlength="4" maxlength="5" required wrapperClasses="col-xs-6 form-group" placeholder="placeholder">
37+
<mk-input-text-label>Input label {{test}}</mk-input-text-label>
38+
</mk-input-text>
39+
<mk-input-text name="input-name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" #name="ngModel" minlength="4" maxlength="5" required wrapperClasses="col-xs-4 form-group" placeholder="placeholder">
40+
<mk-input-text-label>Input label {{test}}</mk-input-text-label>
41+
<mk-input-text-addon-left><i class="fa fa-warning"></i></mk-input-text-addon-left>
42+
</mk-input-text>
43+
<mk-input-text name="input-name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" #name="ngModel" minlength="4" maxlength="5" required wrapperClasses="col-xs-2 form-group" placeholder="placeholder">
44+
<mk-input-text-label>Input label {{test}}</mk-input-text-label>
45+
</mk-input-text>
46+
</mk-box>
47+
</div>
48+
</div>
1349
50+
<div class="row">
51+
<div class="col-md-4 col-xs-12">
52+
<mk-box [isCollapsable]="false" [isRemovable]="false" header="Basic Input">
53+
<mk-input-text name="input-name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" #name="ngModel" minlength="4" maxlength="5" size="large" required placeholder="placeholder">
54+
<mk-input-text-label>Large input {{test}}</mk-input-text-label>
55+
</mk-input-text>
56+
</mk-box>
57+
</div>
58+
<div class="col-md-4 col-xs-12">
59+
<mk-box [isCollapsable]="false" [isRemovable]="false" header="Input with addons">
60+
<mk-input-text name="input-name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" #name="ngModel" minlength="4" maxlength="5" required placeholder="placeholder">
61+
<mk-input-text-label>Default input {{test}}</mk-input-text-label>
62+
<mk-input-text-addon-left><i class="fa fa-warning"></i></mk-input-text-addon-left>
63+
</mk-input-text>
64+
</mk-box>
65+
</div>
66+
<div class="col-md-4 col-xs-12">
67+
<mk-box [isCollapsable]="false" [isRemovable]="false" header="Input with icons">
68+
<mk-input-text name="input-name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" #name="ngModel" minlength="4" maxlength="5" size="small" required placeholder="placeholder">
69+
<mk-input-text-label>Small Input {{test}}</mk-input-text-label>
70+
</mk-input-text>
71+
</mk-box>
72+
</div>
73+
</div>
74+
75+
76+
<mk-box>
77+
<form>
78+
<div class="row">
79+
<mk-input-text name="name" [(ngModel)]="test" #name="ngModel" (ngModelChange)="onChange($event)" addonRight="$" #name="ngModel" minlength="4" maxlength="5" required size="large" placeholder="toto" wrapperClasses="col-xs-3 form-group">
80+
<mk-input-text-label>Input with warning</mk-input-text-label>
81+
<mk-input-text-addon-left><i class="fa fa-warning"></i></mk-input-text-addon-left>
82+
</mk-input-text>
83+
</div>
84+
</form>
85+
</mk-box>
1486
<div *ngIf="name.invalid && (name.dirty || name.touched)" class="alert alert-danger">
1587
<div *ngIf="name.errors.required">
1688
Name is required.
@@ -21,4 +93,4 @@
2193
<div *ngIf="name.errors.maxlength">
2294
Name must be less than 6 characters long.
2395
</div>
24-
</div>
96+
</div>-->

‎demo/src/app/+form/input-text/input-text.component.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ import { Component, OnInit } from '@angular/core';
66
})
77
export class InputTextComponent implements OnInit {
88
public test: string = '';
9+
public classes = 'gogo toto';
910
constructor() { }
1011

1112
ngOnInit() {
13+
1214
}
1315

1416
onChange($event) {
15-
console.log($event);
17+
//console.log($event);
1618
}
1719
}

‎demo/src/app/+form/input-text/input-text.module.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ import { FormsModule } from '@angular/forms';
55
import { InputTextRoutingModule } from './input-text-routing.module';
66
import { InputTextComponent } from './input-text.component';
77

8-
import { InputTextModule as mkInputTextModule } from '../../../../../src';
8+
import { InputGroupModule, InputTextModule as mkInputTextModule, BoxModule } from '../../../../../src';
99

1010
@NgModule({
1111
imports: [
1212
CommonModule,
1313
FormsModule,
14+
BoxModule,
1415
InputTextRoutingModule,
15-
mkInputTextModule
16+
mkInputTextModule,
17+
InputGroupModule
1618
],
1719
declarations: [InputTextComponent]
1820
})

‎demo/src/app/admin-lte.conf.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export var adminLteConf = {
2828
{label: 'Small Box', route: 'boxs/small-box'}
2929
]},
3030
{label: 'Dropdown', route: 'dropdown', iconClasses: 'fa fa-arrows-v'},
31-
//{label: 'Form', iconClasses: 'fa fa-files-o', children: [
32-
//{label: 'Input Text', route: 'form/input-text'}
33-
//]},
31+
{label: 'Form', iconClasses: 'fa fa-files-o', children: [
32+
{label: 'Input Text', route: 'form/input-text'}
33+
]},
3434
{label: 'Tabs', route: 'tabs', iconClasses: 'fa fa-th'}
3535
]
3636
};

‎demo/src/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<meta name="viewport" content="width=device-width, initial-scale=1">
99
<link rel="icon" type="image/x-icon" href="favicon.ico">
10-
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro" rel="stylesheet">
10+
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic" rel="stylesheet">
1111
</head>
1212
<body>
1313
<app-root></app-root>

‎ng-package.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"$schema": "./node_modules/ng-packagr/ng-package.schema.json",
3+
"src": "src",
4+
"dest": "dist",
5+
"workingDirectory": ".ng_build",
6+
"lib": {
7+
"entryFile": "index.ts"
8+
}
9+
}

0 commit comments

Comments
 (0)