FEATURE: refactorize code little bit more

This commit is contained in:
Michal Kváček
2017-08-04 18:43:18 +02:00
parent 25d9ded124
commit c2209538db
5 changed files with 28 additions and 19 deletions
+6 -7
View File
@@ -5,7 +5,7 @@ namespace App\Providers;
use App\CMS\Contracts\Repositories\Template as TemplateContract;
use App\CMS\Handlers\Registrators\TemplateRegistrator;
use App\CMS\Helpers\CurrentTemplate;
use App\Models\Module;
use App\CMS\Repositories\Module;
use Illuminate\Support\Facades\App;
use Illuminate\Support\ServiceProvider;
@@ -45,10 +45,10 @@ class TemplateServiceProvider extends ServiceProvider
public function registerTemplatePaths($publicTemplates)
{
$modules = Module::where('enabled', true)
->get()
->pluck('id', 'alias')
->toArray();
$modules = app(Module::class)
->all()
->pluck('id', 'alias')
->toArray();
/**
* @var $registrator TemplateRegistrator
@@ -77,7 +77,6 @@ class TemplateServiceProvider extends ServiceProvider
/**
* Register the service provider.
*
* @return void
*/
public function register()
@@ -94,7 +93,7 @@ class TemplateServiceProvider extends ServiceProvider
return;
}
$templateDir = base_path('templates/' . $template->static_name. '/Resources');
$templateDir = base_path('templates/' . $template->static_name . '/Resources');
$assetsDir = $templateDir . '/' . TemplateContract::ASSETS_DIRECTORY;
$viewsDir = $templateDir . '/views';