Skip to content

Commit

Permalink
Merge pull request #1138 from aura-nw/Baseline/main_20240322
Browse files Browse the repository at this point in the history
[MAIN][Asset Table] Baseline/main 20240322
  • Loading branch information
nhphuc2411 authored Mar 25, 2024
2 parents 0b31c87 + 0037f41 commit 5d18a57
Show file tree
Hide file tree
Showing 80 changed files with 2,362 additions and 798 deletions.
201 changes: 12 additions & 189 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"rxjs": "^7.2.0",
"swagger-ui-express": "^4.1.6",
"tendermint": "^5.0.2",
"typeorm": "^0.2.38",
"typeorm": "^0.2.40",
"uuid": "^8.3.2",
"winston": "^3.3.3"
},
Expand Down
2 changes: 2 additions & 0 deletions src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { ExportCsvModule } from './components/export-csv/export-csv.module';
import { GoogleRecaptchaModule } from '@nestlab/google-recaptcha/google-recaptcha.module';
import { NotificationModule } from './components/notification/notification.module';
import { WatchListModule } from './components/watch-list/watch-list.module';
import { AssetModule } from './components/asset/asset.module';

@Module({
imports: [
Expand All @@ -37,6 +38,7 @@ import { WatchListModule } from './components/watch-list/watch-list.module';
ExportCsvModule,
MailModule,
WatchListModule,
AssetModule,
ConfigModule.forRoot({
isGlobal: true,
}),
Expand Down
12 changes: 10 additions & 2 deletions src/components/account/account.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,18 @@ import { SharedModule } from '../../shared/shared.module';

import { AccountController } from './controllers/account.controller';
import { AccountService } from './services/account.service';
import { TypeOrmModule } from '@nestjs/typeorm';
import { Explorer } from 'src/shared/entities/explorer.entity';
import { RpcUtil } from 'src/shared/utils/rpc.util';

@Module({
imports: [SharedModule, HttpModule, ConfigModule],
providers: [AccountService, ServiceUtil],
imports: [
SharedModule,
HttpModule,
ConfigModule,
TypeOrmModule.forFeature([Explorer]),
],
providers: [AccountService, ServiceUtil, RpcUtil],
controllers: [AccountController],
exports: [AccountService],
})
Expand Down
1 change: 0 additions & 1 deletion src/components/account/controllers/account.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {
Body,
ClassSerializerInterceptor,
Controller,
Get,
Expand Down
Loading

0 comments on commit 5d18a57

Please sign in to comment.