From 38117ade077b90b02779098223a425b3b48775c6 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Thu, 12 Dec 2024 14:56:17 +0100 Subject: [PATCH] =?UTF-8?q?R=C3=A9cup=C3=A9ration=20de=20la=20liste=20des?= =?UTF-8?q?=20trains=20emprunt=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/app/(tabs)/train.tsx | 33 +++++++++++-- client/components/GameProvider.tsx | 21 ++++++-- client/hooks/useTrain.ts | 7 ++- client/utils/features/train/trainSlice.ts | 60 +++++++++++++---------- 4 files changed, 88 insertions(+), 33 deletions(-) diff --git a/client/app/(tabs)/train.tsx b/client/app/(tabs)/train.tsx index 20bb034..31d7857 100644 --- a/client/app/(tabs)/train.tsx +++ b/client/app/(tabs)/train.tsx @@ -1,8 +1,11 @@ import { useAddTrainMutation } from '@/hooks/mutations/useTrainMutation' import { useAuth } from '@/hooks/useAuth' +import { useTrain } from '@/hooks/useTrain' +import { TrainTrip } from '@/utils/features/train/trainSlice' +import { FontAwesome6 } from '@expo/vector-icons' import { useMemo, useState } from 'react' -import { StyleSheet } from 'react-native' -import { Button, Dialog, FAB, HelperText, Portal, Surface, Text, TextInput } from 'react-native-paper' +import { FlatList, StyleSheet } from 'react-native' +import { Badge, Button, Dialog, Divider, FAB, HelperText, List, Portal, Surface, Text, TextInput } from 'react-native-paper' export default function TrainScreen() { const [addTrainVisible, setAddTrainVisible] = useState(false) @@ -15,9 +18,13 @@ export default function TrainScreen() { onPostSuccess: () => setAddTrainVisible(false) }) + const trains = useTrain() + return ( - Ici on aura la page pour ajouter un trajet en train depuis Rail Planner + } /> ${train.to} ${arrTime} (${depDate})` + const distanceKm = Math.ceil(train.distance / 1000) + const cost = 10 * distanceKm + return <> + Durée : {duration}, distance : {distanceKm} km, coût : {cost} } + /> + + +} diff --git a/client/components/GameProvider.tsx b/client/components/GameProvider.tsx index 1c92dca..605b795 100644 --- a/client/components/GameProvider.tsx +++ b/client/components/GameProvider.tsx @@ -1,5 +1,6 @@ import { useAuth } from '@/hooks/useAuth' import { useGame, useUpdateGameState, useUpdateMoney } from '@/hooks/useGame' +import { useDownloadTrains } from '@/hooks/useTrain' import { useQuery } from '@tanstack/react-query' import { ReactNode, useEffect } from 'react' @@ -8,6 +9,7 @@ export default function GameProvider({ children }: { children: ReactNode }) { const game = useGame() const updateGameState = useUpdateGameState() const updateMoney = useUpdateMoney() + const downloadTrains = useDownloadTrains() const gameQuery = useQuery({ queryKey: ['get-game'], @@ -20,10 +22,10 @@ export default function GameProvider({ children }: { children: ReactNode }) { useEffect(() => { if (gameQuery.isSuccess && gameQuery.data) updateGameState(gameQuery.data) - }, [gameQuery]) + }, [gameQuery.status, gameQuery.dataUpdatedAt]) const playerQuery = useQuery({ - queryKey: ['get-player'], + queryKey: ['get-player', game.playerId], queryFn: () => fetch(`${process.env.EXPO_PUBLIC_TRAINTRAPE_MOI_SERVER}/players/${game.playerId}/`, { headers: { "Authorization": `Bearer ${auth.token}` }} ).then(resp => resp.json()), @@ -33,7 +35,20 @@ export default function GameProvider({ children }: { children: ReactNode }) { useEffect(() => { if (playerQuery.isSuccess && playerQuery.data) updateMoney(playerQuery.data.money) - }, [playerQuery]) + }, [playerQuery.status, playerQuery.dataUpdatedAt]) + + const trainsQuery = useQuery({ + queryKey: ['get-trains'], + queryFn: () => fetch(`${process.env.EXPO_PUBLIC_TRAINTRAPE_MOI_SERVER}/trains/`, { + headers: { "Authorization": `Bearer ${auth.token}` }} + ).then(resp => resp.json()), + enabled: auth.loggedIn, + refetchInterval: 5000, + }) + useEffect(() => { + if (trainsQuery.isSuccess && trainsQuery.data) + downloadTrains(trainsQuery.data) + }, [trainsQuery.status, trainsQuery.dataUpdatedAt]) return <> {children} diff --git a/client/hooks/useTrain.ts b/client/hooks/useTrain.ts index b370af8..cf833ef 100644 --- a/client/hooks/useTrain.ts +++ b/client/hooks/useTrain.ts @@ -1,3 +1,8 @@ -import { useAppSelector } from "./useStore" +import { downloadTrains, TrainsPayload } from "@/utils/features/train/trainSlice" +import { useAppDispatch, useAppSelector } from "./useStore" export const useTrain = () => useAppSelector((state) => state.train) +export const useDownloadTrains = () => { + const dispath = useAppDispatch() + return (trainsData: TrainsPayload) => dispath(downloadTrains(trainsData)) + } diff --git a/client/utils/features/train/trainSlice.ts b/client/utils/features/train/trainSlice.ts index 36dc477..15bb0a7 100644 --- a/client/utils/features/train/trainSlice.ts +++ b/client/utils/features/train/trainSlice.ts @@ -1,28 +1,4 @@ -import { createSlice } from '@reduxjs/toolkit' - -export interface InterrailLeg { - infoJson?: string - info?: InterrailLegInfo - sortOrder: number -} - -export interface InterrailTravel { - date: string - infoJson?: string - info?: InterrailTravelInfo - from: string - to: string - type: number - legs: InterrailLeg[] -} - -export interface InterrailJourneyData { - travels: InterrailTravel[] -} - -export interface InterrailJourney { - data: InterrailJourneyData -} +import { createSlice, PayloadAction } from '@reduxjs/toolkit' export interface InterrailTime { hours: number @@ -85,6 +61,8 @@ export interface TrainTrip { to: string, departureTime: number, arrivalTime: number, + infoJson?: string, + info?: InterrailLegInfo, } export interface TrainsState { @@ -95,13 +73,43 @@ const initialState: TrainsState = { trains: [] } +export interface PaginationMeta { + currentPage: number + lastPage: number + nextPage: number + prevPage: number + total: number + totalPerPage: number +} + +export interface TrainsPayload { + data: TrainTrip[] + meta: PaginationMeta +} + export const trainSlice = createSlice({ name: 'train', initialState: initialState, reducers: { + downloadTrains(state, action: PayloadAction) { + state.trains = state.trains.filter(train => action.payload.data.filter(dlTrain => dlTrain.id === train.id) === null) + for (const dlTrain of action.payload.data) { + const info = dlTrain.infoJson ? JSON.parse(dlTrain.infoJson) : undefined + state.trains.push({ + id: dlTrain.id, + distance: dlTrain.distance, + from: dlTrain.from, + to: dlTrain.to, + departureTime: dlTrain.departureTime, + arrivalTime: dlTrain.arrivalTime, + info: info, + }) + state.trains.sort((t1, t2) => t1.departureTime > t2.departureTime ? -1 : t1.departureTime == t2.arrivalTime ? 0 : 1) + } + } }, }) -export const { } = trainSlice.actions +export const {downloadTrains } = trainSlice.actions export default trainSlice.reducer