fix: restored missing files from revert

vanguardbackup · Jan 11, 2025 · 8cfc5ec · 8cfc5ec
1 parent a8f9946
commit 8cfc5ec
Show file tree

Hide file tree

Showing 11 changed files with 481 additions and 401 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/database/migrations/2025_01_10_041530_make_label_indexable_in_backup_tasks_table.php b/database/migrations/2025_01_10_041530_make_label_indexable_in_backup_tasks_table.php
@@ -0,0 +1,15 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('backup_tasks', function (Blueprint $table) {
+            $table->index('label');
+        });
+    }
+};
diff --git a/lang/da.json b/lang/da.json
@@ -19,7 +19,7 @@
     "Add your Backup Destination": "Tilføj din backupdestination",
     "Add your S3 bucket API details to store your backups safely.": "Tilføj dine S3-bucket API-oplysninger for at gemme dine backups sikkert.",
     "Additional Filename Text": "Yderligere filnavnstekst",
-    "AGPLv3 License": "AGPLv3-licensen",
+    "AGPLv3 License.": "AGPLv3-licensen.",
     "All backups over the past ninety days.": "Alle sikkerhedskopieringer over de sidste halvfems dage.",
     "All tags used to organize and identify your backup tasks.": "Alle tags, der bruges til at organisere og identificere dine sikkerhedskopieringsopgaver.",
     "All your backup task logs have been removed.": "Alle dine sikkerhedskopieringsopgavelogfiler er blevet fjernet.",
@@ -903,5 +903,12 @@
     "Backup task has been pinned.": "Sikkerhedskopieringsopgaven er blevet fastgjort.",
     "Backup task has been unpinned.": "Sikkerhedskopieringsopgaven er blevet fjernet fra fastgørelse.",
     "Security Notice": "Sikkerhedsmeddelelse",
-    "All keys entered here are encrypted and securely stored in the database.": "Alle nøgler indtastet her er krypteret og sikkert gemt i databasen."
+    "All keys entered here are encrypted and securely stored in the database.": "Alle nøgler indtastet her er krypteret og sikkert gemt i databasen.",
+    "Troubleshooting Tips": "Fejlfindingstips",
+    "Ensure the server is online and accessible from your network.": "Sørg for, at serveren er online og tilgængelig fra dit netværk.",
+    "Verify the IP address and port are correct.": "Bekræft, at IP-adressen og porten er korrekte.",
+    "Check that your SSH username and public key are correctly configured.": "Kontroller, at dit SSH-brugernavn og din offentlige nøgle er korrekt konfigureret.",
+    "Ensure the server allows SSH access for the provided user.": "Sørg for, at serveren tillader SSH-adgang for den angivne bruger.",
+    "Double-check all connection details, including the IP address, port, and credentials.": "Dobbelttjek alle forbindelsesdetaljer, inklusive IP-adresse, port og legitimationsoplysninger.",
+    "Ensure the server firewall allows SSH connections from this app.": "Sørg for, at serverens firewall tillader SSH-forbindelser fra denne app."
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/views/components/dropdown-link.blade.php b/resources/views/components/dropdown-link.blade.php
@@ -1,10 +1,11 @@
 @props(['active' => false])
 
 @php
-    $classes = 'block w-full px-4 py-2 text-start text-sm leading-5 transition duration-150 ease-in-out cursor-pointer ';
+    $classes =
+        'block w-full px-4 py-2 text-start text-sm font-normal leading-5 transition duration-150 ease-in-out cursor-pointer rounded ';
     $classes .= $active
-        ? 'text-gray-900 dark:text-white bg-gray-100 dark:bg-gray-700'
-        : 'text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-700';
+        ? 'bg-primary-100 dark:bg-primary-900 text-primary-700 dark:text-primary-100 shadow-sm rounded'
+        : 'text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-700 rounded';
 @endphp
 
 <a {{ $attributes->merge(['class' => $classes]) }}>

diff --git a/resources/views/components/dropdown.blade.php b/resources/views/components/dropdown.blade.php
@@ -9,7 +9,7 @@
     };
 
     $width = match ($width) {
-        '48' => 'w-48',
+        '52' => 'w-52',
         default => $width,
     };
 @endphp
@@ -27,11 +27,11 @@
         x-transition:leave="transition duration-200 ease-in"
         x-transition:leave-start="translate-y-0 scale-100 transform opacity-100"
         x-transition:leave-end="translate-y-2 scale-95 transform opacity-0"
-        class="{{ $width }} {{ $alignmentClasses }} absolute z-50 mt-2 rounded-md shadow-lg"
+        class="{{ $width }} {{ $alignmentClasses }} absolute z-50 mt-2 rounded-[0.70rem] shadow-lg"
         style="display: none"
         @click="open = false"
     >
-        <div class="{{ $contentClasses }} overflow-hidden rounded-md ring-1 ring-black ring-opacity-5">
+        <div class="{{ $contentClasses }} overflow-hidden rounded-[0.70rem] p-2.5 ring-1 ring-black ring-opacity-5">
             {{ $content }}
         </div>
     </div>

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -228,17 +228,16 @@ class="group flex items-center justify-center text-gray-600 transition duration-
                 </div>
                 <div class="mt-12 border-t border-gray-200 pt-8 text-center text-sm dark:border-gray-700">
                     <p class="text-gray-500 dark:text-gray-400">
-                        &copy; {{ date('Y') }} {{ config('app.name') }}.
+                        &copy; 2024 - {{ date('Y') }} {{ config('app.name') }}.
                         {{ __('This software is open source and available under the') }}
                         <a
                             href="https://opensource.org/licenses/agpl-v3"
                             class="text-primary-600 hover:text-primary-800 hover:underline dark:text-primary-400 dark:hover:text-primary-300"
                             target="_blank"
                             rel="noopener noreferrer"
                         >
-                            {{ __('AGPLv3 License') }}
+                            {{ __('AGPLv3 License.') }}
                         </a>
-                        .
                     </p>
                 </div>
             </div>

diff --git a/resources/views/livewire/layout/navigation.blade.php b/resources/views/livewire/layout/navigation.blade.php
@@ -101,7 +101,7 @@ class="mr-2 h-5 w-5"
 
                 <!-- User Dropdown -->
                 <div class="relative ml-3">
-                    <x-dropdown align="right" width="48">
+                    <x-dropdown align="right" width="52">
                         <x-slot name="trigger">
                             <button
                                 x-data="{ open: false }"
@@ -143,31 +143,37 @@ class="-mr-0.5 ml-2 h-4 w-4 transition-transform duration-200"
                         </x-slot>
 
                         <x-slot name="content">
-                            <x-dropdown-link :href="route('profile')" wire:navigate>
-                                <x-hugeicons-user class="mr-2 inline h-5 w-5" />
+                            <x-dropdown-link :href="route('profile')" wire:navigate class="mt-0.5">
+                                <x-hugeicons-user class="mr-2 inline h-5 w-5 text-primary-800 dark:text-white" />
                                 {{ __('My Profile') }}
                             </x-dropdown-link>
                             <x-dropdown-link :href="route('notification-streams.index')" wire:navigate>
-                                <x-hugeicons-notification-02 class="mr-2 inline h-5 w-5" />
+                                <x-hugeicons-notification-02
+                                    class="mr-2 inline h-5 w-5 text-primary-800 dark:text-white"
+                                />
                                 {{ __('Notifications') }}
                             </x-dropdown-link>
                             <x-dropdown-link :href="route('statistics')" wire:navigate>
-                                <x-hugeicons-analytics-01 class="mr-2 inline h-5 w-5" />
+                                <x-hugeicons-analytics-01
+                                    class="mr-2 inline h-5 w-5 text-primary-800 dark:text-white"
+                                />
                                 {{ __('Statistics') }}
                             </x-dropdown-link>
                             <x-dropdown-link :href="route('profile.api')" wire:navigate>
-                                <x-hugeicons-ticket-02 class="mr-2 inline h-5 w-5" />
+                                <x-hugeicons-ticket-02 class="mr-2 inline h-5 w-5 text-primary-800 dark:text-white" />
                                 {{ __('API Tokens') }}
                             </x-dropdown-link>
 
                             <div class="my-1 border-t border-gray-200 dark:border-gray-600"></div>
 
                             <x-dropdown-link :href="route('profile.mfa')" wire:navigate>
-                                <x-hugeicons-square-lock-01 class="mr-2 inline h-5 w-5" />
+                                <x-hugeicons-square-lock-01
+                                    class="mr-2 inline h-5 w-5 text-primary-800 dark:text-white"
+                                />
                                 {{ __('Security Settings') }}
                             </x-dropdown-link>
                             <x-dropdown-link :href="route('profile.help')" wire:navigate>
-                                <x-hugeicons-mentoring class="mr-2 inline h-5 w-5" />
+                                <x-hugeicons-mentoring class="mr-2 inline h-5 w-5 text-primary-800 dark:text-white" />
                                 {{ __('Get Help') }}
                             </x-dropdown-link>
 
@@ -177,22 +183,26 @@ class="-mr-0.5 ml-2 h-4 w-4 transition-transform duration-200"
                                 x-data=""
                                 @click="$dispatch('open-modal', 'theme-switcher'); $el.closest('.dropdown-menu').classList.add('hidden')"
                             >
-                                <x-hugeicons-paint-board class="mr-2 inline h-5 w-5" />
+                                <x-hugeicons-paint-board class="mr-2 inline h-5 w-5 text-primary-800 dark:text-white" />
                                 {{ __('Appearance') }}
                             </x-dropdown-link>
 
                             @if (Auth::user()->isAdmin())
                                 <div class="my-1 border-t border-gray-200 dark:border-gray-600"></div>
                                 <x-dropdown-link href="{{ url('/admin/instance-details') }}">
-                                    <x-hugeicons-database-locked class="mr-2 inline h-5 w-5" />
+                                    <x-hugeicons-database-locked
+                                        class="mr-2 inline h-5 w-5 text-primary-800 dark:text-white"
+                                    />
                                     {{ __('Instance Details') }}
                                 </x-dropdown-link>
                                 <x-dropdown-link href="{{ url('/pulse') }}">
-                                    <x-hugeicons-dashboard-browsing class="mr-2 inline h-5 w-5" />
+                                    <x-hugeicons-dashboard-browsing
+                                        class="mr-2 inline h-5 w-5 text-primary-800 dark:text-white"
+                                    />
                                     {{ __('Laravel Pulse') }}
                                 </x-dropdown-link>
                                 <x-dropdown-link href="{{ url('/horizon/dashboard') }}">
-                                    <x-hugeicons-cpu class="mr-2 inline h-5 w-5" />
+                                    <x-hugeicons-cpu class="mr-2 inline h-5 w-5 text-primary-800 dark:text-white" />
                                     {{ __('Laravel Horizon') }}
                                 </x-dropdown-link>
                             @endif
@@ -201,7 +211,7 @@ class="-mr-0.5 ml-2 h-4 w-4 transition-transform duration-200"
 
                             <button wire:click="logout" class="w-full text-start" role="menuitem">
                                 <x-dropdown-link>
-                                    @svg('hugeicons-logout-04', 'mr-2 inline h-5 w-5')
+                                    @svg('hugeicons-logout-03', 'mr-2 inline h-5 w-5 text-primary-800 dark:text-white')
                                     {{ __('Log Out') }}
                                 </x-dropdown-link>
                             </button>
@@ -341,20 +351,24 @@ class="text-base font-medium text-primary-100"
                     <x-hugeicons-notification-02 class="mr-2 inline h-5 w-5" />
                     {{ __('Notifications') }}
                 </x-responsive-nav-link>
+                <x-responsive-nav-link :href="route('statistics')" wire:navigate>
+                    <x-hugeicons-analytics-01 class="mr-2 inline h-5 w-5" />
+                    {{ __('Statistics') }}
+                </x-responsive-nav-link>
                 <x-responsive-nav-link :href="route('profile.api')" wire:navigate>
                     <x-hugeicons-ticket-02 class="mr-2 inline h-5 w-5" />
                     {{ __('API Tokens') }}
                 </x-responsive-nav-link>
                 <x-responsive-nav-link :href="route('profile.mfa')" wire:navigate>
                     <x-hugeicons-square-lock-01 class="mr-2 inline h-5 w-5" />
-                    {{ __('2FA Settings') }}
+                    {{ __('Security Settings') }}
                 </x-responsive-nav-link>
-                <x-responsive-nav-link :href="route('statistics')" wire:navigate>
-                    <x-hugeicons-analytics-01 class="mr-2 inline h-5 w-5" />
-                    {{ __('Statistics') }}
+                <x-responsive-nav-link :href="route('profile.help')" wire:navigate>
+                    <x-hugeicons-mentoring class="mr-2 inline h-5 w-5" />
+                    {{ __('Get Help') }}
                 </x-responsive-nav-link>
                 @if (Auth::user()->isAdmin())
-                    <x-responsive-nav-link href="{{ url('/admin/dashboard') }}">
+                    <x-responsive-nav-link href="{{ url('/admin/instance-details') }}">
                         <x-hugeicons-database-locked class="mr-2 inline h-5 w-5" />
                         {{ __('Instance Details') }}
                     </x-responsive-nav-link>
@@ -370,7 +384,7 @@ class="text-base font-medium text-primary-100"
             </div>
             <button wire:click="logout" class="w-full text-start">
                 <x-responsive-nav-link>
-                    @svg('hugeicons-logout-04', 'mr-2 inline h-5 w-5 text-gray-50')
+                    @svg('hugeicons-logout-03', 'mr-2 inline h-5 w-5 text-gray-50')
                     {{ __('Log Out') }}
                 </x-responsive-nav-link>
             </button>

diff --git a/resources/views/livewire/profile/connections-page.blade.php b/resources/views/livewire/profile/connections-page.blade.php
@@ -77,21 +77,23 @@ class="w-full justify-center sm:w-auto"
                         </div>
                         @if ($this->isConnected('github'))
                             <div
-                                class="mt-3 w-fit rounded-lg border border-gray-300 bg-gray-800 p-1.5 text-xs dark:border-gray-700"
+                                class="mt-3 w-fit rounded-[0.70rem] border border-gray-200 bg-gray-50 p-2 text-xs text-gray-800 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-100"
                             >
-                                {{ __('Connected as') }}
-                                <a
-                                    target="_blank"
-                                    class="underline"
-                                    href="{{ $this->contactProvider('github')['link'] }}"
-                                >
-                                    {{ $this->contactProvider('github')['username'] }}
-                                </a>
-                                <img
-                                    src="{{ $this->contactProvider('github')['avatar_url'] }}"
-                                    title="{{ __('GitHub avatar') }}"
-                                    class="mx-3 inline h-5 w-5 rounded-full"
-                                />
+                                <div class="mx-1.5">
+                                    {{ __('Connected as') }}:
+                                    <img
+                                        src="{{ $this->contactProvider('github')['avatar_url'] }}"
+                                        title="{{ __('GitHub avatar') }}"
+                                        class="mx-1 inline h-6 w-6 overflow-hidden rounded-full border border-gray-600 dark:border-gray-600"
+                                    />
+                                    <a
+                                        target="_blank"
+                                        class="text-ellipsis text-gray-800 underline ease-in-out hover:text-gray-900 dark:text-gray-300 dark:hover:text-gray-400"
+                                        href="{{ $this->contactProvider('github')['link'] }}"
+                                    >
+                                        {{ $this->contactProvider('github')['username'] }}
+                                    </a>
+                                </div>
                             </div>
                         @endif
                     </div>