[#ERP-42] Mettre à jour la lib Malio UI #16

Merged
tristan merged 6 commits from feature/ERP-42-mettre-a-jour-la-lib-malio-ui into develop 2026-05-28 12:27:33 +00:00
8 changed files with 46 additions and 47 deletions
Showing only changes of commit 0a5ac61957 - Show all commits
+3 -2
View File
@@ -4,6 +4,7 @@
<MalioSidebar <MalioSidebar
v-model="ui.sidebarCollapsed" v-model="ui.sidebarCollapsed"
:sections="translatedSections" :sections="translatedSections"
:sidebar-class="ui.sidebarCollapsed ? '' : 'w-[232px]'"
> >
<template #logo> <template #logo>
<img src="/LOGO_MALIO.png" alt="Malio"/> <img src="/LOGO_MALIO.png" alt="Malio"/>
@@ -16,10 +17,10 @@
<div class="h-full flex-1 flex flex-col min-h-0 min-w-0"> <div class="h-full flex-1 flex flex-col min-h-0 min-w-0">
<SiteSelector v-if="showSiteSelector"/> <SiteSelector v-if="showSiteSelector"/>
<main <main
class="flex flex-1 flex-col overflow-y-auto overflow-x-hidden bg-white px-4 pb-24 sm:px-8 lg:px-16"> class="flex flex-1 flex-col overflow-y-auto overflow-x-hidden bg-white px-4 pb-10 sm:px-6 lg:px-12 xl:px-[170px]">
<div <div
aria-hidden="true" aria-hidden="true"
class="pointer-events-none sticky top-0 z-30 h-8 flex-shrink-0 bg-white sm:h-12"/> class="pointer-events-none sticky top-0 z-30 h-[47px] flex-shrink-0 bg-white"/>
<slot/> <slot/>
</main> </main>
</div> </div>
@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<h1 class="text-xl font-bold text-primary-500 sm:text-2xl">{{ $t('commercial.title') }}</h1> <PageHeader>{{ $t('commercial.title') }}</PageHeader>
<p class="mt-4 text-neutral-500">{{ $t('commercial.welcome') }}</p> <p class="text-neutral-500">{{ $t('commercial.welcome') }}</p>
</div> </div>
</template> </template>
@@ -1,13 +1,9 @@
<template> <template>
<div> <div>
<div class="flex items-center justify-between"> <PageHeader>{{ t('admin.auditLog.title') }}</PageHeader>
<h1 class="text-xl font-bold text-primary-500 sm:text-2xl">
{{ t('admin.auditLog.title') }}
</h1>
</div>
<!-- Filtres --> <!-- Filtres -->
<section class="mt-4 rounded border border-gray-200 bg-white p-4"> <section class="rounded border border-gray-200 bg-white p-4">
<!-- Labels uniformes au-dessus : les composants Malio sont utilises sans <!-- Labels uniformes au-dessus : les composants Malio sont utilises sans
leur `label` flottant interne pour ne pas mixer deux patterns de label. leur `label` flottant interne pour ne pas mixer deux patterns de label.
A revoir une fois le composant calendar Malio développé --> A revoir une fois le composant calendar Malio développé -->
2
+4 -6
View File
@@ -1,10 +1,8 @@
<template> <template>
<div> <div>
<!-- En-tete --> <PageHeader>
<div class="flex items-center justify-between">
<h1 class="text-xl font-bold text-primary-500 sm:text-2xl">
{{ t('admin.roles.title') }} {{ t('admin.roles.title') }}
</h1> <template #actions>
<MalioButton <MalioButton
v-if="can('core.roles.manage')" v-if="can('core.roles.manage')"
:label="t('admin.roles.newRole')" :label="t('admin.roles.newRole')"
@@ -12,11 +10,11 @@
icon-position="left" icon-position="left"
@click="openCreateDrawer" @click="openCreateDrawer"
/> />
</div> </template>
</PageHeader>
<!-- Table des roles --> <!-- Table des roles -->
<MalioDataTable <MalioDataTable
class="mt-6"
:columns="columns" :columns="columns"
:items="roleItems" :items="roleItems"
:total-items="roles.length" :total-items="roles.length"
+1 -7
View File
@@ -1,15 +1,9 @@
<template> <template>
<div> <div>
<!-- En-tete --> <PageHeader>{{ t('admin.users.title') }}</PageHeader>
<div class="flex items-center justify-between">
<h1 class="text-xl font-bold text-primary-500 sm:text-2xl">
{{ t('admin.users.title') }}
</h1>
</div>
<!-- Table des utilisateurs --> <!-- Table des utilisateurs -->
<MalioDataTable <MalioDataTable
class="mt-6"
:columns="columns" :columns="columns"
:items="userItems" :items="userItems"
:total-items="users.length" :total-items="users.length"
+2 -2
View File
@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<h1 class="text-xl font-bold text-primary-500 sm:text-2xl">{{ $t('dashboard.title') }}</h1> <PageHeader>{{ $t('dashboard.title') }}</PageHeader>
<p class="mt-4 text-neutral-500">{{ $t('dashboard.welcome') }}</p> <p class="text-neutral-500">{{ $t('dashboard.welcome') }}</p>
</div> </div>
</template> </template>
+4 -6
View File
@@ -1,10 +1,8 @@
<template> <template>
<div> <div>
<!-- En-tete --> <PageHeader>
<div class="flex items-center justify-between">
<h1 class="text-xl font-bold text-primary-500 sm:text-2xl">
{{ t('admin.sites.title') }} {{ t('admin.sites.title') }}
</h1> <template #actions>
<MalioButton <MalioButton
v-if="can('sites.manage')" v-if="can('sites.manage')"
:label="t('admin.sites.newSite')" :label="t('admin.sites.newSite')"
@@ -12,11 +10,11 @@
icon-position="left" icon-position="left"
@click="openCreateDrawer" @click="openCreateDrawer"
/> />
</div> </template>
</PageHeader>
<!-- Table des sites --> <!-- Table des sites -->
<MalioDataTable <MalioDataTable
class="mt-6"
:columns="columns" :columns="columns"
:items="siteItems" :items="siteItems"
:total-items="sites.length" :total-items="sites.length"
@@ -0,0 +1,12 @@
<template>
<!-- Entete de page standard : source unique du style des titres.
Slot par defaut = texte du titre, slot #actions = boutons a droite. -->
<div class="mb-[44px] flex items-center justify-between gap-4">
<h1 class="text-[32px] font-semibold text-primary-500">
<slot/>
</h1>
<div v-if="$slots.actions" class="shrink-0">
<slot name="actions"/>
</div>
</div>
</template>