diff --git a/afaire.txt b/afaire.txt new file mode 100644 index 00000000..e31ae7e6 --- /dev/null +++ b/afaire.txt @@ -0,0 +1,3 @@ +suppr la page register +rajouter la modification de mot de passe +les notif sur l'app web diff --git a/ansible/playbook-fail2ban.yml b/ansible/playbook-fail2ban.yml index 0c6e3bf0..90a087f6 100644 --- a/ansible/playbook-fail2ban.yml +++ b/ansible/playbook-fail2ban.yml @@ -8,10 +8,10 @@ gather_facts: true vars: - fail2ban_bantime: "1h" - fail2ban_findtime: "10m" - fail2ban_maxretry: 5 - fail2ban_ignoreip: "127.0.0.1/8 ::1" + fail2ban_bantime: "1h" + fail2ban_findtime: "10m" + fail2ban_maxretry: 5 + fail2ban_ignoreip: "127.0.0.1/8 ::1" tasks: # ============================================================ diff --git a/backend/gestion/middleware/clock_middleware.go b/backend/gestion/middleware/clock_middleware.go index 599e3f28..24b99d5d 100644 --- a/backend/gestion/middleware/clock_middleware.go +++ b/backend/gestion/middleware/clock_middleware.go @@ -8,16 +8,14 @@ import ( "github.com/gin-gonic/gin" ) -// OrderHoursMiddleware bloque les commandes en dehors de la plage 13h55 - 23h30. func OrderHoursMiddleware(c *gin.Context) { now := time.Now() hour := now.Hour() min := now.Minute() - // Convertir l'heure courante en minutes depuis minuit pour faciliter la comparaison currentMinutes := hour*60 + min - openMinutes := 13*60 + 55 // 13h55 - closeMinutes := 23*60 + 30 // 23h30 + openMinutes := 13*60 + 55 + closeMinutes := 23*60 + 30 if currentMinutes < openMinutes || currentMinutes >= closeMinutes { log.Printf("❌ [CLOCK-MWARE] Commande refusée à %02d:%02d (plage autorisée: 13h55 - 23h30)", hour, min) diff --git a/frontend-admin/node_modules/.package-lock.json b/frontend-admin/node_modules/.package-lock.json index 5bdb0f45..71c5a0ad 100644 --- a/frontend-admin/node_modules/.package-lock.json +++ b/frontend-admin/node_modules/.package-lock.json @@ -2079,6 +2079,18 @@ "react-native": "^0.0.0-0 || >=0.65 <1.0" } }, + "node_modules/@react-native-community/geolocation": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@react-native-community/geolocation/-/geolocation-3.4.0.tgz", + "integrity": "sha512-bzZH89/cwmpkPMKKveoC72C4JH0yF4St5Ceg/ZM9pA1SqX9MlRIrIrrOGZ/+yi++xAvFDiYfihtn9TvXWU9/rA==", + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/@react-native/assets-registry": { "version": "0.81.5", "resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.81.5.tgz", @@ -6614,11 +6626,6 @@ } } }, - "node_modules/react-native-geolocation-service": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/react-native-geolocation-service/-/react-native-geolocation-service-5.3.1.tgz", - "integrity": "sha512-LTXPtPNmrdhx+yeWG47sAaCgQc3nG1z+HLLHlhK/5YfOgfLcAb9HAkhREPjQKPZOUx8pKZMIpdGFUGfJYtimXQ==" - }, "node_modules/react-native-gesture-handler": { "version": "2.28.0", "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.28.0.tgz", diff --git a/frontend-admin/package-lock.json b/frontend-admin/package-lock.json index 5c08de55..a5c186c6 100644 --- a/frontend-admin/package-lock.json +++ b/frontend-admin/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@expo/vector-icons": "^15.0.3", "@react-native-async-storage/async-storage": "2.2.0", + "@react-native-community/geolocation": "^3.4.0", "@react-navigation/bottom-tabs": "^7.10.1", "@react-navigation/native": "^7.1.28", "@react-navigation/native-stack": "^7.11.0", @@ -24,7 +25,6 @@ "react": "19.1.0", "react-dom": "19.1.0", "react-native": "0.81.5", - "react-native-geolocation-service": "^5.3.1", "react-native-gesture-handler": "~2.28.0", "react-native-maps": "1.20.1", "react-native-reanimated": "~4.1.1", @@ -2245,6 +2245,18 @@ "react-native": "^0.0.0-0 || >=0.65 <1.0" } }, + "node_modules/@react-native-community/geolocation": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@react-native-community/geolocation/-/geolocation-3.4.0.tgz", + "integrity": "sha512-bzZH89/cwmpkPMKKveoC72C4JH0yF4St5Ceg/ZM9pA1SqX9MlRIrIrrOGZ/+yi++xAvFDiYfihtn9TvXWU9/rA==", + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/@react-native/assets-registry": { "version": "0.81.5", "resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.81.5.tgz", @@ -6964,11 +6976,6 @@ } } }, - "node_modules/react-native-geolocation-service": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/react-native-geolocation-service/-/react-native-geolocation-service-5.3.1.tgz", - "integrity": "sha512-LTXPtPNmrdhx+yeWG47sAaCgQc3nG1z+HLLHlhK/5YfOgfLcAb9HAkhREPjQKPZOUx8pKZMIpdGFUGfJYtimXQ==" - }, "node_modules/react-native-gesture-handler": { "version": "2.28.0", "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.28.0.tgz", diff --git a/frontend-admin/package.json b/frontend-admin/package.json index 5b9811db..0b68df2f 100644 --- a/frontend-admin/package.json +++ b/frontend-admin/package.json @@ -11,6 +11,7 @@ "dependencies": { "@expo/vector-icons": "^15.0.3", "@react-native-async-storage/async-storage": "2.2.0", + "@react-native-community/geolocation": "^3.4.0", "@react-navigation/bottom-tabs": "^7.10.1", "@react-navigation/native": "^7.1.28", "@react-navigation/native-stack": "^7.11.0", @@ -25,7 +26,6 @@ "react": "19.1.0", "react-dom": "19.1.0", "react-native": "0.81.5", - "react-native-geolocation-service": "^5.3.1", "react-native-gesture-handler": "~2.28.0", "react-native-maps": "1.20.1", "react-native-reanimated": "~4.1.1", diff --git a/frontend-admin/src/screens/delivery/DashboardScreen.tsx b/frontend-admin/src/screens/delivery/DashboardScreen.tsx index 54c814dd..70a666d6 100644 --- a/frontend-admin/src/screens/delivery/DashboardScreen.tsx +++ b/frontend-admin/src/screens/delivery/DashboardScreen.tsx @@ -22,7 +22,7 @@ import { Platform, PermissionsAndroid, } from "react-native"; -import Geolocation from "react-native-geolocation-service"; +import Geolocation from "@react-native-community/geolocation"; import { Ionicons } from "@expo/vector-icons"; import * as Location from "expo-location"; import { spacing, fontSize, borderRadius } from "../../theme"; @@ -326,8 +326,6 @@ export default function DashboardScreen() { enableHighAccuracy: true, timeout: 30000, maximumAge: 10000, - forceRequestLocation: true, - forceLocationManager: true, }, ); }); diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..6661081d --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "projet_gestion_commande", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/package.json b/package.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/package.json @@ -0,0 +1 @@ +{}