tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

feat(account): make auth wrapper component replaceable 

#2404
pull/2522/head
mehmet-erim 7 years ago
parent
8f78d2371b
commit
e9f8d90a1f
4 changed files with 139 additions and 114 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 132
      npm/ng-packs/packages/account/src/lib/components/login/login.component.html
  2. 109
      npm/ng-packs/packages/account/src/lib/components/register/register.component.html
  3. 11
      npm/ng-packs/packages/account/src/lib/models/account.ts
  4. 1
      npm/ng-packs/packages/account/src/lib/models/index.ts

132
npm/ng-packs/packages/account/src/lib/components/login/login.component.html
View File

@ -1,64 +1,74 @@
<abp-auth-wrapper [mainContentRef]="mainContentRef" [cancelContentRef]="cancelContentRef"> <abp-auth-wrapper
<ng-template #mainContentRef> *abpReplaceableTemplate="{
<h4>{{ 'AbpAccount::Login' | abpLocalization }}</h4> componentKey: 'Account.AuthWrapperComponent',
<strong> inputs: {
{{ 'AbpAccount::AreYouANewUser' | abpLocalization }} mainContentRef: { value: mainContentRef },
<a class="text-decoration-none" routerLink="/account/register">{{ cancelContentRef: { value: cancelContentRef }
'AbpAccount::Register' | abpLocalization }
}}</a> }"
</strong> [mainContentRef]="mainContentRef"
<form [formGroup]="form" (ngSubmit)="onSubmit()" validateOnSubmit class="mt-4"> [cancelContentRef]="cancelContentRef"
<div class="form-group"> >
<label for="login-input-user-name-or-email-address">{{ </abp-auth-wrapper>
'AbpAccount::UserNameOrEmailAddress' | abpLocalization <ng-template #mainContentRef>
}}</label> <h4>{{ 'AbpAccount::Login' | abpLocalization }}</h4>
<input <strong>
class="form-control" {{ 'AbpAccount::AreYouANewUser' | abpLocalization }}
type="text" <a class="text-decoration-none" routerLink="/account/register">{{
id="login-input-user-name-or-email-address" 'AbpAccount::Register' | abpLocalization
formControlName="username" }}</a>
autocomplete="username" </strong>
autofocus <form [formGroup]="form" (ngSubmit)="onSubmit()" validateOnSubmit class="mt-4">
/> <div class="form-group">
</div> <label for="login-input-user-name-or-email-address">{{
<div class="form-group"> 'AbpAccount::UserNameOrEmailAddress' | abpLocalization
<label for="login-input-password">{{ 'AbpAccount::Password' | abpLocalization }}</label> }}</label>
<input
class="form-control"
type="text"
id="login-input-user-name-or-email-address"
formControlName="username"
autocomplete="username"
autofocus
/>
</div>
<div class="form-group">
<label for="login-input-password">{{ 'AbpAccount::Password' | abpLocalization }}</label>
<input
class="form-control"
type="password"
id="login-input-password"
formControlName="password"
autocomplete="current-password"
/>
</div>
<div class="form-check" validationTarget validationStyle>
<label class="form-check-label" for="login-input-remember-me">
<input <input
class="form-control" class="form-check-input"
type="password" type="checkbox"
id="login-input-password" id="login-input-remember-me"
formControlName="password" formControlName="remember"
autocomplete="current-password"
/> />
</div> {{ 'AbpAccount::RememberMe' | abpLocalization }}
<div class="form-check" validationTarget validationStyle> </label>
<label class="form-check-label" for="login-input-remember-me">
<input
class="form-check-input"
type="checkbox"
id="login-input-remember-me"
formControlName="remember"
/>
{{ 'AbpAccount::RememberMe' | abpLocalization }}
</label>
</div>
<abp-button
[loading]="inProgress"
buttonType="submit"
name="Action"
buttonClass="btn-block btn-lg mt-3 btn btn-primary"
>
{{ 'AbpAccount::Login' | abpLocalization }}
</abp-button>
</form>
</ng-template>
<ng-template #cancelContentRef>
<div class="card-footer text-center border-0">
<a routerLink="/">
<button type="button" name="Action" value="Cancel" class="px-2 py-0 btn btn-link">
{{ 'AbpAccount::Cancel' | abpLocalization }}
</button>
</a>
</div> </div>
</ng-template> <abp-button
</abp-auth-wrapper> [loading]="inProgress"
buttonType="submit"
name="Action"
buttonClass="btn-block btn-lg mt-3 btn btn-primary"
>
{{ 'AbpAccount::Login' | abpLocalization }}
</abp-button>
</form>
</ng-template>
<ng-template #cancelContentRef>
<div class="card-footer text-center border-0">
<a routerLink="/">
<button type="button" name="Action" value="Cancel" class="px-2 py-0 btn btn-link">
{{ 'AbpAccount::Cancel' | abpLocalization }}
</button>
</a>
</div>
</ng-template>

109
npm/ng-packs/packages/account/src/lib/components/register/register.component.html
View File

@ -1,54 +1,57 @@
<abp-auth-wrapper [mainContentRef]="mainContentRef"> <abp-auth-wrapper
<ng-template #mainContentRef> *abpReplaceableTemplate="{
<h4>{{ 'AbpAccount::Register' | abpLocalization }}</h4> componentKey: 'Account.AuthWrapperComponent',
<strong> inputs: {
{{ 'AbpAccount::AlreadyRegistered' | abpLocalization }} mainContentRef: { value: mainContentRef }
<a class="text-decoration-none" routerLink="/account/login">{{ }
'AbpAccount::Login' | abpLocalization }"
}}</a> [mainContentRef]="mainContentRef"
</strong> >
<form [formGroup]="form" (ngSubmit)="onSubmit()" validateOnSubmit class="mt-4">
<div class="form-group">
<label for="input-user-name">{{ 'AbpAccount::UserName' | abpLocalization }}</label
><span> * </span
><input
autofocus
type="text"
id="input-user-name"
class="form-control"
formControlName="username"
autocomplete="username"
/>
</div>
<div class="form-group">
<label for="input-email-address">{{ 'AbpAccount::EmailAddress' | abpLocalization }}</label
><span> * </span
><input
type="email"
id="input-email-address"
class="form-control"
formControlName="email"
/>
</div>
<div class="form-group">
<label for="input-password">{{ 'AbpAccount::Password' | abpLocalization }}</label
><span> * </span
><input
type="password"
id="input-password"
class="form-control"
formControlName="password"
autocomplete="current-password"
/>
</div>
<abp-button
[loading]="inProgress"
buttonType="submit"
name="Action"
buttonClass="btn-block btn-lg mt-3 btn btn-primary"
>
{{ 'AbpAccount::Register' | abpLocalization }}
</abp-button>
</form>
</ng-template>
</abp-auth-wrapper> </abp-auth-wrapper>
<ng-template #mainContentRef>
<h4>{{ 'AbpAccount::Register' | abpLocalization }}</h4>
<strong>
{{ 'AbpAccount::AlreadyRegistered' | abpLocalization }}
<a class="text-decoration-none" routerLink="/account/login">{{
'AbpAccount::Login' | abpLocalization
}}</a>
</strong>
<form [formGroup]="form" (ngSubmit)="onSubmit()" validateOnSubmit class="mt-4">
<div class="form-group">
<label for="input-user-name">{{ 'AbpAccount::UserName' | abpLocalization }}</label
><span> * </span
><input
autofocus
type="text"
id="input-user-name"
class="form-control"
formControlName="username"
autocomplete="username"
/>
</div>
<div class="form-group">
<label for="input-email-address">{{ 'AbpAccount::EmailAddress' | abpLocalization }}</label
><span> * </span
><input type="email" id="input-email-address" class="form-control" formControlName="email" />
</div>
<div class="form-group">
<label for="input-password">{{ 'AbpAccount::Password' | abpLocalization }}</label
><span> * </span
><input
type="password"
id="input-password"
class="form-control"
formControlName="password"
autocomplete="current-password"
/>
</div>
<abp-button
[loading]="inProgress"
buttonType="submit"
name="Action"
buttonClass="btn-block btn-lg mt-3 btn btn-primary"
>
{{ 'AbpAccount::Register' | abpLocalization }}
</abp-button>
</form>
</ng-template>

11
npm/ng-packs/packages/account/src/lib/models/account.ts
View File

@ -1,3 +1,14 @@
import { TemplateRef } from '@angular/core';
export namespace Account {
export interface AuthWrapperComponentInputs {
readonly mainContentRef: TemplateRef<any>;
readonly cancelContentRef?: TemplateRef<any>;
}
// tslint:disable-next-line: no-empty-interface
export interface AuthWrapperComponentOutputs {}
// tslint:disable-next-line: no-empty-interface // tslint:disable-next-line: no-empty-interface
export interface TenantBoxComponentInputs {} export interface TenantBoxComponentInputs {}

1
npm/ng-packs/packages/account/src/lib/models/index.ts
View File

@ -1,3 +1,4 @@
export * from './account';
export * from './options'; export * from './options';
export * from './user'; export * from './user';
export * from './tenant'; export * from './tenant';

Write Preview
Loading…
Cancel
Save