npm - generator-folklore - Versions diffs - 3.0.5 → 3.0.7 - Mend

generator-folklore 3.0.5 → 3.0.7

Files changed (135) hide show

package/lib/generators/laravel-project/templates/laravel/resources/assets/img/folklore.png ADDED Viewed

Binary file

package/lib/generators/laravel-project/templates/laravel/resources/views/analytics/body.blade.php ADDED Viewed

@@ -0,0 +1,3 @@
+@include('analytics.gpt', [
+    'body' => true
+])

package/lib/generators/laravel-project/templates/laravel/resources/views/analytics/gpt.blade.php ADDED Viewed

@@ -0,0 +1,16 @@
+@if(!empty($tagManagerId) && (!isset($body) || !$body))
+<!-- Google Tag Manager -->
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','{{ $tagManagerId }}');</script>
+<!-- End Google Tag Manager -->
+@endif
+@if (!empty($tagManagerId) && isset($body) && $body)
+    <!-- Google Tag Manager (noscript) -->
+    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-P2CF52F"
+    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+    <!-- End Google Tag Manager (noscript) -->
+@endif

package/lib/generators/laravel-project/templates/laravel/resources/views/analytics/head.blade.php ADDED Viewed

	@@ -0,0 +1 @@
1	+ @include('analytics.gpt')

package/lib/generators/laravel-project/templates/laravel/resources/views/app.blade.php ADDED Viewed

@@ -0,0 +1,8 @@
+@extends('layout')
+@section('body')
+    <div id="app"></div>
+    <script type="text/javascript">
+        var props = @json($props);
+    </script>
+@endsection

package/lib/generators/laravel-project/templates/laravel/resources/views/errors/401.blade.php ADDED Viewed

@@ -0,0 +1,8 @@
+@extends('layout')
+@section('body')
+    <div id="app"></div>
+    <script type="text/javascript">
+        var props = @json($props);
+    </script>
+@endsection

package/lib/generators/laravel-project/templates/laravel/resources/views/errors/403.blade.php ADDED Viewed

@@ -0,0 +1,8 @@
+@extends('layout')
+@section('body')
+    <div id="app"></div>
+    <script type="text/javascript">
+        var props = @json($props);
+    </script>
+@endsection

package/lib/generators/laravel-project/templates/laravel/resources/views/errors/404.blade.php ADDED Viewed

@@ -0,0 +1,8 @@
+@extends('layout')
+@section('body')
+    <div id="app"></div>
+    <script type="text/javascript">
+        var props = @json($props);
+    </script>
+@endsection

package/lib/generators/laravel-project/templates/laravel/resources/views/errors/500.blade.php ADDED Viewed

@@ -0,0 +1,8 @@
+@extends('layout')
+@section('body')
+    <div id="app"></div>
+    <script type="text/javascript">
+        var props = @json($props);
+    </script>
+@endsection

package/lib/generators/laravel-project/templates/laravel/resources/views/layout.blade.php ADDED Viewed

@@ -0,0 +1,33 @@
+<!doctype html>
+<!--[if IE ]> <html class="ie" lang="{{ $locale }}"> <![endif]-->
+<!--[if !(IE) ]><!--> <html lang="{{ $locale }}"> <!--<![endif]-->
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    @include('meta.all')
+    @include('analytics.head')
+    @if(!isset($inWebpack) || !$inWebpack)
+        @include('assets.head')
+    @endif
+</head>
+<body>
+    @include('analytics.body')
+    @section('body')
+        <div id="app"></div>
+        <script type="text/javascript">
+            var props = @json($props);
+        </script>
+    @show
+    @if(isset($inWebpack) && $inWebpack)
+        <script type="text/javascript" src="/static/js/bundle.js"></script>
+    @else
+        @include('assets.body')
+    @endif
+</body>
+</html>

package/lib/generators/laravel-project/templates/laravel/resources/views/meta/all.blade.php ADDED Viewed

@@ -0,0 +1,4 @@
+@include('meta.base')
+@include('meta.opengraph')
+@include('meta.facebook')
+@include('meta.twitter')

package/lib/generators/laravel-project/templates/laravel/resources/views/meta/base.blade.php ADDED Viewed

@@ -0,0 +1,11 @@
+<title>{{ $title }}</title>
+<meta name="language" content="{{ $locale }}">
+<meta name="description" content="{{ $description }}" data-react-helmet="true">
+@if (isset($keywords) && sizeof($keywords))
+<meta name="keywords" content="{{ $keywords->implode(',') }}" data-react-helmet="true">
+@endif
+<link rel="shortcut icon" href="{{ asset('static/media/favicon/favicon.ico') }}" type="image/x-ico" data-react-helmet="true">
+<link rel="icon" href="{{ asset('static/media/favicon/favicon.png') }}" type="image/png" data-react-helmet="true">

package/lib/generators/laravel-project/templates/laravel/resources/views/meta/facebook.blade.php ADDED Viewed

@@ -0,0 +1,4 @@
+<!-- Facebook -->
+@if($appId)
+    <meta property="fb:app_id" content="{{ $appId }}">
+@endif

package/lib/generators/laravel-project/templates/laravel/resources/views/meta/opengraph.blade.php ADDED Viewed

@@ -0,0 +1,9 @@
+<!-- Open Graph -->
+<meta property="og:locale" content="{{$locale}}">
+<meta property="og:title" content="{{ $title }}" data-react-helmet="true">
+<meta property="og:type" content="website" data-react-helmet="true">
+<meta property="og:description" content="{{ $description }}" data-react-helmet="true">
+<meta property="og:url" content="{{ $url }}" data-react-helmet="true">
+@if(isset($image))
+    <meta property="og:image" content="{{ $image }}" data-react-helmet="true">
+@endif

package/lib/generators/laravel-project/templates/laravel/resources/views/meta/twitter.blade.php ADDED Viewed

@@ -0,0 +1,5 @@
+<!-- Twitter -->
+<meta name="twitter:card" content="summary" />
+@if (isset($siteUsername))
+<meta name="twitter:site" content="{{ $siteUsername }}" />
+@endif

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

@@ -0,0 +1,12 @@
+<?php
+use App\Http\Controllers\HomeController;
+//Redirect to current langage home
+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');
+});

package/lib/generators/prettier/index.js CHANGED Viewed

@@ -31,7 +31,7 @@ module.exports = class PrettierGenerator extends _generator.default {
       },
       dependencies() {
-        this.addDevDependencies(['prettier', '@prettier/plugin-php', '@trivago/prettier-plugin-sort-imports']);
+        this.addDevDependencies(['prettier@^2.0.0', '@prettier/plugin-php@^0.18.0', '@trivago/prettier-plugin-sort-imports@^3.0.0']);
       }
     };

package/lib/generators/react-app/index.js CHANGED Viewed

@@ -108,8 +108,8 @@ module.exports = class ReactAppGenerator extends _generator.default {
       },
       dependencies() {
-        this.addDependencies(['react', 'react-dom', 'prop-types', 'react-intl', 'react-router', 'react-router-dom', 'react-helmet', 'classnames', '@folklore/routes', '@folklore/fonts', '@folklore/forms', '@folklore/fetch', '@folklore/hooks', '@folklore/tracking', // Polyfills
-        'intl', '@formatjs/intl-locale', '@formatjs/intl-pluralrules', 'intersection-observer', 'resize-observer-polyfill']);
+        this.addDependencies(['react@^18.0.0', 'react-dom@^18.0.0', 'prop-types@^15.0.0', 'react-intl@^6.0.0', 'react-router@^6.0.0', 'react-router-dom@^6.0.0', 'react-helmet@^6.0.0', 'classnames@^2.0.0', '@folklore/routes@^0.1.0', '@folklore/fonts@^0.0.1', '@folklore/forms@^0.0.1', '@folklore/fetch@^0.1.0', '@folklore/hooks@^0.0.1', '@folklore/tracking@^0.0.1', // Polyfills
+        'intl@^1.0.0', '@formatjs/intl-locale@^3.0.0', '@formatjs/intl-pluralrules@^5.0.0', 'intersection-observer@^0.12.0', 'resize-observer-polyfill@1.0.0']);
       }
     };

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

@@ -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 CHANGED Viewed

@@ -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/generators/stylelint/index.js CHANGED Viewed

@@ -37,7 +37,7 @@ module.exports = class StylelintGenerator extends _generator.default {
       },
       dependencies() {
-        this.addDevDependencies(['stylelint', 'stylelint-config-standard-scss', 'stylelint-config-idiomatic-order', 'stylelint-config-prettier']);
+        this.addDevDependencies(['stylelint@^14.0.0', 'stylelint-config-standard-scss@^5.0.0', 'stylelint-config-idiomatic-order@^8.0.0', 'stylelint-config-prettier@^9.0.0']);
       }
     };

package/lib/lib/generator.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.5",
+    "version": "3.0.7",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -9,9 +9,9 @@
     "scripts": {
         "clean:lib": "rm -rf lib/*",
         "clean": "npm run clean:lib",
-        "copy:templates": "find src/ -type d | grep -i /templates$ | sed 's/src\\/\\///g' | xargs -I{} cp -r \"src/{}\" \"lib/{}\"",
+        "copy:dirs": "find src/ -type d | grep -E '(/templates|/instructions)$' | sed 's/src\\/\\///g' | xargs -I{} cp -r \"src/{}\" \"lib/{}\"",
         "compile": "../../node_modules/.bin/babel -d lib/ src/",
-        "build": "npm run compile && npm run copy:templates",
+        "build": "npm run compile && npm run copy:dirs",
         "test": "echo \"Error: no test specified\" && exit 1",
         "prepare": "npm run clean && npm run build"
     },
@@ -31,6 +31,7 @@
     "dependencies": {
         "chalk": "^4.0.0",
         "change-case": "^4.1.2",
+        "cli-highlight": "^2.1.11",
         "glob": "^7.2.0",
         "immutable": "^4.0.0",
         "is-utf8": "^0.2.1",
@@ -39,5 +40,5 @@
         "yeoman-generator": "^5.6.1",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "49ba685c19aa4e7e0a358eb8d7f04a285e5732a5"
+    "gitHead": "bc3878a65d256dd8742a6deea2699252d4a4dfb0"
 }

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

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -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'
-    ],
-];