Merge remote-tracking branch 'origin/master'

This commit is contained in:
geek 2018-05-30 15:19:12 +09:00
commit 1cdd48d873
3 changed files with 34 additions and 6 deletions

View File

@ -1,5 +1,5 @@
<div class="ui-g"> <div class="ui-g">
<div class="ui-g-12 ui-md-9 ui-lg-7"> <div class="ui-g-12">
<form [formGroup]="modifyPasswordForm" (ngSubmit)="modifyPasswordFormSubmit()"> <form [formGroup]="modifyPasswordForm" (ngSubmit)="modifyPasswordFormSubmit()">
<table class="login-table"> <table class="login-table">
<tr> <tr>

View File

@ -1,5 +1,5 @@
<div class="ui-g"> <div class="ui-g">
<div class="ui-g-12 ui-md-9 ui-lg-7"> <div class="ui-g-12">
<form [formGroup]="resetPasswordForm" (ngSubmit)="resetPasswordFormSubmit()"> <form [formGroup]="resetPasswordForm" (ngSubmit)="resetPasswordFormSubmit()">
<table class="login-table"> <table class="login-table">
<tr> <tr>

View File

@ -18,7 +18,7 @@
</p-dialog> </p-dialog>
<div class="ui-g" *ngIf="!member"> <div class="ui-g" *ngIf="!member">
<div class="ui-g-12 ui-md-9 ui-lg-7"> <div class="ui-g-12">
<form [formGroup]="signupForm" (ngSubmit)="signupFormSubmit()"> <form [formGroup]="signupForm" (ngSubmit)="signupFormSubmit()">
<table class="login-table"> <table class="login-table">
<tr> <tr>
@ -166,7 +166,35 @@
</div> </div>
</div> </div>
<div class="ui-g" *ngIf="member"> <div class="ui-g" *ngIf="member">
sdklsdlkfklsdfklsdklfskldfjk <div class="ui-g-12">
{{member.email}} <table class="login-table">
</div> <tr>
<td>
<div class="login-panel ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<img src="assets/layout/images/overFlow_CI_blue_185.png">
</div>
<div class="ui-g-12 ui-g-padding-15">
<strong>회원 가입이 신청 되었습니다.</strong>
</div>
<div class="ui-g-12 ui-g-padding-15" style="text-align: left !important">
<p>입력하신 이메일로 인증 메일이 발송 되었습니다.</p>
<p>받으신 <strong>메일을 확인</strong> 하시고, <strong>인증을 완료</strong> 하시면 회원 가입이 완료 됩니다.</p>
<p>신청하신 이메일 주소는 <strong>{{member.email}}</strong> 입니다.</p>
</div>
<div class="ui-g-12 ui-g-padding-15">
<button type="submit" [disabled]="!signupForm.valid" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-icon-left">
<span class="ui-button-icon-left ui-c fa fa-fw ui-icon-home"></span>
<span class="ui-button-text ui-c">Go to Sign In</span>
</button>
</div>
</div>
</div>
</td>
</tr>
</table>
</div>
</div>