Skip to content

Commit 68040d6

Browse files
authored
Merge pull request #19 from iyilm4z/master
login ui refactored
2 parents c419cdd + e1b462e commit 68040d6

File tree

1 file changed

+74
-52
lines changed

1 file changed

+74
-52
lines changed
Lines changed: 74 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,77 @@
11
<div class="card" [@routerTransition]>
2-
<div class="body">
3-
<form novalidate
4-
autocomplete="off"
5-
#loginForm="ngForm"
6-
(ngSubmit)="login()">
7-
<h4 class="text-center">{{ "LogIn" | localize }}</h4>
8-
<mat-form-field>
9-
<span matPrefix>
10-
<mat-icon matPrefix>person</mat-icon>&nbsp;
11-
</span>
12-
<input matInput
13-
name="userNameOrEmailAddress"
14-
[(ngModel)]="loginService.authenticateModel.userNameOrEmailAddress"
15-
[placeholder]="'UserNameOrEmail' | localize"
16-
autocomplete="off"
17-
required
18-
maxlength="255">
19-
</mat-form-field>
20-
<mat-form-field>
21-
<span matPrefix>
22-
<mat-icon matPrefix>lock</mat-icon>&nbsp;
23-
</span>
24-
<input matInput
25-
type="password"
26-
name="password"
27-
[(ngModel)]="loginService.authenticateModel.password"
28-
[placeholder]="'Password' | localize"
29-
required
30-
maxlength="32">
31-
</mat-form-field>
32-
<div class="row">
33-
<div class="col-xs-8 p-t-5">
34-
<mat-checkbox name="rememberMe" [(ngModel)]="loginService.rememberMe">
35-
{{ "RememberMe" | localize }}
36-
</mat-checkbox>
37-
</div>
38-
<div class="col-xs-4">
39-
<button mat-flat-button
40-
type="submit"
41-
flex="15"
42-
color="accent"
43-
[disabled]="!loginForm.form.valid || submitting">
44-
{{ "LogIn" | localize }}
45-
</button>
46-
</div>
2+
<div class="body">
3+
<form
4+
novalidate
5+
autocomplete="off"
6+
#loginForm="ngForm"
7+
(ngSubmit)="login()"
8+
>
9+
<h4 class="text-center">{{ "LogIn" | localize }}</h4>
10+
<div class="row clearfix">
11+
<div class="col-xs-12">
12+
<div class="input-group">
13+
<span class="input-group-addon">
14+
<i class="material-icons">person</i>
15+
</span>
16+
<div>
17+
<mat-form-field>
18+
<input
19+
matInput
20+
name="userNameOrEmailAddress"
21+
[(ngModel)]="
22+
loginService.authenticateModel.userNameOrEmailAddress
23+
"
24+
[placeholder]="'UserNameOrEmail' | localize"
25+
autocomplete="off"
26+
required
27+
maxlength="255"
28+
/>
29+
</mat-form-field>
4730
</div>
48-
<div class="row m-t-15 m-b--20" *ngIf="isSelfRegistrationAllowed">
49-
<div class="col-xs-12">
50-
<a [routerLink]="['../register']">{{ "Register" | localize }}</a>
51-
</div>
31+
</div>
32+
<div class="input-group">
33+
<span class="input-group-addon">
34+
<i class="material-icons">lock</i>
35+
</span>
36+
<div>
37+
<mat-form-field>
38+
<input
39+
matInput
40+
type="password"
41+
name="password"
42+
[(ngModel)]="loginService.authenticateModel.password"
43+
[placeholder]="'Password' | localize"
44+
required
45+
maxlength="32"
46+
/>
47+
</mat-form-field>
5248
</div>
53-
</form>
54-
</div>
55-
</div>
49+
</div>
50+
</div>
51+
</div>
52+
<div class="row">
53+
<div class="col-xs-8 p-t-5">
54+
<mat-checkbox name="rememberMe" [(ngModel)]="loginService.rememberMe">
55+
{{ "RememberMe" | localize }}
56+
</mat-checkbox>
57+
</div>
58+
<div class="col-xs-4">
59+
<button
60+
mat-flat-button
61+
type="submit"
62+
flex="15"
63+
color="accent"
64+
[disabled]="!loginForm.form.valid || submitting"
65+
>
66+
{{ "LogIn" | localize }}
67+
</button>
68+
</div>
69+
</div>
70+
<div class="row m-t-15 m-b--20" *ngIf="isSelfRegistrationAllowed">
71+
<div class="col-xs-12">
72+
<a [routerLink]="['../register']">{{ "Register" | localize }}</a>
73+
</div>
74+
</div>
75+
</form>
76+
</div>
77+
</div>

0 commit comments

Comments
 (0)