From 0c2468a86015f57b80f72b3c506da8ac717e65a8 Mon Sep 17 00:00:00 2001
From: Pinga <121483313+getpinga@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:55:08 +0200
Subject: [PATCH] Preparations for domain and registrar view; fixes

---
 cp/resources/views/layouts/app.twig            | 2 +-
 cp/resources/views/partials/js-contacts.twig   | 2 +-
 cp/resources/views/partials/js-domains.twig    | 2 +-
 cp/resources/views/partials/js-hosts.twig      | 2 +-
 cp/resources/views/partials/js-registrars.twig | 2 +-
 cp/routes/web.php                              | 6 ++++--
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cp/resources/views/layouts/app.twig b/cp/resources/views/layouts/app.twig
index 25fe7fe..f1528d6 100644
--- a/cp/resources/views/layouts/app.twig
+++ b/cp/resources/views/layouts/app.twig
@@ -83,7 +83,7 @@
                     </span>
                   </a>
                 </li>
-                <li {{ is_current_url('domains') or is_current_url('domaincheck') or is_current_url('domaincreate') or is_current_url('transfers') ? 'class="nav-item dropdown active"' : 'class="nav-item dropdown"' }}>
+                <li {{ is_current_url('domains') or is_current_url('domaincheck') or is_current_url('domaincreate') or is_current_url('transfers') or 'domain' in currentUri ? 'class="nav-item dropdown active"' : 'class="nav-item dropdown"' }}>
                   <a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" data-bs-auto-close="outside" role="button" aria-expanded="false">
                     <span class="nav-link-icon d-md-none d-lg-inline-block"><svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M19.5 7a9 9 0 0 0 -7.5 -4a8.991 8.991 0 0 0 -7.484 4"></path><path d="M11.5 3a16.989 16.989 0 0 0 -1.826 4"></path><path d="M12.5 3a16.989 16.989 0 0 1 1.828 4"></path><path d="M19.5 17a9 9 0 0 1 -7.5 4a8.991 8.991 0 0 1 -7.484 -4"></path><path d="M11.5 21a16.989 16.989 0 0 1 -1.826 -4"></path><path d="M12.5 21a16.989 16.989 0 0 0 1.828 -4"></path><path d="M2 10l1 4l1.5 -4l1.5 4l1 -4"></path>   <path d="M17 10l1 4l1.5 -4l1.5 4l1 -4"></path><path d="M9.5 10l1 4l1.5 -4l1.5 4l1 -4"></path></svg>
                     </span>
diff --git a/cp/resources/views/partials/js-contacts.twig b/cp/resources/views/partials/js-contacts.twig
index 78fa393..663daa8 100644
--- a/cp/resources/views/partials/js-contacts.twig
+++ b/cp/resources/views/partials/js-contacts.twig
@@ -18,7 +18,7 @@
     document.addEventListener("DOMContentLoaded", function(){
     function contactLinkFormatter(cell){
         var value = cell.getValue();
-        return `<a href="/contact/${value}" style="font-weight:bold;">${value}</a>`;
+        return `<a href="/contact/view/${value}" style="font-weight:bold;">${value}</a>`;
     }
    
     function actionsFormatter(cell, formatterParams, onRendered) {
diff --git a/cp/resources/views/partials/js-domains.twig b/cp/resources/views/partials/js-domains.twig
index 017e3e7..65dcde8 100644
--- a/cp/resources/views/partials/js-domains.twig
+++ b/cp/resources/views/partials/js-domains.twig
@@ -21,7 +21,7 @@
     document.addEventListener("DOMContentLoaded", function(){
     function domainLinkFormatter(cell){
         var value = cell.getValue();
-        return `<a href="/domain/${value}" style="font-weight:bold;">${value}</a>`;
+        return `<a href="/domain/view/${value}" style="font-weight:bold;">${value}</a>`;
     }
    
     function actionsFormatter(cell, formatterParams, onRendered) {
diff --git a/cp/resources/views/partials/js-hosts.twig b/cp/resources/views/partials/js-hosts.twig
index d290315..c95b72a 100644
--- a/cp/resources/views/partials/js-hosts.twig
+++ b/cp/resources/views/partials/js-hosts.twig
@@ -18,7 +18,7 @@
     document.addEventListener("DOMContentLoaded", function(){
     function hostLinkFormatter(cell){
         var value = cell.getValue();
-        return `<a href="/host/${value}" style="font-weight:bold;">${value}</a>`;
+        return `<a href="/host/view/${value}" style="font-weight:bold;">${value}</a>`;
     }
    
     function actionsFormatter(cell, formatterParams, onRendered) {
diff --git a/cp/resources/views/partials/js-registrars.twig b/cp/resources/views/partials/js-registrars.twig
index fa1577b..ecd172e 100644
--- a/cp/resources/views/partials/js-registrars.twig
+++ b/cp/resources/views/partials/js-registrars.twig
@@ -15,7 +15,7 @@
     document.addEventListener("DOMContentLoaded", function(){
     function registrarLinkFormatter(cell){
         var value = cell.getValue();
-        return `<a href="/registrar/${value}" style="font-weight:bold;">${value}</a>`;
+        return `<a href="/registrar/view/${value}" style="font-weight:bold;">${value}</a>`;
     }
    
     function actionsFormatter(cell, formatterParams, onRendered) {
diff --git a/cp/routes/web.php b/cp/routes/web.php
index 315292c..200ea15 100644
--- a/cp/routes/web.php
+++ b/cp/routes/web.php
@@ -45,18 +45,20 @@ $app->group('', function ($route) {
     $route->get('/domains', DomainsController::class .':view')->setName('domains');
     $route->map(['GET', 'POST'], '/domain/check', DomainsController::class . ':check')->setName('domaincheck');
     $route->map(['GET', 'POST'], '/domain/create', DomainsController::class . ':create')->setName('domaincreate');
+    $route->get('/domain/view/{domain}', DomainsController::class . ':viewDomain')->setName('viewDomain');
     $route->map(['GET', 'POST'], '/transfers', DomainsController::class . ':transfers')->setName('transfers');
 
     $route->get('/contacts', ContactsController::class .':view')->setName('contacts');
     $route->map(['GET', 'POST'], '/contact/create', ContactsController::class . ':create')->setName('contactcreate');
-    $route->get('/contact/{contact}', ContactsController::class . ':viewContact')->setName('viewContact');
+    $route->get('/contact/view/{contact}', ContactsController::class . ':viewContact')->setName('viewContact');
     
     $route->get('/hosts', HostsController::class .':view')->setName('hosts');
     $route->map(['GET', 'POST'], '/host/create', HostsController::class . ':create')->setName('hostcreate');
-    $route->get('/host/{host}', HostsController::class . ':viewHost')->setName('viewHost');
+    $route->get('/host/view/{host}', HostsController::class . ':viewHost')->setName('viewHost');
 
     $route->get('/registrars', RegistrarsController::class .':view')->setName('registrars');
     $route->map(['GET', 'POST'], '/registrar/create', RegistrarsController::class . ':create')->setName('registrarcreate');
+    $route->get('/registrar/view/{registrar}', RegistrarsController::class . ':viewRegistrar')->setName('viewRegistrar');
     
     $route->get('/users', UsersController::class .':view')->setName('users');