From 6e986d9553a9c75475dc3f4cfa24c0ab8d877398 Mon Sep 17 00:00:00 2001 From: punkfairie Date: Thu, 20 Feb 2025 17:43:36 -0800 Subject: [PATCH] fully de-tailwind --- .../components/auth-session-status.blade.php | 10 +- .../views/components/danger-button.blade.php | 3 - .../views/components/dropdown-link.blade.php | 1 - resources/views/components/dropdown.blade.php | 35 ----- .../views/components/input-label.blade.php | 5 - resources/views/components/modal.blade.php | 78 ----------- resources/views/components/nav-link.blade.php | 11 -- .../views/components/primary-button.blade.php | 3 - .../components/responsive-nav-link.blade.php | 11 -- .../components/secondary-button.blade.php | 3 - .../views/components/text-input.blade.php | 3 - resources/views/dashboard.blade.php | 18 +-- resources/views/layouts/app.blade.php | 28 ++-- resources/views/layouts/navigation.blade.php | 114 +++-------------- resources/views/profile/edit.blade.php | 29 +---- .../partials/delete-user-form.blade.php | 55 -------- .../partials/update-password-form.blade.php | 87 +++++++------ .../update-profile-information-form.blade.php | 121 +++++++++--------- 18 files changed, 152 insertions(+), 463 deletions(-) delete mode 100644 resources/views/components/danger-button.blade.php delete mode 100644 resources/views/components/dropdown-link.blade.php delete mode 100644 resources/views/components/dropdown.blade.php delete mode 100644 resources/views/components/input-label.blade.php delete mode 100644 resources/views/components/modal.blade.php delete mode 100644 resources/views/components/nav-link.blade.php delete mode 100644 resources/views/components/primary-button.blade.php delete mode 100644 resources/views/components/responsive-nav-link.blade.php delete mode 100644 resources/views/components/secondary-button.blade.php delete mode 100644 resources/views/components/text-input.blade.php delete mode 100644 resources/views/profile/partials/delete-user-form.blade.php diff --git a/resources/views/components/auth-session-status.blade.php b/resources/views/components/auth-session-status.blade.php index a39bc7d..8417f53 100644 --- a/resources/views/components/auth-session-status.blade.php +++ b/resources/views/components/auth-session-status.blade.php @@ -1,7 +1,9 @@ -@props(['status']) +@props([ + 'status', +]) @if ($status) -
merge(['class' => 'font-medium text-sm text-green-600 dark:text-green-400']) }}> - {{ $status }} -
+
+ {{ $status }} +
@endif diff --git a/resources/views/components/danger-button.blade.php b/resources/views/components/danger-button.blade.php deleted file mode 100644 index d7417b2..0000000 --- a/resources/views/components/danger-button.blade.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/resources/views/components/dropdown-link.blade.php b/resources/views/components/dropdown-link.blade.php deleted file mode 100644 index 6d5279d..0000000 --- a/resources/views/components/dropdown-link.blade.php +++ /dev/null @@ -1 +0,0 @@ -merge(['class' => 'block w-full px-4 py-2 text-start text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out']) }}>{{ $slot }} diff --git a/resources/views/components/dropdown.blade.php b/resources/views/components/dropdown.blade.php deleted file mode 100644 index e4106a4..0000000 --- a/resources/views/components/dropdown.blade.php +++ /dev/null @@ -1,35 +0,0 @@ -@props(['align' => 'right', 'width' => '48', 'contentClasses' => 'py-1 bg-white dark:bg-gray-700']) - -@php -$alignmentClasses = match ($align) { - 'left' => 'ltr:origin-top-left rtl:origin-top-right start-0', - 'top' => 'origin-top', - default => 'ltr:origin-top-right rtl:origin-top-left end-0', -}; - -$width = match ($width) { - '48' => 'w-48', - default => $width, -}; -@endphp - -
-
- {{ $trigger }} -
- - -
diff --git a/resources/views/components/input-label.blade.php b/resources/views/components/input-label.blade.php deleted file mode 100644 index c4d073e..0000000 --- a/resources/views/components/input-label.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@props(['value']) - - diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php deleted file mode 100644 index 384662a..0000000 --- a/resources/views/components/modal.blade.php +++ /dev/null @@ -1,78 +0,0 @@ -@props([ - 'name', - 'show' => false, - 'maxWidth' => '2xl' -]) - -@php -$maxWidth = [ - 'sm' => 'sm:max-w-sm', - 'md' => 'sm:max-w-md', - 'lg' => 'sm:max-w-lg', - 'xl' => 'sm:max-w-xl', - '2xl' => 'sm:max-w-2xl', -][$maxWidth]; -@endphp - -
-
-
-
- -
- {{ $slot }} -
-
diff --git a/resources/views/components/nav-link.blade.php b/resources/views/components/nav-link.blade.php deleted file mode 100644 index 37bad55..0000000 --- a/resources/views/components/nav-link.blade.php +++ /dev/null @@ -1,11 +0,0 @@ -@props(['active']) - -@php -$classes = ($active ?? false) - ? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 dark:border-indigo-600 text-sm font-medium leading-5 text-gray-900 dark:text-gray-100 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out' - : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 hover:border-gray-300 dark:hover:border-gray-700 focus:outline-none focus:text-gray-700 dark:focus:text-gray-300 focus:border-gray-300 dark:focus:border-gray-700 transition duration-150 ease-in-out'; -@endphp - -merge(['class' => $classes]) }}> - {{ $slot }} - diff --git a/resources/views/components/primary-button.blade.php b/resources/views/components/primary-button.blade.php deleted file mode 100644 index 99bf389..0000000 --- a/resources/views/components/primary-button.blade.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/resources/views/components/responsive-nav-link.blade.php b/resources/views/components/responsive-nav-link.blade.php deleted file mode 100644 index 98b55d1..0000000 --- a/resources/views/components/responsive-nav-link.blade.php +++ /dev/null @@ -1,11 +0,0 @@ -@props(['active']) - -@php -$classes = ($active ?? false) - ? 'block w-full ps-3 pe-4 py-2 border-l-4 border-indigo-400 dark:border-indigo-600 text-start text-base font-medium text-indigo-700 dark:text-indigo-300 bg-indigo-50 dark:bg-indigo-900/50 focus:outline-none focus:text-indigo-800 dark:focus:text-indigo-200 focus:bg-indigo-100 dark:focus:bg-indigo-900 focus:border-indigo-700 dark:focus:border-indigo-300 transition duration-150 ease-in-out' - : 'block w-full ps-3 pe-4 py-2 border-l-4 border-transparent text-start text-base font-medium text-gray-600 dark:text-gray-400 hover:text-gray-800 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 hover:border-gray-300 dark:hover:border-gray-600 focus:outline-none focus:text-gray-800 dark:focus:text-gray-200 focus:bg-gray-50 dark:focus:bg-gray-700 focus:border-gray-300 dark:focus:border-gray-600 transition duration-150 ease-in-out'; -@endphp - -merge(['class' => $classes]) }}> - {{ $slot }} - diff --git a/resources/views/components/secondary-button.blade.php b/resources/views/components/secondary-button.blade.php deleted file mode 100644 index fa1c549..0000000 --- a/resources/views/components/secondary-button.blade.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/resources/views/components/text-input.blade.php b/resources/views/components/text-input.blade.php deleted file mode 100644 index 3f44b2f..0000000 --- a/resources/views/components/text-input.blade.php +++ /dev/null @@ -1,3 +0,0 @@ -@props(['disabled' => false]) - -merge(['class' => 'border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm']) }}> diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 4024c64..6b92633 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -1,17 +1,7 @@ - -

- {{ __('Dashboard') }} -

-
+ +

Dashboard

+ -
-
-
-
- {{ __("You're logged in!") }} -
-
-
-
+
You're logged in!
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 9766b2e..11da659 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -2,23 +2,19 @@ @include('layouts.head') - -
- @include('layouts.navigation') + + @include('layouts.navigation') - - @isset($header) -
-
- {{ $header }} -
-
- @endisset + + @isset($header) +
+ {{ $header }} +
+ @endisset - -
- {{ $slot }} -
-
+ +
+ {{ $slot }} +
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index c64bf64..69b7127 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -1,100 +1,24 @@ - diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php index ef69910..4b642de 100644 --- a/resources/views/profile/edit.blade.php +++ b/resources/views/profile/edit.blade.php @@ -1,29 +1,6 @@ - -

- {{ __('Profile') }} -

-
+ Profile -
-
-
-
- @include('profile.partials.update-profile-information-form') -
-
- -
-
- @include('profile.partials.update-password-form') -
-
- -
-
- @include('profile.partials.delete-user-form') -
-
-
-
+ @include('profile.partials.update-profile-information-form') + @include('profile.partials.update-password-form')
diff --git a/resources/views/profile/partials/delete-user-form.blade.php b/resources/views/profile/partials/delete-user-form.blade.php deleted file mode 100644 index b3a6382..0000000 --- a/resources/views/profile/partials/delete-user-form.blade.php +++ /dev/null @@ -1,55 +0,0 @@ -
-
-

- {{ __('Delete Account') }} -

- -

- {{ __('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.') }} -

-
- - {{ __('Delete Account') }} - - -
- @csrf - @method('delete') - -

- {{ __('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.') }} -

- -
- - - - - -
- -
- - {{ __('Cancel') }} - - - - {{ __('Delete Account') }} - -
-
-
-
diff --git a/resources/views/profile/partials/update-password-form.blade.php b/resources/views/profile/partials/update-password-form.blade.php index acd200d..83f2402 100644 --- a/resources/views/profile/partials/update-password-form.blade.php +++ b/resources/views/profile/partials/update-password-form.blade.php @@ -1,48 +1,53 @@ -
-
-

- {{ __('Update Password') }} -

+

Update Password

-

- {{ __('Ensure your account is using a long, random password to stay secure.') }} -

-
+

Ensure your account is using a long, random password to stay secure.

-
- @csrf - @method('put') + + @csrf + @method('put') -
- - - -
+
+ + + +
-
- - - -
+
+ + + +
-
- - - -
+
+ + + +
-
- {{ __('Save') }} +
+ - @if (session('status') === 'password-updated') -

{{ __('Saved.') }}

- @endif -
- -
+ @if (session('status') === 'password-updated') +

Saved.

+ @endif + + diff --git a/resources/views/profile/partials/update-profile-information-form.blade.php b/resources/views/profile/partials/update-profile-information-form.blade.php index 7273fff..4c99e6c 100644 --- a/resources/views/profile/partials/update-profile-information-form.blade.php +++ b/resources/views/profile/partials/update-profile-information-form.blade.php @@ -1,64 +1,67 @@ -
-
-

- {{ __('Profile Information') }} -

+

Profile Information

-

- {{ __("Update your account's profile information and email address.") }} +

Update your account's profile information and email address.

+ +
+ @csrf +
+ +
+ @csrf + @method('patch') + +
+ + + +
+ +
+ + + + + @if ($user instanceof \Illuminate\Contracts\Auth\MustVerifyEmail && ! $user->hasVerifiedEmail()) +
+

+ Your email address is unverified. + +

-
- - @csrf - + @if (session('status') === 'verification-link-sent') +

A new verification link has been sent to your email address.

+ @endif + + @endif + -
- @csrf - @method('patch') +
+ -
- - - -
- -
- - - - - @if ($user instanceof \Illuminate\Contracts\Auth\MustVerifyEmail && ! $user->hasVerifiedEmail()) -
-

- {{ __('Your email address is unverified.') }} - - -

- - @if (session('status') === 'verification-link-sent') -

- {{ __('A new verification link has been sent to your email address.') }} -

- @endif -
- @endif -
- -
- {{ __('Save') }} - - @if (session('status') === 'profile-updated') -

{{ __('Saved.') }}

- @endif -
- -
+ @if (session('status') === 'profile-updated') +

Saved.

+ @endif + +