generator-pninja 1.0.3 → 1.0.4

package/generators/app/index.js

@@ -116,7 +116,7 @@ export default class extends Generator {
         type: "list",
         name: "dbms",
         message: "Your DBMS",
-        default: "sqlite",
+        default: this.config.get('dbms') || 'sqlite',
         choices: [
           {
             name: `SQLite ${colors.dim('(Lightweight, serverless, file-based)')}`,

package/generators/app/templates/README.md.ejs

@@ -16,6 +16,12 @@ Start your **development client** (http://localhost:5173/) with:
 npm run client
 ```
 
+Alternatively, you can start both the **development client and server** with:
+
+```sh
+npm run dev
+```
+
 To **initialize** the database:
 
 ```sh

package/generators/app/templates/package.json.ejs

@@ -7,6 +7,7 @@
     "dependencies": {
     },
     "scripts": {
+        "dev": "concurrently \"npm run server\" \"npm run client\"",
         "client": "cd client && npm i --loglevel=error && npm run dev",
         "dump-server": "cd server && php artisan dump-server",
         "migrate": "cd server && php artisan migrate",
@@ -24,5 +25,8 @@
 <%  } -%>
         "seed": "cd server && php artisan db:seed",
         "server": "cd server && php artisan serve"
-    }
+  },
+  "devDependencies": {
+    "concurrently": "^9.2.1"
+  }
 }

package/generators/client/index.js

@@ -43,6 +43,7 @@ export default class AuthGenerator extends Generator {
                 type: 'checkbox',
                 name: 'languages',
                 message: 'Please choose additional languages to install',
+                default: this.config.get('languages') || [],
                 choices: (answers) => {
                     return getAvailableLanguages(answers.nativeLanguage);
                 },

package/generators/client/templates/react/src/components/entities/EntityForm.tsx.ejs

@@ -181,6 +181,8 @@ interface <%= entity.name %>FormProps {
   onCancel: () => void;
 }
 
+const canDelete = () => true; // Placeholder for permission logic
+
 export function <%= entity.name %>Form({ <%= to.camel(entity.name)%>, onSubmit, onCancel }: <%= entity.name%>FormProps) {
   const { t } = useTranslation();
   useAutoShortcuts();
@@ -392,7 +394,7 @@ export function <%= entity.name %>Form({ <%= to.camel(entity.name)%>, onSubmit,
             <kbd className="kdb-shortcut">{isMac ? '⌘' : 'Ctrl'}</kbd>
             <kbd className="kdb-shortcut">↵</kbd>
           </button>
-          {<%= to.camel(entity.name)-%>?.id && <<%= entity.name %>DeleteButton id={<%= to.camel(entity.name)-%>.id} />}
+          {<%= to.camel(entity.name)-%>?.id && canDelete() && <<%= entity.name %>DeleteButton id={<%= to.camel(entity.name)-%>.id} />}
         </div>
       </form>
     </FormProvider>

package/generators/client/templates/react/src/index.css.ejs

@@ -91,7 +91,10 @@
     }
     tbody {
       td {
-        @apply px-6 py-4 truncate max-w-50;
+        @apply px-6 py-4;
+        &.truncate {
+          @apply truncate max-w-50;
+        }
       }
       tr {
         @apply odd:bg-slate-100 even:bg-slate-200 text-slate-900 odd:dark:bg-slate-700 even:dark:bg-slate-800 dark:text-slate-100;

package/generators/client/templates/react/src/pages/entities/EntityList.tsx.ejs

@@ -148,6 +148,9 @@ export default function <%= entity.name %>List() {
     document.title = t('entities:<%-to.snake(entity.name)%>.<%- pluralize(entity.name)%>');
   }, [i18n.language, t]);
 
+  const canEdit = () => true; // Placeholder for permission logic
+  const canView = () => true; // Placeholder for permission logic
+
   return (
     <>
       <h1 className="text-2xl mb-4">{t('entities:<%-to.snake(entity.name)%>.<%- pluralize(entity.name)%>')}</h1>
@@ -190,7 +193,7 @@ export default function <%= entity.name %>List() {
 <%  for(column of columns) { -%>
                   <SortHeader field="<%-column%>" label={t('entities:<%-to.snake(entity.name)%>.<%-column%>')} />
 <%  } -%>
-<%                if (false) for(r of relatedEntities) { -%>
+<%                for(r of relatedEntities) { -%>
                   <th scope="col">{t('entities:<%-to.snake(entity.name)%>.<%-r.field%>')}</th>
 <%                } -%>
                   <th scope="col">{t('actions.crud.actions')}</th>
@@ -220,7 +223,7 @@ export default function <%= entity.name %>List() {
                     </td>
 <%                    } -%>
 <%                  } -%>
-<%                  if (false) for(r of relatedEntities) { -%>
+<%                  for(r of relatedEntities) { -%>
                     <td>
 <%                  if(r.isArray) { -%>
                       {row?.<%-r.field%>?.map((row, index) => (<Fragment key={index}>{index !== 0 ? ', ': ''}<Link className="text-link" to={`/entities/<%=to.slug(pluralize(r.related))%>/view/${row?.id}`}>{row?.<%-to.snake(r.labelField)%>}</Link></Fragment>))}
@@ -231,8 +234,8 @@ export default function <%= entity.name %>List() {
 <%                  } -%>
                     <td className="text-nowrap w-0 uppercase">
                       <div className="flex space-x-2">
-                        <Link to={`/entities/<%=to.slug(pluralize(entity.name))%>/view/${row.id}`} className="text-link">{t('actions.crud.view')}</Link>
-                        <Link to={`/entities/<%=to.slug(pluralize(entity.name))%>/edit/${row.id}`} className="text-link">{t('actions.crud.edit')}</Link>
+                        {canView() && <Link to={`/entities/<%=to.slug(pluralize(entity.name))%>/view/${row.id}`} className="text-link">{t('actions.crud.view')}</Link>}
+                        {canEdit() && <Link to={`/entities/<%=to.slug(pluralize(entity.name))%>/edit/${row.id}`} className="text-link">{t('actions.crud.edit')}</Link>}
                       </div>
                     </td>
                   </tr>

package/generators/client/templates/react/src/pages/entities/EntityView.tsx.ejs

@@ -27,6 +27,8 @@ interface <%= entity.name %>ViewParams extends Record<string, string | undefined
   id: string;
 }
 
+const canDelete = () => true; // Placeholder for permission logic
+
 export function <%= entity.name %>DataView({ data }: <%= entity.name %>DataViewParams) {
   const { t } = useTranslation();
   if (!data) return '';
@@ -163,7 +165,7 @@ export default function <%= entity.name %>View() {
         <Link to={`/entities/<%-to.slug(pluralize(entity.name))%>/edit/${id}`} className="primary-button">
           {t('actions.crud.edit')}
         </Link>
-        <<%= entity.name %>DeleteButton id={id} />
+        {canDelete() && <<%= entity.name %>DeleteButton id={id} />}
       </div>
       )}
     </>

package/generators/entities/index.js

@@ -144,6 +144,7 @@ export default class EntityGenerator extends Generator {
 
     this.fs.copyTpl(this.templatePath("blobs/dummy.pdf"), this.destinationPath(`server/database/factories/dummy.pdf`));
     this.fs.copyTpl(this.templatePath("blobs/dummy.png"), this.destinationPath(`server/database/factories/dummy.png`));
+    this.fs.copyTpl(this.templatePath(".gitkeep.ejs"), this.destinationPath(`server/database/seeders/csv/.gitkeep`));
     this.fs.copyTpl(this.templatePath(".gitkeep.ejs"), this.destinationPath(`server/storage/app/private/uploads/.gitkeep`));
     this.fs.copyTpl(this.templatePath(".gitkeep.ejs"), this.destinationPath(`server/storage/app/public/uploads/.gitkeep`));
     this.fs.copyTpl(this.templatePath("SessionAuth.php.ejs"), this.destinationPath(`server/app/Http/Middleware/SessionAuth.php`));

package/generators/entities/templates/DatabaseSeeder.php.ejs

@@ -3,6 +3,7 @@
 namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\File;
 <% entities.forEach(function(entity) { %>
 use App\Models\<%= entity.name %>;<% }); %>
 class DatabaseSeeder extends Seeder
@@ -12,12 +13,103 @@ class DatabaseSeeder extends Seeder
      */
     public function run(): void
     {
-<% entities.forEach(function(entity) { %>        while(<%= entity.name %>::count() < <%= n %>) <%= entity.name %>::factory()->create();<%= "\n"%><% }); %>
-        // Many-to-many
-<% manyToMany.forEach(function(rel) { %>        <%= rel.fromEntity %>::all()->each(function ($entity) {
-            $entity-><%= rel.relPropery %>()->attach(
-                <%= rel.toEntity %>::all()->random(<%= Math.round(n/2) %>)->pluck('id')->toArray()
-            );
-        });
-<% }); %>    }
-}
+<% entities.forEach(function(entity) { -%>
+        $this->seedModel(<%= entity.name %>::class, '<%= entity.name %>.csv', <%= n %>);
+<% }); -%>
+
+        // Many-to-many relationships
+<% manyToMany.forEach(function(rel) { -%>
+        $this->seedManyToMany(<%= rel.fromEntity %>::class, '<%= rel.relPropery %>', <%= rel.toEntity %>::class, '<%= rel.fromEntity %><%= rel.toEntity %>.csv', <%- Math.round(n/2) %>);
+<% }); -%>
+    }
+
+    /**
+     * Seed from CSV or factory
+     */
+    private function seedModel(string $modelClass, string $csvFilename, int $minCount): void
+    {
+        $csvPath = database_path("seeders/csv/{$csvFilename}");
+
+        if (File::exists($csvPath)) {
+            $this->seedFromCsv($modelClass, $csvPath);
+        } else {
+            // Use the factory
+            while ($modelClass::count() < $minCount) {
+                $modelClass::factory()->create();
+            }
+        }
+    }
+
+    /**
+     * Load data from a CSV file
+     */
+    private function seedFromCsv(string $modelClass, string $csvPath): void
+    {
+        $csv = array_map('str_getcsv', file($csvPath));
+        $headers = array_shift($csv);
+
+        foreach ($csv as $row) {
+            $data = array_combine($headers, $row);
+
+            // Rimuovi campi vuoti o null
+            $data = array_filter($data, function($value) {
+                return $value !== '' && $value !== null;
+            });
+
+            $modelClass::create($data);
+        }
+    }
+
+    /**
+     * Seed many-to-many relationships
+     */
+    private function seedManyToMany(
+        string $modelClass,
+        string $relationName,
+        string $relatedClass,
+        string $csvFilename,
+        int $randomCount
+    ): void {
+        $csvPath = database_path("seeders/csv/{$csvFilename}");
+
+        if (File::exists($csvPath)) {
+            $this->seedManyToManyFromCsv($modelClass, $relationName, $csvPath);
+        } else {
+            // Use random associations
+            $modelClass::all()->each(function ($entity) use ($relationName, $relatedClass, $randomCount) {
+                $entity->$relationName()->attach(
+                    $relatedClass::all()->random($randomCount)->pluck('id')->toArray()
+                );
+            });
+        }
+    }
+
+    /**
+     * Load many-to-many relationships from CSV
+     * The CSV must have columns: model_id, related_id
+     */
+    private function seedManyToManyFromCsv(string $modelClass, string $relationName, string $csvPath): void
+    {
+        $csv = array_map('str_getcsv', file($csvPath));
+        $headers = array_shift($csv);
+
+        $grouped = [];
+        foreach ($csv as $row) {
+            $data = array_combine($headers, $row);
+            $modelId = $data['model_id'];
+            $relatedId = $data['related_id'];
+
+            if (!isset($grouped[$modelId])) {
+                $grouped[$modelId] = [];
+            }
+            $grouped[$modelId][] = $relatedId;
+        }
+
+        foreach ($grouped as $modelId => $relatedIds) {
+            $model = $modelClass::find($modelId);
+            if ($model) {
+                $model->$relationName()->attach($relatedIds);
+            }
+        }
+    }
+}

package/generators/entities/templates/EntityController.php.ejs

@@ -27,11 +27,12 @@ class <%- className %>Controller extends Controller
     // use HandlesUserRoles;
 
     // private $viewerRole = 'viewer';
+    // private $editorRole = 'editor';
 
     public function index(Request $request)
     {
         try {
-            // if (!$this->userHasRole($this->viewerRole)) return response()->json(['error' => 'Forbidden'], 403);
+            if (!$this->canViewData()) return response()->json(['error' => 'Forbidden'], 403);
 <%  if (searchEngine !== 'null') {-%>
             $search = $request->has('search') ? ScoutQuerySanitizer::sanitize($request->get('search')) : null;
 <%  } -%>
@@ -112,6 +113,7 @@ class <%- className %>Controller extends Controller
     public function show($id)
     {
         try {
+            if (!$this->canViewData()) return response()->json(['error' => 'Forbidden'], 403);
 <%          if (withs) { -%>
             $<%- entityName %> = <%- className %>::with(<%- withs %>)->findOrFail($id);
 <%          } else { -%>
@@ -126,6 +128,7 @@ class <%- className %>Controller extends Controller
     public function store(Request $request)
     {
         try {
+            if (!$this->canCreateData()) return response()->json(['error' => 'Forbidden'], 403);
 <%  if(isEmpty(validationsStore)) {-%>
             $data = $request->all();
 <%  } else {-%>
@@ -184,6 +187,8 @@ class <%- className %>Controller extends Controller
     public function update($id, Request $request)
     {
         try {
+            if (!$this->canModifyData()) return response()->json(['error' => 'Forbidden'], 403);
+
 <%  if (withs) { -%>
             $<%- entityName %> = <%- className %>::with(<%- withs %>)->findOrFail($id);
 <%  } else { -%>
@@ -257,6 +262,7 @@ class <%- className %>Controller extends Controller
     public function destroy($id)
     {
         try {
+            if (!$this->canDeleteData()) return response()->json(['error' => 'Forbidden'], 403);
             $<%- entityName %> = <%- className %>::findOrFail($id);
             $<%- entityName %>->delete();
             return response(null, 200);
@@ -292,4 +298,32 @@ class <%- className %>Controller extends Controller
         }
     }
 <%  }-%>
+
+    private function canViewData()
+    {
+        // Implement role checking logic here
+        // return $this->userHasRole($this->viewerRole);
+        return true;
+    }
+
+    private function canCreateData()
+    {
+        // Implement role checking logic here
+        // return $this->userHasRole($this->editorRole);
+        return true;
+    }
+
+    private function canModifyData()
+    {
+        // Implement role checking logic here
+        // return $this->userHasRole($this->editorRole);
+        return true;
+    }
+
+    private function canDeleteData()
+    {
+        // Implement role checking logic here
+        // return $this->userHasRole($this->editorRole);
+        return true;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-pninja",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Generator for PHP/Laravel + SQL + Vite + React applications",
   "type": "module",
   "files": [