bug fixed

This commit is contained in:
richard-loafle
2020-03-31 17:30:33 +09:00
parent 3a9ae7300f
commit 6935b9a69e
29 changed files with 1166 additions and 298 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "@ucap/ng-ui-authentication",
"version": "0.0.1",
"version": "0.0.5",
"publishConfig": {
"registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
},

View File

@@ -1,17 +1,12 @@
<div class="login-form">
<div
class="mat-title"
style="background-image: url(./assets/images/logo/bg_login_w160.png);"
>
{{ 'accounts.instructionsOfLogin' | ucapI18n }}
</div>
<div class="ucap-login-container">
<ng-content select="[ucapAuthenticationLogin='header']"></ng-content>
<form name="loginForm" [formGroup]="loginForm" novalidate>
<mat-form-field
[style.display]="!!curCompanyCode ? 'none' : 'block'"
class="login-company"
>
<mat-label>{{ 'accounts.fieldCompany' | ucapI18n }}</mat-label>
<mat-label>{{ 'login.fields.company' | ucapI18n }}</mat-label>
<mat-select [formControl]="companyCodeFormControl">
<mat-option
*ngFor="let company of companyList"
@@ -37,7 +32,7 @@
</svg>
</span>
<mat-form-field class="login-id">
<mat-label>{{ 'accounts.fieldLoginId' | ucapI18n }}</mat-label>
<mat-label>{{ 'login.fields.loginId' | ucapI18n }}</mat-label>
<input matInput [formControl]="loginIdFormControl" />
</mat-form-field>
</div>
@@ -72,7 +67,7 @@
</svg>
</span>
<mat-form-field class="login-pw">
<mat-label>{{ 'accounts.fieldLoginPw' | ucapI18n }}</mat-label>
<mat-label>{{ 'login.fields.loginPw' | ucapI18n }}</mat-label>
<input
matInput
type="password"
@@ -89,21 +84,21 @@
companyCodeFormControl.hasError('required')
"
>
{{ 'accounts.errors.requireCompany' | ucapI18n }}
{{ 'login.errors.requireCompany' | ucapI18n }}
</mat-error>
<mat-error
*ngIf="
loginIdFormControl.dirty && loginIdFormControl.hasError('required')
"
>
{{ 'accounts.errors.requireLoginId' | ucapI18n }}
{{ 'login.errors.requireLoginId' | ucapI18n }}
</mat-error>
<mat-error
*ngIf="
loginPwFormControl.dirty && loginPwFormControl.hasError('required')
"
>
{{ 'accounts.errors.requireLoginPw' | ucapI18n }}
{{ 'login.errors.requireLoginPw' | ucapI18n }}
</mat-error>
</div>
@@ -129,7 +124,7 @@
formControlName="rememberMe"
aria-label="Remember Me"
>
{{ 'accounts.rememberMe' | ucapI18n }}
{{ 'login.labels.rememberMe' | ucapI18n }}
</mat-checkbox>
<mat-checkbox
@@ -138,21 +133,10 @@
formControlName="autoLogin"
aria-label="Auto Login"
>
{{ 'accounts.autoLogin' | ucapI18n }}
{{ 'login.labels.autoLogin' | ucapI18n }}
</mat-checkbox>
</div>
</form>
<div class="register" fxLayout="column" fxLayoutAlign="center center">
<div *ngIf="false">
<span class="text">Don't have an account?</span>
<a class="link">Forgot Password?</a>
<a class="link">Create an account</a>
</div>
</div>
<div class="policy" (click)="onClickNoti()">
<div class="icon-img"><i class="mid mdi-alarm-light"></i></div>
<a class="link">{{ !!notiText ? notiText : '개인정보 처리방침' }}</a>
</div>
<ng-content select="[ucapAuthenticationLogin='footer']"></ng-content>
</div>

View File

@@ -24,7 +24,7 @@ $login-max-height: 800px;
}
}
.login-form {
.ucap-login-container {
position: relative;
transform: scale(1);
width: 100%;
@@ -198,7 +198,7 @@ $login-max-height: 800px;
}
@include tab {
.login-form {
.ucap-login-container {
font-size: 0.9em;
.mat-title {
background-size: 90% auto;