Compare commits

..

36 commits

Author SHA1 Message Date
Jérémy Munsch
73eeec3e75
Merge branch 'trunk' 2023-06-27 09:28:53 +02:00
Jérémy Munsch
4890e1d55f
Merge branch 'develop' into trunk 2023-06-27 09:27:47 +02:00
Vincent BRIDIER
1f34c77256
Merge branch 'trunk' 2023-06-26 17:48:47 +02:00
Vincent BRIDIER
49a02d3e2d
Merge branch 'develop' into trunk 2023-06-26 17:47:49 +02:00
Vincent BRIDIER
aca7083436
Merge branch 'trunk' 2023-06-26 15:50:13 +02:00
Vincent BRIDIER
6b234cd0cc
Merge branch 'develop' into trunk 2023-06-26 15:16:34 +02:00
Vincent BRIDIER
ecbf1a8837
Merge branch 'trunk' 2023-05-02 17:15:52 +02:00
Vincent BRIDIER
1c0d7bae5e
Merge branch 'develop' into trunk 2023-05-02 17:15:44 +02:00
Vincent BRIDIER
0d61ee8295
Merge branch 'trunk' 2023-04-27 15:14:30 +02:00
Vincent BRIDIER
cb0fa25557
Merge branch 'develop' into trunk 2023-04-27 10:59:25 +02:00
Vincent BRIDIER
00865f4eff
Merge branch 'trunk' 2023-04-17 12:57:46 +02:00
Vincent BRIDIER
8ab156452f
Merge branch 'develop' into trunk 2023-04-17 12:57:34 +02:00
Vincent BRIDIER
f01db43447
Merge branch 'trunk' 2023-04-17 12:16:55 +02:00
Vincent BRIDIER
37c3e78dc8
Merge branch 'develop' into trunk 2023-04-17 12:16:46 +02:00
Vincent BRIDIER
05de5830f8
Merge branch 'trunk' 2023-04-17 12:04:55 +02:00
Vincent BRIDIER
7d55cf7a39
Merge branch 'develop' into trunk 2023-04-17 12:04:42 +02:00
Vincent BRIDIER
765f9a06df
Merge branch 'trunk' 2023-03-23 12:06:36 +01:00
Vincent BRIDIER
1dc9c3e4d1
Merge branch 'develop' into trunk 2023-03-23 12:06:25 +01:00
Vincent BRIDIER
a57525226f
Merge branch 'trunk' 2023-03-20 14:20:50 +01:00
Vincent BRIDIER
e4656628f7
Merge branch 'develop' into trunk 2023-03-20 14:20:37 +01:00
Vincent BRIDIER
b6d081ec26
Merge branch 'trunk' 2023-02-16 10:15:44 +01:00
Vincent BRIDIER
81b2bed386
Merge branch 'develop' into trunk 2023-02-16 10:15:05 +01:00
Vincent BRIDIER
993d1358a6
Merge branch 'trunk' 2023-01-27 10:33:20 +01:00
Vincent BRIDIER
7d956a54df
Merge branch 'develop' into trunk 2023-01-27 10:30:35 +01:00
Vincent BRIDIER
f37200aedf
Merge branch 'trunk' 2023-01-11 18:31:00 +01:00
Vincent BRIDIER
cb77f9bb14
Merge branch 'develop' into trunk 2023-01-11 18:30:38 +01:00
Vincent BRIDIER
785a6db60f
Merge branch 'trunk' 2023-01-11 18:06:32 +01:00
Vincent BRIDIER
2c26ecb874
Merge branch 'develop' into trunk 2023-01-11 17:49:56 +01:00
Jérémy Munsch
819d964c15
Merge branch 'develop' into trunk 2022-11-07 10:43:48 +01:00
Vincent BRIDIER
d6b3cb767e
Merge branch 'trunk' 2022-09-19 09:14:22 +02:00
Vincent BRIDIER
fcc2e101d9
Merge branch 'develop' into trunk 2022-09-19 09:13:34 +02:00
Olivier Legat
7d768bda93 Merge branch 'hotfix' 2022-09-13 15:31:44 +02:00
Olivier Legat
c346fb350b Merge branch 'hotfix' 2022-09-12 13:51:57 +02:00
Vincent BRIDIER
9e460153d6
Merge branch 'develop' into trunk 2022-08-26 12:55:56 +02:00
Jérémy Munsch
aa4de0d001
Merge branch 'hotfix' 2022-08-24 12:55:26 +02:00
Vincent BRIDIER
642316cb5b
Merge branch 'develop' into trunk 2022-08-23 10:30:29 +02:00
23 changed files with 1001 additions and 1263 deletions

View file

@ -74,6 +74,7 @@ MESBR_COUPON_2_CHARCUT=""
MESBR_COUPON_3_CHARCUT=""
## GOOGLE
ANALYTICS_GOOGLE_ID=
GOOGLE_MAP_API_KEY=
# Google Recaptcha

View file

@ -21,10 +21,8 @@ class OpInstaController extends Controller
{
$this->assertConfigIsValid();
$has_started = $this->hasStarted();
$instaMediaList = [];
if ($has_started) {
$instaMediaList = InstaMedia::query()->orderBy('id')->get()
$instaMediaList = InstaMedia::query()->orderBy('id')->get()
->map(function (InstaMedia $media) {
$path = \explode('/', \rtrim(\parse_url(
$media->permalink,
@ -34,7 +32,6 @@ class OpInstaController extends Controller
$media->pictures = $this->fetchPicture(\collect($path)->last());
return $media;
});
};
return \view('front.opinsta.index', \compact('instaMediaList', 'has_started'));
}
@ -56,8 +53,8 @@ class OpInstaController extends Controller
'start' => $start,
'end' => $end,
], [
'start' => 'date_format:d-m-Y|before:end|required',
'end' => 'date_format:d-m-Y|after:start|required',
'start' => 'date_format:d-m-Y|before:end',
'end' => 'date_format:d-m-Y|after:start',
]);
} catch (ValidationException $e) {
$message = \collect($e->errors())->map(function ($el) {

View file

@ -20,12 +20,12 @@
"guzzlehttp/guzzle": "^7.4",
"kwaadpepper/enum": "^2.1",
"kwaadpepper/image-resizer": "^0.1.0",
"kwaadpepper/refresh-sitemap": "1.0.0",
"kwaadpepper/serial-int-caster": "1.0.1",
"laravel/framework": "^8.0",
"laravel/tinker": "^2.0",
"laravel/ui": "^3.0",
"ldc/ldccrmv2client": "^3.0",
"ldc/sitemap-generator": "^1.0",
"league/csv": "^9.6",
"mews/purifier": "^3.3",
"nunomaduro/collision": "^5.0",

1616
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,6 @@
<?php
return [
'apiKey' => env('GOOGLE_MAP_API_KEY')
'apiKey' => env('GOOGLE_MAP_API_KEY'),
'analyticsKey' => env('ANALYTICS_GOOGLE_ID')
];

143
config/refresh-sitemap.php Normal file
View file

@ -0,0 +1,143 @@
<?php
use App\Enums\BreedingPageType;
use App\Enums\EleveurOcbStatus;
use App\Models\Articles;
use App\Models\BreedingPage;
use App\Models\ConsumptionTimes;
use App\Models\Label;
use App\Models\MeatTypes;
use App\Models\Products;
use App\Models\Range;
use App\Models\Recipes;
use Spatie\Sitemap\Tags\Url;
return [
'ignoreRoutes' => [
'/login',
'/bo',
'/activer',
'/deconnexion',
'/reinitialiser-mot-de-passe',
'/le-club-des-gaulois/la-boutique',
'/password/confirm',
'/produit/from-menus',
'/la-marque/tracabilite/search',
'/frame',
'/map',
'/_debugbar',
// Hack ignore laravel debug bar.
'/la-marque/actualites/renderActu',
'/le-club-des-gaulois/les-promos/get',
'/{unsubscribe}',
],
'routesBinder' => [
'product.show' => [
'publishedProduct' => [Products::class, 'slug']
],
'products.range' => [
'slugRange' => [Range::class, 'slug'],
'slugSubRange' => [Range::class, 'slug'],
],
'products.consumption-times' => [
'slugConsumptionTime' => [ConsumptionTimes::class, 'slug']
],
'breeding-page.list' => [
'breedingPageType' => [BreedingPageType::class, 'value']
],
'breeding-page.show' => [
'breedingPageType' => [BreedingPageType::class, 'value'],
'breeding_page' => [BreedingPage::class, 'slug']
],
'products.meat-type' => [
'slugMeatType' => [MeatTypes::class, 'slug']
],
'products.label' => [
'slugLabel' => [Label::class, 'slug']
],
'recipes.show' => [
'recipe' => [Recipes::class, 'slug']
],
'club.infos.child' => [
'articleTag' => [Articles::class, 'type'],
'publishedArticle' => [Articles::class, 'slug']
],
'club.indexByCategory' => [
'articleTag' => [Articles::class, 'type']
]
],
/**
* You can put route conditions here
* These will be used to decide whether the route should appear
* in the sitemap or not
*
* These are called in Eloquent where
*
* example
*
* 'queryConditions' => [
* 'status' => true,
* 'ocbStatus' => EleveurOcbStatus::yes()->value,
* 'star_moment' => true
* ]
*
*/
'queryConditions' => [
'status' => true,
'ocbStatus' => strval(EleveurOcbStatus::yes()->value),
'star_moment' => true
],
/**
* The default route frequency to use with sitemap generator
*/
'routeDefaultFrequency' => Url::CHANGE_FREQUENCY_DAILY,
/**
* The default route priority to use with sitemap generator
*
* priority should be a number between 0 and 1
* https://www.sitemaps.org/protocol.html
*/
'routeDefaultPriority' => 0.5,
/**
* Frequencies for routes
* use the full or partial route name as index
* and a frequency within \Spatie\Sitemap\Tags\Url constants
*/
'routeFrequencies' => [
'product-request' => Url::CHANGE_FREQUENCY_WEEKLY
],
/**
* Priorities for routes
* use the full or partial route name as index
* and a priority number between 0 and 1
*/
'routePriorities' => [
'product-request' => 0.6
],
/**
* Enable or disable schedule for the job
* If set to true the sitemap generator will be run
* using the 'cron' instruction
*/
'schedule' => true,
/**
* If you want to set specific
* instruction for when to schedule job
* you can set this with a cron instruction
* You can generate one using https://crontab.guru/
* https://laravel.com/docs/8.x/scheduling#schedule-frequency-options
*
* schedule must be set to true
*
* Default is every day at 15:45
*/
'cron' => '45 15 * * *'
];

View file

@ -1,102 +0,0 @@
<?php
use Spatie\Sitemap\Tags\Url;
return [
/**
* A list of url to ignore
* These are hard coded
* Each url does not have to be exhaustive
*
* For example, if you want to ignore all routes
* of the backoffice group
* just add 'bo' into this table
*
* * Note that this can take route names (both partially or full)
* * You can use a wild card just as for routeIs method
*/
'ignoreRoutes' => [
'back.*',
'bo.*',
'front.frame',
'cspReportUri',
],
/**
* This should be filled using the command `php artisan sitemap:install-completer`
*
* 'completeWith' => [CLASS, 'METHOD'],
* eg : 'completeWith' => [CompleteSitemapWith::class, 'append'],
*
* This should point to a static method which will be called with the folowing parameter
* (LDC\SitemapGenerator\Lib\Sitemap $sitemap)
*
* You may now use $sitemap->addLinks('route.myRouteName', string[] $links)
*/
'completeWith' => null,
/**
* The default route frequency to use with sitemap generator
*/
'routeDefaultFrequency' => Url::CHANGE_FREQUENCY_DAILY,
/**
* The default route priority to use with sitemap generator
*
* priority should be a number between 0 and 1
* https://www.sitemaps.org/protocol.html
*/
'routeDefaultPriority' => 0.5,
/**
* Frequencies for routes
* use the full or partial route name as index
* and a frequency within \Spatie\Sitemap\Tags\Url constants
*
* eg: 'engagments.*' => \Spatie\Sitemap\Tags\Url::CHANGE_FREQUENCY_HOURLY
*/
'routeFrequencies' => [
'brand.news.index' => Url::CHANGE_FREQUENCY_HOURLY,
'products.index' => Url::CHANGE_FREQUENCY_HOURLY,
],
/**
* Priorities for routes
* use the full or partial route name as index
* and a priority in 1.0, 0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1, and 0.0.
*
* 1.0 is the Highest
*
* eg: 'engagments.*' => 1.0
*/
'routePriorities' => [],
/**
* Enable or disable schedule for the job
* If set to true the sitemap generator will be run
* using the 'cron' instruction
*/
'schedule' => true,
/**
* If you want to set specific
* instruction for when to schedule job
* you can set this with a cron instruction
* You can generate one using https://crontab.guru/
*
* schedule must be set to true
*
* Default is every day at 15:45
*/
'cron' => '45 15 * * *',
/**
* The sitemap generator can execute JavaScript on each page so it will
* discover links that are generated by your JS scripts. This feature
* is powered by headless Chrome.
*
* ! This needs pupetter installed with npm : npm i puppeteer (not to put in dev dependencies)
*/
'executeJavascript' => false,
];

145
package-lock.json generated
View file

@ -4,10 +4,9 @@
"requires": true,
"packages": {
"": {
"name": "legaulois",
"dependencies": {
"@fancyapps/fancybox": "^3.5.7",
"@ldc-web/cookie-notice": "^3.0.8",
"@ldc-web/cookie-notice": "^3.0.3",
"animate.css": "^3.7.2",
"detect-element-overflow": "^1.2.0",
"hooper2": "^0.3.6",
@ -125,9 +124,9 @@
}
},
"node_modules/@babel/core/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@ -193,9 +192,9 @@
}
},
"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@ -257,9 +256,9 @@
}
},
"node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@ -1483,9 +1482,9 @@
}
},
"node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@ -1688,9 +1687,9 @@
}
},
"node_modules/@babel/preset-env/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@ -1871,9 +1870,12 @@
"dev": true
},
"node_modules/@ldc-web/cookie-notice": {
"version": "3.0.8",
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-3.0.8.tgz",
"integrity": "sha1-FOc6hEv1L9NOnRDOdyBnbIsd31A="
"version": "3.0.3",
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-3.0.3.tgz",
"integrity": "sha1-9zBm0372Tl+Q+p2FxG073/wHApQ=",
"dependencies": {
"core-js": "^3.30.0"
}
},
"node_modules/@leichtgewicht/ip-codec": {
"version": "2.0.4",
@ -2905,9 +2907,9 @@
}
},
"node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@ -3731,7 +3733,6 @@
"version": "3.30.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.1.tgz",
"integrity": "sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ==",
"dev": true,
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@ -6289,9 +6290,9 @@
}
},
"node_modules/make-dir/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@ -6707,9 +6708,9 @@
}
},
"node_modules/normalize-package-data/node_modules/semver": {
"version": "5.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true,
"bin": {
"semver": "bin/semver"
@ -8456,9 +8457,9 @@
}
},
"node_modules/sass-loader/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@ -8506,9 +8507,9 @@
}
},
"node_modules/semver": {
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"version": "7.5.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
"integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@ -10241,9 +10242,9 @@
},
"dependencies": {
"semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
@ -10293,9 +10294,9 @@
},
"dependencies": {
"semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
@ -10341,9 +10342,9 @@
},
"dependencies": {
"semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
@ -11172,9 +11173,9 @@
},
"dependencies": {
"semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
@ -11328,9 +11329,9 @@
},
"dependencies": {
"semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
@ -11480,9 +11481,12 @@
}
},
"@ldc-web/cookie-notice": {
"version": "3.0.8",
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-3.0.8.tgz",
"integrity": "sha1-FOc6hEv1L9NOnRDOdyBnbIsd31A="
"version": "3.0.3",
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-3.0.3.tgz",
"integrity": "sha1-9zBm0372Tl+Q+p2FxG073/wHApQ=",
"requires": {
"core-js": "^3.30.0"
}
},
"@leichtgewicht/ip-codec": {
"version": "2.0.4",
@ -12390,9 +12394,9 @@
},
"dependencies": {
"semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
@ -13040,8 +13044,7 @@
"core-js": {
"version": "3.30.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.1.tgz",
"integrity": "sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ==",
"dev": true
"integrity": "sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ=="
},
"core-js-compat": {
"version": "3.30.1",
@ -14989,9 +14992,9 @@
},
"dependencies": {
"semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
@ -15320,9 +15323,9 @@
},
"dependencies": {
"semver": {
"version": "5.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true
}
}
@ -16524,9 +16527,9 @@
}
},
"semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
@ -16563,9 +16566,9 @@
}
},
"semver": {
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"version": "7.5.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
"integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"

View file

@ -42,7 +42,7 @@
},
"dependencies": {
"@fancyapps/fancybox": "^3.5.7",
"@ldc-web/cookie-notice": "^3.0.8",
"@ldc-web/cookie-notice": "^3.0.3",
"animate.css": "^3.7.2",
"detect-element-overflow": "^1.2.0",
"hooper2": "^0.3.6",

View file

@ -5,59 +5,6 @@
RewriteEngine On
# -- REDIRECTIONS AGENCE
Redirect 301 "/jeu-de-piste-30ans" "/"
Redirect 301 "/les-reductions" "/le-club-des-gaulois"
Redirect 301 "/tous-a-table" "/recettes"
Redirect 301 "/nos-promos" "/le-club-des-gaulois"
Redirect 301 "/votre-avis-nous-interesse" "/contactez-nous"
Redirect 301 "/bonus_departaimants._int.shtml" "/le-club-des-gaulois"
Redirect 301 "/bonus_bdr_webcoupon._int.shtml" "/le-club-des-gaulois"
Redirect 301 "/produits/kebab_duo__645._int.shtml" "/produits"
Redirect 301 "/gammes/simple-a-cuisiner" "/produits/moment-consommations/simple-a-cuisiner"
Redirect 301 "/notre-marque" "/la-marque"
Redirect 301 "/recette/cuisses-canard-croustillantes-pommes-terre-grenailles-confites-estragon/43" "/recettes"
Redirect 301 "/recette/carnard-roti-miel/15" "/recettes"
Redirect 301 "/notre-marque/notre-histoire/1" "/la-marque/notre-histoire"
Redirect 301 "/les-astuces" "/recettes"
Redirect 301 "/gammes/a-preparer" "/produits"
Redirect 301 "/gamme/les-grignottes/2" "/produits/gamme/la-rotisserie/snacking"
Redirect 301 "/gamme/la-belle-escalope/6" "/produits/gamme/le-cru/decoupes-specifiques"
Redirect 301 "/popup_contact.shtml" "/contactez-nous"
Redirect 301 "/gamme/filets-minute/27" "/produits/gamme/le-cru/decoupes-specifiques"
Redirect 301 "/traca_retrouv_elev._int.shtml" "/oui-cest-bon/temoignages-eleveurs"
Redirect 301 "/gamme/crousty-chicken/22" "/produits/gamme/les-panes/crousty-chicken"
Redirect 301 "/web" "/"
Redirect 301 "/gamme/les-cordons-bleus/18" "/produits/gamme/les-panes"
Redirect 301 "/offrederemboursement" "/le-club-des-gaulois"
Redirect 301 "/liste_recette._int.shtml" "/recettes"
Redirect 301 "/oui-cest-bon/eleveurs/524-cellier-david" "/oui-cest-bon/volaille"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles" "/lelevage-des-volailles-le-gaulois"
Redirect 301 "/produits/italian_burger__675.shtml" "/produits"
Redirect 301 "/1001_recettes/filet_d_oie_aux_fruits_secs__88._int.shtml" "/recettes"
Redirect 301 "/recettes/crumble-de-legumes-aux-lardons-de-canard" "/recettes"
Redirect 301 "/html/apports_et_depenses.shtml" "/cote-cuisine/sante-et-nutrition/bienfaits-nutritionnels-de-la-volaille"
Redirect 301 "/volailles/" "/lelevage-des-volailles-le-gaulois/lelevage-des-volailles"
Redirect 301 "/recette/roule-dinde-aux-trompettes-mort-rosace-pommes-terre/38" "/recettes"
Redirect 301 "/votre-avis-nous-interesse" "/contactez-nous"
Redirect 301 "/gamme/la-belle-escalope/6" "/produits/gamme/le-cru/decoupes-specifiques"
Redirect 301 "/notre-marque/notre-histoire/1" "/la-marque/notre-histoire"
Redirect 301 "/recettes/avocado-toast-aux-eminces-de-poulet-roti-eleve-dans-les-pres-et-oeuf-poche" "/recettes"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/la-sante-des-volailles/maladies-de-la-volaille-symptomes-causes-traitements" "/lelevage-des-volailles-le-gaulois/la-sante-des-volailles/maladies-de-la-volaille-symptomes-causes-traitements"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/le-metier-deleveur-de-volailles" "/lelevage-des-volailles-le-gaulois/le-metier-deleveur-de-volailles"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/lelevage-des-volailles/comment-sont-elevees-les-volailles-le-gaulois" "/lelevage-des-volailles-le-gaulois/lelevage-des-volailles/comment-sont-elevees-les-volailles-le-gaulois"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/lelevage-des-volailles/un-elevage-de-canards-100-francais" "/lelevage-des-volailles-le-gaulois/lelevage-des-volailles/un-elevage-de-canards-100-francais"
Redirect 301 "/produits/gamme/la-charcuterie/eleve-dans-les-pres" "/produits/gamme/la-charcuterie/dans-les-pres"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/lelevage-des-volailles/le-bien-etre-animal-au-coeur-des-elevages-de-volaille" "/lelevage-des-volailles-le-gaulois/lelevage-des-volailles/le-bien-etre-animal-au-coeur-des-elevages-de-volaille"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/le-metier-deleveur-de-volailles/eleveur-de-dindes-un-metier-de-passionne" "/lelevage-des-volailles-le-gaulois/le-metier-deleveur-de-volailles/eleveur-de-dindes-un-metier-de-passionne"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/lalimentation-des-volailles/alimentation-des-poussins-bien-les-nourrir-a-toutes-les-etapes-de-leur-vie" "/lelevage-des-volailles-le-gaulois/lalimentation-des-volailles/alimentation-des-poussins-bien-les-nourrir-a-toutes-les-etapes-de-leur-vie"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/la-sante-des-volailles/antibiotiques-des-volailles-comment-les-eleveurs-ont-ils-reduits-leur-consommation" "/lelevage-des-volailles-le-gaulois/la-sante-des-volailles/antibiotiques-des-volailles-comment-les-eleveurs-ont-ils-reduits-leur-consommation"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/lelevage-des-volailles" "/lelevage-des-volailles-le-gaulois/lelevage-des-volailles"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/lelevage-des-volailles/elevage-de-dindes-immersion-au-coeur-dun-metier-passionnant" "/lelevage-des-volailles-le-gaulois/lelevage-des-volailles/elevage-de-dindes-immersion-au-coeur-dun-metier-passionnant"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/lelevage-des-volailles/elevage-de-poules-pondeuses-les-pratiques" "/lelevage-des-volailles-le-gaulois/lelevage-des-volailles/elevage-de-poules-pondeuses-les-pratiques"
Redirect 301 "/elevage-sante-et-alimentation-des-volailles/le-metier-deleveur-de-volailles/a-la-rencontre-des-eleveurs-de-volailles-le-gaulois" "/lelevage-des-volailles-le-gaulois/le-metier-deleveur-de-volailles/a-la-rencontre-des-eleveurs-de-volailles-le-gaulois"
# -- END -- REDIRECTIONS AGENCE
# Handle Authorization Header
RewriteCond %{HTTP:Authorization} .
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]

View file

@ -124,7 +124,7 @@ body > div > footer {
& a {
padding: 0;
font-size: 3.5em;
margin: 0 12px;
margin: 0 14px;
@include max-width($mobile + 100px) {
font-size: 3em;
}

View file

@ -33,7 +33,6 @@
}
@include max-width($desktop) {
padding-left: 21em;
padding-bottom: 78em;
}
@include max-width($tablet) {
padding-left: 0;
@ -68,12 +67,9 @@
position: absolute;
margin-left: 0;
bottom: 0;
left: 21em;
margin-bottom: 3rem;
}
@include max-width($tablet) {
left: 50%;
transform: translateX(-50%)
transform: translateX(-50%);
margin-bottom: 3rem;
}
& picture {
@ -127,7 +123,6 @@
// pour responsive rsm
&.wrapperRsm {
min-height: $rsmHeight + 3rem * 3;
position: relative;
}
& .general {

View file

@ -1,7 +1,7 @@
<div class="media">
@if(!$danslespresContent->isVideo)
<figure>
<img src="{{ asset($danslespresContent->picture) }}" alt="{{ __('Sortant à l’Extérieur image') }}">
<img src="{{ asset($danslespresContent->picture) }}" alt="{{ __('Sortant à l’Extérieur Dans Les Prés image') }}">
</figure>
@else
@php

View file

@ -7,7 +7,7 @@
<div class="sub_header sub_header_danslespres">
<div class="content">
<div class="text">
<h1 class="title">Notre démarche <img class="img-danslespres" src="{{ asset('assets/images/danslespres/logoDLP.png') }}" alt="Sortant à l’Extérieur - Le Gaulois"></h1>
<h1 class="title">Notre démarche <img class="img-danslespres" src="{{ asset('assets/images/danslespres/logoDLP.png') }}" alt="Sortant à l’Extérieur Dans Les Prés - Le Gaulois"></h1>
</div>
</div>
<div class="entete-danslespres"></div>

View file

@ -6,7 +6,7 @@
<div class="sub_header sub_header_danslespres">
<div class="content">
<div class="text">
<h1 class="title">Notre démarche <img class="img-danslespres" src="{{ asset('assets/images/danslespres/logoDLP.png') }}" alt="Sortant à l’Extérieur - Le Gaulois"></h1>
<h1 class="title">Notre démarche <img class="img-danslespres" src="{{ asset('assets/images/danslespres/logoDLP.png') }}" alt="Sortant à l’Extérieur Dans Les Prés - Le Gaulois"></h1>
</div>
</div>
<div class="entete-danslespres"></div>
@ -20,22 +20,22 @@
<section class="danslespres-bg content content-danslespres">
<div class="items">
<div>
<img src="{{ asset('assets/images/danslespres/danslespres-1.jpg') }}" alt="Découvrir notre démarche Sortant à l’Extérieur - Le Gaulois" class="left">
<img src="{{ asset('assets/images/danslespres/danslespres-1.jpg') }}" alt="Découvrir notre démarche Sortant à l’Extérieur Dans Les Prés - Le Gaulois" class="left">
<p>Découvrir notre démarche</p>
<a href="{{ route('danslespres.description') }}">En savoir +</a>
</div>
<div>
<img src="{{ asset('assets/images/danslespres/danslespres-2.jpg') }}" alt="La Démarche Sortant à l’Extérieur en photo et video - Le Gaulois" class="right">
<img src="{{ asset('assets/images/danslespres/danslespres-2.jpg') }}" alt="La Démarche Sortant à l’Extérieur Dans Les Prés en photo et video - Le Gaulois" class="right">
<p>La Démarche en photos et vidéos</p>
<a href="{{ route('danslespres.media') }}">En savoir +</a>
</div>
</div>
<div class="description">
<p class="danslespres-green inline-with-image">
Notre démarche inédite Le Gaulois&nbsp;<img alt="Sortant à l’Extérieur - Le Gaulois" src="{{ asset('assets/images/danslespres/logoDLP.png') }}">&nbsp;, c’est la garantie de produits de qualité, accessibles en prix et, surtout, engagés dans l’<b>amélioration du bien-être animal</b>, la <b>préservation de la santé des volailles</b> et le <b>respect de l’environnement</b>.
Notre démarche inédite Le Gaulois&nbsp;<img alt="Sortant à l’Extérieur Dans Les Prés - Le Gaulois" src="{{ asset('assets/images/danslespres/logoDLP.png') }}">&nbsp;, c’est la garantie de produits de qualité, accessibles en prix et, surtout, engagés dans l’<b>amélioration du bien-être animal</b>, la <b>préservation de la santé des volailles</b> et le <b>respect de l’environnement</b>.
</p>
<p class="danslespres-dark-green inline-with-image">
Le Gaulois s’engage avec cette nouvelle démarche à ce que les volailles <b>sortent à l’extérieur</b>, tous les jours, dans l’ouest de la France.
Le Gaulois s’engage avec cette nouvelle démarche à ce que les volailles <b>sortent à l’extérieur</b>, tous les jours, dans les prés de l’ouest de France.
<br>
Pour cela, nos <b>éleveurs partenaires</b> suivent un cahier des charges pour s’assurer du bien-être de leurs animaux.
<br><br>

View file

@ -6,7 +6,7 @@
<div class="sub_header sub_header_danslespres">
<div class="content">
<div class="text">
<h1 class="title">Notre démarche <img class="img-danslespres" src="{{ asset('assets/images/danslespres/logoDLP.png') }}" alt="Sortant à l\'extérieur - Le Gaulois"></h1>
<h1 class="title">Notre démarche <img class="img-danslespres" src="{{ asset('assets/images/danslespres/logoDLP.png') }}" alt="Dans les prés - Le Gaulois"></h1>
</div>
</div>
<div class="entete-danslespres"></div>

View file

@ -1,7 +1,6 @@
@extends('layouts.app')
@section('title', __('Les éleveurs engagés dans la démarche Oui C’est Bon!'))
@section('description', __('Retrouvez les témoignages des éleveurs engagés dans notre démarche Oui C’est Bon!'))
@section('canonical', url()->current())
@section('sub_header')
<div class="sub_header_ocb sub_testimony">

View file

@ -150,6 +150,26 @@ function () {
}
SCRIPT;
$cookies['recaptcha']['fallback'] = <<<FALLBACK
function () {
let vimeoVids = document.getElementsByClassName('.video.vimeo');
for (let item of vimeoVids) {
let a = document.createElement('a');
a.innerText = 'Autoriser';
a.classList.add('cn-cookie-link');
a.classList.add('btn-autorize');
a.onclick = function () {
CookieNotice.openModal();
};
let e = document.createElement('p');
e.innerHTML = 'Vimeo est désactivé. ';
item.innerHTML = "";
e.appendChild(a);
item.appendChild(e);
}
}
FALLBACK;
// MATOMO
$cookies['matomo'] = [
'name' => __('MESURES D’AUDIENCE') . ' - Matomo',
@ -178,6 +198,47 @@ $cookies['matomo']['script'] .= <<<SCRIPT
})();
}
SCRIPT;
// ANALYCTICS
$cookies['analytics'] = [
'name' => __('MESURES D’AUDIENCE') . ' - Google Analytics',
'description' => __('Service d\'analyse d\'audience'),
'link' => 'https://support.google.com/analytics/answer/6004245',
'labelLink' => __('En savoir +'),
'cookies' => [
'_ga',
'_gat_gtag_' . str_replace("-", "_", config("ldcweb-cookies.analyticsKey")),
'_gid'
]
];
$cookies['analytics']['script'] = <<<SCRIPT
function () {
(function (d, t) {
var g = d.createElement(t),
s = d.getElementsByTagName(t)[0];
g.src = 'https://www.googletagmanager.com/gtag/js?id=
SCRIPT;
$cookies['analytics']['script'] .= config("google.analyticsKey");
$cookies['analytics']['script'] .= <<<SCRIPT
';
g.id = 'analytics';
s.parentNode.insertBefore(g, s)
}(document, 'script'));
window.dataLayer = window.dataLayer || [];
function gtag() {
dataLayer.push(arguments);
}
gtag('js', new Date());
gtag('config', '
SCRIPT;
$cookies['analytics']['script'] .= config("google.analyticsKey");
$cookies['analytics']['script'] .= <<<SCRIPT
');
}
SCRIPT;
@endphp

View file

@ -20,7 +20,7 @@
<li><a href="{{ route('kitchen-side.health-nutrition.index') }}">{{__('Santé et Nutrition') }}</a></li>
<li><a href="{{ route('brand.poultry') }}">{{ $GeneralConfigGlobal->where('type', GeneralConfigType::poultryPage())->first()->data['poultry_header_title']['value'] }}</a></li>
<li><a href="{{ route('ocb.index') }}">{{__('La démarche "Oui c\'est Bon !"') }}</a></li>
<li><a href="{{ route('danslespres.index') }}">{{__('La démarche "Sortant à l’Extérieur"') }}</a></li>
<li><a href="{{ route('danslespres.index') }}">{{__('La démarche "Sortant à l’Extérieur Dans Les Prés"') }}</a></li>
</ul>
</section>
<section>

View file

@ -139,7 +139,7 @@
<a href="{{ route('danslespres.index') }}">
{{ __('La démarche') }}
<picture>
<img src="{{ asset('assets/images/danslespres/logoDLP.png') }}" alt="{{__('Sortant à l\'extérieur - Le Gaulois') }}">
<img src="{{ asset('assets/images/danslespres/logoDLP.png') }}" alt="{{__('Dans les pres - Le Gaulois') }}">
</picture>
</a>
</li>

View file

@ -124,9 +124,9 @@
<a class="dropdown-item" href="{{route('bo.nutrition-page.index')}}">{{ __('Liste des pages') }}</a>
</div>
</li>
{{--Sortant à l'extérieur --}}
{{-- Dans Les Pres --}}
<li class="nav-item dropdown btn btn-sm btn-dark mb-1">
<a class="nav-link dropdown-toggle text-white" data-toggle="dropdown" href="#" role="button">{{ __('Sortant à l\'extérieur') }}</a>
<a class="nav-link dropdown-toggle text-white" data-toggle="dropdown" href="#" role="button">{{ __('Dans Les Pres') }}</a>
<div class="dropdown-menu">
<a class="dropdown-item" href="{{route('bo.dans_les_pres.content', App\Enums\DansLesPresType::description())}}">{{ __('Contenus page description') }}</a>
<a class="dropdown-item" href="{{route('bo.dans_les_pres.content', App\Enums\DansLesPresType::media())}}">{{ __('Contenus page medias') }}</a>

View file

@ -1,52 +1,46 @@
@if ($paginator->hasPages())
<nav>
<ul class="pagination">
{{-- Previous Page Link --}}
@if ($paginator->onFirstPage())
<li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.previous')">
<span class="page-link" aria-hidden="true">&lsaquo;</span>
</li>
@else
<li class="page-item">
<a class="page-link"
href="{{ ($paginator->currentPage() - 1 === 1) ? url()->current() : $paginator->previousPageUrl() }}"
rel="prev"
aria-label="@lang('pagination.previous')">&lsaquo;</a>
</li>
@endif
<nav>
<ul class="pagination">
{{-- Previous Page Link --}}
@if ($paginator->onFirstPage())
<li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.previous')">
<span class="page-link" aria-hidden="true">&lsaquo;</span>
</li>
@else
<li class="page-item">
<a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev" aria-label="@lang('pagination.previous')">&lsaquo;</a>
</li>
@endif
{{-- Pagination Elements --}}
@foreach ($elements as $element)
{{-- "Three Dots" Separator --}}
@if (is_string($element))
<li class="page-item disabled" aria-disabled="true"><span class="page-link">{{ $element }}</span></li>
@endif
{{-- Pagination Elements --}}
@foreach ($elements as $element)
{{-- "Three Dots" Separator --}}
@if (is_string($element))
<li class="page-item disabled" aria-disabled="true"><span class="page-link">{{ $element }}</span></li>
@endif
{{-- Array Of Links --}}
@if (is_array($element))
@foreach ($element as $page => $url)
@if ($page == $paginator->currentPage())
<li class="page-item active" aria-current="page"><span class="page-link">{{ $page }}</span></li>
@else
<li class="page-item"><a class="page-link" href="{{ ($page === 1) ? url()->current() : $url }}">{{ $page }}</a></li>
@endif
@endforeach
@endif
@endforeach
{{-- Array Of Links --}}
@if (is_array($element))
@foreach ($element as $page => $url)
@if ($page == $paginator->currentPage())
<li class="page-item active" aria-current="page"><span class="page-link">{{ $page }}</span></li>
@else
<li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>
@endif
@endforeach
@endif
@endforeach
{{-- Next Page Link --}}
@if ($paginator->hasMorePages())
<li class="page-item">
<a class="page-link"
href="{{ $paginator->nextPageUrl() }}"
rel="next"
aria-label="@lang('pagination.next')">&rsaquo;</a>
</li>
@else
<li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.next')">
<span class="page-link" aria-hidden="true">&rsaquo;</span>
</li>
@endif
</ul>
</nav>
{{-- Next Page Link --}}
@if ($paginator->hasMorePages())
<li class="page-item">
<a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next" aria-label="@lang('pagination.next')">&rsaquo;</a>
</li>
@else
<li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.next')">
<span class="page-link" aria-hidden="true">&rsaquo;</span>
</li>
@endif
</ul>
</nav>
@endif

View file

@ -286,10 +286,11 @@ Breadcrumbs::for('account.favs-recipes', function (Generator $trail) {
$trail->push(__('Mes recettes favorites'), route('account.favs-recipes'));
});
// * Dans les prés
// * OCB
Breadcrumbs::for('danslespres.index', function (Generator $trail) {
$trail->parent('home');
$trail->push(__('Sortant à l’Extérieur'), route('danslespres.index'));
$trail->push(__('Sortant à l’Extérieur Dans Les Prés'), route('danslespres.index'));
});
Breadcrumbs::for('danslespres.description', function (Generator $trail) {
$trail->parent('danslespres.index');