overflow_cloud/member_webapp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader 2018-05-28 20:16:00 +09:00
parent 6d25e3ab56
commit 2802c1ae17
13 changed files with 80 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
@overflow/member/component/member-modify-password.component.ts
View File

@ -7,7 +7,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
})
export class MemberModifyPasswordComponent implements OnInit {
@Input() token: string;
@Output() resetPassword = new EventEmitter<{token: string, password: string, confirmPassword: string}>();
@Output() modifyPassword = new EventEmitter<{token: string, password: string, confirmPassword: string}>();
@Output() signin = new EventEmitter();
modifyPasswordForm: FormGroup;
@ -46,6 +46,6 @@ export class MemberModifyPasswordComponent implements OnInit {
modifyPasswordFormSubmit() {
const formValue = Object.assign({}, this.modifyPasswordForm.value);
this.resetPassword.emit({token: this.token, password: formValue.pw, confirmPassword: formValue.confirmPw});
this.modifyPassword.emit({token: this.token, password: formValue.pw, confirmPassword: formValue.confirmPw});
}
}

10
@overflow/member/component/member-profile.component.html
View File

@ -1,4 +1,4 @@
<form [formGroup]="form" *ngIf="member" (ngSubmit)="onSubmit()">
<form [formGroup]="profileForm" *ngIf="domainMember" (ngSubmit)="profileFormSubmit()">
<div class="ui-g">
<div class="ui-g-12 ui-md-4 ui-img-profile">
<div class="ui-img-profile-box">
@ -13,25 +13,25 @@
<div class="ui-g form-group">
<div class="ui-g-12">
<span class="md-inputfield">
<input type="text" pInputText formControlName="email" readonly value="{{email}}">
<input type="text" pInputText formControlName="email" readonly value="{{member.email}}">
<label>Email</label>
</span>
</div>
<div class="ui-g-12">
<span class="md-inputfield">
<input type="text" pInputText formControlName="name" value="{{name}}" >
<input type="text" pInputText formControlName="name" value="{{member.name}}" >
<label>Name</label>
</span>
</div>
<div class="ui-g-12">
<span class="md-inputfield">
<input type="text" pInputText formControlName="companyName" value="{{companyName}}" >
<input type="text" pInputText formControlName="companyName" value="{{member.companyName}}" >
<label>Company Name</label>
</span>
</div>
<div class="ui-g-12">
<span class="md-inputfield">
<input type="text" pInputText formControlName="phone" value="{{phone}}" >
<input type="text" pInputText formControlName="phone" value="{{member.phone}}" >
<label>Phone</label>
</span>
</div>

15
@overflow/member/component/member-profile.component.ts
View File

@ -1,13 +1,14 @@
import { Component, OnInit, OnDestroy, Input, Output, EventEmitter } from '@angular/core';
import { Member } from '@overflow/commons-typescript/model/member';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { DomainMember } from '@overflow/commons-typescript/model/domain';
@Component({
selector: 'of-member-profile',
templateUrl: './member-profile.component.html',
})
export class MemberProfileComponent implements OnInit, OnDestroy {
@Input() member: Member;
@Input() domainMember: DomainMember;
@Output() modify = new EventEmitter<Member>();
form: FormGroup;
@ -27,21 +28,21 @@ export class MemberProfileComponent implements OnInit, OnDestroy {
initForm() {
this.form = this.formBuilder.group({
'email': [this.member.email,
'email': ['',
[
Validators.required,
Validators.email
]],
'name': [this.member.name, []],
'companyName': [this.member.companyName, []],
'phone': [this.member.phone, []],
'name': ['', []],
'companyName': ['', []],
'phone': ['', []],
});
}
onSubmit() {
profileFormSubmit() {
const formValue = Object.assign({}, this.form.value);
const member: Member = {
email: this.member.email,
email: this.domainMember.member.email,
name: formValue.name,
phone: formValue.phone,
companyName: formValue.companyName,

4
@overflow/member/component/member-signin.component.ts
View File

@ -11,10 +11,9 @@ export class MemberSigninComponent implements OnInit {
@Input() signinError: string;
@Output() resetPassword = new EventEmitter();
@Output() signup = new EventEmitter();
@Output() signin = new EventEmitter<{email: string, password: string, returnURL: string}>();
@Output() signin = new EventEmitter<{email: string, password: string}>();
errorMessage: string | null;
returnURL: string;
signinForm: FormGroup;
formErrors = {
@ -53,7 +52,6 @@ export class MemberSigninComponent implements OnInit {
signinFormSubmit() {
const formValue = Object.assign({}, this.signinForm.value);
formValue.returnURL = this.returnURL;
this.signin.emit(formValue);
}

78
@overflow/member/container/member-modify-password-container.component.html
View File

@ -1,72 +1,6 @@
<div class="ui-g">
<div class="ui-g-12 ui-md-9 ui-lg-7">
<form [formGroup]="modifyPwForm" (ngSubmit)="modifyPw()">
<table class="login-table">
<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">
<span class="md-inputfield">
<input type="password"
id="pw"
autocomplete="off" placeholder="password"
formControlName="pw"
required class="ui-inputtext ui-corner-all ui-state-default ui-widget">
</span>
<div *ngIf="formErrors.pw" class="help is-danger">
{{ formErrors.pw }}
</div>
</div>
<div class="ui-g-12">
<span class="md-inputfield">
<input type="password"
id="confirmPw"
autocomplete="off" placeholder="confirm password"
formControlName="confirmPw"
required class="ui-inputtext ui-corner-all ui-state-default ui-widget">
</span>
<div *ngIf="formErrors.confirmPw" class="help is-danger">
{{ formErrors.confirmPw }}
</div>
</div>
<div class="ui-g-12">
<button type="submit" 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-person"></span>
<span class="ui-button-text ui-c">Confirm</span>
</button>
<a href="javascript:void(0)" (click)="signinBtn()">Signin</a>
</div>
</div>
</div>
</td>
</tr>
</table>
</form>
</div>
<div class="ui-g-12 ui-md-3 ui-lg-5 login-descript">
<table class="login-table">
<tr>
<td>
<div class="login-panel ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<img src="assets/layout/images/login/login_img_01.png">
<p><br>
overFlow는 여러분의 서버에 발생하는<br>
변화를 항상 지켜보고 있습니다.<br><br>
서버에 발생하는 모든 변화를 세분화 하여<br>
실시간으로 알려 드립니다.
</p>
</div>
</div>
</div>
</td>
</tr>
</table>
</div>
</div>
<of-member-modify-password
[token]="token"
(modifyPassword)="modifyPassword($event)"
(signin)="signin"
>
</of-member-modify-password>

55
@overflow/member/container/member-modify-password-container.component.ts
View File

@ -1,63 +1,28 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import * as ModifyPasswordStore from '../../store/reset-password';
import { select, Store } from '@ngrx/store';
import { ResetPasswordSelector } from '../../store';
import { Observable } from 'rxjs';
import * as MemberEntityStore from '../store/entity/member';
@Component({
selector: 'of-member-modify-password-container',
templateUrl: './modify-password-container.component.html',
templateUrl: './member-modify-password-container.component.html',
})
export class MemberModifyPasswordContainerComponent implements OnInit {
modifyPwForm: FormGroup;
tokenURL: string;
formErrors = {
'pw': '',
'confirmPw': ''
};
@Input() token: string;
@Output() signin = new EventEmitter();
constructor(
private router: Router,
private activatedRoute: ActivatedRoute,
private formBuilder: FormBuilder,
private modifyPasswordStore: Store<ModifyPasswordStore.State>,
private store: Store<any>,
) { }
ngOnInit() {
this.tokenURL = this.activatedRoute.snapshot.queryParams['token'];
console.log(this.tokenURL);
this.initForm();
}
initForm() {
this.modifyPwForm = this.formBuilder.group({
'pw': [
'',
[
// Validators.required,
]
],
'confirmPw': [
'',
[
// Validators.pattern('^(?=.*[0-9])(?=.*[a-zA-Z])([a-zA-Z0-9]+)$'),
// Validators.minLength(6),
// Validators.maxLength(25)
]
],
});
modifyPassword(info: {token: string, password: string, confirmPassword: string}) {
this.store.dispatch(new MemberEntityStore.ModifyPassword(info));
}
modifyPw() {
const modifyPwValue = Object.assign({}, this.modifyPwForm.value);
const m = {token: this.tokenURL, pw: modifyPwValue.pw, confirmPw: modifyPwValue.confirmPw};
this.modifyPasswordStore.dispatch(new ModifyPasswordStore.ModifyPassword(m));
}
signinBtn() {
this.router.navigateByUrl('/auth/signin');
}
}

50
@overflow/member/container/member-profile-container.component.html
View File

@ -1,47 +1,5 @@
<form [formGroup]="modifyForm" (ngSubmit)="modifyProfile()">
<div class="ui-g">
<div class="ui-g-12 ui-md-4 ui-img-profile">
<div class="ui-img-profile-box">
<div class="ui-g">
<img class="profile-image " src="assets/layout/images/avatar.png" />
</div>
<button type="button" class="ui-button-photo-add" pButton icon="ui-icon-account-box" (click)="onAddSensorWithTarget(item.target)"></button>
</div>
</div>
<of-member-profile
(modify)="modify($event)"
>
<div class="ui-g-12 ui-md-8">
<div class="ui-g form-group">
<div class="ui-g-12">
<span class="md-inputfield">
<input type="text" pInputText formControlName="email" readonly value="{{member.email}}">
<label>Email</label>
</span>
</div>
<div class="ui-g-12">
<span class="md-inputfield">
<input type="text" pInputText formControlName="name" value="{{member.name}}" >
<label>Name</label>
</span>
</div>
<div class="ui-g-12">
<span class="md-inputfield">
<input type="text" pInputText formControlName="companyName" value="{{member.companyName}}" >
<label>Company Name</label>
</span>
</div>
<div class="ui-g-12">
<span class="md-inputfield">
<input type="text" pInputText formControlName="phone" value="{{member.phone}}" >
<label>Phone</label>
</span>
</div>
</div>
</div>
<div class="ui-g-12" dir="rtl">
<button type="submit" [disabled]="selected" class="ui-button ui-button-text-icon-left ui-button-width-fit">
<span class="ui-button-icon-left ui-c fa fa-fw ui-icon-person"></span>
<span class="ui-button-text ui-c">Save</span>
</button>
</div>
</div>
</form>
</of-member-profile>

80
@overflow/member/container/member-profile-container.component.ts
View File

@ -1,92 +1,38 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
// import { PagesComponent } from 'app/pages/pages.component';
import * as AuthStore from '../../store/auth';
import * as ModifyStore from '../../store/modify';
import { Member } from '@overflow/commons-typescript/model/member';
import { AuthSelector } from '../../store';
import { Store, select } from '@ngrx/store';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { ModifySelector } from '../../store';
import { RPCClientError } from '@loafer/ng-rpc';
import { Observable } from 'rxjs';
import { RPCClientError } from '@loafer/ng-rpc';
import { Member } from '@overflow/commons-typescript/model/member';
import { AuthContainerSelector } from '@overflow/shared/auth/store';
import { DomainMember } from '@overflow/commons-typescript/model/domain';
import * as MemberEntityStore from '../store/entity/member';
@Component({
selector: 'of-member-profile-container',
templateUrl: './member-profile-container.component.html',
})
export class MemberProfileContainerComponent implements OnInit, OnDestroy {
member: Member;
modifyForm: FormGroup;
modifiedMember$ = this.modifyStore.pipe(select(ModifySelector.select('member')));
domainMember$: Observable<DomainMember>;
constructor(
// public app: PagesComponent,
private activatedRoute: ActivatedRoute,
private router: Router,
private store: Store<AuthStore.State>,
private formBuilder: FormBuilder,
private modifyStore: Store<ModifyStore.State>
private store: Store<any>,
) {
}
ngOnInit() {
this.store.select(AuthSelector.select('member')).subscribe(
(member: Member) => {
this.member = member;
},
(error) => {
console.log(error);
}
);
this.initForm();
this.domainMember$ = this.store.pipe(select(AuthContainerSelector.selectDomainMember));
}
ngOnDestroy() {
}
initForm() {
this.modifyForm = this.formBuilder.group({
'email': [this.member.email,
[
Validators.required,
Validators.email
]],
'name': [this.member.name, []],
'companyName': [this.member.companyName, []],
'phone': [this.member.phone, []],
});
}
modifyProfile() {
const modifyValue = Object.assign({}, this.modifyForm.value);
const member: Member = {
email: this.member.email,
name: modifyValue.name,
phone: modifyValue.phone,
companyName: modifyValue.companyName,
};
this.modifyStore.dispatch(new ModifyStore.Modify(member));
const modifiedMemberSubscription$ = this.modifiedMember$.subscribe(
(m: Member) => {
if (m) {
console.log(m);
}
if (modifiedMemberSubscription$) {
modifiedMemberSubscription$.unsubscribe();
}
},
(error: RPCClientError) => {
console.log(error.response.message);
}
);
modify(member: Member) {
this.store.dispatch(new MemberEntityStore.Modify(member));
}
}

5
@overflow/member/container/member-reset-password-container.component.html
View File

@ -1 +1,4 @@
<of-member-reset-password></of-member-reset-password>
<of-member-reset-password
(resetPassword)="resetPassword($event)"
>
</of-member-reset-password>

48
@overflow/member/container/member-reset-password-container.component.ts
View File

@ -1,58 +1,24 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import * as ResetPasswordStore from '../../store/reset-password';
import {select, Store} from '@ngrx/store';
import { ResetPasswordSelector } from '../../store';
import {RPCClientError} from '@loafer/ng-rpc';
import {Member} from '@overflow/commons-typescript/model/member/index';
import * as MemberEntityStore from '../store/entity/member';
@Component({
selector: 'of-member-reset-password-container',
templateUrl: './reset-password-container.component.html',
templateUrl: './member-reset-password-container.component.html',
})
export class MemberResetPasswordContainerComponent implements OnInit {
resetPassword$ = this.resetPasswordStore.pipe(select(ResetPasswordSelector.select('member')));
resetPassword: FormGroup;
formErrors = {
'email': ''
};
constructor(
private resetPasswordStore: Store<ResetPasswordStore.State>,
private router: Router,
private formBuilder: FormBuilder) { }
private store: Store<any>,
) { }
ngOnInit() {
this.resetPassword = this.formBuilder.group({
'email': ['', [
Validators.required,
Validators.email
]
]
});
}
sendResetPassword() {
const emailValue = Object.assign({}, this.resetPassword.value);
console.log(emailValue.email);
this.resetPasswordStore.dispatch(new ResetPasswordStore.ResetPassword(emailValue.email));
const resetPasswordSubscription$ = this.resetPassword$.subscribe(
(m: Member) => {
if (m) {
console.log(m);
}
if (resetPasswordSubscription$) {
resetPasswordSubscription$.unsubscribe();
}
},
(error: RPCClientError) => {
console.log(error.response.message);
}
);
resetPassword(email: string) {
this.store.dispatch(new MemberEntityStore.ResetPassword(email));
}
}

85
@overflow/member/container/member-signin-container.component.ts
View File

@ -1,92 +1,33 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, Input } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { Store, select } from '@ngrx/store';
import { Observable } from 'rxjs';
import * as AuthStore from '../store/auth';
import { AuthSelector } from '../store';
import { MemberSigninContainerSelector } from '../store';
import * as MemberEntityStore from '../store/entity/member';
@Component({
selector: 'of-member-signin-container',
templateUrl: './member-signin-container.component.html',
})
export class MemberSigninContainerComponent implements OnInit {
pending$ = this.store.pipe(select(AuthSelector.select('pending')));
error$ = this.store.pipe(select(AuthSelector.select('error')));
errorMessage: string | null;
returnURL: string;
signinForm: FormGroup;
formErrors = {
'email': '',
'password': ''
};
@Input() returnURL: string;
pending$: Observable<boolean>;
error$: Observable<any>;
constructor(
private activatedRoute: ActivatedRoute,
private router: Router,
private store: Store<AuthStore.State>,
private formBuilder: FormBuilder,
private store: Store<any>,
) {
}
ngOnInit() {
this.initForm();
this.returnURL = this.activatedRoute.snapshot.queryParams['returnURL'] || '/';
this.pending$.subscribe((pending: boolean) => {
if (pending) {
this.signinForm.disable();
} else {
this.signinForm.enable();
}
});
this.error$.subscribe((error) => {
if (error) {
this.errorMessage = error.exception;
} else {
this.errorMessage = null;
}
});
this.pending$ = this.store.pipe(select(MemberSigninContainerSelector.selectPending));
this.error$ = this.store.pipe(select(MemberSigninContainerSelector.selectError));
}
initForm() {
this.signinForm = this.formBuilder.group({
'email': [
'',
[
Validators.required,
Validators.email
]
],
'password': [
'',
[
Validators.pattern('^(?=.*[0-9])(?=.*[a-zA-Z])([a-zA-Z0-9]+)$'),
Validators.minLength(6),
Validators.maxLength(25)
]
],
});
onSignin(info: {email: string, password: string}) {
this.store.dispatch(new MemberEntityStore.Signin({...info, returnURL: this.returnURL}));
}
resetPasswordBtnClick() {
this.router.navigateByUrl('/auth/reset-password');
}
signupBtnClick() {
this.router.navigateByUrl('/auth/signup');
}
signin() {
const signinValue = Object.assign({}, this.signinForm.value);
signinValue.returnURL = this.returnURL;
this.store.dispatch(new AuthStore.Signin(signinValue));
console.log('signin component signin fnc');
}
}

7
@overflow/member/container/member-signup-container.component.ts
View File

@ -4,9 +4,10 @@ import {
OnInit,
} from '@angular/core';
import { Member } from '@overflow/commons-typescript/model/member';
import * as AuthStore from '../store/signup';
import { Store } from '@ngrx/store';
import * as MemberEntityStore from '../store/entity/member';
@Component({
selector: 'of-member-signup-container',
templateUrl: './member-signup-container.component.html',
@ -14,7 +15,7 @@ import { Store } from '@ngrx/store';
export class MemberSignupContainerComponent implements OnInit, OnDestroy {
constructor(
private store: Store<AuthStore.State>,
private store: Store<any>,
) { }
ngOnInit() {
@ -24,6 +25,6 @@ export class MemberSignupContainerComponent implements OnInit, OnDestroy {
}
onSignup(info: {member: Member, password: string}) {
this.store.dispatch(new AuthStore.Signup(info));
this.store.dispatch(new MemberEntityStore.Signup(info));
}
}

2
@overflow/noauth-probe/subscriber/noauth-probe.subscriber.ts
View File

@ -14,7 +14,7 @@ import {
export class NoAuthProbeSubscriber {
public constructor(
private store: Store<NoAuthProbeStore.State>,
private store: Store<any>,
private loggerService: LoggerService,
) {
}