Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions backend/package-lock.json

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

1 change: 0 additions & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"@nestjs/common": "^10.0.0",
"@nestjs/config": "^3.0.0",
"@nestjs/core": "^10.0.0",
"@nestjs/mapped-types": "^2.1.0",
"@nestjs/platform-express": "^10.0.0",
"@nestjs/typeorm": "^10.0.0",
"class-transformer": "^0.5.1",
Expand Down
23 changes: 18 additions & 5 deletions backend/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,43 @@ import { AssetCategoriesModule } from './asset-categories/asset-categories.modul
import { AssetCategory } from './asset-categories/asset-category.entity';
import { DepartmentsModule } from './departments/departments.module';
import { Department } from './departments/department.entity';
import { AssetSubcategoriesModule } from './asset-subcategories/asset-subcategories.module';
import { AssetSubcategory } from './asset-subcategories/entities/asset-subcategory.entity';

@Module({
imports: [
ConfigModule.forRoot({
isGlobal: true,
}),
TypeOrmModule.forRootAsync({
imports: [ConfigModule],
imports: [ConfigModule,
// --- ADD THIS CONFIGURATION ---
I18nModule.forRoot({
fallbackLanguage: 'en',
loaderOptions: {
path: path.join(__dirname, '/i18n/'), // Directory for translation files
watch: true, // Watch for changes in translation files
},
resolvers: [
// Order matters: checks query param, then header, then browser settings
new QueryResolver(['lang', 'l']),
new HeaderResolver(['x-custom-lang-header']),
AcceptLanguageResolver, // Standard 'Accept-Language' header
],
}),
// --- END OF CONFIGURATION ---
],],
useFactory: (configService: ConfigService) => ({
type: 'postgres',
host: configService.get('DB_HOST', 'localhost'),
port: configService.get('DB_PORT', 5432),
username: configService.get('DB_USERNAME', 'postgres'),
password: configService.get('DB_PASSWORD', 'password'),
database: configService.get('DB_DATABASE', 'manage_assets'),
entities: [AssetCategory, AssetSubcategory, Department],
entities: [AssetCategory, Department],
synchronize: configService.get('NODE_ENV') !== 'production', // Only for development
}),
inject: [ConfigService],
}),
AssetCategoriesModule,
AssetSubcategoriesModule,
DepartmentsModule,
],
controllers: [AppController],
Expand Down
8 changes: 4 additions & 4 deletions backend/src/asset-categories/asset-category.entity.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, OneToMany } from 'typeorm';
import { AssetSubcategory } from '../asset-subcategories/entities/asset-subcategory.entity';

@Entity('asset_categories')
export class AssetCategory {
Expand All @@ -18,7 +17,8 @@ export class AssetCategory {
@UpdateDateColumn()
updatedAt: Date;

// Relationship with subcategories
@OneToMany(() => AssetSubcategory, subcategory => subcategory.parentCategory)
subcategories: AssetSubcategory[];
// Relationship with assets (one-to-many)
// This will be uncommented when the Asset entity is created
// @OneToMany(() => Asset, asset => asset.category)
// assets: Asset[];
}
34 changes: 0 additions & 34 deletions backend/src/asset-subcategories/asset-subcategories.controller.ts

This file was deleted.

12 changes: 0 additions & 12 deletions backend/src/asset-subcategories/asset-subcategories.module.ts

This file was deleted.

48 changes: 0 additions & 48 deletions backend/src/asset-subcategories/asset-subcategories.service.ts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions backend/src/inventory/entities/inventory-item.entity.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm';
import { ManyToOne } from 'typeorm';
import { AssetSubcategory } from '../../asset-subcategories/entities/asset-subcategory.entity';

@Entity()
export class InventoryItem {
Expand All @@ -19,7 +17,4 @@ export class InventoryItem {
// --- ADD THIS NEW FIELD ---
@Column({ type: 'int', default: 10 }) // Default threshold of 10 units
threshold: number;

@ManyToOne(() => AssetSubcategory, { nullable: true })
subcategory: AssetSubcategory;
}