Xor290/projet_gestion_commande
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: update icon

Browse Source
This commit is contained in:
Xor290
2026-03-01 14:38:31 +01:00
parent 96daad954e
commit 5ac024cc70
3 changed files with 193 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/assets/icon.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 952 KiB

After

Width:  |  Height:  |  Size: 761 KiB

mobile/src/context/CartContext.tsx
+71 -33
View File
@@ -1,29 +1,38 @@
import React, { createContext, useContext, useState, useEffect, useCallback, type ReactNode } from 'react';
import React, {
createContext,
useContext,
useState,
useEffect,
useCallback,
type ReactNode,
} from "react";
import {
getCart, addToCart as apiAddToCart,
removeFromCart as apiRemoveFromCart, clearCart as apiClearCart,
} from '../api/api';
import { getToken } from '../auth/tokenStorage';
import { extractUsernameFromToken } from '../auth/jwtUtils';
getCart,
addToCart as apiAddToCart,
removeFromCart as apiRemoveFromCart,
clearCart as apiClearCart,
} from "../api/api";
import { getToken } from "../auth/tokenStorage";
import { extractUsernameFromToken } from "../auth/jwtUtils";
export interface CartItem {
id: number;
product_id: number;
name_product: string;
price: number;
quantity: number; // grammes
quantity: number;
category: string;
image?: string;
}
interface ToastData {
message: string;
type: 'success' | 'error' | 'warning' | 'info';
type: "success" | "error" | "warning" | "info";
}
interface CartContextType {
cartItems: CartItem[];
addToCart: (item: Omit<CartItem, 'id'>) => Promise<void>;
addToCart: (item: Omit<CartItem, "id">) => Promise<void>;
removeFromCart: (id: number) => Promise<void>;
clearCart: () => Promise<void>;
cartCount: number;
@@ -43,7 +52,10 @@ export function CartProvider({ children }: { children: ReactNode }) {
const [toast, setToast] = useState<ToastData | null>(null);
const [isAuthenticated, setIsAuthenticated] = useState(false);
const showToast = (message: string, type: ToastData['type'] = 'success') => {
const showToast = (
message: string,
type: ToastData["type"] = "success",
) => {
setToast({ message, type });
setTimeout(() => setToast(null), 3000);
};
@@ -71,10 +83,11 @@ export function CartProvider({ children }: { children: ReactNode }) {
const items: CartItem[] = response.panier.map((item: any) => ({
id: item.id,
product_id: item.product_id,
name_product: item.product_name || item.name_product || 'Produit',
name_product:
item.product_name || item.name_product || "Produit",
price: item.price,
quantity: item.quantity,
category: (item.category || 'autre').toLowerCase().trim(),
category: (item.category || "autre").toLowerCase().trim(),
image: item.image,
}));
setCartItems(items);
@@ -92,34 +105,42 @@ export function CartProvider({ children }: { children: ReactNode }) {
refreshCart();
}, [refreshCart]);
const addToCart = async (item: Omit<CartItem, 'id'>) => {
const addToCart = async (item: Omit<CartItem, "id">) => {
const username = await getUsername();
if (!username) {
showToast('Vous devez être connecté.', 'warning');
showToast("Vous devez être connecté.", "warning");
return;
}
if (!item.quantity || item.quantity <= 0) {
showToast('Quantité invalide', 'error');
showToast("Quantité invalide", "error");
return;
}
const cleanName = (item.name_product || 'Produit').replace(/\s*\([^)]*\)\s*/g, '').trim();
const cleanName = (item.name_product || "Produit")
.replace(/\s*\([^)]*\)\s*/g, "")
.trim();
setLoading(true);
try {
const response = await apiAddToCart({
username,
name_product: cleanName,
category: (item.category || 'autre').toLowerCase().trim(),
category: (item.category || "autre").toLowerCase().trim(),
quantity: Number(item.quantity),
price: Number(item.price) || 0,
});
if (response.success) {
await refreshCart();
showToast(`${cleanName} (${item.quantity}g) ajouté !`, 'success');
showToast(
`${cleanName} (${item.quantity}g) ajouté !`,
"success",
);
} else {
showToast(response.message || "Erreur lors de l'ajout", 'error');
showToast(
response.message || "Erreur lors de l'ajout",
"error",
);
}
} catch {
showToast("Erreur lors de l'ajout", 'error');
showToast("Erreur lors de l'ajout", "error");
} finally {
setLoading(false);
}
@@ -127,18 +148,21 @@ export function CartProvider({ children }: { children: ReactNode }) {
const removeFromCart = async (id: number) => {
const username = await getUsername();
if (!username) { showToast('Vous devez être connecté.', 'warning'); return; }
if (!username) {
showToast("Vous devez être connecté.", "warning");
return;
}
setLoading(true);
try {
const response = await apiRemoveFromCart(id, username);
if (response.success) {
await refreshCart();
showToast('Produit supprimé', 'success');
showToast("Produit supprimé", "success");
} else {
showToast(response.message || 'Erreur suppression', 'error');
showToast(response.message || "Erreur suppression", "error");
}
} catch {
showToast('Erreur suppression', 'error');
showToast("Erreur suppression", "error");
} finally {
setLoading(false);
}
@@ -146,18 +170,21 @@ export function CartProvider({ children }: { children: ReactNode }) {
const clearCartAction = async () => {
const username = await getUsername();
if (!username) { showToast('Vous devez être connecté.', 'warning'); return; }
if (!username) {
showToast("Vous devez être connecté.", "warning");
return;
}
setLoading(true);
try {
const response = await apiClearCart(username);
if (response.success) {
setCartItems([]);
showToast(response.message || 'Panier vidé', 'success');
showToast(response.message || "Panier vidé", "success");
} else {
showToast(response.message || 'Erreur vidage', 'error');
showToast(response.message || "Erreur vidage", "error");
}
} catch {
showToast('Erreur vidage', 'error');
showToast("Erreur vidage", "error");
} finally {
setLoading(false);
}
@@ -167,10 +194,21 @@ export function CartProvider({ children }: { children: ReactNode }) {
const cartTotal = cartItems.reduce((sum, item) => sum + item.price, 0);
return (
<CartContext.Provider value={{
cartItems, addToCart, removeFromCart, clearCart: clearCartAction,
cartCount, cartTotal, loading, refreshCart, toast, clearToast, isAuthenticated,
}}>
<CartContext.Provider
value={{
cartItems,
addToCart,
removeFromCart,
clearCart: clearCartAction,
cartCount,
cartTotal,
loading,
refreshCart,
toast,
clearToast,
isAuthenticated,
}}
>
{children}
</CartContext.Provider>
);
@@ -178,6 +216,6 @@ export function CartProvider({ children }: { children: ReactNode }) {
export function useCart() {
const context = useContext(CartContext);
if (!context) throw new Error('useCart must be used within a CartProvider');
if (!context) throw new Error("useCart must be used within a CartProvider");
return context;
}
mobile/src/navigation/ClientNavigator.tsx
-4
View File
@@ -67,7 +67,6 @@ function ClientTabs() {
const navigation = useNavigation<any>();
const [notifModalVisible, setNotifModalVisible] = useState(false);
// Naviguer vers le suivi quand on tap une push notification
useEffect(() => {
if (navigateToOrder) {
setNotifModalVisible(false);
@@ -77,7 +76,6 @@ function ClientTabs() {
}, [navigateToOrder, navigation, clearNavigateToOrder]);
const handleLogout = async () => {
// Supprimer le push token du backend avant logout
if (pushToken) {
await removePushTokenFromBackend(pushToken);
}
@@ -137,7 +135,6 @@ function ClientTabs() {
gap: spacing.m,
}}
>
{/* Cloche notifications */}
<TouchableOpacity
onPress={openNotifModal}
style={{ position: "relative" }}
@@ -247,7 +244,6 @@ function ClientTabs() {
/>
</Tab.Navigator>
{/* Modal notifications */}
<Modal
visible={notifModalVisible}
animationType="slide"