diff --git a/src/app/modules/beteran/compose/compose.module.ts b/src/app/modules/beteran/compose/compose.module.ts new file mode 100644 index 0000000..eb23494 --- /dev/null +++ b/src/app/modules/beteran/compose/compose.module.ts @@ -0,0 +1,34 @@ +import { NgModule } from '@angular/core'; + +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatTabsModule } from '@angular/material/tabs'; +import { MatInputModule } from '@angular/material/input'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatSelectModule } from '@angular/material/select'; + +import { FuseCardModule } from '@fuse/components/card'; +import { SharedModule } from 'app/shared/shared.module'; + +import { FuseAlertModule } from '@fuse/components/alert'; + +import { COMPOSE } from './compose'; + +@NgModule({ + declarations: [COMPOSE], + imports: [ + MatButtonModule, + MatIconModule, + MatFormFieldModule, + MatTabsModule, + MatInputModule, + MatDialogModule, + MatSelectModule, + FuseCardModule, + SharedModule, + + FuseAlertModule, + ], +}) +export class ComposeModule {} diff --git a/src/app/modules/game/main/compose/comp-compose.component.html b/src/app/modules/beteran/compose/compose/comp-compose.component.html similarity index 100% rename from src/app/modules/game/main/compose/comp-compose.component.html rename to src/app/modules/beteran/compose/compose/comp-compose.component.html diff --git a/src/app/modules/game/main/compose/comp-compose.component.ts b/src/app/modules/beteran/compose/compose/comp-compose.component.ts similarity index 100% rename from src/app/modules/game/main/compose/comp-compose.component.ts rename to src/app/modules/beteran/compose/compose/comp-compose.component.ts diff --git a/src/app/modules/game/main/compose/customer-compose.component.html b/src/app/modules/beteran/compose/compose/customer-compose.component.html similarity index 100% rename from src/app/modules/game/main/compose/customer-compose.component.html rename to src/app/modules/beteran/compose/compose/customer-compose.component.html diff --git a/src/app/modules/game/main/compose/customer-compose.component.ts b/src/app/modules/beteran/compose/compose/customer-compose.component.ts similarity index 100% rename from src/app/modules/game/main/compose/customer-compose.component.ts rename to src/app/modules/beteran/compose/compose/customer-compose.component.ts diff --git a/src/app/modules/game/main/compose/deposit-compose.component.html b/src/app/modules/beteran/compose/compose/deposit-compose.component.html similarity index 100% rename from src/app/modules/game/main/compose/deposit-compose.component.html rename to src/app/modules/beteran/compose/compose/deposit-compose.component.html diff --git a/src/app/modules/game/main/compose/deposit-compose.component.ts b/src/app/modules/beteran/compose/compose/deposit-compose.component.ts similarity index 100% rename from src/app/modules/game/main/compose/deposit-compose.component.ts rename to src/app/modules/beteran/compose/compose/deposit-compose.component.ts diff --git a/src/app/modules/game/main/compose/deposit-history-compose.component.html b/src/app/modules/beteran/compose/compose/deposit-history-compose.component.html similarity index 100% rename from src/app/modules/game/main/compose/deposit-history-compose.component.html rename to src/app/modules/beteran/compose/compose/deposit-history-compose.component.html diff --git a/src/app/modules/game/main/compose/deposit-history-compose.component.ts b/src/app/modules/beteran/compose/compose/deposit-history-compose.component.ts similarity index 100% rename from src/app/modules/game/main/compose/deposit-history-compose.component.ts rename to src/app/modules/beteran/compose/compose/deposit-history-compose.component.ts diff --git a/src/app/modules/game/main/compose/index.ts b/src/app/modules/beteran/compose/compose/index.ts similarity index 100% rename from src/app/modules/game/main/compose/index.ts rename to src/app/modules/beteran/compose/compose/index.ts diff --git a/src/app/modules/game/main/compose/notice-compose.component.html b/src/app/modules/beteran/compose/compose/notice-compose.component.html similarity index 100% rename from src/app/modules/game/main/compose/notice-compose.component.html rename to src/app/modules/beteran/compose/compose/notice-compose.component.html diff --git a/src/app/modules/game/main/compose/notice-compose.component.ts b/src/app/modules/beteran/compose/compose/notice-compose.component.ts similarity index 100% rename from src/app/modules/game/main/compose/notice-compose.component.ts rename to src/app/modules/beteran/compose/compose/notice-compose.component.ts diff --git a/src/app/modules/game/main/compose/sign-in-compose.component.html b/src/app/modules/beteran/compose/compose/sign-in-compose.component.html similarity index 100% rename from src/app/modules/game/main/compose/sign-in-compose.component.html rename to src/app/modules/beteran/compose/compose/sign-in-compose.component.html diff --git a/src/app/modules/game/main/compose/sign-in-compose.component.ts b/src/app/modules/beteran/compose/compose/sign-in-compose.component.ts similarity index 100% rename from src/app/modules/game/main/compose/sign-in-compose.component.ts rename to src/app/modules/beteran/compose/compose/sign-in-compose.component.ts diff --git a/src/app/modules/game/main/compose/sign-up-compose.component.html b/src/app/modules/beteran/compose/compose/sign-up-compose.component.html similarity index 100% rename from src/app/modules/game/main/compose/sign-up-compose.component.html rename to src/app/modules/beteran/compose/compose/sign-up-compose.component.html diff --git a/src/app/modules/game/main/compose/sign-up-compose.component.ts b/src/app/modules/beteran/compose/compose/sign-up-compose.component.ts similarity index 100% rename from src/app/modules/game/main/compose/sign-up-compose.component.ts rename to src/app/modules/beteran/compose/compose/sign-up-compose.component.ts diff --git a/src/app/modules/game/main/compose/withdraw-compose.component.html b/src/app/modules/beteran/compose/compose/withdraw-compose.component.html similarity index 100% rename from src/app/modules/game/main/compose/withdraw-compose.component.html rename to src/app/modules/beteran/compose/compose/withdraw-compose.component.html diff --git a/src/app/modules/game/main/compose/withdraw-compose.component.ts b/src/app/modules/beteran/compose/compose/withdraw-compose.component.ts similarity index 100% rename from src/app/modules/game/main/compose/withdraw-compose.component.ts rename to src/app/modules/beteran/compose/compose/withdraw-compose.component.ts diff --git a/src/app/modules/game/main/compose/withdraw-history-compose.component.html b/src/app/modules/beteran/compose/compose/withdraw-history-compose.component.html similarity index 100% rename from src/app/modules/game/main/compose/withdraw-history-compose.component.html rename to src/app/modules/beteran/compose/compose/withdraw-history-compose.component.html diff --git a/src/app/modules/game/main/compose/withdraw-history-compose.component.ts b/src/app/modules/beteran/compose/compose/withdraw-history-compose.component.ts similarity index 100% rename from src/app/modules/game/main/compose/withdraw-history-compose.component.ts rename to src/app/modules/beteran/compose/compose/withdraw-history-compose.component.ts diff --git a/src/app/modules/game/main/main.component.ts b/src/app/modules/game/main/main.component.ts index 46cf8d2..f6e491a 100644 --- a/src/app/modules/game/main/main.component.ts +++ b/src/app/modules/game/main/main.component.ts @@ -1,14 +1,15 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { CompComposeComponent } from './compose/comp-compose.component'; -import { CustomerComposeComponent } from './compose/customer-compose.component'; -import { DepositComposeComponent } from './compose/deposit-compose.component'; -import { DepositHistoryComposeComponent } from './compose/deposit-history-compose.component'; -import { NoticeComposeComponent } from './compose/notice-compose.component'; -import { SignInComposeComponent } from './compose/sign-in-compose.component'; -import { SignUpComposeComponent } from './compose/sign-up-compose.component'; -import { WithdrawComposeComponent } from './compose/withdraw-compose.component'; -import { WithdrawHistoryComposeComponent } from './compose/withdraw-history-compose.component'; + +import { CompComposeComponent } from 'app/modules/beteran/compose/compose/comp-compose.component'; +import { CustomerComposeComponent } from 'app/modules/beteran/compose/compose/customer-compose.component'; +import { DepositComposeComponent } from 'app/modules/beteran/compose/compose/deposit-compose.component'; +import { DepositHistoryComposeComponent } from 'app/modules/beteran/compose/compose/deposit-history-compose.component'; +import { NoticeComposeComponent } from 'app/modules/beteran/compose/compose/notice-compose.component'; +import { SignInComposeComponent } from 'app/modules/beteran/compose/compose/sign-in-compose.component'; +import { SignUpComposeComponent } from 'app/modules/beteran/compose/compose/sign-up-compose.component'; +import { WithdrawComposeComponent } from 'app/modules/beteran/compose/compose/withdraw-compose.component'; +import { WithdrawHistoryComposeComponent } from 'app/modules/beteran/compose/compose/withdraw-history-compose.component'; export enum ComposeMenuType { signOut = 'signOut', diff --git a/src/app/modules/game/main/main.module.ts b/src/app/modules/game/main/main.module.ts index 65fc68a..877e70e 100644 --- a/src/app/modules/game/main/main.module.ts +++ b/src/app/modules/game/main/main.module.ts @@ -15,8 +15,7 @@ import { GameMainComponent } from 'app/modules/game/main/main.component'; import { FuseAlertModule } from '@fuse/components/alert'; -import { COMPOSE } from './compose'; - +import { ComposeModule } from 'app/modules/beteran/compose/compose.module'; const mainRoutes: Route[] = [ { path: '', @@ -25,7 +24,7 @@ const mainRoutes: Route[] = [ ]; @NgModule({ - declarations: [GameMainComponent, COMPOSE], + declarations: [GameMainComponent], imports: [ RouterModule.forChild(mainRoutes), MatButtonModule, @@ -39,6 +38,8 @@ const mainRoutes: Route[] = [ SharedModule, FuseAlertModule, + + ComposeModule, ], }) export class GameMainModule {} diff --git a/src/app/modules/user/main/compose/comp-compose.component.html b/src/app/modules/user/main/compose/comp-compose.component.html deleted file mode 100644 index a8b20be..0000000 --- a/src/app/modules/user/main/compose/comp-compose.component.html +++ /dev/null @@ -1,123 +0,0 @@ -
- -
-
Comp
- -
- - -
- - - To - -
- - Cc - - - Bcc - -
-
- - - - Cc - - - - - - Bcc - - - - - - Subject - - - - - - - -
-
- - - - - - - - -
- -
- - - - - - -
-
-
-
diff --git a/src/app/modules/user/main/compose/comp-compose.component.ts b/src/app/modules/user/main/compose/comp-compose.component.ts deleted file mode 100644 index 4e4171d..0000000 --- a/src/app/modules/user/main/compose/comp-compose.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { MatDialogRef } from '@angular/material/dialog'; - -@Component({ - selector: 'comp-compose', - templateUrl: './comp-compose.component.html', - encapsulation: ViewEncapsulation.None, -}) -export class CompComposeComponent implements OnInit { - composeForm!: FormGroup; - copyFields: { cc: boolean; bcc: boolean } = { - cc: false, - bcc: false, - }; - quillModules: any = { - toolbar: [ - ['bold', 'italic', 'underline'], - [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], - ['clean'], - ], - }; - - /** - * Constructor - */ - constructor( - public matDialogRef: MatDialogRef, - private _formBuilder: FormBuilder - ) {} - - // ----------------------------------------------------------------------------------------------------- - // @ Lifecycle hooks - // ----------------------------------------------------------------------------------------------------- - - /** - * On init - */ - ngOnInit(): void { - // Create the form - this.composeForm = this._formBuilder.group({ - to: ['', [Validators.required, Validators.email]], - cc: ['', [Validators.email]], - bcc: ['', [Validators.email]], - subject: [''], - body: ['', [Validators.required]], - }); - } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Show the copy field with the given field name - * - * @param name - */ - showCopyField(name: string): void { - // Return if the name is not one of the available names - if (name !== 'cc' && name !== 'bcc') { - return; - } - - // Show the field - this.copyFields[name] = true; - } - - /** - * 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 {} -} diff --git a/src/app/modules/user/main/compose/customer-compose.component.html b/src/app/modules/user/main/compose/customer-compose.component.html deleted file mode 100644 index 85d12de..0000000 --- a/src/app/modules/user/main/compose/customer-compose.component.html +++ /dev/null @@ -1,123 +0,0 @@ -
- -
-
customer
- -
- - -
- - - To - -
- - Cc - - - Bcc - -
-
- - - - Cc - - - - - - Bcc - - - - - - Subject - - - - - - - -
-
- - - - - - - - -
- -
- - - - - - -
-
-
-
diff --git a/src/app/modules/user/main/compose/customer-compose.component.ts b/src/app/modules/user/main/compose/customer-compose.component.ts deleted file mode 100644 index 1f37b46..0000000 --- a/src/app/modules/user/main/compose/customer-compose.component.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { MatDialogRef } from '@angular/material/dialog'; - -@Component({ - selector: 'customer-compose', - templateUrl: './customer-compose.component.html', - encapsulation: ViewEncapsulation.None, -}) -export class CustomerComposeComponent implements OnInit { - composeForm!: FormGroup; - copyFields: { cc: boolean; bcc: boolean } = { - cc: false, - bcc: false, - }; - quillModules: any = { - toolbar: [ - ['bold', 'italic', 'underline'], - [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], - ['clean'], - ], - }; - /** - * Constructor - */ - constructor( - public matDialogRef: MatDialogRef, - private _formBuilder: FormBuilder - ) {} - - // ----------------------------------------------------------------------------------------------------- - // @ Lifecycle hooks - // ----------------------------------------------------------------------------------------------------- - - /** - * On init - */ - ngOnInit(): void { - // Create the form - this.composeForm = this._formBuilder.group({ - to: ['', [Validators.required, Validators.email]], - cc: ['', [Validators.email]], - bcc: ['', [Validators.email]], - subject: [''], - body: ['', [Validators.required]], - }); - } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Show the copy field with the given field name - * - * @param name - */ - showCopyField(name: string): void { - // Return if the name is not one of the available names - if (name !== 'cc' && name !== 'bcc') { - return; - } - - // Show the field - this.copyFields[name] = true; - } - - /** - * 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 {} -} diff --git a/src/app/modules/user/main/compose/deposit-compose.component.html b/src/app/modules/user/main/compose/deposit-compose.component.html deleted file mode 100644 index 114eb35..0000000 --- a/src/app/modules/user/main/compose/deposit-compose.component.html +++ /dev/null @@ -1,123 +0,0 @@ -
- -
-
deposit
- -
- - -
- - - To - -
- - Cc - - - Bcc - -
-
- - - - Cc - - - - - - Bcc - - - - - - Subject - - - - - - - -
-
- - - - - - - - -
- -
- - - - - - -
-
-
-
diff --git a/src/app/modules/user/main/compose/deposit-compose.component.ts b/src/app/modules/user/main/compose/deposit-compose.component.ts deleted file mode 100644 index d56e036..0000000 --- a/src/app/modules/user/main/compose/deposit-compose.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { MatDialogRef } from '@angular/material/dialog'; - -@Component({ - selector: 'deposit-compose', - templateUrl: './deposit-compose.component.html', - encapsulation: ViewEncapsulation.None, -}) -export class DepositComposeComponent implements OnInit { - composeForm!: FormGroup; - copyFields: { cc: boolean; bcc: boolean } = { - cc: false, - bcc: false, - }; - quillModules: any = { - toolbar: [ - ['bold', 'italic', 'underline'], - [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], - ['clean'], - ], - }; - - /** - * Constructor - */ - constructor( - public matDialogRef: MatDialogRef, - private _formBuilder: FormBuilder - ) {} - - // ----------------------------------------------------------------------------------------------------- - // @ Lifecycle hooks - // ----------------------------------------------------------------------------------------------------- - - /** - * On init - */ - ngOnInit(): void { - // Create the form - this.composeForm = this._formBuilder.group({ - to: ['', [Validators.required, Validators.email]], - cc: ['', [Validators.email]], - bcc: ['', [Validators.email]], - subject: [''], - body: ['', [Validators.required]], - }); - } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Show the copy field with the given field name - * - * @param name - */ - showCopyField(name: string): void { - // Return if the name is not one of the available names - if (name !== 'cc' && name !== 'bcc') { - return; - } - - // Show the field - this.copyFields[name] = true; - } - - /** - * 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 {} -} diff --git a/src/app/modules/user/main/compose/deposit-history-compose.component.html b/src/app/modules/user/main/compose/deposit-history-compose.component.html deleted file mode 100644 index 9a8f338..0000000 --- a/src/app/modules/user/main/compose/deposit-history-compose.component.html +++ /dev/null @@ -1,123 +0,0 @@ -
- -
-
Deposit History
- -
- - -
- - - To - -
- - Cc - - - Bcc - -
-
- - - - Cc - - - - - - Bcc - - - - - - Subject - - - - - - - -
-
- - - - - - - - -
- -
- - - - - - -
-
-
-
diff --git a/src/app/modules/user/main/compose/deposit-history-compose.component.ts b/src/app/modules/user/main/compose/deposit-history-compose.component.ts deleted file mode 100644 index 380d329..0000000 --- a/src/app/modules/user/main/compose/deposit-history-compose.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { MatDialogRef } from '@angular/material/dialog'; - -@Component({ - selector: 'deposit-history-compose', - templateUrl: './deposit-history-compose.component.html', - encapsulation: ViewEncapsulation.None, -}) -export class DepositHistoryComposeComponent implements OnInit { - composeForm!: FormGroup; - copyFields: { cc: boolean; bcc: boolean } = { - cc: false, - bcc: false, - }; - quillModules: any = { - toolbar: [ - ['bold', 'italic', 'underline'], - [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], - ['clean'], - ], - }; - - /** - * Constructor - */ - constructor( - public matDialogRef: MatDialogRef, - private _formBuilder: FormBuilder - ) {} - - // ----------------------------------------------------------------------------------------------------- - // @ Lifecycle hooks - // ----------------------------------------------------------------------------------------------------- - - /** - * On init - */ - ngOnInit(): void { - // Create the form - this.composeForm = this._formBuilder.group({ - to: ['', [Validators.required, Validators.email]], - cc: ['', [Validators.email]], - bcc: ['', [Validators.email]], - subject: [''], - body: ['', [Validators.required]], - }); - } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Show the copy field with the given field name - * - * @param name - */ - showCopyField(name: string): void { - // Return if the name is not one of the available names - if (name !== 'cc' && name !== 'bcc') { - return; - } - - // Show the field - this.copyFields[name] = true; - } - - /** - * 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 {} -} diff --git a/src/app/modules/user/main/compose/index.ts b/src/app/modules/user/main/compose/index.ts deleted file mode 100644 index 7d9ad72..0000000 --- a/src/app/modules/user/main/compose/index.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { CompComposeComponent } from './comp-compose.component'; -import { CustomerComposeComponent } from './customer-compose.component'; -import { DepositComposeComponent } from './deposit-compose.component'; -import { DepositHistoryComposeComponent } from './deposit-history-compose.component'; -import { NoticeComposeComponent } from './notice-compose.component'; -import { WithdrawComposeComponent } from './withdraw-compose.component'; -import { WithdrawHistoryComposeComponent } from './withdraw-history-compose.component'; -import { SignUpComposeComponent } from './sign-up-compose.component'; -import { SignInComposeComponent } from './sign-in-compose.component'; -export const COMPOSE = [ - DepositComposeComponent, - WithdrawComposeComponent, - CompComposeComponent, - CustomerComposeComponent, - DepositHistoryComposeComponent, - WithdrawHistoryComposeComponent, - NoticeComposeComponent, - SignUpComposeComponent, - SignInComposeComponent, -]; diff --git a/src/app/modules/user/main/compose/notice-compose.component.html b/src/app/modules/user/main/compose/notice-compose.component.html deleted file mode 100644 index bea4966..0000000 --- a/src/app/modules/user/main/compose/notice-compose.component.html +++ /dev/null @@ -1,123 +0,0 @@ -
- -
-
Notice
- -
- - -
- - - To - -
- - Cc - - - Bcc - -
-
- - - - Cc - - - - - - Bcc - - - - - - Subject - - - - - - - -
-
- - - - - - - - -
- -
- - - - - - -
-
-
-
diff --git a/src/app/modules/user/main/compose/notice-compose.component.ts b/src/app/modules/user/main/compose/notice-compose.component.ts deleted file mode 100644 index 265a577..0000000 --- a/src/app/modules/user/main/compose/notice-compose.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { MatDialogRef } from '@angular/material/dialog'; - -@Component({ - selector: 'notice-compose', - templateUrl: './notice-compose.component.html', - encapsulation: ViewEncapsulation.None, -}) -export class NoticeComposeComponent implements OnInit { - composeForm!: FormGroup; - copyFields: { cc: boolean; bcc: boolean } = { - cc: false, - bcc: false, - }; - quillModules: any = { - toolbar: [ - ['bold', 'italic', 'underline'], - [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], - ['clean'], - ], - }; - - /** - * Constructor - */ - constructor( - public matDialogRef: MatDialogRef, - private _formBuilder: FormBuilder - ) {} - - // ----------------------------------------------------------------------------------------------------- - // @ Lifecycle hooks - // ----------------------------------------------------------------------------------------------------- - - /** - * On init - */ - ngOnInit(): void { - // Create the form - this.composeForm = this._formBuilder.group({ - to: ['', [Validators.required, Validators.email]], - cc: ['', [Validators.email]], - bcc: ['', [Validators.email]], - subject: [''], - body: ['', [Validators.required]], - }); - } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Show the copy field with the given field name - * - * @param name - */ - showCopyField(name: string): void { - // Return if the name is not one of the available names - if (name !== 'cc' && name !== 'bcc') { - return; - } - - // Show the field - this.copyFields[name] = true; - } - - /** - * 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 {} -} diff --git a/src/app/modules/user/main/compose/sign-in-compose.component.html b/src/app/modules/user/main/compose/sign-in-compose.component.html deleted file mode 100644 index fc7fedc..0000000 --- a/src/app/modules/user/main/compose/sign-in-compose.component.html +++ /dev/null @@ -1,65 +0,0 @@ -
- -
-
로그인
- -
- - {{ alert.message }} - - -
- - - 아이디 - -
-
- - - - 비밀번호 - - - - -
-
- - - - - -
-
-
-
diff --git a/src/app/modules/user/main/compose/sign-in-compose.component.ts b/src/app/modules/user/main/compose/sign-in-compose.component.ts deleted file mode 100644 index 42564ad..0000000 --- a/src/app/modules/user/main/compose/sign-in-compose.component.ts +++ /dev/null @@ -1,99 +0,0 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { MatDialogRef } from '@angular/material/dialog'; -import { FuseAlertType } from '@fuse/components/alert'; -import { AuthService } from 'app/core/auth/auth.service'; - -@Component({ - selector: 'sign-in-compose', - templateUrl: './sign-in-compose.component.html', - encapsulation: ViewEncapsulation.None, -}) -export class SignInComposeComponent implements OnInit { - signInComposeForm!: FormGroup; - - alert: { type: FuseAlertType; message: string } = { - type: 'success', - message: '로그인이 성공하였습니다.', - }; - - showAlert: boolean = false; - - /** - * Constructor - */ - constructor( - public matDialogRef: MatDialogRef, - private _formBuilder: FormBuilder, - private _authService: AuthService - ) {} - - // ----------------------------------------------------------------------------------------------------- - // @ Lifecycle hooks - // ----------------------------------------------------------------------------------------------------- - - /** - * On init - */ - ngOnInit(): void { - // Create the form - this.signInComposeForm = this._formBuilder.group({ - username: ['', [Validators.required]], - password: ['', [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 { - // Return if the form is invalid - if (this.signInComposeForm?.invalid) { - return; - } - - // Disable the form - this.signInComposeForm?.disable(); - - // Sign in - this._authService - .signIn(this.signInComposeForm?.value) - .then(() => { - console.log(); - this.showAlert = true; - }) - .catch((e) => { - this.showAlert = true; - this.alert = { type: 'error', message: '등록에 실패하였습니다.' }; - // Re-enable the form - this.signInComposeForm?.enable(); - - // Reset the form - }); - } -} diff --git a/src/app/modules/user/main/compose/sign-up-compose.component.html b/src/app/modules/user/main/compose/sign-up-compose.component.html deleted file mode 100644 index 3277942..0000000 --- a/src/app/modules/user/main/compose/sign-up-compose.component.html +++ /dev/null @@ -1,280 +0,0 @@ -
- -
-
회원가입
- -
- - - {{ alert.message }} - - -
-
-
- -
- - - - 추천인 코드 - - - 추천인 코드는 필수 입력입니다. - - - 추천인 코드는 필수 입력입니다. - - - - -
- -
-
- - - 아이디 - - - 아이디는 필수 입력입니다. - - - 아이디가 중복됩니다. - - - - - - - 닉네임 - - - 닉네임은 필수 입력입니다. - - - 닉네임이 중복됩니다. - - -
-
- -
-
- - - 비밀번호 - - - 비밀번호는 필수 입력입니다. - - - - - - 비밀번호 확인 - - - 비밀번호 확인은 필수 입력입니다. - - - 비밀번호가 동일하지 않습니다. - - -
-
-
-
- - - 출금비밀번호 - - - 출금 비밀번호는 필수 입력입니다. - - - - - - 전화번호 - - - 전화번호는 필수 입력입니다. - - -
-
-
-
- - - 은행명 - - - {{ bank.getName() }} - - - - - 은행명은 필수 입력입니다. - - - - - - 계좌번호 - - - 계좌번호는 필수 입력입니다. - - -
-
-
-
- - - 예금주 - - - 예금주는 필수 입력입니다. - - -
-
- -
-
- - - - - -
-
-
-
-
-
-
diff --git a/src/app/modules/user/main/compose/sign-up-compose.component.ts b/src/app/modules/user/main/compose/sign-up-compose.component.ts deleted file mode 100644 index 0df472c..0000000 --- a/src/app/modules/user/main/compose/sign-up-compose.component.ts +++ /dev/null @@ -1,226 +0,0 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { - AbstractControl, - FormBuilder, - FormGroup, - ValidatorFn, - Validators, -} from '@angular/forms'; -import { MatDialogRef } from '@angular/material/dialog'; -import { fuseAnimations } from '@fuse/animations'; -import { FuseAlertType } from '@fuse/components/alert'; -import { BankService } from 'app/modules/polyglot/bank/services/bank.service'; -import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service'; -import { MemberService } from 'app/modules/polyglot/member/services/member.service'; -import { MemberReferrerService } from 'app/modules/polyglot/member_referrer/services/member_referrer.service'; -import { - CreateMemberRequest, - CreateMemberResponse, -} from 'app/modules/proto/c2se/member_pb'; -import { Bank } from 'app/modules/proto/models/bank_pb'; - -@Component({ - selector: 'sign-up-compose', - templateUrl: './sign-up-compose.component.html', - encapsulation: ViewEncapsulation.None, - animations: fuseAnimations, -}) -export class SignUpComposeComponent implements OnInit { - signupComposeForm!: FormGroup; - - isSendDisable = false; - banks!: Bank[]; - - alert: { type: FuseAlertType; message: string } = { - type: 'success', - message: '등록이 성공하였습니다.', - }; - - showAlert: boolean = false; - - /** - * Constructor - */ - constructor( - public matDialogRef: MatDialogRef, - private _formBuilder: FormBuilder, - private _identityService: IdentityService, - private _memberService: MemberService, - private _memberReferrerService: MemberReferrerService, - private _bankService: BankService - ) {} - - // ----------------------------------------------------------------------------------------------------- - // @ Lifecycle hooks - // ----------------------------------------------------------------------------------------------------- - - /** - * On init - */ - ngOnInit(): void { - this._bankService - .listBanks() - .then((result) => { - this.banks = result.getBanksList(); - }) - .catch((reson) => console.log(reson)); - - // Create the form - this.signupComposeForm = this._formBuilder.group({ - referalCode: ['maejang0lvl1', [Validators.required]], - username: ['', [Validators.required]], - nickname: ['', Validators.required], - password: ['1234', [Validators.required]], - passwordConfirm: [ - '1234', - [Validators.required, this.checkSameForPassword()], - ], - exchangePassword: ['1234', [Validators.required]], - mobilePhoneNumber: ['01012345678', [Validators.required]], - bankId: ['', [Validators.required]], - accountNumber: ['123123123', [Validators.required]], - accountHolder: ['', [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 { - if (!this.signupComposeForm?.valid) { - return; - } - - this.isSendDisable = true; - - const { - referalCode, - username, - nickname, - password, - passwordConfirm, - exchangePassword, - mobilePhoneNumber, - bankId, - accountNumber, - accountHolder, - } = this.signupComposeForm?.value; - - let bank_account = new CreateMemberRequest.BankAccount(); - bank_account.setBankId(bankId); - bank_account.setName(accountHolder); - bank_account.setAccountNumber(accountNumber); - bank_account.setExchangePassword(exchangePassword); - - const member = new CreateMemberRequest(); - - member.setSiteId('d7cbae26-53b6-4cb1-85a4-66b956cbe1d4'); - member.setUsername(username); - member.setPassword(password); - member.setMemberClassId('4598f07a-86d1-42a4-b038-25706683a7cd'); - member.setMemberLevelId('c56231ac-2120-4a81-a30a-5d41fafb6c57'); - member.setReferrerMemberUsername(referalCode); - member.setNickname(nickname); - member.setMobilePhoneNumber(mobilePhoneNumber); - member.setBankAccount(bank_account); - - this._memberService - .createMember(member) - .then((res: CreateMemberResponse.Result) => { - console.log(res.getMember()); - this.showAlert = true; - }) - .catch((e) => { - this.showAlert = true; - this.alert = { type: 'error', message: '등록에 실패하였습니다.' }; - }) - .finally(() => setTimeout(() => this.close(), 5000)); - } - - __checkReferrerCode(event: FocusEvent): void { - const code = this.signupComposeForm.get('referalCode')?.value; - this._memberReferrerService.getMemberReferrerByCode(code).then((result) => { - if (!result) { - this.signupComposeForm - ?.get('referalCode') - ?.setErrors({ notExistReferalCode: true }); - } - }); - } - - __checkUsernameDuplicate(event: FocusEvent): void { - const username = this.signupComposeForm?.get('username')?.value; - // console.log(event, '::', username); - this._identityService - .checkUsernameForDuplication(username) - .then((isUse: boolean) => { - if (!!isUse) { - this.signupComposeForm - ?.get('username') - ?.setErrors({ usernameDuplicate: true }); - } - // this._changeDetectorRef.markForCheck(); - }); - } - - __checkNickname(event: FocusEvent): void { - const nickname = this.signupComposeForm?.get('nickname')?.value; - - this._identityService - .checkNicknameForDuplication(nickname) - .then((isUse: boolean) => { - if (!!isUse) { - this.signupComposeForm - ?.get('nickname') - ?.setErrors({ nicknameDuplicate: true }); - } - // this._changeDetectorRef.markForCheck(); - }); - } - - close(): void { - this.matDialogRef.close({ - choice: true, - }); - } - - private checkSameForPassword(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } | null => { - if (!control || !control.value || control.value === '') { - return null; - } - const password = this.signupComposeForm?.get('password')?.value as string; - const passwordConfirm = control.value as string; - - if (password !== passwordConfirm) { - return { passwordNotMatch: true }; - } - return null; - }; - } -} diff --git a/src/app/modules/user/main/compose/withdraw-compose.component.html b/src/app/modules/user/main/compose/withdraw-compose.component.html deleted file mode 100644 index 4789dc2..0000000 --- a/src/app/modules/user/main/compose/withdraw-compose.component.html +++ /dev/null @@ -1,123 +0,0 @@ -
- -
-
Withdraw
- -
- - -
- - - To - -
- - Cc - - - Bcc - -
-
- - - - Cc - - - - - - Bcc - - - - - - Subject - - - - - - - -
-
- - - - - - - - -
- -
- - - - - - -
-
-
-
diff --git a/src/app/modules/user/main/compose/withdraw-compose.component.ts b/src/app/modules/user/main/compose/withdraw-compose.component.ts deleted file mode 100644 index 51a1295..0000000 --- a/src/app/modules/user/main/compose/withdraw-compose.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { MatDialogRef } from '@angular/material/dialog'; - -@Component({ - selector: 'withdraw-compose', - templateUrl: './withdraw-compose.component.html', - encapsulation: ViewEncapsulation.None, -}) -export class WithdrawComposeComponent implements OnInit { - composeForm!: FormGroup; - copyFields: { cc: boolean; bcc: boolean } = { - cc: false, - bcc: false, - }; - quillModules: any = { - toolbar: [ - ['bold', 'italic', 'underline'], - [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], - ['clean'], - ], - }; - - /** - * Constructor - */ - constructor( - public matDialogRef: MatDialogRef, - private _formBuilder: FormBuilder - ) {} - - // ----------------------------------------------------------------------------------------------------- - // @ Lifecycle hooks - // ----------------------------------------------------------------------------------------------------- - - /** - * On init - */ - ngOnInit(): void { - // Create the form - this.composeForm = this._formBuilder.group({ - to: ['', [Validators.required, Validators.email]], - cc: ['', [Validators.email]], - bcc: ['', [Validators.email]], - subject: [''], - body: ['', [Validators.required]], - }); - } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Show the copy field with the given field name - * - * @param name - */ - showCopyField(name: string): void { - // Return if the name is not one of the available names - if (name !== 'cc' && name !== 'bcc') { - return; - } - - // Show the field - this.copyFields[name] = true; - } - - /** - * 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 {} -} diff --git a/src/app/modules/user/main/compose/withdraw-history-compose.component.html b/src/app/modules/user/main/compose/withdraw-history-compose.component.html deleted file mode 100644 index 5eb6d19..0000000 --- a/src/app/modules/user/main/compose/withdraw-history-compose.component.html +++ /dev/null @@ -1,123 +0,0 @@ -
- -
-
Withdraw History
- -
- - -
- - - To - -
- - Cc - - - Bcc - -
-
- - - - Cc - - - - - - Bcc - - - - - - Subject - - - - - - - -
-
- - - - - - - - -
- -
- - - - - - -
-
-
-
diff --git a/src/app/modules/user/main/compose/withdraw-history-compose.component.ts b/src/app/modules/user/main/compose/withdraw-history-compose.component.ts deleted file mode 100644 index 31e50d7..0000000 --- a/src/app/modules/user/main/compose/withdraw-history-compose.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { MatDialogRef } from '@angular/material/dialog'; - -@Component({ - selector: 'withdraw-history-compose', - templateUrl: './withdraw-history-compose.component.html', - encapsulation: ViewEncapsulation.None, -}) -export class WithdrawHistoryComposeComponent implements OnInit { - composeForm!: FormGroup; - copyFields: { cc: boolean; bcc: boolean } = { - cc: false, - bcc: false, - }; - quillModules: any = { - toolbar: [ - ['bold', 'italic', 'underline'], - [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], - ['clean'], - ], - }; - - /** - * Constructor - */ - constructor( - public matDialogRef: MatDialogRef, - private _formBuilder: FormBuilder - ) {} - - // ----------------------------------------------------------------------------------------------------- - // @ Lifecycle hooks - // ----------------------------------------------------------------------------------------------------- - - /** - * On init - */ - ngOnInit(): void { - // Create the form - this.composeForm = this._formBuilder.group({ - to: ['', [Validators.required, Validators.email]], - cc: ['', [Validators.email]], - bcc: ['', [Validators.email]], - subject: [''], - body: ['', [Validators.required]], - }); - } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Show the copy field with the given field name - * - * @param name - */ - showCopyField(name: string): void { - // Return if the name is not one of the available names - if (name !== 'cc' && name !== 'bcc') { - return; - } - - // Show the field - this.copyFields[name] = true; - } - - /** - * 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 {} -} diff --git a/src/app/modules/user/main/main.component.ts b/src/app/modules/user/main/main.component.ts index c917eb3..776201b 100644 --- a/src/app/modules/user/main/main.component.ts +++ b/src/app/modules/user/main/main.component.ts @@ -1,14 +1,14 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { CompComposeComponent } from './compose/comp-compose.component'; -import { CustomerComposeComponent } from './compose/customer-compose.component'; -import { DepositComposeComponent } from './compose/deposit-compose.component'; -import { DepositHistoryComposeComponent } from './compose/deposit-history-compose.component'; -import { NoticeComposeComponent } from './compose/notice-compose.component'; -import { SignInComposeComponent } from './compose/sign-in-compose.component'; -import { SignUpComposeComponent } from './compose/sign-up-compose.component'; -import { WithdrawComposeComponent } from './compose/withdraw-compose.component'; -import { WithdrawHistoryComposeComponent } from './compose/withdraw-history-compose.component'; +import { CompComposeComponent } from 'app/modules/beteran/compose/compose/comp-compose.component'; +import { CustomerComposeComponent } from 'app/modules/beteran/compose/compose/customer-compose.component'; +import { DepositComposeComponent } from 'app/modules/beteran/compose/compose/deposit-compose.component'; +import { DepositHistoryComposeComponent } from 'app/modules/beteran/compose/compose/deposit-history-compose.component'; +import { NoticeComposeComponent } from 'app/modules/beteran/compose/compose/notice-compose.component'; +import { SignInComposeComponent } from 'app/modules/beteran/compose/compose/sign-in-compose.component'; +import { SignUpComposeComponent } from 'app/modules/beteran/compose/compose/sign-up-compose.component'; +import { WithdrawComposeComponent } from 'app/modules/beteran/compose/compose/withdraw-compose.component'; +import { WithdrawHistoryComposeComponent } from 'app/modules/beteran/compose/compose/withdraw-history-compose.component'; export enum ComposeMenuType { signin = 'signin', diff --git a/src/app/modules/user/main/main.module.ts b/src/app/modules/user/main/main.module.ts index f3690ee..f0f4e30 100644 --- a/src/app/modules/user/main/main.module.ts +++ b/src/app/modules/user/main/main.module.ts @@ -15,7 +15,7 @@ import { MainComponent } from 'app/modules/user/main/main.component'; import { FuseAlertModule } from '@fuse/components/alert'; -import { COMPOSE } from './compose'; +import { ComposeModule } from 'app/modules/beteran/compose/compose.module'; const mainRoutes: Route[] = [ { @@ -25,7 +25,7 @@ const mainRoutes: Route[] = [ ]; @NgModule({ - declarations: [MainComponent, COMPOSE], + declarations: [MainComponent], imports: [ RouterModule.forChild(mainRoutes), MatButtonModule, @@ -39,6 +39,8 @@ const mainRoutes: Route[] = [ SharedModule, FuseAlertModule, + + ComposeModule, ], }) export class MainModule {}