diff --git a/JokesApp/redux/actions/sampleAction.ts b/JokesApp/redux/actions/sampleAction.ts index 0902bf8..ab50ce3 100644 --- a/JokesApp/redux/actions/sampleAction.ts +++ b/JokesApp/redux/actions/sampleAction.ts @@ -42,27 +42,30 @@ export const setCompletJokes = (completJoke: SampleJoke): SampleActionComplet => } } -export const getSampleJoke = async() : Promise => { +export const getSampleJoke = () => { + return async dispatch => { try { const sample = await fetch('https://iut-weather-api.azurewebsites.net/jokes/samples'); const sampleJson = await sample.text(); - return JokeFactory.createSampleJokes(sampleJson); - } - catch (error) { + const joke = JokeFactory.createSampleJokes(sampleJson); + dispatch(setSample(joke)); + } catch (error) { console.log('Error---------', error); } + } } -export const getLatestJokes = async() : Promise => { - try { - const sample = await fetch('https://iut-weather-api.azurewebsites.net/jokes/lasts'); - const sampleJson = await sample.text(); - return JokeFactory.createSampleJokes(sampleJson); - } - catch (error) { - console.log('Error---------', error); +export const getLatestJokes = () => { + return async dispatch => { + try { + const sample = await fetch('https://iut-weather-api.azurewebsites.net/jokes/lasts'); + const sampleJson = await sample.text(); + const latestJoke = JokeFactory.createSampleJokes(sampleJson); + dispatch(setRecentJokes(latestJoke)); + } catch (error) { + console.log('Error---------', error); + } } - } export const getCompletJokes = (id : number) => { @@ -71,7 +74,6 @@ export const getCompletJokes = (id : number) => { const sample = await fetch('https://iut-weather-api.azurewebsites.net/jokes/samples/' + id); const sampleJson = await sample.text(); const jokeSelect = JokeFactory.createSampleJokeById(sampleJson); - console.log("edsv" + jokeSelect); dispatch(setCompletJokes(jokeSelect)) } catch (error) { console.log('Error---------', error); diff --git a/JokesApp/screens/AccueilScreen.tsx b/JokesApp/screens/AccueilScreen.tsx index 5dccc3c..15ebd43 100644 --- a/JokesApp/screens/AccueilScreen.tsx +++ b/JokesApp/screens/AccueilScreen.tsx @@ -22,7 +22,7 @@ export function AccueilScreen() { const getJokes = async () => { // @ts-ignore - dispatch(setRecentJokes(await getLatestJokes())); + await dispatch(getLatestJokes()); }; getJokes(); diff --git a/JokesApp/screens/ListJokeScreen.tsx b/JokesApp/screens/ListJokeScreen.tsx index 9182397..3cbbea2 100644 --- a/JokesApp/screens/ListJokeScreen.tsx +++ b/JokesApp/screens/ListJokeScreen.tsx @@ -12,7 +12,7 @@ export function ListJokeScreen({route, navigation}) { useEffect(() => { const getJokes = async () => { // @ts-ignore - dispatch(setSample(await getSampleJoke())); + await dispatch(getSampleJoke()); }; getJokes(); }, [dispatch]);