generator-folklore 3.0.29 → 3.0.30

package/lib/generators/eslint/templates/.eslint.config.js

@@ -18,7 +18,7 @@ module.exports = tseslint.config(
     {
         settings: {
             react: {
-                defaultVersion: '19',
+                defaultVersion: '18',
             },
         },
         languageOptions: {

package/lib/generators/laravel/templates/gitignore

@@ -1,28 +1,31 @@
 # Numerous always-ignore extensions
-*.diff
-*.err
-*.orig
-*.log
-*.rej
-*.swo
-*.swp
-*.vi
-*~
-*.sass-cache
+
+_.diff
+_.err
+_.orig
+_.log
+_.rej
+_.swo
+_.swp
+_.vi
+_~
+_.sass-cache
 
 # OS or Editor folders
+
 .DS_Store
 Thumbs.db
 .cache
 .project
 .settings
 .tmproj
-*.esproj
+\*.esproj
 nbproject
 devnotes.md
-_notes
+\_notes
 
 # Folders to ignore
+
 .hg
 .svn
 .CVS
@@ -32,7 +35,8 @@ publish
 
 /node_modules
 /public/storage
-/storage/*.key
+/public/static
+/storage/\*.key
 /vendor
 /.idea
 Homestead.json

package/lib/generators/laravel-panneau/templates/app/Contracts/Repositories/Pages.php

@@ -11,7 +11,7 @@ interface Pages extends BasePages
 
     public function findByHandle(string $handle): ?PageResource;
 
-    public function findBySlug(string $slug, string $locale = null): ?PageResource;
+    public function findBySlug(string $slug, ?string $locale = null): ?PageResource;
 
     public function create($data): PageResource;
 

package/lib/generators/laravel-panneau/templates/app/Http/Resources/PageResource.php

@@ -6,7 +6,7 @@ use Illuminate\Http\Resources\Json\JsonResource;
 use App\Contracts\Entities\Page;
 use App\Contracts\Entities\Pages\Home as HomePage;
 use Folklore\Http\Resources\MediaResource;
-use Folklore\Contracts\Resources\HasBlocks;
+use Folklore\Contracts\Entities\HasBlocks;
 
 class PageResource extends JsonResource
 {

package/lib/generators/laravel-panneau/templates/app/Models/MediaFile.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Folklore\Models\MediaFile as BaseMediaFile;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class MediaFile extends BaseMediaFile
+{
+    use HasFactory;
+}

package/lib/generators/laravel-panneau/templates/app/Models/Page.php

@@ -12,7 +12,7 @@ class Page extends BasePage
     use HasFactory;
 
     protected $entitiesByType = [
-        'home' => \App\Resources\Pages\HomePage::class,
+        'home' => \App\Entities\Pages\HomePage::class,
     ];
 
     public function toEntity(): PageContract

package/lib/generators/laravel-panneau/templates/app/Repositories/Pages.php

@@ -25,7 +25,7 @@ class Pages extends BasePages implements PagesContract
         return parent::findByHandle($handle);
     }
 
-    public function findBySlug(string $slug, string $locale = null): ?PageContract
+    public function findBySlug(string $slug, ?string $locale = null): ?PageContract
     {
         return parent::findBySlug($slug, $locale);
     }

package/lib/generators/laravel-panneau/templates/resources/assets/js/components/Panneau.jsx

@@ -6,7 +6,9 @@ import React, { useState, useEffect } from 'react';
 
 import * as fieldsComponents from './panneau/fields';
 
-import '../../styles/panneau.scss';
+import '@panneau/app/assets/css/styles.css';
+import '@panneau/themes/assets/css/styles.css';
+import '@panneau/themes/assets/css/vendor.css';
 
 const propTypes = {
     definition: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types

package/lib/generators/laravel-panneau/templates/routes.php

@@ -2,6 +2,8 @@
 
 use Illuminate\Support\Facades\Route;
 use Panneau\Support\Facade as Panneau;
+use App\Panneau\Http\Controllers\HomeController;
+use App\Panneau\Http\Controllers\UploadController;
 
 Panneau::router()->group(function () {
     $namePrefix = config('panneau.routes.name_prefix', config('panneau.routes.prefix') . '.');
@@ -14,19 +16,15 @@ Panneau::router()->group(function () {
         Panneau::router()->auth();
     });
 
-    Route::namespace('\App\Panneau\Http\Controllers')
-        ->middleware(['web', 'auth', 'can:view,' . \Panneau\Panneau::class])
-        ->group(function () use ($namePrefix) {
-            Route::get('/', 'HomeController@index')->name($namePrefix . 'home');
+    Route::middleware(['web', 'auth', 'can:view,' . \Panneau\Panneau::class])->group(
+        function () use ($namePrefix) {
+            Route::get('/', [HomeController::class, 'index'])->name($namePrefix . 'home');
 
-            Route::post('upload', 'UploadController@upload')->name($namePrefix . 'upload');
-
-            // Account
-            Route::get('account', 'AccountController@index')->name($namePrefix . 'account');
-            Route::post('account', 'AccountController@update')->name(
-                $namePrefix . 'account.update'
+            Route::post('upload', [UploadController::class, 'upload'])->name(
+                $namePrefix . 'upload'
             );
 
             Panneau::router()->resources();
-        });
+        }
+    );
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.29",
+    "version": "3.0.30",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -40,5 +40,5 @@
         "yeoman-generator": "5.9.0",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "d700a0347ce006f62fa5e83f79435a1d283e80d3"
+    "gitHead": "729e543ff89bac05964cdafb710eeb79d8e09362"
 }

package/lib/generators/laravel-panneau/templates/resources/assets/styles/panneau.scss

@@ -1,3 +0,0 @@
-@import '~@panneau/app/scss/styles';
-@import '~@panneau/themes/scss/styles';
-@import '~@panneau/themes/scss/vendor';