generator-folklore 3.0.6 → 3.0.7

package/lib/generators/build/index.js

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

package/lib/generators/eslint/index.js

@@ -32,7 +32,7 @@ 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@^5.0.0', '@babel/eslint-parser@^7.0.0', 'eslint@^8.0.0', 'eslint-config-airbnb@^19.0.0', 'eslint-config-prettier@^8.0.0', 'eslint-plugin-prettier@^4.0.0', 'eslint-plugin-import@^2.0.0', 'eslint-plugin-jsx-a11y@^6.0.0', 'eslint-plugin-react@^7.0.0', 'eslint-plugin-formatjs@^4.0.0']);
       }
 
     };

package/lib/generators/intl/index.js

@@ -76,7 +76,7 @@ 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,18 @@ 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 +122,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 +180,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/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/Models/Block.php

@@ -8,5 +8,6 @@ class Block extends BaseBlock
 {
     protected $typeResources = [
         'text' => \App\Resources\Blocks\TextBlock::class,
+        'image' => \App\Resources\Blocks\ImageBlock::class,
     ];
 }

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/Blocks/ImageBlock.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Resources\Blocks;
+
+use Folklore\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);
+    }
+}

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

@@ -1,12 +1,17 @@
 <?php
 
-namespace App\Resources\Pages;
+namespace App\Resources\Blocks;
 
 use Folklore\Resources\Block;
 use App\Contracts\Resources\Blocks\Text as TextBlockContract;
 
 class TextBlock extends Block implements TextBlockContract
 {
+    public function title(string $locale): ?string
+    {
+        return data_get($this->data, 'title.' . $locale);
+    }
+
     public function body(string $locale): ?string
     {
         return data_get($this->data, 'body.' . $locale);

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

@@ -0,0 +1,29 @@
+<?php
+
+return [
+    'intl' => [
+        'locale' => 'fr',
+        'locales' => ['fr', 'en'],
+        'translations' => ['panneau::resources', 'panneau'],
+    ],
+
+    'resources' => [
+        \App\Panneau\Resources\Blocks::class,
+        \App\Panneau\Resources\Pages::class,
+        \App\Panneau\Resources\Users::class,
+    ],
+
+    'routes' => [
+        // Path to the routes file that will be automatically loaded. Set to null
+        // to prevent auto-loading of routes.
+        'map' => base_path('routes/panneau.php'),
+
+        'prefix' => 'panneau',
+
+        'middleware' => [\Panneau\Http\Middleware\DispatchHandlingRequestEvent::class],
+
+        'custom' => [],
+
+        'without_patterns' => true,
+    ],
+];

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

@@ -17,7 +17,7 @@ function renderApp(Container, props) {
 
 function loadContainer({ isPanneau = false }) {
     return isPanneau
-        ? import('./components/Panneau')
+        ? import('./components/Panneau').then(({ default: Container }) => Container)
         : import('./components/Container').then(({ default: Container }) => Container);
 }
 

package/lib/generators/laravel-panneau/templates/lang/en/panneau.php

@@ -6,6 +6,8 @@ return [
         'url' => 'Address',
         'published' => 'Published',
         'description_short' => 'Short description',
+        'caption' => 'Caption',
+        'credits' => 'Credits',
         'name' => 'Name',
         'email' => 'Email',
         'password' => 'Password',
@@ -13,6 +15,7 @@ return [
         'body' => 'Text',
         'parent' => 'Parent',
         'blocks' => 'Blocks',
+        'role' => 'Role',
 
         'page' => 'Page',
         'pages' => 'Pages',
@@ -30,6 +33,7 @@ return [
         'blocks' => 'Blocks',
         'no_blocks' => 'No blocks',
         'add_block' => 'Add a block',
+        'select_block' => 'Select a block...',
     ],
 
     'filters' => [

package/lib/generators/laravel-panneau/templates/lang/fr/panneau.php

@@ -6,6 +6,8 @@ return [
         'url' => 'Adresse',
         'published' => 'Publié',
         'description_short' => 'Description courte',
+        'caption' => 'Libellé',
+        'credits' => 'Crédits',
         'name' => 'Nom',
         'email' => 'Courriel',
         'password' => 'Mot de passe',
@@ -13,6 +15,7 @@ return [
         'body' => 'Texte',
         'parent' => 'Parent',
         'blocks' => 'Blocs',
+        'role' => 'Rôle',
 
         'page' => 'Page',
         'pages' => 'Pages',
@@ -30,6 +33,7 @@ return [
         'blocks' => 'Blocs',
         'no_blocks' => 'Aucun bloc',
         'add_block' => 'Ajouter un bloc',
+        'select_block' => 'Sélectionner un bloc...',
     ],
 
     'filters' => [

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

@@ -0,0 +1,68 @@
+/* eslint-disable react/jsx-props-no-spreading */
+import { useFormValue } from '@panneau/core/contexts';
+import TextField from '@panneau/field-text';
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { generatePath } from 'react-router';
+
+const propTypes = {
+    fieldLocale: PropTypes.string,
+    value: PropTypes.string,
+    className: PropTypes.string,
+    routes: PropTypes.objectOf(PropTypes.string).isRequired,
+};
+
+const defaultProps = {
+    fieldLocale: null,
+    value: null,
+    className: null,
+};
+
+const PageSlugField = ({ routes, fieldLocale, className, value, ...props }) => {
+    const page = useFormValue();
+    const { parent = null, handle = null } = page || {};
+    const { slug: parentSlug } = parent || {};
+    const { page: pageRoute = null, page_with_parent: pageWithParentRoute = null } = routes || {};
+    let url =
+        pageRoute !== null
+            ? generatePath(pageRoute, {
+                  page: 'REPLACE',
+              })
+            : null;
+    if (parent !== null && pageWithParentRoute !== null) {
+        url = generatePath(pageWithParentRoute, {
+            parent: parentSlug !== null ? parentSlug[fieldLocale] || null : null,
+            page: 'REPLACE',
+        });
+    }
+    if (handle === 'home') {
+        url = `/${fieldLocale}`;
+    }
+
+    return (
+        <TextField
+            prepend={
+                url !== null
+                    ? `${window.location.protocol}//${window.location.host}${url.replace(
+                          'REPLACE',
+                          '',
+                      )}`
+                    : null
+            }
+            className={classNames([
+                'flex-nowrap',
+                {
+                    [className]: className !== null,
+                },
+            ])}
+            value={handle === 'home' ? null : value}
+            {...props}
+        />
+    );
+};
+
+PageSlugField.propTypes = propTypes;
+PageSlugField.defaultProps = defaultProps;
+
+export default PageSlugField;