Commit 527193c0 authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch 'main' into 'main' 

Reorganización de archivos y documentación.

See merge request !89
parents 4ca2bd06 9fc58134

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

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ export class PlaceTraduction { 
  @ManyToOne(() => Place, (place) => place.availableDates, { nullable: false })

  idPlace: number;



  @Column()

  @Column({ length: 1024 })

  description: string;

}

backend/src/pointOfInterest/entities/PointOfInterestTraduction.entity.ts

+2 −2
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ export class PointOfInterestTraduction { 
  @PrimaryColumn()

  language: LANGUAGES;



  @Column({ nullable: false })

  @Column({ nullable: false, length: 1024 })

  content: string;

  @Column({ nullable: true })

  @Column({ nullable: true, length: 1024 })

  directions: string;



  @Column()

backend/src/town/entities/town-traduction.entity.ts

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ export class TownTraduction { 
  @PrimaryColumn()

  language: LANGUAGES;



  @Column()

  @Column({ length: 1024 })

  description: string;

}

web/public/index.html

+2 −3
Original line number Diff line number Diff line
@@ -2,14 +2,13 @@ 
<html lang="en">

  <head>

    <meta charset="utf-8" />

    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />

    <link rel="icon" href="%PUBLIC_URL%/logotipo.png" />

    <meta name="viewport" content="width=device-width, initial-scale=1" />

    <meta name="theme-color" content="#000000" />

    <meta

      name="description"

      content="Web site created using create-react-app"

    />

    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />

    <!--

      manifest.json provides metadata used when your web app is installed on a

      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -24,7 +23,7 @@ 
      work correctly both with client-side routing and a non-root public URL.

      Learn how to configure a non-root public URL by running `npm run build`.

    -->

    <title>React App</title>

    <title>Pueblos Magicos</title>

  </head>

  <body>

    <noscript>You need to enable JavaScript to run this app.</noscript>

web/public/logotipo.png

0 → 100644
+12.1 KiB
Loading image diff...