Merge pull request #3 from trippo/main

Add setModel on steps after reset + UI refactoring
vildanbina · Apr 4, 2022 · 157ff97 · 157ff97
2 parents de1d6b5 + b2b16bf
commit 157ff97
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/resources/views/step-header.blade.php b/resources/views/step-header.blade.php
@@ -10,7 +10,7 @@
                 <div class="bg-gray-200 rounded flex-1">
                     <div
                         @class([
-                            'rounded py-1',
+                            'rounded py-0.5',
                             'bg-green-300' => $stepIsGreaterOrEqualThan && !$isFailedStep,
                             'bg-red-300' => $isFailedStep,
                             'w-full' => $isFailedStep || $stepIsGreaterOrEqualThan,
@@ -21,7 +21,7 @@
             </div>
         @endif
 
-        <div class="w-10 mx-auto">
+        <div class="grid place-items-center">
             <x-button.circle
                 :positive="$stepIsGreaterOrEqualThan && !$isFailedStep"
                 :negative="$isFailedStep"

diff --git a/resources/views/steps-footer.blade.php b/resources/views/steps-footer.blade.php
@@ -1,10 +1,10 @@
-<div>
-    @if($this->hasPrevStep())
-        <x-button dark label="Back" wire:click="goToPrevStep" spinner="goToPrevStep"/>
-    @endif
+<div class="p-2 flex flex-row-reverse justify-between">
     @if($this->hasNextStep())
-        <x-button primary wire:click="goToNextStep" spinner="goToNextStep" label="Next"/>
+        <x-button lg primary  right-icon="chevron-right" wire:click="goToNextStep" spinner="goToNextStep" :label="__('Next')"/>
     @else
-        <x-button primary type="submit" spinner="submit" label="Submit"/>
+        <x-button lg primary type="submit" spinner="submit" :label="__('Submit')"/>
+    @endif
+    @if($this->hasPrevStep())
+        <x-button lg dark :label="__('Back')" icon="chevron-left" wire:click="goToPrevStep" spinner="goToPrevStep"/>
     @endif
 </div>
diff --git a/resources/views/steps-header.blade.php b/resources/views/steps-header.blade.php
@@ -1,4 +1,4 @@
-<div class="w-full py-6">
+<div class="w-full pb-6 pt-2">
     <div class="flex">
         @foreach($stepInstances as $stepInstance)
             @include('livewire-wizard::step-header')

diff --git a/resources/views/wizard.blade.php b/resources/views/wizard.blade.php
@@ -1,8 +1,8 @@
 <div>
-    <x-errors/>
     <form wire:submit.prevent="save">
         @include('livewire-wizard::steps-header')
-        <div class="container p-4">
+        <x-errors/>
+        <div class="container p-4 mx-auto">
             {{ $this->getCurrentStep() }}
         </div>
 

diff --git a/src/WizardComponent.php b/src/WizardComponent.php
@@ -60,6 +60,11 @@ public function mount()
         }
 
         $this->stepClasses(function (Step $step) {
+
+            if (method_exists($this, 'model')) {
+                $step->setModel($this->model);
+            }
+
             if (method_exists($step, 'mount')) {
                 $step->mount();
             }