Skip to content
Snippets Groups Projects
Commit 1a4e5ea5 authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

Merge branch '23-caracteres-speciaux-mal-geres' into 'master' 

Resolve "Caractères spéciaux mal gérés"

Closes #23

See merge request !22
parents f29d57ae d2ab7643
Branches
No related tags found
1 merge request!22Resolve "Caractères spéciaux mal gérés"
Pipeline #762 passed
Stage: test
Stage: deploy
Stage: sentry_release
Show whitespace changes
Inline Side-by-side
Showing
with 47 additions and 41 deletions
resources/views/admin/about/edit.blade.php
+ 9
− 3
View file @ 1a4e5ea5
......@@ -12,11 +12,17 @@
@method('PUT')
@endif
<x-bs.select id="lang-select" label="Langue" name="lang" :options="['fr' => 'Français', 'en' => 'Anglais']" class="mb-3" selected="{{ old('lang', $lang ?? 'fr') }}" />
<x-bs.select id="lang-select" label="Langue" name="lang"
:options="['fr' => 'Français', 'en' => 'Anglais']"
class="mb-3" ;selected="old('lang', $lang ?? 'fr')" />
<x-bs.input label="Description d'accroche" name="attract_desc" class="mb-3" value="{{ old('attract_desc', $attractDesc ?? '') }}" required />
<x-bs.input label="Description d'accroche" name="attract_desc" class="mb-3"
:value="old('attract_desc', $attractDesc ?? '')"
required />
<x-bs.textarea label="Contenu" name="content" class="mb-3" value="{{ old('content', $content ?? '') }}" required />
<x-bs.textarea label="Contenu" name="content" class="mb-3"
:value="old('content', $content ?? '')"
required />
<x-bs.input type="file" label="Image" name="picture" class="mb-3" :required="empty($section)" />
......
resources/views/admin/categories/edit.blade.php
+ 3
− 3
View file @ 1a4e5ea5
......@@ -22,14 +22,14 @@
name="lang"
:options="['fr' => 'Français', 'en' => 'Anglais']"
class="mb-3"
selected="{{ old('lang', $lang ?? 'fr') }}"
:selected="old('lang', $lang ?? 'fr')"
/>
<x-bs.input
label="Nom de la catégorie"
name="name"
class="mb-3"
value="{{ old('name', $name ?? '') }}"
:value="old('name', $name ?? '')"
required
data-form-type="other"
/>
......@@ -38,7 +38,7 @@ class="mb-3"
label="Slug"
name="slug"
class="mb-3"
value="{{ old('slug', !empty($category) ? $category->slug : '') }}"
:value="old('slug', !empty($category) ? $category->slug : '')"
required
/>
......
resources/views/admin/creations/edit.blade.php
+ 6
− 6
View file @ 1a4e5ea5
......@@ -52,14 +52,14 @@
name="lang"
:options="['fr' => 'Français', 'en' => 'Anglais']"
class="mb-3"
selected="{{ old('lang', $lang ?? 'fr') }}"
:selected="old('lang', $lang ?? 'fr')"
/>
<x-bs.input
label="Nom de la création"
name="name"
class="mb-3"
value="{{ old('name', $name ?? '') }}"
:value="old('name', $name ?? '')"
data-form-type="other"
required
/>
......@@ -68,7 +68,7 @@ class="mb-3"
label="Slug"
name="slug"
class="mb-3"
value="{{ old('slug', !empty($creation) ? $creation->slug : '') }}"
:value="old('slug', !empty($creation) ? $creation->slug : '')"
data-form-type="other"
required
/>
......@@ -79,7 +79,7 @@ class="mb-3"
name="category_id"
:options="$categories"
class="mb-3"
selected="{{ old('category_id', $creation->category_id ?? '') }}"
:selected="old('category_id', $creation->category_id ?? '')"
/>
<x-bs.input
......@@ -87,7 +87,7 @@ class="mb-3"
label="Courte description"
name="short_description"
class="mb-3"
value="{{ old('short_description', $shortDescription ?? '') }}"
:value="old('short_description', $shortDescription ?? '')"
data-form-type="other"
/>
......@@ -95,7 +95,7 @@ class="mb-3"
label="Description"
name="description"
class="mb-3"
value="{{ old('description', $description ?? '') }}"
:value="old('description', $description ?? '')"
data-form-type="other"
/>
......
resources/views/admin/events/edit.blade.php
+ 6
− 6
View file @ 1a4e5ea5
......@@ -38,14 +38,14 @@
name="lang"
:options="['fr' => 'Français', 'en' => 'Anglais']"
class="mb-3"
selected="{{ old('lang', $lang ?? 'fr') }}"
:selected="old('lang', $lang ?? 'fr')"
/>
<x-bs.input
label="Nom de l'évènement"
name="name"
class="mb-3"
value="{{ old('name', $name ?? '') }}"
:value="old('name', $name ?? '')"
required
/>
......@@ -53,7 +53,7 @@ class="mb-3"
label="Slug"
name="slug"
class="mb-3"
value="{{ old('slug', $event->slug ?? '') }}"
:value="old('slug', $event->slug ?? '')"
required
/>
......@@ -62,7 +62,7 @@ class="mb-3"
label="Date de Début"
name="date_start"
class="mb-3"
value="{{ old('date_start', (!empty($event) ? $event->date_start->format('Y-m-d') : '')) }}"
:value="old('date_start', (!empty($event) ? $event->date_start->format('Y-m-d') : ''))"
required
/>
......@@ -71,7 +71,7 @@ class="mb-3"
label="Date de Fin"
name="date_end"
class="mb-3"
value="{{ old('date_end', (!empty($event) ? $event->date_end->format('Y-m-d') : '')) }}"
:value="old('date_end', (!empty($event) ? $event->date_end->format('Y-m-d') : ''))"
required
/>
......@@ -79,7 +79,7 @@ class="mb-3"
label="Ville"
name="city"
class="mb-3"
value="{{ old('city', $event->city ?? '') }}"
:value="old('city', $event->city ?? '')"
required
/>
......
resources/views/admin/prestations/edit.blade.php
+ 7
− 7
View file @ 1a4e5ea5
......@@ -50,14 +50,14 @@
name="lang"
:options="['fr' => 'Français', 'en' => 'Anglais']"
class="mb-3"
selected="{{ old('lang', $lang ?? 'fr') }}"
:selected="old('lang', $lang ?? 'fr')"
/>
<x-bs.input
label="Nom de la prestation"
name="name"
class="mb-3"
value="{{ old('name', $name ?? '') }}"
:value="old('name', $name ?? '')"
required
/>
......@@ -67,14 +67,14 @@ class="mb-3"
name="category_id"
:options="$categories"
class="mb-3"
selected="{{ old('category_id', $prestation->category_id ?? '') }}"
:selected="old('category_id', $prestation->category_id ?? '')"
/>
<x-bs.input
label="Icon SVG"
name="icon_svg"
class="mb-3"
value="{!! old('icon_svg', $prestation->icon_svg ?? '') !!}"
:value="old('icon_svg', $prestation->icon_svg ?? '')"
/>
<x-bs.input
......@@ -82,7 +82,7 @@ class="mb-3"
label="Détail (pour les cartes de la page d'accueil)"
name="detail"
class="mb-3"
value="{{ old('detail', $prestation->detail ?? '') }}"
:value="old('detail', $prestation->detail ?? '')"
data-form-type="other"
/>
......@@ -90,14 +90,14 @@ class="mb-3"
label="Description Attrayante"
name="attract_desc"
class="mb-3"
value="{!! old('attract_desc', $attractionDesc ?? '') !!}"
:value="old('attract_desc', $attractionDesc ?? '')"
/>
<x-bs.textarea
label="Description Contenu"
name="content_desc"
class="mb-3"
value="{{ old('content_desc', $contentDesc ?? '') }}"
:value="old('content_desc', $contentDesc ?? '')"
required
/>
......
resources/views/admin/social-media-links/edit.blade.php
+ 3
− 3
View file @ 1a4e5ea5
......@@ -27,7 +27,7 @@
label="Nom de l'icône"
name="icon_name"
class="mb-3"
value="{{ old('icon_name', $link->icon_name ?? '') }}"
:value="old('icon_name', $link->icon_name ?? '')"
required
data-form-type="other"
/>
......@@ -37,7 +37,7 @@ class="mb-3"
label="Nom du réseau"
name="name"
class="mb-3"
value="{{ old('name', $link->name ?? '') }}"
:value="old('name', $link->name ?? '')"
required
data-form-type="other"
/>
......@@ -46,7 +46,7 @@ class="mb-3"
label="Lien"
name="url"
class="mb-3"
value="{{ old('slug', !empty($link) ? $link->url : '') }}"
:value="old('slug', !empty($link) ? $link->url : '')"
required
/>
......
resources/views/components/bs/card.blade.php
+ 7
− 7
View file @ 1a4e5ea5
......@@ -16,7 +16,7 @@
<div class="card" style="width: {{ $width }};">
@if(!empty($badgeText))
<span class="badge text-bg-{{ $badgeVariant }} position-absolute m-2">
{{ $badgeText }}
{!! $badgeText !!}
</span>
@endif
......@@ -32,22 +32,22 @@
@if($header)
<div class="card-header">
{{ $header }}
{!! $header !!}
</div>
@endif
<div class="card-body">
@if($title)
<h5 class="card-title">{{ $title }}</h5>
<h5 class="card-title">{!! $title !!}</h5>
@endif
@if($subtitle)
<h6 class="card-subtitle mb-2 text-body-secondary">{{ $subtitle }}</h6>
<h6 class="card-subtitle mb-2 text-body-secondary">{!! $subtitle !!}</h6>
@endif
@if($text)
<p class="card-text">{{ $text }}</p>
<p class="card-text">{!! $text !!}</p>
@endif
@foreach($links as $link)
<a href="{{ $link['url'] }}" class="card-link">{{ $link['text'] }}</a>
<a href="{{ $link['url'] }}" class="card-link">{!! $link['text'] !!}</a>
@endforeach
</div>
......@@ -57,7 +57,7 @@
@if($footer)
<div class="card-footer">
{{ $footer }}
{!! $footer !!}
</div>
@endif
</div>
\ No newline at end of file
resources/views/components/public/event-card.blade.php
+ 6
− 6
View file @ 1a4e5ea5
......@@ -4,7 +4,7 @@
<div class="flex flex-col gap-3">
<div class="aspect-[3/4] p-1 w-full bg-gradient-to-r from-pink-normal to-yellow-normal rounded-2xl flex items-center gap-2.5 relative">
<img class="rounded-xl w-full h-full object-cover"
alt="{{ __('events.illustration', ['event' => $event->nameTranslationKey->getTranslation()]) }}"
alt="{!! e(__('events.illustration', ['event' => $event->nameTranslationKey->getTranslation()])) !!}"
src="{{ $event->uploadedPicture->getMediumSizeUrl() }}"/>
<x-public.badge size="small" class="absolute top-4 right-4">
{{ __('events.soon') }}
......@@ -12,7 +12,7 @@
</div>
<div class="h-20 flex-col gap-0.5 flex">
<div class="text-2xl font-bold">
{{ $event->nameTranslationKey->getTranslation() }}
{!! e($event->nameTranslationKey->getTranslation()) !!}
</div>
<div class="font-bold bg-gradient-to-r from-pink-normal to-yellow-normal text-transparent bg-clip-text">
{{ $event->date_start->format('d') }}-{{ $event->date_end->format('d M Y') }}
......@@ -21,7 +21,7 @@
<div class="flex items-center gap-1">
<x-font-awesome icon="location-dot" class="mr-2 h-4 fill-muted"/>
<div class="text-muted">
{{ $event->city }}
{!! e($event->city) !!}
</div>
</div>
</div>
......@@ -30,12 +30,12 @@
<div class="flex flex-col gap-3">
<div class="aspect-[3/4] p-1 w-full rounded-2xl flex items-center gap-2.5 relative">
<img class="rounded-xl w-full h-full object-cover"
alt="{{ __('events.illustration', ['event' => $event->nameTranslationKey->getTranslation()]) }}"
alt="{!! e(__('events.illustration', ['event' => $event->nameTranslationKey->getTranslation()])) !!}"
src="{{ $event->uploadedPicture->getMediumSizeUrl() }}"/>
</div>
<div class="h-20 flex-col gap-0.5 flex">
<div class="text-2xl font-bold">
{{ $event->nameTranslationKey->getTranslation() }}
{!! e($event->nameTranslationKey->getTranslation()) !!}
</div>
<div class="font-bold text-muted">
{{ $event->date_start->format('d') }}-{{ $event->date_end->format('d M Y') }}
......@@ -44,7 +44,7 @@
<div class="flex items-center gap-1">
<x-font-awesome icon="location-dot" class="mr-2 h-4 fill-muted"/>
<div class="text-muted">
{{ $event->city }}
{!! e($event->city) !!}
</div>
</div>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment