Commit 94f89ed2 authored by Omar Luna's avatar Omar Luna
Browse files

Merge branch pueblosmagicosconia:main into main

parents 85572406 7a4b8007

backend/src/admin/admin.controller.ts

+1 −7
Original line number Diff line number Diff line 
import { Controller, Post, Body } from '@nestjs/common';

import { Controller } from '@nestjs/common';

import { AdminService } from './admin.service';

import { CreateAdminDto } from './dto/create-admin.dto';



@Controller('admin')

export class AdminController {

  constructor(private readonly adminService: AdminService) {}



  @Post()

  create(@Body() createAdminDto: CreateAdminDto) {

    return this.adminService.create(createAdminDto);

  }

}

backend/src/place/dto/create-place-date.dto.ts

+6 −2
Original line number Diff line number Diff line
@@ -19,8 +19,12 @@ export class CreatePlaceDateTradDto { 
  @ApiProperty({ type: 'string', format: 'binary' })

  image;



  @ApiProperty({ example: '12.3456789-12.3456789' })

  coords: string;

  @ApiProperty()

  latitude: number;



  @ApiProperty()

  longitude: number;



  // 24-hour format

  @ApiProperty({ maximum: 24, minimum: 0 })

  openAt: number;

backend/src/place/dto/create-place.dto.ts

+2 −12
Original line number Diff line number Diff line 
import { ApiProperty } from '@nestjs/swagger';

import { Available } from 'src/pointOfInterest/enum/available.enum';

import { Town } from 'src/town/entities/town.entity';



export class CreatePlaceDto {

  @ApiProperty({ enum: Available, enumName: 'Available' })

  available: Available;

  @ApiProperty()

  name: string;

  @ApiProperty()

  imageName: string;



  @ApiProperty({ type: 'number' })

  idTown: Town;

  @ApiProperty({ example: '12.3456789-12.3456789' })

  coords: string;

  // 24-hour format

  @ApiProperty({ maximum: 24, minimum: 0 })

  latitude: number;

  longitude: number;

  openAt: number;

  // 24-hour format

  @ApiProperty({ maximum: 24, minimum: 0 })

  closeAt: number;

}

backend/src/place/dto/get-place.dto.ts

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ export class GetPlaceDto { 
  name: string;

  description: string;

  imageName: string;

  coords: string;

  latitude: number;

  longitude: number;

  openAt: number;

  closeAt: number;

  startDate: Date;

backend/src/place/entities/place.entity.ts

+4 −1
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ export class Place { 
  imageName: string;



  @Column({ nullable: false })

  coords: string;

  latitude: number;



  @Column({ nullable: false })

  longitude: number;



  @Column({ nullable: false })

  openAt: number;