build(deps): add prettier plugin tailwindcss (#25)

zhaiyuxin103 · Apr 19, 2024 · 38575f8 · 38575f8
1 parent f1bd814
commit 38575f8
Show file tree

Hide file tree

Showing 41 changed files with 240 additions and 164 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
         "postcss": "^8.4.32",
         "prettier": "^3.2.5",
         "prettier-plugin-blade": "^2.1.12",
+        "prettier-plugin-tailwindcss": "^0.5.14",
         "tailwindcss": "^3.4.0",
         "vite": "^5.0",
         "vitepress": "^1.0.2",

diff --git a/prettier.config.js b/prettier.config.js
@@ -1,5 +1,5 @@
 export default {
-    plugins: ['prettier-plugin-blade'],
+    plugins: ['prettier-plugin-blade', 'prettier-plugin-tailwindcss'],
     singleQuote: true,
     overrides: [
         {

diff --git a/resources/views/api/api-token-manager.blade.php b/resources/views/api/api-token-manager.blade.php
@@ -31,7 +31,7 @@ class="mt-1 block w-full"
                         value="{{ __('Permissions') }}"
                     />
 
-                    <div class="mt-2 grid grid-cols-1 md:grid-cols-2 gap-4">
+                    <div class="mt-2 grid grid-cols-1 gap-4 md:grid-cols-2">
                         @foreach (Laravel\Jetstream\Jetstream::$permissions as $permission)
                             <label class="flex items-center">
                                 <x-checkbox
@@ -84,7 +84,7 @@ class="ms-2 text-sm text-gray-600 dark:text-gray-400"
                                     {{ $token->name }}
                                 </div>
 
-                                <div class="flex items-center ms-2">
+                                <div class="ms-2 flex items-center">
                                     @if ($token->last_used_at)
                                         <div class="text-sm text-gray-400">
                                             {{ __('Last used') }}
@@ -94,15 +94,15 @@ class="ms-2 text-sm text-gray-600 dark:text-gray-400"
 
                                     @if (Laravel\Jetstream\Jetstream::hasPermissions())
                                         <button
-                                            class="cursor-pointer ms-6 text-sm text-gray-400 underline"
+                                            class="ms-6 cursor-pointer text-sm text-gray-400 underline"
                                             wire:click="manageApiTokenPermissions({{ $token->id }})"
                                         >
                                             {{ __('Permissions') }}
                                         </button>
                                     @endif
 
                                     <button
-                                        class="cursor-pointer ms-6 text-sm text-red-500"
+                                        class="ms-6 cursor-pointer text-sm text-red-500"
                                         wire:click="confirmApiTokenDeletion({{ $token->id }})"
                                     >
                                         {{ __('Delete') }}
@@ -132,7 +132,7 @@ class="cursor-pointer ms-6 text-sm text-red-500"
                 type="text"
                 readonly
                 :value="$plainTextToken"
-                class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full break-all"
+                class="mt-4 w-full break-all rounded bg-gray-100 px-4 py-2 font-mono text-sm text-gray-500"
                 autofocus
                 autocomplete="off"
                 autocorrect="off"
@@ -159,7 +159,7 @@ class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full
         </x-slot>
 
         <x-slot name="content">
-            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
                 @foreach (Laravel\Jetstream\Jetstream::$permissions as $permission)
                     <label class="flex items-center">
                         <x-checkbox

diff --git a/resources/views/api/index.blade.php b/resources/views/api/index.blade.php
@@ -1,14 +1,14 @@
 <x-app-layout>
     <x-slot name="header">
         <h2
-            class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight"
+            class="text-xl font-semibold leading-tight text-gray-800 dark:text-gray-200"
         >
             {{ __('API Tokens') }}
         </h2>
     </x-slot>
 
     <div>
-        <div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
+        <div class="mx-auto max-w-7xl py-10 sm:px-6 lg:px-8">
             @livewire('api.api-token-manager')
         </div>
     </div>

diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php
@@ -17,7 +17,7 @@
                 <x-label for="password" value="{{ __('Password') }}" />
                 <x-input
                     id="password"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="password"
                     name="password"
                     required
@@ -26,7 +26,7 @@ class="block mt-1 w-full"
                 />
             </div>
 
-            <div class="flex justify-end mt-4">
+            <div class="mt-4 flex justify-end">
                 <x-button class="ms-4">
                     {{ __('Confirm') }}
                 </x-button>

diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php
@@ -10,7 +10,7 @@
 
         @session('status')
             <div
-                class="mb-4 font-medium text-sm text-green-600 dark:text-green-400"
+                class="mb-4 text-sm font-medium text-green-600 dark:text-green-400"
             >
                 {{ $value }}
             </div>
@@ -25,7 +25,7 @@ class="mb-4 font-medium text-sm text-green-600 dark:text-green-400"
                 <x-label for="email" value="{{ __('Email') }}" />
                 <x-input
                     id="email"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="email"
                     name="email"
                     :value="old('email')"
@@ -35,7 +35,7 @@ class="block mt-1 w-full"
                 />
             </div>
 
-            <div class="flex items-center justify-end mt-4">
+            <div class="mt-4 flex items-center justify-end">
                 <x-button>
                     {{ __('Email Password Reset Link') }}
                 </x-button>

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -8,7 +8,7 @@
 
         @session('status')
             <div
-                class="mb-4 font-medium text-sm text-green-600 dark:text-green-400"
+                class="mb-4 text-sm font-medium text-green-600 dark:text-green-400"
             >
                 {{ $value }}
             </div>
@@ -21,7 +21,7 @@ class="mb-4 font-medium text-sm text-green-600 dark:text-green-400"
                 <x-label for="email" value="{{ __('Email') }}" />
                 <x-input
                     id="email"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="email"
                     name="email"
                     :value="old('email')"
@@ -35,15 +35,15 @@ class="block mt-1 w-full"
                 <x-label for="password" value="{{ __('Password') }}" />
                 <x-input
                     id="password"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="password"
                     name="password"
                     required
                     autocomplete="current-password"
                 />
             </div>
 
-            <div class="block mt-4">
+            <div class="mt-4 block">
                 <label for="remember_me" class="flex items-center">
                     <x-checkbox id="remember_me" name="remember" />
                     <span class="ms-2 text-sm text-gray-600 dark:text-gray-400">
@@ -52,10 +52,10 @@ class="block mt-1 w-full"
                 </label>
             </div>
 
-            <div class="flex items-center justify-end mt-4">
+            <div class="mt-4 flex items-center justify-end">
                 @if (Route::has('password.request'))
                     <a
-                        class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+                        class="rounded-md text-sm text-gray-600 underline hover:text-gray-900 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:text-gray-400 dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
                         href="{{ route('password.request') }}"
                     >
                         {{ __('Forgot your password?') }}

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -13,7 +13,7 @@
                 <x-label for="name" value="{{ __('Name') }}" />
                 <x-input
                     id="name"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="text"
                     name="name"
                     :value="old('name')"
@@ -27,7 +27,7 @@ class="block mt-1 w-full"
                 <x-label for="email" value="{{ __('Email') }}" />
                 <x-input
                     id="email"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="email"
                     name="email"
                     :value="old('email')"
@@ -40,7 +40,7 @@ class="block mt-1 w-full"
                 <x-label for="password" value="{{ __('Password') }}" />
                 <x-input
                     id="password"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="password"
                     name="password"
                     required
@@ -55,7 +55,7 @@ class="block mt-1 w-full"
                 />
                 <x-input
                     id="password_confirmation"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="password"
                     name="password_confirmation"
                     required
@@ -82,9 +82,9 @@ class="block mt-1 w-full"
                 </div>
             @endif
 
-            <div class="flex items-center justify-end mt-4">
+            <div class="mt-4 flex items-center justify-end">
                 <a
-                    class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+                    class="rounded-md text-sm text-gray-600 underline hover:text-gray-900 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:text-gray-400 dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
                     href="{{ route('login') }}"
                 >
                     {{ __('Already registered?') }}

diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php
@@ -19,7 +19,7 @@
                 <x-label for="email" value="{{ __('Email') }}" />
                 <x-input
                     id="email"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="email"
                     name="email"
                     :value="old('email', $request->email)"
@@ -33,7 +33,7 @@ class="block mt-1 w-full"
                 <x-label for="password" value="{{ __('Password') }}" />
                 <x-input
                     id="password"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="password"
                     name="password"
                     required
@@ -48,15 +48,15 @@ class="block mt-1 w-full"
                 />
                 <x-input
                     id="password_confirmation"
-                    class="block mt-1 w-full"
+                    class="mt-1 block w-full"
                     type="password"
                     name="password_confirmation"
                     required
                     autocomplete="new-password"
                 />
             </div>
 
-            <div class="flex items-center justify-end mt-4">
+            <div class="mt-4 flex items-center justify-end">
                 <x-button>
                     {{ __('Reset Password') }}
                 </x-button>

diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php
@@ -29,7 +29,7 @@ class="mb-4 text-sm text-gray-600 dark:text-gray-400"
                     <x-label for="code" value="{{ __('Code') }}" />
                     <x-input
                         id="code"
-                        class="block mt-1 w-full"
+                        class="mt-1 block w-full"
                         type="text"
                         inputmode="numeric"
                         name="code"
@@ -46,18 +46,18 @@ class="block mt-1 w-full"
                     />
                     <x-input
                         id="recovery_code"
-                        class="block mt-1 w-full"
+                        class="mt-1 block w-full"
                         type="text"
                         name="recovery_code"
                         x-ref="recovery_code"
                         autocomplete="one-time-code"
                     />
                 </div>
 
-                <div class="flex items-center justify-end mt-4">
+                <div class="mt-4 flex items-center justify-end">
                     <button
                         type="button"
-                        class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 underline cursor-pointer"
+                        class="cursor-pointer text-sm text-gray-600 underline hover:text-gray-900 dark:text-gray-400"
                         x-show="! recovery"
                         x-on:click="
                             recovery = true
@@ -71,7 +71,7 @@ class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 underline cu
 
                     <button
                         type="button"
-                        class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 underline cursor-pointer"
+                        class="cursor-pointer text-sm text-gray-600 underline hover:text-gray-900 dark:text-gray-400"
                         x-cloak
                         x-show="recovery"
                         x-on:click="