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

Merge branch 'main' into 'main' 

Se creó el reseteo de contraseña y se conectó a la api para obtener rutas

See merge request ltrpro/pueblosmagicosconia!65
parents a97dcb67 9cff0c23

backend/src/email/email.service.ts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ export class EmailService { 
        const mailOptions = {

            to: email,

            subject: 'Reset your password',

            text: `Your reset code is ${resetCode}`,

            html: `<p>Your reset code is <b>${resetCode}</b></p>`,

        };

        try {

            await this.mailerService.sendMail(mailOptions);

mobile/app/_layout.tsx

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

        }}

      />

      <Stack.Screen

        name="auth/reset_password"

        options={{

          title: "Reset Password",

          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="auth/reset_password_error"

        options={{

          headerShown: false,

        }}

      />

    </Stack>

  );

};

mobile/app/auth/reset_password.tsx

0 → 100644
+7 −0
Original line number Diff line number Diff line 
import { ResetPasswordPage } from "../../src/auth/pages/reset_password_page";



export default function ResetPassword() {

    return (

        <ResetPasswordPage />

    );

}
 
 No newline at end of file

mobile/app/auth/reset_password_error.tsx

0 → 100644
+5 −0
Original line number Diff line number Diff line 
export default function ResetPasswordError() {

    return (

        <ResetPasswordError />

    );

};
 
 No newline at end of file

mobile/app/state/[stateId]/town/[townId]/activity/[activityId]/index.tsx

+1 −1
Original line number Diff line number Diff line 
import { useLocalSearchParams } from "expo-router";

import { ActivityDescriptionPage } from "../../../../../../../src/screens/activity_description/activity_description_page";

import { ActivityDescriptionPage } from "../../../../../../../src/activity/screens/activity_description_page";



export default function ActivitySelectionScreen() {

    const { activityId, stateId, townId } = useLocalSearchParams<{activityId: string, stateId: string, townId: string}>();