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

Merge branch 'main' into 'main' 

app

See merge request ltrpro/pueblosmagicosconia!87
parents d5fec8f6 c51670f2

backend/src/visited/templates/visit_template.ts

+6 −6
Original line number Diff line number Diff line
@@ -104,16 +104,16 @@ export const visit_template = (places: string[]) => ` 
        <h1 class="pueblo-text">Jerez de García Salinas, Zacatecas</h1>

      </div>

      <div class="pueblo-text-container inverted"></div>

      ${

        places.map(

      ${places

        .map(

          (place) => `<div class="image">

            <img

              src="${place}"

              alt=""

            />

        </div>`

        ).join('\n')

      }

        </div>`,

        )

        .join('\n')}

      <div class="pueblos">

        <img

          src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQnr08Avq1Nkhwh36sTNwiUicOkXhdeASiHuA&s"

backend/src/visited/visited.controller.ts

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ export class VisitedController { 
  }



  @Get('/getImage/:routeId')

  async getVisitedPlacesImage() {

    return await this.visitedService.getVisitedPlacesImage();

  async getVisitedPlacesImage(@Param('routeId') routeId: string) {

    return await this.visitedService.getVisitedPlacesImage(+routeId);

  }



  @UseGuards(AuthUserGuard)

backend/src/visited/visited.module.ts

+4 −1
Original line number Diff line number Diff line 
import { Module } from '@nestjs/common';

import { forwardRef, Module } from '@nestjs/common';

import { VisitedService } from './visited.service';

import { VisitedController } from './visited.controller';

import { TypeOrmModule } from '@nestjs/typeorm';
@@ -19,6 +19,8 @@ import { UserResetCode } from 'src/auth/user/entities/user-reset-code.entity'; 
import { UserConfirmCode } from 'src/auth/user/entities/user-confirm-code.entity';

import { EmailService } from 'src/email/email.service';

import { TravelPlace } from 'src/travel-place/entities/travel-place.entity';

import { RouteModule } from 'src/route/route.module';

import { RouteService } from 'src/route/route.service';



@Module({

  controllers: [VisitedController],
@@ -33,6 +35,7 @@ import { TravelPlace } from 'src/travel-place/entities/travel-place.entity'; 
    EmailService,

  ],

  imports: [

    RouteModule,

    TypeOrmModule.forFeature([

      User,

      Place,

backend/src/visited/visited.service.ts

+7 −3
Original line number Diff line number Diff line
@@ -11,10 +11,12 @@ import { LANGUAGES } from 'src/shared/enum/languages.enum'; 
import { VisitedPlacesImageCreator } from './utils/visited_places_image_creator';

import { ServerConstants } from 'src/constants/server.contants';

import { TravelPlace } from 'src/travel-place/entities/travel-place.entity';

import { RouteService } from 'src/route/route.service';



@Injectable()

export class VisitedService {

  constructor(

    private readonly routeService: RouteService,

    @InjectRepository(Visited) private visitedRepository: Repository<Visited>,

    private readonly userService: UserService,

    private readonly placeService: PlaceService,
@@ -56,12 +58,14 @@ export class VisitedService { 
    return visited;

  }



  async getVisitedPlacesImage() {

  async getVisitedPlacesImage(routeId: number) {

    // obtener imágenes de los lugares visitados en una ruta

    try {

      const visitedPlaces = (await this.placeService.findAllByTown(1, LANGUAGES.EN))

        .map((place) => place.imageName)

      const visitedPlaces = (await this.routeService.getRouteInfoById(routeId)).travelPlace

        .filter((travelPlace) => travelPlace.done)

        .map((travelPlace) => travelPlace.place.imageName)

        .slice(0, 5);

      console.info('visitedPlaces', visitedPlaces);

      const visitedPlacesImageCreator = new VisitedPlacesImageCreator();

      return await visitedPlacesImageCreator.generateImage(visitedPlaces);

    } catch (error) {

mobile/app/_layout.tsx

+23 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import { 
  SetUpContextProvider,

  useSetUp,

} from "../src/common/contexts/set_up_context";

import { useEffect } from "react";



export default function Root() {

  return (
@@ -35,9 +36,15 @@ export default function Root() { 


const MainLayout = () => {

  const { isLoading } = useAuth();

  const { isLoading: profileLoading } = useSetUp();

  const { t } = useTranslation();



  if (isLoading) {

  useEffect(() => {

    console.log("Auth Loading: ", isLoading);

    console.log("Profile Loading: ", profileLoading);

  }, [isLoading, profileLoading]);



  if (isLoading || profileLoading) {

    return <ActivityIndicator />;

  }
@@ -157,6 +164,21 @@ const MainLayout = () => { 
          headerShown: false,

        }}

      />

      <Stack.Screen

        name="verify"

        options={{

          title: "Verify",

          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>

  );

};