Refactor dashboard paths in templates

Author: codedmonkey

templates/dashboard/packages/list.html.twig

@@ -14,11 +14,9 @@
           Add Package
         </button>
         <ul class="dropdown-menu">
-          {% set addVcsUrl = ea_url()
-            .setRoute('dashboard_packages_add_vcs') %}
+          {% set addVcsUrl = dashboard_path('dashboard_packages_add_vcs') %}
           <li><a class="dropdown-item" href="{{ addVcsUrl }}">Add VCS repository</a></li>
-          {% set addMirroringUrl = ea_url()
-            .setRoute('dashboard_packages_add_mirroring') %}
+          {% set addMirroringUrl = dashboard_path('dashboard_packages_add_mirroring') %}
           <li><a class="dropdown-item" href="{{ addMirroringUrl }}">Mirror from registry</a></li>
         </ul>
       </div>
@@ -29,10 +27,9 @@
 {% block page_content %}
   <div class="d-grid gap-3">
     {% for package in packages %}
-      {% set packageInfoUrl = ea_url()
-        .setRoute('dashboard_packages_info', {packageName: package.name}) %}
       <div class="card">
         <div class="card-body py-2">
+          {% set packageInfoUrl = dashboard_path('dashboard_packages_info', {packageName: package.name}) %}
           <a href="{{ packageInfoUrl }}"><h5 class="card-title">{{ package.name }}</h5></a>
           {% if package.mirrorRegistry %}
             <p class="card-text mb-1 text-body-secondary">Mirrored from {{ package.mirrorRegistry.name }}</p>

templates/dashboard/packages/package_header.html.twig

@@ -2,21 +2,18 @@
 
 <ul class="nav nav-pills nav-justified d-grid d-md-flex gap-1 pb-3 mb-3 border-bottom">
   <li class="nav-item">
-    {% set packageInfoUrl = ea_url()
-      .setRoute('dashboard_packages_info', {packageName: package.name}) %}
+    {% set packageInfoUrl = dashboard_path('dashboard_packages_info', {packageName: package.name}) %}
     <a {% if currentPage == 'info' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageInfoUrl }}">{{ 'Info'|trans }}</a>
   </li>
   <li class="nav-item">
-    {% set packageVersionsUrl = ea_url()
-      .setRoute('dashboard_packages_versions', {packageName: package.name}) %}
+    {% set packageVersionsUrl = dashboard_path('dashboard_packages_versions', {packageName: package.name}) %}
     <a {% if currentPage == 'versions' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageVersionsUrl }}">{{ 'Versions'|trans }}</a>
   </li>
   <li class="nav-item">
     <span class="nav-link disabled">{{ 'Dependants'|trans }}</span>
   </li>
   <li class="nav-item">
-    {% set packageVersionsUrl = ea_url()
-      .setRoute('dashboard_packages_statistics', {packageName: package.name}) %}
+    {% set packageVersionsUrl = dashboard_path('dashboard_packages_statistics', {packageName: package.name}) %}
     <a {% if currentPage == 'statistics' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageVersionsUrl }}">{{ 'Statistics'|trans }}</a>
   </li>
 </ul>

templates/dashboard/packages/package_versions.html.twig

@@ -7,8 +7,7 @@
 
   <div class="list-group list-group-flush mb-3">
     {% for version in versions %}
-      {% set packageVersionInfoUrl = ea_url()
-        .setRoute('dashboard_packages_info', {packageName: package.name, packageVersion: version.version}) %}
+      {% set packageVersionInfoUrl = dashboard_path('dashboard_packages_info', {packageName: package.name, packageVersion: version.version}) %}
       <a href="{{ packageVersionInfoUrl }}" class="list-group-item">
         <div class="d-flex justify-content-between">
           <span>

templates/dashboard/reset_password/sent.html.twig

@@ -21,8 +21,7 @@
         If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password.
         This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.
       </p>
-      {% set requestUrl = ea_url()
-        .setRoute('dashboard_reset_password_request') %}
+      {% set requestUrl = dashboard_path('dashboard_reset_password_request') %}
       <p>If you don't receive an email please check your spam folder or <a href="{{ requestUrl }}">try again</a>.</p>
     </section>
   </div>