Skip to content

Commit 74f06b2

Browse files
ismcagdasismcagdas
committed
#14: added hmr source. made minor refactorings.
1 parent 1c987c8 commit 74f06b2

File tree

9 files changed

+42
-60
lines changed

9 files changed

+42
-60
lines changed

‎angular/.angular-cli.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"project": {
44
"version": "1.0.0-beta.31",
5-
"name": "abp-project-name-template"
5+
"name": "abp-project-name-template"
66
},
77
"apps": [
88
{
@@ -66,7 +66,8 @@
6666
"environmentSource": "environments/environment.ts",
6767
"environments": {
6868
"dev": "environments/environment.ts",
69-
"prod": "environments/environment.prod.ts"
69+
"prod": "environments/environment.prod.ts",
70+
"hmr": "environments/environment.hmr.ts"
7071
}
7172
}
7273
],

‎angular/src/account/register/register.component.html

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,38 @@
11
<div [@routerTransition]>
2-
<div class="container">
3-
<div id="LoginArea" class="row">
4-
<div class="col-lg-12">
5-
<div class="well bs-component">
6-
<h3 class="form-title">{{l("SignUp")}}</h3>
7-
8-
<form #registerForm="ngForm" class="login-form" method="post" novalidate (ngSubmit)="save()">
9-
10-
<p class="hint">
11-
{{l("PersonalInformations")}}
12-
</p>
13-
14-
<div class="form-group">
15-
<label class="control-label visible-ie8 visible-ie9">{{l("Name")}}</label>
16-
<input class="form-control placeholder-no-fix" autoFocus type="text" placeholder="{{l('Name')}}" [(ngModel)]="model.name" name="Name" required maxlength="32" />
17-
</div>
18-
19-
<div class="form-group">
20-
<label class="control-label visible-ie8 visible-ie9">{{l("Surname")}}</label>
21-
<input class="form-control placeholder-no-fix" type="text" placeholder="{{l('Surname')}}" [(ngModel)]="model.surname" name="Surname" required maxlength="32" />
22-
</div>
23-
24-
<div class="form-group">
25-
<label class="control-label visible-ie8 visible-ie9">{{l("EmailAddress")}}</label>
26-
<input class="form-control placeholder-no-fix" type="email" placeholder="{{l('EmailAddress')}}" [(ngModel)]="model.emailAddress" name="EmailAddress" required maxlength="256" pattern="^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{1,})+$" />
27-
</div>
2+
<div class="container">
3+
<div id="LoginArea" class="row">
4+
<div class="col-lg-12">
5+
<div class="well bs-component">
6+
<h3 class="form-title">{{l("Register")}}</h3>
7+
<hr />
8+
<form #registerForm="ngForm" class="login-form" method="post" novalidate (ngSubmit)="save()">
9+
<div class="form-group">
10+
<input class="form-control placeholder-no-fix" autoFocus type="text" placeholder="{{l('Name')}}" [(ngModel)]="model.name" name="Name" required maxlength="32" />
11+
</div>
2812

29-
<p class="hint">
30-
{{l("AccountSettings")}}
31-
</p>
13+
<div class="form-group">
14+
<input class="form-control placeholder-no-fix" type="text" placeholder="{{l('Surname')}}" [(ngModel)]="model.surname" name="Surname" required maxlength="32" />
15+
</div>
3216

33-
<div class="form-group">
34-
<label class="control-label visible-ie8 visible-ie9">{{l("UserName")}}</label>
35-
<input class="form-control placeholder-no-fix input-ltr" type="text" autocomplete="off" placeholder="{{l('UserName')}}" name="UserName" [(ngModel)]="model.userName" required maxlength="32" />
36-
</div>
37-
<div class="form-group">
38-
<label class="control-label visible-ie8 visible-ie9">{{l("Password")}}</label>
39-
<input type="password" name="Password" class="form-control" [(ngModel)]="model.password" placeholder="{{l('Password')}}" required>
40-
</div>
17+
<div class="form-group">
18+
<input class="form-control placeholder-no-fix" type="email" placeholder="{{l('EmailAddress')}}" [(ngModel)]="model.emailAddress" name="EmailAddress" required maxlength="256" pattern="^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{1,})+$" />
19+
</div>
4120

42-
<div class="form-actions">
43-
<button [disabled]="saving" [routerLink]="['../login']" type="button" class="btn btn-default"><i class="fa fa-arrow-left"></i> {{l("Back")}}</button>
44-
<button type="submit" class="btn btn-success uppercase" [disabled]="!registerForm.form.valid"><i class="fa fa-check"></i> {{l("Submit")}}</button>
45-
</div>
21+
<div class="form-group">
22+
<input class="form-control placeholder-no-fix input-ltr" type="text" autocomplete="off" placeholder="{{l('UserName')}}" name="UserName" [(ngModel)]="model.userName" required maxlength="32" />
23+
</div>
24+
<div class="form-group">
25+
<input type="password" name="Password" class="form-control" [(ngModel)]="model.password" placeholder="{{l('Password')}}" required>
26+
</div>
4627

47-
</form>
48-
</div>
28+
<div class="form-actions">
29+
<button [disabled]="saving" [routerLink]="['../login']" type="button" class="btn btn-default"><i class="fa fa-arrow-left"></i> {{l("Back")}}</button>
30+
<button type="submit" class="btn btn-success uppercase" [disabled]="!registerForm.form.valid"><i class="fa fa-check"></i> {{l("Submit")}}</button>
4931
</div>
32+
33+
</form>
5034
</div>
35+
</div>
5136
</div>
37+
</div>
5238
</div>

‎angular/src/app/about/about.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="container">
1+
<div class="container" [@routerTransition]>
22
<div class="row">
33
<div class="col-md-12">
44
<h3>About This Template</h3>

‎angular/src/app/app-routing.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import { TenantsComponent } from './tenants/tenants.component';
1515
component: AppComponent,
1616
children: [
1717
{ path: 'home', component: HomeComponent, canActivate: [AppRouteGuard] },
18-
{ path: 'users', component: UsersComponent, data: { permission: 'Pages.Administration.Users' }, canActivate: [AppRouteGuard] },
19-
{ path: 'tenants', component: TenantsComponent, data: { permission: 'Pages.Administration.Tenants' }, canActivate: [AppRouteGuard] },
18+
{ path: 'users', component: UsersComponent, data: { permission: 'Pages.Users' }, canActivate: [AppRouteGuard] },
19+
{ path: 'tenants', component: TenantsComponent, data: { permission: 'Pages.Tenants' }, canActivate: [AppRouteGuard] },
2020
{ path: 'about', component: AboutComponent }
2121
]
2222
}

‎angular/src/app/home/home.component.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<h1>{{l('WellcomeMessage')}}</h1>
2-
<div class="row">
1+
<div [@routerTransition]>
2+
<h1>{{l('WellcomeMessage')}}</h1>
3+
<div class="row">
34
<div class="col-md-12">
45

56
</div>
6-
7+
</div>
78
</div>

‎angular/src/app/tenants/tenants.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div>
1+
<div [@routerTransition]>
22
<h1>{{l("Tenants")}}</h1>
33
<div class="row">
44
<div class="col-md-12">

‎angular/src/app/users/users.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div>
1+
<div [@routerTransition]>
22
<h1>{{l('Users')}}</h1>
33
<div class="row">
44
<div class="col-md-12">

‎angular/src/shared/auth/auth-route-guard.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class AppRouteGuard implements CanActivate, CanActivateChild {
4545
return '/account/login';
4646
}
4747

48-
if (this._permissionChecker.isGranted('Pages.Administration.Users')) {
48+
if (this._permissionChecker.isGranted('Pages.Users')) {
4949
return '/app/admin/users';
5050
}
5151

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/wwwroot/swagger/ui/index.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
<script src='lib/marked.js' type='text/javascript'></script>
2727
<script src='lib/swagger-oauth.js' type='text/javascript'></script>
2828

29-
<!-- Added for Anti Forgery Token Header -->
30-
<script src='/lib/abp-web-resources/Abp/Framework/scripts/abp.js' type='text/javascript'></script>
31-
3229
<!-- Some basic translations -->
3330
<!--<script src='lang/translator.js' type='text/javascript'></script>
3431
<script src='lang/ru.js' type='text/javascript'></script>
@@ -62,9 +59,6 @@
6259
if (window.SwaggerTranslator) {
6360
window.SwaggerTranslator.translate();
6461
}
65-
var csrfToken = abp.security.antiForgery.getToken();
66-
var csrfCookieAuth = new SwaggerClient.ApiKeyAuthorization(abp.security.antiForgery.tokenHeaderName, csrfToken, "header");
67-
swaggerUi.api.clientAuthorizations.add(abp.security.antiForgery.tokenHeaderName, csrfCookieAuth);
6862
},
6963
onFailure: function (data) {
7064
log("Unable to Load SwaggerUI");

0 commit comments

Comments
 (0)