Skip to content

Commit e6ea4e3

Browse files
committed
#14: first prototype of login page
1 parent 5e56fed commit e6ea4e3

File tree

5 files changed

+6
-14
lines changed

5 files changed

+6
-14
lines changed

angular/src/account/account.module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ import { LoginService } from './login/login.service';
2929
AbpModule,
3030
CommonModule,
3131
ServiceProxyModule,
32-
AccountRoutingModule
32+
AccountRoutingModule,
33+
ModalModule.forRoot()
3334
],
3435
declarations: [
3536
AccountComponent,

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ <h3 class="form-title">{{l("SignUp")}}</h3>
3434
<label class="control-label visible-ie8 visible-ie9">{{l("Password")}}</label>
3535
<input type="password" name="Password" class="form-control" [(ngModel)]="model.password" #Password="ngModel" placeholder="{{l('Password')}}" validateEqual="PasswordRepeat"
3636
reverse="true" [minlength]="passwordComplexitySetting.minLength" [maxlength]="passwordComplexitySetting.maxPasswordLength"
37-
[useNumbers]="passwordComplexitySetting.useNumbers" [useUpperCaseLetters]="passwordComplexitySetting.useUpperCaseLetters"
38-
[useLowerCaseLetters]="passwordComplexitySetting.useLowerCaseLetters" [usePunctuations]="passwordComplexitySetting.usePunctuations"
3937
required>
4038
</div>
4139
<div class="form-group">
@@ -53,17 +51,10 @@ <h3 class="form-title">{{l("SignUp")}}</h3>
5351
<li [hidden]="!Password.errors.usePunctuations">{{l("PasswordComplexity_UsePunctuations_Hint")}}</li>
5452
</ul>
5553
</div>
56-
<p *ngIf="useCaptcha" class="hint">
57-
{{l("Captha_Hint")}}
58-
</p>
59-
60-
<div *ngIf="useCaptcha" class="form-group margin-bottom-20">
61-
<recaptcha (resolved)="captchaResolved($event)" siteKey="6LfD-wUTAAAAACULAVXvL61K0w02RIsjhI8EyiS-"></recaptcha>
62-
</div>
6354

6455
<div class="form-actions">
6556
<button [disabled]="saving" routerLink="/login" type="button" class="btn btn-default"><i class="fa fa-arrow-left"></i> {{l("Back")}}</button>
66-
<button type="submit" class="btn btn-success uppercase" [disabled]="!registerForm.form.valid" [buttonBusy]="saving" [busyText]="l('SavingWithThreeDot')"><i class="fa fa-check"></i> {{l("Submit")}}</button>
57+
<button type="submit" class="btn btn-success uppercase" [disabled]="!registerForm.form.valid"><i class="fa fa-check"></i> {{l("Submit")}}</button>
6758
</div>
6859

6960
</form>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export class AppRouteGuard implements CanActivate, CanActivateChild {
1919
) { }
2020

2121
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
22-
debugger;
2322
if (!this._sessionService.user) {
2423
this._router.navigate(['/account/login']);
2524
return false;

angular/src/shared/service-proxies/service-proxies.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export class SessionServiceProxy {
197197
*/
198198
getCurrentLoginInformations(): Observable<GetCurrentLoginInformationsOutput> {
199199
let url_ = this.baseUrl + "/api/services/app/Session/GetCurrentLoginInformations";
200-
debugger;
200+
201201
const content_ = "";
202202

203203
return this.http.request(url_, {

angular/src/shared/service-proxies/service-proxy.module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import * as ApiServiceProxies from './service-proxies';
88
ApiServiceProxies.SessionServiceProxy,
99
ApiServiceProxies.TenantServiceProxy,
1010
ApiServiceProxies.UserServiceProxy,
11-
ApiServiceProxies.TokenAuthServiceProxy
11+
ApiServiceProxies.TokenAuthServiceProxy,
12+
ApiServiceProxies.AccountServiceProxy
1213
]
1314
})
1415
export class ServiceProxyModule { }

0 commit comments

Comments
 (0)