From: Vincent Vanwaelscappel Date: Mon, 24 Jun 2019 16:55:13 +0000 (+0200) Subject: #2843 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=52d2cd2d7865472ffa6c6f05c64c54b56c8ea1d2;p=pmi.git #2843 --- diff --git a/.env.example b/.env.example deleted file mode 100644 index 27f6db4..0000000 --- a/.env.example +++ /dev/null @@ -1,39 +0,0 @@ -APP_NAME=Laravel -APP_ENV=local -APP_KEY= -APP_DEBUG=true -APP_URL=http://localhost - -LOG_CHANNEL=stack - -DB_CONNECTION=mysql -DB_HOST=127.0.0.1 -DB_PORT=3306 -DB_DATABASE=homestead -DB_USERNAME=homestead -DB_PASSWORD=secret - -BROADCAST_DRIVER=log -CACHE_DRIVER=file -QUEUE_CONNECTION=sync -SESSION_DRIVER=file -SESSION_LIFETIME=120 - -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 - -MAIL_DRIVER=smtp -MAIL_HOST=smtp.mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null - -PUSHER_APP_ID= -PUSHER_APP_KEY= -PUSHER_APP_SECRET= -PUSHER_APP_CLUSTER=mt1 - -MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" -MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" diff --git a/.env.production b/.env.production index 5dcfe61..1aebbc8 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ APP_NAME=PMI APP_ENV=production APP_KEY=base64:/Jmlg7TepI/inQ4KJ3VF0YVTqghRGvvBrnDI7NkUk94= APP_DEBUG=true -APP_URL=https://pmi.dev.cubedesigners.com +APP_URL=https://www.pm-instrumentation.com LOG_CHANNEL=stack @@ -29,6 +29,8 @@ MAIL_PORT=25 MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS=pmi@cubedesigners.com +MAIL_FROM_NAME="PM-Instrumentation" PUSHER_APP_ID= PUSHER_APP_KEY= diff --git a/.env.staging b/.env.staging new file mode 100644 index 0000000..fec13ce --- /dev/null +++ b/.env.staging @@ -0,0 +1,43 @@ +APP_NAME=PMI +APP_ENV=production +APP_KEY=base64:/Jmlg7TepI/inQ4KJ3VF0YVTqghRGvvBrnDI7NkUk94= +APP_DEBUG=true +APP_URL=https://staging.pm-instrumentation.com +LOG_CHANNEL=stack + +DB_CONNECTION=mysql +DB_HOST=localhost +DB_PORT=3306 +DB_DATABASE=pmi +DB_USERNAME=pmi +DB_PASSWORD=ZJMcD6nAc3xnLjLVKZ2iWi69 + +BROADCAST_DRIVER=log +CACHE_DRIVER=file +QUEUE_CONNECTION=sync +SESSION_DRIVER=redis +SESSION_LIFETIME=120 + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_DRIVER=smtp +MAIL_HOST=localhost +MAIL_PORT=25 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS=pmi@cubedesigners.com +MAIL_FROM_NAME="PM-Instrumentation" + +PUSHER_APP_ID= +PUSHER_APP_KEY= +PUSHER_APP_SECRET= +PUSHER_APP_CLUSTER=mt1 + +MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" +MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" + +GOOGLE_ANALYTICS_ID=UA-4339912-10 +BACKPACK_LICENSE=YwdOWjeEczPAwy06GzkBJggW diff --git a/app/Models/Page.php b/app/Models/Page.php new file mode 100644 index 0000000..9b8d099 --- /dev/null +++ b/app/Models/Page.php @@ -0,0 +1,11 @@ + false, 'column' => true, ]); + + $this->addField(['name' => 'button', + 'label' => 'Button', + 'type' => 'Button']); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index b78ba9a..2d9dffd 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -24,15 +24,19 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { - // BladeX Component Aliases - // Ref: https://docs.spatie.be/laravel-blade-x/v2/introduction - BladeX::component('components.flexible-image'); // - BladeX::component('components.full-width'); // ... - BladeX::component('components.content'); // ... - BladeX::component('components.columns'); // ... - BladeX::component('components.column'); // ... - BladeX::component('components.grid'); // ... - BladeX::component('components.text-block'); // ... - BladeX::component('components.link-button'); // ... + try { + // BladeX Component Aliases + // Ref: https://docs.spatie.be/laravel-blade-x/v2/introduction + BladeX::component('components.flexible-image'); // + BladeX::component('components.full-width'); // ... + BladeX::component('components.content'); // ... + BladeX::component('components.columns'); // ... + BladeX::component('components.column'); // ... + BladeX::component('components.grid'); // ... + BladeX::component('components.text-block'); // ... + BladeX::component('components.link-button'); // ... + }catch (\Exception $e){ + + } } } diff --git a/app/SubForms/Intro.php b/app/SubForms/Intro.php new file mode 100644 index 0000000..54d8e1e --- /dev/null +++ b/app/SubForms/Intro.php @@ -0,0 +1,30 @@ +addField(['name' => 'title', + 'label' => 'Titre', + 'type' => 'Text']); + + $this->addField(['name' => 'text', + 'label' => 'Texte', + 'type' => 'Textarea']); + + $this->addField(['name' => 'image', + 'label' => 'Image', + 'type' => 'Images']); + + $this->addField(['name' => 'button', + 'label' => 'Lien', + 'type' => 'Button']); + } +} diff --git a/app/SubForms/Slide.php b/app/SubForms/Slide.php new file mode 100644 index 0000000..6e19ad1 --- /dev/null +++ b/app/SubForms/Slide.php @@ -0,0 +1,27 @@ +addField(['name' => 'title', + 'label' => 'Titre', + 'type' => 'Text']); + + $this->addField(['name' => 'text', + 'label' => 'Texte', + 'type' => 'Textarea']); + + $this->addField(['name' => 'image', + 'label' => 'Image', + 'type' => 'Images']); + + $this->addField(['name' => 'button', + 'label' => 'Lien', + 'type' => 'Button']); + } +} diff --git a/app/Templates/Aboutus.php b/app/Templates/Aboutus.php index 5406dd5..cea0030 100644 --- a/app/Templates/Aboutus.php +++ b/app/Templates/Aboutus.php @@ -27,7 +27,7 @@ class Aboutus extends Base $this->addField([ 'name' => 'content', 'label' => trans('backpack::pagemanager.content'), - 'type' => 'simplemde', + 'type' => 'Markdown', 'placeholder' => trans('backpack::pagemanager.content_placeholder'), ]); } diff --git a/app/Templates/Base.php b/app/Templates/Base.php index b8332af..3389dd9 100644 --- a/app/Templates/Base.php +++ b/app/Templates/Base.php @@ -10,6 +10,14 @@ class Base extends TemplateAbstract { parent::init(); + $this->addField([ + 'name' => 'intro', + 'type' => 'BunchOfFields', + 'bunch' => 'App\SubForms\Intro', + 'label' => __('Introduction'), + 'tab' => 'Contenus', + ]); + } public function showInDropDown() diff --git a/app/Templates/Home.php b/app/Templates/Home.php index 3f1d858..2948732 100644 --- a/app/Templates/Home.php +++ b/app/Templates/Home.php @@ -1,10 +1,4 @@ addField([ 'name' => 'slideshow', - 'type' => 'list_model', - 'model' => 'slideshow', + 'type' => 'BunchOfFields', + 'bunch' => 'App\SubForms\Slide', 'label' => __('Slideshow'), + 'tab' => 'Contenus', ]); } } diff --git a/app/Templates/Services.php b/app/Templates/Services.php index bbaa2b8..fb95193 100644 --- a/app/Templates/Services.php +++ b/app/Templates/Services.php @@ -24,5 +24,10 @@ class Services extends Base public function init() { parent::init(); + $this->addField(['name' => 'test', + 'type' => 'Text', + 'label' => 'Super !', + 'tab' => 'Contenus' + ]); } } diff --git a/config/backpack/crud.php b/config/backpack/crud.php index 470bc49..9a35027 100644 --- a/config/backpack/crud.php +++ b/config/backpack/crud.php @@ -270,7 +270,7 @@ return [ // "fr_SN" => "French (Senegal)", // "fr_CH" => "French (Switzerland)", // "fr_TG" => "French (Togo)", - 'fr' => 'French', + // "ff_SN" => "Fulah (Senegal)", // "ff" => "Fulah", // "gl_ES" => "Galician (Spain)", diff --git a/config/backpack/pagemanager.php b/config/backpack/pagemanager.php deleted file mode 100644 index 96639e2..0000000 --- a/config/backpack/pagemanager.php +++ /dev/null @@ -1,9 +0,0 @@ - 'Cubist\Backpack\app\Http\Controllers\CubistPageCrudController', - - // Change this class if you wish to extend the Page model - 'page_model_class' => 'Backpack\PageManager\app\Models\Page', -]; diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php index d0a6724..3b12ecb 100644 --- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php +++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php @@ -21,8 +21,8 @@ {{--
  • Tags
  • --}} {{----}} {{----}} -
  • - {{ trans('backpack::crud.file_manager') }}
  • +{{--
  • --}} +{{-- {{ trans('backpack::crud.file_manager') }}
  • --}} @can('backpack_translation')
  • Translate
  • @@ -65,8 +65,8 @@
  • Backups
  • Logs
  • @endcan -
  • - {{ trans('backpack::crud.file_manager') }}
  • +{{--
  • --}} +{{-- {{ trans('backpack::crud.file_manager') }}
  • --}} @endcan diff --git a/resources/views/vendor/backpack/langfilemanager/language_headers.blade.php b/resources/views/vendor/backpack/langfilemanager/language_headers.blade.php new file mode 100644 index 0000000..8414455 --- /dev/null +++ b/resources/views/vendor/backpack/langfilemanager/language_headers.blade.php @@ -0,0 +1,9 @@ +
    +

    + {!! /*$level.*/ucfirst(str_replace(['_', '-'], ' ', trim($header))) !!} + +

    +
    + {!! $langfile->displayInputs($item, $parents, $header, $level) !!} +
    +
    diff --git a/resources/views/vendor/backpack/langfilemanager/language_inputs.blade.php b/resources/views/vendor/backpack/langfilemanager/language_inputs.blade.php new file mode 100644 index 0000000..2c7b386 --- /dev/null +++ b/resources/views/vendor/backpack/langfilemanager/language_inputs.blade.php @@ -0,0 +1,44 @@ +
    + + +
    + @if (preg_match('/(\|)/', $item)) + @php + $chuncks = explode('|', $item); + @endphp + +
    + @foreach ($chuncks as $k => $chunck) + @php + preg_match('/^({\w}|\[[\w,]+\])([\w\s:]+)/', trim($chunck), $m); + @endphp + @if (empty($m)) + + +
    + @else + + + +
    + @endif + @endforeach +
    + @else + +
    + @endif +
    +
    \ No newline at end of file diff --git a/resources/views/vendor/backpack/langfilemanager/translations.blade.php b/resources/views/vendor/backpack/langfilemanager/translations.blade.php new file mode 100644 index 0000000..920afc7 --- /dev/null +++ b/resources/views/vendor/backpack/langfilemanager/translations.blade.php @@ -0,0 +1,92 @@ +@extends('backpack::layout') + +@section('header') +
    +

    + {{ trans('backpack::langfilemanager.translate') }} {{ trans('backpack::langfilemanager.site_texts') }} +

    + +
    +@endsection + +@section('content') + +
    +
    +

    {{ ucfirst(trans('backpack::langfilemanager.language')) }}: + @foreach ($languages as $lang) + @if ($currentLang == $lang->abbr) + {{{ $lang->name }}} + @endif + @endforeach + +   {{ trans('backpack::langfilemanager.switch_to') }}:   + + +

    +
    +
    +

    {!! trans('backpack::langfilemanager.rules_text') !!}

    +
    + +
    +
    +
    + @if (!empty($fileArray)) +
    + {!! csrf_field() !!} + + + {!! $langfile->displayInputs($fileArray) !!} +
    +
    + +
    +
    + @else + {{ trans('backpack::langfilemanager.empty_file') }} + @endif +
    +
    +
    +@endsection + +@section('after_scripts') + +@endsection diff --git a/resources/views/vendor/webfactor/nestedmodels/ajax/create.blade.php b/resources/views/vendor/webfactor/nestedmodels/ajax/create.blade.php new file mode 100644 index 0000000..dadae69 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/ajax/create.blade.php @@ -0,0 +1,33 @@ +@extends('nestedmodels::ajax.modal') + +@section('header') +

    {{ trans('backpack::crud.add_a_new') }} {{ $crud->entity_name }}

    +@endsection + +@section('content') +
    +
    + @include('crud::inc.grouped_errors') + + + @if(view()->exists('vendor.backpack.crud.form_content')) + @include('vendor.backpack.crud.form_content', ['fields' => $crud->getFields('create'), 'action' => 'create']) + @else + @include('crud::form_content', ['fields' => $crud->getFields('create'), 'action' => 'create']) + @endif +
    +
    +@endsection + +@section('footer') + @include('nestedmodels::ajax.inc.form_save_buttons') +@endsection + +@push('crud_fields_scripts') + + +@endpush \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/ajax/inc/form_save_buttons.blade.php b/resources/views/vendor/webfactor/nestedmodels/ajax/inc/form_save_buttons.blade.php new file mode 100644 index 0000000..4cd361c --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/ajax/inc/form_save_buttons.blade.php @@ -0,0 +1,13 @@ +
    + + + + + + +
    \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/ajax/modal.blade.php b/resources/views/vendor/webfactor/nestedmodels/ajax/modal.blade.php new file mode 100644 index 0000000..14f8f37 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/ajax/modal.blade.php @@ -0,0 +1,15 @@ +@stack('crud_fields_styles') +{!! Form::open(['id' => 'create_form', 'url' => $crud->route, 'method' => 'post', 'files'=>$crud->hasUploadFields('create')]) !!} + + + + +{!! Form::close() !!} +@stack('crud_fields_scripts') \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/inc/modal_style.blade.php b/resources/views/vendor/webfactor/nestedmodels/inc/modal_style.blade.php new file mode 100644 index 0000000..345c968 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/inc/modal_style.blade.php @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/inc/tree_script.blade.php b/resources/views/vendor/webfactor/nestedmodels/inc/tree_script.blade.php new file mode 100644 index 0000000..64f7564 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/inc/tree_script.blade.php @@ -0,0 +1,276 @@ + \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/inc/tree_style.blade.php b/resources/views/vendor/webfactor/nestedmodels/inc/tree_style.blade.php new file mode 100644 index 0000000..9a3e677 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/inc/tree_style.blade.php @@ -0,0 +1,79 @@ + \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/modal.blade.php b/resources/views/vendor/webfactor/nestedmodels/modal.blade.php new file mode 100644 index 0000000..293c25a --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/modal.blade.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/node.blade.php b/resources/views/vendor/webfactor/nestedmodels/node.blade.php new file mode 100644 index 0000000..e0cb691 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/node.blade.php @@ -0,0 +1,11 @@ + + \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/node/button_collapse.blade.php b/resources/views/vendor/webfactor/nestedmodels/node/button_collapse.blade.php new file mode 100644 index 0000000..0c06131 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/node/button_collapse.blade.php @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/node/buttons.blade.php b/resources/views/vendor/webfactor/nestedmodels/node/buttons.blade.php new file mode 100644 index 0000000..ff4c6c5 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/node/buttons.blade.php @@ -0,0 +1,4 @@ +@include('nestedmodels::node.buttons.reorder') +@include('nestedmodels::node.buttons.delete') +@include('nestedmodels::node.buttons.edit') +@include('nestedmodels::node.buttons.create_child') \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/node/buttons/create_child.blade.php b/resources/views/vendor/webfactor/nestedmodels/node/buttons/create_child.blade.php new file mode 100644 index 0000000..d242ebc --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/node/buttons/create_child.blade.php @@ -0,0 +1,34 @@ + + + +{{-- + ---------------------------------------- + | You can have some kind of dropdown here. + | We will add a 'type' attribute to the create route. + | Just call "newChild($event, this, '' on ng-click. + | This way you could create completely different models by redirecting in your NestedModelCrudController subclass. + ---------------------------------------- + SAMPLE CODE + ---------------------------------------- + + + +--}} diff --git a/resources/views/vendor/webfactor/nestedmodels/node/buttons/delete.blade.php b/resources/views/vendor/webfactor/nestedmodels/node/buttons/delete.blade.php new file mode 100644 index 0000000..18f61aa --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/node/buttons/delete.blade.php @@ -0,0 +1,7 @@ + + + \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/node/buttons/edit.blade.php b/resources/views/vendor/webfactor/nestedmodels/node/buttons/edit.blade.php new file mode 100644 index 0000000..a3be29c --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/node/buttons/edit.blade.php @@ -0,0 +1,7 @@ + + + \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/node/buttons/reorder.blade.php b/resources/views/vendor/webfactor/nestedmodels/node/buttons/reorder.blade.php new file mode 100644 index 0000000..8b083ba --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/node/buttons/reorder.blade.php @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/node/childrendering.blade.php b/resources/views/vendor/webfactor/nestedmodels/node/childrendering.blade.php new file mode 100644 index 0000000..3114743 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/node/childrendering.blade.php @@ -0,0 +1,13 @@ +
      +
    1. +
    2. +
    +
      +
    1. +
    2. +
    \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/node/content.blade.php b/resources/views/vendor/webfactor/nestedmodels/node/content.blade.php new file mode 100644 index 0000000..e1bb8e9 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/node/content.blade.php @@ -0,0 +1 @@ +<% node.title %> \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/preview.blade.php b/resources/views/vendor/webfactor/nestedmodels/preview.blade.php new file mode 100644 index 0000000..ccdc8b0 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/preview.blade.php @@ -0,0 +1,23 @@ + \ No newline at end of file diff --git a/resources/views/vendor/webfactor/nestedmodels/tree.blade.php b/resources/views/vendor/webfactor/nestedmodels/tree.blade.php new file mode 100644 index 0000000..c9bd792 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/tree.blade.php @@ -0,0 +1,11 @@ + + diff --git a/resources/views/vendor/webfactor/nestedmodels/treecrud.blade.php b/resources/views/vendor/webfactor/nestedmodels/treecrud.blade.php new file mode 100644 index 0000000..4876af1 --- /dev/null +++ b/resources/views/vendor/webfactor/nestedmodels/treecrud.blade.php @@ -0,0 +1,69 @@ +@extends('backpack::layout') + +@section('header') +
    +

    + {{ $crud->entity_name_plural }} + {{ trans('backpack::crud.all') }} + {{ $crud->entity_name_plural }} {{ trans('backpack::crud.in_the_database') }} + . + +

    + +
    +@endsection + +@section('content') +
    +
    + +
    +
    + @include('crud::inc.button_stack', ['stack' => 'top']) + + +
    +
    +
    +
    +
    +
    + + @include('nestedmodels::tree') + @include('nestedmodels::node') + @include('nestedmodels::modal') + @include('nestedmodels::preview') +
    +@endsection + +@section('after_styles') + + @include('nestedmodels::inc.tree_style') + @include('nestedmodels::inc.modal_style') +@endsection + +@section('after_scripts') + + + + + + @include('nestedmodels::inc.tree_script') +@endsection diff --git a/update b/update index e20cbd6..9a8e97b 100644 --- a/update +++ b/update @@ -1,6 +1,10 @@ #!/usr/bin/env php