Use fragments for nav elements (#126)

* upgrade to Symfony 7.3

* upgrade dependencies

* global and lang navigations now use fragments

* fix url generation when using cli

* update deps

* fix menus in other languages

* configure default locale with environment variable and allow generating menus in different languages, even in the context of CLI

* update deps

* set default_uri to the value of $APP_URL

Author: jean-gui

.env

@@ -34,6 +34,7 @@ CORS_ALLOW_ORIGIN='*'
 # Dev settings are detailed below, please override in .env.$APP_ENV or .env.local (for secrets)
 # Please set APP_ENV application environment in your .env.local file
 
+APP_DEFAULT_LOCALE=en
 APP_URL=https://www-dev.w3.org
 
 # Craft CMS API URL

composer.lock

@@ -2,7 +2,7 @@ framework:
     router:
         # Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
         # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
-        #default_uri: http://localhost
+        default_uri: '%env(APP_URL)%'
 
 when@prod:
     framework:

config/packages/routing.yaml

@@ -1,6 +1,6 @@
 framework:
-    default_locale: en
+    default_locale: '%env(APP_DEFAULT_LOCALE)%'
     translator:
         default_path: '%kernel.project_dir%/translations'
         fallbacks:
-            - en
+            - '%env(APP_DEFAULT_LOCALE)%'

config/packages/translation.yaml

@@ -1,2 +1,4 @@
 twig:
     default_path: '%kernel.project_dir%/templates'
+    globals:
+        default_locale: '%env(APP_DEFAULT_LOCALE)%'

config/packages/twig.yaml

@@ -66,7 +66,7 @@ public function index(
             throw $this->createNotFoundException();
         }
         $search = $request->query->get('search');
-        
+
         $manager->add('page', new Listing($site->siteHandle));
         $manager->add(
             'collection',
@@ -100,7 +100,6 @@ public function index(
 
         return $this->render('blog/index.html.twig', [
             'site'       => $site,
-            'navigation' => $manager->getCollection('navigation'),
             'page'       => $page,
             'entries'    => $collection,
             'pagination' => $collection->getPagination(),
@@ -177,7 +176,6 @@ public function archive(
 
         return $this->render('blog/index.html.twig', [
             'site'       => $site,
-            'navigation' => $manager->getCollection('navigation'),
             'page'       => $page,
             'entries'    => $collection,
             'pagination' => $collection->getPagination(),
@@ -274,7 +272,6 @@ public function category(
 
         return $this->render('blog/index.html.twig', [
             'site'       => $site,
-            'navigation' => $manager->getCollection('navigation'),
             'page'       => $page,
             'entries'    => $collection,
             'pagination' => $collection->getPagination(),
@@ -364,7 +361,6 @@ public function tag(
 
         return $this->render('blog/index.html.twig', [
             'site'       => $site,
-            'navigation' => $manager->getCollection('navigation'),
             'page'       => $page,
             'entries'    => $collection,
             'pagination' => $collection->getPagination(),
@@ -505,7 +501,6 @@ public function show(
 
         return $this->render('blog/show.html.twig', [
             'site'          => $site,
-            'navigation'    => $manager->getCollection('navigation'),
             'page'          => $page,
             'crosslinks'    => $crosslinks,
             'comments'      => $topLevelComms,

src/Controller/BlogController.php

@@ -46,8 +46,6 @@ public function debug(QueryManager $manager, RouterInterface $router): Response
 
         $response = $this->render('debug/test.html.twig', [
             'title'             => 'Debug page',
-            'navigation'        => $manager->getCollection('navigation'),
-            'navigation_cached' => $manager->isHit('navigation'),
             'w3c_available'     => $manager->getQuery('w3c_healthcheck')->isHealthy(),
             'page'              => $manager->get('page'),
             'page_cached'       => $manager->isHit('page'),
@@ -80,8 +78,6 @@ public function home(
         $manager->add('recent-activities', new RecentActivities($site->siteHandle, $router));
         $manager->add('members', new Members());
 
-        $navigation = $manager->getCollection('navigation');
-
         $page    = $manager->get('page');
         $recentActivities = $manager->getCollection('recent-activities');
 
@@ -112,9 +108,9 @@ public function home(
 
         $response = $this->render(
             'pages/home.html.twig',
-            ['page' => $page, 'members' => $members, 'navigation' => $navigation]
+            ['page' => $page, 'members' => $members]
         );
-        
+
         return $response;
     }
 
@@ -146,14 +142,11 @@ public function index(
             throw $this->createNotFoundException('Page not found');
         }
 
-        $navigation = $manager->getCollection('navigation');
-
         $manager->add('crosslinks', new YouMayAlsoLikeRelatedEntries($router, $site->siteHandle, (int)$page['id']));
         $crosslinks = $manager->get('crosslinks');
 
         //Only for testing purposes in dev
         $twig_variables = array(
-          'navigation' => $navigation,
             'page' => $page,
             'crosslinks' => $crosslinks
         );
@@ -169,7 +162,6 @@ public function index(
 
         return $this->render($template, [
             'site'          => $site,
-            'navigation'    => $navigation,
             'page'          => $page,
             'crosslinks'    => $crosslinks,
             'related_links' => array_key_exists('siblings', $page) ? $page['siblings'] : null

src/Controller/DefaultController.php

@@ -151,7 +151,6 @@ public function show(string $slug, Site $site, QueryManager $manager, RouterInte
 
         return $this->render('ecosystems/show.html.twig', [
             'site'       => $site,
-            'navigation' => $manager->getCollection('navigation'),
             'page'       => $page,
         ]);
     }