adapt to new structure

Author: saeedvaziry

php-saas

@@ -7,7 +7,7 @@ if (file_exists(__DIR__.'/../../autoload.php')) {
     require __DIR__.'/vendor/autoload.php';
 }
 
-$app = new Symfony\Component\Console\Application('PHP-SaaS Cli', '0.5.0');
+$app = new Symfony\Component\Console\Application('PHP-SaaS Cli', '0.6.0');
 $app->add(new PHPSaaS\Cli\NewCommand);
 
 $app->run();

src/NewCommand.php

@@ -34,6 +34,8 @@ class NewCommand extends Command
 
     protected string $name = '';
 
+    protected string $tmpPath = '';
+
     protected string $path = '';
 
     protected string $frontend = '';
@@ -80,6 +82,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $this->path = getcwd().'/'.$this->name;
 
+        $this->tmpPath = sys_get_temp_dir().'/php-saas-'.str_replace(' ', '-', strtolower($this->name)).'-'.time();
+
         $this->collectInputs();
 
         // setup modules

src/Traits/Application.php

@@ -15,9 +15,11 @@ protected function setupApplication(): void
         $repositoryUrl = '[email protected]:php-saas/php-saas.git';
 
         $this->runCommands([
-            "git clone {$repositoryUrl} {$this->path}",
+            "git clone {$repositoryUrl} {$this->tmpPath}",
         ]);
 
+        $this->fileSystem->moveDirectory($this->tmpPath.'/laravel', $this->path);
+
         if (! file_exists($this->path.'/.env')) {
             $this->fileSystem->copy($this->path.'/.env.example', $this->path.'/.env');
         }
@@ -30,9 +32,6 @@ protected function setupApplication(): void
 
     protected function cleanupApplication(): void
     {
-        $this->fileSystem->deleteDirectory($this->path.'/.github');
-        $this->fileSystem->deleteDirectory($this->path.'/.git');
-        $this->fileSystem->delete($this->path.'/.gitignore');
-        $this->fileSystem->move($this->path.'/.gitignore.final', $this->path.'/.gitignore');
+        //
     }
 }

src/Traits/Frontend.php

@@ -12,29 +12,22 @@ protected function setupFrontend(): void
             throw new RuntimeException('Vue stack is not supported yet.');
         }
 
-        $renames = [
-            'resources/js-%s' => 'resources/js',
-            'vite-%s.config.ts' => 'vite.config.ts',
-            'tsconfig-%s.json' => 'tsconfig.json',
-            'eslint-%s.config.js' => 'eslint.config.js',
-            'package-%s.json' => 'package.json',
-        ];
-
-        foreach ($renames as $from => $to) {
-            $from = $this->path.'/'.sprintf($from, strtolower($this->frontend));
-            $to = $this->path.'/'.sprintf($to, strtolower($this->frontend));
+        $this->fileSystem->moveDirectory($this->tmpPath.'/'.$this->frontend.'/src', $this->path.'/resources/js');
 
-            if (! $this->fileSystem->exists($from)) {
-                throw new RuntimeException("File {$from} does not exist. Please check the template.");
-            }
+        $filesToCopy = [
+            'vite.config.ts',
+            'tsconfig.json',
+            'eslint.config.js',
+            'package.json',
+        ];
 
-            $this->fileSystem->move($from, $to);
+        foreach ($filesToCopy as $file) {
+            $this->fileSystem->copy($this->tmpPath.'/'.$this->frontend.'/'.$file, $this->path.'/'.$file);
         }
     }
 
     protected function cleanupFrontend(): void
     {
-        $this->fileSystem->deleteDirectory($this->path.'/resources/js-vue');
-        $this->fileSystem->deleteDirectory($this->path.'/resources/js-react');
+        //
     }
 }