generator-folklore 3.0.5 → 3.0.6

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

@@ -1,6 +1,7 @@
 import React from 'react';
 // import PropTypes from 'prop-types';
 import { Route, Routes } from 'react-router-dom';
+import { useRoutes } from '@folklore/routes';
 
 // import { useUrlGenerator } from '@folklore/routes';
 // import * as AppPropTypes from '../lib/PropTypes';
@@ -15,11 +16,11 @@ const propTypes = {};
 const defaultProps = {};
 
 function App() {
-    // const urlGenerator = useUrlGenerator();
+    const routes = useRoutes() || {};
     return (
         <Routes>
             <Route
-                path="/"
+                path={routes.home || '/'}
                 exact
                 element={
                     <MainLayout>

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

@@ -78,7 +78,7 @@ const defaultProps = {
 };
 
 function ErrorPage({ statusCode }) {
-    const urlGenerator = useUrlGenerator();
+    const url = useUrlGenerator();
     return (
         <div className={styles.container}>
             <PageMeta title={messages[`metaTitle${statusCode || 404}`]} />
@@ -90,7 +90,7 @@ function ErrorPage({ statusCode }) {
                     <FormattedMessage {...messages[`description${statusCode || 404}`]} />
                 </p>
                 <div className={styles.actions}>
-                    <Link to={urlGenerator.route('home')}>
+                    <Link to={url('home')}>
                         <FormattedMessage {...messages.gotoHome} />
                     </Link>
                 </div>

package/lib/lib/generator.js

@@ -25,12 +25,21 @@ class Generator extends _yeomanGenerator.default {
 
   constructor(args, options) {
     super(args, options);
+    this._composerJson = null;
     this.option('quiet', {
       type: Boolean,
       defaults: false
     });
   }
 
+  get composerJson() {
+    if (!this._composerJson) {
+      this._composerJson = this.createStorage('composer.json');
+    }
+
+    return this._composerJson;
+  }
+
   getConfig() {
     const configPath = Generator.getConfigPath();
     return this.fs.exists(configPath) ? this.fs.readJSON(configPath) : {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.5",
+    "version": "3.0.6",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -39,5 +39,5 @@
         "yeoman-generator": "^5.6.1",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "49ba685c19aa4e7e0a358eb8d7f04a285e5732a5"
+    "gitHead": "8331a20ddf7647db4895648efb495ce23d070fb3"
 }

package/lib/generators/laravel-panneau/templates/_composer.json

@@ -1,6 +0,0 @@
-{
-    "require": {
-        "folklore/laravel-mediatheque": "v1.x-dev",
-        "folklore/laravel-panneau": "v1.x-dev"
-    }
-}

package/lib/generators/laravel-panneau/templates/_package.json

@@ -1,11 +0,0 @@
-{
-    "scripts": {
-        "build:panneau": "node ./build/scripts/build.js --config ./resources/assets/vendor/panneau/webpack.config.js",
-        "build:site": "node ./build/scripts/build.js --config ./build/webpack.config.prod.js",
-        "build": "node ./build/scripts/build.js --config ./resources/assets/vendor/panneau/webpack.config.js --config ./build/webpack.config.prod.js",
-        "server:panneau": "node ./build/scripts/server.js --config ./resources/assets/vendor/panneau/webpack.config.js",
-        "server:site": "node ./build/scripts/server.js --config ./build/webpack.config.dev.js",
-        "server": "node ./build/scripts/server.js --config ./resources/assets/vendor/panneau/webpack.config.js --config ./build/webpack.config.dev.js",
-        "start": "npm run server"
-    }
-}

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

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Panneau;
-
-use Illuminate\Http\Request;
-use Folklore\Panneau\Http\Controllers\HomeController as BaseHomeController;
-
-class HomeController extends BaseHomeController
-{
-    public function index(Request $request)
-    {
-        return redirect()->route('panneau.resource.index', ['pages']);
-    }
-}

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

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Panneau;
-
-use Folklore\Panneau\Http\Controllers\PagesController as BasePagesController;
-use Illuminate\Http\Request;
-
-class PagesController extends BasePagesController
-{
-    
-}

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

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Models\Mediatheque;
-
-use Folklore\Mediatheque\Models\File as BaseFile;
-
-class File extends BaseFile
-{
-    protected $hidden = [
-        'pivot',
-        'path'
-    ];
-}

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

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Models\Mediatheque;
-
-use Folklore\Mediatheque\Models\Picture as BasePicture;
-
-class Picture extends BasePicture
-{
-    protected $hidden = [
-        'files',
-        'pivot',
-    ];
-}

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

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Models\Mediatheque;
-
-use Folklore\Mediatheque\Models\Video as BaseVideo;
-
-class Video extends BaseVideo
-{
-    protected $hidden = [
-        'pivot',
-    ];
-
-    protected $appends = [
-        'original_file',
-        'thumbnails',
-        'url',
-        'duration_human',
-        'type',
-        'mp4_url',
-        'thumbnail'
-    ];
-
-    protected function getMp4UrlAttribute()
-    {
-        $mp4 = $this->files->mp4;
-        return !is_null($mp4) ? $mp4->url : $this->url;
-    }
-
-    protected function getThumbnailAttribute()
-    {
-        $thumbnails = $this->getThumbnails();
-        return sizeof($thumbnails) ? image()->url($thumbnails[0]->getUrl(), ['thumbnail']) : null;
-    }
-}

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

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Support\ServiceProvider;
-
-class PanneauServiceProvider extends ServiceProvider
-{
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->bind(\Folklore\Panneau\Contracts\Page::class, \App\Models\Page::class);
-        $this->app->bind(\Folklore\Panneau\Contracts\Block::class, \App\Models\Block::class);
-        $this->app->bind(\Folklore\Mediatheque\Contracts\Models\Video::class, \App\Models\Mediatheque\Video::class);
-        $this->app->bind(\Folklore\Mediatheque\Contracts\Models\Picture::class, \App\Models\Mediatheque\Picture::class);
-        $this->app->bind(\Folklore\Mediatheque\Contracts\Models\File::class, \App\Models\Mediatheque\File::class);
-    }
-}

package/lib/generators/laravel-panneau/templates/app/Reducers/SlugExtractReducer.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Reducers;
-
-use Folklore\Panneau\Support\ExtractColumnReducer;
-
-class SlugExtractReducer extends ExtractColumnReducer
-{
-    protected function getExtractedColumns()
-    {
-        $columns = [];
-        $locales = config('locale.locales', [config('app.locale')]);
-        foreach ($locales as $locale) {
-            $columns['slug_'.$locale] = 'data.slug.'.$locale;
-        }
-        return $columns;
-    }
-}

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

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Resources;
-
-use Folklore\Panneau\Resources\Pages as BasePages;
-
-class Pages extends BasePages
-{
-    protected function controller()
-    {
-        return \App\Http\Controllers\Panneau\PagesController::class;
-    }
-
-    protected function lists()
-    {
-        $locale = app()->getLocale();
-        return [
-            'type' => 'table',
-            'cols' => [
-                [
-                    'id' => 'id',
-                    'path' => 'id',
-                    'label' => 'ID',
-                    'width' => 50
-                ],
-                [
-                    'id' => 'name',
-                    'path' => 'title',
-                    'label' => 'Titre'
-                ],
-                [
-                    'id' => 'url',
-                    'path' => 'url',
-                    'label' => 'Url'
-                ],
-                [
-                    'id' => 'type',
-                    'path' => 'type',
-                    'label' => 'Type'
-                ],
-                [
-                    'id' => 'actions',
-                    'type' => 'actions',
-                    'align' => 'right',
-                    'withoutLabel' => true,
-                    'width' => 150,
-                    'showAction' => [
-                        'linkItemPath' => 'url',
-                    ],
-                ]
-            ]
-        ];
-    }
-}

package/lib/generators/laravel-panneau/templates/app/Schemas/Blocks/Base.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Schemas\Blocks;
-
-use Folklore\Panneau\Support\Block;
-
-class Base extends Block
-{
-    protected function attributes()
-    {
-        return [
-            'label' => trans('panneau::models.blocks.base.label')
-        ];
-    }
-
-    protected function properties()
-    {
-        return [
-
-        ];
-    }
-}

package/lib/generators/laravel-panneau/templates/app/Schemas/Bubbles/Base.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Schemas\Bubbles;
-
-use Folklore\Panneau\Support\Bubble;
-
-class Base extends Bubble
-{
-    protected function attributes()
-    {
-        return [
-            'label' => trans('panneau::models.bubbles.base.label')
-        ];
-    }
-
-    protected function properties()
-    {
-        return [
-
-        ];
-    }
-}

package/lib/generators/laravel-panneau/templates/app/Schemas/Pages/Base.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Schemas\Pages;
-
-use Folklore\Panneau\Support\Page;
-
-class Base extends Page
-{
-    protected function attributes()
-    {
-        return [
-            'label' => 'Page'
-        ];
-    }
-
-    protected function properties()
-    {
-        return [
-            'slug' => field('text_locale', [
-                'label' => trans('panneau.fields.slug_label'),
-            ]),
-
-            'title' => field('text_locale', [
-                'label' => trans('panneau.fields.title_label'),
-            ]),
-
-            'parent' => field('page', [
-                'label' => trans('panneau.fields.parent_label'),
-            ]),
-
-            'blocks' => field('blocks', [
-                'label' => trans('panneau.fields.blocks_label'),
-            ]),
-        ];
-    }
-}

package/lib/generators/laravel-panneau/templates/resources/lang/en/panneau.php

@@ -1,12 +0,0 @@
-<?php
-
-return [
-    'fields' => [
-        'slug_label' => 'Slug',
-        'title_label' => 'Title',
-        'description_label' => 'Description',
-        'parent_label' => 'Parent',
-        'blocks_label' => 'Blocks',
-        'image_label' => 'Image'
-    ],
-];

package/lib/generators/laravel-panneau/templates/resources/lang/fr/panneau.php

@@ -1,12 +0,0 @@
-<?php
-
-return [
-    'fields' => [
-        'slug_label' => 'Adresse',
-        'title_label' => 'Titre',
-        'description_label' => 'Description',
-        'parent_label' => 'Parent',
-        'blocks_label' => 'Blocs',
-        'image_label' => 'Image'
-    ],
-];