Merge pull request #8 from beginwebdev2002/feat/api-integration-4669589981061929666

feat: integrate frontend with nestjs api and add swagger documentation

Author: beginwebdev2002

backend/src/modules/admin-settings/presentation/admin-settings.controller.ts

@@ -1,18 +1,22 @@
+import { ApiTags, ApiOperation, ApiResponse } from '@nestjs/swagger';
 import { Controller, Get, Body, Put, Post, Delete } from '@nestjs/common';
 import { AdminSettingsService } from '../application/admin-settings.service';
 import { AdminSettings } from '../domain/admin-settings.entity';
 import { UpdateAdminSettingsDto } from './dto/update-admin-settings.dto';
 import { CreateAdminSettingsDto } from './dto/create-admin-settings.dto';
 
+@ApiTags('Admin Settings')
 @Controller('admin-settings')
 export class AdminSettingsController {
   constructor(private readonly adminSettingsService: AdminSettingsService) {}
 
+  @ApiOperation({ summary: 'Get all' }) @ApiResponse({ status: 200 })
   @Get()
   async getSettings(): Promise<AdminSettings | null> {
     return this.adminSettingsService.getSettings();
   }
 
+  @ApiOperation({ summary: 'Create' }) @ApiResponse({ status: 201 })
   @Post()
   async createSettings(
     @Body() createAdminSettingsDto: CreateAdminSettingsDto,
@@ -24,6 +28,7 @@ export class AdminSettingsController {
     );
   }
 
+  @ApiOperation({ summary: 'Update' }) @ApiResponse({ status: 200 })
   @Put()
   async updateSettings(
     @Body() updateAdminSettingsDto: UpdateAdminSettingsDto,
@@ -37,6 +42,7 @@ export class AdminSettingsController {
     return this.adminSettingsService.updateSettings(settings);
   }
 
+  @ApiOperation({ summary: 'Delete' }) @ApiResponse({ status: 200 })
   @Delete()
   async deleteSettings(): Promise<boolean> {
     return this.adminSettingsService.deleteSettings();

backend/src/modules/admin-settings/presentation/dto/create-admin-settings.dto.ts

@@ -1,4 +1,5 @@
 import { Type } from 'class-transformer';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import {
   IsString,
   IsNotEmpty,
@@ -14,80 +15,80 @@ import {
 } from '../../domain/interfaces/admin-settings.interface';
 
 class LocationDto implements IAdminLocation {
-  @IsString()
+  @IsString() @ApiProperty()
   @IsNotEmpty()
   address: string;
 
-  @IsNumber()
+  @IsNumber() @ApiProperty()
   latitude: number;
 
-  @IsNumber()
+  @IsNumber() @ApiProperty()
   longitude: number;
 }
 
 class OwnerInfoDto implements IOwnerInfo {
-  @IsString()
+  @IsString() @ApiProperty()
   @IsNotEmpty()
   name: string;
 
-  @IsString()
+  @IsString() @ApiProperty()
   @IsNotEmpty()
   phoneNumber: string;
 }
 
 export class CreateAdminSettingsDto {
-  @ValidateNested()
+  @ValidateNested() @ApiProperty()
   @Type(() => LocationDto)
   @IsNotEmpty()
   location: LocationDto;
 
-  @IsObject()
+  @IsObject() @ApiPropertyOptional()
   @IsOptional()
   socialLinks: Record<string, string>;
 
-  @IsObject()
+  @IsObject() @ApiPropertyOptional()
   @IsOptional()
   workHours: Record<string, string>;
 
-  @ValidateNested()
+  @ValidateNested() @ApiProperty()
   @Type(() => OwnerInfoDto)
   @IsNotEmpty()
   ownerInfo: OwnerInfoDto;
 
-  @IsString()
+  @IsString() @ApiProperty()
   @IsOptional()
   biography: string;
 
-  @IsString()
+  @IsString() @ApiProperty()
   @IsOptional()
   philosophy: string;
 
-  @IsArray()
+  @IsArray() @ApiPropertyOptional()
   @IsString({ each: true })
   @IsOptional()
   galleryCategories: string[];
 
-  @IsArray()
+  @IsArray() @ApiPropertyOptional()
   @IsString({ each: true })
   @IsOptional()
   treatmentCategories: string[];
 
-  @IsArray()
+  @IsArray() @ApiPropertyOptional()
   @IsString({ each: true })
   @IsOptional()
   veilSilhouettes: string[];
 
-  @IsArray()
+  @IsArray() @ApiPropertyOptional()
   @IsString({ each: true })
   @IsOptional()
   veilFabrics: string[];
 
-  @IsArray()
+  @IsArray() @ApiPropertyOptional()
   @IsString({ each: true })
   @IsOptional()
   veilTrainLengths: string[];
 
-  @IsArray()
+  @IsArray() @ApiPropertyOptional()
   @IsString({ each: true })
   @IsOptional()
   veilNecklines: string[];

backend/src/modules/admin-settings/presentation/dto/update-admin-settings.dto.ts

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
+import { PartialType } from '@nestjs/swagger';
 import { CreateAdminSettingsDto } from './create-admin-settings.dto';
 
 export class UpdateAdminSettingsDto extends PartialType(

backend/src/modules/gallery/presentation/gallery.controller.ts

@@ -1,3 +1,4 @@
+import { ApiTags, ApiOperation, ApiResponse } from '@nestjs/swagger';
 import {
   Controller,
   Get,
@@ -17,20 +18,24 @@ import { Gallery } from '../domain/gallery.entity';
 import { CreateGalleryDto } from './dto/create-gallery.dto';
 import { UpdateGalleryDto } from './dto/update-gallery.dto';
 
+@ApiTags('Gallery')
 @Controller('gallery')
 export class GalleryController {
   constructor(private readonly galleryService: GalleryService) {}
 
+  @ApiOperation({ summary: 'Get all' }) @ApiResponse({ status: 200 })
   @Get()
   async findAll(): Promise<Gallery[]> {
     return this.galleryService.findAll();
   }
 
+  @ApiOperation({ summary: 'Get one' }) @ApiResponse({ status: 200 })
   @Get(':id')
   async findOne(@Param('id') id: string): Promise<Gallery> {
     return this.galleryService.findOne(id);
   }
 
+  @ApiOperation({ summary: 'Create' }) @ApiResponse({ status: 201 })
   @Post()
   @UseInterceptors(
     FilesInterceptor('files', 10, {
@@ -64,6 +69,7 @@ export class GalleryController {
     return this.galleryService.create(gallery);
   }
 
+  @ApiOperation({ summary: 'Update' }) @ApiResponse({ status: 200 })
   @Put(':id')
   @UseInterceptors(
     FilesInterceptor('files', 10, {
@@ -98,6 +104,7 @@ export class GalleryController {
     );
   }
 
+  @ApiOperation({ summary: 'Delete' }) @ApiResponse({ status: 200 })
   @Delete(':id')
   async remove(@Param('id') id: string): Promise<void> {
     return this.galleryService.remove(id);

backend/src/modules/treatments/presentation/dto/create-treatments.dto.ts

@@ -1,4 +1,5 @@
 import { Type } from 'class-transformer';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import {
   IsBoolean,
   IsNotEmpty,
@@ -21,35 +22,35 @@ export enum TreatmentCategory {
 
 export class CreateServiceDto {
   @IsNotEmpty()
-  @IsString()
+  @IsString() @ApiProperty()
   name: string;
 
   @IsNotEmpty()
-  @IsString()
+  @IsString() @ApiProperty()
   description: string;
 
   @IsNotEmpty()
   @Type(() => Number)
-  @IsNumber()
+  @IsNumber() @ApiProperty()
   @Min(1)
   price: number;
 
   @IsOptional()
   @Type(() => Boolean)
-  @IsBoolean()
+  @IsBoolean() @ApiPropertyOptional()
   active: boolean;
 
   @IsNotEmpty()
   @Type(() => Number)
-  @IsNumber()
+  @IsNumber() @ApiProperty()
   @Min(1)
   duration: number;
 
   @IsNotEmpty()
-  @IsString()
+  @IsString() @ApiProperty()
   category: string;
 
   @IsOptional()
-  @IsString()
+  @IsString() @ApiProperty()
   imageUrl: string;
 }

backend/src/modules/treatments/presentation/dto/update-treatments.dto.ts

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
+import { PartialType } from '@nestjs/swagger';
 import { CreateServiceDto } from './create-treatments.dto';
 
 export class UpdateServiceDto extends PartialType(CreateServiceDto) {}

backend/src/modules/treatments/presentation/treatments.controller.ts

@@ -1,3 +1,4 @@
+import { ApiTags, ApiOperation, ApiResponse } from '@nestjs/swagger';
 import {
   CreateServiceDto as CreateTreatmentDto,
   Treatments,
@@ -19,20 +20,24 @@ import { FilesInterceptor } from '@nestjs/platform-express';
 import { diskStorage } from 'multer';
 import { extname } from 'path';
 
+@ApiTags('Treatments')
 @Controller('treatments')
 export class TreatmentsController {
   constructor(private readonly treatmentsService: TreatmentsService) {}
 
+  @ApiOperation({ summary: 'Get all' }) @ApiResponse({ status: 200 })
   @Get()
   async findAll(): Promise<Treatments[]> {
     return this.treatmentsService.findAll();
   }
 
+  @ApiOperation({ summary: 'Get one' }) @ApiResponse({ status: 200 })
   @Get(':id')
   async findOne(@Param('id') id: string): Promise<Treatments> {
     return this.treatmentsService.findOne(id);
   }
 
+  @ApiOperation({ summary: 'Create' }) @ApiResponse({ status: 201 })
   @Post()
   @UseInterceptors(
     FilesInterceptor('image', 10, {
@@ -63,6 +68,7 @@ export class TreatmentsController {
     );
   }
 
+  @ApiOperation({ summary: 'Update' }) @ApiResponse({ status: 200 })
   @Put(':id')
   @UseInterceptors(
     FilesInterceptor('image', 10, {
@@ -97,6 +103,7 @@ export class TreatmentsController {
     );
   }
 
+  @ApiOperation({ summary: 'Delete' }) @ApiResponse({ status: 200 })
   @Delete(':id')
   async remove(@Param('id') id: string): Promise<void> {
     return this.treatmentsService.remove(id);

frontend/package-lock.json

@@ -4,7 +4,9 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
+    "predev": "node scripts/setenv.cjs",
     "dev": "ng serve --configuration=development",
+    "prebuild": "node scripts/setenv.cjs",
     "build": "ng build",
     "preview": "ng serve --configuration=production",
     "test": "vitest"

frontend/package.json

@@ -0,0 +1,17 @@
+const fs = require('fs');
+const path = require('path');
+require('dotenv').config({ path: path.resolve(__dirname, '../../.env') });
+
+const envConfigFile = `export const environment = {
+  production: ${process.env.NODE_ENV === 'production'},
+  apiUrl: "${process.env.FRONTEND_URL || 'http://localhost:3000'}",
+  telegramBotName: "${process.env.TELEGRAM_BOT_NAME || 'test_bot'}",
+};
+`;
+
+const targetPath = path.resolve(__dirname, '../src/environments/environment.ts');
+const targetProdPath = path.resolve(__dirname, '../src/environments/environment.prod.ts');
+
+fs.writeFileSync(targetPath, envConfigFile);
+fs.writeFileSync(targetProdPath, envConfigFile);
+console.log(`Environment files generated at ${targetPath}`);