Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 00:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve confilict

Browse Source
This commit is contained in:
marshal
2026-06-05 13:06:16 +03:00
parent ba65a3f4cc ec3f83c9fb
commit d59c192137
82 changed files with 3296 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/edr-freight-api/src/app.module.ts
View File

@@ -12,7 +12,8 @@ import databaseConfig from "./config/database.config";
import { BookingsModule } from "./modules/bookings/bookings.module";
import { FilesModule } from "./modules/files/files.module";
import { ConsignmentsModule } from "./modules/consignments/consignments.module";
import { TrainsModule } from "./modules/trains/trains.module";
//import { TrainsModule } from "./modules/trains/trains.module";
import { LocomotivesModule } from "./modules/locomotives/locomotives.module";
import { WagonTypesModule } from "./modules/wagon-types/wagon-types.module";
import { TrainSetsModule } from "./modules/train-sets/train-sets.module";
@@ -40,6 +41,11 @@ import { FreightStaffUsersSeeder } from "./seed/freight-staff-users.seeder";
import { DemoBookingsSeeder } from "./seed/demo-bookings.seeder";
import { PricingDataSeeder } from "./seed/pricing-data.seeder";
import { FileUploadSettingsSeeder } from "./seed/file-upload-settings.seeder";
//New Trains, Wagons, Container and Cargo management modules
import { TrainsModule } from "./modules/trains/trains.module";
import { WagonsModule } from './modules/wagons/wagons.module';
import { ContainersModule } from './modules/container-management/containers.module';
import { CargoesModule } from './modules/cargoes/cargoes.module';
@Module({
imports: [
@@ -86,6 +92,11 @@ import { FileUploadSettingsSeeder } from "./seed/file-upload-settings.seeder";
BackofficeModule,
DemoPermissionsModule,
FreightAuthModule,
//New Modules
TrainsModule,
WagonsModule,
ContainersModule,
CargoesModule,
],
providers: [EdrOrgSeeder, DemoUsersSeeder,FreightStaffUsersSeeder, DemoBookingsSeeder, PricingDataSeeder, FileUploadSettingsSeeder],
})