Skip to content
Extraits de code Groupes Projets
Valider 9a007e0d rédigé par nabil.drissi's avatar nabil.drissi
Parcourir les fichiers

resolve retour excel client

parent c88081b7
Branches
2 requêtes de fusion!311Develop,!306Feature/retour orthographe client
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 144 ajouts et 77 suppressions
public/assets/icons/navbar/ic_achats.svg 0 → 100644
+ 5
− 0
Voir le fichier @ 9a007e0d
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path opacity="0.32" d="M4 6H20C20.5523 6 21 6.44772 21 7C21 7.55228 20.5523 8 20 8H4C3.44772 8 3 7.55228 3 7C3 6.44772 3.44772 6 4 6Z" fill="#1877F2"/>
<path d="M3 8V17C3 18.1046 3.89543 19 5 19H19C20.1046 19 21 18.1046 21 17V8H3Z" fill="#1877F2"/>
<path opacity="0.32" d="M12 2C13.1046 2 14 2.89543 14 4V6C14 6.55228 13.5523 7 13 7H11C10.4477 7 10 6.55228 10 6V4C10 2.89543 10.8954 2 12 2Z" fill="#1877F2"/>
</svg>
\ No newline at end of file
public/assets/icons/navbar/ic_bonachats.svg 0 → 100644
+ 5
− 0
Voir le fichier @ 9a007e0d
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path opacity="0.32" d="M3 7H21C21.5523 7 22 7.44772 22 8V16C22 16.5523 21.5523 17 21 17H3C2.44772 17 2 16.5523 2 16V8C2 7.44772 2.44772 7 3 7Z" fill="#1877F2"/>
<path d="M7 10V14C7 14.5523 7.44772 15 8 15H16C16.5523 15 17 14.5523 17 14V10C17 9.44772 16.5523 9 16 9H8C7.44772 9 7 9.44772 7 10Z" fill="#1877F2"/>
<path opacity="0.32" d="M2 6H22V8H2V6Z" fill="#1877F2"/>
</svg>
\ No newline at end of file
public/assets/icons/navbar/ic_cartecadeaux.svg 0 → 100644
+ 5
− 0
Voir le fichier @ 9a007e0d
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path opacity="0.32" d="M5 4H19C19.5523 4 20 4.44772 20 5V19C20 19.5523 19.5523 20 19 20H5C4.44772 20 4 19.5523 4 19V5C4 4.44772 4.44772 4 5 4Z" fill="#1877F2"/>
<path d="M3 6H21V18H3V6Z" fill="#1877F2"/>
<path opacity="0.32" d="M7 8H17C17.5523 8 18 8.44772 18 9V15C18 15.5523 17.5523 16 17 16H7C6.44772 16 6 15.5523 6 15V9C6 8.44772 6.44772 8 7 8Z" fill="#1877F2"/>
</svg>
\ No newline at end of file
public/assets/icons/navbar/ic_commentaire.svg 0 → 100644
+ 5
− 0
Voir le fichier @ 9a007e0d
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path opacity="0.32" d="M3 8H21C21.5523 8 22 8.44772 22 9V17C22 17.5523 21.5523 18 21 18H3C2.44772 18 2 17.5523 2 17V9C2 8.44772 2.44772 8 3 8Z" fill="#1877F2"/>
<path d="M12 2C13.1046 2 14 2.89543 14 4V6C14 6.55228 13.5523 7 13 7H11C10.4477 7 10 6.55228 10 6V4C10 2.89543 10.8954 2 12 2Z" fill="#1877F2"/>
<path opacity="0.32" d="M6 9H18V11H6V9Z" fill="#1877F2"/>
</svg>
\ No newline at end of file
public/assets/icons/navbar/ic_fournisseurs.svg 0 → 100644
+ 6
− 0
Voir le fichier @ 9a007e0d
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path opacity="0.32" d="M4 6H20C20.5523 6 21 6.44772 21 7V17C21 17.5523 20.5523 18 20 18H4C3.44772 18 3 17.5523 3 17V7C3 6.44772 3.44772 6 4 6Z" fill="#1877F2"/>
<path d="M6 4V6H18V4H6Z" fill="#1877F2"/>
<path opacity="0.32" d="M9 11H15V14H9V11Z" fill="#1877F2"/>
<path d="M12 2C13.1046 2 14 2.89543 14 4V6C14 6.55228 13.5523 7 13 7H11C10.4477 7 10 6.55228 10 6V4C10 2.89543 10.8954 2 12 2Z" fill="#1877F2"/>
</svg>
\ No newline at end of file
public/assets/icons/navbar/ic_livraison.svg 0 → 100644
+ 11
− 0
Voir le fichier @ 9a007e0d
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
opacity="0.32"
fill-rule="evenodd"
clip-rule="evenodd"
d="M2 4C2 3.45 2.45 3 3 3H15C15.55 3 16 3.45 16 4V16C16 16.55 15.55 17 15 17H3C2.45 17 2 16.55 2 16V4ZM13 6H4V8H13V6ZM4 10H10V12H4V10Z"
fill="#1877F2"/>
<path
d="M18 8H16V16C16 16.55 15.55 17 15 17H3C2.45 17 2 16.55 2 16V4C2 3.45 2.45 3 3 3H15C15.55 3 16 3.45 16 4V5H18C18.55 5 19 5.45 19 6V10H20C21.1 10 22 10.9 22 12V17C22 18.1 21.1 19 20 19H19C19 20.1 18.1 21 17 21C15.9 21 15 20.1 15 19H9C9 20.1 8.1 21 7 21C5.9 21 5 20.1 5 19H4C2.9 19 2 18.1 2 17V16H3C3 17.1 3.9 18 5 18C6.1 18 7 17.1 7 16H15C15 17.1 15.9 18 17 18C18.1 18 19 17.1 19 16H20C20.55 16 21 15.55 21 15V13C21 12.45 20.55 12 20 12H18V8ZM18 10H20V13H18V10Z"
fill="#1877F2"/>
</svg>
\ No newline at end of file
public/assets/icons/navbar/ic_promotions.svg 0 → 100644
+ 11
− 0
Voir le fichier @ 9a007e0d
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
opacity="0.32"
fill-rule="evenodd"
clip-rule="evenodd"
d="M12 2C10.9 2 10 2.9 10 4V5H7C6.45 5 6 5.45 6 6V8H4C2.9 8 2 8.9 2 10V14C2 15.1 2.9 16 4 16H6V18C6 18.55 6.45 19 7 19H10V20C10 21.1 10.9 22 12 22H14C15.1 22 16 21.1 16 20V19H17C17.55 19 18 18.55 18 18V16H20C21.1 16 22 15.1 22 14V10C22 8.9 21.1 8 20 8H18V6C18 5.45 17.55 5 17 5H14V4C14 2.9 13.1 2 12 2ZM12 4C12.55 4 13 4.45 13 5V7H15C15.55 7 16 7.45 16 8V10H18C18.55 10 19 10.45 19 11V13C19 13.55 18.55 14 18 14H16V16C16 16.55 15.55 17 15 17H13V19C13 19.55 12.55 20 12 20H11C10.45 20 10 19.55 10 19V17H8C7.45 17 7 16.55 7 16V14H5C4.45 14 4 13.55 4 13V11C4 10.45 4.45 10 5 10H7V8C7 7.45 7.45 7 8 7H10V5C10 4.45 10.45 4 11 4H12Z"
fill="#1877F2"/>
<path
d="M15 12L12 9L9 12L12 15L15 12Z"
fill="#1877F2"/>
</svg>
\ No newline at end of file
src/app/dashboard/product/migration/page.tsx
+ 1
− 1
Voir le fichier @ 9a007e0d
......@@ -3,7 +3,7 @@ import MigrationListView from "@/shared/sections/product/migration/migration-lis
// ----------------------------------------------------------------------
export const metadata = {
title: "Dashboard: Migration des Produit",
title: "Dashboard: Migration des produits",
};
export default function ProductMigrationListPage() {
......
src/shared/_mock/map/map-style-basic-v8.json
+ 1
− 1
Voir le fichier @ 9a007e0d
......@@ -443,7 +443,7 @@
"symbol-placement": "line",
"text-field": "{name_en}",
"text-font": ["Open Sans Semibold", "Arial Unicode MS Bold"],
"text-transform": "uppercase",
"text-letter-spacing": 0.1,
"text-size": {
"base": 1.4,
......
src/shared/components/label/styles.ts
+ 1
− 1
Voir le fichier @ 9a007e0d
......@@ -75,7 +75,7 @@ export const StyledLabel = styled(Box)(({
whiteSpace: 'nowrap',
display: 'inline-flex',
justifyContent: 'center',
textTransform: 'capitalize',
textTransform: 'none',
padding: theme.spacing(0, 0.75),
fontSize: theme.typography.pxToRem(12),
fontWeight: theme.typography.fontWeightBold,
......
src/shared/components/nav-section/horizontal/nav-item.tsx
+ 1
− 1
Voir le fichier @ 9a007e0d
......@@ -145,7 +145,7 @@ const StyledNavItem = styled(ListItemButton, {
marginRight: theme.spacing(1),
},
label: {
textTransform: 'capitalize',
textTransform: 'none',
},
caption: {
marginLeft: theme.spacing(0.75),
......
src/shared/components/nav-section/mini/nav-item.tsx
+ 1
− 1
Voir le fichier @ 9a007e0d
......@@ -150,7 +150,7 @@ const StyledNavItem = styled(ListItemButton, {
flexShrink: 0,
},
label: {
textTransform: 'capitalize',
textTransform: 'none',
},
caption: {
color: theme.palette.text.disabled,
......
src/shared/components/nav-section/vertical/nav-item.tsx
+ 1
− 1
Voir le fichier @ 9a007e0d
......@@ -175,7 +175,7 @@ const StyledNavItem = styled(ListItemButton, {
label: {
...noWrapStyles,
...theme.typography.body2,
textTransform: 'capitalize',
textTransform: 'none',
fontWeight: theme.typography[active ? 'fontWeightSemiBold' : 'fontWeightMedium'],
},
caption: {
......
src/shared/layouts/common/account-popover.tsx
+ 5
− 1
Voir le fichier @ 9a007e0d
......@@ -13,6 +13,7 @@ import { ChangingLogingActivity, UserByEmail } from '@/shared/api/user';
import { IUser, RequestLoginActivity, TokenPayload } from '@/shared/types/user';
import { Box, Typography } from '@mui/material';
import { getTokenInfo } from '@/utils/token';
import { paths } from '@/routes/paths';
// ----------------------------------------------------------------------
......@@ -30,6 +31,7 @@ const OPTIONS = [
linkTo: '/#2',
},
];
const link = { title: "Compte", path: paths.dashboard.admin.user.account };
// ----------------------------------------------------------------------
......@@ -139,7 +141,9 @@ export default function AccountPopover() {
<CustomPopover open={popover.open} onClose={popover.onClose} sx={{ width: 200, p: 0 }}>
{/* <Divider sx={{ borderStyle: 'dashed' }} /> */}
<MenuItem onClick={() => handleClickItem(link.path)} sx={{ m: 1 }}>
{link.title}
</MenuItem>
<MenuItem
onClick={handleLogout}
sx={{ m: 1, fontWeight: 'fontWeightBold', color: 'error.main' }}
......
src/shared/layouts/common/searchbar/index.tsx
+ 1
− 1
Voir le fichier @ 9a007e0d
......@@ -141,7 +141,7 @@ function Searchbar() {
<InputBase
fullWidth
autoFocus
placeholder="Search..."
placeholder="Recherche..."
value={searchQuery}
onChange={handleSearch}
startAdornment={
......
src/shared/layouts/dashboard/config-navigation.tsx
+ 78
− 63
Voir le fichier @ 9a007e0d
......@@ -39,6 +39,13 @@ const ICONS = {
dashboard: icon("ic_dashboard"),
driver: icon("ic_driver"),
supplier: icon("ic_supplier"),
commentaire : icon("ic_commentaire"),
fournisseur : icon("ic_fournisseurs"),
achats : icon("ic_achats"),
bonachats: icon("ic_bonachats"),
carteCadeaux : icon("ic_cartecadeaux"),
promotions : icon("ic_promotions"),
livraison: icon("ic_livraison")
};
export function useNavData() {
......@@ -69,7 +76,7 @@ export function useNavData() {
subheader: "MyDressin",
items: [
{
title: "Home",
title: "Acceuil",
path: paths.dashboard.admin.root,
icon: ICONS.dashboard,
},
......@@ -89,12 +96,12 @@ export function useNavData() {
icon: ICONS.product,
children: [
{
title: "Tout les produits",
title: "Tous les produits",
path: paths.dashboard.admin.product.root,
},
{ title: "Ajouter", path: paths.dashboard.admin.product.new },
{
title: "Catégorie",
title: "Catégories",
path: paths.dashboard.admin.product.category,
},
{
......@@ -106,7 +113,7 @@ export function useNavData() {
path: paths.dashboard.admin.product.attribut,
},
{
title: "Migration de Stock",
title: "Migration de stock",
path: paths.dashboard.admin.product.migration,
},
],
......@@ -117,7 +124,7 @@ export function useNavData() {
icon: ICONS.calendar,
children: [
{
title: "Tout les lives",
title: "Tous les lives",
path: paths.dashboard.admin.live.all_lives,
},
{ title: "Ajouter", path: paths.dashboard.admin.live.new },
......@@ -126,11 +133,11 @@ export function useNavData() {
path: paths.dashboard.admin.live.statistics.all,
},
{
title: "Session de Vente",
title: "Sessions de vente",
path: paths.dashboard.admin.live.saleSession,
},
{
title: "Statistique du session de Vente",
title: "Statistiques sessions de vente",
path: paths.dashboard.admin.cart.statistics,
},
......@@ -138,58 +145,89 @@ export function useNavData() {
],
},
{
title: "Panier",
title: "Paniers",
path: paths.dashboard.admin.cart.root,
icon: ICONS.ecommerce,
children: [
{
title: "Panier Utilisateur",
title: "Paniers clients",
path: paths.dashboard.admin.cart.UserCart,
},
{
title: "Paramétrer",
title: "Paramètres",
path: paths.dashboard.admin.cart.CartConfiguration,
},
],
},
{
title: "Codes promo",
path: paths.dashboard.admin.promoCode.root,
icon: ICONS.label,
title: "Promotion",
path: paths.dashboard.admin.supplier.orders.purchases.root,
icon: ICONS.promotions,
children: [
{ title: "Tout les codes promo", path: paths.dashboard.admin.promoCode.root },
{ title: "Ajouter", path: paths.dashboard.admin.promoCode.new },
{
title: "Cartes cadeaux",
path: paths.dashboard.admin.giftcard.root,
icon: ICONS.carteCadeaux,
children: [
{
title: "Toutes les cartes cadeaux",
path: paths.dashboard.admin.giftcard.all_giftcard,
},
{ title: "Ajouter", path: paths.dashboard.admin.giftcard.new },
],
},
{
title: "Codes promo",
path: paths.dashboard.admin.promoCode.root,
icon: ICONS.label,
children: [
{ title: "Tous les codes promo", path: paths.dashboard.admin.promoCode.root },
{ title: "Ajouter", path: paths.dashboard.admin.promoCode.new },
],
},
{
title: "Bons d'achat",
path: paths.dashboard.admin.voucher.root,
icon: ICONS.bonachats,
children: [
{ title: "Tous les bons d'achat", path: paths.dashboard.admin.voucher.root },
{
title: "Ajouter",
path: paths.dashboard.admin.voucher.new,
},
],
},
],
},
{
title: "commandes",
title: "Commandes",
path: paths.dashboard.admin.order.root,
icon: ICONS.order,
children: [
{
title: "Tout les commandes",
title: "Toutes les commandes",
path: paths.dashboard.admin.order.all_orders,
},
{
title: "Tout les remboursements",
title: "Tous les remboursements",
path: paths.dashboard.admin.order.refund.root,
},
{ title: "Ajouter", path: paths.dashboard.admin.order.create },
{ title: "Corbeille", path: paths.dashboard.admin.order.trash },
{
title: "Statistiques",
title: "Statistiques commandes",
path: paths.dashboard.admin.order.statistics,
},
],
},
{
title: "Commentaires",
title: "Avis",
path: paths.dashboard.admin.review.root,
icon: ICONS.chat,
icon: ICONS.commentaire,
children: [
{
title: "Tout les commentaires",
title: "Tous les avis",
path: paths.dashboard.admin.review.all_reviews,
},
{
......@@ -198,85 +236,62 @@ export function useNavData() {
},
],
},
{
title: "Cartes cadeaux",
path: paths.dashboard.admin.giftcard.root,
icon: ICONS.label,
children: [
{
title: "Tout les Cartes Cadeaux",
path: paths.dashboard.admin.giftcard.all_giftcard,
},
{ title: "Ajouter", path: paths.dashboard.admin.giftcard.new },
],
},
{
title: "Fournisseur",
title: "Fournisseurs",
path: paths.dashboard.admin.supplier.root,
icon: ICONS.order,
icon: ICONS.fournisseur,
children: [
{
title: "Tout les fournisseurs",
title: "Tous les fournisseurs",
path: paths.dashboard.admin.supplier.list,
},
{ title: "Ajouter", path: paths.dashboard.admin.supplier.new },
],
},
{
title: "Commandes Fournisseur",
title: "Achats",
path: paths.dashboard.admin.supplier.orders.purchases.root,
icon: ICONS.order,
icon: ICONS.achats,
children: [
{
title: "Commande d'achats",
title: "Commandes d'achats ",
path: paths.dashboard.admin.supplier.orders.purchases.root,
children: [
{
title: "Ajouter",
path: paths.dashboard.admin.supplier.orders.purchases.new,
},
{
title: "tout les Commandes",
title: "Toutes les commandes",
path: paths.dashboard.admin.supplier.orders.purchases
.root,
},
{
title: "Ajouter",
path: paths.dashboard.admin.supplier.orders.purchases.new,
},
],
},
{
title: "Commande de ventes",
title: "Commandes de préco",
path: paths.dashboard.admin.supplier.orders.sales.root,
},
],
},
{
title: "Utilisateur",
title: "Utilisateurs",
path: paths.dashboard.admin.user.root,
icon: ICONS.user,
children: [
{
title: "Tout les utilisateurs",
title: "Tous les utilisateurs",
path: paths.dashboard.admin.user.all_users,
},
{ title: "Ajouter", path: paths.dashboard.admin.user.new },
{ title: "Compte", path: paths.dashboard.admin.user.account },
{
title: "Editeur de role",
title: "Editeur de rôles",
path: paths.dashboard.admin.user.role,
},
],
},
{
title: "Bon d'achat",
path: paths.dashboard.admin.voucher.root,
icon: ICONS.order,
children: [
{ title: "list des bons d'achats", path: paths.dashboard.admin.voucher.root },
{
title: "Ajouter un bon d'achat",
path: paths.dashboard.admin.voucher.new,
},
],
},
{
title: "Médiathèque",
path: paths.dashboard.admin.media.root,
......@@ -290,7 +305,7 @@ export function useNavData() {
{
title: "Livraison",
path: paths.dashboard.admin.shipping.general.root,
icon: ICONS.external,
icon: ICONS.livraison,
children: [
{
title: "Général",
......
src/shared/sections/account/address/address-list-dialog.tsx
+ 1
− 1
Voir le fichier @ 9a007e0d
......@@ -132,7 +132,7 @@ export default function AddressListDialog({
<TextField
value={searchAddress}
onChange={handleSearchAddress}
placeholder="Search..."
placeholder="Recherche..."
InputProps={{
startAdornment: (
<InputAdornment position="start">
......
src/shared/sections/cart/Cart-createView.tsx
+ 3
− 3
Voir le fichier @ 9a007e0d
......@@ -431,15 +431,15 @@ export default function LiveCard({ liveId }: Props) {
heading={`Panier du live : ${name ? name : "No Name"}`}
links={[
{
name: "dashboard",
name: "Tableau de bord",
href: paths.dashboard.root,
},
{
name: "Tout les Panier",
name: "Tous les Panier",
href: paths.dashboard.admin.cart.root,
},
{
name: "Panier",
name: "Paniers",
},
]}
sx={{
......
src/shared/sections/cart/CartConfiguration/CartConfiguration.tsx
+ 1
− 1
Voir le fichier @ 9a007e0d
......@@ -67,7 +67,7 @@ function CountdownOptions() {
return (
<Card>
<CardContent>
<Typography variant="h6">Sélectionne une Configuration</Typography>
<Typography variant="h6">Sélectionner une Configuration</Typography>
<Box display="flex" flexDirection="column">
<FormControlLabel
control={
......
src/shared/sections/cart/CartConfiguration/cartConfigView.tsx
+ 1
− 1
Voir le fichier @ 9a007e0d
......@@ -24,7 +24,7 @@ export default function CartConfigView() {
href: paths.dashboard.root,
},
{
name: "Panier",
name: "Paniers",
href: paths.dashboard.admin.cart.root,
},
{ name: "Configuration" },
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter