diff --git a/resources/views/components/icons/upcloud.blade.php b/resources/views/components/icons/upcloud.blade.php index 4b85f9d1..b9b7e5ca 100644 --- a/resources/views/components/icons/upcloud.blade.php +++ b/resources/views/components/icons/upcloud.blade.php @@ -1,4 +1,4 @@ -merge() }}> +merge(['class' => 'fill-current']) }}> diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php index b16d4f38..715fae72 100644 --- a/resources/views/components/modal.blade.php +++ b/resources/views/components/modal.blade.php @@ -45,7 +45,7 @@ x-on:keydown.tab.prevent="$event.shiftKey || nextFocusable().focus()" x-on:keydown.shift.tab.prevent="prevFocusable().focus()" x-show="show" - class="fixed inset-0 overflow-y-auto px-4 py-6 sm:px-0 z-50 flex items-center justify-center" + class="fixed inset-0 overflow-y-auto px-2 py-4 sm:px-4 sm:py-6 z-50 flex items-center justify-center" style="display: none;" x-cloak > @@ -77,19 +77,19 @@ class="bg-white dark:bg-gray-800 rounded-[0.70rem] overflow-hidden shadow-xl tra aria-modal="true" :aria-labelledby="$id('modal-title')" > -
+
-
+
@if (isset($title))

{{ $title }} diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 0b495656..92d8a4f5 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -13,7 +13,18 @@
- {{ Auth::user()->name }} +
+
+ +

{{ \App\Facades\Greeting::auto(Auth::user()->timezone) }}, {{ Auth::user()->first_name }}! diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index 70de465c..52932166 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -111,7 +111,7 @@ -
+
diff --git a/resources/views/livewire/backup-tasks/buttons/run-task-button.blade.php b/resources/views/livewire/backup-tasks/buttons/run-task-button.blade.php index d9adc91d..778948a6 100644 --- a/resources/views/livewire/backup-tasks/buttons/run-task-button.blade.php +++ b/resources/views/livewire/backup-tasks/buttons/run-task-button.blade.php @@ -1,34 +1,26 @@
@if ($backupTask->isRunning()) - + {{ __('Task Running') }} @svg('heroicon-o-stop', 'w-4 h-4') @elseif ($backupTask->isPaused()) - + {{ __('Task Disabled') }} @svg('heroicon-o-play', 'w-4 h-4') @elseif ($backupTask->isAnotherTaskRunningOnSameRemoteServer()) - - - {{ __('Another task is running on the same remote server') }} - + + {{ __('Another task is running on the same remote server') }} @svg('heroicon-o-play', 'w-4 h-4') @elseif ($backupTask->remoteServer->isMarkedForDeletion()) - - - {{ __('Remote server is marked for deletion') }} - + + {{ __('Remote server is marked for deletion') }} @svg('heroicon-o-play', 'w-4 h-4') @else - + Run Task @svg('heroicon-o-play', 'w-4 h-4') diff --git a/resources/views/livewire/backup-tasks/buttons/toggle-pause-button.blade.php b/resources/views/livewire/backup-tasks/buttons/toggle-pause-button.blade.php index 17cdd05b..73cf25d8 100644 --- a/resources/views/livewire/backup-tasks/buttons/toggle-pause-button.blade.php +++ b/resources/views/livewire/backup-tasks/buttons/toggle-pause-button.blade.php @@ -1,16 +1,16 @@
@if ($backupTask->isPaused()) - + {{ __('Task Paused') }} @svg('heroicon-o-hand-raised', 'w-4 h-4') - @elseif ($backupTask->isRunning()) - + @elseif ($backupTask->isRunning()) + {{ __('Task Not Paused') }} @svg('heroicon-o-hand-raised', 'w-4 h-4') @else - + {{ __('Task Not Paused') }} @svg('heroicon-o-hand-raised', 'w-4 h-4') diff --git a/resources/views/livewire/backup-tasks/tables/index-item.blade.php b/resources/views/livewire/backup-tasks/tables/index-item.blade.php index 3b14a350..5d4cbac6 100644 --- a/resources/views/livewire/backup-tasks/tables/index-item.blade.php +++ b/resources/views/livewire/backup-tasks/tables/index-item.blade.php @@ -116,14 +116,13 @@ class="font-medium">{{ __('Last ran') }}: {{ $backupTask->lastRunFormatte
-
- +
+ @@ -137,7 +136,7 @@ class="font-medium">{{ __('Last ran') }}: {{ $backupTask->lastRunFormatte /> - + {{ __('Update Backup Task') }} @@ -248,13 +247,12 @@ class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {
- + @@ -268,7 +266,7 @@ class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium { /> - + {{ __('Update Backup Task') }} diff --git a/resources/views/livewire/layout/navigation.blade.php b/resources/views/livewire/layout/navigation.blade.php index 00e6c14b..bd70a1c4 100644 --- a/resources/views/livewire/layout/navigation.blade.php +++ b/resources/views/livewire/layout/navigation.blade.php @@ -84,11 +84,31 @@ public function toggleUserDropdown(): void - diff --git a/resources/views/livewire/profile/update-profile-information-form.blade.php b/resources/views/livewire/profile/update-profile-information-form.blade.php index bdc4949b..faab7400 100644 --- a/resources/views/livewire/profile/update-profile-information-form.blade.php +++ b/resources/views/livewire/profile/update-profile-information-form.blade.php @@ -104,33 +104,49 @@ public function sendVerification(): void
@if (Auth::user()->canLoginWithGithub()) -
-
-
- - - {{ __('You can sign in to :app with GitHub.', ['app' => config('app.name')]) }} - -
-
- @svg('heroicon-o-check', 'w-6 h-6 sm:w-7 sm:h-7 text-green-600 dark:text-green-400 - transition-colors duration-200') +
+
+
+
+
+ +
+
+
+ + {{ __('You can sign in to :app with GitHub.', ['app' => config('app.name')]) }} + +
+
+
+ @svg('heroicon-o-check', 'w-5 h-5 text-green-600 dark:text-green-300 transition-colors duration-200') +
+
@endif
- -
- {{ Auth::user()->name }} - - {{ __('Update your avatar on Gravatar') }} - +
+ +
+
+
+ +
+ + {{ __('Update your avatar on Gravatar') }} + +
diff --git a/resources/views/partials/steps-to-get-started/view.blade.php b/resources/views/partials/steps-to-get-started/view.blade.php index c5219ec5..090b870b 100644 --- a/resources/views/partials/steps-to-get-started/view.blade.php +++ b/resources/views/partials/steps-to-get-started/view.blade.php @@ -1,123 +1,94 @@ -
-
-
-
-
-

{{ __('Steps to Get Started') }}

-
-
-
-
-
-

- {{ __('Step 1)') }} -

-

- {{ __('Link your first Remote Server') }} -

-
- - - -
-
- {{ __('We support Ubuntu and Debian distributions primarily.') }} -
-
- @if (Auth::user()->remoteServers->isNotEmpty()) -
- @svg('heroicon-o-check', 'h-5 w-5 text-green-600 mr-2 inline') - {{ __('You have completed this step.') }} -
- @endif - - @if (Auth::user()->remoteServers->isEmpty()) - - - {{ __('Link Remote Server') }} - @svg('heroicon-o-arrow-right', 'h-5 w-5 ml-2 inline') - - - @endif -
-
-
-

- {{ __('Step 2)') }} -

-

- {{ __('Connect a Backup Destination') }} -

-
- - - -
-
- {{ __('Add your S3 bucket API details to store your backups safely.') }} -
-
- @if (Auth::user()->backupDestinations->isNotEmpty()) -
- @svg('heroicon-o-check', 'h-5 w-5 text-green-600 mr-2 inline') - {{ __('You have completed this step.') }} -
- @endif +
+
+
+

{{ __('Steps to Get Started') }}

+
+

{{ __('Follow these steps to set up your backup system quickly and easily.') }}

+
- @if (Auth::user()->remoteServers->isEmpty()) -
- @svg('heroicon-o-exclamation-triangle', 'h-5 w-5 text-red-500 mr-2 inline') - {{ __('You need to link a Remote Server first.') }} +
+ @foreach([ + [ + 'step' => 1, + 'title' => __('Link your first Remote Server'), + 'description' => __('We support Ubuntu and Debian distributions primarily.'), + 'icons' => ['ubuntu', 'debian', 'tux'], + 'route' => 'remote-servers.create', + 'buttonText' => __('Link Remote Server'), + 'condition' => Auth::user()->remoteServers->isEmpty() + ], + [ + 'step' => 2, + 'title' => __('Connect a Backup Destination'), + 'description' => __('Add your S3 bucket API details to store your backups safely.'), + 'icons' => ['aws', 'upcloud', 'gcp'], + 'route' => 'backup-destinations.create', + 'buttonText' => __('Add your Backup Destination'), + 'condition' => Auth::user()->backupDestinations->isEmpty() && !Auth::user()->remoteServers->isEmpty() + ], + [ + 'step' => 3, + 'title' => __('Make your first Backup Task'), + 'description' => __('Effortlessly set up your Linux server backups to secure S3 buckets. Schedule for continuous data protection.'), + 'additional_info' => __('Easily control when your backups run and be notified of their progress.'), + 'route' => 'backup-tasks.create', + 'buttonText' => __('Create your first Backup Task'), + 'condition' => Auth::user()->remoteServers->isNotEmpty() && Auth::user()->backupDestinations->isNotEmpty() + ] + ] as $index => $step) +
+
+
+ {{ $index + 1 }} +
+

+ {{ $step['title'] }} +

+ @if(isset($step['icons'])) +
+ @foreach($step['icons'] as $icon) + + @endforeach
@endif - - @if (Auth::user()->remoteServers->isEmpty()) - - {{ __('Add your Backup Destination') }} - @svg('heroicon-o-arrow-right', 'h-5 w-5 ml-2 inline') - +

+ {{ $step['description'] }} +

+ @if(isset($step['additional_info'])) +

+ {{ $step['additional_info'] }} +

@endif +
+ @if(Auth::user()->{$step['step'] == 1 ? 'remoteServers' : 'backupDestinations'}->isNotEmpty()) +
+

+ @svg('heroicon-o-check-circle', 'h-5 w-5 mr-2') + {{ __('You have completed this step.') }} +

+
+ @elseif($step['condition']) + + + {{ $step['buttonText'] }} + @svg('heroicon-o-arrow-right', 'h-5 w-5 ml-2 inline-block transition-transform duration-300 group-hover:translate-x-1') + + + @else + + {{ $step['buttonText'] }} + @svg('heroicon-o-lock-closed', 'h-5 w-5 ml-2 inline-block') + + @endif +
-
-

- {{ __('Step 3)') }} -

-

- {{ __('Make your first Backup Task') }} -

-
- {{ __('Effortlessly set up your Linux server backups to secure S3 buckets. Schedule for continuous data protection.') }} -
-
- {{ __('Easily control when your backups run and be notified of their progress.') }} -
-
- @if (Auth::user()->remoteServers->isEmpty() || Auth::user()->backupDestinations->isEmpty()) -
- @svg('heroicon-o-exclamation-triangle', 'h-5 w-5 text-red-500 mr-2 inline') - {{ __('You need to link a Backup Destination first.') }} -
- @else - - - {{ __('Create your first Backup Task') }} - @svg('heroicon-o-arrow-right', 'h-5 w-5 ml-2 inline') - - - @endif -
-
-
-
- -
+ @endforeach +
+ +
+ +

{{ __("You're on your way to secure, automated backups!") }}