From d964a3f0f32e8bc9fb1dca102346c5e3b60ea21a Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Sat, 16 Dec 2017 22:07:58 -0600 Subject: [PATCH] More pathing changes --- bootstrap/app.php | 15 +++++++++++++++ config/view.php | 10 ++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/bootstrap/app.php b/bootstrap/app.php index 144e54f7..69bcd661 100755 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -57,6 +57,21 @@ class App extends Illuminate\Foundation\Application return $this->basePath . DS . 'config' . ($path ? DS . $path : $path); } + public function environmentPath() + { + return $this->environmentPath ?: $this->basePath; + } + + public function langPath() + { + return $this->resourcePath() . DIRECTORY_SEPARATOR . 'lang'; + } + + public function publicPath() + { + return $this->basePath . DS . 'public'; + } + public function resourcePath($path = '') { return $this->basePath . DS . 'resources' . ($path ? DS . $path : $path); diff --git a/config/view.php b/config/view.php index e193ab61..feecf812 100755 --- a/config/view.php +++ b/config/view.php @@ -3,31 +3,25 @@ return [ /* - |-------------------------------------------------------------------------- | View Storage Paths - |-------------------------------------------------------------------------- | | Most templating systems load templates from disk. Here you may specify | an array of paths that should be checked for your views. Of course | the usual Laravel view path has already been registered for you. - | */ 'paths' => [ - realpath(base_path('resources/views')), + resource_path('views'), ], /* - |-------------------------------------------------------------------------- | Compiled View Path - |-------------------------------------------------------------------------- | | This option determines where all the compiled Blade templates will be | stored for your application. Typically, this is within the storage | directory. However, as usual, you are free to change this value. - | */ - 'compiled' => realpath(storage_path('framework/views')), + 'compiled' => storage_path('framework/views'), ];