Commit e8151e0b authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch 'main' into 'main'

Pueblos

See merge request ltrpro/pueblosmagicosconia!76
parents 3f17a69f d606e5a1
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@
        "class-transformer": "^0.5.1",
        "class-validator": "^0.14.1",
        "dotenv": "^16.4.5",
        "ejs": "^3.1.10",
        "mysql2": "^3.9.2",
        "network": "^0.7.0",
        "nodemailer": "^6.9.15",
@@ -5321,7 +5322,6 @@
      "version": "3.1.10",
      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
      "optional": true,
      "dependencies": {
        "jake": "^10.8.5"
      },
@@ -6120,7 +6120,6 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
      "optional": true,
      "dependencies": {
        "minimatch": "^5.0.1"
      }
@@ -6129,7 +6128,6 @@
      "version": "5.1.6",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
      "optional": true,
      "dependencies": {
        "brace-expansion": "^2.0.1"
      },
@@ -7575,7 +7573,6 @@
      "version": "10.9.2",
      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
      "optional": true,
      "dependencies": {
        "async": "^3.2.3",
        "chalk": "^4.0.2",
@@ -7592,14 +7589,12 @@
    "node_modules/jake/node_modules/async": {
      "version": "3.2.6",
      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
      "optional": true
      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
    },
    "node_modules/jake/node_modules/brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
      "optional": true,
      "dependencies": {
        "balanced-match": "^1.0.0",
        "concat-map": "0.0.1"
@@ -7609,7 +7604,6 @@
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
      "optional": true,
      "dependencies": {
        "brace-expansion": "^1.1.7"
      },
+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@
    "class-transformer": "^0.5.1",
    "class-validator": "^0.14.1",
    "dotenv": "^16.4.5",
    "ejs": "^3.1.10",
    "mysql2": "^3.9.2",
    "network": "^0.7.0",
    "nodemailer": "^6.9.15",

backend/src/route/index.html

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
    <style>
        .container{
            display: flex;
            justify-content: center;
            flex-direction: row;
            height: 100px;
            width: 200px;
        }
        .container img{
            flex-grow: 1;
    max-width: 100%;
    object-fit: cover;
        }
        .pueblos {
            position: absolute;
            bottom: 10;
            right: 10;
            width: 30px;
            height: 30px;
        }
        .pueblo-text-container{

        }
        .pueblo-text{

        }
    </style>
</head>
<body>
    <div class="container">
        <div class="pueblo-text-container">
            <h1 class="pueblo-text">

            </h1>
        </div>
        <div class="image"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Altja_j%C3%B5gi_Lahemaal.jpg/1200px-Altja_j%C3%B5gi_Lahemaal.jpg" alt=""></div>
        <div class="image"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Altja_j%C3%B5gi_Lahemaal.jpg/1200px-Altja_j%C3%B5gi_Lahemaal.jpg" alt=""></div>
        <div class="image"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Altja_j%C3%B5gi_Lahemaal.jpg/1200px-Altja_j%C3%B5gi_Lahemaal.jpg" alt=""></div>
        <div class="image"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Altja_j%C3%B5gi_Lahemaal.jpg/1200px-Altja_j%C3%B5gi_Lahemaal.jpg" alt=""></div>
        <div class="image"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Altja_j%C3%B5gi_Lahemaal.jpg/1200px-Altja_j%C3%B5gi_Lahemaal.jpg" alt=""></div>
        <div class="pueblos">
            <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQnr08Avq1Nkhwh36sTNwiUicOkXhdeASiHuA&s" alt="">
        </div>
    </div>
</body>
</html>
 No newline at end of file
+144 −0
Original line number Diff line number Diff line
<!doctype html>
<html lang="en">
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Document</title>
    <style>
      * {
        padding: 0;
        margin: 0;
        box-sizing: border-box;
      }
      body {
        font-family: sans-serif;
        padding: 10px;
      }
      .container {
        position: relative;
        display: flex;
        flex-direction: row;
        height: 300px;
        width: 450px;
        gap: 10px;
        padding-inline: 10px;
        padding-block: 55px;
        border: 2px solid black;
        overflow: hidden;
      }
      .container .image {
        flex-grow: 1;
        max-width: 100%;
        height: 90%;
        border-radius: 10px;
        overflow: hidden;
        border: 3px solid rgb(237,0,132);
      }

      .container .image:nth-child(2n + 1) {
        align-self: flex-end;
      }

      .image img {
        width: 100%;
        height: 100%;
        object-fit: cover;
      }

      .pueblos {
        position: absolute;
        top: 10px;
        right: 10px;
        width: 30px;
        height: 30px;
      }

      .pueblos img {
        height: 100%;
        width: 100%;
      }
      .pueblo-text-container {
        position: absolute;
        bottom: 0;
        left: 0;
        padding: 10px;
        height: 50px;
        width: 100%;
        border-top-right-radius: 75px;
        background-color: rgb(255, 255, 255);
        border-top: 2px solid black;
        border-right: 2px solid black;
        display: flex;
        justify-content: center;
        align-items: center;
      }

      .pueblo-text-container::after {
        content: '';
        position: absolute;
        width: 100%;
        height: 50px;
        bottom: 48px;
        right: 0;
        background-color: transparent;
        border-bottom-left-radius: 75px;
        box-shadow: -75px 0px 0px 0px white;
        border-left: 2px solid black;
        z-index: 2;
      }

      .inverted {
        transform: rotate(180deg);
        top: 0px;
      }
      .pueblo-text {
        font-family: sans-serif;
        font-size: 14px;
      }
    </style>
  </head>
  <body>
    <div class="container">
      <div class="pueblo-text-container">
        <h1 class="pueblo-text">Jerez de García Salinas, Zacatecas</h1>
      </div>
      <div class="pueblo-text-container inverted"></div>
      <div class="image">
        <img
          src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Altja_j%C3%B5gi_Lahemaal.jpg/1200px-Altja_j%C3%B5gi_Lahemaal.jpg"
          alt=""
        />
      </div>
      <div class="image">
        <img
          src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Altja_j%C3%B5gi_Lahemaal.jpg/1200px-Altja_j%C3%B5gi_Lahemaal.jpg"
          alt=""
        />
      </div>
      <div class="image">
        <img
          src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Altja_j%C3%B5gi_Lahemaal.jpg/1200px-Altja_j%C3%B5gi_Lahemaal.jpg"
          alt=""
        />
      </div>
      <div class="image">
        <img
          src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Altja_j%C3%B5gi_Lahemaal.jpg/1200px-Altja_j%C3%B5gi_Lahemaal.jpg"
          alt=""
        />
      </div>
      <div class="image">
        <img
          src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Altja_j%C3%B5gi_Lahemaal.jpg/1200px-Altja_j%C3%B5gi_Lahemaal.jpg"
          alt=""
        />
      </div>
      <div class="pueblos">
        <img
          src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQnr08Avq1Nkhwh36sTNwiUicOkXhdeASiHuA&s"
          alt=""
        />
      </div>
    </div>
  </body>
</html>
+126 −0
Original line number Diff line number Diff line
export const visit_template = (places: string[]) => `
<!doctype html>
<html lang="en">
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Document</title>
    <style>
      * {
        padding: 0;
        margin: 0;
        box-sizing: border-box;
      }
      body {
        font-family: sans-serif;
        padding: 10px;
      }
      .container {
        position: relative;
        display: flex;
        flex-direction: row;
        height: 300px;
        width: 450px;
        gap: 10px;
        padding-inline: 10px;
        padding-block: 55px;
        border: 2px solid black;
        overflow: hidden;
      }
      .container .image {
        flex-grow: 1;
        max-width: 100%;
        height: 90%;
        border-radius: 10px;
        overflow: hidden;
        border: 3px solid rgb(237,0,132);
      }

      .container .image:nth-child(2n + 1) {
        align-self: flex-end;
      }

      .image img {
        width: 100%;
        height: 100%;
        object-fit: cover;
      }

      .pueblos {
        position: absolute;
        top: 10px;
        right: 10px;
        width: 30px;
        height: 30px;
      }

      .pueblos img {
        height: 100%;
        width: 100%;
      }
      .pueblo-text-container {
        position: absolute;
        bottom: 0;
        left: 0;
        padding: 10px;
        height: 50px;
        width: 100%;
        border-top-right-radius: 75px;
        background-color: rgb(255, 255, 255);
        border-top: 2px solid black;
        border-right: 2px solid black;
        display: flex;
        justify-content: center;
        align-items: center;
      }

      .pueblo-text-container::after {
        content: '';
        position: absolute;
        width: 100%;
        height: 50px;
        bottom: 48px;
        right: 0;
        background-color: transparent;
        border-bottom-left-radius: 75px;
        box-shadow: -75px 0px 0px 0px white;
        border-left: 2px solid black;
        z-index: 2;
      }

      .inverted {
        transform: rotate(180deg);
        top: 0px;
      }
      .pueblo-text {
        font-family: sans-serif;
        font-size: 14px;
      }
    </style>
  </head>
  <body>
    <div class="container">
      <div class="pueblo-text-container">
        <h1 class="pueblo-text">Jerez de García Salinas, Zacatecas</h1>
      </div>
      <div class="pueblo-text-container inverted"></div>
      ${
        places.map(
          (place) => `<div class="image">
            <img
              src="${place}"
              alt=""
            />
        </div>`
        ).join('\n')
      }
      <div class="pueblos">
        <img
          src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQnr08Avq1Nkhwh36sTNwiUicOkXhdeASiHuA&s"
          alt=""
        />
      </div>
    </div>
  </body>
</html>
`;
 No newline at end of file
Loading