From a81dca3232dc85c376a09ac5263813e3c23cb95b Mon Sep 17 00:00:00 2001 From: crusader Date: Thu, 1 Mar 2018 19:54:01 +0900 Subject: [PATCH] ing --- .../component/{ => modify}/modify.component.html | 0 .../component/{ => modify}/modify.component.scss | 0 .../component/{ => modify}/modify.component.spec.ts | 0 .../member/component/{ => modify}/modify.component.ts | 0 .../reset-password.component.html | 0 .../reset-password.component.scss | 0 .../reset-password.component.spec.ts | 0 .../{ => reset-password}/reset-password.component.ts | 0 .../component/{ => signin}/signin.component.html | 4 ++-- .../component/{ => signin}/signin.component.scss | 0 .../component/{ => signin}/signin.component.spec.ts | 0 .../member/component/{ => signin}/signin.component.ts | 11 +++++++---- .../component/{ => signup}/signup.component.html | 0 .../component/{ => signup}/signup.component.scss | 0 .../component/{ => signup}/signup.component.spec.ts | 0 .../member/component/{ => signup}/signup.component.ts | 0 src/app/packages/member/member.constant.ts | 2 +- src/app/packages/member/member.module.ts | 8 ++++---- 18 files changed, 14 insertions(+), 11 deletions(-) rename src/app/packages/member/component/{ => modify}/modify.component.html (100%) rename src/app/packages/member/component/{ => modify}/modify.component.scss (100%) rename src/app/packages/member/component/{ => modify}/modify.component.spec.ts (100%) rename src/app/packages/member/component/{ => modify}/modify.component.ts (100%) rename src/app/packages/member/component/{ => reset-password}/reset-password.component.html (100%) rename src/app/packages/member/component/{ => reset-password}/reset-password.component.scss (100%) rename src/app/packages/member/component/{ => reset-password}/reset-password.component.spec.ts (100%) rename src/app/packages/member/component/{ => reset-password}/reset-password.component.ts (100%) rename src/app/packages/member/component/{ => signin}/signin.component.html (94%) rename src/app/packages/member/component/{ => signin}/signin.component.scss (100%) rename src/app/packages/member/component/{ => signin}/signin.component.spec.ts (100%) rename src/app/packages/member/component/{ => signin}/signin.component.ts (84%) rename src/app/packages/member/component/{ => signup}/signup.component.html (100%) rename src/app/packages/member/component/{ => signup}/signup.component.scss (100%) rename src/app/packages/member/component/{ => signup}/signup.component.spec.ts (100%) rename src/app/packages/member/component/{ => signup}/signup.component.ts (100%) diff --git a/src/app/packages/member/component/modify.component.html b/src/app/packages/member/component/modify/modify.component.html similarity index 100% rename from src/app/packages/member/component/modify.component.html rename to src/app/packages/member/component/modify/modify.component.html diff --git a/src/app/packages/member/component/modify.component.scss b/src/app/packages/member/component/modify/modify.component.scss similarity index 100% rename from src/app/packages/member/component/modify.component.scss rename to src/app/packages/member/component/modify/modify.component.scss diff --git a/src/app/packages/member/component/modify.component.spec.ts b/src/app/packages/member/component/modify/modify.component.spec.ts similarity index 100% rename from src/app/packages/member/component/modify.component.spec.ts rename to src/app/packages/member/component/modify/modify.component.spec.ts diff --git a/src/app/packages/member/component/modify.component.ts b/src/app/packages/member/component/modify/modify.component.ts similarity index 100% rename from src/app/packages/member/component/modify.component.ts rename to src/app/packages/member/component/modify/modify.component.ts diff --git a/src/app/packages/member/component/reset-password.component.html b/src/app/packages/member/component/reset-password/reset-password.component.html similarity index 100% rename from src/app/packages/member/component/reset-password.component.html rename to src/app/packages/member/component/reset-password/reset-password.component.html diff --git a/src/app/packages/member/component/reset-password.component.scss b/src/app/packages/member/component/reset-password/reset-password.component.scss similarity index 100% rename from src/app/packages/member/component/reset-password.component.scss rename to src/app/packages/member/component/reset-password/reset-password.component.scss diff --git a/src/app/packages/member/component/reset-password.component.spec.ts b/src/app/packages/member/component/reset-password/reset-password.component.spec.ts similarity index 100% rename from src/app/packages/member/component/reset-password.component.spec.ts rename to src/app/packages/member/component/reset-password/reset-password.component.spec.ts diff --git a/src/app/packages/member/component/reset-password.component.ts b/src/app/packages/member/component/reset-password/reset-password.component.ts similarity index 100% rename from src/app/packages/member/component/reset-password.component.ts rename to src/app/packages/member/component/reset-password/reset-password.component.ts diff --git a/src/app/packages/member/component/signin.component.html b/src/app/packages/member/component/signin/signin.component.html similarity index 94% rename from src/app/packages/member/component/signin.component.html rename to src/app/packages/member/component/signin/signin.component.html index 8571642..d8b9905 100644 --- a/src/app/packages/member/component/signin.component.html +++ b/src/app/packages/member/component/signin/signin.component.html @@ -3,7 +3,7 @@ Register an account -
+ @@ -19,7 +19,7 @@ {{ formErrors.password }} - +
diff --git a/src/app/packages/member/component/signin.component.scss b/src/app/packages/member/component/signin/signin.component.scss similarity index 100% rename from src/app/packages/member/component/signin.component.scss rename to src/app/packages/member/component/signin/signin.component.scss diff --git a/src/app/packages/member/component/signin.component.spec.ts b/src/app/packages/member/component/signin/signin.component.spec.ts similarity index 100% rename from src/app/packages/member/component/signin.component.spec.ts rename to src/app/packages/member/component/signin/signin.component.spec.ts diff --git a/src/app/packages/member/component/signin.component.ts b/src/app/packages/member/component/signin/signin.component.ts similarity index 84% rename from src/app/packages/member/component/signin.component.ts rename to src/app/packages/member/component/signin/signin.component.ts index c0f8997..80f5585 100644 --- a/src/app/packages/member/component/signin.component.ts +++ b/src/app/packages/member/component/signin/signin.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { Store } from '@ngrx/store'; -import * as AuthStore from '../store/auth'; +import * as AuthStore from '../../store/auth'; @Component({ selector: 'of-member-signin', @@ -22,7 +22,9 @@ export class SigninComponent implements OnInit { private router: Router, private store: Store, private formBuilder: FormBuilder, - ) { } + ) { + console.log(this.store); + } ngOnInit() { this.initForm(); @@ -52,7 +54,8 @@ export class SigninComponent implements OnInit { signupBtnClick() { this.router.navigateByUrl('/auth/signup'); } - login() { - console.log('signin component login fnc'); + signin() { + this.store.dispatch(new AuthStore.Signin(this.signinForm.value)); + console.log('signin component signin fnc'); } } diff --git a/src/app/packages/member/component/signup.component.html b/src/app/packages/member/component/signup/signup.component.html similarity index 100% rename from src/app/packages/member/component/signup.component.html rename to src/app/packages/member/component/signup/signup.component.html diff --git a/src/app/packages/member/component/signup.component.scss b/src/app/packages/member/component/signup/signup.component.scss similarity index 100% rename from src/app/packages/member/component/signup.component.scss rename to src/app/packages/member/component/signup/signup.component.scss diff --git a/src/app/packages/member/component/signup.component.spec.ts b/src/app/packages/member/component/signup/signup.component.spec.ts similarity index 100% rename from src/app/packages/member/component/signup.component.spec.ts rename to src/app/packages/member/component/signup/signup.component.spec.ts diff --git a/src/app/packages/member/component/signup.component.ts b/src/app/packages/member/component/signup/signup.component.ts similarity index 100% rename from src/app/packages/member/component/signup.component.ts rename to src/app/packages/member/component/signup/signup.component.ts diff --git a/src/app/packages/member/member.constant.ts b/src/app/packages/member/member.constant.ts index 485bf09..99769e5 100644 --- a/src/app/packages/member/member.constant.ts +++ b/src/app/packages/member/member.constant.ts @@ -1,3 +1,3 @@ export const MODULE = { - name: 'Member' + name: 'member' }; diff --git a/src/app/packages/member/member.module.ts b/src/app/packages/member/member.module.ts index bad2b6b..d1d27df 100644 --- a/src/app/packages/member/member.module.ts +++ b/src/app/packages/member/member.module.ts @@ -5,10 +5,10 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { ModifyComponent } from './component/modify.component'; -import { SigninComponent } from './component/signin.component'; -import { SignupComponent } from './component/signup.component'; -import { ResetPasswordComponent } from './component/reset-password.component'; +import { ModifyComponent } from './component/modify/modify.component'; +import { SigninComponent } from './component/signin/signin.component'; +import { SignupComponent } from './component/signup/signup.component'; +import { ResetPasswordComponent } from './component/reset-password/reset-password.component'; import { MemberService } from './service/member.service'; import { AuthGuard } from './guard/auth.guard';