diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts index ba30c7c..043e13b 100644 --- a/src/app/navigation/navigation.ts +++ b/src/app/navigation/navigation.ts @@ -295,7 +295,7 @@ export const navigation: FuseNavigation[] = [ translate: 'NAV.SITE.ACCOUNT_SEPARATE.TITLE', type: 'item', icon: 'email', - url: '/pages/sites/management/bank-info' + url: '/pages/sites/management/bank-accounts' }, { id: 'set_bet_amount', diff --git a/src/app/pages/sites/site/component/bank-info-list.component.html b/src/app/pages/sites/site/component/bank-accounts-list.component.html similarity index 98% rename from src/app/pages/sites/site/component/bank-info-list.component.html rename to src/app/pages/sites/site/component/bank-accounts-list.component.html index 7844f0a..b6f726a 100644 --- a/src/app/pages/sites/site/component/bank-info-list.component.html +++ b/src/app/pages/sites/site/component/bank-accounts-list.component.html @@ -1,4 +1,4 @@ -
+
; constructor( - private bankInfoService: BankInfoService, + private bankAccountsService: BankAccountsService, private fb: FormBuilder ) { this._unsubscribeAll = new Subject(); diff --git a/src/app/pages/sites/site/component/bank-info-list.data-source.ts b/src/app/pages/sites/site/component/bank-accounts-list.data-source.ts similarity index 63% rename from src/app/pages/sites/site/component/bank-info-list.data-source.ts rename to src/app/pages/sites/site/component/bank-accounts-list.data-source.ts index 56e3e2f..6147ca9 100644 --- a/src/app/pages/sites/site/component/bank-info-list.data-source.ts +++ b/src/app/pages/sites/site/component/bank-accounts-list.data-source.ts @@ -5,27 +5,27 @@ import { map } from 'rxjs/operators'; import { CollectionViewer } from '@angular/cdk/collections'; -import { BankInfo } from 'src/modules/sites/model/bank-info.model'; -import { BankInfoService } from 'src/modules/sites/service/bank-info.service'; +import { BankAccounts } from 'src/modules/sites/model/bank-accounts.model'; +import { BankAccountsService } from 'src/modules/sites/service/bank-accounts.service'; import { FormControl, FormGroup, Validators, FormArray } from '@angular/forms'; -export class BankInfoListDataSource extends DataSource { - private _objectStore: BankInfo[] = []; - private _ObjectsSubject$ = new BehaviorSubject([]); +export class BankAccountsListDataSource extends DataSource { + private _objectStore: BankAccounts[] = []; + private _ObjectsSubject$ = new BehaviorSubject([]); private _loadingSubject$ = new BehaviorSubject(false); public loading$ = this._loadingSubject$.asObservable(); public formg: FormGroup; - constructor(private bankInfoService: BankInfoService) { + constructor(private bankAccountsService: BankAccountsService) { super(); } - connect(collectionViewer: CollectionViewer): Observable { - return this.bankInfoService.getAllAsFormArray().pipe( + connect(collectionViewer: CollectionViewer): Observable { + return this.bankAccountsService.getAllAsFormArray().pipe( map(res => { - res.forEach(m => this._objectStore.push(m as BankInfo)); + res.forEach(m => this._objectStore.push(m as BankAccounts)); this._ObjectsSubject$.next(this._objectStore); let fa = this.formg.get('formarray'); res.forEach(r => fa.push(this.createRowFormGroup(r))); @@ -34,7 +34,7 @@ export class BankInfoListDataSource extends DataSource { ); } - createRowFormGroup(r: BankInfo): FormGroup { + createRowFormGroup(r: BankAccounts): FormGroup { let f = new FormGroup({ id: this.createNewFormContorl(r, 'id'), name: this.createNewFormContorl(r, 'name'), @@ -45,7 +45,7 @@ export class BankInfoListDataSource extends DataSource { return f; } - createNewFormContorl(r: BankInfo, propName: string): FormControl { + createNewFormContorl(r: BankAccounts, propName: string): FormControl { let m = new FormControl(r[propName], Validators.required); m.valueChanges.subscribe(val => { r[propName] = val; diff --git a/src/app/pages/sites/site/component/index.ts b/src/app/pages/sites/site/component/index.ts index 7747e43..ef98742 100644 --- a/src/app/pages/sites/site/component/index.ts +++ b/src/app/pages/sites/site/component/index.ts @@ -1,5 +1,5 @@ import { DefaultConfigComponent } from './default-config.component'; -import { BankInfoListComponent } from './bank-info-list.component'; +import { BankAccountsListComponent } from './bank-accounts-list.component'; import { BetAmountComponent } from './bet-amount.component'; import { BlockIpComponent } from './block-ip.component'; import { AdminIpComponent } from './admin-ip.component'; @@ -7,7 +7,7 @@ import { LevelComponent } from './level.component'; export const COMPONENTS = [ DefaultConfigComponent, - BankInfoListComponent, + BankAccountsListComponent, BetAmountComponent, BlockIpComponent, AdminIpComponent, diff --git a/src/app/pages/sites/site/site-routing.module.ts b/src/app/pages/sites/site/site-routing.module.ts index b8020c3..4efb44b 100644 --- a/src/app/pages/sites/site/site-routing.module.ts +++ b/src/app/pages/sites/site/site-routing.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { DefaultConfigComponent } from './component/default-config.component'; -import { BankInfoListComponent } from './component/bank-info-list.component'; +import { BankAccountsListComponent } from './component/bank-accounts-list.component'; import { BetAmountComponent } from './component/bet-amount.component'; import { BlockIpComponent } from './component/block-ip.component'; import { AdminIpComponent } from './component/admin-ip.component'; @@ -14,8 +14,8 @@ const routes: Routes = [ component: DefaultConfigComponent }, { - path: 'bank-info', - component: BankInfoListComponent + path: 'bank-accounts', + component: BankAccountsListComponent }, { path: 'bet-amount', diff --git a/src/app/pages/specials/special/component/fix-bonus.component.ts b/src/app/pages/specials/special/component/fix-bonus.component.ts index ddfd07f..27f9245 100644 --- a/src/app/pages/specials/special/component/fix-bonus.component.ts +++ b/src/app/pages/specials/special/component/fix-bonus.component.ts @@ -11,7 +11,7 @@ import { FormGroup, FormBuilder, FormArray } from '@angular/forms'; import { fuseAnimations } from 'src/@fuse/animations'; import { Subject } from 'rxjs'; import { FixBonusDataSource } from './fix-bonus.data-source'; -import { FixBonusService } from 'src/modules/special/fix-bonus/service/fix-bonus.service'; +import { FixBonusService } from 'src/modules/special/service/fix-bonus.service'; @Component({ selector: 'app-fix-bonus', diff --git a/src/app/pages/specials/special/component/fix-bonus.data-source.ts b/src/app/pages/specials/special/component/fix-bonus.data-source.ts index 474d251..03362f1 100644 --- a/src/app/pages/specials/special/component/fix-bonus.data-source.ts +++ b/src/app/pages/specials/special/component/fix-bonus.data-source.ts @@ -5,8 +5,8 @@ import { map } from 'rxjs/operators'; import { CollectionViewer } from '@angular/cdk/collections'; -import { FixBonus } from 'src/modules/special/fix-bonus/model/fix-bonus.model'; -import { FixBonusService } from 'src/modules/special/fix-bonus/service/fix-bonus.service'; +import { FixBonus } from 'src/modules/special/model/fix-bonus.model'; +import { FixBonusService } from 'src/modules/special/service/fix-bonus.service'; import { FormControl, FormGroup, Validators, FormArray } from '@angular/forms'; diff --git a/src/app/pages/specials/special/component/roulette-coupon.component.ts b/src/app/pages/specials/special/component/roulette-coupon.component.ts index 9813a35..ab3075e 100644 --- a/src/app/pages/specials/special/component/roulette-coupon.component.ts +++ b/src/app/pages/specials/special/component/roulette-coupon.component.ts @@ -12,7 +12,7 @@ import { FormGroup, FormBuilder, FormArray } from '@angular/forms'; import { fuseAnimations } from 'src/@fuse/animations'; import { Subject } from 'rxjs'; import { RouletteCouponDataSource } from './roulette-coupon.data-source'; -import { RouletteCouponService } from 'src/modules/special/roulette-coupon/service/roulette-coupon.service'; +import { RouletteCouponService } from 'src/modules/special/service/roulette-coupon.service'; @Component({ selector: 'app-roulette-coupon', diff --git a/src/app/pages/specials/special/component/roulette-coupon.data-source.ts b/src/app/pages/specials/special/component/roulette-coupon.data-source.ts index fc6b272..9f21ee5 100644 --- a/src/app/pages/specials/special/component/roulette-coupon.data-source.ts +++ b/src/app/pages/specials/special/component/roulette-coupon.data-source.ts @@ -5,8 +5,8 @@ import { map } from 'rxjs/operators'; import { CollectionViewer } from '@angular/cdk/collections'; -import { RouletteCoupon } from 'src/modules/special/roulette-coupon/model/roulette-coupon.model'; -import { RouletteCouponService } from 'src/modules/special/roulette-coupon/service/roulette-coupon.service'; +import { RouletteCoupon } from 'src/modules/special/model/roulette-coupon.model'; +import { RouletteCouponService } from 'src/modules/special/service/roulette-coupon.service'; import { FormControl, FormGroup, Validators, FormArray } from '@angular/forms'; diff --git a/src/modules/sites/model/bank-info.model.ts b/src/modules/sites/model/bank-accounts.model.ts similarity index 76% rename from src/modules/sites/model/bank-info.model.ts rename to src/modules/sites/model/bank-accounts.model.ts index 105a747..623bfaf 100644 --- a/src/modules/sites/model/bank-info.model.ts +++ b/src/modules/sites/model/bank-accounts.model.ts @@ -1,6 +1,6 @@ import { DateAudit } from 'src/modules/common/data/model/audit'; -export interface BankInfo extends DateAudit { +export interface BankAccounts extends DateAudit { id?: number; name?: string; number?: string; diff --git a/src/modules/sites/service/bank-info.service.ts b/src/modules/sites/service/bank-accounts.service.ts similarity index 71% rename from src/modules/sites/service/bank-info.service.ts rename to src/modules/sites/service/bank-accounts.service.ts index c08f928..c7aa168 100644 --- a/src/modules/sites/service/bank-info.service.ts +++ b/src/modules/sites/service/bank-accounts.service.ts @@ -3,7 +3,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; -import { BankInfo } from '../model/bank-info.model'; +import { BankAccounts } from '../model/bank-accounts.model'; import { API_BASE_URL } from 'src/modules/common/type/injection-token.type'; import { Page } from 'src/modules/common/data/model/page'; import { FormArray } from '@angular/forms'; @@ -11,21 +11,21 @@ import { FormArray } from '@angular/forms'; @Injectable({ providedIn: 'root' }) -export class BankInfoService { +export class BankAccountsService { constructor( @Inject(API_BASE_URL) private apiBaseUrl: string, private httpClient: HttpClient ) {} - public getBankInfos(): Observable> { - return this.httpClient.get>( + public getBankInfos(): Observable> { + return this.httpClient.get>( `${this.apiBaseUrl}/bank_info`, {} ); } - public getAllAsFormArray(): Observable { - return this.httpClient.get( + public getAllAsFormArray(): Observable { + return this.httpClient.get( `${this.apiBaseUrl}/bank_info/test`, {} ); diff --git a/src/modules/sites/service/index.ts b/src/modules/sites/service/index.ts index 962016d..0d89369 100644 --- a/src/modules/sites/service/index.ts +++ b/src/modules/sites/service/index.ts @@ -1,3 +1,3 @@ -import { BankInfoService } from './bank-info.service'; +import { BankAccountsService } from './bank-accounts.service'; -export const SERVICES = [BankInfoService]; +export const SERVICES = [BankAccountsService]; diff --git a/src/modules/special/fix-bonus/service/index.ts b/src/modules/special/fix-bonus/service/index.ts deleted file mode 100644 index 01a8831..0000000 --- a/src/modules/special/fix-bonus/service/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { FixBonusService } from './fix-bonus.service'; - -export const FIX_BONUS_SERVICES = [FixBonusService]; diff --git a/src/modules/special/model/alert-config.model.ts b/src/modules/special/model/alert-config.model.ts new file mode 100644 index 0000000..0bf7245 --- /dev/null +++ b/src/modules/special/model/alert-config.model.ts @@ -0,0 +1,10 @@ +import { UserDateAuditEntity } from 'src/modules/common/data/model/audit'; +import { AlertConfigName } from '../type/alert-config-type'; + +export interface AlertConfig extends UserDateAuditEntity { + id?: number; + name?: string; + filePath?: string; + fileName?: string; + alertType?: AlertConfigName; +} diff --git a/src/modules/special/model/check-notice.model.ts b/src/modules/special/model/check-notice.model.ts new file mode 100644 index 0000000..aaba48e --- /dev/null +++ b/src/modules/special/model/check-notice.model.ts @@ -0,0 +1,7 @@ +import { UserDateAuditEntity } from 'src/modules/common/data/model/audit'; + +export interface CheckNotice extends UserDateAuditEntity { + id?: number; + enable?: boolean; + contents?: string; +} diff --git a/src/modules/special/fix-bonus/model/fix-bonus.model.ts b/src/modules/special/model/fix-bonus.model.ts similarity index 100% rename from src/modules/special/fix-bonus/model/fix-bonus.model.ts rename to src/modules/special/model/fix-bonus.model.ts diff --git a/src/modules/special/model/martin-config.model.ts b/src/modules/special/model/martin-config.model.ts new file mode 100644 index 0000000..b5ee08f --- /dev/null +++ b/src/modules/special/model/martin-config.model.ts @@ -0,0 +1,8 @@ +import { UserDateAuditEntity } from 'src/modules/common/data/model/audit'; + +export interface MartinConfig extends UserDateAuditEntity { + id?: number; + name?: string; + refEnable?: boolean; + bettingOdds?: number; +} diff --git a/src/modules/special/roulette-coupon/model/roulette-coupon.model.ts b/src/modules/special/model/roulette-coupon.model.ts similarity index 100% rename from src/modules/special/roulette-coupon/model/roulette-coupon.model.ts rename to src/modules/special/model/roulette-coupon.model.ts diff --git a/src/modules/special/roulette-coupon/service/index.ts b/src/modules/special/roulette-coupon/service/index.ts deleted file mode 100644 index cdd3a9c..0000000 --- a/src/modules/special/roulette-coupon/service/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { RouletteCouponService } from './roulette-coupon.service'; - -export const ROULETTE_COUPON_SERVICES = [RouletteCouponService]; diff --git a/src/modules/special/fix-bonus/service/fix-bonus.service.ts b/src/modules/special/service/fix-bonus.service.ts similarity index 100% rename from src/modules/special/fix-bonus/service/fix-bonus.service.ts rename to src/modules/special/service/fix-bonus.service.ts diff --git a/src/modules/special/service/index.ts b/src/modules/special/service/index.ts new file mode 100644 index 0000000..15cc723 --- /dev/null +++ b/src/modules/special/service/index.ts @@ -0,0 +1,4 @@ +import { RouletteCouponService } from './roulette-coupon.service'; +import { FixBonusService } from './fix-bonus.service'; + +export const SERVICES = [RouletteCouponService, FixBonusService]; diff --git a/src/modules/special/roulette-coupon/service/roulette-coupon.service.ts b/src/modules/special/service/roulette-coupon.service.ts similarity index 100% rename from src/modules/special/roulette-coupon/service/roulette-coupon.service.ts rename to src/modules/special/service/roulette-coupon.service.ts diff --git a/src/modules/special/special.module.ts b/src/modules/special/special.module.ts index 6dd0596..e0dac72 100644 --- a/src/modules/special/special.module.ts +++ b/src/modules/special/special.module.ts @@ -1,7 +1,6 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { FIX_BONUS_SERVICES } from './fix-bonus/service'; -import { ROULETTE_COUPON_SERVICES } from './roulette-coupon/service'; +import { SERVICES } from './service'; @NgModule({ imports: [], exports: [] @@ -17,7 +16,7 @@ export class SpecialModule { public static forRoot(): ModuleWithProviders { return { ngModule: SpecialRootModule, - providers: [FIX_BONUS_SERVICES, ROULETTE_COUPON_SERVICES] + providers: [SERVICES] }; } } diff --git a/src/modules/special/type/alert-config-type.ts b/src/modules/special/type/alert-config-type.ts new file mode 100644 index 0000000..55227b2 --- /dev/null +++ b/src/modules/special/type/alert-config-type.ts @@ -0,0 +1,12 @@ +export enum AlertConfigName { + DEPOSIT = 'DEPOSIT', + WITHDRAW = 'WITHDRAW', + QNA_USER = 'QNA_USER', + NEW_USER = 'NEW_USER', + NEW_BOARD = 'NEW_BOARD', + WARNING_BETTING_LIMIT = 'WARNING_BETTING_LIMIT', + BETTING = 'BETTING', + WATCH_USER = 'WATCH_USER', + SEND_MESSAGE = 'SEND_MESSAGE', + ANSWER_MESSAGE = 'ANSWER_MESSAGE' +} diff --git a/src/modules/user/model/commission.model.ts b/src/modules/user/model/commission.model.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/modules/user/model/connect-history.model.ts b/src/modules/user/model/connect-history.model.ts new file mode 100644 index 0000000..e69de29