fix installation; use RS layout as main layout

Author: Sean Bethel

src/ReactSyncPreset.php

@@ -6,6 +6,12 @@
 use Illuminate\Filesystem\Filesystem;
 use Laravel\Ui\Presets\Preset;
 
+use Laravel\Ui\UiCommand;
+use Laravel\Ui\AuthCommand;
+
+
+use Schema;
+
 class ReactSyncPreset extends Preset
 {
 
@@ -15,38 +21,55 @@ class ReactSyncPreset extends Preset
 
 	static $start_added = true;
 
+	static $command;
+
     private function getJsPath(){
-      return is_dir(Paths::resource_path('js')) ? Paths::resource_path('js') : Paths::resource_path('assets/js');
+		return is_dir(Paths::resource_path('js')) ? Paths::resource_path('js') : Paths::resource_path('assets/js');
     }
 
+
+	public static function install_auth(AuthCommand $command){
+		static::$command = $command;
+		$command->call('ui:auth');
+		if ($command->confirm('Would you like to use the React Sync layout in place of the default layout view template?', 'yes')) {
+			copy(__DIR__.'/views/layout.blade.php', Paths::resource_path("views/layouts/app.blade.php"));
+		}
+
+
+
+	}
+
     /**
      * Install the preset.
      *
      * @return void
      */
-    public static function install($command)
+    public static function install(UiCommand $command)
     {
+        static::$command = $command;
         static::preflight($command);
 
-
         static::ensurePagesModelsDirectoriesExist();
         static::ensureComponentDirectoryExists();
         static::updatePackages();
         static::updateWebpackConfiguration();
         static::updateBootstrapping();
         static::updateComponent();
         static::removeNodeModules();
-        \Artisan::call('ui:auth');
-        if(self::$include_example){
-	        \Artisan::call('make:react_model Example');
-	        \Artisan::call('make:react_page Example');
+
+        $command->call('ui:auth', ['type' => 'react-sync']);
+//         dd('sdf');
+
+        if(static::$include_example){
+	        $command->call('make:react_model', ['name' => 'Example']);
+	        $command->call('make:react_page', ['name' => 'Example']);
         }
 
         static::addStartCommand();
 
         $command->info('ReactSync scaffolding installed successfully.');
         $command->comment('Please run "npm install && npm run dev" to compile your fresh scaffolding.');
-        if(self::$start_added){
+        if(static::$start_added){
 	        $command->comment('We\'ve added a "start" command to the scripts section of package.json:');
 	        $command->comment('');
 	        $command->comment('- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ');
@@ -78,19 +101,31 @@ public static function install($command)
 
 
     public static function preflight($command){
+		try {
+		    \DB::connection()->getPdo();
+		} catch (\Exception $e) {
+			echo PHP_EOL;
+		    $command->error("Your database configuration does not appear to be configured yet. Afterwards, you will need to run 'php artisan react_sync:all' manually to complete installation.");
+			echo PHP_EOL;
+
+		}
+
+
 	    $command->info("You are about to install the Laravel ReactSync preset");
 		if (!$command->confirm('Would you like to continue?', 'yes')) {
 		    exit('Cancelled' . PHP_EOL);
 		}
 
+
+
 	    $command->info("The following questions will help get the preset configured for your specific requirements.");
 
 		if ($command->confirm('Would you like to include the Bootstrap framework?', 'yes')) {
-		    self::$include_bootstrap = true;
+		    static::$include_bootstrap = true;
 		}
 
 		if ($command->confirm('Would you like to include an example Page and Model component to get started?', 'yes')) {
-		    self::$include_example = true;
+		    static::$include_example = true;
 		}
 
 
@@ -108,7 +143,7 @@ public static function addStartCommand(){
 			$package_json['scripts']['start'] = "php artisan react_sync:all && npm run watch";
 		}
 		else{
-			self::$start_added = false;
+			static::$start_added = false;
 		}
 
         file_put_contents(
@@ -176,6 +211,16 @@ protected static function updatePackageArray(array $packages)
 		return $packages;
     }
 
+    protected static function confirm_copy($from, $to){
+        if (file_exists($from)) {
+            if (! static::$command->confirm("The file [{$from}] already exists. Do you want to replace it?")) {
+                return;
+            }
+        }
+
+        copy($from, $to);
+    }
+
     /**
      * Update the Webpack configuration.
      *
@@ -216,7 +261,7 @@ protected static function updateBootstrapping()
     {
         $js_path = is_dir(Paths::resource_path('js')) ? 'js' : 'assets/js';
         copy(__DIR__.'/react-sync-stubs/app.js', Paths::resource_path("$js_path/app.js"));
-		if(self::$include_bootstrap){
+		if(static::$include_bootstrap){
 			copy(__DIR__.'/react-sync-stubs/app.scss', Paths::resource_path("sass/app.scss"));
 			copy(__DIR__.'/react-sync-stubs/_variables.scss', Paths::resource_path("sass/_variables.scss"));
 		}

src/ReactSyncable.php

@@ -119,7 +119,9 @@ public function syncable_boot()
     {
         $this->loadRoutesFrom(__DIR__.'/routes.php');
 
-        $this->loadRoutesFrom(__DIR__.'/console.php');
+        if ($this->app->runningInConsole()) {
+	        $this->loadRoutesFrom(__DIR__.'/console.php');
+        }
 
 	    $this->loadViewsFrom(__DIR__.'/views', 'react_sync');
 
@@ -134,8 +136,14 @@ public function syncable_boot()
 
         // Load this into the `ui` Artisan command as the type: `react-sync`
 
-		UiCommand::macro('react-sync', function (UiCommand $command) {
-			ReactSyncPreset::install($command);
+		UiCommand::macro('react-sync', function ($command) {
+			if($command instanceof UiCommand){
+				ReactSyncPreset::install($command);
+			}
+			else{
+				ReactSyncPreset::install_auth($command);
+			}
+
 		});
 
     }

src/helpers.php

@@ -90,14 +90,21 @@ function returnFunctionText(ReflectionMethod $method){
 	if(!function_exists('get_schema')){
 		function get_schema($model = null){
 			$connection = Schema::getConnection();
+			try {
+			    \DB::connection()->getPdo();
+			} catch (\Exception $e) {
+
+				return;
+			}
+
 
 			if($model === null) die("\npass in a model instance!\n\n");
 
 			$table = $model->getTable();
 			$primary_key = $model->getKeyName();
 
 			$attrs = Schema::getColumnListing($model->getTable());
-			
+
 			$attrs = collect($attrs)->map(function($column) use($table, $connection, $primary_key){
 				$column_definition = $connection->getDoctrineColumn($table, $column)->toArray();
 				$column_definition['type'] = $column_definition['type']->getName();
@@ -114,7 +121,7 @@ function get_schema($model = null){
 			$appended_attrs = coerceAsArray($model)->only(['with', 'appends'])->flatten();
 
 			$reflection = new ReflectionClass($model);
-			
+
 			$reflected_relations = new ReflectionClass(Illuminate\Database\Eloquent\Concerns\HasRelationships::class);
 			$reflected_relations = collect($reflected_relations->getMethods())->map->getName();
 
@@ -126,7 +133,7 @@ function get_schema($model = null){
 	                $isrel = !!$reflected_relations->first(function($m) use($function_text){
 		                return str_contains($function_text, '->' . $m);
 	                });
-	                
+
 	                return $isrel;
                 }
             });

src/views/layout.blade.php

@@ -19,7 +19,7 @@
     <!-- Styles -->
     <link href="{{ asset('css/app.css') }}?v={{env('APP_VERSION', 9999999)}}" rel="stylesheet">
 </head>
-<body class="{{$bg_class ?? ''}} {{$page_name_class}}">
+<body class="{{$bg_class ?? ''}} {{$page_name_class ?? ''}}">
     <div id="app">
         <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm">
             <div class="container">