generator-folklore 3.0.9 → 3.0.11

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

@@ -16,7 +16,7 @@ class Authenticate extends Middleware
     {
         if (!$request->expectsJson()) {
             $routeWithLocale =
-                route_with_locale('login') .
+                route('panneau.auth.login') .
                 '?' .
                 http_build_query([
                     'next' => $request->fullUrl(),

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/Composers/AppComposer.php

@@ -42,6 +42,8 @@ class AppComposer
             'user' => !is_null($user) ? new UserResource($user) : null,
             'isPanneau' => true,
             'statusCode' => $view->statusCode,
+            'baseUrl' => config('app.url'),
+            'tusUrl' => null,
             'pubnubNamespace' => config('services.pubnub.namespace'),
             'pubnubPublishKey' => config('services.pubnub.publish_key'),
             'pubnubSubscribeKey' => config('services.pubnub.subscribe_key'),

package/lib/generators/laravel-panneau/templates/app/Panneau/Http/Controllers/UploadController.php

@@ -4,10 +4,12 @@ namespace App\Panneau\Http\Controllers;
 
 use App\Panneau\Http\Requests\UploadRequest;
 use Folklore\Contracts\Repositories\Medias as MediasRepository;
-use Folklore\Http\Resources\Medias\MediaResource;
+use Folklore\Http\Resources\MediaResource;
 
 class UploadController extends Controller
 {
+    protected $medias;
+
     public function __construct(MediasRepository $medias)
     {
         $this->medias = $medias;

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/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-project/templates/laravel/app/Actions/Fortify/PasswordValidationRules.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Laravel\Fortify\Rules\Password;
+
+trait PasswordValidationRules
+{
+    /**
+     * Get the validation rules used to validate passwords.
+     *
+     * @return array
+     */
+    protected function passwordRules()
+    {
+        return ['required', 'string', new Password, 'confirmed'];
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Http/Responses/LoginResponse.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Responses;
+
+use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
+use Laravel\Fortify\Fortify;
+use App\Http\Resources\UserResource;
+use App\Panneau\Http\Resources\UserResource as PanneauUserResource;
+
+class LoginResponse implements LoginResponseContract
+{
+    /**
+     * Create an HTTP response that represents the object.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function toResponse($request)
+    {
+        if ($request->wantsJson()) {
+            return $request->isPanneau()
+                ? new PanneauUserResource($request->user())
+                : new UserResource($request->participant());
+        }
+        return redirect()->intended(Fortify::redirects('login'));
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Http/Responses/LoginViewResponse.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Responses;
+
+use Laravel\Fortify\Contracts\LoginViewResponse as LoginViewResponseContract;
+
+class LoginViewResponse implements LoginViewResponseContract
+{
+    /**
+     * Create an HTTP response that represents the object.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function toResponse($request)
+    {
+        return $request->isPanneau() ? view('panneau::app') : view('app');
+    }
+}

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

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Providers;
+
+use App\Actions\Fortify\CreateNewUser;
+use App\Actions\Fortify\ResetUserPassword;
+use App\Actions\Fortify\UpdateUserPassword;
+use App\Actions\Fortify\UpdateUserProfileInformation;
+use App\Http\Responses\LoginResponse;
+use App\Http\Responses\LoginViewResponse;
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\ServiceProvider;
+use Laravel\Fortify\Fortify;
+use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
+use Laravel\Fortify\Contracts\LoginViewResponse as LoginViewResponseContract;
+
+class FortifyServiceProvider extends ServiceProvider
+{
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->bind(LoginResponseContract::class, LoginResponse::class);
+        $this->app->bind(LoginViewResponseContract::class, LoginViewResponse::class);
+    }
+
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        Fortify::createUsersUsing(CreateNewUser::class);
+        Fortify::updateUserProfileInformationUsing(UpdateUserProfileInformation::class);
+        Fortify::updateUserPasswordsUsing(UpdateUserPassword::class);
+        Fortify::resetUserPasswordsUsing(ResetUserPassword::class);
+
+        RateLimiter::for('login', function (Request $request) {
+            $email = (string) $request->email;
+
+            return Limit::perMinute(5)->by($email . $request->ip());
+        });
+
+        RateLimiter::for('two-factor', function (Request $request) {
+            return Limit::perMinute(5)->by($request->session()->get('login.id'));
+        });
+    }
+}

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.9",
+    "version": "3.0.11",
     "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": "88e0fd31cded9ff974e5b50f4c76464ef26efb12"
+    "gitHead": "61748b478ab945f855a51499efb51c0cbcf3d880"
 }