From ac0c96f4af8466b4cc593a68a65381319fea73e9 Mon Sep 17 00:00:00 2001
From: Alexander Shvets <neochief@shvetsgroup.com>
Date: Wed, 14 Mar 2018 19:03:44 +0200
Subject: [PATCH] Fixes.

---
 .gitignore                        |  1 +
 src/JetPagesServiceProvider.php   | 26 ++++++++++++++++++++++----
 src/resources/config/jetpages.php |  2 +-
 src/routes.php                    | 12 ------------
 4 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100755 src/routes.php

diff --git a/.gitignore b/.gitignore
index 7a8a0ad..6ab2a4c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 composer.phar
 composer.lock
 vendor
diff --git a/src/JetPagesServiceProvider.php b/src/JetPagesServiceProvider.php
index a9f7085..4950b5f 100755
--- a/src/JetPagesServiceProvider.php
+++ b/src/JetPagesServiceProvider.php
@@ -65,10 +65,12 @@ public function boot()
         $this->loadMigrationsFrom(__DIR__ . '/resources/migrations');
 
         $this->loadViewsFrom(__DIR__ . '/resources/views', 'sg/jetpages');
-        view()->composer('*', 'ShvetsGroup\JetPages\ViewComposers\LocaleComposer');
-        view()->composer('*', 'ShvetsGroup\JetPages\ViewComposers\MenuComposer');
+        $this->app['view']->composer('*', 'ShvetsGroup\JetPages\ViewComposers\LocaleComposer');
+        $this->app['view']->composer('*', 'ShvetsGroup\JetPages\ViewComposers\MenuComposer');
 
         $this->publishes([__DIR__ . '/resources/views' => base_path('resources/views/vendor/sg/jetpages')], 'views');
+
+        $this->mergeConfigFrom(__DIR__ . '/resources/config/jetpages.php', 'jetpages');
         $this->publishes([__DIR__ . '/resources/config/jetpages.php' => config_path('jetpages.php')], 'config');
 
         $this->app['router']->aliasMiddleware('static-cache', StaticCacheMiddleware::class);
@@ -83,8 +85,24 @@ public function boot()
      */
     public function map(Router $router)
     {
-        $router->group(['namespace' => __NAMESPACE__ . '\Controllers', 'middleware' => 'web'], function () {
-            require __DIR__ . '/routes.php';
+        $router->group(['namespace' => __NAMESPACE__ . '\Controllers', 'middleware' => 'web'], function () use ($router) {
+            $router->get('ajax/jetpages/timestamp', 'PageController@getContentTimestamp');
+
+            $router->group(['middleware' => ['static-cache']], function () use ($router) {
+                $router->get('robots.txt', 'RobotsTxtController@robots');
+                $router->get('sitemap.xml', 'SiteMapController@sitemap');
+            });
+        });
+
+        // Add these routes after bootstrap is done in order to make them last in
+        // the route list. Otherwise, catch-all route will break some other
+        // routes registered after it.
+        $this->app->booted(function () use ($router) {
+            $router->group(['namespace' => __NAMESPACE__ . '\Controllers', 'middleware' => ['web', 'static-cache']], function () use ($router) {
+                // Specific override for a front page to overcome default laravel's route in app/Http/routes.php
+                $router->get('/', 'PageController@show');
+                $router->get('{all}', 'PageController@show')->where(['all' => '.*']);
+            });
         });
     }
 }
diff --git a/src/resources/config/jetpages.php b/src/resources/config/jetpages.php
index 0603b0e..15df07a 100644
--- a/src/resources/config/jetpages.php
+++ b/src/resources/config/jetpages.php
@@ -25,7 +25,7 @@
     | this folder.
     |
     */
-    'content_root' => resource_path('content'),
+    'content_root' => 'resources/content',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/src/routes.php b/src/routes.php
deleted file mode 100755
index 5ed8c69..0000000
--- a/src/routes.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-Route::get('ajax/jetpages/timestamp', 'PageController@getContentTimestamp');
-
-Route::group(['middleware' => ['static-cache']], function () {
-    Route::get('robots.txt', 'RobotsTxtController@robots');
-    Route::get('sitemap.xml', 'SiteMapController@sitemap');
-
-    // Specific override for a front page to overcome default laravel's route in app/Http/routes.php
-    Route::get('/', 'PageController@show');
-    Route::get('{all}', 'PageController@show')->where(['all' => '.*']);
-});
\ No newline at end of file