generator-folklore 3.0.6 → 3.0.8

package/lib/generators/babel/index.js

@@ -56,7 +56,14 @@ module.exports = class BabelGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['@babel/cli', '@babel/core', '@babel/node', '@babel/plugin-transform-runtime', '@babel/preset-env', '@babel/preset-react']);
+        this.addDevDependencies({
+          '@babel/core': '^7.19.3',
+          '@babel/cli': 'latest',
+          '@babel/node': 'latest',
+          '@babel/plugin-transform-runtime': 'latest',
+          '@babel/preset-env': 'latest',
+          '@babel/preset-react': 'latest'
+        });
       }
 
     };

package/lib/generators/build/index.js

@@ -92,7 +92,9 @@ module.exports = class AppGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['@folklore/cli']);
+        this.addDevDependencies({
+          '@folklore/cli': '^0.0.47'
+        });
       }
 
     };

package/lib/generators/cli/index.js

@@ -75,7 +75,10 @@ module.exports = class CliGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDependencies(['commander', 'debug']);
+        this.addDependencies({
+          'commander': 'latest',
+          'debug': 'latest'
+        });
       }
 
     };

package/lib/generators/docs/index.js

@@ -1,11 +1,11 @@
 "use strict";
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _lodash = _interopRequireDefault(require("lodash"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _chalk = _interopRequireDefault(require("chalk"));
-
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -141,10 +141,15 @@ module.exports = class DocsGenerator extends _generator.default {
           return;
         }
 
-        this.addDevDependencies(['gitbook-cli@latest']);
+        this.addDevDependencies({
+          'gitbook-cli': 'latest'
+        });
 
         if (this.options.language === 'js') {
-          this.addDevDependencies(['jsdoc@latest', 'jsdoc-babel@latest']);
+          this.addDevDependencies({
+            jsdoc: 'latest',
+            'jsdoc-babel': 'latest'
+          });
         }
       }
 

package/lib/generators/eslint/index.js

@@ -32,7 +32,18 @@ module.exports = class EslintGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['babel-preset-airbnb', '@babel/eslint-parser', 'eslint', 'eslint-config-airbnb', 'eslint-config-prettier', 'eslint-plugin-prettier', 'eslint-plugin-import', 'eslint-plugin-jsx-a11y', 'eslint-plugin-react', 'eslint-plugin-formatjs']);
+        this.addDevDependencies({
+          'babel-preset-airbnb': 'latest',
+          '@babel/eslint-parser': 'latest',
+          eslint: '^8.0.0',
+          'eslint-config-airbnb': 'latest',
+          'eslint-config-prettier': 'latest',
+          'eslint-plugin-prettier': 'latest',
+          'eslint-plugin-import': 'latest',
+          'eslint-plugin-jsx-a11y': 'latest',
+          'eslint-plugin-react': 'latest',
+          'eslint-plugin-formatjs': 'latest'
+        });
       }
 
     };

package/lib/generators/intl/index.js

@@ -76,7 +76,9 @@ module.exports = class IntlGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['@folklore/cli']);
+        this.addDevDependencies({
+          '@folklore/cli': '^0.0.47'
+        });
       }
 
     };

package/lib/generators/laravel-mediatheque/index.js

@@ -130,4 +130,22 @@ module.exports = class LaravelMediathequeGenerator extends _generator.default {
     };
   }
 
+  end() {
+    if (this.options.quiet) {
+      return;
+    }
+
+    console.log('\n\n');
+    console.log(_chalk.default.yellow('\n----------------------'));
+    console.log(_chalk.default.bold('Instructions'));
+    console.log(_chalk.default.yellow('----------------------\n\n'));
+    console.log(`1. Add to ${_chalk.default.bold.yellow('app/Providers/AppServiceProvider.php')}:`);
+    const serviceProvider = fs.readFileSync(_path.default.join(__dirname, './instructions/ServiceProvider.php'));
+    console.log('---');
+    console.log(highlight(serviceProvider.toString('utf-8'), {
+      language: 'php',
+      ignoreIllegals: true
+    }));
+  }
+
 };

package/lib/generators/laravel-mediatheque/instructions/ServiceProvider.php

@@ -0,0 +1,26 @@
+<?php
+
+class AppServiceProvider extends ServiceProvider
+{
+    //...
+    public function register()
+    {
+        // ...
+
+        $this->registerMediatheque();
+    }
+
+    protected function registerMediatheque()
+    {
+        $this->app->bind(
+            \Folklore\Mediatheque\Contracts\Models\Media::class,
+            \App\Models\Media::class
+        );
+
+        $this->app->bind(
+            \Folklore\Mediatheque\Contracts\Models\File::class,
+            \App\Models\MediaFile::class
+        );
+    }
+    //...
+}

package/lib/generators/laravel-panneau/index.js

@@ -2,6 +2,10 @@
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
+var _cliHighlight = require("cli-highlight");
+
+var _fs = _interopRequireDefault(require("fs"));
+
 var _glob = _interopRequireDefault(require("glob"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
@@ -65,7 +69,24 @@ module.exports = class LaravelPanneauGenerator extends _generator.default {
       },
 
       packageJSON() {
-        this.addDependencies(['@panneau/app@^1.0.0-alpha.193', '@panneau/core@^1.0.0-alpha.193']);
+        this.addDependencies({
+          '@panneau/app': '^1.0.3-alpha.1',
+          '@panneau/core': '^1.0.3-alpha.1',
+          '@panneau/data': '^1.0.3-alpha.1',
+          '@panneau/field-text': '^1.0.3-alpha.1',
+          '@panneau/field-localized': '^1.0.3-alpha.1'
+        });
+      },
+
+      config() {
+        const source = this.templatePath('config.php');
+        const destination = this.destinationPath('config/panneau.php');
+
+        if (this.fs.exists(destination)) {
+          this.fs.delete(destination);
+        }
+
+        this.fs.copyTpl(source, destination, {});
       },
 
       routes() {
@@ -107,10 +128,6 @@ module.exports = class LaravelPanneauGenerator extends _generator.default {
         this.fs.copyTpl(source, destination, {});
       },
 
-      npmDependencies() {
-        this.addDependencies(['@panneau/app@^1.0.0-alpha.193', '@panneau/core@^1.0.0-alpha.193', '@panneau/data@^1.0.0-alpha.193', '@panneau/field-text@^1.0.0-alpha.193', '@panneau/field-localized@^1.0.0-alpha.193']);
-      },
-
       files() {
         const folders = ['app', 'resources', 'lang'];
         folders.forEach(folder => {
@@ -169,4 +186,33 @@ module.exports = class LaravelPanneauGenerator extends _generator.default {
     };
   }
 
+  end() {
+    if (this.options.quiet) {
+      return;
+    }
+
+    console.log('\n\n');
+    console.log(_chalk.default.yellow('\n----------------------'));
+    console.log(_chalk.default.bold('Instructions'));
+    console.log(_chalk.default.yellow('----------------------\n\n'));
+    console.log(`1. Add to ${_chalk.default.bold.yellow('app/Providers/AppServiceProvider.php')}:`);
+
+    const serviceProvider = _fs.default.readFileSync(_path.default.join(__dirname, './instructions/ServiceProvider.php'));
+
+    console.log('---');
+    console.log((0, _cliHighlight.highlight)(serviceProvider.toString('utf-8'), {
+      language: 'php',
+      ignoreIllegals: true
+    }));
+    console.log(`\n2. Add to ${_chalk.default.bold.yellow('config/app.php')}:`);
+
+    const config = _fs.default.readFileSync(_path.default.join(__dirname, './instructions/config.php'));
+
+    console.log('---');
+    console.log((0, _cliHighlight.highlight)(config.toString('utf-8'), {
+      language: 'php',
+      ignoreIllegals: true
+    }));
+  }
+
 };

package/lib/generators/laravel-panneau/instructions/ServiceProvider.php

@@ -0,0 +1,21 @@
+<?php
+
+class AppServiceProvider extends ServiceProvider
+{
+    //...
+    protected function registerRepositories()
+    {
+        //...
+
+        $this->app->bind(
+            \Folklore\Contracts\Repositories\Pages::class,
+            \App\Repositories\Pages::class
+        );
+
+        $this->app->bind(
+            \App\Contracts\Repositories\Pages::class,
+            \App\Repositories\Pages::class
+        );
+    }
+    //...
+}

package/lib/generators/laravel-panneau/instructions/config.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    // ...
+
+    'providers' => [
+        // ...
+
+        App\Panneau\PanneauServiceProvider::class,
+    ],
+
+    // ...
+];

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

@@ -13,7 +13,7 @@ interface Pages extends BasePages
 
     public function findBySlug(string $slug, string $locale = null): ?PageResource;
 
-    public function create(array $data): PageResource;
+    public function create($data): PageResource;
 
-    public function update(string $id, array $data): ?PageResource;
+    public function update(string $id, $data): ?PageResource;
 }

package/lib/generators/laravel-panneau/templates/app/Contracts/Resources/Block.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Contracts\Resources;
+
+use Folklore\Contracts\Resources\Block as BaseBlock;
+
+interface Block extends BaseBlock
+{
+
+}

package/lib/generators/laravel-panneau/templates/app/Contracts/Resources/Blocks/Image.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Contracts\Resources\Blocks;
+
+use App\Contracts\Resources\Block as BaseBlock;
+use Folklore\Contracts\Resources\Image as ImageContract;
+
+interface Image extends BaseBlock
+{
+    public function image(): ?ImageContract;
+
+    public function caption(string $locale): ?string;
+
+    public function credits(string $locale): ?string;
+}

package/lib/generators/laravel-panneau/templates/app/Contracts/Resources/Blocks/Text.php

@@ -6,5 +6,7 @@ use App\Contracts\Resources\Block as BaseBlock;
 
 interface Text extends BaseBlock
 {
+    public function title(string $locale): ?string;
+
     public function body(string $locale): ?string;
 }

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

@@ -3,7 +3,7 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Contracts\Resources\HasBlocks;
+use Folklore\Contracts\Resources\HasBlocks;
 use Folklore\Http\Resources\LocalizedResource;
 use App\Contracts\Resources\Blocks\Text as TextBlock;
 

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

@@ -2,6 +2,8 @@
 
 namespace App\Http\Resources;
 
+use Folklore\Http\Resources\Collection;
+
 class BlocksCollection extends Collection
 {
     public $collects = BlockResource::class;

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

@@ -3,10 +3,10 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Http\Resources\Medias\ImageResource;
 use App\Contracts\Resources\Page;
-use App\Contracts\Resources\HasBlocks;
 use App\Contracts\Resources\Pages\Home as HomePage;
+use Folklore\Http\Resources\MediaResource;
+use Folklore\Contracts\Resources\HasBlocks;
 
 class PageResource extends JsonResource
 {
@@ -19,6 +19,8 @@ class PageResource extends JsonResource
     public function toArray($request)
     {
         $locale = $request->locale();
+        $image = $this->image();
+        $parent = $this->parent();
         return [
             'id' => $this->id(),
             'type' => $this->type(),
@@ -26,10 +28,10 @@ class PageResource extends JsonResource
             'title' => $this->title($locale),
             'description' => $this->description($locale),
             'slug' => $this->slug($locale),
-            'image' => !is_null($image) ? new ImageResource($image) : null,
+            'image' => !is_null($image) ? new MediaResource($image) : null,
             'parent' =>
                 !is_null($parent) && $parent instanceof Page
-                    ? new ParentPageResource($parent)
+                    ? new PageResource($parent)
                     : null,
 
             $this->mergeWhen($this->resource instanceof HasBlocks, function () {

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

@@ -2,11 +2,22 @@
 
 namespace App\Models;
 
+use App\Contracts\Resources\Block as BlockContract;
+use App\Resources\Block as BlockResource;
 use Folklore\Models\Block as BaseBlock;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Block extends BaseBlock
 {
+    use HasFactory;
+
     protected $typeResources = [
         'text' => \App\Resources\Blocks\TextBlock::class,
+        'image' => \App\Resources\Blocks\ImageBlock::class,
     ];
+
+    public function toResource(): BlockContract
+    {
+        return $this->toTypedResource() ?? new BlockResource($this);
+    }
 }

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

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

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

@@ -2,11 +2,21 @@
 
 namespace App\Models;
 
+use App\Contracts\Resources\Page as PageContract;
+use App\Resources\Page as PageResource;
 use Folklore\Models\Page as BasePage;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Page extends BasePage
 {
-    protected $typeResources = [
-        'text' => \App\Resources\Pages\HomePage::class,
+    use HasFactory;
+
+    protected $typedResources = [
+        'home' => \App\Resources\Pages\HomePage::class,
     ];
+
+    public function toResource(): PageContract
+    {
+        return $this->toTypedResource() ?? new PageResource($this);
+    }
 }

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

@@ -2,6 +2,8 @@
 
 namespace App\Panneau\Http\Resources;
 
+use Folklore\Http\Resources\Collection;
+
 class BlocksCollection extends Collection
 {
     public $collects = BlockResource::class;

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

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Panneau\Http\Resources;
+
+use Folklore\Http\Resources\Collection;
+
+class UsersCollection extends Collection
+{
+    public $collects = UserResource::class;
+}

package/lib/generators/laravel-panneau/templates/app/Panneau/PanneauServiceProvider.php

@@ -5,7 +5,9 @@ namespace App\Panneau;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 use Illuminate\Contracts\View\Factory as ViewFactory;
 use Illuminate\Support\Facades\Gate;
+use Panneau\Fields\Upload as UploadField;
 use Panneau\Support\LocalizedField;
+use Folklore\Panneau\Fields\PageSlug as PageSlugField;
 use Panneau\Support\Facade as Panneau;
 
 class PanneauServiceProvider extends BaseServiceProvider
@@ -27,13 +29,35 @@ class PanneauServiceProvider extends BaseServiceProvider
      */
     public function boot()
     {
-        LocalizedField::setLocalesResolver(function () {
-            return config('locale.locales');
-        });
-
+        $this->bootFields();
         $this->bootViews();
     }
 
+    protected function bootFields()
+    {
+        $this->app->booted(function () {
+            LocalizedField::setLocalesResolver(function () {
+                return config('locale.locales');
+            });
+
+            UploadField::setEndpoint(route('panneau.upload'));
+
+            PageSlugField::setRoutesResolver(function ($locale) {
+                return [
+                    'page' => url()->routeForReactRouter($locale . '.page', [
+                        'withoutPatterns' => config('panneau.routes.without_patterns', true),
+                    ]),
+                    'page_with_parent' => url()->routeForReactRouter(
+                        $locale . '.page_with_parent',
+                        [
+                            'withoutPatterns' => config('panneau.routes.without_patterns', true),
+                        ]
+                    ),
+                ];
+            });
+        });
+    }
+
     protected function bootViews()
     {
         $view = $this->app[ViewFactory::class];
@@ -42,6 +66,8 @@ class PanneauServiceProvider extends BaseServiceProvider
         $view->composer('panneau::app', \App\Panneau\Composers\AppComposer::class);
 
         Panneau::serving(function () use ($view) {
+            $view->composer('errors::*', \Panneau\Composers\PanneauComposer::class);
+            $view->composer('errors::*', \Panneau\Composers\AppComposer::class);
             $view->composer('errors::*', \App\Panneau\Composers\AppComposer::class);
         });
     }

package/lib/generators/laravel-panneau/templates/app/Panneau/Resources/Blocks/ImageBlock.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Panneau\Resources\Blocks;
+
+use Panneau\Support\ResourceType;
+use Panneau\Fields\Image;
+use Panneau\Fields\HtmlLocalized;
+use Panneau\Fields\TextLocalized;
+
+class ImageBlock extends ResourceType
+{
+    public function id(): string
+    {
+        return 'image';
+    }
+
+    public function name(): string
+    {
+        return trans('panneau.blocks_image');
+    }
+
+    public function fields(): array
+    {
+        return [
+            Image::make('image')->withTransLabel('panneau.fields.image'),
+            HtmlLocalized::make('caption')->withTransLabel('panneau.fields.caption'),
+            TextLocalized::make('credits')->withTransLabel('panneau.fields.credits'),
+        ];
+    }
+}

package/lib/generators/laravel-panneau/templates/app/Panneau/Resources/Blocks/TextBlock.php

@@ -3,6 +3,7 @@
 namespace App\Panneau\Resources\Blocks;
 
 use Panneau\Support\ResourceType;
+use Panneau\Fields\TextLocalized;
 use Panneau\Fields\HtmlLocalized;
 
 class TextBlock extends ResourceType
@@ -20,8 +21,8 @@ class TextBlock extends ResourceType
     public function fields(): array
     {
         return [
-            HtmlLocalized::make('body')
-                ->withTransLabel('panneau.fields.body'),
+            TextLocalized::make('title')->withTransLabel('panneau.fields.title'),
+            HtmlLocalized::make('body')->withTransLabel('panneau.fields.body'),
         ];
     }
 }

package/lib/generators/laravel-panneau/templates/app/Panneau/Resources/Blocks.php

@@ -16,7 +16,10 @@ class Blocks extends Resource
         'hideInNavbar' => true,
     ];
 
-    public static $types = [\App\Panneau\Resources\Blocks\TextBlock::class];
+    public static $types = [
+        \App\Panneau\Resources\Blocks\TextBlock::class,
+        \App\Panneau\Resources\Blocks\ImageBlock::class,
+    ];
 
     public function name(): string
     {

package/lib/generators/laravel-panneau/templates/app/Panneau/Resources/Pages/Page.php

@@ -3,8 +3,8 @@
 namespace App\Panneau\Resources\Pages;
 
 use Panneau\Support\ResourceType;
-use App\Panneau\Fields\Blocks;
-use App\Panneau\Fields\Page as PageField;
+use Folklore\Panneau\Fields\Blocks;
+use Folklore\Panneau\Fields\Page as PageField;
 
 class Page extends ResourceType
 {

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

@@ -1,9 +1,9 @@
 <?php
 namespace App\Panneau\Resources;
 
-use App\Panneau\Fields\ImageLocalized;
-use App\Panneau\Fields\PageSlugLocalized;
+use Folklore\Panneau\Fields\PageSlugLocalized;
 use Panneau\Fields\TextLocalized;
+use Panneau\Fields\ImageLocalized;
 use Panneau\Fields\Toggle;
 use Panneau\Support\Resource;
 

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

@@ -30,12 +30,12 @@ class Pages extends BasePages implements PagesContract
         return parent::findBySlug($slug, $locale);
     }
 
-    public function create(array $data): PageContract
+    public function create($data): PageContract
     {
         return parent::create($data);
     }
 
-    public function update(string $id, array $data): ?PageContract
+    public function update(string $id, $data): ?PageContract
     {
         return parent::update($id, $data);
     }

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

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Resources;
+
+use Folklore\Resources\Block as BaseBlock;
+
+class Block extends BaseBlock
+{
+
+}

package/lib/generators/laravel-panneau/templates/app/Resources/Blocks/ImageBlock.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Resources\Blocks;
+
+use App\Resources\Block;
+use App\Contracts\Resources\Blocks\Text as TextBlockContract;
+use Folklore\Contracts\Resources\Image as ImageContract;
+use Folklore\Resources\Image;
+
+class ImageBlock extends Block implements TextBlockContract
+{
+    public function image(): ?ImageContract
+    {
+        $image = data_get($this->data, 'image');
+        return isset($image) ? new Image($image) : null;
+    }
+
+    public function caption(string $locale): ?string
+    {
+        return data_get($this->data, 'caption.' . $locale);
+    }
+
+    public function credits(string $locale): ?string
+    {
+        return data_get($this->data, 'credits.' . $locale);
+    }
+}