Cosmetic on UI : sort order, icons instead of png, etc.

computablefacts · Jun 2, 2024 · ea5eb99 · ea5eb99
1 parent 051dfcc
commit ea5eb99
Show file tree

Hide file tree

Showing 16 changed files with 75 additions and 42 deletions.
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -108,6 +108,7 @@ public function index(Request $request)
         }
 
         $backups = collect();
+
         if ($tab === 'backups') {
             $backups = $servers->flatMap(fn(YnhServer $server) => $server->backups);
         }

diff --git a/public/images/download.png b/public/images/download.png
diff --git a/resources/views/home/cards/_applications.blade.php b/resources/views/home/cards/_applications.blade.php
@@ -20,20 +20,22 @@
     <table class="table table-hover">
       <thead>
       <tr>
-        <th>{{ __('Name') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-down"></i>&nbsp;{{ __('Name') }}
+        </th>
         <th>{{ __('Description') }}</th>
         <th>{{ __('Sku') }}</th>
         <th>{{ __('Version') }}</th>
         <th></th>
       </tr>
       </thead>
       <tbody>
-      @foreach($applications->sortBy('name') as $app)
+      @foreach($applications->sortBy('name', SORT_NATURAL|SORT_FLAG_CASE) as $app)
       <tr>
         <td>
           <span class="font-lg mb-3 fw-bold">
             <a href="https://{{ $app->path }}" target="_blank">
-              {{ $app->name }}
+              {{ $app->name }}&nbsp;&nbsp;<i class="zmdi zmdi-open-in-new"></i>
             </a>
           </span>
         </td>

diff --git a/resources/views/home/cards/_applications_ready_to_be_deployed.blade.php b/resources/views/home/cards/_applications_ready_to_be_deployed.blade.php
@@ -22,6 +22,9 @@
       <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>{{ __('Name') }}</th>
         <th>{{ __('Categories') }}</th>
         <th>{{ __('Order') }}</th>
@@ -41,6 +44,9 @@
                alt="{{ $order->name() }}"
                class="mw-100" style="height: 2.5em;"/>
         </td>
+        <td>
+          {{ $order->updated_at->format('Y-m-d H:i') }}
+        </td>
         <td>
           <span class="font-lg mb-3 fw-bold">
             {{ $order->name() }}

diff --git a/resources/views/home/cards/_backups.blade.php b/resources/views/home/cards/_backups.blade.php
@@ -46,7 +46,9 @@ function formatBytes($bytes, $precision = 2)
     <table class="table table-hover">
       <thead>
       <tr>
-        <th>{{ __('Date') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-up"></i>&nbsp;{{ __('Date') }}
+        </th>
         <th>{{ __('Name') }}</th>
         <th>{{ __('Size') }}</th>
         <th></th>
@@ -69,7 +71,7 @@ function formatBytes($bytes, $precision = 2)
           <a href="/ynh/servers/{{ $server->id }}/backup/{{ $backup->id }}"
              class="cursor-pointer"
              title="download">
-            <img src="{{ asset('images/download.png') }}" height="20" class="float-end">
+            <i class="zmdi zmdi-download"></i>
           </a>
           @endif
         </td>

diff --git a/resources/views/home/cards/_domains.blade.php b/resources/views/home/cards/_domains.blade.php
@@ -16,12 +16,14 @@
     <table class="table table-hover">
       <thead>
       <tr>
-        <th>{{ __('Name') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-down"></i>&nbsp;{{ __('Name') }}
+        </th>
         <th></th>
       </tr>
       </thead>
       <tbody>
-      @foreach($domains->sortBy('name') as $domain)
+      @foreach($domains->sortBy('name', SORT_NATURAL|SORT_FLAG_CASE) as $domain)
       <tr>
         <td>
           {{ $domain->name }}

diff --git a/resources/views/home/cards/_my_apps.blade.php b/resources/views/home/cards/_my_apps.blade.php
@@ -47,6 +47,7 @@ class="mw-100" style="height: 2.5em;"/>
               @else
               {{ $app->application->name }}
               @endif
+              &nbsp;&nbsp;<i class="zmdi zmdi-open-in-new"></i>
             </a>
           </span>
           <div class="text-muted">

diff --git a/resources/views/home/cards/_orders.blade.php b/resources/views/home/cards/_orders.blade.php
@@ -31,7 +31,9 @@
       <tr>
         <th class="ps-4" width="25px"></th>
         <th width="70px"></th>
-        <th>{{ __('Date') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-up"></i>&nbsp;{{ __('Date') }}
+        </th>
         <th>{{ __('Name') }}</th>
         <th>{{ __('Categories') }}</th>
         <th>{{ __('Order') }}</th>

diff --git a/resources/views/home/cards/_servers.blade.php b/resources/views/home/cards/_servers.blade.php
@@ -34,7 +34,9 @@
       <thead>
       <tr>
         <th class="ps-4" width="25px"></th>
-        <th>{{ __('Name') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-down"></i>&nbsp;{{ __('Name') }}
+        </th>
         <th>{{ __('IP V4') }}</th>
         <th>{{ __('IP V6') }}</th>
         <th>{{ __('Domain') }}</th>
@@ -45,7 +47,7 @@
       </tr>
       </thead>
       <tbody>
-      @foreach($servers->sortBy('name') as $server)
+      @foreach($servers->sortBy('name', SORT_NATURAL|SORT_FLAG_CASE) as $server)
       <tr>
         <td class="ps-4" width="25px">
           @if($server->isFrozen())

diff --git a/resources/views/home/cards/_towerify_applications.blade.php b/resources/views/home/cards/_towerify_applications.blade.php
@@ -21,7 +21,9 @@
       <thead>
       <tr>
         <th>{{ __('Server') }}</th>
-        <th>{{ __('Name') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-down"></i>&nbsp;{{ __('Name') }}
+        </th>
         <th>{{ __('Description') }}</th>
         <th>{{ __('Sku') }}</th>
         <th>{{ __('Version') }}</th>
@@ -41,7 +43,7 @@
         <td>
           <span class="font-lg mb-3 fw-bold">
             <a href="https://{{ $app->path }}" target="_blank">
-              {{ $app->name }}
+              {{ $app->name }}&nbsp;&nbsp;<i class="zmdi zmdi-open-in-new"></i>
             </a>
           </span>
         </td>

diff --git a/resources/views/home/cards/_towerify_backups.blade.php b/resources/views/home/cards/_towerify_backups.blade.php
@@ -34,7 +34,9 @@ function formatBytes($bytes, $precision = 2)
       <thead>
       <tr>
         <th>{{ __('Server') }}</th>
-        <th>{{ __('Date') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-up"></i>&nbsp;{{ __('Date') }}
+        </th>
         <th>{{ __('Name') }}</th>
         <th>{{ __('Size') }}</th>
         <th></th>
@@ -64,7 +66,7 @@ function formatBytes($bytes, $precision = 2)
           <a href="/ynh/servers/{{ $backup->server->id }}/backup/{{ $backup->id }}"
              class="cursor-pointer"
              title="download">
-            <img src="{{ asset('images/download.png') }}" height="20" class="float-end">
+            <i class="zmdi zmdi-download"></i>
           </a>
           @endif
         </td>

diff --git a/resources/views/home/cards/_towerify_domains.blade.php b/resources/views/home/cards/_towerify_domains.blade.php
@@ -23,12 +23,14 @@
         <th>{{ __('Server') }}</th>
         <th>{{ __('IP V4') }}</th>
         <th>{{ __('IP V6') }}</th>
-        <th>{{ __('Domain') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-down"></i>&nbsp;{{ __('Domain') }}
+        </th>
         <th></th>
       </tr>
       </thead>
       <tbody>
-      @foreach($domains->sortBy('name') as $domain)
+      @foreach($domains->sortBy('name', SORT_NATURAL|SORT_FLAG_CASE) as $domain)
       <tr>
         <td>
           <span class="font-lg mb-3 fw-bold">

diff --git a/resources/views/home/cards/_towerify_invitations.blade.php b/resources/views/home/cards/_towerify_invitations.blade.php
@@ -8,7 +8,7 @@
     </div>
     @if(Auth::user()->canManageUsers())
     <div class="align-items-end">
-      <h3 class="m-0">
+      <h3 class="m-0 cursor-pointer">
         <a onclick="toggleForm()">
           {{ __('+ new') }}
         </a>
@@ -52,20 +52,22 @@ class="form-control btn btn-xs btn-outline-success float-end">
     <table class="table table-hover">
       <thead>
       <tr>
-        <th>{{ __('Username') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-down"></i>&nbsp;{{ __('Username') }}
+        </th>
         <th>{{ __('Email') }}</th>
         <th></th>
       </tr>
       </thead>
       <tbody>
-      @foreach($invitations->sortBy('name') as $invitation)
+      @foreach($invitations->sortBy('name', SORT_NATURAL|SORT_FLAG_CASE) as $invitation)
       <tr>
         <td>
           {{ $invitation->name }}
         </td>
         <td>
           <a href="mailto:{{ $invitation->email }}" target="_blank">
-            {{ $invitation->email }}
+            {{ $invitation->email }}&nbsp;&nbsp;<i class="zmdi zmdi-open-in-new"></i>
           </a>
         </td>
         <td>

diff --git a/resources/views/home/cards/_towerify_users.blade.php b/resources/views/home/cards/_towerify_users.blade.php
@@ -24,21 +24,23 @@
     <table class="table table-hover">
       <thead>
       <tr>
-        <th>{{ __('Username') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-down"></i>&nbsp;{{ __('Username') }}
+        </th>
         <th>{{ __('Email') }}</th>
         <th></th>
         <th></th>
       </tr>
       </thead>
       <tbody>
-      @foreach($users->sortBy('name') as $user)
+      @foreach($users->sortBy('name', SORT_NATURAL|SORT_FLAG_CASE) as $user)
       <tr>
         <td>
           {{ $user->name }}
         </td>
         <td>
           <a href="mailto:{{ $user->email }}" target="_blank">
-            {{ $user->email }}
+            {{ $user->email }}&nbsp;&nbsp;<i class="zmdi zmdi-open-in-new"></i>
           </a>
         </td>
         <td>

diff --git a/resources/views/home/cards/_users.blade.php b/resources/views/home/cards/_users.blade.php
@@ -20,16 +20,17 @@
     <table class="table table-hover">
       <thead>
       <tr>
-        <th>{{ __('Name') }}</th>
+        <th>
+          <i class="zmdi zmdi-long-arrow-down"></i>&nbsp;{{ __('Name') }}
+        </th>
         <th>{{ __('Username') }}</th>
         <th>{{ __('Email') }}</th>
-        <th>{{ __('Permissions') }}</th>
         <th></th>
         <th></th>
       </tr>
       </thead>
       <tbody>
-      @foreach($users->sortBy('fullname') as $user)
+      @foreach($users->sortBy('fullname', SORT_NATURAL|SORT_FLAG_CASE) as $user)
       <tr>
         <td>
           <span class="font-lg mb-3 fw-bold">
@@ -41,24 +42,9 @@
         </td>
         <td>
           <a href="mailto:{{ $user->email }}" target="_blank">
-            {{ $user->email }}
+            {{ $user->email }}&nbsp;&nbsp;<i class="zmdi zmdi-open-in-new"></i>
           </a>
         </td>
-        <td>
-          @php
-          $userPermissions = $user
-          ->permissions
-          ->filter(fn($perm) => $perm->application->ynh_server_id === $server->id)
-          ->sortBy('application.name');
-          @endphp
-          @foreach($userPermissions as $permission)
-          <span class="tw-pill rounded-pill bg-primary">
-            <a href="https://{{ $permission->application->path }}" target="_blank" class="text-white">
-              {{ $permission->application->name }}
-            </a>
-          </span>
-          @endforeach
-        </td>
         <td>
           @if(Auth::user()->canManageUsers())
           @php
@@ -124,6 +110,23 @@ class="dropdown-item">
           @endif
         </td>
       </tr>
+      <tr>
+        <td colspan="5">
+          @php
+          $userPermissions = $user
+          ->permissions
+          ->filter(fn($perm) => $perm->application->ynh_server_id === $server->id)
+          ->sortBy('application.name');
+          @endphp
+          @foreach($userPermissions as $permission)
+          <span class="tw-pill rounded-pill bg-primary">
+            <a href="https://{{ $permission->application->path }}" target="_blank" class="text-white">
+              {{ $permission->application->name }}
+            </a>
+          </span>
+          @endforeach
+        </td>
+      </tr>
       @endforeach
       </tbody>
     </table>

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -23,6 +23,8 @@
     <link href="https://cdn.jsdelivr.net/npm/tom-select/dist/css/tom-select.bootstrap4.min.css" rel="stylesheet">
     <script src="https://cdn.jsdelivr.net/npm/tom-select"></script>
 
+    <!-- Icons -->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css" media="all" type="text/css" rel="stylesheet" integrity="sha256-3sPp8BkKUE7QyPSl6VfBByBroQbKxKG7tsusY2mhbVY=" crossorigin="anonymous">
 </head>
 <body>
     <div id="app">