#55 Load tools and services in an <object> tag

Remove H1 tag in main body for services and tools, they all have a title for their own script so no need to add another
joomlatools · May 30, 2022 · fbed5f8 · fbed5f8
1 parent 0b3dd3c
commit fbed5f8
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 47 deletions.
diff --git a/sites/dashboard/pages/tools/dozzle.html.php b/sites/dashboard/pages/tools/dozzle.html.php
@@ -0,0 +1,14 @@
+---
+@layout: 
+    path: /default
+    pageclass: embedded
+
+name: Dozzle
+title: Joomlatools Server Dozzle
+summary: Dozzle for Joomlatools Server
+visible: true
+---
+
+        <section class="max-w-7xl mx-auto py-4 px-5 min-h-screen">
+            <object type="text/html" data="http://dozzle.localhost/" class="min-h-screen w-full"></object>
+        </section>
diff --git a/sites/dashboard/pages/tools/mailhog.html.php b/sites/dashboard/pages/tools/mailhog.html.php
@@ -0,0 +1,14 @@
+---
+@layout: 
+    path: /default
+    pageclass: embedded
+
+name: Mailhog
+title: Joomlatools Server Mailhog
+summary: Mailhog for managing Joomlatools Server
+visible: true
+---
+
+        <section class="max-w-7xl mx-auto py-4 px-5 min-h-screen">
+            <object type="text/html" data="http://mailhog.localhost/" class="min-h-screen w-full"></object>
+        </section>
diff --git a/sites/dashboard/pages/tools/php-apc.html.php b/sites/dashboard/pages/tools/php-apc.html.php
@@ -10,15 +10,5 @@
 ---
 
         <section class="max-w-7xl mx-auto py-4 px-5 min-h-screen">
-            <div class="flex justify-between items-center border-b border-gray-300">
-                <h1 class="text-2xl font-semibold pt-2 pb-6">APC</h1>
-            </div>
-            <?= file_get_contents('http://localhost:8080/__info/php-apc') ?>
-        </section>
-
-<script>
-    document.addEventListener("DOMContentLoaded", function() {
-        // code...
-        document.getElementsByClassName('content').classList.add('apc-content');
-    });
-</script>
+            <object type="text/html" data="http://localhost:8080/__info/php-apc" class="min-h-screen w-full"></object>
+        </section>
diff --git a/sites/dashboard/pages/tools/php-fpm.html.php b/sites/dashboard/pages/tools/php-fpm.html.php
@@ -10,8 +10,5 @@
 ---
 
         <section class="max-w-7xl mx-auto py-4 px-5 min-h-screen">
-            <div class="flex justify-between items-center border-b border-gray-300">
-                <h1 class="text-2xl font-semibold pt-2 pb-6">FPM</h1>
-            </div>
-            <?= file_get_contents('http://localhost:8080/__info/php-fpm') ?>
+            <object type="text/html" data="http://localhost:8080/__info/php-fpm" class="min-h-screen w-full"></object>
         </section>
diff --git a/sites/dashboard/pages/tools/php-info.html.php b/sites/dashboard/pages/tools/php-info.html.php
@@ -11,8 +11,5 @@
 ---
 
         <section class="max-w-7xl mx-auto py-4 px-5 min-h-screen">
-            <div class="flex justify-between items-center border-b border-gray-300">
-                <h1 class="text-2xl font-semibold pt-2 pb-6">PHP Info</h1>
-            </div>
-            <?= file_get_contents('http://localhost:8080/__info/php-info') ?>
+            <object type="text/html" data="http://localhost:8080/__info/php-info" class="min-h-screen w-full"></object>
         </section>
diff --git a/sites/dashboard/pages/tools/php-opcache.html.php b/sites/dashboard/pages/tools/php-opcache.html.php
@@ -10,8 +10,5 @@
 ---
 
         <section class="max-w-7xl mx-auto py-4 px-5 min-h-screen">
-            <div class="flex justify-between items-center border-b border-gray-300">
-                <h1 class="text-2xl font-semibold pt-2 pb-6">Opcache</h1>
-            </div>
-            <?= file_get_contents('http://localhost:8080/__info/php-opcache') ?>
+            <object type="text/html" data="http://localhost:8080/__info/php-opcache" class="min-h-screen w-full"></object>
         </section>
diff --git a/sites/dashboard/pages/tools/php-xdebug.html.php b/sites/dashboard/pages/tools/php-xdebug.html.php
@@ -10,8 +10,5 @@
 ---
 
         <section class="max-w-7xl mx-auto py-4 px-5 min-h-screen">
-            <div class="flex justify-between items-center border-b border-gray-300">
-                <h1 class="text-2xl font-semibold pt-2 pb-6">Xdebug</h1>
-            </div>
-            <?= file_get_contents('http://localhost:8080/__info/php-xdebug') ?>
+            <object type="text/html" data="http://localhost:8080/__info/php-xdebug" class="min-h-screen w-full"></object>
         </section>
diff --git a/sites/dashboard/pages/tools/phpmyadmin.html.php b/sites/dashboard/pages/tools/phpmyadmin.html.php
@@ -16,5 +16,5 @@
                     Add a database
                 </button>
             </div>
-            <?= file_get_contents('http://localhost:8080/__phpmyadmin') ?>
+            <?= file_get_contents('http://phpmyadmin.localhost/') ?>
         </section>
diff --git a/sites/dashboard/pages/tools/traefik.html.php b/sites/dashboard/pages/tools/traefik.html.php
@@ -0,0 +1,14 @@
+---
+@layout: 
+    path: /default
+    pageclass: embedded
+
+name: Traefik
+title: Joomlatools Server Traefik
+summary: Traefik for Joomlatools Server
+visible: true
+---
+
+        <section class="max-w-7xl mx-auto py-4 px-5 min-h-screen">
+            <object type="text/html" data="http://traefik.localhost/" class="min-h-screen w-full"></object>
+        </section>
diff --git a/sites/dashboard/templates/partials/navigation/main.html.php b/sites/dashboard/templates/partials/navigation/main.html.php
@@ -30,7 +30,7 @@
             <!-- NAV LINKS -->
             <div class="py-4 text-gray-400 space-y-1">
                 <!-- BASIC LINK -->
-                <a href="http://localhost:8080/dashboard/" class="block py-2.5 px-4 flex items-center space-x-2 bg-gray-800 text-white hover:bg-gray-800 hover:text-white rounded">
+                <a href="http://localhost/" class="block py-2.5 px-4 flex items-center space-x-2 bg-gray-800 text-white hover:bg-gray-800 hover:text-white rounded">
                     <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"></path></svg>
                     <span>Dashboard</span>
                 </a>
@@ -45,24 +45,18 @@
                         <svg x-show="!open" class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></svg>    
                     </div>
                     <div x-show="open" class="text-sm border-l-2 border-gray-800 mx-6 my-2.5 px-2.5 flex flex-col gap-y-1">
-                        <a href="http://localhost:8080/dashboard/tools/phpmyadmin" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
-                            phpMyAdmin
+                        <a href="https://localhost/tools/phpmyadmin" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
+                            PHPMyAdmin
                         </a>
-                        <a href="#" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
-                            MailCatcher
-                        </a>
-                        <a href="http://localhost:8080/dashboard/tools/php-fpm" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
-                            PHP-FPM dashboard
-                        </a>
-                        <a href="http://localhost:8080/dashboard/tools/php-apc" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
+                        <a href="http://localhost/tools/php-apc" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
                             APC dashboard
                         </a>
-                        <a href="http://localhost:8080/dashboard/tools/php-opcache" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
-                            Opcache
-                        </a>
-                        <a href="http://localhost:8080/dashboard/tools/php-xdebug" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
+                        <a href="http://localhost/tools/php-xdebug" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
                             Xdebug
                         </a>
+                        <a href="http://localhost/tools/mailhog" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
+                            Mailhog
+                        </a>
                     </div>
                 </div>
                 <!-- DROPDOWN LINK -->
@@ -76,11 +70,20 @@
                         <svg x-show="!open" class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></svg>    
                     </div>
                     <div x-show="open" class="text-sm border-l-2 border-gray-800 mx-6 my-2.5 px-2.5 flex flex-col gap-y-1">
-                        <a href="http://localhost:8080/dashboard/tools/php-info" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
-                            phpinfo
+                        <a href="http://localhost/tools/php-info" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
+                            PHPinfo
                         </a>
-                        <a href="#" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
-                            Log Files
+                        <a href="http://localhost/tools/php-fpm" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
+                            PHP-FPM dashboard
+                        </a>
+                        <a href="http://localhost/tools/traefik" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
+                            Traefik
+                        </a>
+                        <a href="http://localhost/tools/dozzle" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
+                            Dozzle
+                        </a>
+                        <a href="http://localhost/tools/php-opcache" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
+                            Opcache
                         </a>
                         <a href="#" class="block py-2 px-4 hover:bg-gray-800 hover:text-white rounded">
                             File Browser