generator-folklore 3.0.21 → 3.0.22

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

@@ -6,6 +6,8 @@ use Illuminate\Http\Resources\Json\JsonResource;
 use Folklore\Contracts\Resources\HasBlocks;
 use Folklore\Http\Resources\LocalizedResource;
 use App\Contracts\Resources\Blocks\Text as TextBlock;
+use App\Contracts\Resources\Blocks\ImageBlock as ImageBlock;
+use Folklore\Http\Resources\MediaResource;
 
 class BlockResource extends JsonResource
 {
@@ -18,7 +20,6 @@ class BlockResource extends JsonResource
     public function toArray($request)
     {
         $type = $this->type();
-        $locale = $request->locale();
         return [
             'id' => $this->id(),
             'type' => $type,
@@ -27,9 +28,27 @@ class BlockResource extends JsonResource
                 return !is_null($blocks) ? new BlocksCollection($blocks) : [];
             }),
 
-            $this->mergeWhen($this->resource instanceof TextBlock, function () use ($locale) {
+            $this->mergeWhen($this->resource instanceof TextBlock, function () {
                 return [
-                    'body' => $this->body($locale),
+                    'title' => new LocalizedResource(function ($locale) {
+                        return $this->title($locale);
+                    }),
+                    'body' => new LocalizedResource(function ($locale) {
+                        return $this->body($locale);
+                    }),
+                ];
+            }),
+
+            $this->mergeWhen($this->resource instanceof ImageBlock, function () {
+                $image = $this->image();
+                return [
+                    'image' => !empty($image) ? new MediaResource($image) : null,
+                    'caption' => new LocalizedResource(function ($locale) {
+                        return $this->caption($locale);
+                    }),
+                    'credits' => new LocalizedResource(function ($locale) {
+                        return $this->credits($locale);
+                    }),
                 ];
             }),
         ];

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

@@ -11,7 +11,7 @@ class Block extends BaseBlock
 {
     use HasFactory;
 
-    protected $typeResources = [
+    protected $typedResources = [
         'text' => \App\Resources\Blocks\TextBlock::class,
         'image' => \App\Resources\Blocks\ImageBlock::class,
     ];

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

@@ -19,4 +19,9 @@ class Page extends BasePage
     {
         return $this->toTypedResource() ?? new PageResource($this);
     }
+
+    public function blocks()
+    {
+        return $this->morphToMany(Block::class, 'blockable', 'blocks_pivot');
+    }
 }

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

@@ -3,9 +3,11 @@
 namespace App\Panneau\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Contracts\Resources\HasBlocks;
+use Folklore\Contracts\Resources\HasBlocks;
 use Folklore\Http\Resources\LocalizedResource;
 use App\Contracts\Resources\Blocks\Text as TextBlock;
+use App\Contracts\Resources\Blocks\Image as ImageBlock;
+use Folklore\Http\Resources\MediaResource;
 
 class BlockResource extends JsonResource
 {
@@ -18,7 +20,6 @@ class BlockResource extends JsonResource
     public function toArray($request)
     {
         $type = $this->type();
-
         return [
             'id' => $this->id(),
             'type' => $type,
@@ -29,11 +30,27 @@ class BlockResource extends JsonResource
 
             $this->mergeWhen($this->resource instanceof TextBlock, function () {
                 return [
+                    'title' => new LocalizedResource(function ($locale) {
+                        return $this->title($locale);
+                    }),
                     'body' => new LocalizedResource(function ($locale) {
                         return $this->body($locale);
                     }),
                 ];
             }),
+
+            $this->mergeWhen($this->resource instanceof ImageBlock, function () {
+                $image = $this->image();
+                return [
+                    'image' => !empty($image) ? new MediaResource($image) : null,
+                    'caption' => new LocalizedResource(function ($locale) {
+                        return $this->caption($locale);
+                    }),
+                    'credits' => new LocalizedResource(function ($locale) {
+                        return $this->credits($locale);
+                    }),
+                ];
+            }),
         ];
     }
 }

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

@@ -1,12 +1,13 @@
-import React, { useState, useEffect } from 'react';
-import PropTypes from 'prop-types';
-import Panneau from '@panneau/app';
 import { getCSRFHeaders } from '@folklore/fetch';
-
+import Panneau from '@panneau/app';
 import { FIELDS_NAMESPACE } from '@panneau/core/contexts';
-import * as fieldsComponents from './panneau/fields';
+import PropTypes from 'prop-types';
+import React, { useState, useEffect } from 'react';
+
 import * as AppPropTypes from '../lib/PropTypes';
 
+import * as fieldsComponents from './panneau/fields';
+
 import '../../styles/panneau.scss';
 
 const propTypes = {
@@ -26,7 +27,6 @@ const defaultProps = {
 const PanneauContainer = ({ definition, user, baseUrl, uploadEndpoint, statusCode }) => {
     const { routes = {} } = definition;
     const isAuthorized = statusCode !== 401 && statusCode !== 403;
-
     const [localeLoaded, setLocaleLoaded] = useState(false);
 
     useEffect(() => {

package/lib/generators/laravel-panneau/templates/resources/assets/styles/panneau.scss

@@ -1,2 +1,4 @@
+@import '~@panneau/app/scss/styles';
+
 @import '~@panneau/themes/scss/styles';
 @import '~@panneau/themes/scss/vendor';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.21",
+    "version": "3.0.22",
     "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": "e187175793ce4d11d128d39929b4779c534081bd"
+    "gitHead": "299c4d804aaa15455627b5ae353d3936da9fd692"
 }