generator-folklore 3.0.9 → 3.0.10

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/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/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.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": "88e0fd31cded9ff974e5b50f4c76464ef26efb12"
+    "gitHead": "1d7f2e259b004828e208b643fb2d123aad8cc5ec"
 }