From 7d17ca48803d79cf4e49acd2cbd442f7282cc8f7 Mon Sep 17 00:00:00 2001
From: geek <geek@loafle.com>
Date: Wed, 30 May 2018 21:04:53 +0900
Subject: [PATCH] ing

---
 @overflow/member/component/index.ts           |  4 ++++
 ...mber-confirm-reset-password.component.html |  3 +++
 ...member-confirm-reset-password.component.ts | 11 ++++++++++
 .../member-confirm-signup.component.html      |  3 +++
 .../member-confirm-signup.component.ts        | 11 ++++++++++
 @overflow/member/container/index.ts           |  4 ++++
 ...rm-reset-password-container.component.html |  1 +
 ...firm-reset-password-container.component.ts | 20 +++++++++++++++++++
 ...er-confirm-signup-container.component.html |  1 +
 ...mber-confirm-signup-container.component.ts | 20 +++++++++++++++++++
 .../pages/auth/auth-page-routing.module.ts    |  4 ++--
 ...confirm-reset-password-page.component.html |  5 +++++
 .../confirm-reset-password-page.component.ts  |  7 ++++++-
 .../confirm-signup-page.component.html        |  2 +-
 .../confirm/confirm-signup-page.component.ts  |  7 ++++++-
 15 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 @overflow/member/component/member-confirm-reset-password.component.html
 create mode 100644 @overflow/member/component/member-confirm-reset-password.component.ts
 create mode 100644 @overflow/member/component/member-confirm-signup.component.html
 create mode 100644 @overflow/member/component/member-confirm-signup.component.ts
 create mode 100644 @overflow/member/container/member-confirm-reset-password-container.component.html
 create mode 100644 @overflow/member/container/member-confirm-reset-password-container.component.ts
 create mode 100644 @overflow/member/container/member-confirm-signup-container.component.html
 create mode 100644 @overflow/member/container/member-confirm-signup-container.component.ts

diff --git a/@overflow/member/component/index.ts b/@overflow/member/component/index.ts
index 835746c..ce708c7 100644
--- a/@overflow/member/component/index.ts
+++ b/@overflow/member/component/index.ts
@@ -6,6 +6,8 @@ import { MemberModifyPasswordComponent } from './member-modify-password.componen
 import { MemberProfileComponent } from './member-profile.component';
 import { MemberPolicyComponent } from './member-policy.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 = [
   MemberSigninComponent,
@@ -16,4 +18,6 @@ export const COMPONENTS = [
   MemberModifyPasswordComponent,
   MemberPolicyComponent,
   MemberTotpComponent,
+  MemberConfirmResetPasswordComponent,
+  MemberConfirmSignupComponent,
 ];
diff --git a/@overflow/member/component/member-confirm-reset-password.component.html b/@overflow/member/component/member-confirm-reset-password.component.html
new file mode 100644
index 0000000..6091c62
--- /dev/null
+++ b/@overflow/member/component/member-confirm-reset-password.component.html
@@ -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>
diff --git a/@overflow/member/component/member-confirm-reset-password.component.ts b/@overflow/member/component/member-confirm-reset-password.component.ts
new file mode 100644
index 0000000..22ef66c
--- /dev/null
+++ b/@overflow/member/component/member-confirm-reset-password.component.ts
@@ -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 {
+  }
+}
diff --git a/@overflow/member/component/member-confirm-signup.component.html b/@overflow/member/component/member-confirm-signup.component.html
new file mode 100644
index 0000000..d6c52f6
--- /dev/null
+++ b/@overflow/member/component/member-confirm-signup.component.html
@@ -0,0 +1,3 @@
+<div>
+  Your email has been verified. Go to signin when you click the link button below.
+</div>
diff --git a/@overflow/member/component/member-confirm-signup.component.ts b/@overflow/member/component/member-confirm-signup.component.ts
new file mode 100644
index 0000000..3f4d0f1
--- /dev/null
+++ b/@overflow/member/component/member-confirm-signup.component.ts
@@ -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 {
+  }
+}
diff --git a/@overflow/member/container/index.ts b/@overflow/member/container/index.ts
index c2807c6..eeb4372 100644
--- a/@overflow/member/container/index.ts
+++ b/@overflow/member/container/index.ts
@@ -6,6 +6,8 @@ import { MemberResetPasswordContainerComponent } from './member-reset-password-c
 import { MemberModifyPasswordContainerComponent } from './member-modify-password-container.component';
 import { MemberPolicyContainerComponent } from './member-policy-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 = [
   MemberSigninContainerComponent,
@@ -16,4 +18,6 @@ export const CONTAINERS = [
   MemberModifyPasswordContainerComponent,
   MemberPolicyContainerComponent,
   MemberProfileContainerComponent,
+  MemberConfirmSignupContainerComponent,
+  MemberConfirmResetPasswordContainerComponent,
 ];
diff --git a/@overflow/member/container/member-confirm-reset-password-container.component.html b/@overflow/member/container/member-confirm-reset-password-container.component.html
new file mode 100644
index 0000000..9a84edd
--- /dev/null
+++ b/@overflow/member/container/member-confirm-reset-password-container.component.html
@@ -0,0 +1 @@
+<of-member-confirm-reset-password></of-member-confirm-reset-password>
diff --git a/@overflow/member/container/member-confirm-reset-password-container.component.ts b/@overflow/member/container/member-confirm-reset-password-container.component.ts
new file mode 100644
index 0000000..709c02f
--- /dev/null
+++ b/@overflow/member/container/member-confirm-reset-password-container.component.ts
@@ -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 {
+  }
+}
diff --git a/@overflow/member/container/member-confirm-signup-container.component.html b/@overflow/member/container/member-confirm-signup-container.component.html
new file mode 100644
index 0000000..ca864f3
--- /dev/null
+++ b/@overflow/member/container/member-confirm-signup-container.component.html
@@ -0,0 +1 @@
+<of-member-confirm-signup></of-member-confirm-signup>
diff --git a/@overflow/member/container/member-confirm-signup-container.component.ts b/@overflow/member/container/member-confirm-signup-container.component.ts
new file mode 100644
index 0000000..9a82fc4
--- /dev/null
+++ b/@overflow/member/container/member-confirm-signup-container.component.ts
@@ -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 {
+  }
+}
diff --git a/src/app/pages/auth/auth-page-routing.module.ts b/src/app/pages/auth/auth-page-routing.module.ts
index 24a6b2b..330931f 100644
--- a/src/app/pages/auth/auth-page-routing.module.ts
+++ b/src/app/pages/auth/auth-page-routing.module.ts
@@ -19,8 +19,8 @@ const routes: Routes = [
       { path: 'signup', component: SignupPageComponent },
       { path: 'reset-password', component: ResetPasswordPageComponent },
       { path: 'modify-password', component: ModifyPasswordPageComponent },
-      // { path: 'confirm-signup', component: ConfirmSignupPageComponent },
-      // { path: 'confirm-reset-password', component: ConfirmResetPasswordPageComponent }
+      { path: 'confirm-signup', component: ConfirmSignupPageComponent },
+      { path: 'confirm-reset-password', component: ConfirmResetPasswordPageComponent }
     ]
   }
 ];
diff --git a/src/app/pages/auth/confirm/confirm-reset-password-page.component.html b/src/app/pages/auth/confirm/confirm-reset-password-page.component.html
index 9eacd70..47f5cd5 100644
--- a/src/app/pages/auth/confirm/confirm-reset-password-page.component.html
+++ b/src/app/pages/auth/confirm/confirm-reset-password-page.component.html
@@ -1,6 +1,11 @@
 <div class="ui-g">
   <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-confirm-reset-password-container
+      [token]="token"
+      (signin)="onSignin()"
+      (modifyPassword)="onModifyPassword()"
+    ></of-member-confirm-reset-password-container>
   </div>
   <div class="ui-g-12 ui-md-3 ui-lg-5 login-descript">
     <table class="login-table">
diff --git a/src/app/pages/auth/confirm/confirm-reset-password-page.component.ts b/src/app/pages/auth/confirm/confirm-reset-password-page.component.ts
index eca2d3c..852fab4 100644
--- a/src/app/pages/auth/confirm/confirm-reset-password-page.component.ts
+++ b/src/app/pages/auth/confirm/confirm-reset-password-page.component.ts
@@ -15,7 +15,12 @@ export class ConfirmResetPasswordPageComponent implements OnInit {
   ) { }
 
   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() {
diff --git a/src/app/pages/auth/confirm/confirm-signup-page.component.html b/src/app/pages/auth/confirm/confirm-signup-page.component.html
index 7469d82..0bf0bb7 100644
--- a/src/app/pages/auth/confirm/confirm-signup-page.component.html
+++ b/src/app/pages/auth/confirm/confirm-signup-page.component.html
@@ -1,6 +1,6 @@
 <div class="ui-g">
   <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 class="ui-g-12 ui-md-3 ui-lg-5 login-descript">
     <table class="login-table">
diff --git a/src/app/pages/auth/confirm/confirm-signup-page.component.ts b/src/app/pages/auth/confirm/confirm-signup-page.component.ts
index 3e128d3..6f951c6 100644
--- a/src/app/pages/auth/confirm/confirm-signup-page.component.ts
+++ b/src/app/pages/auth/confirm/confirm-signup-page.component.ts
@@ -14,7 +14,12 @@ export class ConfirmSignupPageComponent implements OnInit {
   ) { }
 
   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() {