forked from eatvio/eatvio-infra
Merge pull request 'Registration fix and refactoring' (#69) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#69
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace App\Livewire\BlogPost;
|
||||
|
||||
use App\Models\User;
|
||||
use App\Services\BlogPost\ListViewService;
|
||||
use Illuminate\View\View;
|
||||
use Livewire\Component;
|
||||
@@ -18,7 +17,7 @@ class ListView extends Component
|
||||
|
||||
public string $tag = '';
|
||||
|
||||
public User|null $author = null;
|
||||
public ?int $author = null;
|
||||
|
||||
protected array $queryString = [
|
||||
'search' => ['except' => ''],
|
||||
|
||||
@@ -38,41 +38,41 @@ class Step1 extends Component
|
||||
|
||||
public string $lang = 'ru';
|
||||
|
||||
public int|string $weight = '';
|
||||
public int|string|null $weight = '';
|
||||
|
||||
public int|string $height = '';
|
||||
public int|string|null $height = '';
|
||||
|
||||
public int|string $chest_circumference = '';
|
||||
public int|string|null $chest_circumference = '';
|
||||
|
||||
public int|string $waist_circumference = '';
|
||||
public int|string|null $waist_circumference = '';
|
||||
|
||||
public int|string $hip_circumference = '';
|
||||
public int|string|null $hip_circumference = '';
|
||||
|
||||
public int|string $blood_pressure_up = '';
|
||||
public int|string|null $blood_pressure_up = '';
|
||||
|
||||
public int|string $blood_pressure_down = '';
|
||||
public int|string|null $blood_pressure_down = '';
|
||||
|
||||
public int|string $has_hypo = 0;
|
||||
|
||||
public int|string $has_hyper = 0;
|
||||
|
||||
public string $about_alergy = '';
|
||||
public ?string $about_alergy = '';
|
||||
|
||||
public string $about_taking_pils = '';
|
||||
public ?string $about_taking_pils = '';
|
||||
|
||||
public string $about_sport_hobbies = '';
|
||||
public ?string $about_sport_hobbies = '';
|
||||
|
||||
public string $favorite_foods = '';
|
||||
public ?string $favorite_foods = '';
|
||||
|
||||
public string $unfavorite_foods = '';
|
||||
public ?string $unfavorite_foods = '';
|
||||
|
||||
public string $additional_info = '';
|
||||
public ?string $additional_info = '';
|
||||
|
||||
public function mount(string $step): void
|
||||
{
|
||||
$this->step = $step;
|
||||
collect(session()->get('registrationdata', []))
|
||||
->each(fn ($item, $key) => $this->{$key} = $item);
|
||||
->each(fn ($item, $key): mixed => $this->{$key} = $item);
|
||||
}
|
||||
|
||||
public function render(): View|ViewFactory
|
||||
|
||||
@@ -102,7 +102,7 @@ class Plan extends Model implements Viewable
|
||||
return 'slug';
|
||||
}
|
||||
|
||||
public function author(): BelongsToMany
|
||||
public function author(): ?BelongsToMany
|
||||
{
|
||||
return $this->belongsToMany(User::class, 'plan_author', 'plan_id', 'user_id');
|
||||
}
|
||||
|
||||
@@ -14,6 +14,6 @@ class PlanPolicy
|
||||
|
||||
private function isAuthorPlan(User $user, Plan $plan): bool
|
||||
{
|
||||
return $user->id === $plan->author()->first()->id;
|
||||
return $user->id === optional($plan->author()->first())->id;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ class PlanPresenter extends Presenter
|
||||
return Storage::url($author->profile_photo_path);
|
||||
}
|
||||
|
||||
public function getAuthor(): User
|
||||
public function getAuthor(): ?User
|
||||
{
|
||||
return $this->author->first();
|
||||
}
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
|
||||
namespace App\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\Rule;
|
||||
use Closure;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
|
||||
class MinWords implements Rule
|
||||
class MinWords implements ValidationRule
|
||||
{
|
||||
protected int $minWords;
|
||||
|
||||
@@ -13,15 +14,15 @@ class MinWords implements Rule
|
||||
$this->minWords = $minWords;
|
||||
}
|
||||
|
||||
public function passes(mixed $attribute, mixed $value): bool|int
|
||||
/**
|
||||
* Run the validation rule.
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$wordCount = count(preg_split('/\W+/u', $value, -1, PREG_SPLIT_NO_EMPTY));
|
||||
|
||||
return $wordCount >= $this->minWords;
|
||||
}
|
||||
|
||||
public function message(): string
|
||||
{
|
||||
return "The :attribute must have at least {$this->minWords} words.";
|
||||
if ($wordCount <= $this->minWords) {
|
||||
$fail('validation.min_words_count')->translate(['min' => $this->minWords]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,12 +5,12 @@ namespace App\Services\Recipe;
|
||||
use App\Livewire\Recipe\ListView;
|
||||
use App\Models\Recipe;
|
||||
use App\Services\Strategy\Criteried\AuthorCriteriaStrategy;
|
||||
use App\Services\Strategy\Criteried\CriteriaStrategy;
|
||||
use App\Services\Strategy\Criteried\DefaultCriteriaStrategy;
|
||||
use App\Services\Strategy\Criteried\SearchCriteriaStrategy;
|
||||
use App\Services\Strategy\Criteried\TagCriteriaStrategy;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Relations\MorphToMany;
|
||||
use App\Services\Strategy\Criteried\CriteriaStrategy;
|
||||
|
||||
class ListViewService
|
||||
{
|
||||
@@ -28,12 +28,12 @@ class ListViewService
|
||||
return $this->getSecondaryCriteriedRecipes($recipes);
|
||||
}
|
||||
|
||||
public function getTagsCollection(): array
|
||||
public function getTagsCollection(): ?array
|
||||
{
|
||||
return Recipe::all()->map(
|
||||
fn ($r) => [
|
||||
$r->type,
|
||||
$r->tags->map(fn ($t) => $t->id . '-' . $t->name)->all(),
|
||||
$r->tags->map(fn ($t) => $t->id.'-'.$t->name)->all(),
|
||||
]
|
||||
)->reduce(function ($acc, $item) {
|
||||
[$type, $tagNames] = $item;
|
||||
@@ -44,6 +44,7 @@ class ListViewService
|
||||
$acc[$type][$name] = 1;
|
||||
}
|
||||
}
|
||||
|
||||
return $acc;
|
||||
});
|
||||
}
|
||||
@@ -51,6 +52,7 @@ class ListViewService
|
||||
private function getPrimaryCriteriedRecipes(): Builder|Recipe|MorphToMany|array
|
||||
{
|
||||
$criteria = $this->getCriteriaStrategy();
|
||||
|
||||
return $criteria->getRecipes();
|
||||
}
|
||||
|
||||
|
||||
@@ -70,13 +70,13 @@ class RegistrationRuleSet
|
||||
'height' => static::transform($obj->height),
|
||||
],
|
||||
'step3' => [
|
||||
'chest_circumference' => $obj->chest_circumference,
|
||||
'waist_circumference' => $obj->waist_circumference,
|
||||
'hip_circumference' => $obj->hip_circumference,
|
||||
'chest_circumference' => static::transform($obj->chest_circumference),
|
||||
'waist_circumference' => static::transform($obj->waist_circumference),
|
||||
'hip_circumference' => static::transform($obj->hip_circumference),
|
||||
],
|
||||
'step4' => [
|
||||
'blood_pressure_up' => $obj->blood_pressure_up,
|
||||
'blood_pressure_down' => $obj->blood_pressure_down,
|
||||
'blood_pressure_up' => static::transform($obj->blood_pressure_up),
|
||||
'blood_pressure_down' => static::transform($obj->blood_pressure_down),
|
||||
'has_hypo' => $obj->has_hypo,
|
||||
'has_hyper' => $obj->has_hyper,
|
||||
],
|
||||
|
||||
@@ -5,8 +5,8 @@ declare(strict_types=1);
|
||||
namespace Database\Seeders;
|
||||
|
||||
use App\Models\Recipe;
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\Tag;
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
class RecipeTagSeeder extends Seeder
|
||||
{
|
||||
@@ -17,12 +17,11 @@ class RecipeTagSeeder extends Seeder
|
||||
{
|
||||
if (Recipe::count() > 0) {
|
||||
$recipes = Recipe::all();
|
||||
$tags = Tag::factory()->count(5)->create();
|
||||
|
||||
$recipes->each(static function ($recipe): void {
|
||||
|
||||
$tags = Tag::factory()->count(5)->create();
|
||||
|
||||
$tagsIds = collect($tags)->map(fn($curTag) => $curTag['id']);
|
||||
$recipes->each(static function ($recipe) use ($tags): void {
|
||||
$randomTags = $tags->random(3);
|
||||
$tagsIds = $randomTags->pluck('id');
|
||||
$recipe->tags()->attach($tagsIds);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -49,6 +49,7 @@ return [
|
||||
'exists' => 'The selected :attribute is invalid.',
|
||||
'file' => 'The :attribute must be a file.',
|
||||
'filled' => 'The :attribute field must have a value.',
|
||||
'min_words_count' => 'The :attribute must have at least :min words.',
|
||||
'gt' => [
|
||||
'array' => 'The :attribute must have more than :value items.',
|
||||
'file' => 'The :attribute must be greater than :value kilobytes.',
|
||||
|
||||
@@ -40,12 +40,12 @@ return [
|
||||
'save_changes' => 'Сохранить изменения',
|
||||
'skip' => 'Пропустить',
|
||||
'go_back' => 'Вернуться',
|
||||
'step3_head' => 'Так держать :)',
|
||||
'step3_head' => 'Так держать :) Шаг №3',
|
||||
'primary_measurements' => 'Первичные замеры',
|
||||
'chest_circumference' => 'Обхват груди',
|
||||
'waist_circumference' => 'Обхват талии',
|
||||
'hip_circumference' => 'Обхват бедр',
|
||||
'step4_head' => 'Давай в том же духе :)',
|
||||
'step4_head' => 'Давай в том же духе :) Шаг №4',
|
||||
'your_blood_pressure' => 'Ваше артериальное давление?',
|
||||
'average_pressure_readings' => 'Показатели артериального давления',
|
||||
'pressure_up' => 'Верхннее',
|
||||
@@ -54,10 +54,10 @@ return [
|
||||
'prone_to_hypertension' => 'Есть ли у вас склонность к гипертонии?',
|
||||
'yes' => 'Да',
|
||||
'no' => 'Нет',
|
||||
'step5_head' => 'Расскажите о себе :)',
|
||||
'step6_head' => 'Расскажите о себе :)',
|
||||
'step7_head' => 'Расскажите о себе :)',
|
||||
'step8_head' => 'Ещё немного :)',
|
||||
'step5_head' => 'Расскажите о себе :) Шаг №5',
|
||||
'step6_head' => 'Расскажите о себе :) Шаг №6',
|
||||
'step7_head' => 'Расскажите о себе :) Шаг №7',
|
||||
'step8_head' => 'Ещё немного :) Шаг №8',
|
||||
'has_alergy' => 'Наличие аллергии',
|
||||
'enter_info' => 'Введите информацию...',
|
||||
'take_pils' => 'Принимаете ли вы лекарства на постоянной основе? Если да, то укажите какие',
|
||||
|
||||
@@ -49,6 +49,7 @@ return [
|
||||
'exists' => 'The selected :attribute is invalid.',
|
||||
'file' => 'The :attribute must be a file.',
|
||||
'filled' => 'The :attribute field must have a value.',
|
||||
'min_words_count' => 'Поле ":attribute" должно состоять минимум из :min слов.',
|
||||
'gt' => [
|
||||
'array' => 'The :attribute must have more than :value items.',
|
||||
'file' => 'The :attribute must be greater than :value kilobytes.',
|
||||
@@ -162,6 +163,31 @@ return [
|
||||
|
||||
'attributes' => [
|
||||
'image' => 'Изображение',
|
||||
'unfavorite_foods' => 'не любимые продукты',
|
||||
'favorite_foods' => 'любимые продукты',
|
||||
'first_name' => 'Имя',
|
||||
'last_name' => 'Фамилия',
|
||||
'email' => 'Мэйл',
|
||||
'password' => 'Пароль',
|
||||
'password_confirmation' => 'Подтверждение пароля',
|
||||
'birthdate' => 'Дата рождения',
|
||||
'gender' => 'Пол',
|
||||
'country' => 'Страна',
|
||||
'city' => 'Город',
|
||||
'lang' => 'Язык',
|
||||
'weight' => 'Вес',
|
||||
'height' => 'Рост',
|
||||
'chest_circumference' => 'Замер груди',
|
||||
'waist_circumference' => 'Замер пояса',
|
||||
'hip_circumference' => 'Замер бёдер',
|
||||
'blood_pressure_up' => 'Верхнее давление',
|
||||
'blood_pressure_down' => 'Нижнее давление',
|
||||
'has_hypo' => 'Наличие гипотонии',
|
||||
'has_hyper' => 'Наличи гипертонии',
|
||||
'about_alergy' => 'Наличие аллерги на продукты',
|
||||
'about_taking_pils' => 'Наличи регулярного приёма лекарств',
|
||||
'about_sport_hobbies' => 'Спортивные предпочтения',
|
||||
'additional_info' => 'Дополнительная информация',
|
||||
],
|
||||
|
||||
];
|
||||
|
||||
@@ -13182,16 +13182,12 @@ video {
|
||||
align-items: flex-end;
|
||||
}.items-center {
|
||||
align-items: center;
|
||||
}.items-stretch {
|
||||
align-items: stretch;
|
||||
}.justify-end {
|
||||
justify-content: flex-end;
|
||||
}.justify-center {
|
||||
justify-content: center;
|
||||
}.justify-between {
|
||||
justify-content: space-between;
|
||||
}.justify-around {
|
||||
justify-content: space-around;
|
||||
}.justify-items-center {
|
||||
justify-items: center;
|
||||
}.gap-1 {
|
||||
@@ -13207,9 +13203,6 @@ video {
|
||||
column-gap: 1.5rem;
|
||||
}.gap-y-8 {
|
||||
row-gap: 2rem;
|
||||
}.gap-x-12 {
|
||||
-moz-column-gap: 3rem;
|
||||
column-gap: 3rem;
|
||||
}.space-x-2 > :not([hidden]) ~ :not([hidden]) {
|
||||
--tw-space-x-reverse: 0;
|
||||
margin-right: calc(0.5rem * var(--tw-space-x-reverse));
|
||||
@@ -13254,14 +13247,14 @@ video {
|
||||
word-break: break-all;
|
||||
}.rounded {
|
||||
border-radius: 0.25rem;
|
||||
}.rounded-3xl {
|
||||
border-radius: 1.5rem;
|
||||
}.rounded-full {
|
||||
border-radius: 9999px;
|
||||
}.rounded-lg {
|
||||
border-radius: 0.5rem;
|
||||
}.rounded-md {
|
||||
border-radius: 0.375rem;
|
||||
}.rounded-3xl {
|
||||
border-radius: 1.5rem;
|
||||
}.rounded-b-none {
|
||||
border-bottom-right-radius: 0px;
|
||||
border-bottom-left-radius: 0px;
|
||||
@@ -13316,12 +13309,12 @@ video {
|
||||
border-color: rgb(185 28 28 / var(--tw-border-opacity));
|
||||
}.border-transparent {
|
||||
border-color: transparent;
|
||||
}.bg-\[\#019a3e\] {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(1 154 62 / var(--tw-bg-opacity));
|
||||
}.bg-blue-500 {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(59 130 246 / var(--tw-bg-opacity));
|
||||
}.bg-blue-600 {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(37 99 235 / var(--tw-bg-opacity));
|
||||
}.bg-gray-100 {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(243 244 246 / var(--tw-bg-opacity));
|
||||
@@ -13370,12 +13363,12 @@ video {
|
||||
}.bg-red-700 {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(185 28 28 / var(--tw-bg-opacity));
|
||||
}.bg-white {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
|
||||
}.bg-slate-400 {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(148 163 184 / var(--tw-bg-opacity));
|
||||
}.bg-white {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
|
||||
}.bg-opacity-25 {
|
||||
--tw-bg-opacity: 0.25;
|
||||
}.bg-cover {
|
||||
@@ -13531,10 +13524,10 @@ video {
|
||||
vertical-align: bottom;
|
||||
}.font-mono {
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
||||
}.font-sans {
|
||||
font-family: Figtree, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
|
||||
}.font-mulish {
|
||||
font-family: Mulish, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
|
||||
}.font-sans {
|
||||
font-family: Figtree, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
|
||||
}.text-2xl {
|
||||
font-size: 1.5rem;
|
||||
line-height: 2rem;
|
||||
@@ -13707,11 +13700,11 @@ video {
|
||||
}.ring-gray-300 {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(209 213 219 / var(--tw-ring-opacity));
|
||||
}.ring-gray-900\/5 {
|
||||
--tw-ring-color: rgb(17 24 39 / 0.05);
|
||||
}.ring-red-500 {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(239 68 68 / var(--tw-ring-opacity));
|
||||
}.ring-gray-900\/5 {
|
||||
--tw-ring-color: rgb(17 24 39 / 0.05);
|
||||
}.ring-opacity-5 {
|
||||
--tw-ring-opacity: 0.05;
|
||||
}.blur {
|
||||
@@ -13788,9 +13781,6 @@ video {
|
||||
}.hover\:border-gray-300:hover {
|
||||
--tw-border-opacity: 1;
|
||||
border-color: rgb(209 213 219 / var(--tw-border-opacity));
|
||||
}.hover\:bg-blue-500:hover {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(59 130 246 / var(--tw-bg-opacity));
|
||||
}.hover\:bg-blue-600:hover {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(37 99 235 / var(--tw-bg-opacity));
|
||||
@@ -13924,6 +13914,9 @@ video {
|
||||
}.focus\:ring-blue-200:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(191 219 254 / var(--tw-ring-opacity));
|
||||
}.focus\:ring-blue-500:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
|
||||
}.focus\:ring-blue-600:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(37 99 235 / var(--tw-ring-opacity));
|
||||
@@ -13936,18 +13929,12 @@ video {
|
||||
}.focus\:ring-indigo-500:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(99 102 241 / var(--tw-ring-opacity));
|
||||
}.focus\:ring-indigo-600:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(79 70 229 / var(--tw-ring-opacity));
|
||||
}.focus\:ring-red-200:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(254 202 202 / var(--tw-ring-opacity));
|
||||
}.focus\:ring-red-500:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(239 68 68 / var(--tw-ring-opacity));
|
||||
}.focus\:ring-blue-500:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
|
||||
}.focus\:ring-opacity-50:focus {
|
||||
--tw-ring-opacity: 0.5;
|
||||
}.focus\:ring-offset-2:focus {
|
||||
@@ -13997,6 +13984,8 @@ video {
|
||||
grid-column: span 3 / span 3;
|
||||
}.sm\:col-span-4 {
|
||||
grid-column: span 4 / span 4;
|
||||
}.sm\:col-span-6 {
|
||||
grid-column: span 6 / span 6;
|
||||
}.sm\:-my-px {
|
||||
margin-top: -1px;
|
||||
margin-bottom: -1px;
|
||||
|
||||
@@ -1720,10 +1720,6 @@ select {
|
||||
.gap-6 {
|
||||
gap: 1.5rem;
|
||||
}
|
||||
.gap-x-12 {
|
||||
-moz-column-gap: 3rem;
|
||||
column-gap: 3rem;
|
||||
}
|
||||
.gap-x-6 {
|
||||
-moz-column-gap: 1.5rem;
|
||||
column-gap: 1.5rem;
|
||||
@@ -1879,14 +1875,14 @@ select {
|
||||
.border-transparent {
|
||||
border-color: transparent;
|
||||
}
|
||||
.bg-\[\#019a3e\] {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(1 154 62 / var(--tw-bg-opacity));
|
||||
}
|
||||
.bg-blue-500 {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(59 130 246 / var(--tw-bg-opacity));
|
||||
}
|
||||
.bg-blue-600 {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(37 99 235 / var(--tw-bg-opacity));
|
||||
}
|
||||
.bg-gray-100 {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(243 244 246 / var(--tw-bg-opacity));
|
||||
@@ -2558,11 +2554,6 @@ select {
|
||||
border-color: rgb(209 213 219 / var(--tw-border-opacity));
|
||||
}
|
||||
|
||||
.hover\:bg-blue-500:hover {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(59 130 246 / var(--tw-bg-opacity));
|
||||
}
|
||||
|
||||
.hover\:bg-blue-600:hover {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(37 99 235 / var(--tw-bg-opacity));
|
||||
@@ -2784,6 +2775,11 @@ select {
|
||||
--tw-ring-color: rgb(191 219 254 / var(--tw-ring-opacity));
|
||||
}
|
||||
|
||||
.focus\:ring-blue-500:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
|
||||
}
|
||||
|
||||
.focus\:ring-blue-600:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(37 99 235 / var(--tw-ring-opacity));
|
||||
@@ -2804,11 +2800,6 @@ select {
|
||||
--tw-ring-color: rgb(99 102 241 / var(--tw-ring-opacity));
|
||||
}
|
||||
|
||||
.focus\:ring-indigo-600:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(79 70 229 / var(--tw-ring-opacity));
|
||||
}
|
||||
|
||||
.focus\:ring-red-200:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(254 202 202 / var(--tw-ring-opacity));
|
||||
@@ -2819,11 +2810,6 @@ select {
|
||||
--tw-ring-color: rgb(239 68 68 / var(--tw-ring-opacity));
|
||||
}
|
||||
|
||||
.focus\:ring-blue-500:focus {
|
||||
--tw-ring-opacity: 1;
|
||||
--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
|
||||
}
|
||||
|
||||
.focus\:ring-opacity-50:focus {
|
||||
--tw-ring-opacity: 0.5;
|
||||
}
|
||||
@@ -2915,6 +2901,10 @@ select {
|
||||
grid-column: span 4 / span 4;
|
||||
}
|
||||
|
||||
.sm\:col-span-6 {
|
||||
grid-column: span 6 / span 6;
|
||||
}
|
||||
|
||||
.sm\:-my-px {
|
||||
margin-top: -1px;
|
||||
margin-bottom: -1px;
|
||||
|
||||
@@ -100,22 +100,25 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="">
|
||||
<button class="registration-btn-primary" type="button" next-step
|
||||
wire:click="nextStep">{{ __('reg_form.continue') }}</button>
|
||||
<div class="flex gap-x-12 justify-between mt-3">
|
||||
<a href="javascript:void(0)" wire:click="goBack"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md bg-slate-400">
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6">
|
||||
<button wire:click="goBack"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-2 bg-slate-400">
|
||||
<span class="--f_grey">← {{ __('reg_form.go_back') }}</span>
|
||||
</a>
|
||||
<a href="javascript:void(0)" wire:click="finishRegistration"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md bg-slate-400">
|
||||
</button>
|
||||
|
||||
<button wire:click="finishRegistration"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-2 bg-[#019a3e]">
|
||||
<span class="--f_grey">{{ __('reg_form.enter_data_later') }}</span>
|
||||
</a>
|
||||
<a href="javascript:void(0)" wire:click="skipStep"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md bg-slate-400">
|
||||
</button>
|
||||
|
||||
<button wire:click="skipStep"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-2 bg-slate-400">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }} →</span>
|
||||
</a>
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,56 +1,69 @@
|
||||
@section('title', __('reg_form.title_' . $step))
|
||||
<div>
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title --medium_title">{{ __('reg_form.step3_head') }}</h5>
|
||||
<div class="flex flex-col justify-center py-12 px-6 min-h-full lg:px-8">
|
||||
<div class="sm:mx-auto sm:w-full sm:max-w-sm modal-header">
|
||||
<h5
|
||||
class="mt-10 text-2xl font-bold tracking-tight leading-9 text-center text-gray-900 modal-title --medium_title">
|
||||
{{ __('reg_form.step3_head') }}</h5>
|
||||
</div>
|
||||
<div step-item class="modal-body">
|
||||
<div step-item
|
||||
class="p-6 mt-8 rounded-3xl ring-1 shadow-lg sm:mx-auto sm:w-full sm:max-w-sm md:max-w-md lg:max-w-lg xl:max-w-xl 2xl:max-w-2xl modal-body ring-gray-900/5">
|
||||
<div class="my-3 text-center">{{ __('reg_form.primary_measurements') }}</div>
|
||||
<div class="row">
|
||||
<div class="col-4 @error('chest_circumference') verror @enderror">
|
||||
<div class="text-center --f_bold">{{ __('reg_form.chest_circumference') }}</div>
|
||||
<input type="number" name="chest_circumference" wire:model="chest_circumference" @class( ["form-control", "my-3"=> !$errors->has('chest_circumference'),
|
||||
"mt-3" => $errors->has('chest_circumference'),
|
||||
"text-center"])
|
||||
value="" />
|
||||
@if($errors->has('chest_circumference'))
|
||||
<div @class(["verror-message", "mb-3"=> $errors->has('chest_circumference')])>{{ $errors->first('chest_circumference') }}</div>
|
||||
@endif
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6 row">
|
||||
<div class="sm:col-span-2 col-6 col-4 @error('chest_circumference') verror @enderror">
|
||||
<lable for="chest_circumference"
|
||||
class="block mt-3 text-sm font-medium leading-6 text-gray-900 ms-3 fw-bold">
|
||||
{{ __('reg_form.chest_circumference') }}</lable>
|
||||
<div class="mt-2">
|
||||
<input type="number" name="chest_circumference" wire:model="chest_circumference"
|
||||
class="block py-1.5 w-full text-gray-900 @error('chest_circumference') ring-red-500 @enderror rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-500 placeholder:text-gray-400 form-control"
|
||||
value="" />
|
||||
@if ($errors->has('chest_circumference'))
|
||||
<div @class([
|
||||
'verror-message',
|
||||
'mb-3' => $errors->has('chest_circumference'),
|
||||
])>{{ $errors->first('chest_circumference') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-4 @error('waist_circumference') verror @enderror">
|
||||
<div class="text-center --f_bold">{{ __('reg_form.waist_circumference') }}</div>
|
||||
<input type="number" name="waist_circumference" wire:model="waist_circumference" @class( ["form-control", "my-3"=> !$errors->has('waist_circumference'),
|
||||
"mt-3" => $errors->has('waist_circumference'),
|
||||
"text-center"]
|
||||
)
|
||||
value="" />
|
||||
@if($errors->has('waist_circumference'))
|
||||
<div class="verror-message">{{ $errors->first('waist_circumference') }}</div>
|
||||
@endif
|
||||
<div class="sm:col-span-2 col-6 col-4 @error('waist_circumference') verror @enderror">
|
||||
<label for="waist_circumference"
|
||||
class="block mt-3 text-sm font-medium leading-6 text-center text-gray-900 ms-3 fw-bold --f_bold">{{ __('reg_form.waist_circumference') }}</label>
|
||||
<div class="mt-2">
|
||||
<input type="number" name="waist_circumference" wire:model="waist_circumference"
|
||||
class="block py-1.5 w-full text-gray-900 @error('waist_circumference') ring-red-500 @enderror rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-500 placeholder:text-gray-400 form-control"
|
||||
value="" />
|
||||
@if ($errors->has('waist_circumference'))
|
||||
<div class="verror-message">{{ $errors->first('waist_circumference') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-4 @error('hip_circumference') verror @enderror">
|
||||
<div class="text-center --f_bold">{{ __('reg_form.hip_circumference') }}</div>
|
||||
<input type="number" name="hip_circumference" wire:model="hip_circumference" @class( ["form-control", "my-3"=> !$errors->has('hip_circumference'),
|
||||
"mt-3" => $errors->has('hip_circumference'),
|
||||
"text-center"]
|
||||
)
|
||||
value="" />
|
||||
@if($errors->has('hip_circumference'))
|
||||
<div class="verror-message">{{ $errors->first('hip_circumference') }}</div>
|
||||
@endif
|
||||
<div class="sm:col-span-2 col-6 col-4 @error('hip_circumference') verror @enderror">
|
||||
<label for="hip_circumference"
|
||||
class="block mt-3 text-sm font-medium leading-6 text-center text-gray-900 ms-3 fw-bold">{{ __('reg_form.hip_circumference') }}</label>
|
||||
<div class="mt-2">
|
||||
<input type="number" name="hip_circumference" wire:model="hip_circumference"
|
||||
class="block py-1.5 w-full text-gray-900 @error('waist_circumference') ring-red-500 @enderror rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-500 placeholder:text-gray-400 form-control"
|
||||
value="" />
|
||||
@if ($errors->has('hip_circumference'))
|
||||
<div class="verror-message">{{ $errors->first('hip_circumference') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button class="mb-2 btn btn-lg btn-primary btn-block w-100 --f_bolder" type="button" next-step wire:click="nextStep">{{ __('reg_form.continue') }}</button>
|
||||
<div class="row">
|
||||
<div class="text-center --f_bold col-6">
|
||||
<a href="javascript:void(0)" skip-step wire:click="goBack">
|
||||
<span class="--f_grey">{{ __('reg_form.go_back') }}</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="text-center --f_bold col-6">
|
||||
<div>
|
||||
<button class="registration-btn-primary" type="button" next-step
|
||||
wire:click="nextStep">{{ __('reg_form.continue') }}</button>
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6">
|
||||
<button wire:click="goBack"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">← {{ __('reg_form.go_back') }}</span>
|
||||
</button>
|
||||
|
||||
<button wire:click="skipStep"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }} →</span>
|
||||
</button>
|
||||
|
||||
<a href="javascript:void(0)" skip-step wire:click="skipStep">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,66 +1,82 @@
|
||||
@section('title', __('reg_form.title_' . $step))
|
||||
<div>
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title --medium_title">{{ __('reg_form.step4_head') }}</h5>
|
||||
<div class="flex flex-col justify-center py-12 px-6 min-h-full lg:px-8">
|
||||
<div class="sm:mx-auto sm:w-full sm:max-w-sm modal-header">
|
||||
<h5
|
||||
class="mt-10 text-2xl font-bold tracking-tight leading-9 text-center text-gray-900 modal-title --medium_title">
|
||||
{{ __('reg_form.step4_head') }}</h5>
|
||||
</div>
|
||||
|
||||
<div step-item class="modal-body">
|
||||
<div step-item
|
||||
class="p-6 mt-8 rounded-3xl ring-1 shadow-lg sm:mx-auto sm:w-full sm:max-w-sm md:max-w-md lg:max-w-lg xl:max-w-xl 2xl:max-w-2xl modal-body ring-gray-900/5">
|
||||
<div class="my-3 text-center">{{ __('reg_form.your_blood_pressure') }}</div>
|
||||
|
||||
<div class="text-center --f_bold">{{ __('reg_form.average_pressure_readings') }}</div>
|
||||
<div class="row">
|
||||
<div class="col-6 @error('blood_pressure_up') verror @enderror">
|
||||
<div class="text-center --f_bold">{{ __('reg_form.pressure_up') }}</div>
|
||||
<input type="number" wire:model="blood_pressure_up" name="blood_pressure_up" class="form-control my-3 text-center" value="" />
|
||||
@if($errors->has('blood_pressure_up'))
|
||||
<div class="verror-message">{{ $errors->first('blood_pressure_up') }}</div>
|
||||
@endif
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6 row">
|
||||
<div class="sm:col-span-3 col-6 col-6 @error('blood_pressure_up') verror @enderror">
|
||||
<label for="blood_pressure_up"
|
||||
class="block text-sm font-medium leading-6 text-gray-900 --f_bold ms-3 fw-bold">{{ __('reg_form.pressure_up') }}</label>
|
||||
<div class="my-3">
|
||||
<input type="number" wire:model="blood_pressure_up" name="blood_pressure_up"
|
||||
class="block py-1.5 w-full text-gray-900 @error('blood_pressure_up') ring-red-500 @enderror rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-500 placeholder:text-gray-400 form-control my-3 text-center form-control"
|
||||
value="" />
|
||||
@if ($errors->has('blood_pressure_up'))
|
||||
<div class="verror-message">{{ $errors->first('blood_pressure_up') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 @error('blood_pressure_down') verror @enderror">
|
||||
<div class="text-center --f_bold">{{ __('reg_form.pressure_down') }}</div>
|
||||
<input type="number" wire:model="blood_pressure_down" name="blood_pressure_down" class="form-control my-3 text-center" value="" />
|
||||
@if($errors->has('blood_pressure_down'))
|
||||
<div class="verror-message">{{ $errors->first('blood_pressure_down') }}</div>
|
||||
@endif
|
||||
<div class="sm:col-span-3 col-6 @error('blood_pressure_down') verror @enderror">
|
||||
<label for="blood_pressure_down"
|
||||
class="block text-sm font-medium leading-6 text-gray-900 --f_bold ms-3 fw-bold">{{ __('reg_form.pressure_down') }}</label>
|
||||
<div class="my-3">
|
||||
<input type="number" wire:model="blood_pressure_down" name="blood_pressure_down"
|
||||
class="block py-1.5 w-full text-gray-900 @error('blood_pressure_down') ring-red-500 @enderror rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-500 placeholder:text-gray-400 form-control my-3 text-center form-control my-3 text-center form-control"
|
||||
value="" />
|
||||
@if ($errors->has('blood_pressure_down'))
|
||||
<div class="verror-message">{{ $errors->first('blood_pressure_down') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="text-center --f_bold">{{ __('reg_form.tendency_to_be_hypo') }}</div>
|
||||
<div class="--with_arr my-3 @error('has_hypo') verror @enderror">
|
||||
<select class="form-select text-center" wire:model="has_hypo" name="has_hypo">
|
||||
<select
|
||||
class="block py-1.5 w-full text-gray-900 rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-600 form-control placeholder:text-gray-400 form-select"
|
||||
wire:model="has_hypo" name="has_hypo">
|
||||
<option selected value="0">{{ __('reg_form.no') }}</option>
|
||||
<option value="1">{{ __('reg_form.yes') }}</option>
|
||||
</select>
|
||||
<span></span>
|
||||
@if($errors->has('has_hypo'))
|
||||
<div class="verror-message">{{ $errors->first('has_hypo') }}</div>
|
||||
@if ($errors->has('has_hypo'))
|
||||
<div class="verror-message">{{ $errors->first('has_hypo') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="text-center --f_bold">{{ __('reg_form.prone_to_hypertension') }}</div>
|
||||
<div class="--with_arr my-3 @error('has_hyper') verror @enderror">
|
||||
<select class="form-select text-center" wire:model="has_hyper" name="has_hyper">
|
||||
<select
|
||||
class="block py-1.5 w-full text-gray-900 rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-600 form-control placeholder:text-gray-400 form-select"
|
||||
wire:model="has_hyper" name="has_hyper">
|
||||
<option selected value="0">{{ __('reg_form.no') }}</option>
|
||||
<option value="1">{{ __('reg_form.yes') }}</option>
|
||||
</select>
|
||||
<span></span>
|
||||
@if($errors->has('has_hyper'))
|
||||
<div class="verror-message">{{ $errors->first('has_hyper') }}</div>
|
||||
@if ($errors->has('has_hyper'))
|
||||
<div class="verror-message">{{ $errors->first('has_hyper') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<button class="mb-2 btn btn-lg btn-primary btn-block w-100 --f_bolder" type="button" next-step wire:click="nextStep">{{ __('reg_form.continue') }}</button>
|
||||
<div class="row">
|
||||
<div class="text-center --f_bold col-6">
|
||||
<a href="javascript:void(0)" skip-step wire:click="goBack">
|
||||
<span class="--f_grey">{{ __('reg_form.go_back') }}</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="text-center --f_bold col-6">
|
||||
<div>
|
||||
<button class="registration-btn-primary" type="button" next-step
|
||||
wire:click="nextStep">{{ __('reg_form.continue') }}</button>
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6">
|
||||
<button wire:click="goBack"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">← {{ __('reg_form.go_back') }}</span>
|
||||
</button>
|
||||
|
||||
<a href="javascript:void(0)" skip-step wire:click="skipStep">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }}</span>
|
||||
</a>
|
||||
<button wire:click="skipStep"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }} →</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,30 +1,40 @@
|
||||
@section('title', __('reg_form.title_' . $step))
|
||||
<div>
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title --medium_title">{{ __('reg_form.step5_head') }}</h5>
|
||||
<div class="flex flex-col justify-center py-12 px-6 min-h-full lg:px-8">
|
||||
<div class="sm:mx-auto sm:w-full sm:max-w-sm modal-header">
|
||||
<h5
|
||||
class="mt-10 text-2xl font-bold tracking-tight leading-9 text-center text-gray-900 modal-title --medium_title">
|
||||
{{ __('reg_form.step5_head') }}</h5>
|
||||
</div>
|
||||
|
||||
<div step-item class="modal-body">
|
||||
<div class="my-3 text-center">{{ __('reg_form.has_alergy') }}</div>
|
||||
<div step-item
|
||||
class="p-6 mt-8 rounded-3xl ring-1 shadow-lg sm:mx-auto sm:w-full sm:max-w-sm md:max-w-md lg:max-w-lg xl:max-w-xl 2xl:max-w-2xl modal-body ring-gray-900/5">
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6 row">
|
||||
<div class="sm:col-span-6">
|
||||
<label for="about_alergy" class="block text-sm font-medium leading-6 text-gray-900 --f_bold ms-3 fw-bold">
|
||||
{{ __('reg_form.has_alergy') }}</label>
|
||||
|
||||
<div class="@error('about_alergy') verror @enderror">
|
||||
<textarea wire:model="about_alergy" name="about_alergy" class="form-control my-3" placeholder="{{ __('reg_form.enter_info') }}" style="min-height:140px"></textarea>
|
||||
@if($errors->has('about_alergy'))
|
||||
<div class="verror-message">{{ $errors->first('about_alergy') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
<button wire:click="nextStep" class="mb-2 btn btn-lg btn-primary btn-block w-100 --f_bolder" type="button" next-step>{{ __('reg_form.continue') }}</button>
|
||||
<div class="row">
|
||||
<div class="text-center --f_bold col-6">
|
||||
<a href="javascript:void(0)" skip-step wire:click="goBack">
|
||||
<span class="--f_grey">{{ __('reg_form.go_back') }}</span>
|
||||
</a>
|
||||
<div class="@error('about_alergy') verror @enderror">
|
||||
<textarea wire:model="about_alergy" name="about_alergy"
|
||||
class="block py-1.5 my-3 w-full text-gray-900 rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-600 form-control placeholder:text-gray-400"
|
||||
placeholder="{{ __('reg_form.enter_info') }}" style="min-height:140px"></textarea>
|
||||
@if ($errors->has('about_alergy'))
|
||||
<div class="verror-message">{{ $errors->first('about_alergy') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-center --f_bold col-6">
|
||||
|
||||
<a href="javascript:void(0)" skip-step wire:click="skipStep">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }}</span>
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<button class="registration-btn-primary" type="button"
|
||||
wire:click="nextStep">{{ __('reg_form.continue') }}</button>
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6">
|
||||
<button wire:click="goBack"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">← {{ __('reg_form.go_back') }}</span>
|
||||
</button>
|
||||
<button wire:click="skipStep"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }} →</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,41 +1,40 @@
|
||||
@section('title', __('reg_form.title_' . $step))
|
||||
<div>
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title --medium_title">{{ __('reg_form.step6_head') }}</h5>
|
||||
<div class="flex flex-col justify-center py-12 px-6 min-h-full lg:px-8">
|
||||
<div class="sm:mx-auto sm:w-full sm:max-w-sm modal-header">
|
||||
<h5
|
||||
class="mt-10 text-2xl font-bold tracking-tight leading-9 text-center text-gray-900 modal-title --medium_title">
|
||||
{{ __('reg_form.step6_head') }}
|
||||
</h5>
|
||||
</div>
|
||||
{{--
|
||||
@if ($errors->any())
|
||||
<div class="alert alert-danger">
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
--}}
|
||||
<div step-item
|
||||
class="p-6 mt-8 rounded-3xl ring-1 shadow-lg sm:mx-auto sm:w-full sm:max-w-sm md:max-w-md lg:max-w-lg xl:max-w-xl 2xl:max-w-2xl modal-body ring-gray-900/5">
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6 row">
|
||||
<div class="sm:col-span-6">
|
||||
<label for="about_taking_pils"
|
||||
class="block my-3 text-sm font-medium leading-6 text-gray-900 --f_bold ms-3 fw-bold">{{ __('reg_form.take_pils') }}</label>
|
||||
|
||||
<div step-item class="modal-body">
|
||||
<div class="my-3 text-center">{{ __('reg_form.take_pils') }}</div>
|
||||
|
||||
<div class="@error('about_taking_pils') verror @enderror">
|
||||
<textarea wire:model="about_taking_pils" name="about_taking_pils" class="form-control my-3" placeholder="{{ __('reg_form.enter_info') }}" style="min-height:140px"></textarea>
|
||||
@if($errors->has('about_taking_pils'))
|
||||
<div class="verror-message">{{ $errors->first('about_taking_pils') }}</div>
|
||||
@endif
|
||||
<button class="mb-2 btn btn-lg btn-primary btn-block w-100 --f_bolder" type="button" next-step wire:click="nextStep">{{ __('reg_form.continue') }}</button>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="text-center --f_bold col-6">
|
||||
<a href="javascript:void(0)" skip-step wire:click="goBack">
|
||||
<span class="--f_grey">{{ __('reg_form.go_back') }}</span>
|
||||
</a>
|
||||
<div class="@error('about_taking_pils') verror @enderror">
|
||||
<textarea wire:model="about_taking_pils" name="about_taking_pils"
|
||||
class="block py-1.5 my-3 w-full text-gray-900 rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-600 form-control placeholder:text-gray-400"
|
||||
placeholder="{{ __('reg_form.enter_info') }}" style="min-height:140px"></textarea>
|
||||
@if ($errors->has('about_taking_pils'))
|
||||
<div class="verror-message">{{ $errors->first('about_taking_pils') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-center --f_bold col-6">
|
||||
|
||||
<a href="javascript:void(0)" skip-step wire:click="skipStep">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }}</span>
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<button class="registration-btn-primary" type="button"
|
||||
wire:click="nextStep">{{ __('reg_form.continue') }}</button>
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6">
|
||||
<button wire:click="goBack"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">← {{ __('reg_form.go_back') }}</span>
|
||||
</button>
|
||||
<button wire:click="skipStep"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }} →</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,29 +1,40 @@
|
||||
@section('title', __('reg_form.title_' . $step))
|
||||
<div>
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title --medium_title">{{ __('reg_form.step7_head') }}</h5>
|
||||
<div class="flex flex-col justify-center py-12 px-6 min-h-full lg:px-8">
|
||||
<div class="sm:mx-auto sm:w-full sm:max-w-sm modal-header">
|
||||
<h5
|
||||
class="mt-10 text-2xl font-bold tracking-tight leading-9 text-center text-gray-900 modal-title --medium_title">
|
||||
{{ __('reg_form.step7_head') }}
|
||||
</h5>
|
||||
</div>
|
||||
<div step-item class="modal-body">
|
||||
<div class="my-3 text-center">{{ __('reg_form.sport_hobbies') }}</div>
|
||||
<div step-item
|
||||
class="p-6 mt-8 rounded-3xl ring-1 shadow-lg sm:mx-auto sm:w-full sm:max-w-sm md:max-w-md lg:max-w-lg xl:max-w-xl 2xl:max-w-2xl modal-body ring-gray-900/5">
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6 row">
|
||||
<div class="sm:col-span-6">
|
||||
<label
|
||||
class="block my-3 text-sm font-medium leading-6 text-center text-gray-900 --f_bold ms-3 fw-bold">{{ __('reg_form.sport_hobbies') }}</label>
|
||||
|
||||
<div class="@error('about_sport_hobbies') verror @enderror">
|
||||
<textarea wire:model="about_sport_hobbies" name="about_sport_hobbies" class="form-control my-3" placeholder="{{ __('reg_form.enter_info') }}" style="min-height:140px"></textarea>
|
||||
@if($errors->has('about_sport_hobbies'))
|
||||
<div class="verror-message">{{ $errors->first('about_sport_hobbies') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
<button wire:click="nextStep" class="mb-2 btn btn-lg btn-primary btn-block w-100 --f_bolder" type="button" next-step>{{ __('reg_form.continue') }}</button>
|
||||
<div class="row">
|
||||
<div class="text-center --f_bold col-6">
|
||||
<a href="javascript:void(0)" skip-step wire:click="goBack">
|
||||
<span class="--f_grey">{{ __('reg_form.go_back') }}</span>
|
||||
</a>
|
||||
<div class="@error('about_sport_hobbies') verror @enderror">
|
||||
<textarea wire:model="about_sport_hobbies" name="about_sport_hobbies"
|
||||
class="block py-1.5 my-3 w-full text-gray-900 rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-600 form-control placeholder:text-gray-400"
|
||||
placeholder="{{ __('reg_form.enter_info') }}" style="min-height:140px"></textarea>
|
||||
@if ($errors->has('about_sport_hobbies'))
|
||||
<div class="verror-message">{{ $errors->first('about_sport_hobbies') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-center --f_bold col-6">
|
||||
|
||||
<a href="javascript:void(0)" skip-step wire:click="skipStep">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }}</span>
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<button class="registration-btn-primary" type="button"
|
||||
wire:click="nextStep">{{ __('reg_form.continue') }}</button>
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6">
|
||||
<button wire:click="goBack"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">← {{ __('reg_form.go_back') }}</span>
|
||||
</button>
|
||||
<button wire:click="skipStep"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }} →</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,38 +1,55 @@
|
||||
@section('title', __('reg_form.title_' . $step))
|
||||
<div>
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title --medium_title">{{ __('reg_form.step8_head') }}</h5>
|
||||
<div class="flex flex-col justify-center py-12 px-6 min-h-full lg:px-8">
|
||||
<div class="sm:mx-auto sm:w-full sm:max-w-sm modal-header">
|
||||
<h5
|
||||
class="mt-10 text-2xl font-bold tracking-tight leading-9 text-center text-gray-900 modal-title --medium_title">
|
||||
{{ __('reg_form.step8_head') }}
|
||||
</h5>
|
||||
</div>
|
||||
|
||||
<div step-item class="modal-body">
|
||||
<div class="my-3 text-center">{{ __('reg_form.favorite_foods_q') }}</div>
|
||||
<div step-item
|
||||
class="p-6 mt-8 rounded-3xl ring-1 shadow-lg sm:mx-auto sm:w-full sm:max-w-sm md:max-w-md lg:max-w-lg xl:max-w-xl 2xl:max-w-2xl modal-body ring-gray-900/5">
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6 row">
|
||||
<div class="sm:col-span-6">
|
||||
<label class="block my-3 text-sm font-medium leading-6 text-gray-900 ms-3">
|
||||
{{ __('reg_form.favorite_foods_q') }}
|
||||
</label>
|
||||
|
||||
<div class="@error('favorite_foods') verror @enderror">
|
||||
<textarea wire:model="favorite_foods" name="favorite_foods" class="form-control" placeholder="{{ __('reg_form.favorite_foods') }}" style="min-height:140px"></textarea>
|
||||
@if($errors->has('favorite_foods'))
|
||||
<div class="verror-message">{{ $errors->first('favorite_foods') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="@error('favorite_foods') verror @enderror">
|
||||
<textarea wire:model="favorite_foods" name="favorite_foods"
|
||||
class="block py-1.5 my-3 w-full @error('favorite_foods') ring-red-500 @enderror text-gray-900 rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-600 form-control placeholder:text-gray-400"
|
||||
placeholder="{{ __('reg_form.favorite_foods') }}" style="min-height:140px"></textarea>
|
||||
@if ($errors->has('favorite_foods'))
|
||||
<div
|
||||
class="flex items-center mt-1 ml-1 text-xs font-medium tracking-wide text-red-500 verror-message">
|
||||
{{ $errors->first('favorite_foods') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="@error('unfavorite_foods') verror @enderror">
|
||||
<textarea wire:model="unfavorite_foods" name="unfavorite_foods" class="form-control my-3" placeholder="{{ __('reg_form.unfavorite_foods') }}" style="min-height:140px"></textarea>
|
||||
@if($errors->has('unfavorite_foods'))
|
||||
<div class="verror-message">{{ $errors->first('unfavorite_foods') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<button wire:click="nextStep" class="mb-2 btn btn-lg btn-primary btn-block w-100 --f_bolder" type="button" next-step>{{ __('reg_form.continue') }}</button>
|
||||
<div class="row">
|
||||
<div class="text-center --f_bold col-6">
|
||||
<a href="javascript:void(0)" skip-step wire:click="goBack">
|
||||
<span class="--f_grey">{{ __('reg_form.go_back') }}</span>
|
||||
</a>
|
||||
<div class="@error('unfavorite_foods') verror @enderror">
|
||||
<textarea wire:model="unfavorite_foods" name="unfavorite_foods"
|
||||
class="block py-1.5 my-3 w-full @error('unfavorite_foods') ring-red-500 @enderror text-gray-900 rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-600 form-control placeholder:text-gray-400"
|
||||
placeholder="{{ __('reg_form.unfavorite_foods') }}" style="min-height:140px"></textarea>
|
||||
@if ($errors->has('unfavorite_foods'))
|
||||
<div
|
||||
class="flex items-center mt-1 ml-1 text-xs font-medium tracking-wide text-red-500 verror-message">
|
||||
{{ $errors->first('unfavorite_foods') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-center --f_bold col-6">
|
||||
|
||||
<a href="javascript:void(0)" skip-step wire:click="skipStep">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }}</span>
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<button class="registration-btn-primary" type="button"
|
||||
wire:click="nextStep">{{ __('reg_form.continue') }}</button>
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6">
|
||||
<button wire:click="goBack"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">← {{ __('reg_form.go_back') }}</span>
|
||||
</button>
|
||||
<button wire:click="skipStep"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">{{ __('reg_form.skip') }} →</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,36 +1,50 @@
|
||||
@section('title', __('reg_form.title_' . $step))
|
||||
<div>
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title --medium_title">{{ __('reg_form.step9_head') }}</h5>
|
||||
<div class="flex flex-col justify-center py-12 px-6 min-h-full lg:px-8">
|
||||
<div class="sm:mx-auto sm:w-full sm:max-w-sm modal-header">
|
||||
<h5
|
||||
class="mt-10 text-2xl font-bold tracking-tight leading-9 text-center text-gray-900 modal-title --medium_title">
|
||||
{{ __('reg_form.step9_head') }}
|
||||
</h5>
|
||||
</div>
|
||||
@if ($errors->any())
|
||||
<div class="alert alert-danger">
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div step-item class="modal-body">
|
||||
<div class="my-3 text-center">{{ __('reg_form.optional_info') }}</div>
|
||||
<div step-item
|
||||
class="p-6 mt-8 rounded-3xl ring-1 shadow-lg sm:mx-auto sm:w-full sm:max-w-sm md:max-w-md lg:max-w-lg xl:max-w-xl 2xl:max-w-2xl modal-body ring-gray-900/5">
|
||||
{{-- @if ($errors->any())
|
||||
<div class="text-red-500 alert alert-danger">
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif --}}
|
||||
|
||||
<div class="@error('additional_info') verror @enderror">
|
||||
<textarea wire:model="additional_info" name="additional_info" class="my-3 form-control"
|
||||
placeholder="{{ __('reg_form.any_additional_info') }}" style="min-height:140px"></textarea>
|
||||
@if ($errors->has('additional_info'))
|
||||
<div class="verror-message">{{ $errors->first('additional_info') }}</div>
|
||||
@endif
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6 row">
|
||||
<div class="sm:col-span-6">
|
||||
<label
|
||||
class="block my-3 text-sm font-medium leading-6 text-center text-gray-900 ms-3">{{ __('reg_form.optional_info') }}</label>
|
||||
<div class="@error('additional_info') verror @enderror">
|
||||
<textarea wire:model="additional_info" name="additional_info"
|
||||
class="block py-1.5 my-3 w-full @error('additional_info') ring-red-500 @enderror text-gray-900 rounded-md border-0 ring-1 ring-inset ring-gray-300 shadow-sm sm:text-sm sm:leading-6 focus:ring-2 focus:ring-inset focus:ring-blue-600 form-control placeholder:text-gray-400 my-3 form-control"
|
||||
placeholder="{{ __('reg_form.any_additional_info') }}" style="min-height:140px"></textarea>
|
||||
@if ($errors->has('additional_info'))
|
||||
<div
|
||||
class="flex items-center mt-1 ml-1 text-xs font-medium tracking-wide text-red-500 verror-message">
|
||||
{{ $errors->first('additional_info') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button wire:click="finishRegistration" class="btn btn-lg btn-primary btn-block w-100 --f_bolder"
|
||||
type="submit">{{ __('reg_form.complete') }}</button>
|
||||
<div class="row">
|
||||
<div class="text-center --f_bold col-6">
|
||||
<a href="javascript:void(0)" skip-step wire:click="goBack">
|
||||
<span class="--f_grey">{{ __('reg_form.go_back') }}</span>
|
||||
</a>
|
||||
<div>
|
||||
<button
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md bg-[#019a3e] flex justify-center py-1.5 px-3 mt-5 w-full text-sm font-semibold leading-6 text-white rounded-md shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
|
||||
type="button" wire:click="finishRegistration">{{ __('reg_form.complete') }}</button>
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 mt-4 mt-5 sm:grid-cols-6">
|
||||
<button wire:click="goBack"
|
||||
class="p-2 px-5 text-sm font-semibold text-white rounded-md sm:col-span-3 bg-slate-400">
|
||||
<span class="--f_grey">← {{ __('reg_form.go_back') }}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -21,6 +21,9 @@ export default {
|
||||
sans: ["Figtree", ...defaultTheme.fontFamily.sans],
|
||||
mulish: ["Mulish", ...defaultTheme.fontFamily.sans],
|
||||
},
|
||||
backgroundColor: {
|
||||
"bg-eatvio-allow": "#019a3e",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user