Internal: Fix routes.yaml to use annotations

config/routes.yaml

@@ -8,49 +8,24 @@ oneup_uploader:
     resource: .
     type: uploader
 
-legacy_main:
+#courses_vue:
-    path: /main/{name}
+#    path: /courses/{wildcard}
-    defaults: {_controller: 'ChamiloCoreBundle:Legacy:classic'}
+#    controller: Chamilo\CoreBundle\Controller\IndexController::resources
-    requirements:
+#    requirements:
-        name: .+
+#        wildcard: .*
-
-legacy_plugin:
-    path: /plugin/{name}
-    defaults: {_controller: 'ChamiloCoreBundle:Legacy:plugin'}
-    requirements:
-        name: .+
-
-courses_vue:
-    path: /courses/{wildcard}
-    controller: Chamilo\CoreBundle\Controller\IndexController::resources
-    requirements:
-        wildcard: .*
 
-sessions_vue:
+#sessions_vue:
-    path: /sessions/{wildcard}
+#    path: /sessions/{wildcard}
-    controller: Chamilo\CoreBundle\Controller\IndexController::resources
+#    controller: Chamilo\CoreBundle\Controller\IndexController::resources
-    requirements:
+#    requirements:
-        wildcard: .*
+#        wildcard: .*
 
 resources_vue:
     path: /resources/{wildcard}
-    controller: Chamilo\CoreBundle\Controller\IndexController::resources
+    controller: Chamilo\CoreBundle\Controller\IndexController::indexAction
-    requirements:
-        wildcard: .*
-
-vue:
-    path: /vue/{wildcard}
-    controller: Chamilo\CoreBundle\Controller\IndexController::resources
     requirements:
         wildcard: .*
 
-# web url shortcuts for legacy templates
-web.ajax:
-    path: main/inc/ajax/
-
-web.main:
-    path: main/
-
 #liip_theme:
 #    resource: "@LiipThemeBundle/Resources/config/routing.xml"
 #    prefix: /theme
@@ -63,8 +38,12 @@ web.main:
 #        url: .*/$
 #        _method: GET
 
-chamilo_graphql:
+# web url shortcuts for legacy templates
-    resource: "@ChamiloGraphQlBundle/Resources/config/routing.yaml"
+web.ajax:
+    path: main/inc/ajax/
+
+web.main:
+    path: main/
 
 chamilo_lti:
     resource: "@ChamiloLtiBundle/Resources/config/routing.yml"

config/routes/annotations.yaml

@@ -1,4 +1,7 @@
-# Controllers
+core_controllers:
-controllers:
     resource: '../../src/CoreBundle/Controller/'
     type: annotation
+
+course_controllers:
+    resource: '../../src/CourseBundle/Controller/'
+    type: annotation

config/services.yaml

@@ -12,8 +12,6 @@ parameters:
                 - 'GeneratorBundle::fields.html.twig'
     course_info_is_not_editable: false
 
-#    sonata_media.cdn.host: '/var/upload/media/'
-#    sonata_page.varnish.command: 'if [ ! -r "/etc/varnish/secret" ]; then echo "VALID ERROR :/"; else varnishadm -S /etc/varnish/secret -T 127.0.0.1:6082 {{ COMMAND }} "{{ EXPRESSION }}"; fi;'
 #    router.request_context.base_url: '%env(APP_URL_APPEND)%'
 #    asset.request_context.base_path: '%env(APP_URL_APPEND)%'
 
@@ -59,7 +57,6 @@ services:
     Chamilo\CoreBundle\Controller\ResourceController:
         arguments:
             - '@Chamilo\CoreBundle\Repository\ResourceFactory'
-#            - '@Chamilo\CoreBundle\Block\BreadcrumbBlockService'
 
     Symfony\Component\Mailer\Mailer:
         public: true
@@ -82,11 +79,6 @@ services:
 sylius_settings:
     driver: doctrine/orm
 
-# Doctrine audit
-#sonata_doctrine_orm_admin:
-#    audit:
-#        force: false # Audits are set in the admin.yml files with audit:true
-
 ## Grid default template
 #apy_data_grid:
 #    theme: '@ChamiloCore/Resource/grid_theme.html.twig'

src/CoreBundle/Controller/IndexController.php

@@ -10,35 +10,21 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * Class IndexController
+ * Class IndexController.
- * author Julio Montoya <gugli100@gmail.com>.
  */
 class IndexController extends BaseController
 {
     /**
-     * The Chamilo index home page.
+     * Index home page.
      *
      * @Route("/", name="home", methods={"GET", "POST"}, options={"expose"=true})
      * @Route("/login", name="login", methods={"GET", "POST"}, options={"expose"=true})
+     * @Route("/courses", name="courses", methods={"GET", "POST"}, options={"expose"=true})
+     * @Route("/sessions", name="sessions", methods={"GET", "POST"}, options={"expose"=true})
      */
     public function indexAction(): Response
     {
-        return $this->render(
+        return $this->render('@ChamiloCore/Index/vue.html.twig');
-            '@ChamiloCore/Index/vue.html.twig',
-            [
-                'content' => '',
-            ]
-        );
-    }
-
-    public function resources(): Response
-    {
-        return $this->render(
-            '@ChamiloCore/Index/vue.html.twig',
-            [
-                'content' => '',
-            ]
-        );
     }
 
     /**

src/CoreBundle/Controller/ResourceController.php

@@ -58,7 +58,7 @@ class ResourceController extends AbstractResourceController implements CourseCon
      * For the tool value check the Tool entity.
      * For the type value check the ResourceType entity.
      */
-    public function indexAction(Request $request, Grid $grid): Response
+    public function indexAction(Request $request): Response
     {
         $tool = $request->get('tool');
         $type = $request->get('type');
@@ -408,7 +408,7 @@ class ResourceController extends AbstractResourceController implements CourseCon
      *
      * If node has children show it
      */
-    public function listAction(Request $request, Grid $grid): Response
+    public function listAction(Request $request): Response
     {
         $tool = $request->get('tool');
         $type = $request->get('type');