Merge branch 'develop' into trunk

This commit is contained in:
Jérémy Munsch 2026-10-28 15:13:49 +01:00
commit 8be89194e3
No known key found for this signature in database
GPG key ID: 2AAECDA6B7330F91
3 changed files with 52 additions and 36 deletions

View file

@ -10,27 +10,27 @@ use Monolog\Processor\PsrLogMessageProcessor;
return [
/*
*--------------------------------------------------------------------------
* Default Log Channel
*--------------------------------------------------------------------------
*
* This option defines the default log channel that is utilized to write
* messages to your logs. The value provided here should match one of
* the channels present in the list of "channels" configured below.
*
|--------------------------------------------------------------------------
| Default Log Channel
|--------------------------------------------------------------------------
|
| This option defines the default log channel that is utilized to write
| messages to your logs. The value provided here should match one of
| the channels present in the list of "channels" configured below.
|
*/
'default' => env('LOG_CHANNEL', 'stack'),
/*
*--------------------------------------------------------------------------
* Deprecations Log Channel
*--------------------------------------------------------------------------
*
* This option controls the log channel that should be used to log warnings
* regarding deprecated PHP and library features. This allows you to get
* your application ready for upcoming major versions of dependencies.
*
|--------------------------------------------------------------------------
| Deprecations Log Channel
|--------------------------------------------------------------------------
|
| This option controls the log channel that should be used to log warnings
| regarding deprecated PHP and library features. This allows you to get
| your application ready for upcoming major versions of dependencies.
|
*/
'deprecations' => [
@ -39,17 +39,17 @@ return [
],
/*
*--------------------------------------------------------------------------
* Log Channels
*--------------------------------------------------------------------------
*
* Here you may configure the log channels for your application. Laravel
* utilizes the Monolog PHP logging library, which includes a variety
* of powerful log handlers and formatters that you're free to use.
*
* Available drivers: "single", "daily", "slack", "syslog",
* "errorlog", "monolog", "custom", "stack"
*
|--------------------------------------------------------------------------
| Log Channels
|--------------------------------------------------------------------------
|
| Here you may configure the log channels for your application. Laravel
| utilizes the Monolog PHP logging library, which includes a variety
| of powerful log handlers and formatters that you're free to use.
|
| Available drivers: "single", "daily", "monthly", "slack", "syslog",
| "errorlog", "monolog", "custom", "stack"
|
*/
'channels' => [
@ -71,7 +71,15 @@ return [
'driver' => 'daily',
'path' => storage_path('logs/laravel.log'),
'level' => env('LOG_LEVEL', 'debug'),
'days' => env('LOG_DAILY_DAYS', 14),
'max_files' => env('LOG_DAILY_DAYS', 14),
'replace_placeholders' => true,
],
'monthly' => [
'driver' => 'monthly',
'path' => storage_path('logs/laravel.log'),
'level' => env('LOG_LEVEL', 'debug'),
'max_files' => 3,
'replace_placeholders' => true,
],

View file

@ -1,7 +1,7 @@
<template>
<div>
<div class="h1 sticky-md-top sticky-top-offset bg-body py-2 z-3 text-uppercase">
{{ __('All aisles') }}
{{ pageTitle }}
</div>
<div
@ -53,7 +53,7 @@
<script lang="ts" setup>
import { storeToRefs } from "pinia";
import { onMounted, onUnmounted, ref } from "vue";
import { computed, onMounted, onUnmounted, ref } from "vue";
import { useProductViewerStore } from "@fo/stores";
import { __, trans_choice } from "@modules/trans";
@ -62,14 +62,22 @@ import ProductCard from "./ProductCard.vue";
defineOptions({ name: "AilesViewer" });
const store = useProductViewerStore();
const { loading, filteredProductList } = storeToRefs(store);
const {
loading, filteredProductList, activeBrands, activeRanges, activeTags, isDiscounted, currentSearchValue
} = storeToRefs(store);
const scrollSentinel = ref<HTMLElement | null>(null);
let observer: IntersectionObserver | null = null;
const anyBrandChecked = computed<boolean>(() => activeBrands.value.length > 0);
const anyRangeChecked = computed<boolean>(() => activeRanges.value.length > 0);
const anyTagChecked = computed<boolean>(() => activeTags.value.length > 0);
const hascheckedAnOption = computed<boolean>(() => currentSearchValue.value.length > 0 || anyBrandChecked.value
|| anyRangeChecked.value || anyTagChecked.value|| anyBrandChecked.value || isDiscounted.value
);
const pageTitle = computed<string>(() => hascheckedAnOption.value ? __("Your search") : __("All aisles"));
onMounted(() => {
observer = new IntersectionObserver((entries) => {
const firstEntry = entries[0];

View file

@ -18,12 +18,12 @@
@foreach ($faqs as $key => $faq)
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button" data-bs-toggle="collapse" data-bs-target="#faq-{{ $key }}" type="button"
aria-expanded="true" aria-controls="faq-{{ $key }}">
<button class="accordion-button collapsed" data-bs-toggle="collapse" data-bs-target="#faq-{{ $key }}" type="button"
aria-controls="faq-{{ $key }}">
<span class="fw-semibold">{{ $faq->question }}</span>
</button>
</h2>
<div class="accordion-collapse show collapse" id="faq-{{ $key }}" data-bs-parent="#faq-list">
<div class="accordion-collapse collapse" id="faq-{{ $key }}" data-bs-parent="#faq-list">
<div class="accordion-body">
<div class="ck-content m-0 p-3 pt-2">{!! clean($faq->answer) !!}</div>
</div>