From c6070ea34295de75acdb31680f98be53d66925b8 Mon Sep 17 00:00:00 2001 From: Clovis Muneza Date: Tue, 30 Sep 2025 06:18:53 +0000 Subject: [PATCH 1/3] chore: run prettier --- resources/components/alert.blade.php | 2 +- resources/components/aspect-ratio.blade.php | 2 +- resources/components/badge.blade.php | 2 +- resources/components/button.blade.php | 2 +- resources/components/dialog.blade.php | 5 ++--- resources/components/popover.blade.php | 6 +++--- resources/components/slide-over.blade.php | 2 +- resources/components/toggle.blade.php | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/resources/components/alert.blade.php b/resources/components/alert.blade.php index 1782ba9..44c973f 100644 --- a/resources/components/alert.blade.php +++ b/resources/components/alert.blade.php @@ -2,7 +2,7 @@ 'variant' => 'default', 'title', 'icon', - 'content' + 'content', ]) @php diff --git a/resources/components/aspect-ratio.blade.php b/resources/components/aspect-ratio.blade.php index d68b4c0..3fcee9b 100644 --- a/resources/components/aspect-ratio.blade.php +++ b/resources/components/aspect-ratio.blade.php @@ -11,7 +11,7 @@
twMerge('relative w-full') }} :style="{'padding-bottom': `${100 / {{ (float) $ratio }} }%`}"> -
+
{{ $slot }}
diff --git a/resources/components/badge.blade.php b/resources/components/badge.blade.php index d5b41cc..0d1bfac 100644 --- a/resources/components/badge.blade.php +++ b/resources/components/badge.blade.php @@ -10,7 +10,7 @@ default => 'bg-primary text-primary-foreground hover:bg-primary/80 border-transparent shadow', }; - $defaultClasses = 'focus:ring-ring inline-flex items-center rounded-md border px-3 py-1 text-xs font-semibold transition-colors focus:ring-2 focus:ring-offset-2 focus:outline-none'; + $defaultClasses = 'focus:ring-ring inline-flex items-center rounded-md border px-3 py-1 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-offset-2'; @endphp
twMerge($defaultClasses, $variantClasses) }}>{{ $slot }}
diff --git a/resources/components/button.blade.php b/resources/components/button.blade.php index 3db30b8..f898808 100644 --- a/resources/components/button.blade.php +++ b/resources/components/button.blade.php @@ -25,7 +25,7 @@ 'focus-visible:ring-ring inline-flex items-center justify-center gap-2', 'rounded-md text-sm font-medium whitespace-nowrap transition-colors duration-75', 'hover:cursor-pointer focus-visible:ring-1 focus-visible:outline-none', - 'disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0' + 'disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0', ); $tag = $asLink ? 'a' : 'button'; diff --git a/resources/components/dialog.blade.php b/resources/components/dialog.blade.php index 314bcd1..6fed679 100644 --- a/resources/components/dialog.blade.php +++ b/resources/components/dialog.blade.php @@ -58,7 +58,7 @@
+ class="bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg">
attributes->twMerge('flex flex-col gap-2 text-center sm:text-left') }}>
attributes->twMerge('text-lg font-semibold') }}> {{ $title }} @@ -68,8 +68,7 @@ class="bg-background data-[state=open]:animate-in data-[state=closed]:animate-ou
-
attributes->twMerge('flex flex-col-reverse items-center sm:[align-items:unset] sm:flex-row sm:justify-end gap-2') }}> +
attributes->twMerge('flex flex-col-reverse items-center sm:[align-items:unset] sm:flex-row sm:justify-end gap-2') }}> @foreach ($orderedButtons as $name) {{ $$name }} @endforeach diff --git a/resources/components/popover.blade.php b/resources/components/popover.blade.php index d16fda9..0ac5ccb 100644 --- a/resources/components/popover.blade.php +++ b/resources/components/popover.blade.php @@ -18,7 +18,7 @@ const trigger = $refs.trigger.firstElementChild || $refs.trigger const rect = trigger.getBoundingClientRect() const align = '{{ $align }}' - const popover = $refs.content; + const popover = $refs.content // Get popover dimensions (estimate if not visible) const popoverWidth = popover?.offsetWidth || 288 // w-72 = 18rem = 288px @@ -88,7 +88,7 @@ }, }" x-on:scroll.window="open && positionPopover()" - x-on:click.outside="!$refs.content?.contains($event.target) ? open = false : null" + x-on:click.outside="! $refs.content?.contains($event.target) ? (open = false) : null" x-on:keydown.escape.window="open = false" x-on:click=" positionPopover() @@ -96,7 +96,7 @@ " x-bind:data-state="open ? 'open' : 'closed'" :id="$id('popover')" - data-slot='popover' + data-slot="popover" {{ $attributes->twMerge('relative group') }}>
attributes }} diff --git a/resources/components/slide-over.blade.php b/resources/components/slide-over.blade.php index 838d870..2d542fd 100644 --- a/resources/components/slide-over.blade.php +++ b/resources/components/slide-over.blade.php @@ -41,7 +41,7 @@ 'bottom' => 'data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 h-auto border-t', }; - if(isset($trigger)) { + if (isset($trigger)) { $triggerAttributes = $trigger->attributes->merge(['x-on:click' => 'open()']); $triggerAttributes->twMerge('h-max w-max'); diff --git a/resources/components/toggle.blade.php b/resources/components/toggle.blade.php index eadf54f..1be19bc 100644 --- a/resources/components/toggle.blade.php +++ b/resources/components/toggle.blade.php @@ -6,7 +6,7 @@ ]) @php - $defaultClasses = 'hover:bg-muted hover:text-muted-foreground focus-visible:ring-ring data-[state=on]:bg-accent data-[state=on]:text-accent-foreground inline-flex items-center justify-center gap-2 rounded-md text-sm font-medium transition-colors hover:cursor-pointer focus-visible:ring-1 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0'; + $defaultClasses = 'hover:bg-muted hover:text-muted-foreground focus-visible:ring-ring data-[state=on]:bg-accent data-[state=on]:text-accent-foreground inline-flex items-center justify-center gap-2 rounded-md text-sm font-medium transition-colors hover:cursor-pointer focus-visible:outline-none focus-visible:ring-1 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0'; $variantClasses = match ($variant) { 'outline' => 'border-input hover:bg-accent hover:text-accent-foreground border bg-transparent shadow-sm', From fba29815d875a4ba7bb3a76839f7af2011f54da6 Mon Sep 17 00:00:00 2001 From: Clovis Muneza Date: Tue, 30 Sep 2025 06:20:07 +0000 Subject: [PATCH 2/3] chore: setup prettier and plugins --- .blade.format.json | 15 +++++++++++++++ .gitignore | 1 + .prettierignore | 5 +++++ .prettierrc | 20 ++++++++++++++++++++ package.json | 15 +++++++++++++++ 5 files changed, 56 insertions(+) create mode 100644 .blade.format.json create mode 100644 .prettierignore create mode 100644 .prettierrc create mode 100644 package.json diff --git a/.blade.format.json b/.blade.format.json new file mode 100644 index 0000000..179ec52 --- /dev/null +++ b/.blade.format.json @@ -0,0 +1,15 @@ +{ + "echoStyle": "block", + "phpOptions": { + "singleQuotes": false, + "phpVersion": "8.2" + }, + "formatDirectivePhpParameters": true, + "formatDirectiveJsonParameters": true, + "formatInsideEcho": true, + "spacesAfterDirective": 0, + "spacesAfterControlDirective": 1, + "ignoreDirectives": [], + "customIfs": [], + "useLaravelPint": true +} diff --git a/.gitignore b/.gitignore index a4a031f..b0fb83c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vendor/ /build/ +/node_modules/ diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..394f5da --- /dev/null +++ b/.prettierignore @@ -0,0 +1,5 @@ +node_modules +pnpm-lock.yaml +composer.lock +vendor +resources/css/tw-animate-css.css diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..a895bc7 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,20 @@ +{ + "semi": false, + "tabWidth": 4, + "useTabs": false, + "printWidth": 160, + "singleQuote": true, + "bracketSameLine": true, + "singleAttributePerLine": true, + "htmlWhitespaceSensitivity": "css", + "tailwindFunctions": ["clsx", "cn", "twMerge"], + "plugins": ["prettier-plugin-blade", "prettier-plugin-tailwindcss"], + "overrides": [ + { + "files": ["*.blade.php"], + "options": { + "parser": "blade" + } + } + ] +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..87d8726 --- /dev/null +++ b/package.json @@ -0,0 +1,15 @@ +{ + "name": "mog", + "version": "1.0.0", + "private": true, + "scripts": { + "format": "prettier --write resources", + "format:check": "prettier --check resources" + }, + "devDependencies": { + "prettier": "^3.0.0", + "prettier-plugin-blade": "^2.0.0", + "prettier-plugin-tailwindcss": "^0.5.0", + "tailwindcss": "^4.1.13" + } +} From ffb4706952fb614770f9b8849a85345d1f413c5c Mon Sep 17 00:00:00 2001 From: Clovis Muneza Date: Tue, 30 Sep 2025 06:26:59 +0000 Subject: [PATCH 3/3] actually dont need tailwind as dependency --- package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 87d8726..217f450 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,12 @@ "version": "1.0.0", "private": true, "scripts": { - "format": "prettier --write resources", - "format:check": "prettier --check resources" + "format": "prettier --write resources .github/workflows", + "format:check": "prettier --check resources .github/workflows" }, "devDependencies": { "prettier": "^3.0.0", "prettier-plugin-blade": "^2.0.0", - "prettier-plugin-tailwindcss": "^0.5.0", - "tailwindcss": "^4.1.13" + "prettier-plugin-tailwindcss": "^0.5.0" } }