From 94e45322d43a4a4c9fa26beb62a9cb6b92277d10 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 25 Sep 2019 16:24:38 +0200 Subject: [PATCH] wip #3080 @1 --- .../Magic/Models/CubistMagicAbstractModel.php | 2 -- .../Models/CubistMagicTranslatableModel.php | 2 -- src/app/Magic/Models/Locale.php | 10 +++++++ src/app/Middleware/LocaleSelector.php | 28 +++++++++++++++++++ src/resources/config/cubist.php | 1 + 5 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 src/app/Middleware/LocaleSelector.php diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php index a6fb6c9..63e4fdf 100644 --- a/src/app/Magic/Models/CubistMagicAbstractModel.php +++ b/src/app/Magic/Models/CubistMagicAbstractModel.php @@ -25,8 +25,6 @@ use Venturecraft\Revisionable\RevisionableTrait; class CubistMagicAbstractModel extends Model implements HasMedia { use CrudTrait; - use Sluggable; - use SluggableScopeHelpers; use HasMediaTrait; use RevisionableTrait; use BunchOfFields { diff --git a/src/app/Magic/Models/CubistMagicTranslatableModel.php b/src/app/Magic/Models/CubistMagicTranslatableModel.php index 71384de..9eaa048 100644 --- a/src/app/Magic/Models/CubistMagicTranslatableModel.php +++ b/src/app/Magic/Models/CubistMagicTranslatableModel.php @@ -9,8 +9,6 @@ use Backpack\CRUD\ModelTraits\SpatieTranslatable\SluggableScopeHelpers; class CubistMagicTranslatableModel extends CubistMagicAbstractModel { - use Sluggable; - use SluggableScopeHelpers; use HasTranslations { update as protected updateTranslations; create as protected createTranslations; diff --git a/src/app/Magic/Models/Locale.php b/src/app/Magic/Models/Locale.php index 2fbe729..febc19f 100644 --- a/src/app/Magic/Models/Locale.php +++ b/src/app/Magic/Models/Locale.php @@ -46,4 +46,14 @@ class Locale extends CubistMagicAbstractModel 'translatable' => false, ]); } + + public static function getLocaleClass() + { + $class = self::class; + $config = config('cubist.locale_model', 'Cubist\Backpack\app\Magic\Models\Locale'); + if (class_exists($config)) { + $class = $config; + } + return $class; + } } diff --git a/src/app/Middleware/LocaleSelector.php b/src/app/Middleware/LocaleSelector.php new file mode 100644 index 0000000..25c97bd --- /dev/null +++ b/src/app/Middleware/LocaleSelector.php @@ -0,0 +1,28 @@ +getPathInfo(), '/admin/') === 0) { + return $response; + } + + $domain = $request->getHttpHost(); + $class = Locale::getLocaleClass(); + + $locales = $class::where('active', 1)->get(0); + foreach ($locales as $locale) { + dd($locale); + } + + return $response; + } +} diff --git a/src/resources/config/cubist.php b/src/resources/config/cubist.php index a231e8d..fe62b90 100644 --- a/src/resources/config/cubist.php +++ b/src/resources/config/cubist.php @@ -5,5 +5,6 @@ return [ 'internal_search_index' => env('CUBIST_INTERNAL_SEARCH_INDEX', strtolower(env('APP_NAME', 'App_name') . '_' . env('APP_ENV', 'dev'))), 'page_model' => '\App\Models\Page', 'settings_model' => '\App\Models\Settings', + 'locale_model' => '\App\Models\Locale', 'seo_robots' => env('SEO_ROBOTS', true), ]; -- 2.39.5