site bank info rename and route edit
This commit is contained in:
		
							parent
							
								
									5fefd19851
								
							
						
					
					
						commit
						42d44618fd
					
				@ -287,7 +287,7 @@ export const navigation: FuseNavigation[] = [
 | 
				
			|||||||
        translate: 'NAV.SITE.DEFAULT_SET.TITLE',
 | 
					        translate: 'NAV.SITE.DEFAULT_SET.TITLE',
 | 
				
			||||||
        type: 'item',
 | 
					        type: 'item',
 | 
				
			||||||
        icon: 'email',
 | 
					        icon: 'email',
 | 
				
			||||||
        url: '/pages/sites/configs'
 | 
					        url: '/pages/sites/management/configs'
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
        id: 'account_separate',
 | 
					        id: 'account_separate',
 | 
				
			||||||
@ -295,7 +295,7 @@ export const navigation: FuseNavigation[] = [
 | 
				
			|||||||
        translate: 'NAV.SITE.ACCOUNT_SEPARATE.TITLE',
 | 
					        translate: 'NAV.SITE.ACCOUNT_SEPARATE.TITLE',
 | 
				
			||||||
        type: 'item',
 | 
					        type: 'item',
 | 
				
			||||||
        icon: 'email',
 | 
					        icon: 'email',
 | 
				
			||||||
        url: '/pages/sites/bank-info'
 | 
					        url: '/pages/sites/management/bank-info'
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
        id: 'set_bet_amount',
 | 
					        id: 'set_bet_amount',
 | 
				
			||||||
@ -303,7 +303,7 @@ export const navigation: FuseNavigation[] = [
 | 
				
			|||||||
        translate: 'NAV.SITE.SET_BET_AMOUNT.TITLE',
 | 
					        translate: 'NAV.SITE.SET_BET_AMOUNT.TITLE',
 | 
				
			||||||
        type: 'item',
 | 
					        type: 'item',
 | 
				
			||||||
        icon: 'email',
 | 
					        icon: 'email',
 | 
				
			||||||
        url: '/pages/sites/bet-amount'
 | 
					        url: '/pages/sites/management/bet-amount'
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
        id: 'block_ip',
 | 
					        id: 'block_ip',
 | 
				
			||||||
@ -311,7 +311,7 @@ export const navigation: FuseNavigation[] = [
 | 
				
			|||||||
        translate: 'NAV.SITE.BLOCK_IP.TITLE',
 | 
					        translate: 'NAV.SITE.BLOCK_IP.TITLE',
 | 
				
			||||||
        type: 'item',
 | 
					        type: 'item',
 | 
				
			||||||
        icon: 'email',
 | 
					        icon: 'email',
 | 
				
			||||||
        url: '/pages/sites/block-ip'
 | 
					        url: '/pages/sites/management/block-ip'
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
        id: 'admin_ip',
 | 
					        id: 'admin_ip',
 | 
				
			||||||
@ -319,7 +319,7 @@ export const navigation: FuseNavigation[] = [
 | 
				
			|||||||
        translate: 'NAV.SITE.ADMIN_IP.TITLE',
 | 
					        translate: 'NAV.SITE.ADMIN_IP.TITLE',
 | 
				
			||||||
        type: 'item',
 | 
					        type: 'item',
 | 
				
			||||||
        icon: 'email',
 | 
					        icon: 'email',
 | 
				
			||||||
        url: '/pages/sites/admin-ip'
 | 
					        url: '/pages/sites/management/admin-ip'
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
        id: 'set_level',
 | 
					        id: 'set_level',
 | 
				
			||||||
@ -327,7 +327,7 @@ export const navigation: FuseNavigation[] = [
 | 
				
			|||||||
        translate: 'NAV.SITE.SET_LEVEL.TITLE',
 | 
					        translate: 'NAV.SITE.SET_LEVEL.TITLE',
 | 
				
			||||||
        type: 'item',
 | 
					        type: 'item',
 | 
				
			||||||
        icon: 'email',
 | 
					        icon: 'email',
 | 
				
			||||||
        url: '/pages/sites/level'
 | 
					        url: '/pages/sites/management/level'
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
				
			|||||||
@ -1,3 +0,0 @@
 | 
				
			|||||||
import { ListComponent } from './list.component';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
export const COMPONENTS = [ListComponent];
 | 
					 | 
				
			||||||
@ -7,22 +7,10 @@ import {
 | 
				
			|||||||
  ViewEncapsulation,
 | 
					  ViewEncapsulation,
 | 
				
			||||||
  AfterViewInit
 | 
					  AfterViewInit
 | 
				
			||||||
} from '@angular/core';
 | 
					} from '@angular/core';
 | 
				
			||||||
import { MatPaginator } from '@angular/material/paginator';
 | 
					 | 
				
			||||||
import { MatSort } from '@angular/material/sort';
 | 
					 | 
				
			||||||
import { fromEvent, Subject } from 'rxjs';
 | 
					 | 
				
			||||||
import {
 | 
					 | 
				
			||||||
  debounceTime,
 | 
					 | 
				
			||||||
  distinctUntilChanged,
 | 
					 | 
				
			||||||
  map,
 | 
					 | 
				
			||||||
  switchMap
 | 
					 | 
				
			||||||
} from 'rxjs/operators';
 | 
					 | 
				
			||||||
import { takeUntil } from 'rxjs/internal/operators';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import { MatTableDataSource } from '@angular/material/table';
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import { Subject } from 'rxjs';
 | 
				
			||||||
import { fuseAnimations } from 'src/@fuse/animations';
 | 
					import { fuseAnimations } from 'src/@fuse/animations';
 | 
				
			||||||
import { FuseUtils } from 'src/@fuse/utils';
 | 
					import { BankInfoListDataSource } from './bank-info-list.data-source';
 | 
				
			||||||
import { BankInfoDataSource } from './list.data-source';
 | 
					 | 
				
			||||||
import { BankInfoService } from 'src/modules/sites/bank-info/service/bank-info.service';
 | 
					import { BankInfoService } from 'src/modules/sites/bank-info/service/bank-info.service';
 | 
				
			||||||
import {
 | 
					import {
 | 
				
			||||||
  FormGroup,
 | 
					  FormGroup,
 | 
				
			||||||
@ -32,18 +20,18 @@ import {
 | 
				
			|||||||
  FormControl
 | 
					  FormControl
 | 
				
			||||||
} from '@angular/forms';
 | 
					} from '@angular/forms';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { BankInfo } from 'src/modules/sites/bank-info/model/bank-info.model';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@Component({
 | 
					@Component({
 | 
				
			||||||
  selector: 'app-page-sites-bank-info-list',
 | 
					  selector: 'app-page-sites-bank-info-list',
 | 
				
			||||||
  templateUrl: './list.component.html',
 | 
					  templateUrl: './bank-info-list.component.html',
 | 
				
			||||||
  styleUrls: ['./list.component.scss'],
 | 
					  styleUrls: ['./bank-info-list.component.scss'],
 | 
				
			||||||
  animations: fuseAnimations,
 | 
					  animations: fuseAnimations,
 | 
				
			||||||
  encapsulation: ViewEncapsulation.None
 | 
					  encapsulation: ViewEncapsulation.None
 | 
				
			||||||
})
 | 
					})
 | 
				
			||||||
export class ListComponent implements OnInit, OnDestroy, AfterViewInit {
 | 
					export class BankInfoListComponent implements OnInit, OnDestroy, AfterViewInit {
 | 
				
			||||||
  dataSource: BankInfoDataSource = new BankInfoDataSource(this.bankInfoService);
 | 
					  dataSource: BankInfoListDataSource = new BankInfoListDataSource(
 | 
				
			||||||
  // dataSource: MatTableDataSource<any>;
 | 
					    this.bankInfoService
 | 
				
			||||||
 | 
					  );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  displayedColumns = ['id', 'name', 'number', 'holder', 'description'];
 | 
					  displayedColumns = ['id', 'name', 'number', 'holder', 'description'];
 | 
				
			||||||
  public bankInfoFormGroup: FormGroup;
 | 
					  public bankInfoFormGroup: FormGroup;
 | 
				
			||||||
  public bankInfoFormArray: FormArray;
 | 
					  public bankInfoFormArray: FormArray;
 | 
				
			||||||
@ -1,28 +1,16 @@
 | 
				
			|||||||
import { DataSource } from '@angular/cdk/table';
 | 
					import { DataSource } from '@angular/cdk/table';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { BehaviorSubject, Observable, merge } from 'rxjs';
 | 
					import { BehaviorSubject, Observable, merge } from 'rxjs';
 | 
				
			||||||
import { switchMap, map, tap } from 'rxjs/operators';
 | 
					import { map } from 'rxjs/operators';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { MatPaginator } from '@angular/material/paginator';
 | 
					 | 
				
			||||||
import { MatSort } from '@angular/material/sort';
 | 
					 | 
				
			||||||
import { CollectionViewer } from '@angular/cdk/collections';
 | 
					import { CollectionViewer } from '@angular/cdk/collections';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { BankInfo } from 'src/modules/sites/bank-info/model/bank-info.model';
 | 
					import { BankInfo } from 'src/modules/sites/bank-info/model/bank-info.model';
 | 
				
			||||||
import { BankInfoService } from 'src/modules/sites/bank-info/service/bank-info.service';
 | 
					import { BankInfoService } from 'src/modules/sites/bank-info/service/bank-info.service';
 | 
				
			||||||
import { Page } from 'src/modules/common/data/model/page';
 | 
					 | 
				
			||||||
import {
 | 
					 | 
				
			||||||
  FormControl,
 | 
					 | 
				
			||||||
  FormsModule,
 | 
					 | 
				
			||||||
  ReactiveFormsModule,
 | 
					 | 
				
			||||||
  FormGroup,
 | 
					 | 
				
			||||||
  FormBuilder,
 | 
					 | 
				
			||||||
  Validators,
 | 
					 | 
				
			||||||
  NgControl,
 | 
					 | 
				
			||||||
  NgForm,
 | 
					 | 
				
			||||||
  FormArray
 | 
					 | 
				
			||||||
} from '@angular/forms';
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
export class BankInfoDataSource extends DataSource<BankInfo> {
 | 
					import { FormControl, FormGroup, Validators, FormArray } from '@angular/forms';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export class BankInfoListDataSource extends DataSource<BankInfo> {
 | 
				
			||||||
  private _objectStore: BankInfo[] = [];
 | 
					  private _objectStore: BankInfo[] = [];
 | 
				
			||||||
  private _ObjectsSubject$ = new BehaviorSubject<BankInfo[]>([]);
 | 
					  private _ObjectsSubject$ = new BehaviorSubject<BankInfo[]>([]);
 | 
				
			||||||
  private _loadingSubject$ = new BehaviorSubject<boolean>(false);
 | 
					  private _loadingSubject$ = new BehaviorSubject<boolean>(false);
 | 
				
			||||||
							
								
								
									
										3
									
								
								src/app/pages/sites/site/component/index.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								src/app/pages/sites/site/component/index.ts
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					import { BankInfoListComponent } from './bank-info-list.component';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export const COMPONENTS = [BankInfoListComponent];
 | 
				
			||||||
@ -1,11 +1,11 @@
 | 
				
			|||||||
import { NgModule } from '@angular/core';
 | 
					import { NgModule } from '@angular/core';
 | 
				
			||||||
import { Routes, RouterModule } from '@angular/router';
 | 
					import { Routes, RouterModule } from '@angular/router';
 | 
				
			||||||
import { ListComponent } from './component/list.component';
 | 
					import { BankInfoListComponent } from './component/bank-info-list.component';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const routes: Routes = [
 | 
					const routes: Routes = [
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    path: '',
 | 
					    path: 'bank-info',
 | 
				
			||||||
    component: ListComponent
 | 
					    component: BankInfoListComponent
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
];
 | 
					];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -13,4 +13,4 @@ const routes: Routes = [
 | 
				
			|||||||
  imports: [RouterModule.forChild(routes)],
 | 
					  imports: [RouterModule.forChild(routes)],
 | 
				
			||||||
  exports: [RouterModule]
 | 
					  exports: [RouterModule]
 | 
				
			||||||
})
 | 
					})
 | 
				
			||||||
export class BankInfoRoutingModule {}
 | 
					export class SiteRoutingModule {}
 | 
				
			||||||
@ -14,8 +14,7 @@ import { MatPaginatorModule } from '@angular/material/paginator';
 | 
				
			|||||||
import { FuseSharedModule } from 'src/@fuse/shared.module';
 | 
					import { FuseSharedModule } from 'src/@fuse/shared.module';
 | 
				
			||||||
import { FuseWidgetModule } from 'src/@fuse/components/widget/widget.module';
 | 
					import { FuseWidgetModule } from 'src/@fuse/components/widget/widget.module';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { BankInfoRoutingModule } from './bank-info-routing.module';
 | 
					import { SiteRoutingModule } from './site-routing.module';
 | 
				
			||||||
import { ListComponent } from './component/list.component';
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { COMPONENTS } from './component';
 | 
					import { COMPONENTS } from './component';
 | 
				
			||||||
// import { RESOLVERS } from './resolver';
 | 
					// import { RESOLVERS } from './resolver';
 | 
				
			||||||
@ -36,10 +35,10 @@ import { COMPONENTS } from './component';
 | 
				
			|||||||
    FuseSharedModule,
 | 
					    FuseSharedModule,
 | 
				
			||||||
    FuseWidgetModule,
 | 
					    FuseWidgetModule,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    BankInfoRoutingModule
 | 
					    SiteRoutingModule
 | 
				
			||||||
  ],
 | 
					  ],
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  declarations: [...COMPONENTS]
 | 
					  declarations: [...COMPONENTS]
 | 
				
			||||||
  // providers: [...RESOLVERS]
 | 
					  // providers: [...RESOLVERS]
 | 
				
			||||||
})
 | 
					})
 | 
				
			||||||
export class BankInfoModule {}
 | 
					export class SiteModule {}
 | 
				
			||||||
@ -3,8 +3,8 @@ import { Routes, RouterModule } from '@angular/router';
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
const routes: Routes = [
 | 
					const routes: Routes = [
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    path: 'bank-info',
 | 
					    path: 'management',
 | 
				
			||||||
    loadChildren: './bank-info/bank-info.module#BankInfoModule'
 | 
					    loadChildren: './site/site.module#SiteModule'
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
];
 | 
					];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user