Commit dea433e5 authored by Omar Luna Hernández's avatar Omar Luna Hernández
Browse files

Merge branch 'main' of https://labsol.cozcyt.gob.mx/git/Xarom/pueblosmagicosconia

parents 8a8a1cad 10500f04

.gitignore

+3 −2
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ 
/mobile/node_modules

/mobile/.expo

/mobile/metro

.vscode/settings.json

/mobile/src/common/constants/api.ts

/mobile/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver

/mobile/assets/audio_prueba.mp3

backend/package-lock.json

+566 −5

File changed.

Preview size limit exceeded, changes collapsed.

backend/package.json

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    "test:e2e": "jest --config ./test/jest-e2e.json"

  },

  "dependencies": {

    "@google-cloud/text-to-speech": "^5.3.0",

    "@nestjs/common": "^10.0.0",

    "@nestjs/core": "^10.0.0",

    "@nestjs/jwt": "^10.2.0",
@@ -31,6 +32,7 @@ 
    "bcrypt": "^5.1.1",

    "dotenv": "^16.4.5",

    "mysql2": "^3.9.2",

    "network": "^0.7.0",

    "reflect-metadata": "^0.2.0",

    "rxjs": "^7.8.1",

    "typeorm": "^0.3.20"

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

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ export class CreateAdminDto { 
  @ApiProperty()

  email: string;



  @ApiProperty()

  idTown: number;



  @ApiProperty()

  password: string;

backend/src/admin/entities/admin.entity.ts

+6 −1
Original line number Diff line number Diff line 
import { ADMIN_ROLE } from 'src/shared/enum/admin-role.enum';

import { UserStatus } from 'src/shared/enum/user-status.enum';

import { Entity, Column, PrimaryColumn } from 'typeorm';

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

import { Entity, Column, PrimaryColumn, JoinColumn, ManyToOne } from 'typeorm';



@Entity()

export class Admin {

  @PrimaryColumn()

  email: string;



  @JoinColumn({ name: 'idTown' })

  @ManyToOne(() => Town, { nullable: true })

  idTown: number;



  @Column()

  name: string;