generator-folklore 3.0.8 → 3.0.10

package/Readme.md

@@ -1,12 +1,15 @@
 # Folklore Generator
+
 Yeoman generator to start projects at Folklore
 
 ## Install
+
 ```
 npm install -g generator-folklore
 ```
 
 ## Usage
+
 ```
 yo folklore
 ```
@@ -14,20 +17,23 @@ yo folklore
 ## Sub-Generators
 
 ```
-yo folklore:laravel
+yo folklore:laravel-project
 ```
-Laravel 5 project, JS, Sass, and miscellaneous Laravel boilerplate.
+
+Laravel boilerplate.
 
 --
 
 ```
-yo folklore:html
+yo folklore:html-project
 ```
+
 HTML static application
 
 --
 
 ```
-yo folklore:npm-package
+yo folklore:node-project
 ```
-NPM package
+
+Node package

package/lib/generators/app/index.js

@@ -53,6 +53,9 @@ module.exports = class AppGenerator extends _generator.default {
             choices: [{
               name: 'HTML',
               value: 'html-project'
+            }, {
+              name: 'Laravel',
+              value: 'laravel-project'
             }, {
               name: 'Node',
               value: 'node-project'

package/lib/generators/intl/index.js

@@ -62,7 +62,7 @@ module.exports = class IntlGenerator extends _generator.default {
           'without-id-only': withoutIdOnly = false,
           locales
         } = this.options;
-        const intlCommand = `flklr intl --po${withoutIdOnly ? ' --without-id-only' : ''} --output-path$ '${outputPath}' '${translationsPath}'`;
+        const intlCommand = `flklr intl --po${withoutIdOnly ? ' --without-id-only' : ''} --output-path '${outputPath}' '${translationsPath}'`;
         this.packageJson.merge({
           scripts: jsonPath !== null ? {
             intl: 'npm run intl:build && npm run intl:copy',

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

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Route;
+
 Route::groupWithLocales(function ($locale) {
     // Authentication Routes...
     Route::getLocalized('login', 'LoginController@showLoginForm')->nameWithLocale('auth.login');

package/lib/generators/laravel-panneau/templates/app/Http/Middleware/Authenticate.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Auth\Middleware\Authenticate as Middleware;
+
+class Authenticate extends Middleware
+{
+    /**
+     * Get the path the user should be redirected to when they are not authenticated.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return string|null
+     */
+    protected function redirectTo($request)
+    {
+        if (!$request->expectsJson()) {
+            $routeWithLocale =
+                route('panneau.auth.login') .
+                '?' .
+                http_build_query([
+                    'next' => $request->fullUrl(),
+                ]);
+            return $request->isPanneau() ? route('panneau.auth.login') : $routeWithLocale;
+        }
+    }
+}

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

@@ -30,9 +30,7 @@ class PageResource extends JsonResource
             'slug' => $this->slug($locale),
             'image' => !is_null($image) ? new MediaResource($image) : null,
             'parent' =>
-                !is_null($parent) && $parent instanceof Page
-                    ? new PageResource($parent)
-                    : null,
+                !is_null($parent) && $parent instanceof Page ? new PageResource($parent) : null,
 
             $this->mergeWhen($this->resource instanceof HasBlocks, function () {
                 $blocks = $this->blocks();

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

@@ -3,9 +3,9 @@
 namespace App\Panneau\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Http\Resources\Medias\ImageResource;
+use Folklore\Http\Resources\MediaResource;
 use App\Contracts\Resources\Page;
-use App\Contracts\Resources\HasBlocks;
+use Folklore\Contracts\Resources\HasBlocks;
 use Folklore\Http\Resources\LocalizedResource;
 use App\Contracts\Resources\Pages\Home as HomePage;
 
@@ -19,8 +19,8 @@ class PageResource extends JsonResource
      */
     public function toArray($request)
     {
-        $locale = $request->locale();
-        $isPanneauIndex = $request->isPanneauIndex();
+        $image = $this->image();
+        $parent = $this->parent();
 
         return [
             'id' => $this->id(),
@@ -35,7 +35,7 @@ class PageResource extends JsonResource
             'slug' => new LocalizedResource(function ($locale) {
                 return $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)

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

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Panneau\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use Folklore\Http\Resources\MediaResource;
+use App\Contracts\Resources\Page;
+use Folklore\Http\Resources\LocalizedResource;
+
+class ParentPageResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $image = $this->image();
+        $parent = $this->parent();
+
+        return [
+            'id' => $this->id(),
+            'type' => $this->type(),
+            'published' => $this->published(),
+            'title' => new LocalizedResource(function ($locale) {
+                return $this->title($locale);
+            }),
+            'description' => new LocalizedResource(function ($locale) {
+                return $this->description($locale);
+            }),
+            'slug' => new LocalizedResource(function ($locale) {
+                return $this->slug($locale);
+            }),
+            'image' => !is_null($image) ? new MediaResource($image) : null,
+            'parent' =>
+                !is_null($parent) && $parent instanceof Page
+                    ? new ParentPageResource($parent)
+                    : null,
+        ];
+    }
+}

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

@@ -10,6 +10,11 @@ use Panneau\Support\LocalizedField;
 use Folklore\Panneau\Fields\PageSlug as PageSlugField;
 use Panneau\Support\Facade as Panneau;
 
+use Illuminate\Http\Request;
+use Laravel\Fortify\Fortify;
+use Illuminate\Support\Facades\Hash;
+use App\Models\User;
+
 class PanneauServiceProvider extends BaseServiceProvider
 {
     /**
@@ -31,6 +36,7 @@ class PanneauServiceProvider extends BaseServiceProvider
     {
         $this->bootFields();
         $this->bootViews();
+        $this->bootAuth();
     }
 
     protected function bootFields()
@@ -71,4 +77,14 @@ class PanneauServiceProvider extends BaseServiceProvider
             $view->composer('errors::*', \App\Panneau\Composers\AppComposer::class);
         });
     }
+
+    protected function bootAuth()
+    {
+        Fortify::authenticateUsing(function (Request $request) {
+            $user = User::where('email', $request->email)->first();
+            if (!is_null($user) && Hash::check($request->password, $user->password)) {
+                return $user;
+            }
+        });
+    }
 }

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

@@ -51,7 +51,8 @@ class Users extends Resource
                     ],
                 ])
                 ->withoutReset()
-                ->withDefaultValue('guest'),
+                ->withDefaultValue('admin')
+                ->isRequired(),
         ];
     }
 }

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

@@ -3,8 +3,8 @@
 namespace App\Resources;
 
 use Folklore\Resources\Block as BaseBlock;
+use App\Contracts\Resources\Block as BlockContract;
 
-class Block extends BaseBlock
+class Block extends BaseBlock implements BlockContract
 {
-
 }

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

@@ -3,11 +3,11 @@
 namespace App\Resources\Blocks;
 
 use App\Resources\Block;
-use App\Contracts\Resources\Blocks\Text as TextBlockContract;
+use App\Contracts\Resources\Blocks\Image as ImageBlockContract;
 use Folklore\Contracts\Resources\Image as ImageContract;
 use Folklore\Resources\Image;
 
-class ImageBlock extends Block implements TextBlockContract
+class ImageBlock extends Block implements ImageBlockContract
 {
     public function image(): ?ImageContract
     {

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

@@ -3,8 +3,8 @@
 namespace App\Resources;
 
 use Folklore\Resources\Page as BasePage;
+use App\Contracts\Resources\Page as PageContract;
 
-class Page extends BasePage
+class Page extends BasePage implements PageContract
 {
-
 }

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

@@ -10,7 +10,9 @@ Panneau::router()->group(function () {
         return app('tus-server')->serve();
     })->where('any', '.*');
 
-    Panneau::router()->auth();
+    Route::middleware(['web'])->group(function () {
+        Panneau::router()->auth();
+    });
 
     Route::namespace('\App\Panneau\Http\Controllers')
         ->middleware(['web', 'auth', 'can:view,' . \Panneau\Panneau::class])

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

@@ -297,7 +297,7 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
     if (this.options.panneau) {
       this.composeWith('folklore:laravel-panneau', {
         'project-name': this.options['project-name'],
-        'skip-install': skipInstall,
+        'skip-install': true,
         quiet: true
       });
     } // if (this.options.auth) {
@@ -305,7 +305,7 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
     //         'project-name': this.options['project-name'],
     //         'js-path': jsSrcPath,
     //         'styles-path': stylesSrcPath,
-    //         'skip-install': skipInstall,
+    //         'skip-install': true,
     //         'install-npm': true,
     //         quiet: true,
     //     });

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

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Gate;
+use Laravel\Telescope\IncomingEntry;
+use Laravel\Telescope\Telescope;
+use Laravel\Telescope\TelescopeApplicationServiceProvider;
+
+class TelescopeServiceProvider extends TelescopeApplicationServiceProvider
+{
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        // Telescope::night();
+
+        $this->hideSensitiveRequestDetails();
+
+        Telescope::filter(function (IncomingEntry $entry) {
+            if ($this->app->environment('local')) {
+                return true;
+            }
+
+            return $entry->isReportableException() ||
+                $entry->isFailedRequest() ||
+                $entry->isFailedJob() ||
+                $entry->isScheduledTask() ||
+                $entry->hasMonitoredTag();
+        });
+    }
+
+    /**
+     * Prevent sensitive request details from being logged by Telescope.
+     *
+     * @return void
+     */
+    protected function hideSensitiveRequestDetails()
+    {
+        if ($this->app->environment('local')) {
+            return;
+        }
+
+        Telescope::hideRequestParameters(['_token']);
+
+        Telescope::hideRequestHeaders(['cookie', 'x-csrf-token', 'x-xsrf-token']);
+    }
+
+    /**
+     * Register the Telescope gate.
+     *
+     * This gate determines who can access Telescope in non-local environments.
+     *
+     * @return void
+     */
+    protected function gate()
+    {
+        Gate::define('viewTelescope', function ($user) {
+            return in_array($user->email, [
+                //
+            ]);
+        });
+    }
+}

package/lib/generators/laravel-project/templates/laravel/resources/views/assets/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

package/lib/generators/laravel-project/templates/laravel/routes/web.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\HomeController;
 
 //Redirect to current langage home
@@ -8,5 +9,7 @@ Route::get('/', [HomeController::class, 'redirect'])->name('home');
 Route::groupWithLocales(function () {
     Route::getTrans('/', [HomeController::class, 'index'])->nameWithLocale('home');
     Route::getTrans('/test', [HomeController::class, 'index'])->nameWithLocale('test');
-    Route::getTrans('/test/{with_param}', [HomeController::class, 'index'])->nameWithLocale('test_with_param');
+    Route::getTrans('/test/{with_param}', [HomeController::class, 'index'])->nameWithLocale(
+        'test_with_param'
+    );
 });

package/lib/generators/react-app/templates/src/components/Container.jsx

@@ -8,21 +8,23 @@ import { BrowserRouter } from 'react-router-dom';
 import App from './App';
 
 const propTypes = {
-    locale: PropTypes.string,
-    messages: PropTypes.oneOfType([
-        PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
-        PropTypes.objectOf(PropTypes.string),
-    ]),
+    intl: PropTypes.shape({
+        locale: PropTypes.string,
+        messages: PropTypes.oneOfType([
+            PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
+            PropTypes.objectOf(PropTypes.string),
+        ]),
+    }),
     routes: PropTypes.objectOf(PropTypes.string),
 };
 
 const defaultProps = {
-    locale: 'fr',
-    messages: {},
+    intl: null,
     routes: {},
 };
 
-function Container({ locale, messages, routes }) {
+function Container({ intl, routes }) {
+    const { locale = null, messages = null } = intl || {};
     return (
         <IntlProvider locale={locale} messages={messages[locale] || messages}>
             <BrowserRouter>

package/lib/generators/stylelint/index.js

@@ -12,7 +12,7 @@ module.exports = class StylelintGenerator extends _generator.default {
     this.option('camel-case', {
       type: Boolean,
       required: false,
-      defaults: false
+      defaults: true
     });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.8",
+    "version": "3.0.10",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -40,5 +40,5 @@
         "yeoman-generator": "^5.7.0",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "a8406b4ff188934ed49c13826cf577968669ed4e"
+    "gitHead": "1d7f2e259b004828e208b643fb2d123aad8cc5ec"
 }