Browse Source

Merge branch 'develop' of https://gitea.laclic.fr/Laclic/CaracoleSkeleton into develop

master
Fab 3 years ago
parent
commit
483e1e033c
3 changed files with 23 additions and 4 deletions
  1. +3
    -0
      src/Controller/Admin/PageCrudController.php
  2. +18
    -4
      src/Controller/Common/TaxRateCrudController.php
  3. +2
    -0
      webpack.config.js

+ 3
- 0
src/Controller/Admin/PageCrudController.php View File

namespace App\Controller\Admin; namespace App\Controller\Admin;


use App\Entity\Site\Page; use App\Entity\Site\Page;
use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField; use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
use Lc\SovBundle\Controller\Admin\AbstractCrudController; use Lc\SovBundle\Controller\Admin\AbstractCrudController;
use Lc\SovBundle\Field\CKEditorField; use Lc\SovBundle\Field\CKEditorField;

+ 18
- 4
src/Controller/Common/TaxRateCrudController.php View File

namespace App\Controller\Common; namespace App\Controller\Common;


use App\Entity\Common\TaxRate; use App\Entity\Common\TaxRate;
use EasyCorp\Bundle\EasyAdminBundle\Field\NumberField;
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
use Lc\CaracoleBundle\Controller\Common\TaxRateCrudController as AbstractUserCrudController; use Lc\CaracoleBundle\Controller\Common\TaxRateCrudController as AbstractUserCrudController;
use Lc\SovBundle\Field\CKEditorField;
use Lc\SovBundle\Field\GalleryManagerField;
use Lc\SovBundle\Field\ImageManagerField;
use Lc\SovBundle\Field\StatusField;


class TaxRateCrudController extends AbstractUserCrudController class TaxRateCrudController extends AbstractUserCrudController
{ {
public static function getEntityFqcn(): string
{
return TaxRate::class;
}
public static function getEntityFqcn(): string
{
return TaxRate::class;
}

public function configureFields(string $pageName): iterable
{
return [
TextField::new('title')->setLabel('Titre'),
NumberField::new('value')->setLabel('Valeur'),
];
}


} }

+ 2
- 0
webpack.config.js View File

'adminlte-css': path.join(__dirname, 'node_modules/admin-lte/build/scss/adminlte.scss'), 'adminlte-css': path.join(__dirname, 'node_modules/admin-lte/build/scss/adminlte.scss'),
'fontawesome-css': path.join(__dirname, 'node_modules/admin-lte/plugins/fontawesome-free/css/all.css'), 'fontawesome-css': path.join(__dirname, 'node_modules/admin-lte/plugins/fontawesome-free/css/all.css'),
'adminlte-plugin': path.join(__dirname, 'node_modules/admin-lte/plugins/'), 'adminlte-plugin': path.join(__dirname, 'node_modules/admin-lte/plugins/'),
'toastr': path.join(__dirname, 'node_modules/toastr'),


/*'adminlte': path.resolve(__dirname, './node_modules/admin-lte/dist/js/adminlte.min.js'), /*'adminlte': path.resolve(__dirname, './node_modules/admin-lte/dist/js/adminlte.min.js'),
'adminltePlugin': path.resolve(__dirname, './node_modules/admin-lte/plugins/'), 'adminltePlugin': path.resolve(__dirname, './node_modules/admin-lte/plugins/'),
* and one CSS file (e.g. app.css) if your JavaScript imports CSS. * and one CSS file (e.g. app.css) if your JavaScript imports CSS.
*/ */
.addEntry('adminlte-common', './Lc/SovBundle/Resources/assets/app/adminlte/common/app.common.js') .addEntry('adminlte-common', './Lc/SovBundle/Resources/assets/app/adminlte/common/app.common.js')
.addEntry('adminlte-index', './Lc/SovBundle/Resources/assets/app/adminlte/index/app.index.js')
.addEntry('adminlte-field-filemanager', './Lc/SovBundle/Resources/assets/app/adminlte/field/filemanager/app.filemanager.js') .addEntry('adminlte-field-filemanager', './Lc/SovBundle/Resources/assets/app/adminlte/field/filemanager/app.filemanager.js')
.addEntry('adminlte-field-collection', './Lc/SovBundle/Resources/assets/app/adminlte/field/collection/app.collection.js') .addEntry('adminlte-field-collection', './Lc/SovBundle/Resources/assets/app/adminlte/field/collection/app.collection.js')



Loading…
Cancel
Save