Skip to content
This repository was archived by the owner on Oct 1, 2021. It is now read-only.

Commit 45e34a3

Browse files
authored
refactor: ui tweaks (#15)
1 parent 40a0217 commit 45e34a3

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

resources/lang/en/forms.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
'title' => 'Delete Account',
2929
'description' => 'Permanently delete your account.',
3030
'content' => 'Once your account is deleted, all of its resources and data will be permanently deleted. Before deleting your account, please download any data or information that you wish to retain.',
31-
'confirmation' => 'Are you sure you want to delete your account? Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.',
31+
'confirmation' => 'Are you sure you want to delete your account? Deleting your account is irreversible and all deleted data is unrecoverable.',
3232
],
3333

3434
'logout-sessions' => [

resources/lang/en/pages.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
'contact_information_description' => "Update your account's contact information and email address.",
2222
'gdpr_title' => 'General Data Protection Regulation (GDPR)',
2323
'gdpr_description' => 'This will will create a zip containing all personal data to respect your right to data portability. You will receive the zip file on the email address linked to your account.',
24-
'delete_account_title' => 'Dangerous area',
25-
'delete_account_description' => 'Deletion of the account will result in the loss of your data. We remind you that in the first 30 days you have the opportunity to restore your account, after which all your data will be completely deleted.',
24+
'delete_account_title' => 'Delete Account',
25+
'delete_account_description' => 'Deletion of the account will result in the loss of your data instantly and your account will be unrecoverable.',
2626
],
2727
];

resources/views/components/password-rules.blade.php

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@
55
</div>
66

77
<div class="flex flex-col text-sm">
8-
<span x-show="!isTyping">@lang('fortify::forms.update-password.requirements_notice')</span>
9-
10-
<div x-show="isTyping" x-cloak>
11-
@foreach($passwordRules as $ruleName => $ruleIsValid)
12-
<div class="flex items-center w-full mt-4 space-x-2">
13-
@if ($ruleIsValid)
14-
<div class="flex items-center justify-center flex-shrink-0 w-5 h-5 rounded-full bg-theme-success-200">
15-
@svg('checkmark', 'text-theme-success-500 h-2 w-2')
16-
@elseif(! $ruleIsValid)
17-
<div class="flex items-center justify-center flex-shrink-0 w-5 h-5 rounded-full border-2 border-theme-secondary-700">
18-
@else
19-
<div class="flex items-center justify-center flex-shrink-0 w-5 h-5 rounded-full bg-theme-danger-200">
20-
@svg('exclamation', 'text-theme-danger-500 h-5 w-5')
21-
@endif
22-
</div>
23-
<span class="text-theme-secondary-900">@lang('fortify::forms.password-rules.' .Str::snake($ruleName))</span>
24-
</div>
25-
@endforeach
26-
</div>
8+
<span x-show="!isTyping">@lang('fortify::forms.update-password.requirements_notice')</span>
9+
<div x-show="isTyping" x-cloak>
10+
@foreach($passwordRules as $ruleName => $ruleIsValid)
11+
<div class="flex items-center w-full mt-4 space-x-2">
12+
@if ($ruleIsValid)
13+
<div class="flex items-center justify-center flex-shrink-0 w-5 h-5 rounded-full bg-theme-success-200">
14+
@svg('checkmark', 'text-theme-success-500 h-2 w-2')
15+
@elseif(! $ruleIsValid)
16+
<div class="flex items-center justify-center flex-shrink-0 w-5 h-5 rounded-full border-2 border-theme-secondary-700">
17+
@else
18+
<div class="flex items-center justify-center flex-shrink-0 w-5 h-5 rounded-full bg-theme-danger-200">
19+
@svg('exclamation', 'text-theme-danger-500 h-5 w-5')
20+
@endif
21+
</div>
22+
<span class="text-theme-secondary-900">@lang('fortify::forms.password-rules.' .Str::snake($ruleName))</span>
23+
</div>
24+
@endforeach
25+
</div>
2726
</div>
2827
</div>

resources/views/profile/delete-user-form.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div>
2-
<div class="flex flex-col px-8 lg:p-8 xl:mx-8">
2+
<div class="flex flex-col">
33
<span class="text-2xl font-semibold text-theme-secondary-900">@lang('fortify::pages.user-settings.delete_account_title')</span>
44
<span>
55
@lang('fortify::pages.user-settings.delete_account_description')
@@ -15,7 +15,7 @@
1515
</div>
1616

1717
@if($this->confirmingUserDeletion)
18-
<x-ark-modal>
18+
<x-ark-modal title-class="header-2" width-class="max-w-xl">
1919
<x-slot name="title">
2020
@lang('fortify::forms.delete-user.title')
2121
</x-slot>

resources/views/profile/two-factor-authentication-form.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
@endif
6565

6666
@if($showingRecoveryCodes)
67-
<x-ark-modal>
67+
<x-ark-modal title-class="header-2">
6868
@slot('title')
6969
@lang('fortify::pages.user-settings.2fa_reset_code_title')
7070
@endslot

0 commit comments

Comments
 (0)