From a06fdcb317a3edef04c92c75686d17d8cea14dd8 Mon Sep 17 00:00:00 2001
From: "Joseph.Rawlings" <root0091@gmail.com>
Date: Wed, 3 Dec 2025 04:48:34 -0500
Subject: [PATCH] refactor: enhance Proxmox Firewall view with improved modal
 structure and loading indicators for IP geolocation, optimizing user
 experience and data presentation

---
 .../Servers/Proxmox/views/firewall.blade.php  | 190 ++++++++++--------
 1 file changed, 106 insertions(+), 84 deletions(-)

diff --git a/extensions/Servers/Proxmox/views/firewall.blade.php b/extensions/Servers/Proxmox/views/firewall.blade.php
index 0f688e845..b480e3444 100644
--- a/extensions/Servers/Proxmox/views/firewall.blade.php
+++ b/extensions/Servers/Proxmox/views/firewall.blade.php
@@ -622,10 +622,10 @@
                                                             } else {
                                                                 open = true;
                                                             }
-                                                        " class="text-base/50 hover:text-primary transition-colors" title="View IP Location">
+                                                        " class="text-base/50 hover:text-base/70 transition-colors" title="View IP Location">
                                                             <x-ri-map-pin-line class="size-3" />
                                                         </button>
-                                                        <!-- Modal Backdrop -->
+                                                        <!-- Modal -->
                                                         <div x-show="open" 
                                                              x-transition:enter="transition ease-out duration-200"
                                                              x-transition:enter-start="opacity-0"
@@ -635,53 +635,64 @@
                                                              x-transition:leave-end="opacity-0"
                                                              @click="open = false"
                                                              @keydown.escape.window="open = false"
-                                                             class="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm"
+                                                             class="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm flex items-center justify-center p-4"
                                                              style="display: none;">
-                                                        </div>
-                                                        <!-- Modal -->
-                                                        <div x-show="open"
-                                                             x-transition:enter="transition ease-out duration-200"
-                                                             x-transition:enter-start="opacity-0 scale-95"
-                                                             x-transition:enter-end="opacity-100 scale-100"
-                                                             x-transition:leave="transition ease-in duration-150"
-                                                             x-transition:leave-start="opacity-100 scale-100"
-                                                             x-transition:leave-end="opacity-0 scale-95"
-                                                             @click.away="open = false"
-                                                             @keydown.escape.window="open = false"
-                                                             class="fixed inset-0 z-50 flex items-center justify-center p-4"
-                                                             style="display: none;">
-                                                            <div class="relative w-full max-w-md bg-background-secondary rounded-xl border border-neutral/20 shadow-2xl p-6">
-                                                                <button @click="open = false" class="absolute top-4 right-4 text-base/50 hover:text-base transition-colors">
+                                                            <div @click.stop class="relative w-full max-w-4xl bg-background-secondary rounded-xl border border-neutral/20 shadow-2xl max-h-[90vh] overflow-y-auto overflow-x-hidden">
+                                                                <button @click="open = false" class="absolute top-4 right-4 text-base/50 hover:text-base transition-colors z-10">
                                                                     <x-ri-close-line class="size-5" />
                                                                 </button>
-                                                                <div class="pr-8">
+                                                                <div class="p-6 break-words">
                                                                     <div class="flex items-center gap-2 mb-4">
-                                                                        <x-ri-map-pin-line class="size-6 text-primary" />
-                                                                        <h3 class="text-lg font-semibold">IP Location</h3>
+                                                                        <x-ri-map-pin-line class="size-5 text-primary flex-shrink-0" />
+                                                                        <h3 class="text-lg font-semibold break-words">IP Address: <span class="font-mono break-all" x-text="log.source"></span></h3>
                                                                     </div>
-                                                                    <template x-if="loading">
-                                                                        <div class="flex items-center justify-center py-8">
-                                                                            <div class="animate-spin rounded-full h-8 w-8 border-b-2 border-primary"></div>
-                                                                        </div>
-                                                                    </template>
-                                                                    <template x-if="!loading && ipData">
-                                                                        <div>
-                                                                            <template x-if="ipData.status === 'success'">
-                                                                                <div class="space-y-3 text-sm">
-                                                                                    <div><span class="font-semibold">IP:</span> <span class="font-mono" x-text="log.source"></span></div>
-                                                                                    <div><span class="font-semibold">Country:</span> <span x-text="ipData.country"></span></div>
-                                                                                    <div><span class="font-semibold">Region:</span> <span x-text="ipData.regionName"></span></div>
-                                                                                    <div><span class="font-semibold">City:</span> <span x-text="ipData.city"></span></div>
-                                                                                    <div><span class="font-semibold">ISP:</span> <span x-text="ipData.isp"></span></div>
-                                                                                    <div><span class="font-semibold">Organization:</span> <span x-text="ipData.org"></span></div>
-                                                                                    <div><span class="font-semibold">Timezone:</span> <span x-text="ipData.timezone"></span></div>
+                                                                    <div x-show="loading" class="text-center py-8">
+                                                                        <svg fill="currentColor" stroke="currentColor" viewBox="0 0 128 128" class="size-6 mx-auto mb-2">
+                                                                            <g>
+                                                                                <path stroke-width="5" d="M31.6 8.98a4.02 4.02 0 0 0 1.7 5.3l6.12 3.22a52.56 52.56 0 1 0 63.13 10.73L96 33.97a43.88 43.88 0 1 1-53-8.5l-3.65 7.4a4.02 4.02 0 0 0 1.72 5.3 3.73 3.73 0 0 0 5.13-1.67l7.66-15.63a4.18 4.18 0 0 0-1.75-5.4L36.74 7.32a3.73 3.73 0 0 0-5.13 1.66z" fill="currentColor" stroke="currentColor"/>
+                                                                                <animateTransform attributeName="transform" type="rotate" from="0 64 64" to="360 64 64" dur="1000ms" repeatCount="indefinite"></animateTransform>
+                                                                            </g>
+                                                                        </svg>
+                                                                        <p class="text-sm text-base/60">Loading location data...</p>
+                                                                    </div>
+                                                                    <div x-show="ipData && !loading">
+                                                                        <template x-if="ipData && (ipData.status === 'success')">
+                                                                            <div>
+                                                                                <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
+                                                                                    <div class="space-y-2 break-words">
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">Country:</span> <span class="font-semibold text-sm break-words" x-text="ipData.country"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">Region:</span> <span class="font-semibold text-sm break-words" x-text="ipData.regionName + ' (' + ipData.region + ')'"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">City:</span> <span class="font-semibold text-sm break-words" x-text="ipData.city"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">ZIP Code:</span> <span class="font-semibold text-sm break-words" x-text="ipData.zip"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">Timezone:</span> <span class="font-semibold text-sm break-words" x-text="ipData.timezone"></span></div>
+                                                                                    </div>
+                                                                                    <div class="space-y-2 break-words">
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">ISP:</span> <span class="font-semibold text-sm break-words" x-text="ipData.isp"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">Organization:</span> <span class="font-semibold text-sm break-words" x-text="ipData.org"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">AS:</span> <span class="font-semibold text-sm break-all" x-text="ipData.as"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">Coordinates:</span> <span class="font-semibold text-sm font-mono break-all" x-text="ipData.lat + ', ' + ipData.lon"></span></div>
+                                                                                    </div>
                                                                                 </div>
-                                                                            </template>
-                                                                            <template x-if="ipData.status !== 'success'">
+                                                                                <div x-show="ipData.lat && ipData.lon" class="mt-4 w-full" style="max-width: 100%; box-sizing: border-box;">
+                                                                                    <p class="text-xs text-base/60 mb-2">Location Map:</p>
+                                                                                    <div class="w-full rounded-lg border border-neutral/20 overflow-hidden bg-background/50" style="position: relative; width: 100%; max-width: 100%; height: 256px; min-height: 256px; box-sizing: border-box;">
+                                                                                        <iframe 
+                                                                                            x-bind:src="'https://www.openstreetmap.org/export/embed.html?bbox=' + encodeURIComponent((parseFloat(ipData.lon) - 0.01) + ',' + (parseFloat(ipData.lat) - 0.01) + ',' + (parseFloat(ipData.lon) + 0.01) + ',' + (parseFloat(ipData.lat) + 0.01)) + '&layer=mapnik&marker=' + encodeURIComponent(ipData.lat + ',' + ipData.lon)"
+                                                                                            style="width: 100%; height: 100%; border: 0; display: block; margin: 0; padding: 0;"
+                                                                                            frameborder="0"
+                                                                                            loading="lazy"
+                                                                                            allowfullscreen
+                                                                                            title="Location Map"></iframe>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </template>
+                                                                        <template x-if="ipData && (ipData.status === 'fail' || ipData.status === 'error')">
+                                                                            <div class="text-center py-4">
                                                                                 <p class="text-sm text-warning" x-text="ipData.message || 'Failed to load location data'"></p>
-                                                                            </template>
-                                                                        </div>
-                                                                    </template>
+                                                                            </div>
+                                                                        </template>
+                                                                    </div>
                                                                 </div>
                                                             </div>
                                                         </div>
@@ -762,10 +773,10 @@
                                                             } else {
                                                                 open = true;
                                                             }
-                                                        " class="text-base/50 hover:text-primary transition-colors" title="View IP Location">
+                                                        " class="text-base/50 hover:text-base/70 transition-colors" title="View IP Location">
                                                             <x-ri-map-pin-line class="size-3" />
                                                         </button>
-                                                        <!-- Modal Backdrop -->
+                                                        <!-- Modal -->
                                                         <div x-show="open" 
                                                              x-transition:enter="transition ease-out duration-200"
                                                              x-transition:enter-start="opacity-0"
@@ -775,53 +786,64 @@
                                                              x-transition:leave-end="opacity-0"
                                                              @click="open = false"
                                                              @keydown.escape.window="open = false"
-                                                             class="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm"
+                                                             class="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm flex items-center justify-center p-4"
                                                              style="display: none;">
-                                                        </div>
-                                                        <!-- Modal -->
-                                                        <div x-show="open"
-                                                             x-transition:enter="transition ease-out duration-200"
-                                                             x-transition:enter-start="opacity-0 scale-95"
-                                                             x-transition:enter-end="opacity-100 scale-100"
-                                                             x-transition:leave="transition ease-in duration-150"
-                                                             x-transition:leave-start="opacity-100 scale-100"
-                                                             x-transition:leave-end="opacity-0 scale-95"
-                                                             @click.away="open = false"
-                                                             @keydown.escape.window="open = false"
-                                                             class="fixed inset-0 z-50 flex items-center justify-center p-4"
-                                                             style="display: none;">
-                                                            <div class="relative w-full max-w-md bg-background-secondary rounded-xl border border-neutral/20 shadow-2xl p-6">
-                                                                <button @click="open = false" class="absolute top-4 right-4 text-base/50 hover:text-base transition-colors">
+                                                            <div @click.stop class="relative w-full max-w-4xl bg-background-secondary rounded-xl border border-neutral/20 shadow-2xl max-h-[90vh] overflow-y-auto overflow-x-hidden">
+                                                                <button @click="open = false" class="absolute top-4 right-4 text-base/50 hover:text-base transition-colors z-10">
                                                                     <x-ri-close-line class="size-5" />
                                                                 </button>
-                                                                <div class="pr-8">
+                                                                <div class="p-6 break-words">
                                                                     <div class="flex items-center gap-2 mb-4">
-                                                                        <x-ri-map-pin-line class="size-6 text-primary" />
-                                                                        <h3 class="text-lg font-semibold">IP Location</h3>
+                                                                        <x-ri-map-pin-line class="size-5 text-primary flex-shrink-0" />
+                                                                        <h3 class="text-lg font-semibold break-words">IP Address: <span class="font-mono break-all" x-text="log.destination"></span></h3>
                                                                     </div>
-                                                                    <template x-if="loading">
-                                                                        <div class="flex items-center justify-center py-8">
-                                                                            <div class="animate-spin rounded-full h-8 w-8 border-b-2 border-primary"></div>
-                                                                        </div>
-                                                                    </template>
-                                                                    <template x-if="!loading && ipData">
-                                                                        <div>
-                                                                            <template x-if="ipData.status === 'success'">
-                                                                                <div class="space-y-3 text-sm">
-                                                                                    <div><span class="font-semibold">IP:</span> <span class="font-mono" x-text="log.destination"></span></div>
-                                                                                    <div><span class="font-semibold">Country:</span> <span x-text="ipData.country"></span></div>
-                                                                                    <div><span class="font-semibold">Region:</span> <span x-text="ipData.regionName"></span></div>
-                                                                                    <div><span class="font-semibold">City:</span> <span x-text="ipData.city"></span></div>
-                                                                                    <div><span class="font-semibold">ISP:</span> <span x-text="ipData.isp"></span></div>
-                                                                                    <div><span class="font-semibold">Organization:</span> <span x-text="ipData.org"></span></div>
-                                                                                    <div><span class="font-semibold">Timezone:</span> <span x-text="ipData.timezone"></span></div>
+                                                                    <div x-show="loading" class="text-center py-8">
+                                                                        <svg fill="currentColor" stroke="currentColor" viewBox="0 0 128 128" class="size-6 mx-auto mb-2">
+                                                                            <g>
+                                                                                <path stroke-width="5" d="M31.6 8.98a4.02 4.02 0 0 0 1.7 5.3l6.12 3.22a52.56 52.56 0 1 0 63.13 10.73L96 33.97a43.88 43.88 0 1 1-53-8.5l-3.65 7.4a4.02 4.02 0 0 0 1.72 5.3 3.73 3.73 0 0 0 5.13-1.67l7.66-15.63a4.18 4.18 0 0 0-1.75-5.4L36.74 7.32a3.73 3.73 0 0 0-5.13 1.66z" fill="currentColor" stroke="currentColor"/>
+                                                                                <animateTransform attributeName="transform" type="rotate" from="0 64 64" to="360 64 64" dur="1000ms" repeatCount="indefinite"></animateTransform>
+                                                                            </g>
+                                                                        </svg>
+                                                                        <p class="text-sm text-base/60">Loading location data...</p>
+                                                                    </div>
+                                                                    <div x-show="ipData && !loading">
+                                                                        <template x-if="ipData && (ipData.status === 'success')">
+                                                                            <div>
+                                                                                <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
+                                                                                    <div class="space-y-2 break-words">
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">Country:</span> <span class="font-semibold text-sm break-words" x-text="ipData.country"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">Region:</span> <span class="font-semibold text-sm break-words" x-text="ipData.regionName + ' (' + ipData.region + ')'"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">City:</span> <span class="font-semibold text-sm break-words" x-text="ipData.city"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">ZIP Code:</span> <span class="font-semibold text-sm break-words" x-text="ipData.zip"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">Timezone:</span> <span class="font-semibold text-sm break-words" x-text="ipData.timezone"></span></div>
+                                                                                    </div>
+                                                                                    <div class="space-y-2 break-words">
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">ISP:</span> <span class="font-semibold text-sm break-words" x-text="ipData.isp"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">Organization:</span> <span class="font-semibold text-sm break-words" x-text="ipData.org"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">AS:</span> <span class="font-semibold text-sm break-all" x-text="ipData.as"></span></div>
+                                                                                        <div class="break-words"><span class="text-xs text-base/60">Coordinates:</span> <span class="font-semibold text-sm font-mono break-all" x-text="ipData.lat + ', ' + ipData.lon"></span></div>
+                                                                                    </div>
                                                                                 </div>
-                                                                            </template>
-                                                                            <template x-if="ipData.status !== 'success'">
+                                                                                <div x-show="ipData.lat && ipData.lon" class="mt-4 w-full" style="max-width: 100%; box-sizing: border-box;">
+                                                                                    <p class="text-xs text-base/60 mb-2">Location Map:</p>
+                                                                                    <div class="w-full rounded-lg border border-neutral/20 overflow-hidden bg-background/50" style="position: relative; width: 100%; max-width: 100%; height: 256px; min-height: 256px; box-sizing: border-box;">
+                                                                                        <iframe 
+                                                                                            x-bind:src="'https://www.openstreetmap.org/export/embed.html?bbox=' + encodeURIComponent((parseFloat(ipData.lon) - 0.01) + ',' + (parseFloat(ipData.lat) - 0.01) + ',' + (parseFloat(ipData.lon) + 0.01) + ',' + (parseFloat(ipData.lat) + 0.01)) + '&layer=mapnik&marker=' + encodeURIComponent(ipData.lat + ',' + ipData.lon)"
+                                                                                            style="width: 100%; height: 100%; border: 0; display: block; margin: 0; padding: 0;"
+                                                                                            frameborder="0"
+                                                                                            loading="lazy"
+                                                                                            allowfullscreen
+                                                                                            title="Location Map"></iframe>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </template>
+                                                                        <template x-if="ipData && (ipData.status === 'fail' || ipData.status === 'error')">
+                                                                            <div class="text-center py-4">
                                                                                 <p class="text-sm text-warning" x-text="ipData.message || 'Failed to load location data'"></p>
-                                                                            </template>
-                                                                        </div>
-                                                                    </template>
+                                                                            </div>
+                                                                        </template>
+                                                                    </div>
                                                                 </div>
                                                             </div>
                                                         </div>