Cleanup

computablefacts · Oct 11, 2024 · 93f9cc1 · 93f9cc1
1 parent b20656e
commit 93f9cc1
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 154 deletions.
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -45,7 +45,7 @@ public function index(Request $request)
             ->values()
             ->all();
 
-        return view('home.index', compact(
+        return view('index', compact(
             'tab',
             'limit',
             'servers',

diff --git a/app/Http/Controllers/YnhServerController.php b/app/Http/Controllers/YnhServerController.php
@@ -52,7 +52,7 @@ public function index(YnhServer $server, Request $request)
         $tab = $request->input('tab', 'settings');
         $limit = $request->input('limit', 40);
 
-        return view('home.pages._servers', compact(
+        return view('_server', compact(
             'tab',
             'limit',
             'server',
@@ -174,7 +174,7 @@ public function create(CreateHostRequest $request)
         }
 
         $tab = 'settings';
-        return view('home.pages._servers', compact('server', 'tab'));
+        return view('_server', compact('server', 'tab'));
     }
 
     public function delete(YnhServer $server, RemoveHostRequest $request)

diff --git a/app/View/Components/Interdependencies.php b/app/View/Components/Interdependencies.php
@@ -9,7 +9,6 @@
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\View\Component;
-use Traversable;
 
 class Interdependencies extends Component
 {
@@ -19,7 +18,7 @@ public function __construct(?YnhServer $server = null)
     {
         /** @var User $user */
         $user = Auth::user();
-        if ($server && (is_array($server) || $server instanceof Traversable) && count($server) > 0) {
+        if (isset($server->id)) {
             $this->interdependencies = YnhNginxLogs::interdependencies(YnhServer::forUser($user), $server);
         } else {
             $this->interdependencies = YnhNginxLogs::interdependencies(YnhServer::forUser($user));

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
@@ -149,6 +149,6 @@
   "Text successfully copied to clipboard.": "Le text a été copié dans le presse-papiers.",
   "Someone has shared vulnerabilities with you on assets for which you are responsible. Please fix the vulnerabilities below and check the corresponding box. A new scan will verify that the problem has been solved.": "Quelqu'un a partagé avec vous des vulnérabilités sur des actifs dont vous êtes responsable. Veuillez corriger les vulnérabilités ci-dessous et cocher la case correspondante. Un nouveau scan vérifiera que le problème a été résolu.",
   "uppercase/lowercase letters and digits only": "lettres majuscules/minuscules et chiffres uniquement",
-  "+ new": "+ créer",
+  "+ new": "+ nouvelle",
   "Size": "Taille"
 }
diff --git a/...urces/views/home/pages/_servers.blade.php → resources/views/_server.blade.php b/...urces/views/home/pages/_servers.blade.php → resources/views/_server.blade.php
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -15,7 +15,7 @@
                             <label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Name') }}</label>
 
                             <div class="col-md-6">
-                                <input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" required autofocus>
+                                <input id="name" placeholder="John Doe" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" required autofocus>
 
                                 @if ($errors->has('name'))
                                     <span class="invalid-feedback" role="alert">
@@ -29,7 +29,7 @@
                             <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
 
                             <div class="col-md-6">
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
+                                <input id="email" placeholder="j.doe@example.com" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
 
                                 @if ($errors->has('email'))
                                     <span class="invalid-feedback" role="alert">

diff --git a/resources/views/components/servers.blade.php b/resources/views/components/servers.blade.php
@@ -91,12 +91,11 @@
           {{ $server->ip() }}
         </td>
         <td>
-          @if($server->isFrozen() || $server->ipv6() === '
-          <unavailable>')
-            -
-            @else
-            {{ $server->ipv6() }}
-            @endif
+          @if($server->isFrozen() || $server->ipv6() === '<unavailable>')
+          -
+          @else
+          {{ $server->ipv6() }}
+          @endif
         </td>
         <td>
           @if($server->isFrozen())

diff --git a/resources/views/components/users.blade.php b/resources/views/components/users.blade.php
@@ -58,13 +58,17 @@ class="btn btn-sm btn-outline-success dropdown-toggle dropdown-toggle-split"
               </button>
               <div class="dropdown-menu" x-placement="bottom-start">
                 @foreach($userAvailablePermissions as $permission)
-                <a onclick="addUserPermission('{{ $server->id }}', '{{ $user->id }}', '{{ $permission }}')"
+                  <?php $serverId = $server ? $server->id : $permission->server_id; ?>
+                  <?php $serverName = $server ? $server->name : $permission->server_name; ?>
+                  <?php $permissionId = $server ? $permission : $permission->permission; ?>
+                  <?php $userId = $server ? $user->id : $permission->ynh_user_id; ?>
+                <a onclick="addUserPermission('{{ $serverId }}', '{{ $userId }}', '{{ $permissionId }}')"
                    class="dropdown-item">
-                  @if(\Illuminate\Support\Str::after($permission, '.') === 'main')
-                  {{ \Illuminate\Support\Str::before($permission, '.') }}
+                  @if(\Illuminate\Support\Str::after($permissionId, '.') === 'main')
+                  {{ \Illuminate\Support\Str::before($permissionId, '.') }} / {{ $serverName }}
                   @else
-                  {{ \Illuminate\Support\Str::before($permission, '.') }}
-                  &nbsp;({{ \Illuminate\Support\Str::after($permission, '.') }})
+                  {{ \Illuminate\Support\Str::before($permissionId, '.') }}
+                  &nbsp;({{ \Illuminate\Support\Str::after($permissionId, '.') }}) / {{ $serverName }}
                   @endif
                 </a>
                 @endforeach
@@ -91,13 +95,18 @@ class="btn btn-sm btn-outline-danger dropdown-toggle dropdown-toggle-split"
               </button>
               <div class="dropdown-menu" x-placement="bottom-start">
                 @foreach($userCurrentPermissions as $permission)
-                <a onclick="removeUserPermission('{{ $server->id }}', '{{ $user->id }}', '{{ $permission }}')"
-                   class="dropdown-item">
-                  @if(\Illuminate\Support\Str::after($permission, '.') === 'main')
-                  {{ \Illuminate\Support\Str::before($permission, '.') }}
+                  <?php $serverId = $server ? $server->id : $permission->server_id; ?>
+                  <?php $serverName = $server ? $server->name : $permission->server_name; ?>
+                  <?php $permissionId = $server ? $permission : $permission->permission; ?>
+                  <?php $userId = $server ? $user->id : $permission->ynh_user_id; ?>
+                <a
+                  onclick="removeUserPermission('{{ $serverId }}', '{{ $userId }}', '{{ $permissionId }}')"
+                  class="dropdown-item">
+                  @if(\Illuminate\Support\Str::after($permissionId, '.') === 'main')
+                  {{ \Illuminate\Support\Str::before($permissionId, '.') }} / {{ $serverName }}
                   @else
-                  {{ \Illuminate\Support\Str::before($permission, '.') }}
-                  &nbsp;({{ \Illuminate\Support\Str::after($permission, '.') }})
+                  {{ \Illuminate\Support\Str::before($permissionId, '.') }}
+                  &nbsp;({{ \Illuminate\Support\Str::after($permissionId, '.') }}) / {{ $serverName }}
                   @endif
                 </a>
                 @endforeach

diff --git a/resources/views/cyber-todo.blade.php b/resources/views/cyber-todo.blade.php
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>My Cyber TODO (Powered by {{ config('app.name') }})</title>
+  <title>Cyber TODO (Powered by {{ config('app.name') }})</title>
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
   <meta name="keywords"
         content="honeypot, vulnerability scanner, assets discovery, attack surface management, shadow it">
@@ -211,7 +211,9 @@
   <div class="content">
     <h1>Cyber TODO</h1>
     <p>
-      {{ __('Someone has shared vulnerabilities with you on assets for which you are responsible. Please fix the vulnerabilities below and check the corresponding box. A new scan will verify that the problem has been solved.') }}
+      {{ __('Someone has shared vulnerabilities with you on assets for which you are responsible. Please fix the
+      vulnerabilities below and check the corresponding box. A new scan will verify that the problem has been solved.')
+      }}
     </p>
     <div class="loader" id="loader"></div>
     <div id="vulnerabilities" class="list d-none"></div>

diff --git a/resources/views/home/cards/_adversarymeter.blade.php b/resources/views/home/cards/_adversarymeter.blade.php
diff --git a/resources/views/home/index.blade.php → resources/views/index.blade.php b/resources/views/home/index.blade.php → resources/views/index.blade.php
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php