generator-folklore 3.0.6 → 3.0.8

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\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;

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

@@ -289,19 +289,18 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
     if (this.options.mediatheque) {
       this.composeWith('folklore:laravel-mediatheque', {
         'project-name': this.options['project-name'],
-        'skip-install': true
+        'skip-install': true,
+        quiet: true
       });
-    } // if (this.options.panneau) {
-    //     this.composeWith('folklore:laravel-panneau', {
-    //         'project-name': this.options['project-name'],
-    //         'js-path': jsSrcPath,
-    //         'styles-path': stylesSrcPath,
-    //         'skip-install': skipInstall,
-    //         'install-npm': true,
-    //         quiet: true,
-    //     });
-    // }
-    // if (this.options.auth) {
+    }
+
+    if (this.options.panneau) {
+      this.composeWith('folklore:laravel-panneau', {
+        'project-name': this.options['project-name'],
+        'skip-install': skipInstall,
+        quiet: true
+      });
+    } // if (this.options.auth) {
     //     this.composeWith('folklore:laravel-auth', {
     //         'project-name': this.options['project-name'],
     //         'js-path': jsSrcPath,
@@ -368,6 +367,14 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
             'folklore/laravel-folklore': 'v1.x-dev',
             'folklore/laravel-locale': 'v8.x-dev',
             'folklore/laravel-image': 'v1.x-dev'
+          },
+          'require-dev': {
+            'laravel/telescope': '^4.0.0'
+          },
+          extra: {
+            laravel: {
+              'dont-discover': ['laravel/telescope', 'folklore/laravel-folklore']
+            }
           }
         });
       },
@@ -490,6 +497,14 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
         await this.spawnCommand('php', ['artisan', 'vendor:publish', '--provider=Folklore\\Image\\ServiceProvider']);
       },
 
+      async telescope() {
+        if (this.options['skip-install']) {
+          return;
+        }
+
+        await this.spawnCommand('php', ['artisan', 'telescope:install']);
+      },
+
       async valet() {
         if (this.options['skip-install']) {
           return;

package/lib/generators/laravel-project/templates/laravel/app/Actions/Fortify/CreateNewUser.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use App\Contracts\Repositories\Users;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Laravel\Fortify\Contracts\CreatesNewUsers;
+
+class CreateNewUser implements CreatesNewUsers
+{
+    use PasswordValidationRules;
+
+    /**
+     * Validate and create a newly registered user.
+     *
+     * @param  array  $input
+     * @return \App\Models\User
+     */
+    public function create(array $input)
+    {
+        Validator::make($input, [
+            'name' => ['required', 'string', 'max:255'],
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                Rule::unique(User::class),
+            ],
+            'password' => $this->passwordRules(),
+        ])->validate();
+
+        return resolve(Users::class)->create([
+            'name' => $input['name'],
+            'email' => $input['email'],
+            'password' => Hash::make($input['password']),
+        ]);
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Actions/Fortify/ResetUserPassword.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\ResetsUserPasswords;
+use App\Contracts\Repositories\Users;
+
+class ResetUserPassword implements ResetsUserPasswords
+{
+    use PasswordValidationRules;
+
+    /**
+     * Validate and reset the user's forgotten password.
+     *
+     * @param  mixed  $user
+     * @param  array  $input
+     * @return void
+     */
+    public function reset($user, array $input)
+    {
+        Validator::make($input, [
+            'password' => $this->passwordRules(),
+        ])->validate();
+
+        resolve(Users::class)->update($user->id(), [
+            'password' => Hash::make($input['password']),
+        ]);
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Actions/Fortify/UpdateUserPassword.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\UpdatesUserPasswords;
+use App\Contracts\Repositories\Users;
+
+class UpdateUserPassword implements UpdatesUserPasswords
+{
+    use PasswordValidationRules;
+
+    /**
+     * Validate and update the user's password.
+     *
+     * @param  mixed  $user
+     * @param  array  $input
+     * @return void
+     */
+    public function update($user, array $input)
+    {
+        Validator::make($input, [
+            'current_password' => ['required', 'string', 'current_password:web'],
+            'password' => $this->passwordRules(),
+        ], [
+            'current_password.current_password' => __('The provided password does not match your current password.'),
+        ])->validateWithBag('updatePassword');
+
+        resolve(Users::class)->update($user->id(), [
+            'password' => Hash::make($input['password']),
+        ]);
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
+use App\Contracts\Repositories\Users;
+
+class UpdateUserProfileInformation implements UpdatesUserProfileInformation
+{
+    /**
+     * Validate and update the given user's profile information.
+     *
+     * @param  mixed  $user
+     * @param  array  $input
+     * @return void
+     */
+    public function update($user, array $input)
+    {
+        Validator::make($input, [
+            'name' => ['required', 'string', 'max:255'],
+
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                Rule::unique('users')->ignore($user->id()),
+            ],
+        ])->validateWithBag('updateProfileInformation');
+
+        if ($input['email'] !== $user->email() && $user instanceof MustVerifyEmail) {
+            $this->updateVerifiedUser($user, $input);
+        } else {
+            resolve(Users::class)->update($user->id(), [
+                'name' => $input['name'],
+                'email' => $input['email'],
+            ]);
+        }
+    }
+
+    /**
+     * Update the given verified user's profile information.
+     *
+     * @param  mixed  $user
+     * @param  array  $input
+     * @return void
+     */
+    protected function updateVerifiedUser($user, array $input)
+    {
+        $user = resolve(Users::class)->update($user->id(), [
+            'name' => $input['name'],
+            'email' => $input['email'],
+            'email_verified_at' => null,
+        ]);
+
+        $user->sendEmailVerificationNotification();
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Contracts/Repositories/Users.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Contracts\Repositories;
+
+use Folklore\Contracts\Repositories\Users as BaseUsers;
+use App\Contracts\Resources\User as UserResource;
+
+interface Users extends BaseUsers
+{
+    public function findById(string $id): ?UserResource;
+
+    public function findByEmail(string $email): ?UserResource;
+
+    public function create($data): UserResource;
+
+    public function update(string $id, $data): ?UserResource;
+}

package/lib/generators/laravel-project/templates/laravel/app/Models/User.php

@@ -13,36 +13,6 @@ class User extends BaseUser
 {
     use HasApiTokens, HasFactory;
 
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-    protected $fillable = [
-        'name',
-        'email',
-        'password',
-    ];
-
-    /**
-     * The attributes that should be hidden for serialization.
-     *
-     * @var array<int, string>
-     */
-    protected $hidden = [
-        'password',
-        'remember_token',
-    ];
-
-    /**
-     * The attributes that should be cast.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'email_verified_at' => 'datetime',
-    ];
-
     public function toResource(): UserContract
     {
         return new UserResource($this);

package/lib/generators/laravel-project/templates/laravel/app/Providers/AppServiceProvider.php

@@ -6,9 +6,66 @@ use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 
 class AppServiceProvider extends ServiceProvider
 {
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->registerRepositories();<% if (options.mediatheque) { %>
+        $this->registerMediatheque();<% } %>
+        $this->registerTelescope();
+    }
+
+    protected function registerRepositories()
+    {
+        $this->app->bind(
+            \Folklore\Contracts\Repositories\Users::class,
+            \App\Repositories\Users::class
+        );
+
+        $this->app->bind(
+            \App\Contracts\Repositories\Users::class,
+            \App\Repositories\Users::class
+        );<% if (options.panneau) { %>
+
+        $this->app->bind(
+            \Folklore\Contracts\Repositories\Pages::class,
+            \App\Repositories\Pages::class
+        );
+
+        $this->app->bind(
+            \App\Contracts\Repositories\Pages::class,
+            \App\Repositories\Pages::class
+        );<% } %>
+    }<% if (options.mediatheque) { %>
+
+    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
+        );
+    }<% } %>
+
+    protected function registerTelescope()
+    {
+        if ($this->app->environment('local')) {
+            $this->app->register(\Laravel\Telescope\TelescopeServiceProvider::class);
+            $this->app->register(TelescopeServiceProvider::class);
+        }
+    }
+
     /**
      * Bootstrap any application services.
      *
@@ -16,30 +73,48 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        // Some defaults
         Schema::defaultStringLength(191);
         JsonResource::withoutWrapping();
 
+        $this->bootRequest();
+
+        $this->bootImage();
+    }
+
+    protected function bootRequest()
+    {
         // Determine site from request
         Request::macro('site', function () {
             return null;
         });
     }
 
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->registerRepositories();
-    }
-
-    protected function registerRepositories()
+    protected function bootImage()
     {
-        $this->app->bind(
-            \Folklore\Contracts\Repositories\Users::class,
-            \App\Repositories\Users::class
-        );
+        foreach (config('image.sizes') as $filter) {
+            $id = $filter['id'];
+            $data = Arr::except($filter, ['id']);
+            if (sizeof($data) === 0) {
+                continue;
+            }
+            $newFilter = [];
+            if (isset($filter['maxWidth'])) {
+                $newFilter['width'] = $filter['maxWidth'];
+            }
+            if (isset($filter['maxHeight'])) {
+                $newFilter['height'] = $filter['maxHeight'];
+            }
+            if (isset($filter['width'])) {
+                $newFilter['width'] = $filter['width'];
+            }
+            if (isset($filter['height'])) {
+                $newFilter['height'] = $filter['height'];
+            }
+            if (isset($filter['width']) && isset($filter['height'])) {
+                $newFilter['crop'] = true;
+            }
+            $this->app['image']->filter($id, $newFilter);
+        }
     }
 }

package/lib/generators/laravel-project/templates/laravel/app/Repositories/Users.php

@@ -3,11 +3,12 @@
 namespace App\Repositories;
 
 use Folklore\Repositories\Users as BaseUsers;
+use App\Contracts\Repositories\Users as UsersContract;
 use Illuminate\Database\Eloquent\Model;
 use App\Models\User as UserModel;
 use App\Contracts\Resources\User as UserContract;
 
-class Users extends BaseUsers
+class Users extends BaseUsers implements UsersContract
 {
     protected function newModel(): Model
     {
@@ -24,12 +25,12 @@ class Users extends BaseUsers
         return parent::findByEmail($email);
     }
 
-    public function create(array $data): UserContract
+    public function create($data): UserContract
     {
         return parent::create($data);
     }
 
-    public function update(string $id, array $data): ?UserContract
+    public function update(string $id, $data): ?UserContract
     {
         return parent::update($id, $data);
     }

package/lib/generators/laravel-project/templates/laravel/config/app.php

@@ -185,6 +185,7 @@ return [
         /*
          * Package Service Providers...
          */
+        Folklore\ServiceProvider::class,
 
         /*
          * Application Service Providers...
@@ -194,8 +195,8 @@ return [
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-        App\Providers\ViewServiceProvider::class,
-
+        App\Providers\ViewServiceProvider::class,<% if (options.panneau) { %>
+        App\Panneau\PanneauServiceProvider::class,<% } %>
     ],
 
     /*