From e7c5480fc8f7efab7f581f4553d59367cfd5f084 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Tue, 6 Dec 2022 12:57:49 +0100 Subject: [PATCH 1/2] Fix redirect egg --- app/Http/Controllers/Fo/EggController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Fo/EggController.php b/app/Http/Controllers/Fo/EggController.php index 4d26d7d..6256e82 100644 --- a/app/Http/Controllers/Fo/EggController.php +++ b/app/Http/Controllers/Fo/EggController.php @@ -49,7 +49,7 @@ class EggController extends Controller $mobas = TraceaEgg::where('box_code', $id)->orderBy('box_code', 'DESC')->first(); if (!$mobas) { - return redirect('/search'); + return redirect()->route('egg.search'); } $edes = $mobas->code_edes; From 5f6236e24e97200b60218326712bc91cabefdbf9 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Tue, 6 Dec 2022 12:58:18 +0100 Subject: [PATCH 2/2] Handle bo.gt redirect --- config/app.php | 2 + routes/web-fo.php | 162 ++++++++++++++++++++++++++-------------------- 2 files changed, 93 insertions(+), 71 deletions(-) diff --git a/config/app.php b/config/app.php index 03e6eec..d557f98 100644 --- a/config/app.php +++ b/config/app.php @@ -53,6 +53,8 @@ return [ */ 'url' => env('APP_URL', 'http://localhost'), + 'domain' => env('APP_DOMAIN', 'tracabilite.loue.fr'), + 'egg_domain' => env('APP_EGG_DOMAIN', 'bo.gt'), 'asset_url' => env('ASSET_URL', null), diff --git a/routes/web-fo.php b/routes/web-fo.php index 3e6b718..2f726a9 100644 --- a/routes/web-fo.php +++ b/routes/web-fo.php @@ -6,82 +6,102 @@ use App\Http\Controllers\Fo\InfoController; use App\Http\Controllers\Fo\TraceaPoultryController; use Illuminate\Support\Facades\Route; -// * LEGALS and POLICY -Route::view('/charte-confidentialite', 'front.pages.policy')->name('policy'); -Route::view('/mentions-legales-cgu', 'front.pages.legals')->name('legals'); +Route::domain(config('app.domain'))->group(function () { + // * LEGALS and POLICY + Route::view('/charte-confidentialite', 'front.pages.policy')->name('policy'); + Route::view('/mentions-legales-cgu', 'front.pages.legals')->name('legals'); -// * IFRAME Media COOKIE -Route::view('/frame/{type}', 'front.frame') + // * IFRAME Media COOKIE + Route::view('/frame/{type}', 'front.frame') ->where('type', 'youtube')->name('front.frame'); -// * Page éleveur (Oeuf et Volaille) -Route::get('/eleveurs/{breeder}', [BreederController::class, 'show'])->name('breeders.show'); + // * Page éleveur (Oeuf et Volaille) + Route::get('/eleveurs/{breeder}', [BreederController::class, 'show'])->name('breeders.show'); -// * Partie Poultry -Route::name('poultry.')->group(function () { - Route::view('/', 'front.poultry.search')->name('search'); - Route::post('/', [TraceaPoultryController::class, 'searchSubmit'])->name('searchSubmit'); - Route::get('tracabilite/volaille', [TraceaPoultryController::class, 'show'])->name('show'); - Route::get('tracabilite/volaille/distribution', [TraceaPoultryController::class, 'getDistribution']) - ->name('distribution'); - Route::get('tracabilite/volaille/info', [InfoController::class, 'poultry'])->name('infos'); - Route::get( - 'tracabilite/volaille/info/des-poulets-libres-par-nature', - [InfoController::class, 'poultryFreeChicken'] - )->name('infos.freeChicken'); - Route::get( - 'tracabilite/volaille/info/quest-ce-quun-poulet-fermier-de-loue', - [InfoController::class, 'poultryFarmChicken'] - )->name('infos.farmChiken'); - Route::get( - 'tracabilite/volaille/alimentation/bio', - [InfoController::class, 'poultryBio'] - )->name('food.bio'); - Route::get( - 'tracabilite/volaille/alimentation/label-rouge', - [InfoController::class, 'poultryLr'] - )->name('food.lr'); - Route::name('labels.')->prefix('/tracabilite/volaille/labels')->group(function () { - Route::view('/ab', 'front.poultry.labels.ab')->name('ab'); - Route::view('/lr', 'front.poultry.labels.lr')->name('lr'); - Route::view('/bea', 'front.poultry.labels.bea')->name('bea'); - Route::view('/igp', 'front.poultry.labels.igp')->name('igp'); - Route::view('/nutriscore', 'front.poultry.labels.nutriscore')->name('nutriscore'); - Route::view('/planet-score', 'front.poultry.labels.planet-score')->name('planet-score'); + // * Partie Poultry + Route::name('poultry.')->group(function () { + Route::view('/', 'front.poultry.search')->name('search'); + Route::post('/', [TraceaPoultryController::class, 'searchSubmit'])->name('searchSubmit'); + Route::get('tracabilite/volaille', [TraceaPoultryController::class, 'show'])->name('show'); + Route::get('tracabilite/volaille/distribution', [TraceaPoultryController::class, 'getDistribution']) + ->name('distribution'); + Route::get('tracabilite/volaille/info', [InfoController::class, 'poultry'])->name('infos'); + Route::get( + 'tracabilite/volaille/info/des-poulets-libres-par-nature', + [InfoController::class, 'poultryFreeChicken'] + )->name('infos.freeChicken'); + Route::get( + 'tracabilite/volaille/info/quest-ce-quun-poulet-fermier-de-loue', + [InfoController::class, 'poultryFarmChicken'] + )->name('infos.farmChiken'); + Route::get( + 'tracabilite/volaille/alimentation/bio', + [InfoController::class, 'poultryBio'] + )->name('food.bio'); + Route::get( + 'tracabilite/volaille/alimentation/label-rouge', + [InfoController::class, 'poultryLr'] + )->name('food.lr'); + Route::name('labels.')->prefix('/tracabilite/volaille/labels')->group(function () { + Route::view('/ab', 'front.poultry.labels.ab')->name('ab'); + Route::view('/lr', 'front.poultry.labels.lr')->name('lr'); + Route::view( + '/bea', + 'front.poultry.labels.bea' + )->name('bea'); + Route::view( + '/igp', + 'front.poultry.labels.igp' + )->name('igp'); + Route::view('/nutriscore', 'front.poultry.labels.nutriscore')->name('nutriscore'); + Route::view('/planet-score', 'front.poultry.labels.planet-score')->name('planet-score'); + }); + }); + + // * Partie Egg + Route::prefix('/oeuf')->name('egg.')->group(function () { + Route::view('/search', 'front.egg.search')->name('search'); + Route::post('/find-my-box', [EggController::class, 'findMyBox'])->name('searchSubmit'); + + // * LABELS + Route::view('/{id}/labels-et-certifications', 'front.egg.labels_and_certifs')->name('labelCertif'); + + Route::view('/{id}/label-rouge', 'front.egg.labels.label_rouge')->name('labelRouge'); + Route::view('/{id}/label-bio', 'front.egg.labels.label_bio')->name('labelBio'); + Route::view('/{id}/label-igp', 'front.egg.labels.igp')->name('labelIGP'); + Route::view('/{id}/label-nutriscore', 'front.egg.labels.nutriscore')->name('labelNutriscore'); + Route::view('/{id}/label-fermiers', 'front.egg.labels.fermiers')->name('labelFermiers'); + + + // * INFOS ELEVAGE + Route::view('/{id}/infos-elevages', 'front.egg.infos_elevages')->name('infoElevage'); + Route::view('/{id}/differences-oeufs', 'front.egg.elevages.vs_oeufs')->name('infoDiffOeufs'); + Route::view('/{id}/elevage-liberte', 'front.egg.elevages.elevage_liberte')->name('infoElevageLib'); + + + // * ALIMENTATION + Route::view('/{id}/details-alimentation', 'front.egg.details-alimentation')->name('infoAlim'); + + // * EMBALLAGE + Route::view('/{id}/details-emballage', 'front.egg.details-emballage')->name('infoEmballage'); + + + // * ELEVEURS + Route::get('/{id}/portrait-eleveur/{eleveurId}', [EggController::class, 'eleveurPortrait']) + ->name('portraitEleveur'); + + Route::get('/{id}', [EggController::class, 'indexId'])->name('FrontPage'); }); }); -// * Partie Egg -Route::prefix('/oeuf')->name('egg.')->group(function () { - Route::view('/search', 'front.egg.search')->name('search'); - Route::post('/find-my-box', [EggController::class, 'findMyBox'])->name('searchSubmit'); - - // * LABELS - Route::view('/{id}/labels-et-certifications', 'front.egg.labels_and_certifs')->name('labelCertif'); - - Route::view('/{id}/label-rouge', 'front.egg.labels.label_rouge')->name('labelRouge'); - Route::view('/{id}/label-bio', 'front.egg.labels.label_bio')->name('labelBio'); - Route::view('/{id}/label-igp', 'front.egg.labels.igp')->name('labelIGP'); - Route::view('/{id}/label-nutriscore', 'front.egg.labels.nutriscore')->name('labelNutriscore'); - Route::view('/{id}/label-fermiers', 'front.egg.labels.fermiers')->name('labelFermiers'); - - - // * INFOS ELEVAGE - Route::view('/{id}/infos-elevages', 'front.egg.infos_elevages')->name('infoElevage'); - Route::view('/{id}/differences-oeufs', 'front.egg.elevages.vs_oeufs')->name('infoDiffOeufs'); - Route::view('/{id}/elevage-liberte', 'front.egg.elevages.elevage_liberte')->name('infoElevageLib'); - - - // * ALIMENTATION - Route::view('/{id}/details-alimentation', 'front.egg.details-alimentation')->name('infoAlim'); - - // * EMBALLAGE - Route::view('/{id}/details-emballage', 'front.egg.details-emballage')->name('infoEmballage'); - - - // * ELEVEURS - Route::get('/{id}/portrait-eleveur/{eleveurId}', [EggController::class, 'eleveurPortrait']) - ->name('portraitEleveur'); - - Route::get('/{id}', [EggController::class, 'indexId'])->name('FrontPage'); +Route::domain(config('app.egg_domain'))->group(function () { + Route::get('/{id}', function ($id) { + return redirect(config('app.url') . route('egg.FrontPage', ['id' => $id], false)); + }); }); + +Route::fallback(function () { + if (request()->getHost() === config('app.egg_domain')) { + return redirect(config('app.url')); + } +}); \ No newline at end of file