Commit 6acc6721 authored by Diego Correa's avatar Diego Correa
Browse files

Merge branch pueblosmagicosconia:main into main

parents f15224bd 37886f99

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ 
/mobile/src/common/constants/api.ts

/mobile/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver

/mobile/assets/audio_prueba.mp3

.vscode/settings.json

mobile/src/common/components/audio_player.tsx

+4 −5
Original line number Diff line number Diff line
@@ -5,21 +5,20 @@ import { millisecondsToHourFormat } from "../../utils/time"; 
import { LIGHT_THEME } from "../constants/theme";

import { useAudio } from "../contexts/audio_context";

import { useEffect } from "react";

import { API_URL } from "../constants/api";



const audio = require("./../../../assets/audio_prueba.mp3");



interface AudioPlayerProps {

  audioUrl: string;

  title: string;

  description: string;

  pointId: number;

}



export const AudioPlayer = () => {

export const AudioPlayer = ({ pointId }: AudioPlayerProps) => {

  const { loadAudio, position, togglePlay, isPlaying, duration, onValueChange } =

    useAudio();



    useEffect(() => {

        loadAudio(audio);

        loadAudio({ uri: `${API_URL}/point/${pointId}/audio?lang=es`});

    }, []);



  return (

mobile/src/common/contexts/data_context.tsx

+7 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import { StateDataSourceProd } from "../../infrastructure/datasource/prod/state_ 
import { ProfileRepository } from "../../profile/domain/repositories/profile_repository";

import { ProfileDataSourceDev } from "../../profile/infrastructure/datasources/dev/profile_datasource";

import { ProfileRepositoryImpl } from "../../profile/infrastructure/repositories/profile_repository";

import { ActivityDatasourceProd } from "../../infrastructure/datasource/prod/activity_datasource";



type DataContextType = {

    statesRepository: StateRepository | null;
@@ -41,11 +42,14 @@ const DataContext = createContext<DataContextType>({ 
});



export const DataContextProvider = ({ children }: DataContextProviderProps) => {

    const statesDataSource = new StateDataSourceDev();

    //const statesDataSource = new StateDataSourceDev();

    const statesDataSource = new StateDataSourceProd();

    const statesRepository = new StateRepositoryImpl(statesDataSource);

    const authDataSource = new AuthDataSourceDev();

    //const authDataSource = new AuthDataSourceDev();

    const authDataSource = new AuthDatasourceProd();

    const authRepository = new AuthRepositoryImpl(authDataSource);

    const activityDataSource = new ActivityDatasourceDev();

    //const activityDataSource = new ActivityDatasourceDev();

    const activityDataSource = new ActivityDatasourceProd();

    const activityRepository = new ActivityRepositoryDev(activityDataSource);

    const travelDatasource = new TravelDatasourceDev();

    const travelRepository = new TravelRepositoryImpl(travelDatasource);

mobile/src/hooks/useGet.ts

+2 −0
Original line number Diff line number Diff line 
import { useEffect, useState } from "react";

import { ApiRequestStatus } from "../common/constants/api_request_states";

import { set } from "react-hook-form";



export const useGet = <T>(callback: () => Promise<T>) => {

    const [data, setData] = useState<T | null>(null);
@@ -9,6 +10,7 @@ export const useGet = <T>(callback: () => Promise<T>) => { 


    const fetchData = async () => {

        try {

            await setLoading();

            const response = await callback();

            setData(response);

            setRequestStatus(ApiRequestStatus.SUCCESS);

mobile/src/hooks/useGetStates.ts

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ export const useGetStates = () => { 
    const callback = async () =>{

        return await statesRepository?.getStates() || [];

    }

    const { requestStatus, data } = useGet<StateEntity[]>(callback);

    const { requestStatus, data, refresh } = useGet<StateEntity[]>(callback);



    return { requestStatus, data };

    return { requestStatus, data, refresh };

}
 
 No newline at end of file