This commit is contained in:
geek 2018-05-30 21:04:53 +09:00
parent ea812f6e54
commit 7d17ca4880
15 changed files with 98 additions and 5 deletions

View File

@ -6,6 +6,8 @@ import { MemberModifyPasswordComponent } from './member-modify-password.componen
import { MemberProfileComponent } from './member-profile.component'; import { MemberProfileComponent } from './member-profile.component';
import { MemberPolicyComponent } from './member-policy.component'; import { MemberPolicyComponent } from './member-policy.component';
import { MemberTotpComponent } from './member-totp.component'; import { MemberTotpComponent } from './member-totp.component';
import { MemberConfirmResetPasswordComponent } from './member-confirm-reset-password.component';
import { MemberConfirmSignupComponent } from './member-confirm-signup.component';
export const COMPONENTS = [ export const COMPONENTS = [
MemberSigninComponent, MemberSigninComponent,
@ -16,4 +18,6 @@ export const COMPONENTS = [
MemberModifyPasswordComponent, MemberModifyPasswordComponent,
MemberPolicyComponent, MemberPolicyComponent,
MemberTotpComponent, MemberTotpComponent,
MemberConfirmResetPasswordComponent,
MemberConfirmSignupComponent,
]; ];

View File

@ -0,0 +1,3 @@
<div>
Your email has been verified. When you click the link button below, it goes to the password change screen.
</div>

View File

@ -0,0 +1,11 @@
import {Component, OnInit} from '@angular/core';
@Component({
selector: 'of-member-confirm-reset-password',
templateUrl: './member-confirm-reset-password.component.html',
})
export class MemberConfirmResetPasswordComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

View File

@ -0,0 +1,3 @@
<div>
Your email has been verified. Go to signin when you click the link button below.
</div>

View File

@ -0,0 +1,11 @@
import {Component, OnInit} from '@angular/core';
@Component({
selector: 'of-member-confirm-signup',
templateUrl: './member-confirm-signup.component.html',
})
export class MemberConfirmSignupComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

View File

@ -6,6 +6,8 @@ import { MemberResetPasswordContainerComponent } from './member-reset-password-c
import { MemberModifyPasswordContainerComponent } from './member-modify-password-container.component'; import { MemberModifyPasswordContainerComponent } from './member-modify-password-container.component';
import { MemberPolicyContainerComponent } from './member-policy-container.component'; import { MemberPolicyContainerComponent } from './member-policy-container.component';
import { MemberProfileContainerComponent } from './member-profile-container.component'; import { MemberProfileContainerComponent } from './member-profile-container.component';
import {MemberConfirmSignupContainerComponent} from './member-confirm-signup-container.component';
import {MemberConfirmResetPasswordContainerComponent} from './member-confirm-reset-password-container.component';
export const CONTAINERS = [ export const CONTAINERS = [
MemberSigninContainerComponent, MemberSigninContainerComponent,
@ -16,4 +18,6 @@ export const CONTAINERS = [
MemberModifyPasswordContainerComponent, MemberModifyPasswordContainerComponent,
MemberPolicyContainerComponent, MemberPolicyContainerComponent,
MemberProfileContainerComponent, MemberProfileContainerComponent,
MemberConfirmSignupContainerComponent,
MemberConfirmResetPasswordContainerComponent,
]; ];

View File

@ -0,0 +1 @@
<of-member-confirm-reset-password></of-member-confirm-reset-password>

View File

@ -0,0 +1,20 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import {Store} from '@ngrx/store';
@Component({
selector: 'of-member-confirm-reset-password-container',
templateUrl: './member-confirm-reset-password-container.component.html',
})
export class MemberConfirmResetPasswordContainerComponent implements OnInit {
@Input() token: string;
@Output() signin = new EventEmitter();
@Output() modifyPassword = new EventEmitter();
constructor(
private store: Store<any>,
) {
}
ngOnInit(): void {
}
}

View File

@ -0,0 +1 @@
<of-member-confirm-signup></of-member-confirm-signup>

View File

@ -0,0 +1,20 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import {Store} from '@ngrx/store';
@Component({
selector: 'of-member-confirm-signup-container',
templateUrl: './member-confirm-signup-container.component.html',
})
export class MemberConfirmSignupContainerComponent implements OnInit {
@Input() token: string;
@Output() signin = new EventEmitter();
constructor(
private store: Store<any>,
) {
}
ngOnInit(): void {
}
}

View File

@ -19,8 +19,8 @@ const routes: Routes = [
{ path: 'signup', component: SignupPageComponent }, { path: 'signup', component: SignupPageComponent },
{ path: 'reset-password', component: ResetPasswordPageComponent }, { path: 'reset-password', component: ResetPasswordPageComponent },
{ path: 'modify-password', component: ModifyPasswordPageComponent }, { path: 'modify-password', component: ModifyPasswordPageComponent },
// { path: 'confirm-signup', component: ConfirmSignupPageComponent }, { path: 'confirm-signup', component: ConfirmSignupPageComponent },
// { path: 'confirm-reset-password', component: ConfirmResetPasswordPageComponent } { path: 'confirm-reset-password', component: ConfirmResetPasswordPageComponent }
] ]
} }
]; ];

View File

@ -1,6 +1,11 @@
<div class="ui-g"> <div class="ui-g">
<div class="ui-g-12 ui-md-9 ui-lg-7"> <div class="ui-g-12 ui-md-9 ui-lg-7">
<!--<of-member-reset-password-container (signin)="onSignin()" (signup)="onSignup()"></of-member-reset-password-container>--> <!--<of-member-reset-password-container (signin)="onSignin()" (signup)="onSignup()"></of-member-reset-password-container>-->
<of-member-confirm-reset-password-container
[token]="token"
(signin)="onSignin()"
(modifyPassword)="onModifyPassword()"
></of-member-confirm-reset-password-container>
</div> </div>
<div class="ui-g-12 ui-md-3 ui-lg-5 login-descript"> <div class="ui-g-12 ui-md-3 ui-lg-5 login-descript">
<table class="login-table"> <table class="login-table">

View File

@ -15,7 +15,12 @@ export class ConfirmResetPasswordPageComponent implements OnInit {
) { } ) { }
ngOnInit() { ngOnInit() {
this.token = this.activatedRoute.snapshot.queryParams['token'] || '/'; this.token = this.activatedRoute.snapshot.queryParams['token'];
if (this.token === '' || this.token === null || this.token === undefined ) {
// warning message print
console.log('warning message print');
this.router.navigate(['/']);
}
} }
onModifyPassword() { onModifyPassword() {

View File

@ -1,6 +1,6 @@
<div class="ui-g"> <div class="ui-g">
<div class="ui-g-12 ui-md-9 ui-lg-7"> <div class="ui-g-12 ui-md-9 ui-lg-7">
<!--<of-member-modify-password-container (signin)="onSignin()"></of-member-modify-password-container>--> <of-member-confirm-signup-container [token]="token" (signin)="onSignin()"></of-member-confirm-signup-container>
</div> </div>
<div class="ui-g-12 ui-md-3 ui-lg-5 login-descript"> <div class="ui-g-12 ui-md-3 ui-lg-5 login-descript">
<table class="login-table"> <table class="login-table">

View File

@ -14,7 +14,12 @@ export class ConfirmSignupPageComponent implements OnInit {
) { } ) { }
ngOnInit() { ngOnInit() {
this.token = this.activatedRoute.snapshot.queryParams['token'] || '/'; this.token = this.activatedRoute.snapshot.queryParams['token'];
if (this.token === '' || this.token === null || this.token === undefined ) {
// warning message print
console.log('warning message print');
this.router.navigate(['/']);
}
} }
onSignin() { onSignin() {