diff --git a/frontend-admin/src/api/api_cabine.ts b/frontend-admin/src/api/api_cabine.ts index b89b8105..628a5785 100644 --- a/frontend-admin/src/api/api_cabine.ts +++ b/frontend-admin/src/api/api_cabine.ts @@ -74,7 +74,7 @@ export const resetClientPenalties = async (clientUsername: string) => { return { success: true, message: data.message }; }; -// pool: 0 = pool principal (point), 1 = pool secondaire (point_zipette), -1 = tous +// pool: index dans pool_names/pool_keys, -1 = reset tous les points export const resetClientPoints = async ( clientUsername: string, pool: number = -1, diff --git a/frontend-admin/src/navigation/DeliveryNavigator.tsx b/frontend-admin/src/navigation/DeliveryNavigator.tsx index b914d79e..8086a168 100644 --- a/frontend-admin/src/navigation/DeliveryNavigator.tsx +++ b/frontend-admin/src/navigation/DeliveryNavigator.tsx @@ -17,7 +17,7 @@ import { markLivreurNotificationsRead, } from "../api/api_delivery"; import type { LivreurNotification } from "../api/api_delivery"; -import { fontSize, spacing, borderRadius } from "../theme"; +import { fontSize, spacing } from "../theme"; import type { DeliveryTabParamList } from "./types"; import DashboardScreen from "../screens/delivery/DashboardScreen"; @@ -214,31 +214,15 @@ export default function DeliveryNavigator() { - {/* Header modal */} - - - - - Notifications - - + + + Notifications + setShowModal(false)}> - - {/* Liste */} - + {notifications.length === 0 ? ( ( {n.message} @@ -322,45 +303,48 @@ const styles = StyleSheet.create({ }, overlay: { flex: 1, - justifyContent: "flex-end", backgroundColor: "rgba(0,0,0,0.5)", + justifyContent: "flex-end", }, modalContent: { - height: "70%", - borderTopLeftRadius: borderRadius.lg, - borderTopRightRadius: borderRadius.lg, + borderTopLeftRadius: 16, + borderTopRightRadius: 16, + maxHeight: "70%", + paddingBottom: 32, }, modalHeader: { flexDirection: "row", justifyContent: "space-between", alignItems: "center", - padding: spacing.l, + padding: 16, borderBottomWidth: 1, - }, - modalTitleRow: { - flexDirection: "row", - alignItems: "center", - gap: spacing.s, + borderBottomColor: "rgba(255,255,255,0.1)", }, modalTitle: { - fontSize: fontSize.lg, + fontSize: 18, fontWeight: "bold", }, + notifList: { + padding: 12, + }, emptyText: { textAlign: "center", - marginTop: spacing.xl, - fontSize: fontSize.sm, + marginTop: 32, + fontSize: 14, }, notifItem: { - padding: spacing.m, - borderBottomWidth: 1, borderLeftWidth: 3, + paddingLeft: 12, + paddingVertical: 10, + marginBottom: 8, + borderRadius: 4, + paddingRight: 8, }, notifMessage: { - fontSize: fontSize.sm, - marginBottom: spacing.xs, + fontSize: 14, }, notifTime: { - fontSize: fontSize.xs, + fontSize: 12, + marginTop: 4, }, });