강제로그아웃 수정
This commit is contained in:
parent
aa2b2f6d6f
commit
e352e0c861
|
|
@ -150,7 +150,7 @@
|
||||||
mat-flat-button
|
mat-flat-button
|
||||||
class="bet-mat-small-8"
|
class="bet-mat-small-8"
|
||||||
[color]="'primary'"
|
[color]="'primary'"
|
||||||
(click)="__onClickSignout($event)"
|
(click)="__onClickSignoutBlock($event)"
|
||||||
>
|
>
|
||||||
로그아웃
|
로그아웃
|
||||||
</button>
|
</button>
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,6 @@ import { CurrentUserService } from '../services/current-user.service';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { MessageComposeComponent } from '../compose/message-compose.component';
|
import { MessageComposeComponent } from '../compose/message-compose.component';
|
||||||
import { SignoutComposeComponent } from '../compose/signout-compose.component';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'current-user-list',
|
selector: 'current-user-list',
|
||||||
|
|
@ -95,6 +94,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
'etcBtn',
|
'etcBtn',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
signoutBlockConfigForm!: FormGroup;
|
||||||
|
|
||||||
private _unsubscribeAll: Subject<any> = new Subject<any>();
|
private _unsubscribeAll: Subject<any> = new Subject<any>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -147,6 +148,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
});
|
});
|
||||||
|
|
||||||
this.currentUsers$ = this._currentUserService.currentUsers$;
|
this.currentUsers$ = this._currentUserService.currentUsers$;
|
||||||
|
|
||||||
|
// Set signout block config
|
||||||
|
this.__signoutBlockConfirmConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -247,13 +251,33 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
console.log('Compose dialog was closed!');
|
console.log('Compose dialog was closed!');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
__onClickSignout(event: MouseEvent): void {
|
__signoutBlockConfirmConfig(): void {
|
||||||
const dialogRef = this._matDialog.open(SignoutComposeComponent, {
|
this.signoutBlockConfigForm = this._formBuilder.group({
|
||||||
data: { price: '', memo: '' },
|
title: '알림',
|
||||||
});
|
message: '로그아웃되었습니다.',
|
||||||
|
icon: this._formBuilder.group({
|
||||||
dialogRef.afterClosed().subscribe((result) => {
|
show: true,
|
||||||
console.log('Compose dialog was closed!');
|
name: 'heroicons_outline:exclamation',
|
||||||
|
color: 'warn',
|
||||||
|
}),
|
||||||
|
actions: this._formBuilder.group({
|
||||||
|
confirm: this._formBuilder.group({
|
||||||
|
show: true,
|
||||||
|
label: '확인',
|
||||||
|
color: 'warn',
|
||||||
|
}),
|
||||||
|
cancel: this._formBuilder.group({
|
||||||
|
show: false,
|
||||||
|
label: '취소',
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
dismissible: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
__onClickSignoutBlock(event: MouseEvent): void {
|
||||||
|
// Open the dialog and save the reference of it
|
||||||
|
const dialogRef = this._fuseConfirmationService.open(
|
||||||
|
this.signoutBlockConfigForm.value
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
import { MessageComposeComponent } from './message-compose.component';
|
import { MessageComposeComponent } from './message-compose.component';
|
||||||
import { SignoutComposeComponent } from './signout-compose.component';
|
|
||||||
|
|
||||||
export const COMPOSE = [MessageComposeComponent, SignoutComposeComponent];
|
export const COMPOSE = [MessageComposeComponent];
|
||||||
|
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
<div class="flex flex-col max-w-240 md:min-w-160 max-h-screen -m-6">
|
|
||||||
<!-- Header -->
|
|
||||||
<div
|
|
||||||
class="flex flex-0 items-center justify-between h-16 pr-3 sm:pr-5 pl-6 sm:pl-8 bg-primary text-on-primary"
|
|
||||||
>
|
|
||||||
<div class="text-lg font-medium">알림</div>
|
|
||||||
<button mat-icon-button (click)="saveAndClose()" [tabIndex]="-1">
|
|
||||||
<mat-icon
|
|
||||||
class="text-current"
|
|
||||||
[svgIcon]="'heroicons_outline:x'"
|
|
||||||
></mat-icon>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Compose form -->
|
|
||||||
<form
|
|
||||||
class="flex flex-col flex-auto p-6 sm:p-8 overflow-y-auto"
|
|
||||||
[formGroup]="composeForm"
|
|
||||||
>
|
|
||||||
<div>
|
|
||||||
<span class="font-semibold mb-2">로그아웃되었습니다.</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="flex flex-col sm:flex-row sm:items-center justify-between mt-4 sm:mt-6"
|
|
||||||
>
|
|
||||||
<div class="flex items-center mt-4 sm:mt-0">
|
|
||||||
<!-- Save as draft -->
|
|
||||||
<button class="sm:mx-3" mat-stroked-button (click)="saveAsDraft()">
|
|
||||||
<span>OK</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,94 +0,0 @@
|
||||||
import {
|
|
||||||
ChangeDetectorRef,
|
|
||||||
Component,
|
|
||||||
Inject,
|
|
||||||
OnInit,
|
|
||||||
ViewEncapsulation,
|
|
||||||
} from '@angular/core';
|
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
|
||||||
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
|
|
||||||
import { SiteService } from 'app/modules/polyglot/site/services/site.service';
|
|
||||||
import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service';
|
|
||||||
import { Site } from 'app/modules/proto/models/site_pb';
|
|
||||||
|
|
||||||
export interface SignoutComposeData {
|
|
||||||
price: string;
|
|
||||||
memo: string;
|
|
||||||
}
|
|
||||||
export interface SignoutComposeResult {
|
|
||||||
price: string;
|
|
||||||
memo: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-signout-compose',
|
|
||||||
templateUrl: './signout-compose.component.html',
|
|
||||||
encapsulation: ViewEncapsulation.None,
|
|
||||||
})
|
|
||||||
export class SignoutComposeComponent implements OnInit {
|
|
||||||
composeForm!: FormGroup;
|
|
||||||
sites: any[] = [];
|
|
||||||
// quillModules: any = {
|
|
||||||
// toolbar: [
|
|
||||||
// ['bold', 'italic', 'underline'],
|
|
||||||
// [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }],
|
|
||||||
// ['clean'],
|
|
||||||
// ],
|
|
||||||
// };
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructor
|
|
||||||
*/
|
|
||||||
constructor(
|
|
||||||
public matDialogRef: MatDialogRef<SignoutComposeComponent>,
|
|
||||||
@Inject(MAT_DIALOG_DATA) public data: SignoutComposeData,
|
|
||||||
private _formBuilder: FormBuilder,
|
|
||||||
private _identityService: IdentityService,
|
|
||||||
private _changeDetectorRef: ChangeDetectorRef
|
|
||||||
) {}
|
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
// @ Lifecycle hooks
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
|
||||||
* On init
|
|
||||||
*/
|
|
||||||
ngOnInit(): void {
|
|
||||||
// Create the form
|
|
||||||
this.composeForm = this._formBuilder.group({
|
|
||||||
price: ['', [Validators.required]],
|
|
||||||
memo: ['', [Validators.required]],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
// @ Public methods
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save and close
|
|
||||||
*/
|
|
||||||
saveAndClose(): void {
|
|
||||||
// Save the message as a draft
|
|
||||||
this.saveAsDraft();
|
|
||||||
|
|
||||||
// Close the dialog
|
|
||||||
this.matDialogRef.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Discard the message
|
|
||||||
*/
|
|
||||||
discard(): void {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save the message as a draft
|
|
||||||
*/
|
|
||||||
saveAsDraft(): void {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send the message
|
|
||||||
*/
|
|
||||||
send(): void {}
|
|
||||||
}
|
|
||||||
|
|
@ -119,7 +119,7 @@
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
mat-menu-item
|
mat-menu-item
|
||||||
(click)="__onClickSignout($event)"
|
(click)="__onClickSignoutBlock($event)"
|
||||||
>
|
>
|
||||||
강제로그아웃
|
강제로그아웃
|
||||||
</button>
|
</button>
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import {
|
||||||
ViewChild,
|
ViewChild,
|
||||||
ViewEncapsulation,
|
ViewEncapsulation,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import { FormBuilder, FormControl } from '@angular/forms';
|
import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
|
||||||
|
|
||||||
import { MatPaginator } from '@angular/material/paginator';
|
import { MatPaginator } from '@angular/material/paginator';
|
||||||
import { MatSort } from '@angular/material/sort';
|
import { MatSort } from '@angular/material/sort';
|
||||||
|
|
@ -42,7 +42,6 @@ import { CommissionComposeComponent } from '../compose/commission-compose.compon
|
||||||
import { CompComposeComponent } from '../compose/comp-compose.component';
|
import { CompComposeComponent } from '../compose/comp-compose.component';
|
||||||
import { CouponComposeComponent } from '../compose/coupon-compose.component';
|
import { CouponComposeComponent } from '../compose/coupon-compose.component';
|
||||||
import { MessageComposeComponent } from '../compose/message-compose.component';
|
import { MessageComposeComponent } from '../compose/message-compose.component';
|
||||||
import { SignoutComposeComponent } from '../compose/signout-compose.component';
|
|
||||||
|
|
||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { SiteService } from 'app/modules/polyglot/site/services/site.service';
|
import { SiteService } from 'app/modules/polyglot/site/services/site.service';
|
||||||
|
|
@ -108,6 +107,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
btnTitle: string = '';
|
btnTitle: string = '';
|
||||||
memberClassId = '';
|
memberClassId = '';
|
||||||
|
|
||||||
|
signoutBlockConfigForm!: FormGroup;
|
||||||
|
|
||||||
private _unsubscribeAll: Subject<any> = new Subject<any>();
|
private _unsubscribeAll: Subject<any> = new Subject<any>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -201,6 +202,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
console.log('error', e);
|
console.log('error', e);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Set signout block config
|
||||||
|
this.__signoutBlockConfirmConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -361,15 +365,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
console.log('Compose dialog was closed!');
|
console.log('Compose dialog was closed!');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
__onClickSignout(event: MouseEvent): void {
|
|
||||||
const dialogRef = this._matDialog.open(SignoutComposeComponent, {
|
|
||||||
data: { price: '', memo: '' },
|
|
||||||
});
|
|
||||||
|
|
||||||
dialogRef.afterClosed().subscribe((result) => {
|
|
||||||
console.log('Compose dialog was closed!');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
__getRateTooltop(): string {
|
__getRateTooltop(): string {
|
||||||
const tempRate = 0;
|
const tempRate = 0;
|
||||||
|
|
@ -384,4 +379,33 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
|
|
||||||
return '정상';
|
return '정상';
|
||||||
}
|
}
|
||||||
|
__signoutBlockConfirmConfig(): void {
|
||||||
|
this.signoutBlockConfigForm = this._formBuilder.group({
|
||||||
|
title: '알림',
|
||||||
|
message: '로그아웃되었습니다.',
|
||||||
|
icon: this._formBuilder.group({
|
||||||
|
show: true,
|
||||||
|
name: 'heroicons_outline:exclamation',
|
||||||
|
color: 'warn',
|
||||||
|
}),
|
||||||
|
actions: this._formBuilder.group({
|
||||||
|
confirm: this._formBuilder.group({
|
||||||
|
show: true,
|
||||||
|
label: '확인',
|
||||||
|
color: 'warn',
|
||||||
|
}),
|
||||||
|
cancel: this._formBuilder.group({
|
||||||
|
show: false,
|
||||||
|
label: '취소',
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
dismissible: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
__onClickSignoutBlock(event: MouseEvent): void {
|
||||||
|
// Open the dialog and save the reference of it
|
||||||
|
const dialogRef = this._fuseConfirmationService.open(
|
||||||
|
this.signoutBlockConfigForm.value
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ import { CommissionComposeComponent } from './commission-compose.component';
|
||||||
import { CompComposeComponent } from './comp-compose.component';
|
import { CompComposeComponent } from './comp-compose.component';
|
||||||
import { CouponComposeComponent } from './coupon-compose.component';
|
import { CouponComposeComponent } from './coupon-compose.component';
|
||||||
import { MessageComposeComponent } from './message-compose.component';
|
import { MessageComposeComponent } from './message-compose.component';
|
||||||
import { SignoutComposeComponent } from './signout-compose.component';
|
|
||||||
|
|
||||||
export const COMPOSE = [
|
export const COMPOSE = [
|
||||||
RegistComposeComponent,
|
RegistComposeComponent,
|
||||||
|
|
@ -13,5 +12,4 @@ export const COMPOSE = [
|
||||||
CompComposeComponent,
|
CompComposeComponent,
|
||||||
CouponComposeComponent,
|
CouponComposeComponent,
|
||||||
MessageComposeComponent,
|
MessageComposeComponent,
|
||||||
SignoutComposeComponent,
|
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
<div class="flex flex-col max-w-240 md:min-w-160 max-h-screen -m-6">
|
|
||||||
<!-- Header -->
|
|
||||||
<div
|
|
||||||
class="flex flex-0 items-center justify-between h-16 pr-3 sm:pr-5 pl-6 sm:pl-8 bg-primary text-on-primary"
|
|
||||||
>
|
|
||||||
<div class="text-lg font-medium">알림</div>
|
|
||||||
<button mat-icon-button (click)="saveAndClose()" [tabIndex]="-1">
|
|
||||||
<mat-icon
|
|
||||||
class="text-current"
|
|
||||||
[svgIcon]="'heroicons_outline:x'"
|
|
||||||
></mat-icon>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Compose form -->
|
|
||||||
<form
|
|
||||||
class="flex flex-col flex-auto p-6 sm:p-8 overflow-y-auto"
|
|
||||||
[formGroup]="composeForm"
|
|
||||||
>
|
|
||||||
<div>
|
|
||||||
<span class="font-semibold mb-2">로그아웃되었습니다.</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="flex flex-col sm:flex-row sm:items-center justify-between mt-4 sm:mt-6"
|
|
||||||
>
|
|
||||||
<div class="flex items-center mt-4 sm:mt-0">
|
|
||||||
<!-- Save as draft -->
|
|
||||||
<button class="sm:mx-3" mat-stroked-button (click)="saveAsDraft()">
|
|
||||||
<span>OK</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,94 +0,0 @@
|
||||||
import {
|
|
||||||
ChangeDetectorRef,
|
|
||||||
Component,
|
|
||||||
Inject,
|
|
||||||
OnInit,
|
|
||||||
ViewEncapsulation,
|
|
||||||
} from '@angular/core';
|
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
|
||||||
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
|
|
||||||
import { SiteService } from 'app/modules/polyglot/site/services/site.service';
|
|
||||||
import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service';
|
|
||||||
import { Site } from 'app/modules/proto/models/site_pb';
|
|
||||||
|
|
||||||
export interface SignoutComposeData {
|
|
||||||
price: string;
|
|
||||||
memo: string;
|
|
||||||
}
|
|
||||||
export interface SignoutComposeResult {
|
|
||||||
price: string;
|
|
||||||
memo: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-signout-compose',
|
|
||||||
templateUrl: './signout-compose.component.html',
|
|
||||||
encapsulation: ViewEncapsulation.None,
|
|
||||||
})
|
|
||||||
export class SignoutComposeComponent implements OnInit {
|
|
||||||
composeForm!: FormGroup;
|
|
||||||
sites: any[] = [];
|
|
||||||
// quillModules: any = {
|
|
||||||
// toolbar: [
|
|
||||||
// ['bold', 'italic', 'underline'],
|
|
||||||
// [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }],
|
|
||||||
// ['clean'],
|
|
||||||
// ],
|
|
||||||
// };
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructor
|
|
||||||
*/
|
|
||||||
constructor(
|
|
||||||
public matDialogRef: MatDialogRef<SignoutComposeComponent>,
|
|
||||||
@Inject(MAT_DIALOG_DATA) public data: SignoutComposeData,
|
|
||||||
private _formBuilder: FormBuilder,
|
|
||||||
private _identityService: IdentityService,
|
|
||||||
private _changeDetectorRef: ChangeDetectorRef
|
|
||||||
) {}
|
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
// @ Lifecycle hooks
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
|
||||||
* On init
|
|
||||||
*/
|
|
||||||
ngOnInit(): void {
|
|
||||||
// Create the form
|
|
||||||
this.composeForm = this._formBuilder.group({
|
|
||||||
price: ['', [Validators.required]],
|
|
||||||
memo: ['', [Validators.required]],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
// @ Public methods
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save and close
|
|
||||||
*/
|
|
||||||
saveAndClose(): void {
|
|
||||||
// Save the message as a draft
|
|
||||||
this.saveAsDraft();
|
|
||||||
|
|
||||||
// Close the dialog
|
|
||||||
this.matDialogRef.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Discard the message
|
|
||||||
*/
|
|
||||||
discard(): void {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save the message as a draft
|
|
||||||
*/
|
|
||||||
saveAsDraft(): void {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send the message
|
|
||||||
*/
|
|
||||||
send(): void {}
|
|
||||||
}
|
|
||||||
|
|
@ -239,7 +239,10 @@
|
||||||
<button mat-menu-item (click)="viewSlot(user.id!)">
|
<button mat-menu-item (click)="viewSlot(user.id!)">
|
||||||
배팅리스트
|
배팅리스트
|
||||||
</button>
|
</button>
|
||||||
<button mat-menu-item (click)="__onClickSignout($event)">
|
<button
|
||||||
|
mat-menu-item
|
||||||
|
(click)="__onClickSignoutBlock($event)"
|
||||||
|
>
|
||||||
강제로그아웃
|
강제로그아웃
|
||||||
</button>
|
</button>
|
||||||
</mat-menu>
|
</mat-menu>
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import {
|
||||||
ViewChild,
|
ViewChild,
|
||||||
ViewEncapsulation,
|
ViewEncapsulation,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import { FormBuilder, FormControl } from '@angular/forms';
|
import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
|
||||||
import { MatPaginator } from '@angular/material/paginator';
|
import { MatPaginator } from '@angular/material/paginator';
|
||||||
import { MatSort } from '@angular/material/sort';
|
import { MatSort } from '@angular/material/sort';
|
||||||
import { map, merge, Observable, Subject, switchMap, takeUntil } from 'rxjs';
|
import { map, merge, Observable, Subject, switchMap, takeUntil } from 'rxjs';
|
||||||
|
|
@ -26,7 +26,6 @@ import { CommissionComposeComponent } from '../compose/commission-compose.compon
|
||||||
import { CompComposeComponent } from '../compose/comp-compose.component';
|
import { CompComposeComponent } from '../compose/comp-compose.component';
|
||||||
import { CouponComposeComponent } from '../compose/coupon-compose.component';
|
import { CouponComposeComponent } from '../compose/coupon-compose.component';
|
||||||
import { MessageComposeComponent } from '../compose/message-compose.component';
|
import { MessageComposeComponent } from '../compose/message-compose.component';
|
||||||
import { SignoutComposeComponent } from '../compose/signout-compose.component';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'user-list',
|
selector: 'user-list',
|
||||||
|
|
@ -75,6 +74,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
selectedUser?: User;
|
selectedUser?: User;
|
||||||
pagination?: UserPagination;
|
pagination?: UserPagination;
|
||||||
|
|
||||||
|
signoutBlockConfigForm!: FormGroup;
|
||||||
|
|
||||||
private _unsubscribeAll: Subject<any> = new Subject<any>();
|
private _unsubscribeAll: Subject<any> = new Subject<any>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -111,6 +112,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
|
|
||||||
// Get the products
|
// Get the products
|
||||||
this.users$ = this._userService.users$;
|
this.users$ = this._userService.users$;
|
||||||
|
|
||||||
|
// Set signout block config
|
||||||
|
this.__signoutBlockConfirmConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -257,15 +261,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
console.log('Compose dialog was closed!');
|
console.log('Compose dialog was closed!');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
__onClickSignout(event: MouseEvent): void {
|
|
||||||
const dialogRef = this._matDialog.open(SignoutComposeComponent, {
|
|
||||||
data: { price: '', memo: '' },
|
|
||||||
});
|
|
||||||
|
|
||||||
dialogRef.afterClosed().subscribe((result) => {
|
|
||||||
console.log('Compose dialog was closed!');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
__getRateTooltop(): string {
|
__getRateTooltop(): string {
|
||||||
const tempRate = 0;
|
const tempRate = 0;
|
||||||
const resultTooltip = `
|
const resultTooltip = `
|
||||||
|
|
@ -273,4 +268,33 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||||
`;
|
`;
|
||||||
return resultTooltip;
|
return resultTooltip;
|
||||||
}
|
}
|
||||||
|
__signoutBlockConfirmConfig(): void {
|
||||||
|
this.signoutBlockConfigForm = this._formBuilder.group({
|
||||||
|
title: '알림',
|
||||||
|
message: '로그아웃되었습니다.',
|
||||||
|
icon: this._formBuilder.group({
|
||||||
|
show: true,
|
||||||
|
name: 'heroicons_outline:exclamation',
|
||||||
|
color: 'warn',
|
||||||
|
}),
|
||||||
|
actions: this._formBuilder.group({
|
||||||
|
confirm: this._formBuilder.group({
|
||||||
|
show: true,
|
||||||
|
label: '확인',
|
||||||
|
color: 'warn',
|
||||||
|
}),
|
||||||
|
cancel: this._formBuilder.group({
|
||||||
|
show: false,
|
||||||
|
label: '취소',
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
dismissible: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
__onClickSignoutBlock(event: MouseEvent): void {
|
||||||
|
// Open the dialog and save the reference of it
|
||||||
|
const dialogRef = this._fuseConfirmationService.open(
|
||||||
|
this.signoutBlockConfigForm.value
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ import { CommissionComposeComponent } from './commission-compose.component';
|
||||||
import { CompComposeComponent } from './comp-compose.component';
|
import { CompComposeComponent } from './comp-compose.component';
|
||||||
import { CouponComposeComponent } from './coupon-compose.component';
|
import { CouponComposeComponent } from './coupon-compose.component';
|
||||||
import { MessageComposeComponent } from './message-compose.component';
|
import { MessageComposeComponent } from './message-compose.component';
|
||||||
import { SignoutComposeComponent } from './signout-compose.component';
|
|
||||||
|
|
||||||
export const COMPOSE = [
|
export const COMPOSE = [
|
||||||
CashComposeComponent,
|
CashComposeComponent,
|
||||||
|
|
@ -11,5 +10,4 @@ export const COMPOSE = [
|
||||||
CompComposeComponent,
|
CompComposeComponent,
|
||||||
CouponComposeComponent,
|
CouponComposeComponent,
|
||||||
MessageComposeComponent,
|
MessageComposeComponent,
|
||||||
SignoutComposeComponent,
|
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
<div class="flex flex-col max-w-240 md:min-w-160 max-h-screen -m-6">
|
|
||||||
<!-- Header -->
|
|
||||||
<div
|
|
||||||
class="flex flex-0 items-center justify-between h-16 pr-3 sm:pr-5 pl-6 sm:pl-8 bg-primary text-on-primary"
|
|
||||||
>
|
|
||||||
<div class="text-lg font-medium">알림</div>
|
|
||||||
<button mat-icon-button (click)="saveAndClose()" [tabIndex]="-1">
|
|
||||||
<mat-icon
|
|
||||||
class="text-current"
|
|
||||||
[svgIcon]="'heroicons_outline:x'"
|
|
||||||
></mat-icon>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Compose form -->
|
|
||||||
<form
|
|
||||||
class="flex flex-col flex-auto p-6 sm:p-8 overflow-y-auto"
|
|
||||||
[formGroup]="composeForm"
|
|
||||||
>
|
|
||||||
<div>
|
|
||||||
<span class="font-semibold mb-2">로그아웃되었습니다.</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="flex flex-col sm:flex-row sm:items-center justify-between mt-4 sm:mt-6"
|
|
||||||
>
|
|
||||||
<div class="flex items-center mt-4 sm:mt-0">
|
|
||||||
<!-- Save as draft -->
|
|
||||||
<button class="sm:mx-3" mat-stroked-button (click)="saveAsDraft()">
|
|
||||||
<span>OK</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,94 +0,0 @@
|
||||||
import {
|
|
||||||
ChangeDetectorRef,
|
|
||||||
Component,
|
|
||||||
Inject,
|
|
||||||
OnInit,
|
|
||||||
ViewEncapsulation,
|
|
||||||
} from '@angular/core';
|
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
|
||||||
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
|
|
||||||
import { SiteService } from 'app/modules/polyglot/site/services/site.service';
|
|
||||||
import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service';
|
|
||||||
import { Site } from 'app/modules/proto/models/site_pb';
|
|
||||||
|
|
||||||
export interface SignoutComposeData {
|
|
||||||
price: string;
|
|
||||||
memo: string;
|
|
||||||
}
|
|
||||||
export interface SignoutComposeResult {
|
|
||||||
price: string;
|
|
||||||
memo: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-signout-compose',
|
|
||||||
templateUrl: './signout-compose.component.html',
|
|
||||||
encapsulation: ViewEncapsulation.None,
|
|
||||||
})
|
|
||||||
export class SignoutComposeComponent implements OnInit {
|
|
||||||
composeForm!: FormGroup;
|
|
||||||
sites: any[] = [];
|
|
||||||
// quillModules: any = {
|
|
||||||
// toolbar: [
|
|
||||||
// ['bold', 'italic', 'underline'],
|
|
||||||
// [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }],
|
|
||||||
// ['clean'],
|
|
||||||
// ],
|
|
||||||
// };
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructor
|
|
||||||
*/
|
|
||||||
constructor(
|
|
||||||
public matDialogRef: MatDialogRef<SignoutComposeComponent>,
|
|
||||||
@Inject(MAT_DIALOG_DATA) public data: SignoutComposeData,
|
|
||||||
private _formBuilder: FormBuilder,
|
|
||||||
private _identityService: IdentityService,
|
|
||||||
private _changeDetectorRef: ChangeDetectorRef
|
|
||||||
) {}
|
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
// @ Lifecycle hooks
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
|
||||||
* On init
|
|
||||||
*/
|
|
||||||
ngOnInit(): void {
|
|
||||||
// Create the form
|
|
||||||
this.composeForm = this._formBuilder.group({
|
|
||||||
price: ['', [Validators.required]],
|
|
||||||
memo: ['', [Validators.required]],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
// @ Public methods
|
|
||||||
// -----------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save and close
|
|
||||||
*/
|
|
||||||
saveAndClose(): void {
|
|
||||||
// Save the message as a draft
|
|
||||||
this.saveAsDraft();
|
|
||||||
|
|
||||||
// Close the dialog
|
|
||||||
this.matDialogRef.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Discard the message
|
|
||||||
*/
|
|
||||||
discard(): void {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save the message as a draft
|
|
||||||
*/
|
|
||||||
saveAsDraft(): void {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send the message
|
|
||||||
*/
|
|
||||||
send(): void {}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user