Gestion utilisateurs, limites recherche, filtres lieux/sources, fix logo prod
- Admin : CRUD complet utilisateurs (créer, modifier nom/email/mdp/rôle, supprimer) avec garde-fous (dernier admin, compte propre) - Recherche : limite configurable par l'admin (défaut 200), bannière d'avertissement quand la limite est atteinte, plus de pagination (résultats en bloc) - Lieux : liste non chargée sans filtre actif (performance sur grands volumes) - Sources : idem pour admin/responsables ; membres voient toujours leurs sources - Logo 404 prod : +FollowSymLinks dans .htaccess, storage:link dans l'assistant d'installation, bouton "Recréer le lien" dans Administration → Paramètres Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -163,12 +163,26 @@ class SettingController extends Controller
|
||||
{
|
||||
$data = $request->validate([
|
||||
'site_name' => ['nullable', 'string', 'max:100'],
|
||||
'search_max_results' => ['nullable', 'integer', 'min:10', 'max:5000'],
|
||||
]);
|
||||
|
||||
$siteName = trim($data['site_name'] ?? '');
|
||||
SiteSettingsService::set('site_name', $siteName ?: null);
|
||||
SiteSettingsService::set('registration_enabled', $request->boolean('registration_enabled'));
|
||||
if (isset($data['search_max_results'])) {
|
||||
SiteSettingsService::set('search_max_results', (int) $data['search_max_results']);
|
||||
}
|
||||
|
||||
return back()->with('success', 'Paramètres enregistrés.');
|
||||
}
|
||||
|
||||
public function storageLink(): RedirectResponse
|
||||
{
|
||||
try {
|
||||
\Illuminate\Support\Facades\Artisan::call('storage:link');
|
||||
return back()->with('success', 'Lien de stockage public créé (public/storage → storage/app/public).');
|
||||
} catch (\Exception $e) {
|
||||
return back()->with('error', 'Impossible de créer le lien : ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -208,6 +208,33 @@ class UserController extends Controller
|
||||
return view('admin.utilisateurs.import', compact('results', 'created', 'errors'));
|
||||
}
|
||||
|
||||
public function create(): View
|
||||
{
|
||||
return view('admin.utilisateurs.create');
|
||||
}
|
||||
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'email' => ['required', 'email', 'max:255', 'unique:users,email'],
|
||||
'password' => ['required', 'string', 'min:8', 'confirmed'],
|
||||
'role' => ['required', new Enum(UserRole::class)],
|
||||
]);
|
||||
|
||||
$user = User::create([
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
'password' => Hash::make($data['password']),
|
||||
'role' => $data['role'],
|
||||
'is_active' => true,
|
||||
'email_verified_at' => now(),
|
||||
]);
|
||||
|
||||
return redirect()->route('admin.utilisateurs.edit', $user)
|
||||
->with('success', 'Utilisateur créé.');
|
||||
}
|
||||
|
||||
public function edit(User $user): View
|
||||
{
|
||||
$user->load('sections', 'sourcesAssignees');
|
||||
@@ -217,24 +244,64 @@ class UserController extends Controller
|
||||
|
||||
public function update(Request $request, User $user): RedirectResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'role' => ['required', new Enum(UserRole::class)],
|
||||
]);
|
||||
$isSelf = $user->id === auth()->id();
|
||||
|
||||
if ($user->id === auth()->id()) {
|
||||
return back()->with('error', 'Vous ne pouvez pas modifier votre propre rôle.');
|
||||
$rules = [
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'email' => ['required', 'email', 'max:255', 'unique:users,email,' . $user->id],
|
||||
'role' => ['required', new Enum(UserRole::class)],
|
||||
];
|
||||
|
||||
if ($request->filled('password')) {
|
||||
$rules['password'] = ['string', 'min:8', 'confirmed'];
|
||||
$rules['password_confirmation'] = ['required'];
|
||||
}
|
||||
|
||||
if ($user->role === UserRole::Admin && $data['role'] !== UserRole::Admin->value) {
|
||||
$data = $request->validate($rules);
|
||||
|
||||
// Protection : retrait du dernier admin ou de son propre rôle
|
||||
if (! $isSelf && $user->role === UserRole::Admin && $data['role'] !== UserRole::Admin->value) {
|
||||
$adminCount = User::where('role', UserRole::Admin->value)->count();
|
||||
if ($adminCount <= 1) {
|
||||
return back()->with('error', 'Impossible de retirer le rôle admin au dernier administrateur.');
|
||||
}
|
||||
}
|
||||
|
||||
$user->update(['role' => $data['role']]);
|
||||
$update = [
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
];
|
||||
|
||||
return back()->with('success', 'Rôle mis à jour.');
|
||||
if (! $isSelf) {
|
||||
$update['role'] = $data['role'];
|
||||
}
|
||||
|
||||
if ($request->filled('password')) {
|
||||
$update['password'] = Hash::make($data['password']);
|
||||
}
|
||||
|
||||
$user->update($update);
|
||||
|
||||
return back()->with('success', 'Utilisateur mis à jour.');
|
||||
}
|
||||
|
||||
public function destroy(User $user): RedirectResponse
|
||||
{
|
||||
if ($user->id === auth()->id()) {
|
||||
return back()->with('error', 'Vous ne pouvez pas supprimer votre propre compte.');
|
||||
}
|
||||
|
||||
if ($user->role === UserRole::Admin) {
|
||||
$adminCount = User::where('role', UserRole::Admin->value)->count();
|
||||
if ($adminCount <= 1) {
|
||||
return back()->with('error', 'Impossible de supprimer le dernier administrateur.');
|
||||
}
|
||||
}
|
||||
|
||||
$user->delete();
|
||||
|
||||
return redirect()->route('admin.utilisateurs.index')
|
||||
->with('success', 'Utilisateur supprimé.');
|
||||
}
|
||||
|
||||
public function toggleActive(User $user): RedirectResponse
|
||||
|
||||
@@ -66,9 +66,10 @@ class LieuController extends Controller
|
||||
$lieuSelectionne = $request->filled('lieu_id')
|
||||
? Lieu::find($request->integer('lieu_id'), ['id', 'nom', 'nom_long'])
|
||||
: null;
|
||||
$lieux = $query->paginate(50)->withQueryString();
|
||||
$hasFilters = $request->anyFilled(['lieu_type_id', 'q', 'lieu_id']);
|
||||
$lieux = $hasFilters ? $query->paginate(50)->withQueryString() : null;
|
||||
|
||||
return view('lieux.index', compact('lieux', 'lieuTypes', 'lieuSelectionne'));
|
||||
return view('lieux.index', compact('lieux', 'lieuTypes', 'lieuSelectionne', 'hasFilters'));
|
||||
}
|
||||
|
||||
public function create(): View
|
||||
|
||||
@@ -6,6 +6,7 @@ use App\Enums\SourceStatus;
|
||||
use App\Models\Lieu;
|
||||
use App\Models\Releve;
|
||||
use App\Models\SourceType;
|
||||
use App\Services\SiteSettingsService;
|
||||
use App\Support\DbCompat;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -18,6 +19,7 @@ class RechercheController extends Controller
|
||||
$sourceTypes = SourceType::orderBy('nom')->get(['id', 'nom']);
|
||||
$resultats = null;
|
||||
$total = null;
|
||||
$limited = false;
|
||||
|
||||
// Charger le lieu sélectionné pour pré-remplir le picker
|
||||
$lieuSelectionne = $request->filled('lieu_id')
|
||||
@@ -25,10 +27,10 @@ class RechercheController extends Controller
|
||||
: null;
|
||||
|
||||
if ($request->anyFilled(['q', 'source_type_id', 'lieu_id', 'annee_debut', 'annee_fin'])) {
|
||||
[$resultats, $total] = $this->search($request);
|
||||
[$resultats, $total, $limited] = $this->search($request);
|
||||
}
|
||||
|
||||
return view('recherche.index', compact('sourceTypes', 'resultats', 'total', 'lieuSelectionne'));
|
||||
return view('recherche.index', compact('sourceTypes', 'resultats', 'total', 'limited', 'lieuSelectionne'));
|
||||
}
|
||||
|
||||
private function search(Request $request): array
|
||||
@@ -85,15 +87,17 @@ class RechercheController extends Controller
|
||||
$query->whereRaw("date_evenement <= ?", [$request->integer('annee_fin') . '-12-31']);
|
||||
}
|
||||
|
||||
// ── Tri + pagination ────────────────────────────────────────────────
|
||||
// ── Limite configurable par l'admin ─────────────────────────────────
|
||||
$max = SiteSettingsService::searchMaxResults();
|
||||
$total = $query->count();
|
||||
|
||||
$resultats = $query
|
||||
->orderByRaw(DbCompat::nullsLast('nom'))
|
||||
->orderByRaw(DbCompat::nullsLast('date_evenement'))
|
||||
->paginate(25)
|
||||
->withQueryString();
|
||||
->limit($max)
|
||||
->get();
|
||||
|
||||
return [$resultats, $total];
|
||||
return [$resultats, $total, $total > $max];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -219,6 +219,17 @@ class SetupController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
// 4b. Lien de stockage public (symlink public/storage → storage/app/public)
|
||||
// Non bloquant : l'installation continue même si le serveur interdit les symlinks.
|
||||
if ($success) {
|
||||
try {
|
||||
\Illuminate\Support\Facades\Artisan::call('storage:link');
|
||||
$steps[] = ['ok' => true, 'label' => 'Lien de stockage public créé'];
|
||||
} catch (\Exception $e) {
|
||||
$steps[] = ['ok' => false, 'label' => 'Lien de stockage public (non bloquant — créez-le manuellement via « Administration → Paramètres »)', 'error' => $e->getMessage()];
|
||||
}
|
||||
}
|
||||
|
||||
// 5. Paramètres du site
|
||||
if ($success) {
|
||||
try {
|
||||
|
||||
@@ -69,9 +69,16 @@ class SourceController extends Controller
|
||||
? Lieu::find($request->integer('lieu_id'), ['id', 'nom', 'nom_long'])
|
||||
: null;
|
||||
|
||||
$sources = $query->orderBy('nom')->paginate(25)->withQueryString();
|
||||
// Pour les admins/responsables, exiger au moins un filtre avant d'afficher
|
||||
// les résultats (ils peuvent voir potentiellement des milliers de sources).
|
||||
// Les membres normaux voient toujours leurs sources (déjà filtrées par accès).
|
||||
$hasFilters = $request->anyFilled(['status', 'source_type_id', 'lieu_id', 'annee_debut', 'annee_fin']);
|
||||
$requiresFilter = $user->isSectionManager();
|
||||
$sources = ($requiresFilter && ! $hasFilters)
|
||||
? null
|
||||
: $query->orderBy('nom')->paginate(25)->withQueryString();
|
||||
|
||||
return view('sources.index', compact('sources', 'sourceTypes', 'lieuSelectionne'));
|
||||
return view('sources.index', compact('sources', 'sourceTypes', 'lieuSelectionne', 'hasFilters'));
|
||||
}
|
||||
|
||||
private function getLieuDescendantIds(int $lieuId): array
|
||||
|
||||
@@ -88,6 +88,13 @@ class SiteSettingsService
|
||||
return (bool) self::get('registration_enabled', false);
|
||||
}
|
||||
|
||||
// ── Recherche ────────────────────────────────────────────────────────────────
|
||||
|
||||
public static function searchMaxResults(): int
|
||||
{
|
||||
return max(10, (int) self::get('search_max_results', 200));
|
||||
}
|
||||
|
||||
// ── Mises à jour ──────────────────────────────────────────────────────────
|
||||
|
||||
public static function updatesDisabled(): bool
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
# ── Sécurité ──────────────────────────────────────────────────────────────────
|
||||
Options -Indexes -MultiViews
|
||||
Options -Indexes -MultiViews +FollowSymLinks
|
||||
|
||||
# ── En-têtes HTTP transmis à PHP ───────────────────────────────────────────────
|
||||
# Nécessaire pour que Laravel reçoive le token Authorization (API) et CSRF
|
||||
|
||||
@@ -37,6 +37,24 @@
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
{{-- Nombre maximum de résultats de recherche --}}
|
||||
<div class="pt-4 border-t border-gray-100 dark:border-gray-700">
|
||||
<label for="search_max_results" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Nombre maximum de résultats de recherche
|
||||
</label>
|
||||
<input type="number" id="search_max_results" name="search_max_results"
|
||||
value="{{ old('search_max_results', \App\Services\SiteSettingsService::get('search_max_results', 200)) }}"
|
||||
min="10" max="5000"
|
||||
class="block w-32 rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm
|
||||
focus:border-indigo-500 focus:ring-indigo-500">
|
||||
<p class="mt-1 text-xs text-gray-400 dark:text-gray-500">
|
||||
La page de recherche affiche au plus ce nombre de relevés. Si la limite est atteinte, un message invite l'utilisateur à affiner ses critères. (10 – 5000, défaut : 200)
|
||||
</p>
|
||||
@error('search_max_results')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
{{-- Inscriptions --}}
|
||||
<div class="pt-4 border-t border-gray-100 dark:border-gray-700">
|
||||
<p class="text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Inscription publique des comptes</p>
|
||||
@@ -62,6 +80,22 @@
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{{-- Lien de stockage public --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-3">
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide">Lien de stockage</h3>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400">
|
||||
Le lien symbolique <code class="bg-gray-100 dark:bg-gray-700 px-1 rounded text-xs">public/storage</code> permet de servir les fichiers (logo, etc.) via l'URL <code class="bg-gray-100 dark:bg-gray-700 px-1 rounded text-xs">/storage/…</code>.
|
||||
S'il est absent, le logo sera invisible et d'autres fichiers seront inaccessibles.
|
||||
</p>
|
||||
<form method="POST" action="{{ route('admin.parametres.storage-link') }}">
|
||||
@csrf
|
||||
<button type="submit"
|
||||
class="px-4 py-2 bg-gray-100 dark:bg-gray-700 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 text-sm rounded-md hover:bg-gray-200 dark:hover:bg-gray-600">
|
||||
Recréer le lien de stockage
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{{-- Logo --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-5">
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide">Logo du site</h3>
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
<x-app-layout>
|
||||
<x-slot name="header">
|
||||
<div class="flex items-center gap-3">
|
||||
<a href="{{ route('admin.utilisateurs.index') }}" class="text-sm text-indigo-600 hover:underline">← Utilisateurs</a>
|
||||
<span class="text-gray-400 dark:text-gray-500">/</span>
|
||||
<h2 class="text-xl font-semibold text-gray-800 dark:text-gray-200">Nouvel utilisateur</h2>
|
||||
</div>
|
||||
</x-slot>
|
||||
|
||||
<div class="py-8 max-w-2xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-5">
|
||||
<form method="POST" action="{{ route('admin.utilisateurs.store') }}">
|
||||
@csrf
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Nom <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="text" name="name" value="{{ old('name') }}" required autofocus
|
||||
class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
@error('name')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Adresse e-mail <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="email" name="email" value="{{ old('email') }}" required
|
||||
class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
@error('email')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Mot de passe <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="password" name="password" required autocomplete="new-password"
|
||||
class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
@error('password')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Confirmer le mot de passe <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="password" name="password_confirmation" required autocomplete="new-password"
|
||||
class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-3">
|
||||
Rôle <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<div class="space-y-2">
|
||||
@foreach(\App\Enums\UserRole::cases() as $role)
|
||||
<label class="flex items-start gap-3 p-3 border rounded-lg cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700
|
||||
{{ old('role', 'member') === $role->value ? 'border-indigo-400 bg-indigo-50 dark:bg-indigo-900/30' : 'border-gray-200 dark:border-gray-700' }}">
|
||||
<input type="radio" name="role" value="{{ $role->value }}"
|
||||
{{ old('role', 'member') === $role->value ? 'checked' : '' }}
|
||||
class="mt-0.5 text-indigo-600">
|
||||
<div>
|
||||
<p class="text-sm font-medium text-gray-900 dark:text-white">{{ $role->label() }}</p>
|
||||
<p class="text-xs text-gray-500 dark:text-gray-400 mt-0.5">
|
||||
@if($role === \App\Enums\UserRole::Admin)
|
||||
Accès complet : gestion des utilisateurs, sections, dépôts, types de sources et statistiques.
|
||||
@elseif($role === \App\Enums\UserRole::SectionManager)
|
||||
Peut créer des sources, assigner des membres et valider les relevés de sa section.
|
||||
@else
|
||||
Peut saisir des relevés sur les sources auxquelles il est assigné.
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
</label>
|
||||
@endforeach
|
||||
</div>
|
||||
@error('role')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div class="flex gap-4 pt-2">
|
||||
<button type="submit"
|
||||
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700">
|
||||
Créer l'utilisateur
|
||||
</button>
|
||||
<a href="{{ route('admin.utilisateurs.index') }}"
|
||||
class="text-sm text-gray-500 dark:text-gray-400 self-center hover:text-gray-700 dark:hover:text-gray-300">
|
||||
Annuler
|
||||
</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</x-app-layout>
|
||||
@@ -16,63 +16,68 @@
|
||||
<div class="p-4 bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-700 text-red-800 dark:text-red-200 rounded-md">{{ session('error') }}</div>
|
||||
@endif
|
||||
|
||||
{{-- Informations --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-3">
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide">Informations</h3>
|
||||
<dl class="grid grid-cols-2 gap-x-6 gap-y-3 text-sm">
|
||||
<dt class="text-gray-500 dark:text-gray-400">Nom</dt>
|
||||
<dd class="text-gray-900 dark:text-white font-medium">{{ $user->name }}</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">E-mail</dt>
|
||||
<dd class="text-gray-900 dark:text-white">{{ $user->email }}</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">Inscrit le</dt>
|
||||
<dd class="text-gray-900 dark:text-white">{{ $user->created_at->format('d/m/Y') }}</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">Sections</dt>
|
||||
<dd class="text-gray-900 dark:text-white">
|
||||
@if($user->sections->isNotEmpty())
|
||||
{{ $user->sections->pluck('nom')->join(', ') }}
|
||||
@else
|
||||
—
|
||||
@endif
|
||||
</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">Sources assignées</dt>
|
||||
<dd class="text-gray-900 dark:text-white">{{ $user->sourcesAssignees->count() }}</dd>
|
||||
</dl>
|
||||
</div>
|
||||
|
||||
{{-- Statut actif / inactif --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 flex items-center justify-between">
|
||||
<div>
|
||||
<p class="text-sm font-medium text-gray-900 dark:text-white">Statut du compte</p>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mt-0.5">
|
||||
@if($user->is_active)
|
||||
Le compte est <span class="text-green-600 font-medium">actif</span> — l'utilisateur peut se connecter et être assigné à des sources.
|
||||
@else
|
||||
Le compte est <span class="text-red-600 font-medium">inactif</span> — l'utilisateur ne peut pas se connecter.
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
@if($user->id !== auth()->id())
|
||||
<form method="POST" action="{{ route('admin.utilisateurs.toggle-active', $user) }}"
|
||||
x-data
|
||||
@submit.prevent="if(confirm('{{ $user->is_active ? 'Désactiver' : 'Activer' }} ce compte ?')) $el.submit()">
|
||||
@csrf
|
||||
<button type="submit"
|
||||
class="px-4 py-2 text-sm font-medium rounded-md
|
||||
{{ $user->is_active
|
||||
? 'bg-red-50 dark:bg-red-900/30 text-red-700 border border-red-200 dark:border-red-700 hover:bg-red-100'
|
||||
: 'bg-green-50 dark:bg-green-900/30 text-green-700 border border-green-200 dark:border-green-700 hover:bg-green-100' }}">
|
||||
{{ $user->is_active ? 'Désactiver le compte' : 'Activer le compte' }}
|
||||
</button>
|
||||
</form>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
{{-- Modifier le rôle --}}
|
||||
{{-- Formulaire principal --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6">
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide mb-4">Rôle</h3>
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide mb-5">Informations</h3>
|
||||
|
||||
<form method="POST" action="{{ route('admin.utilisateurs.update', $user) }}">
|
||||
@csrf @method('PUT')
|
||||
<div class="space-y-3">
|
||||
|
||||
<div class="space-y-5">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Nom <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="text" name="name" value="{{ old('name', $user->name) }}" required
|
||||
class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
@error('name')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Adresse e-mail <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="email" name="email" value="{{ old('email', $user->email) }}" required
|
||||
class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
@error('email')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div x-data="{ open: false }">
|
||||
<button type="button" @click="open = !open"
|
||||
class="text-sm text-indigo-600 hover:underline">
|
||||
<span x-show="!open">Changer le mot de passe…</span>
|
||||
<span x-show="open">Annuler le changement de mot de passe</span>
|
||||
</button>
|
||||
<div x-show="open" x-cloak class="mt-3 space-y-3">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Nouveau mot de passe
|
||||
</label>
|
||||
<input type="password" name="password" autocomplete="new-password"
|
||||
class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
@error('password')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Confirmer le nouveau mot de passe
|
||||
</label>
|
||||
<input type="password" name="password_confirmation" autocomplete="new-password"
|
||||
class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{-- Rôle (masqué pour soi-même) --}}
|
||||
@if($user->id !== auth()->id())
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-3">Rôle</label>
|
||||
<div class="space-y-2">
|
||||
@foreach(\App\Enums\UserRole::cases() as $role)
|
||||
<label class="flex items-start gap-3 p-3 border rounded-lg cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700
|
||||
{{ $user->role === $role ? 'border-indigo-400 bg-indigo-50 dark:bg-indigo-900/30' : 'border-gray-200 dark:border-gray-700' }}">
|
||||
@@ -94,7 +99,17 @@
|
||||
</label>
|
||||
@endforeach
|
||||
</div>
|
||||
<div class="mt-5 flex gap-4">
|
||||
</div>
|
||||
@else
|
||||
{{-- Champ caché pour ne pas perdre le rôle lors du submit --}}
|
||||
<input type="hidden" name="role" value="{{ $user->role->value }}">
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 italic">
|
||||
Vous ne pouvez pas modifier votre propre rôle.
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="mt-6 flex gap-4">
|
||||
<button type="submit"
|
||||
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700">
|
||||
Enregistrer
|
||||
@@ -106,5 +121,68 @@
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{{-- Statut actif / inactif --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 flex items-center justify-between">
|
||||
<div>
|
||||
<p class="text-sm font-medium text-gray-900 dark:text-white">Statut du compte</p>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mt-0.5">
|
||||
@if($user->is_active)
|
||||
Le compte est <span class="text-green-600 font-medium">actif</span> — l'utilisateur peut se connecter.
|
||||
@else
|
||||
Le compte est <span class="text-red-600 font-medium">inactif</span> — l'utilisateur ne peut pas se connecter.
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
@if($user->id !== auth()->id())
|
||||
<form method="POST" action="{{ route('admin.utilisateurs.toggle-active', $user) }}"
|
||||
x-data
|
||||
@submit.prevent="if(confirm('{{ $user->is_active ? 'Désactiver' : 'Activer' }} ce compte ?')) $el.submit()">
|
||||
@csrf
|
||||
<button type="submit"
|
||||
class="px-4 py-2 text-sm font-medium rounded-md
|
||||
{{ $user->is_active
|
||||
? 'bg-red-50 dark:bg-red-900/30 text-red-700 border border-red-200 dark:border-red-700 hover:bg-red-100'
|
||||
: 'bg-green-50 dark:bg-green-900/30 text-green-700 border border-green-200 dark:border-green-700 hover:bg-green-100' }}">
|
||||
{{ $user->is_active ? 'Désactiver le compte' : 'Activer le compte' }}
|
||||
</button>
|
||||
</form>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
{{-- Informations complémentaires --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-2">
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide mb-3">Détails</h3>
|
||||
<dl class="grid grid-cols-2 gap-x-6 gap-y-2 text-sm">
|
||||
<dt class="text-gray-500 dark:text-gray-400">Inscrit le</dt>
|
||||
<dd class="text-gray-900 dark:text-white">{{ $user->created_at->format('d/m/Y') }}</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">Sections</dt>
|
||||
<dd class="text-gray-900 dark:text-white">
|
||||
{{ $user->sections->isNotEmpty() ? $user->sections->pluck('nom')->join(', ') : '—' }}
|
||||
</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">Sources assignées</dt>
|
||||
<dd class="text-gray-900 dark:text-white">{{ $user->sourcesAssignees->count() ?: '—' }}</dd>
|
||||
</dl>
|
||||
</div>
|
||||
|
||||
{{-- Zone danger : suppression --}}
|
||||
@if($user->id !== auth()->id())
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 border border-red-200 dark:border-red-800">
|
||||
<h3 class="text-sm font-semibold text-red-700 dark:text-red-400 uppercase tracking-wide mb-2">Zone dangereuse</h3>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mb-4">
|
||||
La suppression est définitive. Les relevés et assignations liés à cet utilisateur seront également supprimés.
|
||||
</p>
|
||||
<form method="POST" action="{{ route('admin.utilisateurs.destroy', $user) }}"
|
||||
x-data
|
||||
@submit.prevent="if(confirm('Supprimer définitivement {{ addslashes($user->name) }} ? Cette action est irréversible.')) $el.submit()">
|
||||
@csrf @method('DELETE')
|
||||
<button type="submit"
|
||||
class="px-4 py-2 bg-red-600 text-white text-sm font-medium rounded-md hover:bg-red-700">
|
||||
Supprimer cet utilisateur
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</x-app-layout>
|
||||
|
||||
@@ -3,6 +3,10 @@
|
||||
<div class="flex items-center justify-between">
|
||||
<h2 class="text-xl font-semibold text-gray-800 dark:text-gray-200">Gestion des utilisateurs</h2>
|
||||
<div class="flex items-center gap-3">
|
||||
<a href="{{ route('admin.utilisateurs.create') }}"
|
||||
class="flex items-center gap-1.5 px-4 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700 transition-colors">
|
||||
+ Nouvel utilisateur
|
||||
</a>
|
||||
<a href="{{ route('admin.utilisateurs.import') }}"
|
||||
class="flex items-center gap-1.5 px-4 py-2 border border-gray-300 dark:border-gray-600 text-sm text-gray-700 dark:text-gray-300 rounded-md hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
@@ -139,19 +143,28 @@
|
||||
{{ $user->created_at->format('d/m/Y') }}
|
||||
</td>
|
||||
<td class="px-6 py-4 text-right space-x-3">
|
||||
@if($user->id !== auth()->id())
|
||||
<a href="{{ route('admin.utilisateurs.edit', $user) }}"
|
||||
class="text-indigo-600 hover:underline text-sm">Modifier</a>
|
||||
@if($user->id !== auth()->id())
|
||||
<form method="POST"
|
||||
action="{{ route('admin.utilisateurs.toggle-active', $user) }}"
|
||||
class="inline" x-data
|
||||
@submit.prevent="if(confirm('{{ $user->is_active ? 'Désactiver' : 'Activer' }} ce compte ?')) $el.submit()">
|
||||
@csrf
|
||||
<button type="submit"
|
||||
class="text-sm {{ $user->is_active ? 'text-red-500 hover:text-red-700' : 'text-green-600 hover:text-green-700' }}">
|
||||
class="text-sm {{ $user->is_active ? 'text-orange-500 hover:text-orange-700' : 'text-green-600 hover:text-green-700' }}">
|
||||
{{ $user->is_active ? 'Désactiver' : 'Activer' }}
|
||||
</button>
|
||||
</form>
|
||||
<form method="POST"
|
||||
action="{{ route('admin.utilisateurs.destroy', $user) }}"
|
||||
class="inline" x-data
|
||||
@submit.prevent="if(confirm('Supprimer définitivement {{ addslashes($user->name) }} ?')) $el.submit()">
|
||||
@csrf @method('DELETE')
|
||||
<button type="submit" class="text-sm text-red-500 hover:text-red-700">
|
||||
Supprimer
|
||||
</button>
|
||||
</form>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -86,7 +86,8 @@
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{{-- Tableau --}}
|
||||
{{-- Tableau (uniquement si un filtre est actif) --}}
|
||||
@if($lieux !== null)
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg overflow-hidden">
|
||||
<table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
|
||||
<thead class="bg-gray-50 dark:bg-gray-700">
|
||||
@@ -142,8 +143,7 @@
|
||||
@empty
|
||||
<tr>
|
||||
<td colspan="6" class="px-6 py-10 text-center text-gray-400 dark:text-gray-500">
|
||||
@if($hasFilters) Aucun lieu ne correspond aux filtres.
|
||||
@else Aucun lieu enregistré. @endif
|
||||
Aucun lieu ne correspond aux filtres.
|
||||
</td>
|
||||
</tr>
|
||||
@endforelse
|
||||
@@ -156,5 +156,14 @@
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@else
|
||||
<div class="text-center py-16 text-gray-400 dark:text-gray-500">
|
||||
<svg class="mx-auto w-12 h-12 mb-4 text-gray-300 dark:text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"/>
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"/>
|
||||
</svg>
|
||||
<p class="text-sm">Utilisez les filtres ci-dessus pour rechercher des lieux.</p>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</x-app-layout>
|
||||
|
||||
@@ -102,7 +102,8 @@
|
||||
{{-- Résultats --}}
|
||||
@if($resultats !== null)
|
||||
<div>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mb-3">
|
||||
<div class="flex items-center justify-between mb-3">
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400">
|
||||
@if($total === 0)
|
||||
Aucun relevé trouvé.
|
||||
@else
|
||||
@@ -110,6 +111,19 @@
|
||||
@if(request('q')) pour <em>« {{ request('q') }} »</em> @endif
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@if($limited)
|
||||
<div class="mb-4 p-4 bg-amber-50 dark:bg-amber-900/30 border border-amber-200 dark:border-amber-700 rounded-md flex items-start gap-3">
|
||||
<svg class="w-5 h-5 text-amber-500 shrink-0 mt-0.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/>
|
||||
</svg>
|
||||
<p class="text-sm text-amber-800 dark:text-amber-200">
|
||||
Seuls les <strong>{{ number_format($resultats->count()) }} premiers résultats</strong> sur {{ number_format($total) }} sont affichés.
|
||||
Affinez vos critères de recherche pour obtenir des résultats plus précis.
|
||||
</p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if($resultats->isNotEmpty())
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg overflow-hidden">
|
||||
@@ -175,11 +189,6 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@if($resultats->hasPages())
|
||||
<div class="px-6 py-4 border-t border-gray-200 dark:border-gray-700">
|
||||
{{ $resultats->links() }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
@@ -97,6 +97,14 @@
|
||||
</div>
|
||||
|
||||
{{-- Tableau --}}
|
||||
@if($sources === null)
|
||||
<div class="text-center py-16 text-gray-400 dark:text-gray-500">
|
||||
<svg class="mx-auto w-12 h-12 mb-4 text-gray-300 dark:text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
|
||||
</svg>
|
||||
<p class="text-sm">Utilisez les filtres ci-dessus pour afficher les sources.</p>
|
||||
</div>
|
||||
@else
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg overflow-hidden">
|
||||
<table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700 text-sm">
|
||||
<thead class="bg-gray-50 dark:bg-gray-700">
|
||||
@@ -165,5 +173,6 @@
|
||||
<div class="px-6 py-4 border-t">{{ $sources->links() }}</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</x-app-layout>
|
||||
|
||||
+2
-1
@@ -21,6 +21,7 @@ Route::middleware(['auth', 'role:admin'])->prefix('admin')->name('admin.')->grou
|
||||
Route::delete('parametres/smtp', [SettingController::class, 'deleteSmtp'])->name('parametres.smtp.delete');
|
||||
Route::post('parametres/smtp/test', [SettingController::class, 'testSmtp'])->name('parametres.smtp.test');
|
||||
Route::post('parametres/updates', [SettingController::class, 'updateUpdates'])->name('parametres.updates');
|
||||
Route::post('parametres/storage-link', [SettingController::class, 'storageLink'])->name('parametres.storage-link');
|
||||
|
||||
// Routes spécifiques avant la resource pour éviter les conflits de paramètre
|
||||
Route::get('utilisateurs/export', [UserController::class, 'export'])->name('utilisateurs.export');
|
||||
@@ -28,7 +29,7 @@ Route::middleware(['auth', 'role:admin'])->prefix('admin')->name('admin.')->grou
|
||||
Route::post('utilisateurs/import', [UserController::class, 'import'])->name('utilisateurs.import.store');
|
||||
Route::get('utilisateurs/import/modele', [UserController::class, 'importTemplate'])->name('utilisateurs.import.modele');
|
||||
|
||||
Route::resource('utilisateurs', UserController::class)->only(['index', 'edit', 'update']);
|
||||
Route::resource('utilisateurs', UserController::class)->only(['index', 'create', 'store', 'edit', 'update', 'destroy']);
|
||||
Route::post('utilisateurs/{utilisateur}/toggle-active', [UserController::class, 'toggleActive'])->name('utilisateurs.toggle-active');
|
||||
Route::resource('lieu-types', LieuTypeController::class)
|
||||
->parameters(['lieu-types' => 'lieuType'])
|
||||
|
||||
Reference in New Issue
Block a user