From 6dc3d7957cc50cd13005aa625d6722c389fd0b79 Mon Sep 17 00:00:00 2001
From: usmannasir <usman@cyberpersons.com>
Date: Fri, 11 Apr 2025 13:46:22 +0500
Subject: [PATCH] show both containers by default

---
 .../websiteFunctions/DockerSiteHome.html      | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/websiteFunctions/templates/websiteFunctions/DockerSiteHome.html b/websiteFunctions/templates/websiteFunctions/DockerSiteHome.html
index 6adb7830a..647cb9231 100644
--- a/websiteFunctions/templates/websiteFunctions/DockerSiteHome.html
+++ b/websiteFunctions/templates/websiteFunctions/DockerSiteHome.html
@@ -342,11 +342,11 @@
                                                     <label class="mb-2">Memory Usage</label>
                                                     <div class="progress" style="height: 20px;">
                                                         <div class="progress-bar" role="progressbar" 
-                                                            ng-style="{'width': web.memoryUsagePercent + '%'}" 
-                                                            aria-valuenow="{$ web.memoryUsagePercent $}" 
+                                                            ng-style="{'width': (web.data.memory_usage / 1048576) + '%'}" 
+                                                            aria-valuenow="{$ web.data.memory_usage / 1048576 $}" 
                                                             aria-valuemin="0" 
                                                             aria-valuemax="100">
-                                                            {$ web.memoryUsagePercent | number:1 $}%
+                                                            {$ (web.data.memory_usage / 1048576) | number:1 $} MB
                                                         </div>
                                                     </div>
                                                 </div>
@@ -354,11 +354,11 @@
                                                     <label class="mb-2">CPU Usage</label>
                                                     <div class="progress" style="height: 20px;">
                                                         <div class="progress-bar" role="progressbar" 
-                                                            ng-style="{'width': web.cpuUsagePercent + '%'}" 
-                                                            aria-valuenow="{$ web.cpuUsagePercent $}" 
+                                                            ng-style="{'width': (web.data.cpu_usage / 1000000000) + '%'}" 
+                                                            aria-valuenow="{$ web.data.cpu_usage / 1000000000 $}" 
                                                             aria-valuemin="0" 
                                                             aria-valuemax="100">
-                                                            {$ web.cpuUsagePercent | number:1 $}%
+                                                            {$ (web.data.cpu_usage / 1000000000) | number:1 $}%
                                                         </div>
                                                     </div>
                                                 </div>
@@ -368,7 +368,7 @@
                                         <div class="col-md-6">
                                             <div class="info-box shadow-sm">
                                                 <h4 class="border-bottom pb-2 mb-3">Network & Ports</h4>
-                                                <div ng-if="web.ports">
+                                                <div ng-if="web.data.ports">
                                                     <div class="table-responsive">
                                                         <table class="table table-striped table-hover mb-0">
                                                             <thead>
@@ -378,7 +378,7 @@
                                                                 </tr>
                                                             </thead>
                                                             <tbody>
-                                                                <tr ng-repeat="(containerPort, hostBindings) in web.ports">
+                                                                <tr ng-repeat="(containerPort, hostBindings) in web.data.ports">
                                                                     <td><code>{$ containerPort $}</code></td>
                                                                     <td>
                                                                         <span ng-repeat="binding in hostBindings" class="badge bg-light text-dark me-2">
@@ -390,14 +390,14 @@
                                                         </table>
                                                     </div>
                                                 </div>
-                                                <div ng-if="!web.ports" class="text-muted">
+                                                <div ng-if="!web.data.ports" class="text-muted">
                                                     <p class="mb-0">No ports exposed</p>
                                                 </div>
                                             </div>
 
                                             <div class="info-box shadow-sm mt-4">
                                                 <h4 class="border-bottom pb-2 mb-3">Volumes</h4>
-                                                <div ng-if="web.volumes && web.volumes.length > 0">
+                                                <div ng-if="web.data.volumes && web.data.volumes.length > 0">
                                                     <div class="table-responsive">
                                                         <table class="table table-striped table-hover mb-0">
                                                             <thead>
@@ -408,7 +408,7 @@
                                                                 </tr>
                                                             </thead>
                                                             <tbody>
-                                                                <tr ng-repeat="volume in web.volumes">
+                                                                <tr ng-repeat="volume in web.data.volumes">
                                                                     <td><code>{$ volume.Source $}</code></td>
                                                                     <td><code>{$ volume.Destination $}</code></td>
                                                                     <td><span class="badge bg-secondary">{$ volume.Mode $}</span></td>
@@ -417,14 +417,14 @@
                                                         </table>
                                                     </div>
                                                 </div>
-                                                <div ng-if="!web.volumes || web.volumes.length === 0" class="text-muted">
+                                                <div ng-if="!web.data.volumes || web.data.volumes.length === 0" class="text-muted">
                                                     <p class="mb-0">No volumes mounted</p>
                                                 </div>
                                             </div>
 
                                             <div class="info-box shadow-sm mt-4">
                                                 <h4 class="border-bottom pb-2 mb-3">Environment Variables</h4>
-                                                <div ng-if="web.environment && web.environment.length > 0">
+                                                <div ng-if="web.data.environment && web.data.environment.length > 0">
                                                     <div class="table-responsive">
                                                         <table class="table table-striped table-hover mb-0">
                                                             <thead>
@@ -434,15 +434,18 @@
                                                                 </tr>
                                                             </thead>
                                                             <tbody>
-                                                                <tr ng-repeat="env in web.environment">
+                                                                <tr ng-repeat="env in web.data.environment">
                                                                     <td><code>{$ env.split('=')[0] $}</code></td>
-                                                                    <td><code>{$ env.split('=')[1] $}</code></td>
+                                                                    <td>
+                                                                        <code ng-if="env.split('=')[1] === '********'">{$ env.split('=')[1] $}</code>
+                                                                        <code ng-if="env.split('=')[1] !== '********'">{$ env.split('=')[1] $}</code>
+                                                                    </td>
                                                                 </tr>
                                                             </tbody>
                                                         </table>
                                                     </div>
                                                 </div>
-                                                <div ng-if="!web.environment || web.environment.length === 0" class="text-muted">
+                                                <div ng-if="!web.data.environment || web.data.environment.length === 0" class="text-muted">
                                                     <p class="mb-0">No environment variables set</p>
                                                 </div>
                                             </div>