Skip to content

Commit

Permalink
Merge pull request #21 from rema424/rema424-patch-1
Browse files Browse the repository at this point in the history
chore: ensure proper Tailwind formatting & improve consistency
  • Loading branch information
kresnasatya authored Jan 30, 2025
2 parents 6455989 + 3d37555 commit 82626fe
Show file tree
Hide file tree
Showing 31 changed files with 517 additions and 238 deletions.
6 changes: 3 additions & 3 deletions stubs/inertia-svelte-ts/resources/js/Components/Modal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@

{#if show}
<div bind:this={dialog} style:display={show ? 'contents' : 'none'}>
<div class="fixed inset-0 z-50 px-4 py-6 overflow-y-auto sm:px-0" scroll-region>
<div class="fixed inset-0 z-50 overflow-y-auto px-4 py-6 sm:px-0" scroll-region>
<div
in:fade={{ duration: 300, easing: cubicOut }}
out:fade={{ duration: 200, easing: cubicIn }}
>
<!-- svelte-ignore a11y_consider_explicit_label -->
<button class="fixed inset-0 transition-all transform-select-none" onclick={close}>
<button class="transform-select-none fixed inset-0 transition-all" onclick={close}>
<div class="absolute inset-0 bg-gray-500 opacity-75 dark:bg-gray-900">
&nbsp;
</div>
Expand All @@ -74,7 +74,7 @@
out:fade={{ duration: 200, easing: cubicIn }}
>
<div
class="mb-6 bg-white dark:bg-gray-800 rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full sm:mx-auto {maxWidthClass}"
class="mb-6 transform overflow-hidden rounded-lg bg-white shadow-xl transition-all sm:mx-auto sm:w-full dark:bg-gray-800 {maxWidthClass}"
>
{@render children()}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<Link
{...attrs}
class={active
? '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'}
? 'inline-flex items-center border-b-2 border-indigo-400 px-1 pt-1 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out focus:border-indigo-700 focus:outline-none dark:border-indigo-600 dark:text-gray-100'
: 'inline-flex items-center border-b-2 border-transparent px-1 pt-1 text-sm font-medium leading-5 text-gray-500 transition duration-150 ease-in-out hover:border-gray-300 hover:text-gray-700 focus:border-gray-300 focus:text-gray-700 focus:outline-none dark:text-gray-400 dark:hover:border-gray-700 dark:hover:text-gray-300 dark:focus:border-gray-700 dark:focus:text-gray-300'}
>
{@render children()}
</Link>
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<div class="min-h-screen bg-gray-100 dark:bg-gray-900">
<nav class="border-b border-gray-100 bg-white dark:border-gray-700 dark:bg-gray-800">
<!-- Primary Navigation Menu -->
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
<div class="flex h-16 justify-between">
<div class="flex">
<!-- Logo -->
<div class="shrink-0 flex items-center">
<div class="flex shrink-0 items-center">
<a use:inertia href={route('dashboard')}>
<ApplicationLogo
class="block h-9 w-auto fill-current text-gray-800 dark:text-gray-200"
Expand Down Expand Up @@ -135,7 +135,7 @@

<!-- Page Heading -->
{#if header}
<header class="bg-white dark:bg-gray-800 shadow">
<header class="bg-white shadow dark:bg-gray-800">
<div class="mx-auto max-w-7xl px-4 py-6 sm:px-6 lg:px-8">
{@render header()}
</div>
Expand Down
4 changes: 2 additions & 2 deletions stubs/inertia-svelte-ts/resources/js/bootstrap.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import axios from 'axios';
window.axios = axios
window.axios = axios;

window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
6 changes: 3 additions & 3 deletions stubs/inertia-svelte/.prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"trailingComma": "none",
"printWidth": 100,
"plugins": [
"prettier-plugin-svelte",
"prettier-plugin-organize-imports",
"prettier-plugin-tailwindcss",
"prettier-plugin-svelte"
"prettier-plugin-tailwindcss"
],
"overrides": [
{
Expand All @@ -15,4 +15,4 @@
}
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
</script>

<svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg" {...attrs}>
<path d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z"/>
<path
d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z"
/>
</svg>
7 changes: 6 additions & 1 deletion stubs/inertia-svelte/resources/js/Components/Checkbox.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
let { checked = $bindable(false), class: className, ...attrs } = $props();
</script>

<input {...attrs} type="checkbox" bind:checked class="rounded border-gray-300 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:border-gray-700 dark:bg-gray-900 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800 {className}"/>
<input
{...attrs}
type="checkbox"
bind:checked
class="rounded border-gray-300 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:border-gray-700 dark:bg-gray-900 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800 {className}"
/>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<button
{...attrs}
class="inline-flex items-center rounded-md border border-transparent bg-red-600 px-4 py-2 text-xs font-semibold uppercase tracking-widest text-white transition duration-150 ease-in-out hover:bg-red-500 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 active:bg-red-700 dark:focus:ring-offset-gray-800 {className}">
class="inline-flex items-center rounded-md border border-transparent bg-red-600 px-4 py-2 text-xs font-semibold uppercase tracking-widest text-white transition duration-150 ease-in-out hover:bg-red-500 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 active:bg-red-700 dark:focus:ring-offset-gray-800 {className}"
>
{@render children()}
</button>
30 changes: 12 additions & 18 deletions stubs/inertia-svelte/resources/js/Components/Dropdown.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
content,
contentClasses = 'py-1 bg-white dark:bg-gray-700',
trigger,
width = '48',
width = '48'
} = $props();
let open = $state(false);
Expand All @@ -16,20 +16,16 @@
? 'ltr:origin-top-left rtl:origin-top-right start-0'
: align === 'right'
? 'ltr:origin-top-right rtl:origin-top-left end-0'
: 'origin-top',
)
: 'origin-top'
);
function closeOnEscape(e) {
if (open && e.key === 'Escape') {
open = false
open = false;
}
}
function enter(node, {
delay = 0,
duration = 200,
easing = cubicOut
}) {
function enter(node, { delay = 0, duration = 200, easing = cubicOut }) {
return {
delay,
duration,
Expand All @@ -38,14 +34,10 @@
opacity: ${t};
transform: scale(${0.95 + 0.05 * t});
`
}
};
}
function leave(node, {
delay = 0,
duration = 75,
easing = cubicIn
}) {
function leave(node, { delay = 0, duration = 75, easing = cubicIn }) {
return {
delay,
duration,
Expand All @@ -54,7 +46,7 @@
opacity: ${t};
transform: scale(${0.95 + 0.05 * t});
`
}
};
}
</script>

Expand All @@ -71,8 +63,10 @@
{#if open}
<div class="fixed inset-0 z-40" onclick={() => (open = false)}></div>
<div in:enter out:leave>
<div class="absolute z-50 mt-2 rounded-md shadow-lg {widthClass} {alignmentClasses}"
onclick={() => (open = false)}>
<div
class="absolute z-50 mt-2 rounded-md shadow-lg {widthClass} {alignmentClasses}"
onclick={() => (open = false)}
>
<div class="rounded-md ring-1 ring-black ring-opacity-5 {contentClasses}">
{@render content()}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

{#if message}
<div {...attrs}>
<p class="text-sm text-red-600 dark:text-red-400">{ message }</p>
<p class="text-sm text-red-600 dark:text-red-400">{message}</p>
</div>
{/if}
68 changes: 43 additions & 25 deletions stubs/inertia-svelte/resources/js/Components/Modal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@
/** @type {HTMLDivElement} */
let dialog;
let { children, closeable = true, maxWidth = '2xl', onclose = () => {}, show = false } = $props();
let {
children,
closeable = true,
maxWidth = '2xl',
onclose = () => {},
show = false
} = $props();
$effect(() => {
if (show) document.body.appendChild(dialog);
Expand All @@ -21,40 +27,52 @@
if (closeable) {
onclose();
}
}
};
const closeOnEscape = (e) => {
if (e.key === 'Escape' && show) {
close();
}
}
let maxWidthClass = $derived({
'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]);
};
let maxWidthClass = $derived(
{
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]
);
</script>

<svelte:window onkeydown={closeOnEscape}/>
<svelte:window onkeydown={closeOnEscape} />

{#if show}
<div bind:this={dialog} style:display={show ? 'contents' : 'none'}>
<div class="fixed inset-0 z-50 px-4 py-6 overflow-y-auto sm:px-0" scroll-region>
<div in:fade={{ duration: 300, easing: cubicOut }} out:fade={{ duration: 200, easing: cubicIn }}>
<!-- svelte-ignore a11y_consider_explicit_label -->
<button class="fixed inset-0 transition-all transform-select-none" onclick={close}>
<div class="absolute inset-0 bg-gray-500 opacity-75 dark:bg-gray-900">&nbsp;</div>
</button>
</div>
<div bind:this={dialog} style:display={show ? 'contents' : 'none'}>
<div class="fixed inset-0 z-50 overflow-y-auto px-4 py-6 sm:px-0" scroll-region>
<div
in:fade={{ duration: 300, easing: cubicOut }}
out:fade={{ duration: 200, easing: cubicIn }}
>
<!-- svelte-ignore a11y_consider_explicit_label -->
<button class="transform-select-none fixed inset-0 transition-all" onclick={close}>
<div class="absolute inset-0 bg-gray-500 opacity-75 dark:bg-gray-900">
&nbsp;
</div>
</button>
</div>

<div in:fade={{ duration: 300, easing: cubicOut }} out:fade={{ duration: 200, easing: cubicIn }}>
<div class="mb-6 bg-white dark:bg-gray-800 rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full sm:mx-auto {maxWidthClass}">
{@render children()}
<div
in:fade={{ duration: 300, easing: cubicOut }}
out:fade={{ duration: 200, easing: cubicIn }}
>
<div
class="mb-6 transform overflow-hidden rounded-lg bg-white shadow-xl transition-all sm:mx-auto sm:w-full dark:bg-gray-800 {maxWidthClass}"
>
{@render children()}
</div>
</div>
</div>
</div>
</div>
{/if}
{/if}
10 changes: 7 additions & 3 deletions stubs/inertia-svelte/resources/js/Components/NavLink.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
import { Link } from '@inertiajs/svelte';
let { active = false, children, href, ...attrs } = $props();
</script>

<Link {...attrs} {href} class={active ? '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'}>
<Link
{...attrs}
{href}
class={active
? 'inline-flex items-center border-b-2 border-indigo-400 px-1 pt-1 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out focus:border-indigo-700 focus:outline-none dark:border-indigo-600 dark:text-gray-100'
: 'inline-flex items-center border-b-2 border-transparent px-1 pt-1 text-sm font-medium leading-5 text-gray-500 transition duration-150 ease-in-out hover:border-gray-300 hover:text-gray-700 focus:border-gray-300 focus:text-gray-700 focus:outline-none dark:text-gray-400 dark:hover:border-gray-700 dark:hover:text-gray-300 dark:focus:border-gray-700 dark:focus:text-gray-300'}
>
{@render children()}
</Link>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
let { children, class: className, ...attrs } = $props();
</script>

<button {...attrs} class="inline-flex items-center rounded-md border border-transparent bg-gray-800 px-4 py-2 text-xs font-semibold uppercase tracking-widest text-white transition duration-150 ease-in-out hover:bg-gray-700 focus:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 active:bg-gray-900 dark:bg-gray-200 dark:text-gray-800 dark:hover:bg-white dark:focus:bg-white dark:focus:ring-offset-gray-800 dark:active:bg-gray-300 {className}">
<button
{...attrs}
class="inline-flex items-center rounded-md border border-transparent bg-gray-800 px-4 py-2 text-xs font-semibold uppercase tracking-widest text-white transition duration-150 ease-in-out hover:bg-gray-700 focus:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 active:bg-gray-900 dark:bg-gray-200 dark:text-gray-800 dark:hover:bg-white dark:focus:bg-white dark:focus:ring-offset-gray-800 dark:active:bg-gray-300 {className}"
>
{@render children()}
</button>
Loading

0 comments on commit 82626fe

Please sign in to comment.