+
{{ __('shopper::pages/auth.two_factor.authentication_code') }}
{{ __('shopper::pages/auth.two_factor.recovery_code') }}
{{ __('shopper::pages/auth.two_factor.remember') }} {{ __('shopper::pages/auth.two_factor.use_recovery_code') }} @@ -46,9 +79,14 @@ class="ml-1 text-sm text-gray-500 hover:text-gray-900 underline cursor-pointer d {{ __('shopper::pages/auth.two_factor.use_authentication_code') }} diff --git a/packages/admin/resources/views/components/attribute-card.blade.php b/packages/admin/resources/views/components/attribute-card.blade.php index b4a82803c..45337c440 100644 --- a/packages/admin/resources/views/components/attribute-card.blade.php +++ b/packages/admin/resources/views/components/attribute-card.blade.php @@ -1,24 +1,26 @@ -@props(['attribute', 'activated' => false]) +@props([ + 'attribute', + 'activated' => false, +]) - - + + - @if($attribute->icon) + @if ($attribute->icon) @endif - + + {{ $attribute->name }} - @if($activated) - + @if ($activated) + {{ __('shopper::layout.forms.actions.enabled') }} @endif @@ -28,7 +30,7 @@ class="h-5 w-5 text-gray-400 dark:text-gray-500" {{ $action }} @endisset - + {{ $slot }} diff --git a/packages/admin/resources/views/components/auth-card.blade.php b/packages/admin/resources/views/components/auth-card.blade.php index f77e146c3..f13b1ee22 100755 --- a/packages/admin/resources/views/components/auth-card.blade.php +++ b/packages/admin/resources/views/components/auth-card.blade.php @@ -1,25 +1,66 @@ - - + + - + - + - + - - - twMerge(['class' => 'relative w-full max-w-md overflow-hidden border-t border-gray-200 dark:border-gray-700/50 px-6 py-10 rounded-xl backdrop-blur-sm bg-gradient-to-b from-gray-50/70 dark:from-gray-800/60']) }}> + + + twMerge(['class' => 'relative w-full max-w-md overflow-hidden border-t border-gray-200 dark:border-gray-700/50 px-6 py-10 rounded-xl backdrop-blur-sm bg-gradient-to-b from-gray-50/70 dark:from-gray-800/60']) }} + > {{ $slot }} diff --git a/packages/admin/resources/views/components/badge.blade.php b/packages/admin/resources/views/components/badge.blade.php index fe86b6c42..43b77be9e 100755 --- a/packages/admin/resources/views/components/badge.blade.php +++ b/packages/admin/resources/views/components/badge.blade.php @@ -1,7 +1,10 @@ -@props(['style' => null, 'value']) +@props([ + 'style' => null, + 'value', +]) @php - $style = match($style ?? 'gray') { + $style = match ($style ?? 'gray') { 'primary' => 'bg-primary-100 text-primary-800', 'warning' => 'bg-warning-100 text-warning-800', 'danger' => 'bg-danger-100 text-danger-800', @@ -10,6 +13,6 @@ }; @endphp - + {{ $value }} diff --git a/packages/admin/resources/views/components/breadcrumb/index.blade.php b/packages/admin/resources/views/components/breadcrumb/index.blade.php index ae20c9cd6..37e5308c3 100755 --- a/packages/admin/resources/views/components/breadcrumb/index.blade.php +++ b/packages/admin/resources/views/components/breadcrumb/index.blade.php @@ -1,22 +1,37 @@ -@props(['back', 'current' => null]) +@props([ + 'back', + 'current' => null, +]) - - + + {{ __('shopper::layout.back') }} - - + + {{ $slot }} - @if($current) - - + @if ($current) + + {{ $current }} @endif diff --git a/packages/admin/resources/views/components/breadcrumb/link.blade.php b/packages/admin/resources/views/components/breadcrumb/link.blade.php index 8914e1c1c..f18702eb2 100755 --- a/packages/admin/resources/views/components/breadcrumb/link.blade.php +++ b/packages/admin/resources/views/components/breadcrumb/link.blade.php @@ -1,5 +1,11 @@ -@props(['link', 'title']) +@props([ + 'link', + 'title', +]) -twMerge(['class' => 'inline-flex items-center py-1.5 px-2 text-gray-500 rounded-md hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-800']) }} wire:navigate> +twMerge(['class' => 'inline-flex items-center py-1.5 px-2 text-gray-500 rounded-md hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-800']) }} +> {{ $title }} - + diff --git a/packages/admin/resources/views/components/buttons/danger-outline.blade.php b/packages/admin/resources/views/components/buttons/danger-outline.blade.php deleted file mode 100755 index c2456055f..000000000 --- a/packages/admin/resources/views/components/buttons/danger-outline.blade.php +++ /dev/null @@ -1,3 +0,0 @@ -twMerge(['class' => 'inline-flex items-center justify-center rounded-lg px-4 py-2 bg-danger-50 dark:bg-danger-400/10 text-base leading-6 font-medium text-danger-700 dark:text-danger-400 shadow-sm hover:bg-danger-100 dark:hover:bg-danger-400/20 focus:outline-none focus:border-danger-700 focus:shadow-outline-danger transition ease-in-out duration-150 sm:text-sm sm:leading-5']) }}> - {{ $slot }} - diff --git a/packages/admin/resources/views/components/buttons/danger.blade.php b/packages/admin/resources/views/components/buttons/danger.blade.php index e082707e8..0e315fa5b 100755 --- a/packages/admin/resources/views/components/buttons/danger.blade.php +++ b/packages/admin/resources/views/components/buttons/danger.blade.php @@ -1,3 +1,5 @@ -twMerge(['class' => 'inline-flex items-center justify-center rounded-lg px-4 py-2 bg-danger-500 text-base leading-6 font-medium text-white shadow-sm hover:bg-danger-600 focus:outline-none focus:border-danger-700 focus:shadow-outline-danger transition ease-in-out duration-150 sm:text-sm sm:leading-5']) }}> +twMerge(['class' => 'inline-flex items-center justify-center rounded-lg px-4 py-2 bg-danger-600 text-base leading-6 font-medium text-white shadow-sm hover:bg-danger-500 focus:outline-none focus:border-danger-700 focus:shadow-outline-danger transition ease-in-out duration-150 sm:text-sm sm:leading-5']) }} +> {{ $slot }} diff --git a/packages/admin/resources/views/components/buttons/default.blade.php b/packages/admin/resources/views/components/buttons/default.blade.php index 1dc17b924..4fc23e6db 100755 --- a/packages/admin/resources/views/components/buttons/default.blade.php +++ b/packages/admin/resources/views/components/buttons/default.blade.php @@ -6,7 +6,9 @@ {{ $slot }} @else - twMerge(['class' => 'inline-flex items-center px-4 py-2 border border-gray-300 dark:border-gray-700 shadow-sm text-sm font-medium rounded-lg text-gray-700 dark:text-white bg-white dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 dark:focus:ring-offset-gray-900']) }}> + twMerge(['class' => 'inline-flex items-center px-4 py-2 border border-gray-300 dark:border-gray-700 shadow-sm text-sm font-medium rounded-lg text-gray-700 dark:text-white bg-white dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 dark:focus:ring-offset-gray-900']) }} + > {{ $slot }} @endisset diff --git a/packages/admin/resources/views/components/buttons/primary.blade.php b/packages/admin/resources/views/components/buttons/primary.blade.php index b598b3666..8c5e6360a 100755 --- a/packages/admin/resources/views/components/buttons/primary.blade.php +++ b/packages/admin/resources/views/components/buttons/primary.blade.php @@ -6,7 +6,9 @@ {{ $slot }} @else - twMerge(['class' => 'inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-lg shadow-sm text-white bg-primary-600 hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-offset-2 dark:focus:ring-offset-gray-900 focus:ring-primary-500 disabled:cursor-not-allowed disabled:opacity-75']) }}> + twMerge(['class' => 'inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-lg shadow-sm text-white bg-primary-600 hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-offset-2 dark:focus:ring-offset-gray-900 focus:ring-primary-500 disabled:cursor-not-allowed disabled:opacity-75']) }} + > {{ $slot }} @endisset diff --git a/packages/admin/resources/views/components/card.blade.php b/packages/admin/resources/views/components/card.blade.php index 42e624571..04ffa2e5d 100755 --- a/packages/admin/resources/views/components/card.blade.php +++ b/packages/admin/resources/views/components/card.blade.php @@ -1,3 +1,5 @@ -twMerge(['class' => 'bg-white dark:bg-gray-800 rounded-xl shadow ring-1 ring-gray-200 dark:ring-gray-700']) }}> +twMerge(['class' => 'bg-white dark:bg-gray-800 rounded-xl ring-1 ring-gray-200 dark:ring-white/10']) }} +> {{ $slot }} diff --git a/packages/admin/resources/views/components/dropdown-button.blade.php b/packages/admin/resources/views/components/dropdown-button.blade.php index 4ef6796c6..59016087b 100755 --- a/packages/admin/resources/views/components/dropdown-button.blade.php +++ b/packages/admin/resources/views/components/dropdown-button.blade.php @@ -1 +1,5 @@ -twMerge(['class' => 'group w-full flex items-center px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 hover:text-gray-900 dark:hover:text-white dark:hover:bg-gray-800 focus:outline-none transition duration-150 ease-in-out']) }}>{{ $slot }} +twMerge(['class' => 'group w-full flex items-center px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 hover:text-gray-900 dark:hover:text-white dark:hover:bg-gray-800 focus:outline-none transition duration-150 ease-in-out']) }} +> + {{ $slot }} + diff --git a/packages/admin/resources/views/components/dropdown-link.blade.php b/packages/admin/resources/views/components/dropdown-link.blade.php index 770efc537..e48f31ea8 100755 --- a/packages/admin/resources/views/components/dropdown-link.blade.php +++ b/packages/admin/resources/views/components/dropdown-link.blade.php @@ -1,3 +1,5 @@ -twMerge(['class' => 'group flex items-center px-4 py-2 text-sm leading-5 text-gray-700 hover:text-gray-900 hover:bg-gray-50 dark:text-gray-400 dark:hover:bg-white/5 dark:hover:text-white transition duration-150 ease-in-out']) }}> +twMerge(['class' => 'group flex items-center px-4 py-2 text-sm leading-5 text-gray-700 hover:text-gray-900 hover:bg-gray-50 dark:text-gray-400 dark:hover:bg-white/5 dark:hover:text-white transition duration-150 ease-in-out']) }} +> {{ $slot }} diff --git a/packages/admin/resources/views/components/dropdown.blade.php b/packages/admin/resources/views/components/dropdown.blade.php index 49907b1c2..f62dfc990 100755 --- a/packages/admin/resources/views/components/dropdown.blade.php +++ b/packages/admin/resources/views/components/dropdown.blade.php @@ -3,20 +3,20 @@ 'width' => '48', 'customAlignmentClasses' => '', 'contentClasses' => 'bg-white dark:bg-gray-700', - 'containerClasses' => 'relative block text-left' + 'containerClasses' => 'relative block text-left', ]) @php switch ($align) { case 'left': - $alignmentClasses = 'origin-top-left '. $customAlignmentClasses; + $alignmentClasses = 'origin-top-left ' . $customAlignmentClasses; break; case 'top': - $alignmentClasses = 'origin-top '. $customAlignmentClasses; + $alignmentClasses = 'origin-top ' . $customAlignmentClasses; break; case 'right': default: - $alignmentClasses = 'origin-top-right '. $customAlignmentClasses; + $alignmentClasses = 'origin-top-right ' . $customAlignmentClasses; break; } @@ -30,23 +30,31 @@ } @endphp - + {{ $trigger }} - - + + {{ $content }} diff --git a/packages/admin/resources/views/components/empty-state.blade.php b/packages/admin/resources/views/components/empty-state.blade.php index bf4309af2..2d1c8a619 100755 --- a/packages/admin/resources/views/components/empty-state.blade.php +++ b/packages/admin/resources/views/components/empty-state.blade.php @@ -8,27 +8,33 @@ ]) twMerge(['class' => 'relative w-full lg:flex lg:items-center py-10 lg:py-12']) }}> - + {{ $slot }} - + - + {{ $title }} - + {{ $content }} - @if($permission) + @if ($permission) @can($permission) - @if($url) + @if ($url) {{ $button }} - @elseif($panel) - + @elseif ($panel) + {{ $button }} @endif diff --git a/packages/admin/resources/views/components/favicons.blade.php b/packages/admin/resources/views/components/favicons.blade.php index f5826717a..b8e25431c 100755 --- a/packages/admin/resources/views/components/favicons.blade.php +++ b/packages/admin/resources/views/components/favicons.blade.php @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/packages/admin/resources/views/components/filament/attribute-color-badge.blade.php b/packages/admin/resources/views/components/filament/attribute-color-badge.blade.php index b00dea357..0bd7b5129 100644 --- a/packages/admin/resources/views/components/filament/attribute-color-badge.blade.php +++ b/packages/admin/resources/views/components/filament/attribute-color-badge.blade.php @@ -1,12 +1,13 @@ -@props(['key', 'value' => null]) +@props([ + 'key', + 'value' => null, +]) - - - @if($value) + + + @if ($value) {{ $value }} @endif diff --git a/packages/admin/resources/views/components/filament/forms/currency-mask.blade.php b/packages/admin/resources/views/components/filament/forms/currency-mask.blade.php index cdaf309f6..5cec8f854 100644 --- a/packages/admin/resources/views/components/filament/forms/currency-mask.blade.php +++ b/packages/admin/resources/views/components/filament/forms/currency-mask.blade.php @@ -89,7 +89,7 @@ class="fi-fo-text-input" @if ($datalistOptions) @foreach ($datalistOptions as $option) - + @endforeach @endif diff --git a/packages/admin/resources/views/components/filament/forms/quantity.blade.php b/packages/admin/resources/views/components/filament/forms/quantity.blade.php index d03b82bcf..430794622 100644 --- a/packages/admin/resources/views/components/filament/forms/quantity.blade.php +++ b/packages/admin/resources/views/components/filament/forms/quantity.blade.php @@ -20,17 +20,10 @@ $suffixLabel = $getSuffixLabel(); @endphp - - $hasInlineLabel, - ]) - > + + $hasInlineLabel, + ])> {{ $getLabel() }} @@ -44,33 +37,37 @@ increment() { if (this.state < this.maxValue && this.state >= this.minValue) { - this.state++ - $wire.$refresh() - if (this.state === this.maxValue) { - this.isIncrementAllowed = false - } else { - this.isIncrementAllowed = true - this.isDecrementAllowed = true - } + this.state++ + $wire.$refresh() + if (this.state === this.maxValue) { + this.isIncrementAllowed = false + } else { + this.isIncrementAllowed = true + this.isDecrementAllowed = true + } } }, decrement() { - if (this.state > 0 && this.state <= this.maxValue && this.state > this.minValue) { - this.state-- - $wire.$refresh() - if (this.state === this.minValue) { - this.isDecrementAllowed = false - } else { - this.isIncrementAllowed = true - this.isDecrementAllowed = true - } - } + if ( + this.state > 0 && + this.state <= this.maxValue && + this.state > this.minValue + ) { + this.state-- + $wire.$refresh() + if (this.state === this.minValue) { + this.isDecrementAllowed = false + } else { + this.isIncrementAllowed = true + this.isDecrementAllowed = true + } + } }, - init: function() { - this.isIncrementAllowed = true - this.isDecrementAllowed = true + init: function () { + this.isIncrementAllowed = true + this.isDecrementAllowed = true }, }" > @@ -88,10 +85,10 @@ :suffix-icon-color="$getSuffixIconColor()" :valid="! $errors->has($getStatePath)" > - + - @if($getHeading !== null) - + @if ($getHeading !== null) + {{ $getHeading }} @endif @@ -117,29 +114,49 @@ /> - @if($isStacked()) - - - @svg('heroicon-o-plus', 'shrink-0 w-4 h-4') + @if ($isStacked()) + + + @svg('heroicon-o-plus', 'h-4 w-4 shrink-0') - - @svg('heroicon-o-minus', 'shrink-0 w-4 h-4') + + @svg('heroicon-o-minus', 'h-4 w-4 shrink-0') @else - - - @svg('heroicon-o-minus', 'shrink-0 w-3.5 h-3.5') + + + @svg('heroicon-o-minus', 'h-3.5 w-3.5 shrink-0') - - @svg('heroicon-o-plus', 'shrink-0 w-3.5 h-3.5') + + @svg('heroicon-o-plus', 'h-3.5 w-3.5 shrink-0') @endif - - diff --git a/packages/admin/resources/views/components/filament/section.blade.php b/packages/admin/resources/views/components/filament/section.blade.php index 9370904e0..f374dba42 100644 --- a/packages/admin/resources/views/components/filament/section.blade.php +++ b/packages/admin/resources/views/components/filament/section.blade.php @@ -4,21 +4,21 @@ @endphp @props([ - 'aside' => false, - 'collapsed' => false, - 'collapsible' => false, - 'compact' => false, - 'contentBefore' => false, - 'description' => null, - 'footerActions' => [], - 'footerActionsAlignment' => Alignment::Start, - 'headerActions' => [], - 'headerEnd' => null, - 'heading' => null, - 'icon' => null, - 'iconColor' => 'gray', - 'iconSize' => IconSize::Large, - 'persistCollapsed' => false, + "aside" => false, + "collapsed" => false, + "collapsible" => false, + "compact" => false, + "contentBefore" => false, + "description" => null, + "footerActions" => [], + "footerActionsAlignment" => Alignment::Start, + "headerActions" => [], + "headerEnd" => null, + "heading" => null, + "icon" => null, + "iconColor" => "gray", + "iconSize" => IconSize::Large, + "persistCollapsed" => false, ]) @php @@ -27,26 +27,16 @@ $hasIcon = filled($icon); if (is_array($headerActions)) { - $headerActions = array_filter( - $headerActions, - fn ($headerAction): bool => $headerAction->isVisible(), - ); + $headerActions = array_filter($headerActions, fn ($headerAction): bool => $headerAction->isVisible()); } if (is_array($footerActions)) { - $footerActions = array_filter( - $footerActions, - fn ($footerAction): bool => $footerAction->isVisible(), - ); + $footerActions = array_filter($footerActions, fn ($footerAction): bool => $footerAction->isVisible()); } - $hasHeaderActions = $headerActions instanceof \Illuminate\Contracts\Support\Htmlable - ? ! \Filament\Support\is_slot_empty($headerActions) - : filled($headerActions); + $hasHeaderActions = $headerActions instanceof \Illuminate\Contracts\Support\Htmlable ? ! \Filament\Support\is_slot_empty($headerActions) : filled($headerActions); - $hasFooterActions = $footerActions instanceof \Illuminate\Contracts\Support\Htmlable - ? ! \Filament\Support\is_slot_empty($footerActions) - : filled($footerActions); + $hasFooterActions = $footerActions instanceof \Illuminate\Contracts\Support\Htmlable ? ! \Filament\Support\is_slot_empty($footerActions) : filled($footerActions); $hasHeader = $hasIcon || $hasHeading || $hasDescription || $collapsible || $hasHeaderActions || filled((string) $headerEnd); @endphp @@ -65,10 +55,10 @@ @endif {{ $attributes->class([ - 'fi-section', + "fi-section", match ($aside) { - true => 'fi-aside grid grid-cols-1 items-start gap-x-6 gap-y-4 md:grid-cols-3 md:gap-y-6 md:gap-x-12', - false => '', + true => "fi-aside grid grid-cols-1 items-start gap-x-6 gap-y-4 md:grid-cols-3 md:gap-x-12 md:gap-y-6", + false => "", }, ]) }} @@ -79,11 +69,11 @@ x-on:click="isCollapsed = ! isCollapsed" @endif @class([ - 'fi-section-header flex flex-col gap-3', - 'cursor-pointer px-4 py-2 bg-gray-100/75 rounded-lg dark:bg-white/5' => $collapsible, + "fi-section-header flex flex-col gap-3", + "cursor-pointer rounded-lg bg-gray-100/75 px-4 py-2 dark:bg-white/5" => $collapsible, match ($compact) { - true => 'p-0', - false => 'py-4', + true => "p-0", + false => "py-4", } => ! $aside, ]) > @@ -92,16 +82,16 @@ 'text-gray-400 dark:text-gray-500', - default => 'fi-color-custom text-custom-500 dark:text-custom-400', + "gray" => "text-gray-400 dark:text-gray-500", + default => "fi-color-custom text-custom-500 dark:text-custom-400", }, is_string($iconColor) ? "fi-color-{$iconColor}" : null, match ($iconSize) { - IconSize::Small, 'sm' => 'h-4 w-4 mt-1', - IconSize::Medium, 'md' => 'h-5 w-5 mt-0.5', - IconSize::Large, 'lg' => 'h-6 w-6', + IconSize::Small, "sm" => "h-4 w-4 mt-1", + IconSize::Medium, "md" => "h-5 w-5 mt-0.5", + IconSize::Large, "lg" => "h-6 w-6", default => $iconSize, }, ]) @@ -109,8 +99,8 @@ \Filament\Support\get_color_css_variables( $iconColor, shades: [400, 500], - alias: 'section.header.icon', - ) => $iconColor !== 'gray', + alias: "section.header.icon", + ) => $iconColor !== "gray", ]) /> @endif @@ -175,19 +165,20 @@ x-bind:class="{ 'invisible h-0 overflow-y-hidden border-none': isCollapsed }" @endif @class([ - 'fi-section-content-ctn', - 'border-t border-gray-200 dark:border-white/10' => $hasHeader && (! $aside) && (! $collapsible), - 'md:col-span-2 lg:max-w-3xl' => $aside, - 'md:order-first' => $contentBefore, - 'pt-4 lg:pt-6 px-2' => $collapsible, + "fi-section-content-ctn", + "border-t border-gray-200 dark:border-white/10" => + $hasHeader && ! $aside && ! $collapsible, + "md:col-span-2 lg:max-w-3xl" => $aside, + "md:order-first" => $contentBefore, + "px-2 pt-4 lg:pt-6" => $collapsible, ]) > 'p-0', - false => 'py-5', + true => "p-0", + false => "py-5", }, ]) > @@ -197,15 +188,12 @@ @if ($hasFooterActions) @endif diff --git a/packages/admin/resources/views/components/filament/warning.blade.php b/packages/admin/resources/views/components/filament/warning.blade.php index 088cd9496..59204eb25 100644 --- a/packages/admin/resources/views/components/filament/warning.blade.php +++ b/packages/admin/resources/views/components/filament/warning.blade.php @@ -1,13 +1,10 @@ - + - {{ __('Attention needed') }} + {{ __('shopper::words.attention_needed') }} {{ __('shopper::words.feature_enabled', ['feature' => \Illuminate\Support\Str::title($getFeature())]) }} diff --git a/packages/admin/resources/views/components/form-slider-over.blade.php b/packages/admin/resources/views/components/form-slider-over.blade.php index c43fc5246..5fa647e33 100644 --- a/packages/admin/resources/views/components/form-slider-over.blade.php +++ b/packages/admin/resources/views/components/form-slider-over.blade.php @@ -1,4 +1,8 @@ -@props(['action', 'title', 'description' => null]) +@props([ + 'action', + 'title', + 'description' => null, +]) @@ -10,7 +14,7 @@ Close panel @@ -18,7 +22,7 @@ class="rounded-md bg-white text-gray-400 hover:text-gray-500 dark:bg-gray-900 da - @if($description) + @if ($description) {{ $description }} @@ -30,7 +34,7 @@ class="rounded-md bg-white text-gray-400 hover:text-gray-500 dark:bg-gray-900 da {{ $slot }} - + {{ __('shopper::layout.forms.actions.cancel') }} diff --git a/packages/admin/resources/views/components/forms/checkbox.blade.php b/packages/admin/resources/views/components/forms/checkbox.blade.php index 526786e02..f331da2d9 100755 --- a/packages/admin/resources/views/components/forms/checkbox.blade.php +++ b/packages/admin/resources/views/components/forms/checkbox.blade.php @@ -1 +1,4 @@ -twMerge(['class' => 'focus:ring-primary-500 h-4 w-4 text-primary-600 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600 dark:focus:ring-offset-gray-800']) !!} /> +twMerge(['class' => 'focus:ring-primary-500 h-4 w-4 text-primary-600 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600 dark:focus:ring-offset-gray-800']) !!} +/> diff --git a/packages/admin/resources/views/components/forms/group.blade.php b/packages/admin/resources/views/components/forms/group.blade.php index 1deb5958f..8d8d9abb4 100755 --- a/packages/admin/resources/views/components/forms/group.blade.php +++ b/packages/admin/resources/views/components/forms/group.blade.php @@ -9,13 +9,16 @@ ]) - @if($label) + @if ($label) - {{ $label }} @if($isRequired) * @endif + {{ $label }} + @if ($isRequired) + * + @endif - @if($optional) - + @if ($optional) + {{ __('shopper::layout.forms.label.optional') }} @endif @@ -25,7 +28,7 @@ $label, - 'rounded-md shadow-sm' => !$noShadow + 'rounded-md shadow-sm' => ! $noShadow, ])> {{ $slot }} diff --git a/packages/admin/resources/views/components/forms/input.blade.php b/packages/admin/resources/views/components/forms/input.blade.php index bd9140719..80092d7e2 100755 --- a/packages/admin/resources/views/components/forms/input.blade.php +++ b/packages/admin/resources/views/components/forms/input.blade.php @@ -1 +1,3 @@ -twMerge(['class' => 'block w-full rounded-lg border-0 py-1.5 px-3 text-gray-900 ring-1 ring-gray-300 placeholder:text-gray-400 dark:bg-gray-700 dark:text-white dark:ring-gray-700 dark:placeholder-gray-400 focus:ring-2 focus:ring-primary-600 dark:bg-gray-800 dark:focus:ring-primary-500 sm:text-sm sm:leading-6']) }} /> +twMerge(['class' => 'block w-full rounded-lg border-0 py-1.5 px-3 text-gray-900 ring-1 ring-gray-300 placeholder:text-gray-400 dark:bg-gray-700 dark:text-white dark:ring-gray-700 dark:placeholder-gray-400 focus:ring-2 focus:ring-primary-600 dark:bg-gray-800 dark:focus:ring-primary-500 sm:text-sm sm:leading-6']) }} +/> diff --git a/packages/admin/resources/views/components/forms/label-product.blade.php b/packages/admin/resources/views/components/forms/label-product.blade.php index 1a6c0c6aa..ed5b1623a 100755 --- a/packages/admin/resources/views/components/forms/label-product.blade.php +++ b/packages/admin/resources/views/components/forms/label-product.blade.php @@ -1,6 +1,11 @@ -@props(['product']) +@props([ + 'product', +]) - + - + {{ $product->name }} diff --git a/packages/admin/resources/views/components/forms/radio.blade.php b/packages/admin/resources/views/components/forms/radio.blade.php index 054dcb4c4..db195d310 100755 --- a/packages/admin/resources/views/components/forms/radio.blade.php +++ b/packages/admin/resources/views/components/forms/radio.blade.php @@ -1 +1,4 @@ -twMerge(['class' => 'focus:ring-primary-500 h-4 w-4 text-primary-600 border-gray-300 dark:bg-gray-700 dark:border-gray-600 dark:focus:ring-offset-gray-800']) !!} /> +twMerge(['class' => 'focus:ring-primary-500 h-4 w-4 text-primary-600 border-gray-300 dark:bg-gray-700 dark:border-gray-600 dark:focus:ring-offset-gray-800']) !!} +/> diff --git a/packages/admin/resources/views/components/forms/search.blade.php b/packages/admin/resources/views/components/forms/search.blade.php index aea0a8474..0e7bdccfe 100755 --- a/packages/admin/resources/views/components/forms/search.blade.php +++ b/packages/admin/resources/views/components/forms/search.blade.php @@ -8,11 +8,8 @@ {{ $label }} - - + + - + diff --git a/packages/admin/resources/views/components/forms/select.blade.php b/packages/admin/resources/views/components/forms/select.blade.php index 0abe1bc7a..f88f10853 100755 --- a/packages/admin/resources/views/components/forms/select.blade.php +++ b/packages/admin/resources/views/components/forms/select.blade.php @@ -1,12 +1,14 @@ @props([ 'items' => false, 'key' => 'id', - 'value' => 'name' + 'value' => 'name', ]) -twMerge(['class' => 'block w-full py-1.5 px-3 border-0 ring-1 ring-gray-300 rounded-lg bg-white dark:bg-gray-800 dark:text-gray-300 dark:ring-gray-700 focus:ring-2 focus:outline-none focus:ring-primary-600 dark:focus:ring-primary-500 sm:text-sm sm:leading-6']) !!}> - @if($items) - @foreach($items as $item) +twMerge(['class' => 'block w-full py-1.5 px-3 border-0 ring-1 ring-gray-300 rounded-lg bg-white dark:bg-gray-800 dark:text-gray-300 dark:ring-gray-700 focus:ring-2 focus:outline-none focus:ring-primary-600 dark:focus:ring-primary-500 sm:text-sm sm:leading-6']) !!} +> + @if ($items) + @foreach ($items as $item) {{ $item->{$value} }} @endforeach @else diff --git a/packages/admin/resources/views/components/forms/textarea.blade.php b/packages/admin/resources/views/components/forms/textarea.blade.php index dc47f03d9..2f9cce17e 100755 --- a/packages/admin/resources/views/components/forms/textarea.blade.php +++ b/packages/admin/resources/views/components/forms/textarea.blade.php @@ -1,5 +1,8 @@ @props(['value' => null]) -twMerge(['class' => 'block w-full rounded-lg py-1.5 px-3 border-0 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 dark:ring-gray-700 dark:bg-gray-800 dark:text-white focus:ring-2 focus:ring-primary-600 dark:focus:ring-primary-500 sm:text-sm sm:leading-6']) }} rows="3"> +<textarea + {{ $attributes->twMerge(['class' => 'block w-full rounded-lg py-1.5 px-3 border-0 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 dark:ring-gray-700 dark:bg-gray-800 dark:text-white focus:ring-2 focus:ring-primary-600 dark:focus:ring-primary-500 sm:text-sm sm:leading-6']) }} + rows="3" +> {{ $value }} diff --git a/packages/admin/resources/views/components/heading.blade.php b/packages/admin/resources/views/components/heading.blade.php index 65ff09457..6c2e41f52 100755 --- a/packages/admin/resources/views/components/heading.blade.php +++ b/packages/admin/resources/views/components/heading.blade.php @@ -1,5 +1,9 @@ -twMerge(['class' => 'space-y-3 sm:flex sm:items-center sm:justify-between sm:space-x-4 sm:space-y-0']) }}> - +twMerge(['class' => 'space-y-3 sm:flex sm:items-center sm:justify-between sm:space-x-4 sm:space-y-0']) }} +> + {{ $title }} @isset($action) diff --git a/packages/admin/resources/views/components/icons/contrast.blade.php b/packages/admin/resources/views/components/icons/contrast.blade.php index 9baf58666..02724fd53 100755 --- a/packages/admin/resources/views/components/icons/contrast.blade.php +++ b/packages/admin/resources/views/components/icons/contrast.blade.php @@ -1,4 +1,6 @@ - + diff --git a/packages/admin/resources/views/components/icons/facebook.blade.php b/packages/admin/resources/views/components/icons/facebook.blade.php index cc6b38031..9259bc169 100755 --- a/packages/admin/resources/views/components/icons/facebook.blade.php +++ b/packages/admin/resources/views/components/icons/facebook.blade.php @@ -1,3 +1,7 @@ - - + + diff --git a/packages/admin/resources/views/components/icons/ga.blade.php b/packages/admin/resources/views/components/icons/ga.blade.php index cb811828f..838111044 100755 --- a/packages/admin/resources/views/components/icons/ga.blade.php +++ b/packages/admin/resources/views/components/icons/ga.blade.php @@ -1,5 +1,14 @@ - - - + + + diff --git a/packages/admin/resources/views/components/icons/gtag.blade.php b/packages/admin/resources/views/components/icons/gtag.blade.php index ecf5da7bc..060896b63 100755 --- a/packages/admin/resources/views/components/icons/gtag.blade.php +++ b/packages/admin/resources/views/components/icons/gtag.blade.php @@ -1,6 +1,9 @@ - - - - + + + + diff --git a/packages/admin/resources/views/components/icons/instagram.blade.php b/packages/admin/resources/views/components/icons/instagram.blade.php index 59e304031..a8fc39240 100755 --- a/packages/admin/resources/views/components/icons/instagram.blade.php +++ b/packages/admin/resources/views/components/icons/instagram.blade.php @@ -1,3 +1,5 @@ - + diff --git a/packages/admin/resources/views/components/icons/notchpay.blade.php b/packages/admin/resources/views/components/icons/notchpay.blade.php index 2381be616..e601ce009 100755 --- a/packages/admin/resources/views/components/icons/notchpay.blade.php +++ b/packages/admin/resources/views/components/icons/notchpay.blade.php @@ -1,4 +1,10 @@ - - + + diff --git a/packages/admin/resources/views/components/icons/pixel.blade.php b/packages/admin/resources/views/components/icons/pixel.blade.php index 9ab14421b..eae8c38b6 100755 --- a/packages/admin/resources/views/components/icons/pixel.blade.php +++ b/packages/admin/resources/views/components/icons/pixel.blade.php @@ -1,3 +1,6 @@ - + diff --git a/packages/admin/resources/views/components/icons/twitter.blade.php b/packages/admin/resources/views/components/icons/twitter.blade.php index 4f61e5cda..869da1455 100755 --- a/packages/admin/resources/views/components/icons/twitter.blade.php +++ b/packages/admin/resources/views/components/icons/twitter.blade.php @@ -1,3 +1,10 @@ - - + + diff --git a/packages/admin/resources/views/components/label.blade.php b/packages/admin/resources/views/components/label.blade.php index a321fc597..3ebc2eb98 100755 --- a/packages/admin/resources/views/components/label.blade.php +++ b/packages/admin/resources/views/components/label.blade.php @@ -1,5 +1,11 @@ -@props(['value', 'isRequired' => false]) +@props([ + 'value', + 'isRequired' => false, +]) twMerge(['class' => 'block font-medium text-sm text-gray-700 dark:text-gray-300']) }}> - {{ $value ?? $slot }} @if($isRequired) * @endif + {{ $value ?? $slot }} + @if ($isRequired) + * + @endif diff --git a/packages/admin/resources/views/components/layouts/app.blade.php b/packages/admin/resources/views/components/layouts/app.blade.php index 964acf1dc..51825283f 100755 --- a/packages/admin/resources/views/components/layouts/app.blade.php +++ b/packages/admin/resources/views/components/layouts/app.blade.php @@ -1,18 +1,24 @@ - + - - + + @isset($subHeading) {{ $subHeading }} @endisset - + twMerge(['class' => 'flex-1 min-h-full']) }}> {{ $slot }} diff --git a/packages/admin/resources/views/components/layouts/app/header.blade.php b/packages/admin/resources/views/components/layouts/app/header.blade.php index 529dd9a9d..72f2cfa3c 100755 --- a/packages/admin/resources/views/components/layouts/app/header.blade.php +++ b/packages/admin/resources/views/components/layouts/app/header.blade.php @@ -1,10 +1,16 @@ - - - + + + - - - @if(config('shopper.components.dashboard.components.search')) + + + @if (config('shopper.components.dashboard.components.search')) @endif @@ -16,31 +22,49 @@ @click.away="show = false" class="relative inline-block" > - + - - - @if(config('shopper.components.search')) + + @if (config('shopper.components.search')) @endif - - + + + - + diff --git a/packages/admin/resources/views/components/layouts/app/sidebar/content.blade.php b/packages/admin/resources/views/components/layouts/app/sidebar/content.blade.php index 30d5f97f6..3c78f4790 100755 --- a/packages/admin/resources/views/components/layouts/app/sidebar/content.blade.php +++ b/packages/admin/resources/views/components/layouts/app/sidebar/content.blade.php @@ -1,14 +1,16 @@ - + - + - + {{ config('app.name') }} @@ -17,32 +19,28 @@ - - + + - + @can('access_setting') request()->routeIs('shopper.settings*'), - 'sh-sidebar-item-inactive' => ! request()->routeIs('shopper.settings*') + 'sh-sidebar-item-inactive' => ! request()->routeIs('shopper.settings*'), ]) > - + {{ __('shopper::layout.account_dropdown.settings') }} @endcan - - + + {{ __('shopper::messages.dashboard.cards.doc_title') }} diff --git a/packages/admin/resources/views/components/layouts/app/sidebar/mobile.blade.php b/packages/admin/resources/views/components/layouts/app/sidebar/mobile.blade.php index 25cc9fe2b..8a5351aa1 100755 --- a/packages/admin/resources/views/components/layouts/app/sidebar/mobile.blade.php +++ b/packages/admin/resources/views/components/layouts/app/sidebar/mobile.blade.php @@ -1,35 +1,41 @@ - - + - - + - - - + + + - + diff --git a/packages/admin/resources/views/components/layouts/app/sidebar/secondary.blade.php b/packages/admin/resources/views/components/layouts/app/sidebar/secondary.blade.php index 3828d40b6..bbfa73e66 100755 --- a/packages/admin/resources/views/components/layouts/app/sidebar/secondary.blade.php +++ b/packages/admin/resources/views/components/layouts/app/sidebar/secondary.blade.php @@ -1,3 +1,3 @@ - + {!! $sidebar !!} diff --git a/packages/admin/resources/views/components/layouts/base.blade.php b/packages/admin/resources/views/components/layouts/base.blade.php index a9125e2f7..db04f3b53 100755 --- a/packages/admin/resources/views/components/layouts/base.blade.php +++ b/packages/admin/resources/views/components/layouts/base.blade.php @@ -1,65 +1,63 @@ @props(['title' => config('app.name')]) - - - - - - - - - - - - @if ($favicon = config('shopper.admin.favicon')) - - @else - - @endif - - {{ $title }} // {{ __('shopper::layout.meta_title') }} - - - - - - - - @stack('styles') - - @filamentStyles - {{ \Shopper\Facades\Shopper::getThemeLink() }} - - - - @include('shopper::includes._additional-styles') - -twMerge(['class' => 'bg-white font-sans dark:bg-gray-950']) }}> - - {{ $slot }} - - @livewire(\Filament\Notifications\Livewire\Notifications::class) - @livewire(\Shopper\Livewire\Components\SlideOverPanel::class) - - - @livewire(\LivewireUI\Modal\Modal::class) - - - @filamentScripts - - @include('shopper::includes._additional-scripts') - - + + + + + + + + + + + + @if ($favicon = config('shopper.admin.favicon')) + + @else + + @endif + + {{ $title }} // {{ __('shopper::layout.meta_title') }} + + + + + + + + @stack('styles') + + @filamentStyles + {{ \Shopper\Facades\Shopper::getThemeLink() }} + + + + @include('shopper::includes._additional-styles') + + twMerge(['class' => 'bg-white font-sans dark:bg-gray-950']) }}> + {{ $slot }} + + @livewire(\Filament\Notifications\Livewire\Notifications::class) + @livewire(\Shopper\Livewire\Components\SlideOverPanel::class) + + + @livewire(\LivewireUI\Modal\Modal::class) + + + @filamentScripts + + @include('shopper::includes._additional-scripts') + diff --git a/packages/admin/resources/views/components/layouts/footer.blade.php b/packages/admin/resources/views/components/layouts/footer.blade.php index 084027441..a4c5b8219 100755 --- a/packages/admin/resources/views/components/layouts/footer.blade.php +++ b/packages/admin/resources/views/components/layouts/footer.blade.php @@ -1,3 +1,3 @@ - + Copyright © {{ date('Y') }} — Shopper Labs. diff --git a/packages/admin/resources/views/components/layouts/setting.blade.php b/packages/admin/resources/views/components/layouts/setting.blade.php index 76ecb1e66..0786832c3 100755 --- a/packages/admin/resources/views/components/layouts/setting.blade.php +++ b/packages/admin/resources/views/components/layouts/setting.blade.php @@ -1,11 +1,16 @@ - - + - - - + + - - @foreach(config('shopper.settings.items') as $menu) + + @foreach (config('shopper.settings.items', []) as $menu) @endforeach - - - + + @@ -65,5 +87,4 @@ class="flex items-center justify-end absolute h-full w-24 top-0 right-0 px-2.5 b {{ $slot }} - diff --git a/packages/admin/resources/views/components/learn-more.blade.php b/packages/admin/resources/views/components/learn-more.blade.php index bee5ecc63..a9ec30dd8 100755 --- a/packages/admin/resources/views/components/learn-more.blade.php +++ b/packages/admin/resources/views/components/learn-more.blade.php @@ -1,17 +1,20 @@ - - - - + + + + - + {{ __('shopper::components.learn_more') }} - + {{ $name }} diff --git a/packages/admin/resources/views/components/loader.blade.php b/packages/admin/resources/views/components/loader.blade.php index f1a2ac951..9c9afe99e 100755 --- a/packages/admin/resources/views/components/loader.blade.php +++ b/packages/admin/resources/views/components/loader.blade.php @@ -1,4 +1,13 @@ -twMerge(['class' => 'mr-2 h-5 w-5 animate-spin']) }} fill="none" viewBox="0 0 24 24" aria-hidden="true"> - - +twMerge(['class' => 'mr-2 h-5 w-5 animate-spin']) }} + fill="none" + viewBox="0 0 24 24" + aria-hidden="true" +> + + diff --git a/packages/admin/resources/views/components/menu/item.blade.php b/packages/admin/resources/views/components/menu/item.blade.php deleted file mode 100755 index 2c4e1d2a5..000000000 --- a/packages/admin/resources/views/components/menu/item.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -@props(['active']) - -@php - $classes = ($active ?? false) - ? 'inline-flex items-center p-2 text-base leading-6 font-medium rounded-md text-white bg-primary-900 focus:outline-none transition ease-in-out duration-150' - : 'inline-flex items-center p-2 text-base leading-6 font-medium rounded-md text-white hover:bg-primary-700 focus:outline-none focus:text-white focus:bg-primary-900 transition ease-in-out duration-150'; -@endphp - - - - {{ $slot }} - - diff --git a/packages/admin/resources/views/components/menu/nav-setting.blade.php b/packages/admin/resources/views/components/menu/nav-setting.blade.php index ef2a18739..20ef008cc 100755 --- a/packages/admin/resources/views/components/menu/nav-setting.blade.php +++ b/packages/admin/resources/views/components/menu/nav-setting.blade.php @@ -1,22 +1,36 @@ -@props(['menu']) +@props([ + "menu", +]) - $menu['route'] && request()->routeIs($menu['route'] . '*'), - 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700 dark:text-gray-400 dark:hover:border-gray-700 dark:hover:text-gray-300' => ! $menu['route'] || ! request()->routeIs($menu['route'] . '*'), + + $menu["route"] && request()->routeIs($menu["route"] . "*"), + "border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700 dark:text-gray-400 dark:hover:border-gray-700 dark:hover:text-gray-300" => + ! $menu["route"] || ! request()->routeIs($menu["route"] . "*"), ]) - wire:navigate - @if($menu['route'] && request()->routeIs($menu['route'] . '*')) aria-current="page" @endif + @if ($menu["route"] && request()->routeIs($menu["route"] . "*")) + aria-current="page" + @endif + wire:navigate > - {{ __($menu['name']) }} + {{ __($menu["name"]) }} - @if(! $menu['route']) - - + @if (! $menu["route"]) + + - {{ __('shopper::layout.soon') }} + {{ __("shopper::layout.soon") }} @endif diff --git a/packages/admin/resources/views/components/menu/setting.blade.php b/packages/admin/resources/views/components/menu/setting.blade.php index 33bc19f93..d13e19fc2 100755 --- a/packages/admin/resources/views/components/menu/setting.blade.php +++ b/packages/admin/resources/views/components/menu/setting.blade.php @@ -1,26 +1,34 @@ -@props(['menu']) +@props([ + "menu", +]) - - {{ $menu['icon'] }} + + {{ $menu["icon"] }} - {{ __($menu['name']) }} + {{ __($menu["name"]) }} - @if(! $menu['route']) - - {{ __('shopper::layout.soon') }} + @if (! $menu["route"]) + + {{ __("shopper::layout.soon") }} @endif - {{ __($menu['description']) }} + {{ __($menu["description"]) }} diff --git a/packages/admin/resources/views/components/modal.blade.php b/packages/admin/resources/views/components/modal.blade.php index 127c580c0..eb640e452 100755 --- a/packages/admin/resources/views/components/modal.blade.php +++ b/packages/admin/resources/views/components/modal.blade.php @@ -2,39 +2,42 @@ 'formAction' => false, 'headerClasses' => '', 'contentClasses' => 'p-4 sm:p-6', - 'footerClasses' => 'p-4 sm:p-6 sm:flex', + 'footerClasses' => 'p-4 sm:flex sm:p-6', ]) twMerge(['class' => 'h-full bg-white dark:bg-gray-800']) }}> - @if($formAction) - + @if ($formAction) + {{-- format-ignore-start --}}{{-- format-ignore-end --}} @endif - - @if(isset($title)) - - {{ $title }} - - @endif - @if(isset($subtitle)) - - - {{ $subtitle }} - - - @endif - + + @if (isset($title)) + + {{ $title }} + + @endif - @if(isset($content)) - - {{ $content }} + @if (isset($subtitle)) + + + {{ $subtitle }} + @endif + - diff --git a/packages/admin/resources/views/components/section-heading.blade.php b/packages/admin/resources/views/components/section-heading.blade.php index 8d9bb1659..a917f41cb 100644 --- a/packages/admin/resources/views/components/section-heading.blade.php +++ b/packages/admin/resources/views/components/section-heading.blade.php @@ -1,10 +1,13 @@ -@props(['title', 'description' => null]) +@props([ + 'title', + 'description' => null, +]) - + {{ $title }} - @if($description) + @if ($description) {{ $description }} diff --git a/packages/admin/resources/views/components/shortcut.blade.php b/packages/admin/resources/views/components/shortcut.blade.php index e82dd6013..b91b4bfe4 100755 --- a/packages/admin/resources/views/components/shortcut.blade.php +++ b/packages/admin/resources/views/components/shortcut.blade.php @@ -1,16 +1,24 @@ -@props(['name', 'command', 'param' => null]) +@props([ + 'name', + 'command', + 'param' => null, +]) - + {{ $name }} - - + + {{ $command }} @if ($param) + - + {{ $param }} @endif diff --git a/packages/admin/resources/views/components/stock-badge.blade.php b/packages/admin/resources/views/components/stock-badge.blade.php index dce79990a..10b743c2a 100755 --- a/packages/admin/resources/views/components/stock-badge.blade.php +++ b/packages/admin/resources/views/components/stock-badge.blade.php @@ -1,9 +1,13 @@ -@props(['stock']) +@props([ + 'stock', +]) - $stock < 10, - 'bg-success-100 text-success-800' => $stock >= 10, -])> + $stock < 10, + 'bg-success-100 text-success-800' => $stock >= 10, + ]) +> {{ $stock }} diff --git a/packages/admin/resources/views/components/tables/table-head.blade.php b/packages/admin/resources/views/components/tables/table-head.blade.php index 607406c58..265ba49ac 100755 --- a/packages/admin/resources/views/components/tables/table-head.blade.php +++ b/packages/admin/resources/views/components/tables/table-head.blade.php @@ -1,3 +1,6 @@ -twMerge(['class' => 'px-6 py-3 text-left text-xs leading-4 whitespace-nowrap font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400']) }}> +twMerge(['class' => 'px-6 py-3 text-left text-xs leading-4 whitespace-nowrap font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400']) }} +> {{ $slot }} diff --git a/packages/admin/resources/views/components/tables/table-row.blade.php b/packages/admin/resources/views/components/tables/table-row.blade.php index 3b85f234d..b0f179d92 100644 --- a/packages/admin/resources/views/components/tables/table-row.blade.php +++ b/packages/admin/resources/views/components/tables/table-row.blade.php @@ -1,3 +1,5 @@ -twMerge(['class' => 'border-b border-gray-200 bg-gray-50 dark:border-gray-700 dark:bg-white/5']) }}> +twMerge(['class' => 'border-b border-gray-200 bg-gray-50 dark:border-gray-700 dark:bg-white/5']) }} +> {{ $slot }} diff --git a/packages/admin/resources/views/components/theme-switcher/button.blade.php b/packages/admin/resources/views/components/theme-switcher/button.blade.php index 7198648e3..ebff95176 100644 --- a/packages/admin/resources/views/components/theme-switcher/button.blade.php +++ b/packages/admin/resources/views/components/theme-switcher/button.blade.php @@ -22,9 +22,5 @@ class="fi-theme-switcher-btn flex justify-center rounded-md p-2 outline-none tra : 'text-gray-400 hover:text-gray-500 focus-visible:text-gray-500 dark:text-gray-500 dark:hover:text-gray-400 dark:focus-visible:text-gray-400' " > - + diff --git a/packages/admin/resources/views/components/theme-switcher/index.blade.php b/packages/admin/resources/views/components/theme-switcher/index.blade.php index bbd046b90..800bb5fa2 100644 --- a/packages/admin/resources/views/components/theme-switcher/index.blade.php +++ b/packages/admin/resources/views/components/theme-switcher/index.blade.php @@ -9,18 +9,9 @@ " class="fi-theme-switcher grid grid-flow-col gap-x-1" > - + - + - + diff --git a/packages/admin/resources/views/components/validation-errors.blade.php b/packages/admin/resources/views/components/validation-errors.blade.php index c3acb17e7..351e6ddff 100755 --- a/packages/admin/resources/views/components/validation-errors.blade.php +++ b/packages/admin/resources/views/components/validation-errors.blade.php @@ -1,17 +1,21 @@ -@if($errors->count() > 0) - +@if ($errors->count() > 0) + - + - + {{ __('shopper::layout.forms.error') }} - + @foreach ($errors->all() as $message) {{ $message }} @endforeach diff --git a/packages/admin/resources/views/filament/form/select-tree.blade.php b/packages/admin/resources/views/filament/form/select-tree.blade.php index 050b8051a..6e533dfe1 100644 --- a/packages/admin/resources/views/filament/form/select-tree.blade.php +++ b/packages/admin/resources/views/filament/form/select-tree.blade.php @@ -12,26 +12,26 @@ wire:key="{{ rand() }}" wire:ignore x-data="selectTree({ - name: @js($getName()), - state: $wire.{{ $applyStateBindingModifiers("\$entangle('{$getStatePath()}')") }}, - options: @js($getTree()), - searchable: @js($isSearchable()), - showCount: @js($getWithCount()), - placeholder: @js($getPlaceholder()), - disabledBranchNode: @js(!$getEnableBranchNode()), - disabled: @js($isDisabled()), - isSingleSelect: @js(!$getMultiple()), - isIndependentNodes: @js($getIndependent()), - showTags: @js($getMultiple()), - alwaysOpen: @js($getAlwaysOpen()), - clearable: @js($getClearable()), - emptyText: @js($getEmptyLabel()), - expandSelected: @js($getExpandSelected()), - grouped: @js($getGrouped()), - openLevel: @js($getDefaultOpenLevel()), - direction: @js($getDirection()), - rtl: false, - })" + name: @js($getName()), + state: $wire.{{ $applyStateBindingModifiers("\$entangle('{$getStatePath()}')") }}, + options: @js($getTree()), + searchable: @js($isSearchable()), + showCount: @js($getWithCount()), + placeholder: @js($getPlaceholder()), + disabledBranchNode: @js(! $getEnableBranchNode()), + disabled: @js($isDisabled()), + isSingleSelect: @js(! $getMultiple()), + isIndependentNodes: @js($getIndependent()), + showTags: @js($getMultiple()), + alwaysOpen: @js($getAlwaysOpen()), + clearable: @js($getClearable()), + emptyText: @js($getEmptyLabel()), + expandSelected: @js($getExpandSelected()), + grouped: @js($getGrouped()), + openLevel: @js($getDefaultOpenLevel()), + direction: @js($getDirection()), + rtl: false, + })" > - @if($hasSelect) - @if($getPosition() === 'prefix') + @if ($hasSelect) + @if ($getPosition() === 'prefix') {{ $getSelectComponent() }} - + @else {{ $getSelectComponent() }} - + @endif @endif diff --git a/packages/admin/resources/views/filament/icon-picker-item.blade.php b/packages/admin/resources/views/filament/icon-picker-item.blade.php index 36e64a410..4ebe0d51c 100755 --- a/packages/admin/resources/views/filament/icon-picker-item.blade.php +++ b/packages/admin/resources/views/filament/icon-picker-item.blade.php @@ -1,15 +1,11 @@ - - - + + + {{-- Ugly fix for choices.js not registering clicks on SVGs. --}} - + - + {{ $icon }} diff --git a/packages/admin/resources/views/filament/tables/icon-column.blade.php b/packages/admin/resources/views/filament/tables/icon-column.blade.php index c7f166d61..2ba2d5587 100644 --- a/packages/admin/resources/views/filament/tables/icon-column.blade.php +++ b/packages/admin/resources/views/filament/tables/icon-column.blade.php @@ -1,5 +1,5 @@ - @if($icon = $getState()) + @if ($icon = $getState()) @endif diff --git a/packages/admin/resources/views/filament/wizard-column.blade.php b/packages/admin/resources/views/filament/wizard-column.blade.php index a386e72c5..3297459fc 100644 --- a/packages/admin/resources/views/filament/wizard-column.blade.php +++ b/packages/admin/resources/views/filament/wizard-column.blade.php @@ -48,7 +48,9 @@ }, getStepIndex: function (step) { - let index = this.getSteps().findIndex((indexedStep) => indexedStep === step) + let index = this.getSteps().findIndex( + (indexedStep) => indexedStep === step, + ) if (index === -1) { return 0 @@ -96,15 +98,15 @@ x-on:next-wizard-step.window="if ($event.detail.statePath === '{{ $statePath }}') nextStep()" {{ $attributes - ->merge([ - 'id' => $getId(), - ], escape: false) + ->merge( + [ + "id" => $getId(), + ], + escape: false, + ) ->merge($getExtraAttributes(), escape: false) ->merge($getExtraAlpineAttributes(), escape: false) - ->class([ - 'fi-fo-wizard h-full', - 'fi-contained' => $isContained, - ]) + ->class(["fi-fo-wizard h-full", "fi-contained" => $isContained]) }} > $isContained, - 'rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10' => ! $isContained, + "fi-fo-wizard-header scrolling grid divide-y divide-gray-200 dark:divide-white/5 md:grid-flow-col md:divide-y-0 md:overflow-x-auto xl:flex xl:flex-col", + "border-b border-gray-200 dark:border-white/10 xl:border-0 xl:border-r xl:py-10" => $isContained, + "rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10" => ! $isContained, ]) > @foreach ($getChildComponentContainer()->getComponents() as $step) @@ -145,7 +147,7 @@ class="fi-fo-wizard-header-step relative flex" x-on:click="step = @js($step->getId())" x-bind:disabled="! isStepAccessible(@js($step->getId()))" role="step" - class="fi-fo-wizard-header-step-button flex w-full h-full items-center gap-x-4 px-6 py-4 text-start" + class="fi-fo-wizard-header-step-button flex h-full w-full items-center gap-x-4 px-6 py-4 text-start" > index }}, }" > - {{ str_pad($loop->index + 1, 2, '0', STR_PAD_LEFT) }} + {{ str_pad($loop->index + 1, 2, "0", STR_PAD_LEFT) }} @endif @@ -253,13 +255,13 @@ class="h-full w-full text-gray-200 dark:text-white/5 rtl:rotate-180" $isContained, - 'mt-6' => ! $isContained, + "flex items-center justify-between gap-x-3", + "px-6" => $isContained, + "mt-6" => ! $isContained, ]) > - {{ $getAction('previous') }} + {{ $getAction("previous") }} @@ -277,7 +279,7 @@ class="h-full w-full text-gray-200 dark:text-white/5 rtl:rotate-180" " x-show="! isLastStep()" > - {{ $getAction('next') }} + {{ $getAction("next") }} @@ -286,5 +288,4 @@ class="h-full w-full text-gray-200 dark:text-white/5 rtl:rotate-180" - diff --git a/packages/admin/resources/views/filament/wizard/step-column.blade.php b/packages/admin/resources/views/filament/wizard/step-column.blade.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/admin/resources/views/includes/_additional-scripts.blade.php b/packages/admin/resources/views/includes/_additional-scripts.blade.php index bd6522a17..1bacd3413 100755 --- a/packages/admin/resources/views/includes/_additional-scripts.blade.php +++ b/packages/admin/resources/views/includes/_additional-scripts.blade.php @@ -1,6 +1,6 @@ -@if(! empty(config('shopper.admin.resources.scripts'))) +@if (! empty(config('shopper.admin.resources.scripts'))) - @foreach(config('shopper.admin.resources.scripts') as $js) + @foreach (config('shopper.admin.resources.scripts') as $js) @if (\Illuminate\Support\Str::of($js)->startsWith(['http://', 'https://'])) @else diff --git a/packages/admin/resources/views/includes/_additional-styles.blade.php b/packages/admin/resources/views/includes/_additional-styles.blade.php index ead86e16a..854862624 100755 --- a/packages/admin/resources/views/includes/_additional-styles.blade.php +++ b/packages/admin/resources/views/includes/_additional-styles.blade.php @@ -1,10 +1,10 @@ -@if(! empty(config('shopper.admin.resources.stylesheets'))) +@if (! empty(config('shopper.admin.resources.stylesheets'))) - @foreach(config('shopper.admin.resources.stylesheets') as $css) + @foreach (config('shopper.admin.resources.stylesheets') as $css) @if (\Illuminate\Support\Str::of($css)->startsWith(['http://', 'https://'])) - + @else - + @endif @endforeach @endif diff --git a/packages/admin/resources/views/livewire/components/account/devices.blade.php b/packages/admin/resources/views/livewire/components/account/devices.blade.php index 8bff2c179..6fb9a32e7 100755 --- a/packages/admin/resources/views/livewire/components/account/devices.blade.php +++ b/packages/admin/resources/views/livewire/components/account/devices.blade.php @@ -1,62 +1,73 @@ - - + + - + @if (count($this->sessions) > 0) {{ __('shopper::pages/auth.account.empty_device') }} - @foreach($this->sessions as $session) - + @foreach ($this->sessions as $session) + @if ($session->agent->isDesktop()) - + @else - + @endif - {{ __('shopper::words.browser_platform', [ - 'browser' => $session->agent->browser(), - 'platform' => $session->agent->platform() - ]) }} + {{ + __('shopper::words.browser_platform', [ + 'browser' => $session->agent->browser(), + 'platform' => $session->agent->platform(), + ]) + }} - {{ $session->ip_address }} @if ($session->is_current_device) - + {{ __('shopper::pages/auth.account.current_device') }} @else - {{ __('shopper::pages/auth.account.device_last_activity') }} {{ $session->last_active }} + {{ __('shopper::pages/auth.account.device_last_activity') }} + {{ $session->last_active }} @endif - @if($session->location) - {{ $session->location->cityName }}, {{ $session->location->regionName }}, {{ $session->location->countryName }} + @if ($session->location) + {{ $session->location->cityName }}, + {{ $session->location->regionName }}, + {{ $session->location->countryName }} @else {{ __('shopper::pages/auth.account.device_location') }} @endif - @if (!$session->is_current_device) + @if (! $session->is_current_device) - + {{ __('shopper::words.log_out') }} @@ -67,17 +78,31 @@ @else - + - - + + {{ __('shopper::pages/auth.account.device_enabled_feature') }} - + {{ __('shopper::components.learn_more') }} → diff --git a/packages/admin/resources/views/livewire/components/account/dropdown.blade.php b/packages/admin/resources/views/livewire/components/account/dropdown.blade.php index 45128b3fd..d2004f606 100755 --- a/packages/admin/resources/views/livewire/components/account/dropdown.blade.php +++ b/packages/admin/resources/views/livewire/components/account/dropdown.blade.php @@ -1,31 +1,32 @@ - + - + class="relative inline-flex w-full items-center rounded-full text-sm leading-5 focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800" + type="button" + > + {{ $user->full_name }} - + - @@ -46,15 +47,15 @@ class="absolute z-50 top-10 right-2.5 w-56 origin-top-right rounded-lg bg-white @endcan - + - + @csrf {{ __('shopper::layout.account_dropdown.sign_out') }} diff --git a/packages/admin/resources/views/livewire/components/account/two-factor.blade.php b/packages/admin/resources/views/livewire/components/account/two-factor.blade.php index a7f41e790..622d15a1e 100755 --- a/packages/admin/resources/views/livewire/components/account/two-factor.blade.php +++ b/packages/admin/resources/views/livewire/components/account/two-factor.blade.php @@ -1,20 +1,22 @@ - + - + - + - $this->enabled, - 'bg-gray-400 dark:bg-gray-500' => ! $this->enabled, - ])> - + $this->enabled, + 'bg-gray-400 dark:bg-gray-500' => ! $this->enabled, + ]) + > + @if ($this->enabled) {{ __('shopper::pages/auth.account.two_factor_enabled') }} @else @@ -23,7 +25,7 @@ class="lg:col-span-1" - + @if (! $this->enabled) @@ -35,7 +37,11 @@ class="lg:col-span-1" {{ __('shopper::pages/auth.account.two_factor_install_message') }} - + {{ __('shopper::components.learn_more') }} → @@ -43,17 +49,18 @@ class="lg:col-span-1" @endif + - - + + {{ __('shopper::pages/auth.account.two_factor_secure') }} - @if($this->enabled) + @if ($this->enabled) {{ __('shopper::pages/auth.account.two_factor_activation_message') }} @@ -62,7 +69,7 @@ class="lg:col-span-1" @if ($this->enabled) @if ($showingQrCode) - + {{ __('shopper::pages/auth.account.two_factor_is_enabled') }} @@ -74,37 +81,55 @@ class="lg:col-span-1" @endif @if ($showingRecoveryCodes) - + {{ __('shopper::pages/auth.account.two_factor_store_recovery_codes') }} - + @foreach (json_decode(decrypt($this->user->two_factor_recovery_codes), true) as $code) - {{ $code }} + {{ $code }} @endforeach @endif @endif - - @if(! $this->enabled) - + + @if (! $this->enabled) + {{ __('shopper::layout.forms.actions.enabled_two_factor') }} @else - + {{ __('shopper::layout.forms.actions.disabled') }} @if ($showingRecoveryCodes) - + {{ __('shopper::layout.forms.actions.regenerate') }} @else - + {{ __('shopper::layout.forms.actions.show_recovery_code') }} @endif diff --git a/packages/admin/resources/views/livewire/components/collections/products.blade.php b/packages/admin/resources/views/livewire/components/collections/products.blade.php index 7ecf32055..c1519564c 100755 --- a/packages/admin/resources/views/livewire/components/collections/products.blade.php +++ b/packages/admin/resources/views/livewire/components/collections/products.blade.php @@ -6,7 +6,7 @@ {{ __('shopper::layout.sidebar.products') }} - @if($collection->isAutomatic()) + @if ($collection->isAutomatic()) {{ __('shopper::pages/collections.automatic_description') }} @else {{ __('shopper::pages/collections.manual_description') }} diff --git a/packages/admin/resources/views/livewire/components/customers/addresses.blade.php b/packages/admin/resources/views/livewire/components/customers/addresses.blade.php index d75349dbc..6d78fb341 100755 --- a/packages/admin/resources/views/livewire/components/customers/addresses.blade.php +++ b/packages/admin/resources/views/livewire/components/customers/addresses.blade.php @@ -1,18 +1,22 @@ - @forelse($addresses as $address) + @forelse ($addresses as $address) - + - {{ $address->type === \Shopper\Core\Enum\AddressType::SHIPPING - ? __('shopper::pages/customers.addresses.shipping') - : __('shopper::pages/customers.addresses.billing') }} + {{ + $address->type === \Shopper\Core\Enum\AddressType::SHIPPING + ? __('shopper::pages/customers.addresses.shipping') + : __('shopper::pages/customers.addresses.billing') + }} - @if($address->is_default) - + @if ($address->is_default) + {{ __('shopper::pages/customers.addresses.default') }} @endif @@ -24,9 +28,11 @@ {{ $address->street_address }}, {{ $address->city }} - - {{ $address->phone_number }} - {{ $address->zipcode }}, + + {{ $address->phone_number }} + + {{ $address->zipcode }} + , {{ $address->country->name }} {{ isoToEmoji($address->country->cca2) }} @@ -35,12 +41,14 @@ @empty - - - + + + - - + + {{ __('shopper::pages/customers.addresses.customer') }} diff --git a/packages/admin/resources/views/livewire/components/customers/orders.blade.php b/packages/admin/resources/views/livewire/components/customers/orders.blade.php index 65cbc6781..10d4b0ef3 100755 --- a/packages/admin/resources/views/livewire/components/customers/orders.blade.php +++ b/packages/admin/resources/views/livewire/components/customers/orders.blade.php @@ -1,10 +1,14 @@ - @forelse($orders as $order) - - + @forelse ($orders as $order) + + - + {{ __('shopper::pages/customers.orders.placed') }} @@ -12,24 +16,29 @@ - + {{ __('shopper::pages/customers.orders.total') }} {{ $order->total }} - - + + {{ __('shopper::pages/customers.orders.ship_to') }} - {{ $order->shippingAddress->street_address }} {{ $order->shippingAddress->zipcode ?? '' }}, {{ $order->shippingAddress->country->name }} + {{ $order->shippingAddress->street_address }} + {{ $order->shippingAddress->zipcode ?? '' }}, {{ $order->shippingAddress->country->name }} - - + + {{ __('shopper::pages/customers.orders.order_number', ['number' => $order->number]) }} @@ -37,34 +46,44 @@ - + - + {{ __('shopper::pages/customers.orders.items') }} - + {{ $order->formatted_status }} - - @foreach($order->items as $item) - + + @foreach ($order->items as $item) + {{ $item->name }} - - {{ shopper_money_format($item->unit_price_amount) }} x {{ $item->quantity }} + + {{ shopper_money_format($item->unit_price_amount) }} x {{ $item->quantity }} + @endforeach - + {{ __('shopper::words.payment_method') }} - @if($order->paymentMethod->logo) - + @if ($order->paymentMethod->logo) + @else - + @endif @@ -76,11 +95,11 @@ - + {{ __('shopper::words.shipping_method') }} - @if($order->shipping_method) + @if ($order->shipping_method) {{ $order->shipping_method }} @@ -95,24 +114,27 @@ - - - + + + {{ __('shopper::pages/customers.orders.estimated') }} {{ __('N/A') }} - + {{ __('shopper::pages/customers.orders.view') }} - + @empty - - + + - + {{ __('shopper::pages/customers.orders.empty_text') }} diff --git a/packages/admin/resources/views/livewire/components/customers/profile.blade.php b/packages/admin/resources/views/livewire/components/customers/profile.blade.php index 650e8aadf..d7debf04e 100755 --- a/packages/admin/resources/views/livewire/components/customers/profile.blade.php +++ b/packages/admin/resources/views/livewire/components/customers/profile.blade.php @@ -1,7 +1,7 @@ - + {{ __('shopper::pages/customers.profile.title') }} @@ -10,55 +10,55 @@ - - + + {{ __('shopper::layout.forms.label.first_name') }} - + {{ $customer->first_name }} - - + + {{ __('shopper::layout.forms.label.last_name') }} - + {{ $customer->last_name }} - - + + {{ __('shopper::layout.forms.label.photo') }} - + - + - - + + {{ __('shopper::layout.forms.label.email') }} - + {{ $customer->email }} - - + + {{ __('shopper::layout.forms.label.birth_date') }} - + @@ -67,11 +67,13 @@ class="w-5 h-5 mr-2 text-gray-500 dark:text-gray-400" - - + + {{ __('shopper::layout.forms.label.gender') }} - + {{ $customer->gender }} @@ -82,7 +84,7 @@ class="w-5 h-5 mr-2 text-gray-500 dark:text-gray-400" - + {{ __('shopper::pages/customers.profile.account') }} @@ -91,22 +93,22 @@ class="w-5 h-5 mr-2 text-gray-500 dark:text-gray-400" - - + + {{ __('shopper::pages/customers.profile.marketing') }} - + - - + + {{ __('shopper::pages/customers.profile.two_factor') }} - + - @foreach($steps as $step) + @foreach ($steps as $step) $step->complete + "inline-flex items-center text-sm leading-6", + "cursor-pointer" => $step->complete, ]) @if ($step->complete) wire:click="{{ $step->show() }}" @endif > - $step->complete, - 'border border-gray-300 bg-white text-gray-500 dark:border-gray-700 dark:bg-gray-950 dark:text-gray-400' => ! $step->complete, - ])> - @if($step->complete) - + $step->complete, + "border border-gray-300 bg-white text-gray-500 dark:border-gray-700 dark:bg-gray-950 dark:text-gray-400" => ! $step->complete, + ]) + > + @if ($step->complete) + @else {{ $loop->index + 1 }} @endif - $step->complete, - 'text-gray-900 font-medium dark:text-white' => $step->isCurrent(), - 'text-gray-500 dark:text-gray-400' => ! ($step->isCurrent() || $step->complete) - ])> + $step->complete, + "font-medium text-gray-900 dark:text-white" => $step->isCurrent(), + "text-gray-500 dark:text-gray-400" => ! ( + $step->isCurrent() || $step->complete + ), + ]) + > {{ $step->label }} - @if(! $loop->last) + @if (! $loop->last) - + {{ __('shopper::pages/settings.initialization.address_description') }} - + {{ __('shopper::pages/settings.initialization.step_2_description') }} @@ -39,7 +39,11 @@ class="col-span-2" required /> - + - - + + @@ -71,18 +74,13 @@ class="w-full" - + {{ __('shopper::layout.forms.actions.back') }} - + {{ __('shopper::layout.forms.actions.next') }} diff --git a/packages/admin/resources/views/livewire/components/initialization/store-information.blade.php b/packages/admin/resources/views/livewire/components/initialization/store-information.blade.php index d558ddb4c..42354fece 100644 --- a/packages/admin/resources/views/livewire/components/initialization/store-information.blade.php +++ b/packages/admin/resources/views/livewire/components/initialization/store-information.blade.php @@ -15,10 +15,10 @@ class="h-6 w-6 text-gray-400 dark:text-gray-500" - + {{ __('shopper::pages/settings.initialization.tell_about') }} - + {{ __('shopper::pages/settings.initialization.step_1_description') }} @@ -31,9 +31,9 @@ class="h-6 w-6 text-gray-400 dark:text-gray-500" isRequired > - + @@ -56,9 +56,9 @@ class="pl-10" isRequired > - + @@ -86,10 +86,10 @@ class="pl-10" x-data="{ init() { tomSelect('#country_id', {}) - } + }, }" > - @foreach($countries as $country) + @foreach ($countries as $country) {{ $country->name }} @endforeach @@ -111,10 +111,10 @@ class="pl-10" x-data="{ init() { tomSelect('#currency', {}) - } + }, }" > - @foreach($currencies as $currency) + @foreach ($currencies as $currency) {{ $currency->name . ' (' . $currency->code . ')' }} @@ -136,15 +136,10 @@ class="pl-10" - + - + {{ __('shopper::layout.forms.actions.next') }} diff --git a/packages/admin/resources/views/livewire/components/initialization/store-social-link.blade.php b/packages/admin/resources/views/livewire/components/initialization/store-social-link.blade.php index 3d65545f4..b9433f37e 100644 --- a/packages/admin/resources/views/livewire/components/initialization/store-social-link.blade.php +++ b/packages/admin/resources/views/livewire/components/initialization/store-social-link.blade.php @@ -15,22 +15,26 @@ class="h-6 w-6 text-gray-400 dark:text-gray-500" - + {{ __('shopper::pages/settings.initialization.social_description') }} ({{ __('shopper::layout.forms.label.optional') }}) - + {{ __('shopper::pages/settings.initialization.step_3_description') }} - - + + @@ -42,10 +46,14 @@ class="pl-10" placeholder="https://facebook.com/laravelshopper" /> - - + + @@ -57,12 +65,13 @@ class="pl-10" placeholder="https://instagram.com/laravelshopper" /> - - - + + + - + {{ __('shopper::layout.forms.actions.back') }} - + {{ __('shopper::pages/settings.initialization.action') }} diff --git a/packages/admin/resources/views/livewire/components/products/attributes/multiple-choice.blade.php b/packages/admin/resources/views/livewire/components/products/attributes/multiple-choice.blade.php index 71c5e83e2..b1512eec8 100755 --- a/packages/admin/resources/views/livewire/components/products/attributes/multiple-choice.blade.php +++ b/packages/admin/resources/views/livewire/components/products/attributes/multiple-choice.blade.php @@ -1,10 +1,10 @@ {{ $this->saveAction }} - + - @foreach($attribute->values as $value) + @foreach ($attribute->values as $value) - @if($attribute->type === \Shopper\Core\Enum\FieldType::COLORPICKER) - + @if ($attribute->type === \Shopper\Core\Enum\FieldType::COLORPICKER) + - @if($model) + @if ($model) {{ ($this->removeAction)(['id' => $model->id]) }} @endif + {{ ($this->saveAction)(['column' => 'value']) }} - + - @foreach($attribute->values as $value) + @foreach ($attribute->values as $value) - @if($model) + @if ($model) {{ ($this->removeAction)(['id' => $model->id]) }} @endif - + {{ $this->form }} diff --git a/packages/admin/resources/views/livewire/components/products/forms/attributes.blade.php b/packages/admin/resources/views/livewire/components/products/forms/attributes.blade.php index 13b630fc5..f6f855e32 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/attributes.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/attributes.blade.php @@ -8,12 +8,12 @@ - @if($productAttributes->isNotEmpty()) + @if ($productAttributes->isNotEmpty()) - @if($productAttributes['choice']->isNotEmpty()) + @if ($productAttributes['choice']->isNotEmpty()) - @foreach($productAttributes['choice'] as $attribute) - @if($attribute->hasMultipleValues()) + @foreach ($productAttributes['choice'] as $attribute) + @if ($attribute->hasMultipleValues()) @endif - @if($attribute->hasSingleValue()) + @if ($attribute->hasSingleValue()) @endif - @if($productAttributes['text']->isNotEmpty()) + @if ($productAttributes['text']->isNotEmpty()) - @foreach($productAttributes['text'] as $productAttribute) - $productAttribute->type === \Shopper\Core\Enum\FieldType::RICHTEXT - ])> + @foreach ($productAttributes['text'] as $productAttribute) + $productAttribute->type === \Shopper\Core\Enum\FieldType::RICHTEXT, + ]) + > @else - - + + - + {{ __('shopper::pages/products.attributes.empty_title') }} diff --git a/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php b/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php index c6fc47bd7..9385fbf7d 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php @@ -2,7 +2,7 @@ {{ $this->form }} - + diff --git a/packages/admin/resources/views/livewire/components/products/forms/inventory.blade.php b/packages/admin/resources/views/livewire/components/products/forms/inventory.blade.php index 6f590677b..625037859 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/inventory.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/inventory.blade.php @@ -14,7 +14,9 @@ - + {{ __('shopper::pages/products.inventory.stock_title') }} diff --git a/packages/admin/resources/views/livewire/components/products/forms/media.blade.php b/packages/admin/resources/views/livewire/components/products/forms/media.blade.php index c6fc47bd7..9385fbf7d 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/media.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/media.blade.php @@ -2,7 +2,7 @@ {{ $this->form }} - + diff --git a/packages/admin/resources/views/livewire/components/products/forms/related.blade.php b/packages/admin/resources/views/livewire/components/products/forms/related.blade.php index a6299cf93..4fd90f091 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/related.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/related.blade.php @@ -8,7 +8,7 @@ {{ __('shopper::pages/products.related.description') }} - @if($relatedProducts->isNotEmpty()) + @if ($relatedProducts->isNotEmpty()) - @if($relatedProducts->isNotEmpty()) + @if ($relatedProducts->isNotEmpty()) - @foreach($relatedProducts as $relatedProduct) + @foreach ($relatedProducts as $relatedProduct) + class="h-full w-full max-w-none object-cover object-center" + /> removeAction)(['id' => $relatedProduct->id]), + ]" :badge="true" :icon-button="true" icon="untitledui-dots-vertical" @@ -61,7 +61,7 @@ class="h-full w-full object-cover object-center max-w-none" {{ $relatedProduct->getPriceAmount()?->formatted }} - + @else - - - + + + {{ __('shopper::pages/products.related.empty') }} @@ -97,11 +95,7 @@ class="h-5 w-5" arguments: { productId: {{ $product->id }}, ids: {{ json_encode($this->productsIds) }} }, })" > - + {{ __('shopper::words.actions_label.add_new', ['name' => strtolower(__('shopper::words.product'))]) }} diff --git a/packages/admin/resources/views/livewire/components/products/forms/seo.blade.php b/packages/admin/resources/views/livewire/components/products/forms/seo.blade.php index 2d69043e1..378f42c22 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/seo.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/seo.blade.php @@ -25,24 +25,26 @@ {{ __('shopper::pages/products.seo.sub_description') }} - - + + - - - + + + - + - + {{ $data['seo_title'] }} - +
{{ $content }}
{{ __('shopper::words.feature_enabled', ['feature' => \Illuminate\Support\Str::title($getFeature())]) }} diff --git a/packages/admin/resources/views/components/form-slider-over.blade.php b/packages/admin/resources/views/components/form-slider-over.blade.php index c43fc5246..5fa647e33 100644 --- a/packages/admin/resources/views/components/form-slider-over.blade.php +++ b/packages/admin/resources/views/components/form-slider-over.blade.php @@ -1,4 +1,8 @@ -@props(['action', 'title', 'description' => null]) +@props([ + 'action', + 'title', + 'description' => null, +])
{{ $description }} @@ -30,7 +34,7 @@ class="rounded-md bg-white text-gray-400 hover:text-gray-500 dark:bg-gray-900 da {{ $slot }}
Copyright © {{ date('Y') }} — Shopper Labs.
- {{ __($menu['name']) }} + {{ __($menu["name"]) }} - @if(! $menu['route']) - - {{ __('shopper::layout.soon') }} + @if (! $menu["route"]) + + {{ __("shopper::layout.soon") }} @endif
- {{ __($menu['description']) }} + {{ __($menu["description"]) }}
- {{ $subtitle }} -
+ {{ $subtitle }} +
{{ $description }}
{{ __('shopper::pages/auth.account.empty_device') }}
- @if($session->location) - {{ $session->location->cityName }}, {{ $session->location->regionName }}, {{ $session->location->countryName }} + @if ($session->location) + {{ $session->location->cityName }}, + {{ $session->location->regionName }}, + {{ $session->location->countryName }} @else {{ __('shopper::pages/auth.account.device_location') }} @endif
{{ __('shopper::pages/auth.account.device_enabled_feature') }} - + {{ __('shopper::components.learn_more') }} →
@@ -46,15 +47,15 @@ class="absolute z-50 top-10 right-2.5 w-56 origin-top-right rounded-lg bg-white @endcan
- + {{ __('shopper::components.learn_more') }} →
{{ __('shopper::pages/auth.account.two_factor_secure') }}
{{ __('shopper::pages/auth.account.two_factor_activation_message') }}
{{ __('shopper::pages/auth.account.two_factor_is_enabled') }}
{{ __('shopper::pages/auth.account.two_factor_store_recovery_codes') }}
{{ $address->street_address }}, {{ $address->city }}
{{ __('shopper::pages/customers.addresses.customer') }}
diff --git a/packages/admin/resources/views/livewire/components/customers/orders.blade.php b/packages/admin/resources/views/livewire/components/customers/orders.blade.php index 65cbc6781..10d4b0ef3 100755 --- a/packages/admin/resources/views/livewire/components/customers/orders.blade.php +++ b/packages/admin/resources/views/livewire/components/customers/orders.blade.php @@ -1,10 +1,14 @@ - @forelse($orders as $order) - - + @forelse ($orders as $order) + + - + {{ __('shopper::pages/customers.orders.placed') }} @@ -12,24 +16,29 @@ - + {{ __('shopper::pages/customers.orders.total') }} {{ $order->total }} - - + + {{ __('shopper::pages/customers.orders.ship_to') }} - {{ $order->shippingAddress->street_address }} {{ $order->shippingAddress->zipcode ?? '' }}, {{ $order->shippingAddress->country->name }} + {{ $order->shippingAddress->street_address }} + {{ $order->shippingAddress->zipcode ?? '' }}, {{ $order->shippingAddress->country->name }} - - + + {{ __('shopper::pages/customers.orders.order_number', ['number' => $order->number]) }} @@ -37,34 +46,44 @@ - + - + {{ __('shopper::pages/customers.orders.items') }} - + {{ $order->formatted_status }} - - @foreach($order->items as $item) - + + @foreach ($order->items as $item) + {{ $item->name }} - - {{ shopper_money_format($item->unit_price_amount) }} x {{ $item->quantity }} + + {{ shopper_money_format($item->unit_price_amount) }} x {{ $item->quantity }} + @endforeach - + {{ __('shopper::words.payment_method') }} - @if($order->paymentMethod->logo) - + @if ($order->paymentMethod->logo) + @else - + @endif @@ -76,11 +95,11 @@ - + {{ __('shopper::words.shipping_method') }} - @if($order->shipping_method) + @if ($order->shipping_method) {{ $order->shipping_method }} @@ -95,24 +114,27 @@ - - - + + + {{ __('shopper::pages/customers.orders.estimated') }} {{ __('N/A') }} - + {{ __('shopper::pages/customers.orders.view') }} - + @empty - - + + - + {{ __('shopper::pages/customers.orders.empty_text') }} diff --git a/packages/admin/resources/views/livewire/components/customers/profile.blade.php b/packages/admin/resources/views/livewire/components/customers/profile.blade.php index 650e8aadf..d7debf04e 100755 --- a/packages/admin/resources/views/livewire/components/customers/profile.blade.php +++ b/packages/admin/resources/views/livewire/components/customers/profile.blade.php @@ -1,7 +1,7 @@ - + {{ __('shopper::pages/customers.profile.title') }} @@ -10,55 +10,55 @@ - - + + {{ __('shopper::layout.forms.label.first_name') }} - + {{ $customer->first_name }} - - + + {{ __('shopper::layout.forms.label.last_name') }} - + {{ $customer->last_name }} - - + + {{ __('shopper::layout.forms.label.photo') }} - + - + - - + + {{ __('shopper::layout.forms.label.email') }} - + {{ $customer->email }} - - + + {{ __('shopper::layout.forms.label.birth_date') }} - + @@ -67,11 +67,13 @@ class="w-5 h-5 mr-2 text-gray-500 dark:text-gray-400" - - + + {{ __('shopper::layout.forms.label.gender') }} - + {{ $customer->gender }} @@ -82,7 +84,7 @@ class="w-5 h-5 mr-2 text-gray-500 dark:text-gray-400" - + {{ __('shopper::pages/customers.profile.account') }} @@ -91,22 +93,22 @@ class="w-5 h-5 mr-2 text-gray-500 dark:text-gray-400" - - + + {{ __('shopper::pages/customers.profile.marketing') }} - + - - + + {{ __('shopper::pages/customers.profile.two_factor') }} - + - @foreach($steps as $step) + @foreach ($steps as $step) $step->complete + "inline-flex items-center text-sm leading-6", + "cursor-pointer" => $step->complete, ]) @if ($step->complete) wire:click="{{ $step->show() }}" @endif > - $step->complete, - 'border border-gray-300 bg-white text-gray-500 dark:border-gray-700 dark:bg-gray-950 dark:text-gray-400' => ! $step->complete, - ])> - @if($step->complete) - + $step->complete, + "border border-gray-300 bg-white text-gray-500 dark:border-gray-700 dark:bg-gray-950 dark:text-gray-400" => ! $step->complete, + ]) + > + @if ($step->complete) + @else {{ $loop->index + 1 }} @endif - $step->complete, - 'text-gray-900 font-medium dark:text-white' => $step->isCurrent(), - 'text-gray-500 dark:text-gray-400' => ! ($step->isCurrent() || $step->complete) - ])> + $step->complete, + "font-medium text-gray-900 dark:text-white" => $step->isCurrent(), + "text-gray-500 dark:text-gray-400" => ! ( + $step->isCurrent() || $step->complete + ), + ]) + > {{ $step->label }} - @if(! $loop->last) + @if (! $loop->last) - + {{ __('shopper::pages/settings.initialization.address_description') }} - + {{ __('shopper::pages/settings.initialization.step_2_description') }} @@ -39,7 +39,11 @@ class="col-span-2" required /> - + - - + + @@ -71,18 +74,13 @@ class="w-full" - + {{ __('shopper::layout.forms.actions.back') }} - + {{ __('shopper::layout.forms.actions.next') }} diff --git a/packages/admin/resources/views/livewire/components/initialization/store-information.blade.php b/packages/admin/resources/views/livewire/components/initialization/store-information.blade.php index d558ddb4c..42354fece 100644 --- a/packages/admin/resources/views/livewire/components/initialization/store-information.blade.php +++ b/packages/admin/resources/views/livewire/components/initialization/store-information.blade.php @@ -15,10 +15,10 @@ class="h-6 w-6 text-gray-400 dark:text-gray-500" - + {{ __('shopper::pages/settings.initialization.tell_about') }} - + {{ __('shopper::pages/settings.initialization.step_1_description') }} @@ -31,9 +31,9 @@ class="h-6 w-6 text-gray-400 dark:text-gray-500" isRequired > - + @@ -56,9 +56,9 @@ class="pl-10" isRequired > - + @@ -86,10 +86,10 @@ class="pl-10" x-data="{ init() { tomSelect('#country_id', {}) - } + }, }" > - @foreach($countries as $country) + @foreach ($countries as $country) {{ $country->name }} @endforeach @@ -111,10 +111,10 @@ class="pl-10" x-data="{ init() { tomSelect('#currency', {}) - } + }, }" > - @foreach($currencies as $currency) + @foreach ($currencies as $currency) {{ $currency->name . ' (' . $currency->code . ')' }} @@ -136,15 +136,10 @@ class="pl-10" - + - + {{ __('shopper::layout.forms.actions.next') }} diff --git a/packages/admin/resources/views/livewire/components/initialization/store-social-link.blade.php b/packages/admin/resources/views/livewire/components/initialization/store-social-link.blade.php index 3d65545f4..b9433f37e 100644 --- a/packages/admin/resources/views/livewire/components/initialization/store-social-link.blade.php +++ b/packages/admin/resources/views/livewire/components/initialization/store-social-link.blade.php @@ -15,22 +15,26 @@ class="h-6 w-6 text-gray-400 dark:text-gray-500" - + {{ __('shopper::pages/settings.initialization.social_description') }} ({{ __('shopper::layout.forms.label.optional') }}) - + {{ __('shopper::pages/settings.initialization.step_3_description') }} - - + + @@ -42,10 +46,14 @@ class="pl-10" placeholder="https://facebook.com/laravelshopper" /> - - + + @@ -57,12 +65,13 @@ class="pl-10" placeholder="https://instagram.com/laravelshopper" /> - - - + + + - + {{ __('shopper::layout.forms.actions.back') }} - + {{ __('shopper::pages/settings.initialization.action') }} diff --git a/packages/admin/resources/views/livewire/components/products/attributes/multiple-choice.blade.php b/packages/admin/resources/views/livewire/components/products/attributes/multiple-choice.blade.php index 71c5e83e2..b1512eec8 100755 --- a/packages/admin/resources/views/livewire/components/products/attributes/multiple-choice.blade.php +++ b/packages/admin/resources/views/livewire/components/products/attributes/multiple-choice.blade.php @@ -1,10 +1,10 @@ {{ $this->saveAction }} - + - @foreach($attribute->values as $value) + @foreach ($attribute->values as $value) - @if($attribute->type === \Shopper\Core\Enum\FieldType::COLORPICKER) - + @if ($attribute->type === \Shopper\Core\Enum\FieldType::COLORPICKER) + - @if($model) + @if ($model) {{ ($this->removeAction)(['id' => $model->id]) }} @endif + {{ ($this->saveAction)(['column' => 'value']) }} - + - @foreach($attribute->values as $value) + @foreach ($attribute->values as $value) - @if($model) + @if ($model) {{ ($this->removeAction)(['id' => $model->id]) }} @endif - + {{ $this->form }} diff --git a/packages/admin/resources/views/livewire/components/products/forms/attributes.blade.php b/packages/admin/resources/views/livewire/components/products/forms/attributes.blade.php index 13b630fc5..f6f855e32 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/attributes.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/attributes.blade.php @@ -8,12 +8,12 @@ - @if($productAttributes->isNotEmpty()) + @if ($productAttributes->isNotEmpty()) - @if($productAttributes['choice']->isNotEmpty()) + @if ($productAttributes['choice']->isNotEmpty()) - @foreach($productAttributes['choice'] as $attribute) - @if($attribute->hasMultipleValues()) + @foreach ($productAttributes['choice'] as $attribute) + @if ($attribute->hasMultipleValues()) @endif - @if($attribute->hasSingleValue()) + @if ($attribute->hasSingleValue()) @endif - @if($productAttributes['text']->isNotEmpty()) + @if ($productAttributes['text']->isNotEmpty()) - @foreach($productAttributes['text'] as $productAttribute) - $productAttribute->type === \Shopper\Core\Enum\FieldType::RICHTEXT - ])> + @foreach ($productAttributes['text'] as $productAttribute) + $productAttribute->type === \Shopper\Core\Enum\FieldType::RICHTEXT, + ]) + > @else - - + + - + {{ __('shopper::pages/products.attributes.empty_title') }} diff --git a/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php b/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php index c6fc47bd7..9385fbf7d 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php @@ -2,7 +2,7 @@ {{ $this->form }} - + diff --git a/packages/admin/resources/views/livewire/components/products/forms/inventory.blade.php b/packages/admin/resources/views/livewire/components/products/forms/inventory.blade.php index 6f590677b..625037859 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/inventory.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/inventory.blade.php @@ -14,7 +14,9 @@ - + {{ __('shopper::pages/products.inventory.stock_title') }} diff --git a/packages/admin/resources/views/livewire/components/products/forms/media.blade.php b/packages/admin/resources/views/livewire/components/products/forms/media.blade.php index c6fc47bd7..9385fbf7d 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/media.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/media.blade.php @@ -2,7 +2,7 @@ {{ $this->form }} - + diff --git a/packages/admin/resources/views/livewire/components/products/forms/related.blade.php b/packages/admin/resources/views/livewire/components/products/forms/related.blade.php index a6299cf93..4fd90f091 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/related.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/related.blade.php @@ -8,7 +8,7 @@ {{ __('shopper::pages/products.related.description') }} - @if($relatedProducts->isNotEmpty()) + @if ($relatedProducts->isNotEmpty()) - @if($relatedProducts->isNotEmpty()) + @if ($relatedProducts->isNotEmpty()) - @foreach($relatedProducts as $relatedProduct) + @foreach ($relatedProducts as $relatedProduct) + class="h-full w-full max-w-none object-cover object-center" + /> removeAction)(['id' => $relatedProduct->id]), + ]" :badge="true" :icon-button="true" icon="untitledui-dots-vertical" @@ -61,7 +61,7 @@ class="h-full w-full object-cover object-center max-w-none" {{ $relatedProduct->getPriceAmount()?->formatted }} - + @else - - - + + + {{ __('shopper::pages/products.related.empty') }} @@ -97,11 +95,7 @@ class="h-5 w-5" arguments: { productId: {{ $product->id }}, ids: {{ json_encode($this->productsIds) }} }, })" > - + {{ __('shopper::words.actions_label.add_new', ['name' => strtolower(__('shopper::words.product'))]) }} diff --git a/packages/admin/resources/views/livewire/components/products/forms/seo.blade.php b/packages/admin/resources/views/livewire/components/products/forms/seo.blade.php index 2d69043e1..378f42c22 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/seo.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/seo.blade.php @@ -25,24 +25,26 @@ {{ __('shopper::pages/products.seo.sub_description') }} - - + + - - - + + + - + - + {{ $data['seo_title'] }} - +
{{ $order->shipping_method }}
- + + + {{ __('shopper::pages/customers.orders.estimated') }} {{ __('N/A') }} - + {{ __('shopper::pages/customers.orders.view') }} - +
+ {{ __('shopper::pages/customers.orders.estimated') }} {{ __('N/A') }}
@@ -10,55 +10,55 @@
@@ -67,11 +67,13 @@ class="w-5 h-5 mr-2 text-gray-500 dark:text-gray-400"
@@ -91,22 +93,22 @@ class="w-5 h-5 mr-2 text-gray-500 dark:text-gray-400"
{{ __('shopper::pages/settings.initialization.step_2_description') }}
{{ __('shopper::pages/settings.initialization.step_1_description') }}
{{ __('shopper::pages/settings.initialization.step_3_description') }}
diff --git a/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php b/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php index c6fc47bd7..9385fbf7d 100755 --- a/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php +++ b/packages/admin/resources/views/livewire/components/products/forms/edit.blade.php @@ -2,7 +2,7 @@