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

Merge branch 'main' into 'main' 

Production

See merge request !71
parents 31f4997e eda46232

backend/src/auth/user/authUserservice.ts

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ export class AuthUserService { 
  }



  async getResetPasswordCode(email: string) {

    console.log(`Email: ${email}`);

    const user: User = await this.userService.findOne(email);

    if (!user) throw new UnauthorizedException('Invalid email');

    const resetCode = randomInt(100000, 999999).toString();

backend/src/route/index.html

0 → 100644
+52 −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>

        .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

mobile/app/_layout.tsx

+15 −0
Original line number Diff line number Diff line
@@ -95,6 +95,21 @@ const MainLayout = () => { 
          statusBarColor: LIGHT_THEME.color.primary,

        }}

      />

      <Stack.Screen

        name="about_us"

        options={{

          title: "About Us",

          statusBarColor: LIGHT_THEME.color.primary,

          headerStyle: {

            backgroundColor: LIGHT_THEME.color.primary,

          },

          headerTitleStyle: {

            color: LIGHT_THEME.color.white,

          },

          headerTitleAlign: "center",

          headerTintColor: LIGHT_THEME.color.white,

        }}

      />

      <Stack.Screen

        name="routes/generate_route"

        options={{

mobile/app/about_us.tsx

0 → 100644
+5 −0
Original line number Diff line number Diff line 
import { AboutUsPage } from "../src/profile/screens/about_us_page";



export default function AboutUs() {

    return (<AboutUsPage />);

}
 
 No newline at end of file

mobile/src/common/const/api.ts

+1 −1
Original line number Diff line number Diff line 
export const API_URL = 'http://192.168.0.14:3005';
 
 No newline at end of file
 
export const API_URL = 'https://c749-200-92-164-74.ngrok-free.app';
 
 No newline at end of file