From 2fde50550b3ce10aefe16d7d1bb38d946f4858b3 Mon Sep 17 00:00:00 2001 From: freek Date: Tue, 29 Dec 2015 09:57:24 +0100 Subject: [PATCH] move config to root --- {resources/config => config}/.gitkeep | 0 resources/views/.gitkeep | 0 src/SkeletonServiceProvider.php | 10 ++++++---- 3 files changed, 6 insertions(+), 4 deletions(-) rename {resources/config => config}/.gitkeep (100%) delete mode 100644 resources/views/.gitkeep diff --git a/resources/config/.gitkeep b/config/.gitkeep similarity index 100% rename from resources/config/.gitkeep rename to config/.gitkeep diff --git a/resources/views/.gitkeep b/resources/views/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/SkeletonServiceProvider.php b/src/SkeletonServiceProvider.php index dad1a0a..64e7125 100644 --- a/src/SkeletonServiceProvider.php +++ b/src/SkeletonServiceProvider.php @@ -11,15 +11,17 @@ class SkeletonServiceProvider extends ServiceProvider */ public function boot() { - $this->loadViewsFrom(__DIR__.'/../resources/views', 'skeleton'); - $this->publishes([ - __DIR__.'/../resources/config/skeleton.php' => config_path('skeleton.php'), + __DIR__.'/../config/skeleton.php' => config_path('skeleton.php'), ], 'config'); + /* + $this->loadViewsFrom(__DIR__.'/../resources/views', 'skeleton'); + $this->publishes([ __DIR__.'/../resources/views' => base_path('resources/views/vendor/skeleton'), ], 'views'); + */ } /** @@ -27,6 +29,6 @@ public function boot() */ public function register() { - $this->mergeConfigFrom(__DIR__.'/../resources/config/config.php', 'skeleton'); + $this->mergeConfigFrom(__DIR__.'/../config/config.php', 'skeleton'); } }