Fixup! Cosmetic on UI

computablefacts · Oct 14, 2024 · 1151c9f · 1151c9f
1 parent 19b1739
commit 1151c9f
Show file tree

Hide file tree

Showing 30 changed files with 277 additions and 458 deletions.
diff --git a/app/Models/YnhServer.php b/app/Models/YnhServer.php
@@ -180,7 +180,7 @@ public function ip(): ?string
 
     public function ipv6(): ?string
     {
-        return $this->ip_address_v6;
+        return $this->ip_address_v6 === '<unavailable>' ? null : $this->ip_address_v6;
     }
 
     public function domain(): ?YnhDomain

diff --git a/app/Modules/CyberBuddy/Http/Controllers/CyberBuddyController.php b/app/Modules/CyberBuddy/Http/Controllers/CyberBuddyController.php
@@ -255,7 +255,7 @@ public function handle(): void
                         $name = $server->name;
                         $os = isset($os_infos[$server->id]) && $os_infos[$server->id]->count() >= 1 ? $os_infos[$server->id][0]->os : '-';
                         $ipv4 = $server->ip();
-                        $ipv6 = $server->isFrozen() || $server->ipv6() === '<unavailable>' ? '-' : $server->ipv6();
+                        $ipv6 = !$server->ipv6() ? '-' : $server->ipv6();
                         $domains = $server->isFrozen() || $server->addedWithCurl() ? '-' : $server->domains->count();
                         $applications = $server->isFrozen() || $server->addedWithCurl() ? '-' : $server->applications->count();
                         $users = $server->isFrozen() || $server->addedWithCurl() ? '-' : $server->users->count();

diff --git a/app/Notifications/HealthCheckIssue.php b/app/Notifications/HealthCheckIssue.php
@@ -61,7 +61,7 @@ public function toArray(object $notifiable): array
                 'server_name' => $this->server->name,
                 'principal_domain' => $this->server->domain()?->name,
                 'ip_v4' => $this->server->ip(),
-                'ip_v6' => !$this->server->ipv6() || $this->server->ipv6() === '<unavailable>' ? null : $this->server->ipv6(),
+                'ip_v6' => !$this->server->ipv6() ? null : $this->server->ipv6(),
                 'last_heartbeat' => $this->server->lastHeartbeat() ? $this->server->lastHeartbeat()->format('Y-m-d H:i:s') . ' UTC' : null,
             ],
             'action' => [

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/appshell.css b/public/css/appshell.css
diff --git a/public/css/custom.css b/public/css/custom.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/app.js.LICENSE.txt b/public/js/app.js.LICENSE.txt
@@ -1,9 +1,3 @@
-/*!
-  * Bootstrap v5.3.3 (https://getbootstrap.com/)
-  * Copyright 2011-2024 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
-  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
-  */
-
 /*!
  * The buffer module from node.js, for the browser.
  *

diff --git a/public/js/appshell.js b/public/js/appshell.js
diff --git a/public/js/appshell.js.LICENSE.txt b/public/js/appshell.js.LICENSE.txt
diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
@@ -6,12 +6,12 @@ window._ = require('lodash');
  * for JavaScript based Bootstrap features such as modals and tabs. This
  * code may be modified to fit the specific needs of your application.
  */
-
+/*
 try {
     window.$ = window.jQuery = require('jquery');
     require('bootstrap');
 } catch (e) {}
-
+*/
 /**
  * We'll load the axios HTTP library which allows us to easily issue requests
  * to our Laravel back-end. This library automatically handles sending the

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
@@ -164,5 +164,7 @@
   "Service Provider Delegation": "Délégation",
   "Agents Deployed": "Agents déployés",
   "AdversaryMeter protects your external perimeter": "AdversaryMeter protège votre périmètre externe",
-  "Sentinel protects your internal perimeter": "Sentinel protège votre périmètre interne"
+  "Sentinel protects your internal perimeter": "Sentinel protège votre périmètre interne",
+  "Applications Ready To Be Deployed": "Applications prêtes à être déployées",
+  "Applications Installed": "Applications installées"
 }
diff --git a/resources/views/cart/show.blade.php b/resources/views/cart/show.blade.php
@@ -22,7 +22,7 @@
         @else
         <div class="row">
             <div class="col-md-8">
-                <div class="card bg-light card-accent-secondary tw-card">
+                <div class="card bg-light">
                     <div class="card-header">{{ __('Cart Items') }}</div>
 
                     <div class="card-body">
@@ -95,7 +95,7 @@
             </div>
 
             <div class="col-md-4">
-                <div class="card bg-white card-accent-secondary tw-card">
+                <div class="card bg-white">
                     <div class="card-header">{{ __('Summary') }}</div>
                     <div class="card-body">
                         @include('cart._summary')

diff --git a/resources/views/checkout/show.blade.php b/resources/views/checkout/show.blade.php
@@ -19,7 +19,7 @@
     <div class="container">
         <div class="row">
             <div class="col-md-8">
-                <div class="card card-accent-secondary tw-card">
+                <div class="card">
                     <div class="card-header">Checkout</div>
 
                     <div class="card-body">
@@ -72,7 +72,7 @@
                 </div>
             </div>
             <div class="col-md-4">
-                <div class="card card-accent-secondary bg-white tw-card">
+                <div class="card bg-white">
                     <div class="card-header">Summary</div>
                     <div class="card-body">
                         @include('cart._summary')

diff --git a/resources/views/components/applications-ready-to-be-deployed.blade.php b/resources/views/components/applications-ready-to-be-deployed.blade.php
@@ -9,15 +9,13 @@
     </div>
   </div>
   @else
-  <div class="card-body">
-    <table class="table table-hover" style="margin-bottom:0">
+  <div class="card-body p-0">
+    <table class="table table-hover no-bottom-margin">
       <thead>
       <tr>
         <th class="ps-4" width="25px"></th>
         <th width="70px"></th>
-        <th>
-          <i class="zmdi zmdi-long-arrow-down"></i>&nbsp;{{ __('Date') }}
-        </th>
+        <th>{{ __('Date') }}</th>
         <th>{{ __('Name') }}</th>
         <th>{{ __('Categories') }}</th>
         <th>{{ __('Order') }}</th>
@@ -49,7 +47,7 @@ class="mw-100" style="height: 2.5em;"/>
         </td>
         <td>
           @foreach($order->taxons() as $taxon)
-          <span class="tw-pill rounded-pill bg-dark">
+          <span class="lozenge new">
             {{ $taxon->name }}
           </span>
           @endforeach
@@ -60,10 +58,10 @@ class="mw-100" style="height: 2.5em;"/>
           </div>
         </td>
         <td>
-          <span class="tw-pill rounded-pill bg-{{
+          <span class="lozenge {{
             $order->orderIsCompleted() ? 'success' :
-              ($order->orderIsCancelled() ? 'warning' :
-                ($order->orderIsProcessing() ? 'info' : 'secondary')) }}">
+              ($order->orderIsCancelled() ? 'error' :
+                ($order->orderIsProcessing() ? 'information' : 'information')) }}">
             {{ $order->orderStatus() }}
           </span>
         </td>

diff --git a/resources/views/components/applications.blade.php b/resources/views/components/applications.blade.php
@@ -10,13 +10,11 @@
   </div>
   @else
   <div class="card-body p-0">
-    <table class="table table-hover" style="margin-bottom:0">
+    <table class="table table-hover no-bottom-margin">
       <thead>
       <tr>
         <th>{{ __('Server') }}</th>
-        <th>
-          { __('Name') }}
-        </th>
+        <th>{{ __('Name') }}</th>
         <th>{{ __('Description') }}</th>
         <th>{{ __('Sku') }}</th>
         <th>{{ __('Version') }}</th>
@@ -36,7 +34,7 @@
         <td>
           <span class="font-lg mb-3 fw-bold">
             <a href="https://{{ $app->path }}" target="_blank">
-              {{ $app->name }}&nbsp;&nbsp;<i class="zmdi zmdi-open-in-new"></i>
+              {{ $app->name }}
             </a>
           </span>
         </td>

diff --git a/resources/views/components/backups.blade.php b/resources/views/components/backups.blade.php
@@ -21,7 +21,7 @@
   </div>
   @else
   <div class="card-body p-0">
-    <table class="table table-hover" style="margin-bottom:0">
+    <table class="table table-hover no-bottom-margin">
       <thead>
       <tr>
         <th>{{ __('Date') }}</th>
@@ -47,22 +47,24 @@
           <a href="/ynh/servers/{{ $backup->server->id }}/backup/{{ $backup->id }}"
              class="cursor-pointer"
              title="download">
-            <i class="zmdi zmdi-download"></i>
+            {{ __('open') }}
           </a>
           @endif
         </td>
       </tr>
+      @if(count($backup->result['apps']) > 0)
       <tr>
         <td colspan="4">
           @foreach($backup->result['apps'] as $app => $status)
           @if($status === 'Success')
-          <span class="tw-pill rounded-pill bg-success">{{ $app }}</span>
+          <span class="lozenge success">{{ $app }}</span>
           @else
-          <span class="tw-pill rounded-pill bg-danger">{{ $app }}</span>
+          <span class="lozenge error">{{ $app }}</span>
           @endif
           @endforeach
         </td>
       </tr>
+      @endif
       @endforeach
       </tbody>
     </table>

diff --git a/resources/views/components/domains.blade.php b/resources/views/components/domains.blade.php
@@ -10,7 +10,7 @@
   </div>
   @else
   <div class="card-body p-0">
-    <table class="table table-hover" style="margin-bottom:0">
+    <table class="table table-hover no-bottom-margin">
       <thead>
       <tr>
         <th>{{ __('Server') }}</th>