Refactoring directories

config/packages/doctrine.yaml

@@ -17,8 +17,8 @@ doctrine:
             Lc\SovBundle\Model\User\UserInterface: App\Entity\User\User
             Lc\SovBundle\Doctrine\Extension\FileInterface: App\Entity\File\File
             Lc\CaracoleBundle\Model\Address\AddressInterface: App\Entity\Address\Address
-            Lc\CaracoleBundle\Model\Common\TaxRateInterface: App\Entity\Common\TaxRate
-            Lc\CaracoleBundle\Model\Common\UnitInterface: App\Entity\Common\Unit
+            Lc\CaracoleBundle\Model\Config\TaxRateInterface: App\Entity\Config\TaxRate
+            Lc\CaracoleBundle\Model\Config\UnitInterface: App\Entity\Config\Unit
             Lc\CaracoleBundle\Model\Credit\CreditConfigInterface: App\Entity\Credit\CreditConfig
             Lc\CaracoleBundle\Model\Credit\CreditHistoryInterface: App\Entity\Credit\CreditHistory
             Lc\CaracoleBundle\Model\File\DocumentInterface: App\Entity\File\Document

config/packages/lc_sov.yaml

@@ -1,3 +1,8 @@
-# see https://symfony.com/doc/current/reference/configuration/framework.html
 lc_sov:
-    homepage_route: 'app_homepage'
+  homepage_route: 'app_homepage'
+  login_redirection:
+    redirect_referer: true
+    roles_redirection:
+      - { role: "ROLE_ADMIN", redirect: "admin_dashboard" }
+      - { role: "ROLE_ANIMATOR", redirect: "admin_dashboard" }
+      - { role: "ROLE_SUPER_ADMIN", redirect: "admin_dashboard" }

config/routes.yaml

@@ -10,7 +10,7 @@ artgris_bundle_file_manager:
 
 admin_dashboard:
   path: /admin
-  controller: App\Controller\Admin\DashboardController::index
+  controller: App\Controller\Dashboard\DashboardAdminController::index
 
 app_homepage:
   path: /

src/Controller/Common/TaxRateCrudController.php → src/Controller/Config/TaxRateAdminController.php

@@ -1,18 +1,15 @@
 <?php
 
-namespace App\Controller\Common;
+namespace App\Controller\Config;
 
-use App\Entity\Common\TaxRate;
+use App\Entity\Config\TaxRate;
 use EasyCorp\Bundle\EasyAdminBundle\Field\NumberField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
-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;
+use Lc\CaracoleBundle\Controller\Config\TaxRateAdminController as CaracTaxRateAdminController;
 
-class TaxRateCrudController extends AbstractUserCrudController
+class TaxRateAdminController extends CaracTaxRateAdminController
 {
+
     public static function getEntityFqcn(): string
     {
         return TaxRate::class;

src/Controller/Admin/DashboardController.php → src/Controller/Dashboard/DashboardAdminController.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Controller\Admin;
+namespace App\Controller\Dashboard;
 
-use App\Entity\Common\TaxRate;
+use App\Entity\Config\TaxRate;
 use App\Entity\Merchant\Merchant;
 use App\Entity\Section\Section;
 use App\Entity\Site\Page;
 use App\Entity\User\User;
 use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem;
-use Lc\CaracoleBundle\Controller\Admin\DashboardController as CaracDashboardController;
+use Lc\CaracoleBundle\Controller\Dashboard\DashboardAdminController as CaracDashboardController;
 use Symfony\Component\HttpFoundation\Response;
 
-class DashboardController extends CaracDashboardController
+class DashboardAdminController extends CaracDashboardController
 {
 
     public function configureMenuItems(): iterable

src/Controller/Admin/MerchantCrudController.php → src/Controller/Merchant/MerchantAdminController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Admin;
+namespace App\Controller\Merchant;
 
 use App\Entity\Merchant\Merchant;
 use App\Entity\Section\Section;
@@ -9,12 +9,12 @@ use EasyCorp\Bundle\EasyAdminBundle\Field\AssociationField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\FormField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\NumberField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
-use Lc\SovBundle\Controller\Admin\AbstractCrudController;
+use Lc\SovBundle\Controller\AbstractAdminController;
 use Lc\SovBundle\Field\BooleanField;
 use Lc\SovBundle\Field\CKEditorField;
 use Lc\SovBundle\Field\StatusField;
 
-class MerchantCrudController extends AbstractCrudController
+class MerchantAdminController extends AbstractAdminController
 {
     public static function getEntityFqcn(): string
     {

src/Controller/Admin/SectionCrudController.php → src/Controller/Section/SectionAdminController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Admin;
+namespace App\Controller\Section;
 
 use App\Entity\Section\Section;
 use App\Entity\Site\Page;
@@ -9,12 +9,12 @@ use EasyCorp\Bundle\EasyAdminBundle\Field\ChoiceField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\FormField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\NumberField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
-use Lc\SovBundle\Controller\Admin\AbstractCrudController;
+use Lc\SovBundle\Controller\AbstractAdminController;
 use Lc\SovBundle\Field\BooleanField;
 use Lc\SovBundle\Field\CKEditorField;
 use Lc\SovBundle\Field\StatusField;
 
-class SectionCrudController extends AbstractCrudController
+class SectionAdminController extends AbstractAdminController
 {
     public static function getEntityFqcn(): string
     {

src/Controller/Admin/PageCrudController.php → src/Controller/Site/PageAdminController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Controller\Admin;
+namespace App\Controller\Site;
 
 use App\Entity\Site\Page;
 use EasyCorp\Bundle\EasyAdminBundle\Field\FormField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\NumberField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
-use Lc\CaracoleBundle\Controller\Admin\AbstractCrudController;
+use Lc\CaracoleBundle\Controller\AbstractAdminController;
 use Lc\SovBundle\Field\CKEditorField;
 use Lc\SovBundle\Field\StatusField;
 
-class PageCrudController extends AbstractCrudController
+class PageAdminController extends AbstractAdminController
 {
     public static function getEntityFqcn(): string
     {

src/Controller/User/GroupUserCrudController.php → src/Controller/User/GroupUserAdminController.php

@@ -4,9 +4,9 @@ namespace App\Controller\User;
 
 use App\Entity\User\GroupUser;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
-use Lc\CaracoleBundle\Controller\User\GroupUserCrudController as AbstractUserCrudController;
+use Lc\CaracoleBundle\Controller\User\GroupUserAdminController as AbstractUserCrudController;
 
-class GroupUserCrudController extends AbstractUserCrudController
+class GroupUserAdminController extends AbstractUserCrudController
 {
         public static function getEntityFqcn(): string
         {

src/Controller/User/UserCrudController.php → src/Controller/User/UserAdminController.php

@@ -3,9 +3,9 @@
 namespace App\Controller\User;
 
 use App\Entity\User\User;
-use Lc\SovBundle\Controller\Admin\UserCrudController as AbstractUserCrudController;
+use Lc\SovBundle\Controller\User\UserAdminController as SovUserAdminController;
 
-class UserCrudController extends AbstractUserCrudController
+class UserAdminController extends SovUserAdminController
 {
         public static function getEntityFqcn(): string
         {

src/Entity/Common/TaxRate.php → src/Entity/Config/TaxRate.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Entity\Common;
+namespace App\Entity\Config;
 
-use Lc\CaracoleBundle\Repository\Common\TaxRateRepository;
+use Lc\CaracoleBundle\Repository\Config\TaxRateRepository;
 use Doctrine\ORM\Mapping as ORM;
-use Lc\CaracoleBundle\Model\Common\TaxRateInterface;
-use Lc\CaracoleBundle\Model\Common\TaxRateModel;
+use Lc\CaracoleBundle\Model\Config\TaxRateInterface;
+use Lc\CaracoleBundle\Model\Config\TaxRateModel;
 
 /**
  * @ORM\Entity(repositoryClass=TaxRateRepository::class)

src/Entity/Common/Unit.php → src/Entity/Config/Unit.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Entity\Common;
+namespace App\Entity\Config;
 
-use Lc\CaracoleBundle\Repository\Common\UnitRepository;
+use Lc\CaracoleBundle\Repository\Config\UnitRepository;
 use Doctrine\ORM\Mapping as ORM;
-use Lc\CaracoleBundle\Model\Common\UnitInterface;
-use Lc\CaracoleBundle\Model\Common\UnitModel;
+use Lc\CaracoleBundle\Model\Config\UnitInterface;
+use Lc\CaracoleBundle\Model\Config\UnitModel;
 
 /**
  * @ORM\Entity(repositoryClass=UnitRepository::class)