Correction du partage de la position pour la joueuse qui n'est pas en course

client/.env

@@ -1,5 +1,6 @@
 # Public variables
 EXPO_PUBLIC_TRAINTRAPE_MOI_SERVER=https://traintrapemoi.luemy.eu/api
+EXPO_PUBLIC_TRAINTRAPE_MOI_SOCKET=https://traintrapemoi.luemy.eu/
 
 # Build variables
 ANDROID_HOME=/opt/android-sdk

client/.env.development

@@ -1 +1,2 @@
 EXPO_PUBLIC_TRAINTRAPE_MOI_SERVER=http://localhost:3000/
+EXPO_PUBLIC_TRAINTRAPE_MOI_SOCKET=http://localhost:3000/

client/app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Traintrape-moi",
     "slug": "traintrape-moi-client",
-    "version": "1.0.0",
+    "version": "1.1.1",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "traintrapemoi",
@@ -15,7 +15,7 @@
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/images/adaptive-icon.png",
-        "backgroundColor": "#ffffff"
+        "backgroundColor": "#0033fe"
       },
       "package": "eu.luemy.traintrapemoi",
       "permissions": [
@@ -42,7 +42,6 @@
           "locationAlwaysAndWhenInUsePermission": "Allow $(PRODUCT_NAME) to use your location."
         }
       ],
-      "expo-notifications",
       "expo-router",
       "expo-secure-store",
       "expo-share-intent",
@@ -50,9 +49,9 @@
         "expo-splash-screen",
         {
           "image": "./assets/images/splash-icon.png",
-          "imageWidth": 200,
+          "imageWidth": 128,
           "resizeMode": "contain",
-          "backgroundColor": "#ffffff"
+          "backgroundColor": "#0033fe"
         }
       ],
       "expo-task-manager",

client/app/(tabs)/settings.tsx

@@ -1,10 +1,12 @@
 import { useGameRepairMutation, useGameResetMutation, useGameStartMutation, useGameStopMutation, useGameSwitchPlayerMutation } from '@/hooks/mutations/useGameMutation'
 import { useAuth } from '@/hooks/useAuth'
-import { useGame, useUpdateGameState } from '@/hooks/useGame'
+import { useGame, useSetLocationAccuracy, useUpdateGameState } from '@/hooks/useGame'
 import { useQueryClient } from '@tanstack/react-query'
 import { useRouter } from 'expo-router'
 import { useState } from 'react'
-import { Button, Dialog, FAB, List, MD3Colors, Portal, Snackbar, Surface, Text } from 'react-native-paper'
+import { Button, Dialog, List, MD3Colors, Portal, Snackbar, Surface, Text } from 'react-native-paper'
+import { Dropdown } from 'react-native-paper-dropdown'
+import { Accuracy } from 'expo-location'
 
 export default function HistoryScreen() {
   const [successVisible, setSuccessVisible] = useState(false)
@@ -17,6 +19,17 @@ export default function HistoryScreen() {
   const auth = useAuth()
   const game = useGame()
   const updateGameState = useUpdateGameState()
+  const setLocationAccuracy = useSetLocationAccuracy()
+
+  const accuracyArrayList = [
+    { value: Accuracy.BestForNavigation.toString(), label: "Navigation" },
+    { value: Accuracy.Highest.toString(), label: "Plus haute" },
+    { value: Accuracy.High.toString(), label: "Haute" },
+    { value: Accuracy.Balanced.toString(), label: "Équilibrée" },
+    { value: Accuracy.Low.toString(), label: "Basse" },
+    { value: Accuracy.Lowest.toString(), label: "Plus basse" },
+    { value: 'null', label: "Désactivée" },
+  ]
 
   const gameStartMutation = useGameStartMutation({
     auth,
@@ -112,6 +125,11 @@ export default function HistoryScreen() {
             description={auth.loggedIn ? "Vous êtes déjà connecté⋅e" : "Vous n'êtes pas connecté⋅e"}
             right={() => <List.Icon icon="login" />}
             onPress={() => router.navigate('/login')} />
+        <List.Item
+            key={"location-accuracy"}
+            title="Précision de la géolocalisation"
+            description="Réglez le niveau de précision de la géolocalisation. Une valeur élevée indique une consommation de batterie accrue."
+            right={() => <Dropdown label={"Géolocalisation"} hideMenuHeader={true} options={accuracyArrayList} value={game.settings.locationAccuracy?.toString() ?? 'null'} onSelect={(value) => setLocationAccuracy(!value || value == 'null' ? null : +value)} />} />
       </List.Section>
       <List.Section title={"Gestion du jeu"}>
         <List.Item

client/babel.config.js

@@ -2,10 +2,5 @@ module.exports = function(api) {
     api.cache(true);
     return {
       presets: ['babel-preset-expo'],
-      env: {
-        production: {
-          plugins: ['react-native-paper/babel'],
-        },
-      },
     }
   }

client/components/FreeChaseBanner.tsx

@@ -7,13 +7,13 @@ import { Banner, MD3Colors, ProgressBar, Text } from "react-native-paper"
 export default function FreeChaseBanner() {
   const game = useGame()
   const chaseFreeTime = game.chaseFreeTime
-  const chaser = !game.gameStarted && !game.currentRunner && chaseFreeTime !== null
+  const chaser = game.gameStarted && !game.currentRunner && chaseFreeTime !== null
   const chaseFreeDate = useMemo(() => new Date(chaseFreeTime || 0), [chaseFreeTime])
   const chaseFreePretty = chaseFreeDate.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit' })
   const [remainingTime, setRemainingTime] = useState(0)
   const prettyRemainingTime = useMemo(() => `${Math.floor(remainingTime / 60).toString().padStart(2, '0')}:${Math.floor(remainingTime % 60).toString().padStart(2, '0')}`, [remainingTime])
   const iconName = useMemo(() => {
-    switch (Math.abs(remainingTime % 4)) {
+    switch (Math.abs(Math.floor(remainingTime) % 4)) {
       case 0: return 'hourglass-empty'
       case 1: return 'hourglass-end'
       case 2: return 'hourglass-half'
@@ -25,7 +25,7 @@ export default function FreeChaseBanner() {
     const now = new Date().getTime()
     if (!chaser || (chaseFreeTime < now && remainingTime < 0))
       return
-    const interval = setInterval(() => setRemainingTime(Math.floor(chaseFreeTime - now) / 1000), 1000)
+    const interval = setInterval(() => setRemainingTime(Math.floor(chaseFreeTime - new Date().getTime()) / 1000), 1000)
     return () => clearInterval(interval)
   }, [game.gameStarted, game.currentRunner, chaseFreeDate])
 

client/components/Map.tsx

@@ -1,27 +1,53 @@
-import { StyleSheet } from 'react-native'
-import MapLibreGL, { Camera, FillLayer, LineLayer, MapView, PointAnnotation, RasterLayer, RasterSource, ShapeSource, UserLocation, UserTrackingMode } from '@maplibre/maplibre-react-native'
 import { FontAwesome5, MaterialIcons } from '@expo/vector-icons'
+import MapLibreGL, { Camera, FillLayer, LineLayer, MapView, PointAnnotation, RasterLayer, RasterSource, ShapeSource, UserLocation, UserTrackingMode } from '@maplibre/maplibre-react-native'
+import { useQuery } from '@tanstack/react-query'
 import { circle } from '@turf/circle'
-import { useLastOwnLocation, useLastPlayerLocations } from '@/hooks/useLocation'
-import React, { useMemo, useState } from 'react'
-import { PlayerLocation } from '@/utils/features/location/locationSlice'
+import { reverseGeocodeAsync } from 'expo-location'
+import React, { useEffect, useMemo, useState } from 'react'
+import { StyleSheet } from 'react-native'
+import { Button, Dialog, FAB, Portal, Text } from 'react-native-paper'
+import { useAuth } from '@/hooks/useAuth'
 import { useGame } from '@/hooks/useGame'
-import { FAB } from 'react-native-paper'
+import { useLastOwnLocation, useLastPlayerLocations } from '@/hooks/useLocation'
+import { isAuthValid } from '@/utils/features/auth/authSlice'
+import { Player } from '@/utils/features/game/gameSlice'
+import { PlayerLocation } from '@/utils/features/location/locationSlice'
 
 export default function Map() {
   const [followUser, setFollowUser] = useState(true)
+
   return (
     <>
-      <MapComponent followUser={followUser} setFollowUser={setFollowUser} />
-      <FAB
-          style={{ position: 'absolute', right: 25, bottom: 25 }}
-          icon={(props) => <MaterialIcons name={followUser ? 'my-location' : 'location-searching'} {...props} />}
-          onPress={() => setFollowUser(followUser => !followUser)} />
+      <MapWrapper followUser={followUser} setFollowUser={setFollowUser} />
+      <FollowUserButton key={'follow-userr-btn-component'} followUser={followUser} setFollowUser={setFollowUser} />
     </>
   )
 }
 
-function MapComponent({ followUser, setFollowUser }: { followUser?: boolean, setFollowUser: React.Dispatch<React.SetStateAction<boolean>> }) {
+type FollowUserProps = {
+  followUser: boolean,
+  setFollowUser: React.Dispatch<React.SetStateAction<boolean>>,
+}
+
+function MapWrapper({ followUser, setFollowUser }: FollowUserProps) {
+  const [displayedPlayerId, setDisplayedPlayerId] = useState<number | null>(null)
+  return (
+    <>
+      <MapComponent followUser={followUser} setFollowUser={setFollowUser} setDisplayedPlayerId={setDisplayedPlayerId} />
+      <Portal>
+        <PlayerLocationDialog displayedPlayerId={displayedPlayerId} onDismiss={() => setDisplayedPlayerId(null)} />
+      </Portal>
+    </>
+  )
+}
+
+type MapComponentProps = {
+  followUser?: boolean,
+  setFollowUser: React.Dispatch<React.SetStateAction<boolean>>,
+  setDisplayedPlayerId: React.Dispatch<React.SetStateAction<number | null>>
+}
+
+function MapComponent({ followUser, setFollowUser, setDisplayedPlayerId }: MapComponentProps) {
   MapLibreGL.setAccessToken(null)
   const userLocation = useLastOwnLocation()
   return (
@@ -44,22 +70,22 @@ function MapComponent({ followUser, setFollowUser }: { followUser?: boolean, set
       <RasterLayer id="railwaymap-layer" sourceID="railwaymap-source" style={{rasterOpacity: 0.7}} />
 
       <UserLocation animated={true} renderMode="native" androidRenderMode="compass" showsUserHeadingIndicator={true} />
-      <PlayerLocationsMarkers />
+      <PlayerLocationsMarkers setDisplayedPlayerId={setDisplayedPlayerId} />
     </MapView>
   )
 }
 
 
-function PlayerLocationsMarkers() {
+function PlayerLocationsMarkers({ setDisplayedPlayerId }: { setDisplayedPlayerId: React.Dispatch<React.SetStateAction<number | null>> }) {
   const game = useGame()
   const lastPlayerLocations = useLastPlayerLocations()
   return lastPlayerLocations ? lastPlayerLocations
-    .filter(() => game.currentRunner === true || !game.gameStarted)
+    .filter(() => !game.currentRunner || !game.gameStarted)
     .filter(playerLoc => playerLoc.playerId !== game.playerId)
-    .map(playerLoc => <PlayerLocationMarker key={`player-${playerLoc.playerId}-loc`} playerLocation={playerLoc} />) : <></>
+    .map(playerLoc => <PlayerLocationMarker key={`player-${playerLoc.playerId}-loc`} playerLocation={playerLoc} setDisplayedPlayerId={setDisplayedPlayerId} />) : <></>
 }
 
-function PlayerLocationMarker({ playerLocation }: { playerLocation: PlayerLocation }) {
+function PlayerLocationMarker({ playerLocation, setDisplayedPlayerId }: { playerLocation: PlayerLocation, setDisplayedPlayerId: React.Dispatch<React.SetStateAction<number | null>> }) {
   const accuracyCircle = useMemo(() => circle([playerLocation.longitude, playerLocation.latitude], playerLocation.accuracy, {steps: 64, units: 'meters'}), [playerLocation])
   return <>
     <ShapeSource
@@ -76,7 +102,8 @@ function PlayerLocationMarker({ playerLocation }: { playerLocation: PlayerLocati
         style={{lineOpacity: 0.4, lineColor: 'red'}}
         aboveLayerID={`accuracy-radius-fill-${playerLocation.playerId}`} />
     <PointAnnotation id={`player-location-marker-${playerLocation.playerId}`}
-        coordinate={[playerLocation.longitude, playerLocation.latitude]}>
+        coordinate={[playerLocation.longitude, playerLocation.latitude]}
+        onSelected={() => { setDisplayedPlayerId(playerLocation.playerId) }}>
       <FontAwesome5 name="map-marker-alt" size={24} color="red" />
     </PointAnnotation>
   </>
@@ -88,3 +115,68 @@ const styles = StyleSheet.create({
     alignSelf: 'stretch',
   }
 })
+
+function FollowUserButton({ followUser, setFollowUser }: FollowUserProps) {
+  return (
+    <FAB
+      key={'follow-user-btn'}
+      style={{ position: 'absolute', right: 25, bottom: 25 }}
+      icon={(props) => <MaterialIcons name={followUser ? 'my-location' : 'location-searching'} {...props} />}
+      onPress={() => setFollowUser(followUser => !followUser)} />
+  )
+}
+
+function PlayerLocationDialog({ displayedPlayerId, onDismiss }: { displayedPlayerId: number | null, onDismiss: () => void }) {
+  const auth = useAuth()
+  const lastPlayerLocations = useLastPlayerLocations()
+  const playersQuery = useQuery({
+      queryKey: ['get-players', auth.token],
+      queryFn: () => fetch(`${process.env.EXPO_PUBLIC_TRAINTRAPE_MOI_SERVER}/players/`, {
+        headers: { "Authorization": `Bearer ${auth.token}` }}
+      ).then(resp => resp.json()),
+      enabled: isAuthValid(auth),
+      initialData: { data: [], meta: { currentPage: 0, lastPage: 0, nextPage: 0, prevPage: 0, total: 0, totalPerPage: 0 } },
+    })
+
+  const displayedPlayerLoc = useMemo(() => {
+    return lastPlayerLocations.find(loc => loc.playerId === displayedPlayerId)
+  }, [displayedPlayerId, lastPlayerLocations])
+
+  const displayedPlayerName = useMemo(() => {
+    if (!playersQuery.isSuccess || !displayedPlayerId)
+      return "Chargement…"
+    const player: Player | undefined = playersQuery.data.data.find((player: Player) => player.id === displayedPlayerId)
+    if (!player)
+      return "Chargement…"
+    return player.name
+  }, [displayedPlayerId, playersQuery])
+
+  const [address, setAddress] = useState("Adresse inconnue")
+  useEffect(() => {
+    if (!displayedPlayerLoc)
+      return setAddress("Adresse inconnue")
+    reverseGeocodeAsync(displayedPlayerLoc).then(addresses => setAddress(addresses[0].formattedAddress ?? "Adresse inconnue"))
+  }, [displayedPlayerLoc])
+
+  return (
+    <Dialog visible={displayedPlayerId !== null} onDismiss={onDismiss}>
+      <Dialog.Title>{displayedPlayerName}</Dialog.Title>
+      <Dialog.Content>
+        <Text>
+          Dernière position : {new Date(displayedPlayerLoc?.timestamp ?? 0).toLocaleString()}
+        </Text>
+        <Text>
+          Précision : {displayedPlayerLoc?.accuracy.toPrecision(3)} m
+        </Text>
+        <Text>
+          Adresse estimée : {address}
+        </Text>
+      </Dialog.Content>
+      <Dialog.Actions>
+        <Button onPress={onDismiss}>
+          Fermer
+        </Button>
+      </Dialog.Actions>
+    </Dialog>
+  )
+}

client/components/providers/GameProvider.tsx

@@ -11,7 +11,7 @@ import { Challenge } from '@/utils/features/challenges/challengesSlice'
 import { useQuery } from '@tanstack/react-query'
 import { router } from 'expo-router'
 import { useShareIntentContext } from 'expo-share-intent'
-import { ReactNode, useEffect } from 'react'
+import React, { ReactNode, useEffect } from 'react'
 
 export default function GameProvider({ children }: { children: ReactNode }) {
   const auth = useAuth()

client/components/providers/GeolocationProvider.tsx

@@ -1,19 +1,23 @@
-import { ReactNode, useEffect } from 'react'
-import { useAuth } from '@/hooks/useAuth'
-import { useQueuedLocations, useSetLastPlayerLocation, useSetLastPlayerLocations, useUnqueueLocation } from '@/hooks/useLocation'
-import { useGeolocationMutation } from '@/hooks/mutations/useGeolocationMutation'
-import { useStartGeolocationServiceEffect } from '@/utils/geolocation'
-import { Platform } from 'react-native'
 import { useQuery } from '@tanstack/react-query'
-import { isAuthValid } from '@/utils/features/auth/authSlice'
-import { socket } from '@/utils/socket'
-import { PlayerLocation } from '@/utils/features/location/locationSlice'
+import React, { ReactNode, useEffect } from 'react'
+import { Platform } from 'react-native'
 import { Constants } from '@/constants/Constants'
+import { useAuth } from '@/hooks/useAuth'
+import { useSetLocationAccuracy } from '@/hooks/useGame'
+import { useGeolocationMutation } from '@/hooks/mutations/useGeolocationMutation'
+import { useQueuedLocations, useSetLastPlayerLocation, useSetLastPlayerLocations, useUnqueueLocation } from '@/hooks/useLocation'
+import { isAuthValid } from '@/utils/features/auth/authSlice'
+import { PlayerLocation } from '@/utils/features/location/locationSlice'
+import { useStartGeolocationServiceEffect } from '@/utils/geolocation'
+import * as SecureStore from '@/utils/SecureStore'
+import { socket } from '@/utils/socket'
+import { Accuracy } from 'expo-location'
 
 export default function GeolocationProvider({ children }: { children: ReactNode }) {
   useStartGeolocationServiceEffect()
 
   const auth = useAuth()
+  const setLocationAccuracy = useSetLocationAccuracy()
   const geolocationsQueue = useQueuedLocations()
   const unqueueLocation = useUnqueueLocation()
   const setLastPlayerLocations = useSetLastPlayerLocations()
@@ -24,6 +28,17 @@ export default function GeolocationProvider({ children }: { children: ReactNode
     onError: ({ response, error }) => console.error(response, error),
   })
 
+  useEffect(() => {
+    SecureStore.getItemAsync('locationAccuracy').then(locationAccuracyString => {
+      if (!locationAccuracyString)
+        setLocationAccuracy(Accuracy.Balanced)
+      else if (locationAccuracyString === 'null')
+        setLocationAccuracy(null)
+      else
+        setLocationAccuracy(+locationAccuracyString)
+    })
+  }, [])
+  
   if (Platform.OS !== "web") {
     useEffect(() => {
       if (geolocationsQueue.length === 0 || geolocationMutation.isPending || !isAuthValid(auth))
@@ -51,10 +66,14 @@ export default function GeolocationProvider({ children }: { children: ReactNode
       setLastPlayerLocations(lastLocationsQuery.data)
   }, [lastLocationsQuery.status, lastLocationsQuery.dataUpdatedAt])
 
-  socket.on('last-location', (data: PlayerLocation) => {
-    if (data.playerId)
-      setLastPlayerLocation(data)
-  })
+  useEffect(() => {
+    const locationListener = async (data: PlayerLocation) => {
+      if (data.playerId)
+        setLastPlayerLocation(data)
+    }
+    socket.on('last-location', locationListener)
+    return () => { socket.off('last-location', locationListener) }
+  }, [])
 
   return <>
     {children}

client/constants/Constants.ts

@@ -1,3 +1,5 @@
+import { Accuracy } from 'expo-location'
+
 export const Constants = {
   MIN_DELAY_LOCATION_SENT: 20,
   QUERY_REFETCH_INTERVAL: 15,

client/hooks/useGame.ts

@@ -1,7 +1,9 @@
+import { Accuracy } from "expo-location"
 import { useAppDispatch, useAppSelector } from "./useStore"
-import { GamePayload, PenaltyPayload, setPlayerId, updateActiveChallengeId, updateGameState, updateMoney, updatePenalty } from "@/utils/features/game/gameSlice"
+import { GamePayload, PenaltyPayload, setLocationAccuracy, setPlayerId, updateActiveChallengeId, updateGameState, updateMoney, updatePenalty } from "@/utils/features/game/gameSlice"
 
 export const useGame = () => useAppSelector((state) => state.game)
+export const useSettings = () => useAppSelector((state) => state.game.settings)
 export const useSetPlayerId = () => {
   const dispath = useAppDispatch()
   return (playerId: number) => dispath(setPlayerId(playerId))
@@ -22,3 +24,7 @@ export const useUpdatePenalty = () => {
     const dispatch = useAppDispatch()
     return (penalty: PenaltyPayload) => dispatch(updatePenalty(penalty))
 }
+export const useSetLocationAccuracy = () => {
+    const dispatch = useAppDispatch()
+    return (accuracy: Accuracy | null) => dispatch(setLocationAccuracy(accuracy))
+}

client/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "traintrape-moi-client",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "traintrape-moi-client",
-      "version": "1.0.0",
+      "version": "1.0.1",
       "dependencies": {
         "@dev-plugins/react-navigation": "^0.1.0",
         "@dev-plugins/react-query": "^0.1.0",
@@ -25,10 +25,8 @@
         "expo-constants": "~17.0.3",
         "expo-dev-client": "~5.0.4",
         "expo-font": "~13.0.1",
-        "expo-haptics": "~14.0.0",
         "expo-linking": "~7.0.3",
         "expo-location": "^18.0.2",
-        "expo-notifications": "~0.29.11",
         "expo-router": "~4.0.9",
         "expo-secure-store": "~14.0.0",
         "expo-share-intent": "^3.1.1",
@@ -38,7 +36,6 @@
         "expo-system-ui": "~4.0.4",
         "expo-task-manager": "^12.0.3",
         "expo-updates": "~0.26.10",
-        "expo-web-browser": "~14.0.1",
         "maplibre-gl": "^4.7.1",
         "maplibre-react-components": "^0.1.9",
         "react": "18.3.1",
@@ -47,11 +44,10 @@
         "react-native": "0.76.3",
         "react-native-gesture-handler": "~2.20.2",
         "react-native-paper": "^5.12.5",
-        "react-native-reanimated": "~3.16.1",
+        "react-native-paper-dropdown": "^2.3.1",
         "react-native-safe-area-context": "~4.12.0",
         "react-native-screens": "~4.1.0",
         "react-native-web": "~0.19.13",
-        "react-native-webview": "13.12.2",
         "react-redux": "^9.1.2",
         "socket.io-client": "^4.8.1"
       },
@@ -1850,6 +1846,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
       "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
       },
@@ -2956,12 +2953,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@ide/backoff": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@ide/backoff/-/backoff-1.0.0.tgz",
-      "integrity": "sha512-F0YfUDjvT+Mtt/R4xdl2X0EYCHMMiJqNLdxHD++jDT5ydEFIyqbCHh51Qx2E211dgZprPKhV7sHmnXKpLuvc5g==",
-      "license": "MIT"
-    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -5686,19 +5677,6 @@
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
       "license": "MIT"
     },
-    "node_modules/assert": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
-      "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-nan": "^1.3.2",
-        "object-is": "^1.1.5",
-        "object.assign": "^4.1.4",
-        "util": "^0.12.5"
-      }
-    },
     "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -5982,12 +5960,6 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/badgin": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/badgin/-/badgin-1.2.3.tgz",
-      "integrity": "sha512-NQGA7LcfCpSzIbGRbkgjgdWkjy7HI+Th5VLxTJfW5EeaAf3fnS+xWQaQOCYiny+q6QSvxqoSO04vCx+4u++EJw==",
-      "license": "MIT"
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -7123,23 +7095,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/del": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
@@ -7846,15 +7801,6 @@
         }
       }
     },
-    "node_modules/expo-application": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/expo-application/-/expo-application-6.0.1.tgz",
-      "integrity": "sha512-w+1quSmKp8SYKT+GAFHSN5c6u+PqoVRIfpsLyRQrQdOnBA9dA8Hw6JT9sHNFmA30A2v1b/sdYZE3qKuRJFNSWQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
-      }
-    },
     "node_modules/expo-asset": {
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-11.0.1.tgz",
@@ -7981,15 +7927,6 @@
         "react": "*"
       }
     },
-    "node_modules/expo-haptics": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/expo-haptics/-/expo-haptics-14.0.0.tgz",
-      "integrity": "sha512-5tYJN+2axYF22BtG1elBQAV1aZPUOCtr9sItClfm4jDoekGiPCxZG/nylcA3DVh2bUHMSll4Y98qjFFFhwZ1Cw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
-      }
-    },
     "node_modules/expo-json-utils": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-0.14.0.tgz",
@@ -8106,26 +8043,6 @@
         "invariant": "^2.2.4"
       }
     },
-    "node_modules/expo-notifications": {
-      "version": "0.29.11",
-      "resolved": "https://registry.npmjs.org/expo-notifications/-/expo-notifications-0.29.11.tgz",
-      "integrity": "sha512-u/Csc3YNOPjjuyjAeyj5ne7XR/Z0ABYVquhSnyjEj2Fp8mSldOPCMvaEA01pTFj+8HTlkjX5RZDvQ7cR62ngOA==",
-      "license": "MIT",
-      "dependencies": {
-        "@expo/image-utils": "^0.6.0",
-        "@ide/backoff": "^1.0.0",
-        "abort-controller": "^3.0.0",
-        "assert": "^2.0.0",
-        "badgin": "^1.1.5",
-        "expo-application": "~6.0.0",
-        "expo-constants": "~17.0.0"
-      },
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*",
-        "react-native": "*"
-      }
-    },
     "node_modules/expo-router": {
       "version": "4.0.11",
       "resolved": "https://registry.npmjs.org/expo-router/-/expo-router-4.0.11.tgz",
@@ -8330,16 +8247,6 @@
       "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==",
       "license": "MIT"
     },
-    "node_modules/expo-web-browser": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/expo-web-browser/-/expo-web-browser-14.0.1.tgz",
-      "integrity": "sha512-QM9F3ie+UyIOoBvqFmT6CZojb1vMc2H+7ZlMT5dEu1PL2jtYyOeK2hLfbt/EMt7CBm/w+P29H9W9Y9gdebOkuQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*",
-        "react-native": "*"
-      }
-    },
     "node_modules/exponential-backoff": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
@@ -9558,22 +9465,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-nan": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
-      "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -12452,49 +12343,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-is": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
-      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.5",
-        "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -13631,6 +13479,23 @@
         "react-native-vector-icons": "*"
       }
     },
+    "node_modules/react-native-paper-dropdown": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/react-native-paper-dropdown/-/react-native-paper-dropdown-2.3.1.tgz",
+      "integrity": "sha512-IvcHTucAV5+fiX2IVMiVdBDKT6KHxycW0o9QzZe7bpmeZWmuCajHDnwG3OSBGlXhUxrrM3TC0/HJZHwORWGgQg==",
+      "license": "MIT",
+      "workspaces": [
+        "example"
+      ],
+      "dependencies": {
+        "react-native-paper": "^5.12.3"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*",
+        "react-native-paper": "*"
+      }
+    },
     "node_modules/react-native-paper/node_modules/color": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
@@ -13670,6 +13535,8 @@
       "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.16.5.tgz",
       "integrity": "sha512-mq/5k14pimkhCeP9XwFJkEr8XufaHqIekum8fqpsn0fcBzbLvyiqfM2LEuBvi0+DTv5Bd2dHmUHkYqGYfkj3Jw==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@babel/plugin-transform-arrow-functions": "^7.0.0-0",
         "@babel/plugin-transform-class-properties": "^7.0.0-0",
@@ -13843,6 +13710,8 @@
       "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-13.12.2.tgz",
       "integrity": "sha512-OpRcEhf1IEushREax6rrKTeqGrHZ9OmryhZLBLQQU4PwjqVsq55iC8OdYSD61/F628f9rURn9THyxEZjrknpQQ==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "escape-string-regexp": "^4.0.0",
         "invariant": "2.2.4"

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "traintrape-moi-client",
   "main": "expo-router/entry",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "scripts": {
     "start": "expo start",
     "android": "expo run:android",
@@ -31,10 +31,8 @@
     "expo-constants": "~17.0.3",
     "expo-dev-client": "~5.0.4",
     "expo-font": "~13.0.1",
-    "expo-haptics": "~14.0.0",
     "expo-linking": "~7.0.3",
     "expo-location": "^18.0.2",
-    "expo-notifications": "~0.29.11",
     "expo-router": "~4.0.9",
     "expo-secure-store": "~14.0.0",
     "expo-share-intent": "^3.1.1",
@@ -44,7 +42,6 @@
     "expo-system-ui": "~4.0.4",
     "expo-task-manager": "^12.0.3",
     "expo-updates": "~0.26.10",
-    "expo-web-browser": "~14.0.1",
     "maplibre-gl": "^4.7.1",
     "maplibre-react-components": "^0.1.9",
     "react": "18.3.1",
@@ -53,11 +50,10 @@
     "react-native": "0.76.3",
     "react-native-gesture-handler": "~2.20.2",
     "react-native-paper": "^5.12.5",
-    "react-native-reanimated": "~3.16.1",
+    "react-native-paper-dropdown": "^2.3.1",
     "react-native-safe-area-context": "~4.12.0",
     "react-native-screens": "~4.1.0",
     "react-native-web": "~0.19.13",
-    "react-native-webview": "13.12.2",
     "react-redux": "^9.1.2",
     "socket.io-client": "^4.8.1"
   },

client/utils/features/game/gameSlice.ts

@@ -1,4 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { Accuracy } from 'expo-location'
+import * as SecureStore from '@/utils/SecureStore'
 
 export interface RunPayload {
   id: number
@@ -20,6 +22,13 @@ export interface PenaltyPayload {
   penaltyEnd: number | null
 }
 
+export interface Player {
+  id: number
+  name: string
+  money: number
+  activeChallengeId: number | null
+}
+
 export interface GameState {
   playerId: number | null
   runId: number | null
@@ -30,6 +39,11 @@ export interface GameState {
   chaseFreeTime: number | null  // date
   penaltyStart: number | null // date
   penaltyEnd: number | null  //date
+  settings: Settings
+}
+
+export interface Settings {
+  locationAccuracy: Accuracy | null
 }
 
 const initialState: GameState = {
@@ -42,6 +56,9 @@ const initialState: GameState = {
   chaseFreeTime: null,
   penaltyStart: null,
   penaltyEnd: null,
+  settings: {
+    locationAccuracy: Accuracy.Highest,
+  }
 }
 
 export const gameSlice = createSlice({
@@ -70,10 +87,14 @@ export const gameSlice = createSlice({
     updatePenalty: (state, action: PayloadAction<PenaltyPayload>) => {
       state.penaltyStart = action.payload.penaltyStart
       state.penaltyEnd = action.payload.penaltyEnd
+    },
+    setLocationAccuracy: (state, action: PayloadAction<Accuracy | null>) => {
+      state.settings.locationAccuracy = action.payload
+      SecureStore.setItem('locationAccuracy', action.payload?.toString() ?? 'null')
     }
   },
 })
 
-export const { setPlayerId, updateMoney, updateActiveChallengeId, updateGameState, updatePenalty } = gameSlice.actions
+export const { setLocationAccuracy, setPlayerId, updateMoney, updateActiveChallengeId, updateGameState, updatePenalty } = gameSlice.actions
 
 export default gameSlice.reducer

client/utils/features/location/locationSlice.ts

@@ -1,6 +1,7 @@
-import { Constants } from '@/constants/Constants'
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { LocationObject } from 'expo-location'
+import { Constants } from '@/constants/Constants'
+
 
 export type PlayerLocation = {
   id?: number

client/utils/geolocation.ts

@@ -5,8 +5,11 @@ import { PlayerLocation, setLastLocation } from './features/location/locationSli
 import store from './store'
 import { useEffect } from 'react'
 import { socket } from './socket'
+import { useSettings } from '@/hooks/useGame'
+import { useAuth } from '@/hooks/useAuth'
+import { isAuthValid } from './features/auth/authSlice'
 
-const LOCATION_TASK = "fetch-geolocation"
+const LOCATION_TASK = "TRAINTRAPE_MOI_GEOLOCATION"
 
 TaskManager.defineTask(LOCATION_TASK, async ({ data, error }: any) => {
   if (error) {
@@ -15,8 +18,9 @@ TaskManager.defineTask(LOCATION_TASK, async ({ data, error }: any) => {
   }
   const { locations } = data
   const lastLoc: Location.LocationObject = locations.at(-1)
+  if (__DEV__)
+    console.log("Localisation reçue :", lastLoc)
   store.dispatch(setLastLocation(lastLoc))
-  console.log("sending-loc", lastLoc, socket.active)
   const playerId = store.getState().game.playerId
   if (socket.active && playerId) {
     const lastLocToSend: PlayerLocation = {
@@ -25,17 +29,20 @@ TaskManager.defineTask(LOCATION_TASK, async ({ data, error }: any) => {
       latitude: lastLoc.coords.latitude,
       speed: lastLoc.coords.speed ?? 0,
       accuracy: lastLoc.coords.accuracy ?? 0,
-      altitude: lastLoc.coords.accuracy ?? 0,
+      altitude: lastLoc.coords.altitude ?? 0,
       altitudeAccuracy: lastLoc.coords.altitudeAccuracy ?? 0,
       timestamp: new Date(lastLoc.timestamp).toISOString(),
     }
-    socket.emit('last-location', { playerId: playerId, loc: lastLocToSend })
+    socket.emit('last-location', lastLocToSend)
   }
 })
   
-export async function startGeolocationService(): Promise<void | (() => void)> {
+export async function startGeolocationService(locationAccuracy: Location.Accuracy | null): Promise<void | (() => void)> {
   if (Platform.OS !== "web" && await Location.hasStartedLocationUpdatesAsync(LOCATION_TASK))
-    return async () => await Location.stopLocationUpdatesAsync(LOCATION_TASK)
+    await Location.stopLocationUpdatesAsync(LOCATION_TASK)
+
+  if (locationAccuracy === null)
+    return
 
   await Location.enableNetworkProviderAsync().catch(error => alert(error))
 
@@ -49,10 +56,10 @@ export async function startGeolocationService(): Promise<void | (() => void)> {
 
   if (Platform.OS !== "web") {
     await Location.startLocationUpdatesAsync(LOCATION_TASK, {
-      accuracy: Location.Accuracy.BestForNavigation,
+      accuracy: locationAccuracy,
       activityType: Location.ActivityType.OtherNavigation,
-      deferredUpdatesInterval: 100,
-      timeInterval: 100,
+      distanceInterval: 10,
+      timeInterval: 1000,
       foregroundService: {
         killServiceOnDestroy: false,
         notificationBody: "Géolocalisation activée pour « Traintrape-moi »",
@@ -63,13 +70,19 @@ export async function startGeolocationService(): Promise<void | (() => void)> {
     return async () => await Location.stopLocationUpdatesAsync(LOCATION_TASK)
   }
   else {
-    const locationSubscription = await Location.watchPositionAsync({accuracy: Location.Accuracy.BestForNavigation}, location_nouveau => store.dispatch(setLastLocation(location_nouveau)))
+    const locationSubscription = await Location.watchPositionAsync({ accuracy: locationAccuracy }, location_nouveau => store.dispatch(setLastLocation(location_nouveau)))
     return locationSubscription.remove
   }
 }
 
-export const useStartGeolocationServiceEffect = () => useEffect(() => {
-  let cleanup: void | (() => void) = () => {}
-  startGeolocationService().then(result => cleanup = result)
-  return cleanup
-}, [])
+export const useStartGeolocationServiceEffect = () => {
+  const auth = useAuth()
+  const settings = useSettings()
+  return useEffect(() => {
+    if (!isAuthValid(auth))
+      return
+    let cleanup: void | (() => void) = () => {}
+    startGeolocationService(settings.locationAccuracy).then(result => cleanup = result)
+    return cleanup
+  }, [auth, settings.locationAccuracy])
+}

client/utils/socket.ts

@@ -1,3 +1,3 @@
 import { io } from 'socket.io-client'
 
-export const socket = io(process.env.EXPO_PUBLIC_TRAINTRAPE_MOI_SERVER)
+export const socket = io(process.env.EXPO_PUBLIC_TRAINTRAPE_MOI_SOCKET)

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "traintrape-moi-server",
-  "version": "0.0.1",
+  "version": "1.1.1",
   "description": "",
   "author": "",
   "private": true,

server/src/common/utils/constants.utils.ts

@@ -1,8 +1,13 @@
 export const Constants = {
   /**
-   * Nombre de points attribués au début de la partie
+   * Nombre de points attribués au début de la partie pour la première joueuse
    */
-  INITIAL_MONEY: 2000,
+  INITIAL_MONEY_1ST_PLAYER: 1500,
+
+  /**
+   * Nombre de points attribués au début de la partie pour la première joueuse
+   */
+  INITIAL_MONEY_2ND_PLAYER: 1000,
 
   /**
    * Nombre de points attribués lors d'une nouvelle tentative

server/src/game/game.service.ts

@@ -20,16 +20,16 @@ export class GameService {
     const alreadyStarted = game.currentRunId !== null
     let run
     if (!alreadyStarted) {
+      const runnerId = players[Math.floor(players.length * Math.random())].id
       for (const player of players) {
         await this.prisma.moneyUpdate.create({
           data: {
             playerId: player.id,
-            amount: Constants.INITIAL_MONEY,
+            amount: player.id === runnerId ? Constants.INITIAL_MONEY_1ST_PLAYER : Constants.INITIAL_MONEY_2ND_PLAYER,
             reason: MoneyUpdateType.START,
           }
         })
       }
-      const runnerId = players[Math.floor(players.length * Math.random())].id
       run = await this.prisma.playerRun.create({
         data: {
           gameId: game.id,

server/src/main.ts

@@ -10,10 +10,11 @@ async function bootstrap() {
   app.useGlobalPipes(new ValidationPipe({ transform: true }))
   app.useGlobalInterceptors(new ClassSerializerInterceptor(app.get(Reflector)))
 
+  const { version } = require('../../package.json')
   const config = new DocumentBuilder()
     .setTitle('Traintrape-moi')
     .setDescription('API permettant de stocker les données de Traintrape-moi')
-    .setVersion('1.0')
+    .setVersion(version)
     .addBearerAuth()
     .build()
   const document = SwaggerModule.createDocument(app, config)