Merge branch 'develop' into trunk

This commit is contained in:
Vincent BRIDIER 2026-04-17 07:45:48 +02:00
commit 2c80702f4e
12 changed files with 21 additions and 15 deletions

View file

@ -2,7 +2,7 @@
return [
"classes" => [
"user" => "user",
"user" => "user|users",
"dynamic-page" => "dynamic page|dynamic pages",
"page-config" => "page configuration|page configurations",
"activity-log" => "activity log",

View file

@ -2,7 +2,7 @@
return [
"classes" => [
"user" => "utilisateur",
"user" => "utilisateur|utilisateurs",
"dynamic-page" => "page dynamique|pages dynamiques",
"page-config" => "configuration de page|configurations de page",
"activity-log" => "journal d'activité",

View file

@ -7,7 +7,7 @@ data:
APP_ENV: "${APP_APP_ENV}"
APP_KEY: "${APP_APP_KEY}"
APP_DEBUG: "${APP_APP_DEBUG}"
APP_URL: "https://${APP_DOMAIN}"
APP_URL: "https://${REDIRECT}${APP_DOMAIN}"
LOG_CHANNEL: "k8s"
CACHE_STORE: "${APP_CACHE_STORE}"
DB_HOST: "${APP_DB_HOST}"
@ -158,11 +158,14 @@ spec:
- web
- websecure
routes:
- match: Host(`${APP_DOMAIN}`)
- match: Host(`${APP_DOMAIN}`) || Host(`www.${APP_DOMAIN}`)
kind: Rule
services:
- name: ${CI_PROJECT_PATH_SLUG}-service
port: 80
middlewares:
- name: redirect-no-www-to-www
tls:
secretName: ${CRT_TLS_NAME}
---

View file

@ -5,4 +5,4 @@ parameters:
paths:
- app/
level: 5
level: 7

View file

@ -5,6 +5,7 @@ metadata:
spec:
dnsNames:
- $APP_DOMAIN
- www.${APP_DOMAIN}
secretName: $APP_DOMAIN
issuerRef:
name: $APP_CERT_ISSUER

View file

@ -164,7 +164,7 @@ export default function AppSidebar() {
choice: 2,
});
const transAdmin = useTrans("enums.user-role.admin");
const transUsers = useTrans("models.classes.user");
const transUsers = useTrans("models.classes.user", { choice: 2 });
const transActivityLogs = useTrans("models.classes.activity-log");
const transPageConfigs = useTrans("models.classes.page-config", {
choice: 2,

View file

@ -22,7 +22,7 @@ export default function Create({ data }: { data: SingleResource }) {
: "crud.helpers.creation_model",
{
params: {
model: useTrans("models.classes.user"),
model: useTrans("models.classes.user", { choice: 1 }),
},
},
);

View file

@ -41,7 +41,9 @@ export default function Edit({ data }: { data: SingleResource }) {
return (
<AuthenticatedLayout
title={useTrans("crud.helpers.edition_model", {
params: { model: useTrans("models.classes.user") },
params: {
model: useTrans("models.classes.user", { choice: 1 }),
},
})}
beforeNode={beforeNode()}
>

View file

@ -187,7 +187,7 @@ export default function Index({
return (
<AuthenticatedLayout
title={str(useTrans("models.classes.user"))
title={str(useTrans("models.classes.user", { choice: 1 }))
.ucFirst()
.plural()
.value()}

View file

@ -20,7 +20,7 @@ interface Stringable {
*/
slug: () => Stringable;
/**
* Pascal case a word based.
* Upper case the first letter of a word based.
* Examples:
* - some $ in the GARDEN ! -> Some $ in the GARDEN !
*
@ -28,7 +28,7 @@ interface Stringable {
*/
ucFirst: () => Stringable;
/**
* Pascal case a word based.
* Camel case a word based.
* Examples:
* - Some $ in the GARDEN ! -> some$InTheGarden!
*

View file

@ -20,6 +20,7 @@
'terms' => $searchTerm,
]);
$currentLocale = app()->getLocale();
$routeAjax = route('front.searching.ajax.news');
@endphp
@push('scripts')
@ -46,7 +47,7 @@
results.innerHTML = '';
pagination.innerHTML = '';
fetch('/search/load/results', {
fetch(@json($routeAjax), {
method: 'POST',
headers: {
'Content-Type': 'application/json',

View file

@ -26,12 +26,11 @@ Route::group(
->where('unsubscribe', 'unsubscribe|unsubscribe.php|unsubscribe.html|newsletter')
->name('unsubscribeNewsletter');
// Search routes.
Route::get(LaravelLocalization::transRoute('routes.front.search'), [SearchController::class, 'search'])
->name('search');
Route::post('/search/load/results', [SearchController::class, 'ajaxSearchLoadResults'])
->name('search.ajax.news');
Route::post('/searching/load/results', [SearchController::class, 'ajaxSearchLoadResults'])
->name('searching.ajax.news');
// Filters routes.
Route::prefix('posts')->group(function () {