From ea577e9a3b8c606075502d47614c7b34b5bfd785 Mon Sep 17 00:00:00 2001
From: Thekindbull <thekindbull@gmail.com>
Date: Fri, 10 Oct 2025 15:29:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BA=D0=B0=D0=B1=D0=B8=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=82=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D1=81=D1=82=D0=B2=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/livewire/info/index.blade.php       | 18 ++--
 .../Views/livewire/form.blade.php             |  6 +-
 app/Modules/Contracts/Views/index.blade.php   | 83 ++++++++++---------
 .../Views/livewire/table/index.blade.php      |  6 +-
 .../views/clients/contract/index.blade.php    |  2 +-
 resources/views/clients/table.blade.php       | 18 ++--
 resources/views/layouts/app.blade.php         | 10 +--
 resources/views/user/dashboard.blade.php      |  9 +-
 8 files changed, 84 insertions(+), 68 deletions(-)

diff --git a/app/Modules/CityManager/Views/livewire/info/index.blade.php b/app/Modules/CityManager/Views/livewire/info/index.blade.php
index fe113f7..fc0d8fa 100644
--- a/app/Modules/CityManager/Views/livewire/info/index.blade.php
+++ b/app/Modules/CityManager/Views/livewire/info/index.blade.php
@@ -1,12 +1,16 @@
 <div>
     @if ($manager)
-        <div class="text-secondary">Ваш менеджер:</div>
-        <div class="fw-bold text-uppercase text-primary">
-            {{ $manager->name }}
-        </div>
-        <div class="hstack gap-3 fs-6">
-            <span><i class="bi bi-telephone-fill"></i> {{ $manager->phone }}</span>
-            <span><i class="bi bi-envelope-fill"></i> {{ $manager->email }}</span>
+        <div class="vstack gap-1">
+            <div>
+                <div class="text-secondary">Ваш менеджер:</div>
+                <div class="fw-bold text-uppercase text-primary">
+                    {{ $manager->name }}
+                </div>
+            </div>
+            <div class="d-flex flex-column flex-md-row gap-1 fs-6">
+                <span><i class="bi bi-telephone-fill"></i> {{ $manager->phone }}</span>
+                <span><i class="bi bi-envelope-fill"></i> {{ $manager->email }}</span>
+            </div>
         </div>
     @endif
 </div>
diff --git a/app/Modules/ClientCreateForm/Views/livewire/form.blade.php b/app/Modules/ClientCreateForm/Views/livewire/form.blade.php
index 1d216c9..a089120 100644
--- a/app/Modules/ClientCreateForm/Views/livewire/form.blade.php
+++ b/app/Modules/ClientCreateForm/Views/livewire/form.blade.php
@@ -151,9 +151,9 @@ class="form-select rounded-4 @error('client.complexId') is-invalid @enderror" id
                     <select wire:model.live="agent" class="form-select rounded-4 @error('agent') is-invalid @enderror"
                         id="agent" name="agent" aria-label="Агент">
                         <option selected></option>
-                        @foreach ($agents as $agent)
-                            <option value="{{ $agent->id }}">
-                                {{ $agent->user->name }}
+                        @foreach ($availableAgents as $agent)
+                            <option value="{{ $agent['id'] }}">
+                                {{ $agent['user']['name'] }}
                             </option>
                         @endforeach
                     </select>
diff --git a/app/Modules/Contracts/Views/index.blade.php b/app/Modules/Contracts/Views/index.blade.php
index 7f5d63c..74a048b 100644
--- a/app/Modules/Contracts/Views/index.blade.php
+++ b/app/Modules/Contracts/Views/index.blade.php
@@ -1,50 +1,53 @@
+@php($title = 'Договоры')
 @extends('layouts.app')
 @section('content')
-    <form method="get" action="{{ Request::fullUrl() }}">
-        <div class="d-block d-flex flex-row mb-3">
-            <div class="border rounded-3 border-1 p-1 bg-white">
-                <?php
-                $filterFormArray = [];
-                foreach ($filter as $key => $filterValue) {
-                    if (!is_array($filterValue)) {
-                        $filterFormArray['filter[' . $key . ']'] = $filterValue;
-                    } else {
-                        foreach ($filterValue as $num => $value) {
-                            $filterFormArray['filter[' . $key . '][' . $num . ']'] = $value;
+    <form method="get" class="bg-light rounded-3" action="{{ Request::fullUrl() }}">
+        <div class="mb-3">
+            <div class="sticky-top position-sticky d-flex flex-row">
+                <div class="border rounded-3 border-1 p-1 bg-white">
+                    <?php
+                    $filterFormArray = [];
+                    foreach ($filter as $key => $filterValue) {
+                        if (!is_array($filterValue)) {
+                            $filterFormArray['filter[' . $key . ']'] = $filterValue;
+                        } else {
+                            foreach ($filterValue as $num => $value) {
+                                $filterFormArray['filter[' . $key . '][' . $num . ']'] = $value;
+                            }
                         }
                     }
-                }
-                ?>
-                @foreach ($filterFormArray as $key => $filterValue)
-                    <input type="hidden" name="{{ $key }}" value="{{ $filterValue }}">
-                @endforeach
-                <input type="radio" class="btn-check" name="mode" value="all" id="mode_all" autocomplete="off"
-                    onclick="this.form.submit()" {{ $mode == 'all' ? 'checked' : '' }}>
-                <label class="btn p-2 fs-5" for="mode_all">Все</label>
+                    ?>
+                    @foreach ($filterFormArray as $key => $filterValue)
+                        <input type="hidden" name="{{ $key }}" value="{{ $filterValue }}">
+                    @endforeach
+                    <input type="radio" class="btn-check" name="mode" value="all" id="mode_all" autocomplete="off"
+                        onclick="this.form.submit()" {{ $mode == 'all' ? 'checked' : '' }}>
+                    <label class="btn p-2 fs-5" for="mode_all">Все</label>
 
-                <input type="radio" class="btn-check" name="mode" value="active" id="mode_active" autocomplete="off"
-                    onclick="this.form.submit()" {{ $mode == 'active' ? 'checked' : '' }}>
-                <label class="btn p-2 fs-5" for="mode_active">Активные</label>
+                    <input type="radio" class="btn-check" name="mode" value="active" id="mode_active"
+                        autocomplete="off" onclick="this.form.submit()" {{ $mode == 'active' ? 'checked' : '' }}>
+                    <label class="btn p-2 fs-5" for="mode_active">Активные</label>
 
-                <input type="radio" class="btn-check" name="mode" value="successed" id="mode_successed"
-                    autocomplete="off" onclick="this.form.submit()" {{ $mode == 'successed' ? 'checked' : '' }}>
-                <label class="btn p-2 fs-5" for="mode_successed">Успешные</label>
+                    <input type="radio" class="btn-check" name="mode" value="successed" id="mode_successed"
+                        autocomplete="off" onclick="this.form.submit()" {{ $mode == 'successed' ? 'checked' : '' }}>
+                    <label class="btn p-2 fs-5" for="mode_successed">Успешные</label>
 
-                <input type="radio" class="btn-check" name="mode" value="declined" id="mode_declined"
-                    autocomplete="off" onclick="this.form.submit()" {{ $mode == 'declined' ? 'checked' : '' }}>
-                <label class="btn p-2 fs-5" for="mode_declined">Отклоненные</label>
-            </div>
-            <div class="ms-auto hstack gap-2">
-                <button type="button" class="lh-1  btn bg-white p-3 fw-bold border rounded-3 border-1"
-                    data-bs-toggle="modal" data-bs-target="#contractFilterModal">
-                    <span class="d-none d-lg-inline">Фильтр</span>
-                    <span class="position-relative">
-                        <i class="bi bi-person-plus"></i>
-                        @if ($filter)
-                            <span class="notices-badge animation-blink"></span>
-                        @endif
-                    </span>
-                </button>
+                    <input type="radio" class="btn-check" name="mode" value="declined" id="mode_declined"
+                        autocomplete="off" onclick="this.form.submit()" {{ $mode == 'declined' ? 'checked' : '' }}>
+                    <label class="btn p-2 fs-5" for="mode_declined">Отклоненные</label>
+                </div>
+                <div class="ms-auto hstack gap-2">
+                    <button type="button" class="lh-1  btn bg-white p-3 fw-bold border rounded-3 border-1"
+                        data-bs-toggle="modal" data-bs-target="#contractFilterModal">
+                        <span class="d-none d-lg-inline">Фильтр</span>
+                        <span class="position-relative">
+                            <i class="bi bi-person-plus"></i>
+                            @if ($filter)
+                                <span class="notices-badge animation-blink"></span>
+                            @endif
+                        </span>
+                    </button>
+                </div>
             </div>
             <!-- Modal -->
             <div class="modal fade" id="contractFilterModal" tabindex="-1" aria-labelledby="contractFilterModalLabel"
diff --git a/app/Modules/Contracts/Views/livewire/table/index.blade.php b/app/Modules/Contracts/Views/livewire/table/index.blade.php
index d6498ae..00f9bed 100644
--- a/app/Modules/Contracts/Views/livewire/table/index.blade.php
+++ b/app/Modules/Contracts/Views/livewire/table/index.blade.php
@@ -5,7 +5,6 @@
             <thead>
                 <tr class="d-none d-lg-table-row" scope="col">
                     <th>Клиент
-                    <th class="d-none d-lg-table-cell">Город
                     <th>ЖК
                     <th>Площадь
                     <th>Сумма
@@ -25,15 +24,12 @@
                             </div>
                             <div class="w-100">{{ $contract->deal->user->name }}</div>
                         </td>
-                        <td class="align-middle d-none d-lg-table-cell">
-                            {{ $contract->deal->complex->city->name }}
-                        </td>
                         <td class="d-block d-lg-none d-flex flex-row">
                             <div class="w-100">
                                 <span class="d-block d-md-none fs-6 text-secondary">Жилой комплекс</span>
                                 {{ $contract->deal->complex->name }}
                             </div>
-                            <div class="d-flex flex-column">
+                            <div class="d-flex flex-column d-md-none">
                                 <span class="d-block d-md-none fs-6 text-secondary">Площадь</span>
                                 <div>
                                     {{ $contract->square }} <span class="d-inline d-lg-none"> м<sup>2</sup></span>
diff --git a/resources/views/clients/contract/index.blade.php b/resources/views/clients/contract/index.blade.php
index f1b8ab3..28325c6 100644
--- a/resources/views/clients/contract/index.blade.php
+++ b/resources/views/clients/contract/index.blade.php
@@ -1,5 +1,5 @@
+@php($title = 'Договор')
 @extends('layouts.app')
-
 @section('content')
     <div class="row">
         <div class="col-12 col-lg-8">
diff --git a/resources/views/clients/table.blade.php b/resources/views/clients/table.blade.php
index 564fad2..66a6981 100644
--- a/resources/views/clients/table.blade.php
+++ b/resources/views/clients/table.blade.php
@@ -1,10 +1,10 @@
-@extends('layouts.app')
+@php($title = 'Контакты')
 
+@extends('layouts.app')
 @section('content')
     <div class="">
-        <form class="w-100 d-flex flex-row mb-3 sticky-top bg-light rounded-3" method="GET"
-            action="{{ route('clients.table') }}">
-            <div class="p-2 border rounded-3 border-1 p-1 bg-white">
+        <form class=" d-flex flex-row mb-3 sticky-top bg-light rounded-3" method="GET" action="{{ route('clients.table') }}">
+            <div class="col-12 col-md-auto p-2 border rounded-3 border-1 p-1 bg-white">
                 <input type="radio" class="btn-check" name="status" value="all" id="option5" autocomplete="off"
                     onclick="this.form.submit()" {{ $status == 'all' ? 'checked' : '' }}>
                 <label class="btn p-2 fs-5" for="option5">Все</label>
@@ -18,12 +18,20 @@
                 <label class="btn p-2 fs-5" for="option7">Не
                     уникальные</label>
             </div>
-            <div class="ms-auto p-2 ">
+            <div class="d-none d-md-flex flex-fill"></div>
+            <div class="ms-auto p-2 d-none d-md-block">
                 <button type="button" class="btn btn-primary py-2 px-3 fs-5" data-bs-toggle="modal"
                     data-bs-target="#createClientModal">
                     <i class="bi bi-person-plus"></i> <span class="d-inline d-none d-md-inline">Добавить клиента</span>
                 </button>
             </div>
+            <div class="d-block d-md-none position-fixed bottom-0 end-0">
+                <button type="button" class="shadow btn btn-secondary p-2 fs-3 rounded-pill"
+                    style="margin-bottom:90px;width:4rem;height:4rem" data-bs-toggle="modal"
+                    data-bs-target="#createClientModal">
+                    <i class="bi bi-person-plus"></i>
+                </button>
+            </div>
         </form>
         @if (!$status || $status == 'all' || $status == 'unique')
             <h4 class="fw-bold mt-5 mb-3">Уникальные</h4>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index e961a1c..a113e57 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -21,20 +21,20 @@
 <body>
     <div id="app">
         <nav class="navbar navbar-expand-md bg-body-tertiary shadow-sm">
-            <div class="container">
-                <div class="col-auto col-sm-2 text-center">
+            <div class="container d-flex flex-row">
+                <div class=" text-center">
                     <a class="navbar-brand">
                         <img src={{ url('/images/logo.png') }} alt="Logo" width="70">
                     </a>
                 </div>
-                <div class="col px-0 px-md-4 text-start text-truncate fw-light fs-4 text-secondary text-uppercase"
+                <div class="flex-fill px-0 px-md-4 text-start text-truncate fw-light fs-4 text-secondary text-uppercase"
                     id="pageTitle">
                     @isset($title)
                         {{ $title }}
                     @endisset
                 </div>
                 <!-- Right Side Of Navbar -->
-                <div class="position-sm-fixed position-relative d-flex flex-row align-items-center ms-auto">
+                <div class="d-flex flex-row align-items-center">
                     <div class="nav-item d-none d-lg-block">
                         @livewire('citymanagerinfo')
                     </div>
@@ -109,7 +109,7 @@
                     <div class="d-flex flex-column" id="leftPanel">
                         @include('left-panel')
                     </div>
-                    <div class="px-0 px-md-4">
+                    <div class="px-0 px-md-4 w-100">
                         @if (session('success'))
                             <div class="alert alert-success">
                                 {{ session('success') }}
diff --git a/resources/views/user/dashboard.blade.php b/resources/views/user/dashboard.blade.php
index a296ed5..2085224 100644
--- a/resources/views/user/dashboard.blade.php
+++ b/resources/views/user/dashboard.blade.php
@@ -2,7 +2,12 @@
 
 @section('content')
     <div>
-        <div class="row">
+        <div class="d-block d-lg-none">
+            <div class="bg-white p-3 border border-light-subtle rounded-3 mb-3">
+                @livewire('citymanagerinfo')
+            </div>
+        </div>
+        <div class="row d-none d-md-flex">
             <div class="col-12 col-lg-6 mb-2">
                 <div class="" data-bs-toggle="modal" data-bs-target="#plan7Modal">
                     <a href="#"
@@ -53,7 +58,7 @@ class="list-group-item list-group-item-action p-3 bg-white rounded border border
             'count' => 3,
         ])
     </div>
-    <div class="mt-3 col-12">
+    <div class="mt-3 col-12 d-none">
         <div class="d-flex">
             <div class="fs-5 fw-bold">Избранное</div>
             <div class="ms-auto p-2">Смотреть все</div>