fix: кабинет агентства

app/Modules/CityManager/Views/livewire/info/index.blade.php

@@ -1,12 +1,16 @@
 <div>
     @if ($manager)
+        <div class="vstack gap-1">
+            <div>
                 <div class="text-secondary">Ваш менеджер:</div>
                 <div class="fw-bold text-uppercase text-primary">
                     {{ $manager->name }}
                 </div>
-        <div class="hstack gap-3 fs-6">
+            </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>

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)
+                        @foreach ($availableAgents as $agent)
-                            <option value="{{ $agent->id }}">
+                            <option value="{{ $agent['id'] }}">
-                                {{ $agent->user->name }}
+                                {{ $agent['user']['name'] }}
                             </option>
                         @endforeach
                     </select>

app/Modules/Contracts/Views/index.blade.php

@@ -1,7 +1,9 @@
+@php($title = 'Договоры')
 @extends('layouts.app')
 @section('content')
-    <form method="get" action="{{ Request::fullUrl() }}">
+    <form method="get" class="bg-light rounded-3" action="{{ Request::fullUrl() }}">
-        <div class="d-block d-flex flex-row mb-3">
+        <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 = [];
@@ -22,8 +24,8 @@
                         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"
+                    <input type="radio" class="btn-check" name="mode" value="active" id="mode_active"
-                    onclick="this.form.submit()" {{ $mode == 'active' ? 'checked' : '' }}>
+                        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"
@@ -46,6 +48,7 @@
                         </span>
                     </button>
                 </div>
+            </div>
             <!-- Modal -->
             <div class="modal fade" id="contractFilterModal" tabindex="-1" aria-labelledby="contractFilterModalLabel"
                 aria-hidden="true">

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>

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">

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"
+        <form class=" d-flex flex-row mb-3 sticky-top bg-light rounded-3" method="GET" action="{{ route('clients.table') }}">
-            action="{{ route('clients.table') }}">
+            <div class="col-12 col-md-auto p-2 border rounded-3 border-1 p-1 bg-white">
-            <div class="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>

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="container d-flex flex-row">
-                <div class="col-auto col-sm-2 text-center">
+                <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') }}

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>