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

Merge branch 'main' into 'main' 

Main

See merge request pueblosmagicosconia!84
parents e041b413 f3290bf9

backend/backend.code-workspace

0 → 100644
+9 −0
Original line number Diff line number Diff line 
{

  "folders": [

	{

		"name": "backend",

		"path": "."

	}

],

  "settings": {}

}

backend/src/database-seeder/database-seeder.service.ts

+2 −16
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ export class DatabaseSeederService implements OnModuleInit { 
      role: ADMIN_ROLE.ADMIN,

      status: UserStatus.ACTIVE,

    };

    let tokenSuper = '',

      tokenAdmin = '';

    let tokenSuper = '';

    try {

      tokenSuper = await this.authAdminService.signUp({ ...createSuperAdmin });

    } catch (error) {
@@ -61,24 +60,11 @@ export class DatabaseSeederService implements OnModuleInit { 
        })

      ).token;

    }

    try {

      tokenAdmin = await this.authAdminService.signUp({ ...createAdmin });

    } catch (error) {

      tokenAdmin = (

        await this.authAdminService.signIn({

          email: createAdmin.email,

          password: createSuperAdmin.password,

        })

      ).token;

    }



    console.log(

      `Super Admin created with email: ${createSuperAdmin.email}

      , password: ${createSuperAdmin.password}, and token: ${tokenSuper}`,

    );

    console.log(

      `Admin created with email: ${createAdmin.email}, 

      password: ${createAdmin.password}, and token: ${tokenAdmin}`,

    );

  }



  async insertTowns() {

backend/src/route/route.controller.ts

+15 −8
Original line number Diff line number Diff line
@@ -32,14 +32,21 @@ export class RouteController { 
    @Param('idTown') idTown: number,

    @Body() createRouteReq: CreateRouteReq,

  ) {

    try {

      const { email } = req.user;

    return await this.routeService.recommend(

      const res = await this.routeService.recommend(

        idTown,

        email,

        lang as LANGUAGES,

        createRouteReq.start,

        createRouteReq.end,

      );

      console.log('HELOOO: ', res);

      return res;

    } catch (error) {

      console.log(error);

      return error;

    }

  }



  @Get('')

backend/src/route/route.service.ts

+4 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ export class RouteService { 
  async getRouteAndPlacesByUser(email: string, routeStatus: RouteStatus) {

    const res = await this.routeRepository.find({

      relations: ['travelPlace'],

      where: { user: { email }, status: routeStatus, endDate: MoreThan(new Date()) },

      where: { user: { email }, status: routeStatus },

      order: { endDate: 'DESC' },

    });



    return res;
@@ -138,6 +139,8 @@ export class RouteService { 
      });

    }



    console.log(res);



    return res;

  }

mobile/app/(tabs)/_layout.tsx

+10 −6
Original line number Diff line number Diff line
@@ -7,16 +7,20 @@ import { useTranslation } from "react-i18next"; 
import { useSetUp } from "../../src/common/contexts/set_up_context";



export default function Layout() {

  const { user } = useAuth();

  const { user, isVerified } = useAuth();

  const { isFirstTime } = useSetUp();

  const LANG = useTranslation();

  console.log(user);



  if (!user) {

    return <Redirect href={'/login'}/>;

    return <Redirect href={"/login"} />;

  }



  if (!isVerified) {

    return <Redirect href={"/verify"} />;

  }



  if (isFirstTime) {

    return <Redirect href={'/profile/set_up'}/>;

    return <Redirect href={"/profile/set_up"} />;

  }



  return (