From 9d0ea124867c2a272cc39733640c82b2fbb37f1e Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 25 Feb 2019 15:51:21 +0100
Subject: [PATCH] wip #2609

---
 {src => resources}/config/cubist-front.php             |  0
 {src => resources}/config/googletagmanager.php         |  0
 .../resources => resources}/views/body/begin.blade.php |  0
 {src/resources => resources}/views/body/end.blade.php  |  0
 {src/resources => resources}/views/head/head.blade.php |  0
 .../views/head/htmldeclaration.blade.php               |  0
 {src/resources => resources}/views/head/link.blade.php |  0
 {src/resources => resources}/views/head/meta.blade.php |  0
 src/FrontServiceProvider.php                           | 10 ++++++----
 9 files changed, 6 insertions(+), 4 deletions(-)
 rename {src => resources}/config/cubist-front.php (100%)
 rename {src => resources}/config/googletagmanager.php (100%)
 rename {src/resources => resources}/views/body/begin.blade.php (100%)
 rename {src/resources => resources}/views/body/end.blade.php (100%)
 rename {src/resources => resources}/views/head/head.blade.php (100%)
 rename {src/resources => resources}/views/head/htmldeclaration.blade.php (100%)
 rename {src/resources => resources}/views/head/link.blade.php (100%)
 rename {src/resources => resources}/views/head/meta.blade.php (100%)

diff --git a/src/config/cubist-front.php b/resources/config/cubist-front.php
similarity index 100%
rename from src/config/cubist-front.php
rename to resources/config/cubist-front.php
diff --git a/src/config/googletagmanager.php b/resources/config/googletagmanager.php
similarity index 100%
rename from src/config/googletagmanager.php
rename to resources/config/googletagmanager.php
diff --git a/src/resources/views/body/begin.blade.php b/resources/views/body/begin.blade.php
similarity index 100%
rename from src/resources/views/body/begin.blade.php
rename to resources/views/body/begin.blade.php
diff --git a/src/resources/views/body/end.blade.php b/resources/views/body/end.blade.php
similarity index 100%
rename from src/resources/views/body/end.blade.php
rename to resources/views/body/end.blade.php
diff --git a/src/resources/views/head/head.blade.php b/resources/views/head/head.blade.php
similarity index 100%
rename from src/resources/views/head/head.blade.php
rename to resources/views/head/head.blade.php
diff --git a/src/resources/views/head/htmldeclaration.blade.php b/resources/views/head/htmldeclaration.blade.php
similarity index 100%
rename from src/resources/views/head/htmldeclaration.blade.php
rename to resources/views/head/htmldeclaration.blade.php
diff --git a/src/resources/views/head/link.blade.php b/resources/views/head/link.blade.php
similarity index 100%
rename from src/resources/views/head/link.blade.php
rename to resources/views/head/link.blade.php
diff --git a/src/resources/views/head/meta.blade.php b/resources/views/head/meta.blade.php
similarity index 100%
rename from src/resources/views/head/meta.blade.php
rename to resources/views/head/meta.blade.php
diff --git a/src/FrontServiceProvider.php b/src/FrontServiceProvider.php
index f90ce2b..e8285f9 100644
--- a/src/FrontServiceProvider.php
+++ b/src/FrontServiceProvider.php
@@ -14,6 +14,8 @@ class FrontServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        $resourcesDir = __DIR__ . '/../resources';
+
         // LOAD THE VIEWS
         // - first the published/overwritten views (in case they have any changes)
         $customViewsFolder = resource_path('views/vendor/cubist/front');
@@ -22,12 +24,12 @@ class FrontServiceProvider extends ServiceProvider
             $this->loadViewsFrom($customViewsFolder, 'cubist');
         }
         // - then the stock views that come with the package, in case a published view might be missing
-        $this->loadViewsFrom(realpath(__DIR__ . '/resources/views'), 'cubist');
+        $this->loadViewsFrom(realpath($resourcesDir . '/views'), 'cubist');
 
         // publish config file
-        $this->publishes([__DIR__ . '/config/cubist-front.php' => config_path('cubist-front.php')], 'config');
-        $this->publishes([__DIR__ . '/config/googletagmanager.php' => config_path('googletagmanager.php')], 'config');
+        $this->publishes([$resourcesDir . '/config/cubist-front.php' => config_path('cubist-front.php')], 'config');
+        $this->publishes([$resourcesDir . '/config/googletagmanager.php' => config_path('googletagmanager.php')], 'config');
         // publish the views
-        $this->publishes([__DIR__ . '/resources/views' => resource_path('views/vendor/cubist/front')], 'views');
+        $this->publishes([$resourcesDir . '/views' => resource_path('views/vendor/cubist/front')], 'views');
     }
 }
\ No newline at end of file
-- 
2.39.5