fix: patch up theme install on non-mvc apps

mychidarko · mychidarko · commit c4a35a9fd868 · 2023-10-04T08:37:09.000Z
diff --git a/src/ViewInstallCommand.php b/src/ViewInstallCommand.php
@@ -85,7 +85,7 @@ protected function installBlade($output)
             \Leaf\FS::superCopy(__DIR__ . '/themes/blade/theme', "$directory/$viewsPath");
             \Leaf\FS::superCopy(__DIR__ . '/themes/blade/config', "$directory/config");
         } else {
-            \Leaf\FS::superCopy(__DIR__ . '/themes/blade', $directory);
+            \Leaf\FS::superCopy(__DIR__ . '/themes/blade/theme', $directory);
         }
 
         $output->writeln("\n🎉   <info>Blade setup successfully.</info>");
@@ -145,7 +145,7 @@ protected function installBareUi($output)
                 file_put_contents($indexFile, $index);
             }
         } else {
-            \Leaf\FS::superCopy(__DIR__ . '/themes/bareui', $directory);
+            \Leaf\FS::superCopy(__DIR__ . '/themes/bareui/theme', $directory);
         }
 
         $output->writeln("\n🎉   <info>Bare UI setup successfully.</info>");
diff --git a/src/ui/server.php b/src/ui/server.php
@@ -332,7 +332,6 @@ function createApp($appInfo)
 function updateBasicBuild($appInfo, $directory, $appName)
 {
     $indexFile = $directory . '/' . $appName . '/index.php';
-
     $indexFileContent = file_get_contents($indexFile);
 
     if ($appInfo['templateEngine'] === 'blade') {

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ protected function installBlade($output)`
`85`	`85`	`\Leaf\FS::superCopy(__DIR__ . '/themes/blade/theme', "$directory/$viewsPath");`
`86`	`86`	`\Leaf\FS::superCopy(__DIR__ . '/themes/blade/config', "$directory/config");`
`87`	`87`	`} else {`
`88`		`- \Leaf\FS::superCopy(__DIR__ . '/themes/blade', $directory);`
	`88`	`+ \Leaf\FS::superCopy(__DIR__ . '/themes/blade/theme', $directory);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`$output->writeln("\n🎉 <info>Blade setup successfully.</info>");`
`@@ -145,7 +145,7 @@ protected function installBareUi($output)`
`145`	`145`	`file_put_contents($indexFile, $index);`
`146`	`146`	`}`
`147`	`147`	`} else {`
`148`		`- \Leaf\FS::superCopy(__DIR__ . '/themes/bareui', $directory);`
	`148`	`+ \Leaf\FS::superCopy(__DIR__ . '/themes/bareui/theme', $directory);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`$output->writeln("\n🎉 <info>Bare UI setup successfully.</info>");`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,6 @@ function createApp($appInfo)`
`332`	`332`	`function updateBasicBuild($appInfo, $directory, $appName)`
`333`	`333`	`{`
`334`	`334`	`$indexFile = $directory . '/' . $appName . '/index.php';`
`335`		`-`
`336`	`335`	`$indexFileContent = file_get_contents($indexFile);`
`337`	`336`
`338`	`337`	`if ($appInfo['templateEngine'] === 'blade') {`