(Rebase) Resolution de merge conflit entre dev et j3/feat/pagination

This commit is contained in:
Loic Masi
2026-04-04 20:11:20 +02:00
29 changed files with 260 additions and 92 deletions

View File

@@ -60,13 +60,14 @@
<div class="d-flex gap-2">
<form asp-action="Like" method="post">
<input type="hidden" name="IdTitre" value="@Model.Details.IdTitre" />
<input type="hidden" name="IdTitre" value="@Model.Details.IdTitre"/>
<button type="submit" class="btn btn-outline-primary btn-sm">
<i class="fa fa-thumbs-up me-1"></i> Like
</button>
</form>
<a asp-area="Administration" asp-controller="Titre" asp-action="Edit" asp-route-id="@Model.Details.IdTitre" class="btn text-primary btn-sm">
<a asp-area="Administration" asp-controller="Titre" asp-action="Edit"
asp-route-id="@Model.Details.IdTitre" class="btn text-primary btn-sm">
<i class="fa fa-pen-to-square me-1"></i> Editer
</a>
@@ -88,7 +89,7 @@
class="img-fluid rounded shadow"
alt="Jaquette"
loading="lazy"
fetchpriority="high" />
fetchpriority="high"/>
</div>
</div>
@@ -121,7 +122,7 @@
<input name="Auteur"
class="form-control input-full"
placeholder="Votre nom"
required />
required/>
</div>
</div>
@@ -131,10 +132,10 @@
</label>
<div class="col">
<textarea name="Contenu"
rows="3"
class="form-control input-full"
placeholder="Votre commentaire..."
required></textarea>
rows="3"
class="form-control input-full"
placeholder="Votre commentaire..."
required></textarea>
</div>
</div>
@@ -156,7 +157,7 @@
<h4 class="mb-4">Commentaires</h4>
@if (Model.Details.Commentaires != null && Model.Details.Commentaires.Any())
@if (Model.Details.Commentaires.Any())
{
foreach (var comment in Model.Details.Commentaires.OrderByDescending(c => c.DateCreation))
{
@@ -169,7 +170,7 @@
width="50"
height="50"
class="rounded-circle me-3 shadow-sm"
alt="avatar" />
alt="avatar"/>
<div>
<strong>@comment.Auteur</strong>,

View File

@@ -26,7 +26,7 @@
<div class="d-flex align-items-start my-3">
<!-- Image -->
<a asp-action="Details"
<a asp-action="Index"
asp-route-id="@titre.IdTitre"
class="me-3 text-black">
<img src="@titre.UrlJaquette" alt="@titre.Libelle" width="70px" height="70px" class="object-fit-cover" loading="lazy"/>
@@ -41,7 +41,7 @@
@titre.ArtisteNom
</a>
-
<a asp-action="Details"
<a asp-action="Index"
asp-route-id="@titre.IdTitre">
@titre.Libelle
</a>