forge-joniko/ldc-volena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'update' into 'develop'

Browse source 
fix: 🚸 check if nav links is empty, then display or not the...

See merge request ldc-web/projets/volena!78
This commit is contained in:
Karl M'muller 2026-08-13 11:11:41 +00:00
commit d5edac7cba
10 changed files with 454 additions and 376 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.husky/commit-msg
View file

@ -1,3 +1,2 @@
#!/bin/sh
npx --no -- commitlint --config node_modules/@uwil/husky-config/commitlint.config.cjs --edit $1
npx commitlint --config node_modules/@uwil/husky-config/commitlint.config.js --edit $1

2
app/Http/Controllers/Fo/StaticPageController.php
View file

@ -82,7 +82,7 @@ class StaticPageController extends Controller
public function unveil(): \Illuminate\Contracts\View\View
{
$staticPageModel = StaticPage::query()->where('type', StaticPageType::unveil)->first();
$sectionModels = Section::query()->where('page_id', $staticPageModel->id)->get();
$sectionModels = Section::query()->where('page_id', $staticPageModel->getKey())->get();
$historicalMilestoneModels = HistoricalMilestone::query()->orderBy('year', 'ASC')->get();
/** @var \Illuminate\Database\Eloquent\Collection<array-key,\App\Models\Site> */
$siteModelList = Site::query()->orderBy('order')->get();

2
app/Http/Requests/Bo/Stickies/StoreStickyRequest.php
View file

@ -56,7 +56,7 @@ class StoreStickyRequest extends FormRequest
'type' => trans('validation.custom.type'),
'title' => trans('validation.attributes.title'),
'anchor' => trans('validation.custom.anchor'),
'color' => trans('validation.custom.color'),
'color' => trans('validation.custom.color'),
];
}
}

1
commitlint.config.cjs
View file

@ -1 +0,0 @@
module.exports = require('@uwil/husky-config/commitlint.config.cjs');

1
commitlint.config.js Normal file
View file

@ -0,0 +1 @@
export default { extends: ["@uwil/husky-config/commitlint.config.js"] };

699
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -29,7 +29,7 @@
"@types/toastify-js": "^1.12.1",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.36.2",
"@uwil/husky-config": "^1.0.1",
"@uwil/husky-config": "^1.1.1",
"@vitejs/plugin-basic-ssl": "^1.0.1",
"@vitejs/plugin-vue": "^4.6.2",
"@vue/compiler-sfc": "latest",

40
resources/views/fo/pages/commitments.blade.php
View file

@ -17,27 +17,29 @@
@section('content')
<section class="commit">
<div class="sticky-navigation">
<div class="sticky-navigation-wrapper show row m-0 p-0">
@foreach ($navLinks as $link)
<div class="col-6 col-md-12 py-md-1 p-2">
<div class="rounded-5 bg-{{ $link->color->name }}-light shadow-sm">
<a class="d-flex justify-content-center align-items-center text-primary text-decoration-none p-sm-3 p-2"
data-bs-toggle="tooltip" href="#{{ $link->anchor }}"
title="{{ __('Accéder à la partie :name de la page', ['name' => $link->title]) }}">
<span class="badge rounded-pill bg-{{ $link->color->name }} d-block me-2"></span>
<small>{{ $link->title }}</small>
</a>
@if ($navLinks->count())
<div class="sticky-navigation">
<div class="sticky-navigation-wrapper show row m-0 p-0">
@foreach ($navLinks as $link)
<div class="col-6 col-md-12 py-md-1 p-2">
<div class="rounded-5 bg-{{ $link->color->name }}-light shadow-sm">
<a class="d-flex justify-content-center align-items-center text-primary text-decoration-none p-sm-3 p-2"
data-bs-toggle="tooltip" href="#{{ $link->anchor }}"
title="{{ __('Accéder à la partie :name de la page', ['name' => $link->title]) }}">
<span class="badge rounded-pill bg-{{ $link->color->name }} d-block me-2"></span>
<small>{{ $link->title }}</small>
</a>
</div>
</div>
</div>
@endforeach
@endforeach
</div>
<button class="d-none d-md-block btn btn-primary rounded-pill mt-1 w-fit px-3"
title="{{ __('Afficher/Masquer le menu des ancres') }}">
<i class="fa-solid fa-plus d-none"></i>
<i class="fa-solid fa-minus"></i>
</button>
</div>
<button class="d-none d-md-block btn btn-primary rounded-pill mt-1 w-fit px-3"
title="{{ __('Afficher/Masquer le menu des ancres') }}">
<i class="fa-solid fa-plus d-none"></i>
<i class="fa-solid fa-minus"></i>
</button>
</div>
@endif
{{-- AMBITION --}}
<section class="ambition anchor-padding container my-4" id="introduction">
<span id="sticky-displayer"></span>

40
resources/views/fo/pages/hire.blade.php
View file

@ -17,27 +17,29 @@
@section('content')
<section class="we-hire">
<div class="sticky-navigation">
<div class="sticky-navigation-wrapper show row m-0 p-0">
@foreach ($navLinks as $link)
<div class="col-6 col-md-12 py-md-1 p-2">
<div class="rounded-5 shadow-sm h-100 bg-{{ $link->color->name }}-light">
<a class="d-flex justify-content-start align-items-center text-primary text-decoration-none p-sm-3 p-2 h-100"
data-bs-toggle="tooltip" href="#{{ $link->anchor }}"
title="{{ __('Accéder à la partie :name de la page', ['name' => $link->title]) }}">
<span class="badge rounded-pill d-block me-2 bg-{{ $link->color->name }}"></span>
<small>{{ $link->title }}</small>
</a>
@if ($navLinks->count())
<div class="sticky-navigation">
<div class="sticky-navigation-wrapper show row m-0 p-0">
@foreach ($navLinks as $link)
<div class="col-6 col-md-12 py-md-1 p-2">
<div class="rounded-5 shadow-sm h-100 bg-{{ $link->color->name }}-light">
<a class="d-flex justify-content-start align-items-center text-primary text-decoration-none p-sm-3 p-2 h-100"
data-bs-toggle="tooltip" href="#{{ $link->anchor }}"
title="{{ __('Accéder à la partie :name de la page', ['name' => $link->title]) }}">
<span class="badge rounded-pill d-block me-2 bg-{{ $link->color->name }}"></span>
<small>{{ $link->title }}</small>
</a>
</div>
</div>
</div>
@endforeach
@endforeach
</div>
<button class="d-none d-md-block btn btn-primary rounded-pill mt-1 w-fit px-3"
title="{{ __('Afficher/Masquer le menu des ancres') }}">
<i class="fa-solid fa-plus d-none"></i>
<i class="fa-solid fa-minus"></i>
</button>
</div>
<button class="d-none d-md-block btn btn-primary rounded-pill mt-1 w-fit px-3"
title="{{ __('Afficher/Masquer le menu des ancres') }}">
<i class="fa-solid fa-plus d-none"></i>
<i class="fa-solid fa-minus"></i>
</button>
</div>
@endif
{{-- COMPAGNY LIFE --}}
<section class="company-life anchor-padding" id="company-life">
<span id="sticky-displayer"></span>

40
resources/views/fo/pages/unveil.blade.php
View file

@ -17,27 +17,29 @@
@section('content')
<section class="unveil">
<div class="sticky-navigation">
<div class="sticky-navigation-wrapper show row m-0 p-0">
@foreach ($navLinks as $link)
<div class="col-6 col-md-12 py-md-1 p-2">
<div class="rounded-5 shadow-sm h-100 bg-{{ $link->color->name }}-light">
<a class="d-flex justify-content-start align-items-center text-primary text-decoration-none p-sm-3 p-2 h-100"
data-bs-toggle="tooltip" href="#{{ $link->anchor }}"
title="{{ __('Accéder à la partie :name de la page', ['name' => $link->title]) }}">
<span class="badge rounded-pill d-block me-2 bg-{{ $link->color->name }}"></span>
<small>{{ $link->title }}</small>
</a>
@if ($navLinks->count())
<div class="sticky-navigation">
<div class="sticky-navigation-wrapper show row m-0 p-0">
@foreach ($navLinks as $link)
<div class="col-6 col-md-12 py-md-1 p-2">
<div class="rounded-5 shadow-sm h-100 bg-{{ $link->color->name }}-light">
<a class="d-flex justify-content-start align-items-center text-primary text-decoration-none p-sm-3 p-2 h-100"
data-bs-toggle="tooltip" href="#{{ $link->anchor }}"
title="{{ __('Accéder à la partie :name de la page', ['name' => $link->title]) }}">
<span class="badge rounded-pill d-block me-2 bg-{{ $link->color->name }}"></span>
<small>{{ $link->title }}</small>
</a>
</div>
</div>
</div>
@endforeach
@endforeach
</div>
<button class="d-none d-md-block btn btn-primary rounded-pill mt-1 w-fit px-3"
title="{{ __('Afficher/Masquer le menu des ancres') }}">
<i class="fa-solid fa-plus d-none"></i>
<i class="fa-solid fa-minus"></i>
</button>
</div>
<button class="d-none d-md-block btn btn-primary rounded-pill mt-1 w-fit px-3"
title="{{ __('Afficher/Masquer le menu des ancres') }}">
<i class="fa-solid fa-plus d-none"></i>
<i class="fa-solid fa-minus"></i>
</button>
</div>
@endif
{{-- KEY NUMBERS --}}
<section class="key-numbers anchor-padding my-5" id="key-numbers">
<span id="sticky-displayer"></span>