From 4d8dcd241cd37be854353b8736856f9ca969588f Mon Sep 17 00:00:00 2001 From: Sebastien Riviere Date: Wed, 18 Feb 2026 00:45:38 +0100 Subject: [PATCH] Modify folder structure --- mobile/traque-app/app.json | 4 +-- mobile/traque-app/app/_layout.jsx | 4 +-- mobile/traque-app/app/index.jsx | 20 +++++++------- mobile/traque-app/app/interface.jsx | 26 +++++++++--------- .../{ => src}/assets/images/arrow.png | Bin .../{ => src}/assets/images/battery/black.png | Bin .../{ => src}/assets/images/battery/green.png | Bin .../{ => src}/assets/images/battery/red.png | Bin .../{ => src}/assets/images/centerMap.png | Bin .../{ => src}/assets/images/cogwheel.png | Bin .../{ => src}/assets/images/distance.png | Bin .../assets/images/localisation/black.png | Bin .../assets/images/localisation/green.png | Bin .../assets/images/localisation/red.png | Bin .../assets/images/logo/logo_traque.png | Bin .../{ => src}/assets/images/logout.png | Bin .../{ => src}/assets/images/marker/blue.png | Bin .../{ => src}/assets/images/marker/grey.png | Bin .../{ => src}/assets/images/marker/red.png | Bin .../{ => src}/assets/images/missing_image.jpg | Bin .../{ => src}/assets/images/observed.png | Bin .../{ => src}/assets/images/path.png | Bin .../{ => src}/assets/images/placement.png | Bin .../{ => src}/assets/images/running.jpg | Bin .../{ => src}/assets/images/running.png | Bin .../{ => src}/assets/images/target/black.png | Bin .../{ => src}/assets/images/target/white.png | Bin .../{ => src}/assets/images/time.png | Bin .../assets/images/update_position.png | Bin .../{ => src}/components/button.jsx | 0 .../{ => src}/components/drawer.jsx | 0 .../traque-app/{ => src}/components/image.jsx | 0 .../traque-app/{ => src}/components/input.jsx | 0 .../traque-app/{ => src}/components/layer.jsx | 0 .../traque-app/{ => src}/components/map.jsx | 0 .../traque-app/{ => src}/components/stat.jsx | 0 .../traque-app/{ => src}/components/timer.jsx | 0 .../traque-app/{ => src}/constants/colors.js | 0 .../traque-app/{ => src}/constants/config.js | 0 mobile/traque-app/{ => src}/constants/game.js | 0 .../traque-app/{ => src}/constants/index.js | 0 mobile/traque-app/{ => src}/constants/map.js | 0 .../context/teamConnexionContext.jsx | 0 .../{ => src}/context/teamContext.jsx | 0 mobile/traque-app/{ => src}/hook/useGame.jsx | 0 .../{ => src}/hook/useLocalStorage.jsx | 0 .../traque-app/{ => src}/hook/useLocation.jsx | 0 .../{ => src}/hook/usePickImage.jsx | 0 .../{ => src}/hook/useSendDeviceInfo.jsx | 0 .../{ => src}/hook/useSocketAuth.jsx | 0 .../{ => src}/hook/useTimeDifference.jsx | 0 .../services/backgroundLocationTask.js | 0 .../{ => src}/services/imageService.js | 0 .../traque-app/{ => src}/services/socket.js | 0 .../{ => src}/services/socketEmitter.js | 0 mobile/traque-app/{ => src}/util/functions.js | 0 56 files changed, 27 insertions(+), 27 deletions(-) rename mobile/traque-app/{ => src}/assets/images/arrow.png (100%) rename mobile/traque-app/{ => src}/assets/images/battery/black.png (100%) rename mobile/traque-app/{ => src}/assets/images/battery/green.png (100%) rename mobile/traque-app/{ => src}/assets/images/battery/red.png (100%) rename mobile/traque-app/{ => src}/assets/images/centerMap.png (100%) rename mobile/traque-app/{ => src}/assets/images/cogwheel.png (100%) rename mobile/traque-app/{ => src}/assets/images/distance.png (100%) rename mobile/traque-app/{ => src}/assets/images/localisation/black.png (100%) rename mobile/traque-app/{ => src}/assets/images/localisation/green.png (100%) rename mobile/traque-app/{ => src}/assets/images/localisation/red.png (100%) rename mobile/traque-app/{ => src}/assets/images/logo/logo_traque.png (100%) rename mobile/traque-app/{ => src}/assets/images/logout.png (100%) rename mobile/traque-app/{ => src}/assets/images/marker/blue.png (100%) rename mobile/traque-app/{ => src}/assets/images/marker/grey.png (100%) rename mobile/traque-app/{ => src}/assets/images/marker/red.png (100%) rename mobile/traque-app/{ => src}/assets/images/missing_image.jpg (100%) rename mobile/traque-app/{ => src}/assets/images/observed.png (100%) rename mobile/traque-app/{ => src}/assets/images/path.png (100%) rename mobile/traque-app/{ => src}/assets/images/placement.png (100%) rename mobile/traque-app/{ => src}/assets/images/running.jpg (100%) rename mobile/traque-app/{ => src}/assets/images/running.png (100%) rename mobile/traque-app/{ => src}/assets/images/target/black.png (100%) rename mobile/traque-app/{ => src}/assets/images/target/white.png (100%) rename mobile/traque-app/{ => src}/assets/images/time.png (100%) rename mobile/traque-app/{ => src}/assets/images/update_position.png (100%) rename mobile/traque-app/{ => src}/components/button.jsx (100%) rename mobile/traque-app/{ => src}/components/drawer.jsx (100%) rename mobile/traque-app/{ => src}/components/image.jsx (100%) rename mobile/traque-app/{ => src}/components/input.jsx (100%) rename mobile/traque-app/{ => src}/components/layer.jsx (100%) rename mobile/traque-app/{ => src}/components/map.jsx (100%) rename mobile/traque-app/{ => src}/components/stat.jsx (100%) rename mobile/traque-app/{ => src}/components/timer.jsx (100%) rename mobile/traque-app/{ => src}/constants/colors.js (100%) rename mobile/traque-app/{ => src}/constants/config.js (100%) rename mobile/traque-app/{ => src}/constants/game.js (100%) rename mobile/traque-app/{ => src}/constants/index.js (100%) rename mobile/traque-app/{ => src}/constants/map.js (100%) rename mobile/traque-app/{ => src}/context/teamConnexionContext.jsx (100%) rename mobile/traque-app/{ => src}/context/teamContext.jsx (100%) rename mobile/traque-app/{ => src}/hook/useGame.jsx (100%) rename mobile/traque-app/{ => src}/hook/useLocalStorage.jsx (100%) rename mobile/traque-app/{ => src}/hook/useLocation.jsx (100%) rename mobile/traque-app/{ => src}/hook/usePickImage.jsx (100%) rename mobile/traque-app/{ => src}/hook/useSendDeviceInfo.jsx (100%) rename mobile/traque-app/{ => src}/hook/useSocketAuth.jsx (100%) rename mobile/traque-app/{ => src}/hook/useTimeDifference.jsx (100%) rename mobile/traque-app/{ => src}/services/backgroundLocationTask.js (100%) rename mobile/traque-app/{ => src}/services/imageService.js (100%) rename mobile/traque-app/{ => src}/services/socket.js (100%) rename mobile/traque-app/{ => src}/services/socketEmitter.js (100%) rename mobile/traque-app/{ => src}/util/functions.js (100%) diff --git a/mobile/traque-app/app.json b/mobile/traque-app/app.json index 1bee4fb..9d454f7 100644 --- a/mobile/traque-app/app.json +++ b/mobile/traque-app/app.json @@ -18,9 +18,9 @@ "slug": "la-traque", "version": "1.0.0", "orientation": "portrait", - "icon": "./assets/images/logo/logo_traque.png", + "icon": "./src/assets/images/logo/logo_traque.png", "splash": { - "image": "./assets/images/logo/logo_traque.png", + "image": "./src/assets/images/logo/logo_traque.png", "resizeMode": "contain", "backgroundColor": "#ffffff" }, diff --git a/mobile/traque-app/app/_layout.jsx b/mobile/traque-app/app/_layout.jsx index 2ec2090..d9c319c 100644 --- a/mobile/traque-app/app/_layout.jsx +++ b/mobile/traque-app/app/_layout.jsx @@ -1,8 +1,8 @@ // Expo import { Slot } from 'expo-router'; // Contexts -import { TeamConnexionProvider } from "../context/teamConnexionContext"; -import { TeamProvider } from "../context/teamContext"; +import { TeamConnexionProvider } from "../src/context/teamConnexionContext"; +import { TeamProvider } from "../src/context/teamContext"; const Layout = () => { return ( diff --git a/mobile/traque-app/app/index.jsx b/mobile/traque-app/app/index.jsx index a9a1c3a..1b3bfef 100644 --- a/mobile/traque-app/app/index.jsx +++ b/mobile/traque-app/app/index.jsx @@ -4,18 +4,18 @@ import { ScrollView, View, Text, StyleSheet, Image, Alert } from 'react-native'; // Expo import { useRouter } from 'expo-router'; // Components -import { CustomButton } from '../components/button'; -import { CustomImage } from '../components/image'; -import { CustomTextInput } from '../components/input'; +import { CustomButton } from '../src/components/button'; +import { CustomImage } from '../src/components/image'; +import { CustomTextInput } from '../src/components/input'; // Contexts -import { useTeamConnexion } from "../context/teamConnexionContext"; +import { useTeamConnexion } from "../src/context/teamConnexionContext"; // Hooks -import { usePickImage } from '../hook/usePickImage'; +import { usePickImage } from '../src/hook/usePickImage'; // Services -import { uploadTeamImage } from '../services/imageService'; -import { getLocationAuthorization, stopLocationTracking } from '../services/backgroundLocationTask'; +import { uploadTeamImage } from '../src/services/imageService'; +import { getLocationAuthorization, stopLocationTracking } from '../src/services/backgroundLocationTask'; // Constants -import { COLORS } from '../constants'; +import { COLORS } from '../src/constants'; const Index = () => { const router = useRouter(); @@ -68,7 +68,7 @@ const Index = () => { - + LA TRAQUE @@ -77,7 +77,7 @@ const Index = () => { Appuyer pour changer la photo d'équipe (Le haut du corps doit être visible) - + diff --git a/mobile/traque-app/app/interface.jsx b/mobile/traque-app/app/interface.jsx index 6cb3622..b98e4ee 100644 --- a/mobile/traque-app/app/interface.jsx +++ b/mobile/traque-app/app/interface.jsx @@ -4,21 +4,21 @@ import { View, Text, Image, Alert, StyleSheet, TouchableOpacity } from 'react-na // Expo import { useRouter } from 'expo-router'; // Components -import { CustomMap } from '../components/map'; -import { Drawer } from '../components/drawer'; -import { TimerMMSS } from '../components/timer'; +import { CustomMap } from '../src/components/map'; +import { Drawer } from '../src/components/drawer'; +import { TimerMMSS } from '../src/components/timer'; // Contexts -import { useTeamConnexion } from '../context/teamConnexionContext'; -import { useTeamContext } from '../context/teamContext'; +import { useTeamConnexion } from '../src/context/teamConnexionContext'; +import { useTeamContext } from '../src/context/teamContext'; // Hooks -import { useGame } from '../hook/useGame'; -import { useTimeDifference } from '../hook/useTimeDifference'; +import { useGame } from '../src/hook/useGame'; +import { useTimeDifference } from '../src/hook/useTimeDifference'; // Services -import { startLocationTracking } from '../services/backgroundLocationTask'; +import { startLocationTracking } from '../src/services/backgroundLocationTask'; // Util -import { secondsToMMSS } from '../util/functions'; +import { secondsToMMSS } from '../src/util/functions'; // Constants -import { GAME_STATE, COLORS } from '../constants'; +import { GAME_STATE, COLORS } from '../src/constants'; const Interface = () => { const router = useRouter(); @@ -66,10 +66,10 @@ const Interface = () => { - + Alert.alert("Settings")}> - + @@ -99,7 +99,7 @@ const Interface = () => { { gameState == GAME_STATE.PLAYING && !captured && !hasHandicap && - + } { gameState == GAME_STATE.PLAYING && !captured && diff --git a/mobile/traque-app/assets/images/arrow.png b/mobile/traque-app/src/assets/images/arrow.png similarity index 100% rename from mobile/traque-app/assets/images/arrow.png rename to mobile/traque-app/src/assets/images/arrow.png diff --git a/mobile/traque-app/assets/images/battery/black.png b/mobile/traque-app/src/assets/images/battery/black.png similarity index 100% rename from mobile/traque-app/assets/images/battery/black.png rename to mobile/traque-app/src/assets/images/battery/black.png diff --git a/mobile/traque-app/assets/images/battery/green.png b/mobile/traque-app/src/assets/images/battery/green.png similarity index 100% rename from mobile/traque-app/assets/images/battery/green.png rename to mobile/traque-app/src/assets/images/battery/green.png diff --git a/mobile/traque-app/assets/images/battery/red.png b/mobile/traque-app/src/assets/images/battery/red.png similarity index 100% rename from mobile/traque-app/assets/images/battery/red.png rename to mobile/traque-app/src/assets/images/battery/red.png diff --git a/mobile/traque-app/assets/images/centerMap.png b/mobile/traque-app/src/assets/images/centerMap.png similarity index 100% rename from mobile/traque-app/assets/images/centerMap.png rename to mobile/traque-app/src/assets/images/centerMap.png diff --git a/mobile/traque-app/assets/images/cogwheel.png b/mobile/traque-app/src/assets/images/cogwheel.png similarity index 100% rename from mobile/traque-app/assets/images/cogwheel.png rename to mobile/traque-app/src/assets/images/cogwheel.png diff --git a/mobile/traque-app/assets/images/distance.png b/mobile/traque-app/src/assets/images/distance.png similarity index 100% rename from mobile/traque-app/assets/images/distance.png rename to mobile/traque-app/src/assets/images/distance.png diff --git a/mobile/traque-app/assets/images/localisation/black.png b/mobile/traque-app/src/assets/images/localisation/black.png similarity index 100% rename from mobile/traque-app/assets/images/localisation/black.png rename to mobile/traque-app/src/assets/images/localisation/black.png diff --git a/mobile/traque-app/assets/images/localisation/green.png b/mobile/traque-app/src/assets/images/localisation/green.png similarity index 100% rename from mobile/traque-app/assets/images/localisation/green.png rename to mobile/traque-app/src/assets/images/localisation/green.png diff --git a/mobile/traque-app/assets/images/localisation/red.png b/mobile/traque-app/src/assets/images/localisation/red.png similarity index 100% rename from mobile/traque-app/assets/images/localisation/red.png rename to mobile/traque-app/src/assets/images/localisation/red.png diff --git a/mobile/traque-app/assets/images/logo/logo_traque.png b/mobile/traque-app/src/assets/images/logo/logo_traque.png similarity index 100% rename from mobile/traque-app/assets/images/logo/logo_traque.png rename to mobile/traque-app/src/assets/images/logo/logo_traque.png diff --git a/mobile/traque-app/assets/images/logout.png b/mobile/traque-app/src/assets/images/logout.png similarity index 100% rename from mobile/traque-app/assets/images/logout.png rename to mobile/traque-app/src/assets/images/logout.png diff --git a/mobile/traque-app/assets/images/marker/blue.png b/mobile/traque-app/src/assets/images/marker/blue.png similarity index 100% rename from mobile/traque-app/assets/images/marker/blue.png rename to mobile/traque-app/src/assets/images/marker/blue.png diff --git a/mobile/traque-app/assets/images/marker/grey.png b/mobile/traque-app/src/assets/images/marker/grey.png similarity index 100% rename from mobile/traque-app/assets/images/marker/grey.png rename to mobile/traque-app/src/assets/images/marker/grey.png diff --git a/mobile/traque-app/assets/images/marker/red.png b/mobile/traque-app/src/assets/images/marker/red.png similarity index 100% rename from mobile/traque-app/assets/images/marker/red.png rename to mobile/traque-app/src/assets/images/marker/red.png diff --git a/mobile/traque-app/assets/images/missing_image.jpg b/mobile/traque-app/src/assets/images/missing_image.jpg similarity index 100% rename from mobile/traque-app/assets/images/missing_image.jpg rename to mobile/traque-app/src/assets/images/missing_image.jpg diff --git a/mobile/traque-app/assets/images/observed.png b/mobile/traque-app/src/assets/images/observed.png similarity index 100% rename from mobile/traque-app/assets/images/observed.png rename to mobile/traque-app/src/assets/images/observed.png diff --git a/mobile/traque-app/assets/images/path.png b/mobile/traque-app/src/assets/images/path.png similarity index 100% rename from mobile/traque-app/assets/images/path.png rename to mobile/traque-app/src/assets/images/path.png diff --git a/mobile/traque-app/assets/images/placement.png b/mobile/traque-app/src/assets/images/placement.png similarity index 100% rename from mobile/traque-app/assets/images/placement.png rename to mobile/traque-app/src/assets/images/placement.png diff --git a/mobile/traque-app/assets/images/running.jpg b/mobile/traque-app/src/assets/images/running.jpg similarity index 100% rename from mobile/traque-app/assets/images/running.jpg rename to mobile/traque-app/src/assets/images/running.jpg diff --git a/mobile/traque-app/assets/images/running.png b/mobile/traque-app/src/assets/images/running.png similarity index 100% rename from mobile/traque-app/assets/images/running.png rename to mobile/traque-app/src/assets/images/running.png diff --git a/mobile/traque-app/assets/images/target/black.png b/mobile/traque-app/src/assets/images/target/black.png similarity index 100% rename from mobile/traque-app/assets/images/target/black.png rename to mobile/traque-app/src/assets/images/target/black.png diff --git a/mobile/traque-app/assets/images/target/white.png b/mobile/traque-app/src/assets/images/target/white.png similarity index 100% rename from mobile/traque-app/assets/images/target/white.png rename to mobile/traque-app/src/assets/images/target/white.png diff --git a/mobile/traque-app/assets/images/time.png b/mobile/traque-app/src/assets/images/time.png similarity index 100% rename from mobile/traque-app/assets/images/time.png rename to mobile/traque-app/src/assets/images/time.png diff --git a/mobile/traque-app/assets/images/update_position.png b/mobile/traque-app/src/assets/images/update_position.png similarity index 100% rename from mobile/traque-app/assets/images/update_position.png rename to mobile/traque-app/src/assets/images/update_position.png diff --git a/mobile/traque-app/components/button.jsx b/mobile/traque-app/src/components/button.jsx similarity index 100% rename from mobile/traque-app/components/button.jsx rename to mobile/traque-app/src/components/button.jsx diff --git a/mobile/traque-app/components/drawer.jsx b/mobile/traque-app/src/components/drawer.jsx similarity index 100% rename from mobile/traque-app/components/drawer.jsx rename to mobile/traque-app/src/components/drawer.jsx diff --git a/mobile/traque-app/components/image.jsx b/mobile/traque-app/src/components/image.jsx similarity index 100% rename from mobile/traque-app/components/image.jsx rename to mobile/traque-app/src/components/image.jsx diff --git a/mobile/traque-app/components/input.jsx b/mobile/traque-app/src/components/input.jsx similarity index 100% rename from mobile/traque-app/components/input.jsx rename to mobile/traque-app/src/components/input.jsx diff --git a/mobile/traque-app/components/layer.jsx b/mobile/traque-app/src/components/layer.jsx similarity index 100% rename from mobile/traque-app/components/layer.jsx rename to mobile/traque-app/src/components/layer.jsx diff --git a/mobile/traque-app/components/map.jsx b/mobile/traque-app/src/components/map.jsx similarity index 100% rename from mobile/traque-app/components/map.jsx rename to mobile/traque-app/src/components/map.jsx diff --git a/mobile/traque-app/components/stat.jsx b/mobile/traque-app/src/components/stat.jsx similarity index 100% rename from mobile/traque-app/components/stat.jsx rename to mobile/traque-app/src/components/stat.jsx diff --git a/mobile/traque-app/components/timer.jsx b/mobile/traque-app/src/components/timer.jsx similarity index 100% rename from mobile/traque-app/components/timer.jsx rename to mobile/traque-app/src/components/timer.jsx diff --git a/mobile/traque-app/constants/colors.js b/mobile/traque-app/src/constants/colors.js similarity index 100% rename from mobile/traque-app/constants/colors.js rename to mobile/traque-app/src/constants/colors.js diff --git a/mobile/traque-app/constants/config.js b/mobile/traque-app/src/constants/config.js similarity index 100% rename from mobile/traque-app/constants/config.js rename to mobile/traque-app/src/constants/config.js diff --git a/mobile/traque-app/constants/game.js b/mobile/traque-app/src/constants/game.js similarity index 100% rename from mobile/traque-app/constants/game.js rename to mobile/traque-app/src/constants/game.js diff --git a/mobile/traque-app/constants/index.js b/mobile/traque-app/src/constants/index.js similarity index 100% rename from mobile/traque-app/constants/index.js rename to mobile/traque-app/src/constants/index.js diff --git a/mobile/traque-app/constants/map.js b/mobile/traque-app/src/constants/map.js similarity index 100% rename from mobile/traque-app/constants/map.js rename to mobile/traque-app/src/constants/map.js diff --git a/mobile/traque-app/context/teamConnexionContext.jsx b/mobile/traque-app/src/context/teamConnexionContext.jsx similarity index 100% rename from mobile/traque-app/context/teamConnexionContext.jsx rename to mobile/traque-app/src/context/teamConnexionContext.jsx diff --git a/mobile/traque-app/context/teamContext.jsx b/mobile/traque-app/src/context/teamContext.jsx similarity index 100% rename from mobile/traque-app/context/teamContext.jsx rename to mobile/traque-app/src/context/teamContext.jsx diff --git a/mobile/traque-app/hook/useGame.jsx b/mobile/traque-app/src/hook/useGame.jsx similarity index 100% rename from mobile/traque-app/hook/useGame.jsx rename to mobile/traque-app/src/hook/useGame.jsx diff --git a/mobile/traque-app/hook/useLocalStorage.jsx b/mobile/traque-app/src/hook/useLocalStorage.jsx similarity index 100% rename from mobile/traque-app/hook/useLocalStorage.jsx rename to mobile/traque-app/src/hook/useLocalStorage.jsx diff --git a/mobile/traque-app/hook/useLocation.jsx b/mobile/traque-app/src/hook/useLocation.jsx similarity index 100% rename from mobile/traque-app/hook/useLocation.jsx rename to mobile/traque-app/src/hook/useLocation.jsx diff --git a/mobile/traque-app/hook/usePickImage.jsx b/mobile/traque-app/src/hook/usePickImage.jsx similarity index 100% rename from mobile/traque-app/hook/usePickImage.jsx rename to mobile/traque-app/src/hook/usePickImage.jsx diff --git a/mobile/traque-app/hook/useSendDeviceInfo.jsx b/mobile/traque-app/src/hook/useSendDeviceInfo.jsx similarity index 100% rename from mobile/traque-app/hook/useSendDeviceInfo.jsx rename to mobile/traque-app/src/hook/useSendDeviceInfo.jsx diff --git a/mobile/traque-app/hook/useSocketAuth.jsx b/mobile/traque-app/src/hook/useSocketAuth.jsx similarity index 100% rename from mobile/traque-app/hook/useSocketAuth.jsx rename to mobile/traque-app/src/hook/useSocketAuth.jsx diff --git a/mobile/traque-app/hook/useTimeDifference.jsx b/mobile/traque-app/src/hook/useTimeDifference.jsx similarity index 100% rename from mobile/traque-app/hook/useTimeDifference.jsx rename to mobile/traque-app/src/hook/useTimeDifference.jsx diff --git a/mobile/traque-app/services/backgroundLocationTask.js b/mobile/traque-app/src/services/backgroundLocationTask.js similarity index 100% rename from mobile/traque-app/services/backgroundLocationTask.js rename to mobile/traque-app/src/services/backgroundLocationTask.js diff --git a/mobile/traque-app/services/imageService.js b/mobile/traque-app/src/services/imageService.js similarity index 100% rename from mobile/traque-app/services/imageService.js rename to mobile/traque-app/src/services/imageService.js diff --git a/mobile/traque-app/services/socket.js b/mobile/traque-app/src/services/socket.js similarity index 100% rename from mobile/traque-app/services/socket.js rename to mobile/traque-app/src/services/socket.js diff --git a/mobile/traque-app/services/socketEmitter.js b/mobile/traque-app/src/services/socketEmitter.js similarity index 100% rename from mobile/traque-app/services/socketEmitter.js rename to mobile/traque-app/src/services/socketEmitter.js diff --git a/mobile/traque-app/util/functions.js b/mobile/traque-app/src/util/functions.js similarity index 100% rename from mobile/traque-app/util/functions.js rename to mobile/traque-app/src/util/functions.js