Андрей Ларионов / rekamore.su

Browse Code »

Commit 02091c25ac61098c4f125c725575f7892b37d26e

Authored by Андрей Ларионов 2023-09-12 16:39:55 +0300

1 parent e878fca705

Exists in master

Третье обновление системы

Showing 37 changed files with 1 additions and 995 deletions Inline Diff

app/Http/Controllers/Admin/EmployersController.php
app/Http/Controllers/Admin/UsersController.php
app/Http/Controllers/Admin/WorkersController.php
app/Models/Ad_employer.php
app/Models/Category.php
app/Models/Employer.php
app/Models/Group_user.php
app/Models/Job_title.php
app/Models/Message.php
app/Models/User.php
app/Models/Worker.php
composer.json
config/app.php
database/migrations/2023_05_16_081308_create_static_workers_table.php
database/migrations/2023_05_16_081330_create_static_ads_table.php
database/migrations/2023_05_16_092746_alter_ad_jobs_table.php
database/seeders/DatabaseSeeder.php
resources/views/admin/config.blade.php
resources/views/admin/employer/index.blade.php
resources/views/admin/employer/index_ajax.blade.php
resources/views/admin/index.blade.php
resources/views/admin/profile.blade.php
resources/views/admin/users/index.blade.php
resources/views/admin/users/index_ajax.blade.php
resources/views/admin/worker/index.blade.php
resources/views/admin/worker/index_ajax.blade.php
resources/views/layout/admin.blade.php
routes/web.php
storage/app/.gitignore
storage/app/public/.gitignore
storage/framework/.gitignore
storage/framework/cache/.gitignore
storage/framework/cache/data/.gitignore
storage/framework/sessions/.gitignore
storage/framework/testing/.gitignore
storage/framework/views/.gitignore
storage/logs/.gitignore

app/Http/Controllers/Admin/EmployersController.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
-<<<<<<< HEAD
-use App\Models\User;
-use Illuminate\Http\Request;
-=======
 use App\Models\Answer;
 use App\Models\Employer;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 class EmployersController extends Controller
 {
     public function index(Request $request) {
         if ($request->ajax()) {
             $user = User::find($request->id);
             $request->offsetUnset('id');
             $user->update($request->all());
         }
         $users = User::where('is_worker', '0')->paginate(15);
         if ($request->ajax()) {
             return view('admin.employer.index_ajax', compact('users'));
         } else {
             return view('admin.employer.index', compact('users'));
         }
     }
-<<<<<<< HEAD
-=======
     public function form_update_employer(Employer $employer) {
         return view('admin.employer.edit', compact('employer'));
     }
     public function update_employer(Employer $employer, Request $request)
     {
         $params = $request->all();
         unset($params['logo']);
         unset($params['telephone']);
         unset($params['email']);
         unset($params['address']);
         unset($params['site']);
         $rules = [
             'name' => 'required|string|max:255',
         ];
         $messages = [
             'required' => 'Укажите обязательное поле «:attribute»',
             'confirmed' => 'Пароли не совпадают',
             'email' => 'Введите корректный email',
             'min' => [
                 'string' => 'Поле «:attribute» должно быть не меньше :min символов',
                 'file' => 'Файл «:attribute» должен быть не меньше :min Кбайт'
             ],
             'max' => [
                 'string' => 'Поле «:attribute» должно быть не больше :max символов',
                 'file' => 'Файл «:attribute» должен быть не больше :max Кбайт'
             ],
         ];
         $validator = Validator::make($params, $rules, $messages);
         if ($validator->fails()) {
             return back()->withErrors($validator)->withInput();                    //->route('admin.register')
         } else {
             //$user = User::find($employer->user_id);
             $user_id = $employer->user_id;
             $employer->telephone = $request->telephone;
             $employer->email = $request->email;
             $employer->address = $request->address;
             $employer->site = $request->site;
             $employer->text = $request->text;
             if ($request->has('logo')) {
                 if (!empty($employer->logo)) {
                     Storage::delete($employer->logo);
                 }
                 $employer->logo = $request->file('logo')->store("employer/$user_id", 'public');
             }
             $employer->save();
             $user = User::find($user_id);
             $user->update($params);
             return redirect()->route('admin.employer-profile', ['employer' => $employer->id])
                 ->with('success', 'Данные были успешно сохранены');
         }
     }
     // кабинет - отзывы о работодателе для модерации
     public function answers(Request $request) {
         if ($request->ajax()) {
             $user = Answer::find($request->id);
             $request->offsetUnset('id');
             $user->update($request->all());
         }
         $answers = Answer::query()->orderByDesc('id')->paginate(15);
         if ($request->ajax()) {
             return view('admin.answers.index_ajax', compact('answers'));
         } else {
             return view('admin.answers.index', compact('answers'));
         }
     }
     // кабинет - статистика вакансий работодателя
     public function static_ads() {
         return;
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

app/Http/Controllers/Admin/UsersController.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use App\Models\User;
 use Illuminate\Http\Request;
-<<<<<<< HEAD
-=======
 use Illuminate\Support\Facades\Auth;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 class UsersController extends Controller
 {
     public function index(Request $request) {
-<<<<<<< HEAD
-=======
         $title = 'Админка - Пользователи системы';
         $id_admin = Auth::user()->id;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
         if ($request->ajax()) {
             $user = User::find($request->id);
             $request->offsetUnset('id');
             $user->update($request->all());
         }
         $users = User::query()->paginate(15);
         if ($request->ajax()) {
-<<<<<<< HEAD
-           return view('admin.users.index_ajax', compact('users'));
-        } else {
-            return view('admin.users.index', compact('users'));
-        }
-    }
-=======
            return view('admin.users.index_ajax', compact('users', 'id_admin'));
         } else {
             return view('admin.users.index', compact('users', 'title', 'id_admin'));
         }
     }
     public function roles(Request $request) {
         if ($request->ajax()) {
             $user = User::find($request->id);
             $request->offsetUnset('id');
             $user->update($request->all());
         }
         $users = User::query()->paginate(15);
         if ($request->ajax()) {
             return view('admin.users.roles.index_ajax', compact('users'));
         } else {
             return view('admin.users.roles.index', compact('users'));
         }
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

app/Http/Controllers/Admin/WorkersController.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use App\Models\User;
-<<<<<<< HEAD
-=======
 use App\Models\Worker;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 use Illuminate\Http\Request;
 class WorkersController extends Controller
 {
     public function index(Request $request) {
         if ($request->ajax()) {
             $user = User::find($request->id);
             $request->offsetUnset('id');
             $user->update($request->all());
         }
         $users = User::where('is_worker', '1')->paginate(15);
         if ($request->ajax()) {
             return view('admin.worker.index_ajax', compact('users'));
         } else {
             return view('admin.worker.index', compact('users'));
         }
     }
-<<<<<<< HEAD
-=======
     public function form_update_worker(Worker $worker) {
         return view('admin.worker.edit');
     }
     // кабинет - статистика работников
     public function static_workers() {
         return;
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

app/Models/Ad_employer.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 class Ad_employer extends Model
 {
     use HasFactory;
-<<<<<<< HEAD
-=======
     protected $fillable = [
         'name',
         'telephone',
         'email',
         'salary',
         'category_id',
         'text',
         'employer_id',
         'city',
         'sort',
         'is_remove',
         'active_is',
       ];
     /*
      * Связь таблицы employers с таблицей ad_employers
      многие-к-одному
     */
     public function employer() {
         return $this->belongsTo(Employer::class, 'employer_id');
     }
     /*
     * Связь модели Вакансии (Ad_employer) с моделью Должности (Job_title)
       многие-ко-многим
     */
     public function jobs() {
         return $this->belongsToMany(Job_title::class, 'ad_jobs');
     }
     /*
     * Связь модели Вакансия (Ad_employers) с моделью Отклик на Вакансию (Ad_response)
       один-ко-многим
     */
     public function response() {
         return $this->hasMany(ad_response::class);
     }
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

app/Models/Category.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 class Category extends Model
 {
     use HasFactory;
-<<<<<<< HEAD
-=======
     protected $fillable = [
         'name',
         'is_remove'
         ];
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

app/Models/Employer.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 class Employer extends Model
 {
     use HasFactory;
     protected $fillable = [
         'name_company',
         'email',
         'telephone',
         'logo',
         'rate',
         'user_id',
         'sort',
         'text',
         'address',
         'map',
         'site',
-<<<<<<< HEAD
-=======
         'coord',
         'plus',
         'is_remove',
         'oficial_status',
         'social_is',
         'sending_is',
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
         ];
     /*
      * Связь таблицы users с таблицей employers
     */
     public function users() {
         return $this->belongsTo(User::class, 'user_id');
     }
-<<<<<<< HEAD
-=======
     /*
     * Связь Работодателя с вакансиями
     */
     public function ads() {
         return $this->hasMany(Ad_employer::class);
     }
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

app/Models/Group_user.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 class Group_user extends Model
 {
     use HasFactory;
-<<<<<<< HEAD
-=======
     protected $fillable = [
         'name_group',
         'user_id',
         'is_remove',
     ];
     /*
      * Связь Модели Группы (Group_user) с Модели Юзеры (User)
      многие-к-одному
     */
     public function user() {
         return $this->belongsTo(User::class, 'user_id');
     }
     /*
     * Связь модели Группы (Group_user) с Моделью Юзеры (User) - участники группы
       многие-ко-многим
     */
     public function ingroup() {
         return $this->belongsToMany(User::class, 'group_works');
     }
     /*
    * Связь модели Группы (Group_users) с моделью Группы пользователей (Group_works)
      один-ко-многим
    */
     public function peoples() {
         return $this->hasMany(Group_works::class);
     }
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

app/Models/Job_title.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 class Job_title extends Model
 {
     use HasFactory;
-<<<<<<< HEAD
-=======
     protected $fillable = [
         'name',
         'is_remove',
         'parent_id',
        ];
     /*
        * Связь модели Вакансии (Ad_employer) с моделью Должности (Job_title)
        */
     public function Ads() {
         return $this->belongsToMany(Ad_employer::class, 'ad_jobs');
     }
     /*
      * Связь таблицы job_titles с таблицей job_titles через ключ parent_id
        многие-к-одному
     */
     public function parent() {
         return $this->belongsTo(Job_title::class, 'parent_id');
     }
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

app/Models/Message.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 class Message extends Model
 {
     use HasFactory;
-<<<<<<< HEAD
-=======
     /*
      * Связь таблицы Message с таблицей User (Отправитель)
     */
     public function user_from() {
         return $this->belongsTo(User::class, 'user_id');
     }
     /*
      * Связь таблицы Message с таблицей User (Получатель)
     */
     public function user_to() {
         return $this->belongsTo(User::class, 'to_user_id');
     }
     /*
     * Связь модели Сообщения (Message) с моделью Отклик на Вакансию (Ad_response)
     */
     public function response() {
         return $this->hasMany(ad_response::class);
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

app/Models/User.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Models;
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
 class User extends Authenticatable
 {
     use HasApiTokens, HasFactory, Notifiable;
     /**
      * The attributes that are mass assignable.
      *
      * @var array<int, string>
      */
     protected $fillable = [
         'name',
         'email',
         'password',
         'admin',
         'telephone',
         'surname',
         'name_man',
         'surname2',
         'is_worker',
         'is_lookin',
         'is_message',
         'is_public',
         'is_remove',
         'is_ban',
         'is_new',
     ];
     /**
      * The attributes that should be hidden for serialization.
      *
      * @var array<int, string>
      */
     protected $hidden = [
         'password',
         'remember_token',
     ];
     /**
      * The attributes that should be cast.
      *
      * @var array<string, string>
      */
     protected $casts = [
         'email_verified_at' => 'datetime',
     ];
     /*
     * Связь Пользователей системы с работодателями
      * users - employers
     */
     public function employers() {
-<<<<<<< HEAD
-        return $this->hasMany(Employer::class);
-=======
         return $this->hasMany(Employer::class, 'user_id');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     }
     /*
      * Связь Пользователей системы с работниками
      * users - workers
     */
     public function workers() {
-<<<<<<< HEAD
-        return $this->hasMany(Worker::class);
-    }
-    /*
-      * Связь Пользователей системы с группами юзеров
-      * users - group_users
-    */
-    public function groups() {
-        return $this->hasMany(Group_user::class);
-=======
         return $this->hasMany(Worker::class, 'user_id');
     }
     /*
       * Связь Модели Пользователей(Users) с Группами (Group_users)
       * users - group_users
         многие-ко-многим
    */
     public function ingroup() {
         return $this->belongsToMany(Group_user::class, 'group_works');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     }
     /*
      * Связь Пользователей системы с ссобщениями
      * users - messages
     */
     public function messages() {
         return $this->hasMany(Message::class);
     }
     /*
      * Связь Пользователей системы с статистика
      * users - static_workers
     */
     public function static_user() {
         return $this->hasMany(Static_worker::class);
     }
-<<<<<<< HEAD
-=======
     /*
     * Связь модели Юзеры (users) с моделью Группы пользователей (Group_works)
         один-ко-многим
     */
     public function peoples() {
         return $this->hasMany(Group_works::class);
     }
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

app/Models/Worker.php

Diff comments View file @ 02091c2

 <?php
 namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 class Worker extends Model
 {
     use HasFactory;
     protected $fillable = [
         'user_id',
         'status_work',
         'position_work',
         'telephone',
         'telephone2',
         'persent_anketa',
         'photo',
         'email_data',
         'status_profile',
         'old_year',
         'experience',
         'en_is',
         'education',
         'email',
         'interpassport',
         'mk',
         'vvp',
         'vlm',
         'reka_diplom',
         'more_diplom',
         'mpss',
         'tanker',
         'gmssb',
         'resume',
         'sort',
         'updated_at',
         'text',
         'address',
         'city',
-<<<<<<< HEAD
-=======
         'coord',
         'file',
         'is_remove',
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     ];
     /*
      * Связь таблицы users с таблицей workers
     */
     public function users() {
         return $this->belongsTo(User::class, 'user_id');
     }
-<<<<<<< HEAD
-=======
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }

composer.json

Diff comments View file @ 02091c2

 {
     "name": "laravel/laravel",
     "type": "project",
     "description": "The Laravel Framework.",
     "keywords": ["framework", "laravel"],
     "license": "MIT",
     "require": {
         "php": "^8.0.2",
         "filament/forms": "^2.17",
         "filament/notifications": "^2.17",
         "filament/tables": "^2.17",
         "guzzlehttp/guzzle": "^7.2",
         "laravel-lang/lang": "^12.17",
         "laravel/framework": "^9.19",
         "laravel/sanctum": "^3.0",
         "laravel/tinker": "^2.7",
-<<<<<<< HEAD
-        "laravel/ui": "^4.2"
-=======
         "laravel/ui": "^4.2",
       "ext-http": "*"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
         "laravel/pint": "^1.0",
         "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^6.1",
         "phpunit/phpunit": "^9.5.10",
         "spatie/laravel-ignition": "^1.0"
     },
     "autoload": {
         "psr-4": {
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",
             "Database\\Seeders\\": "database/seeders/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "Tests\\": "tests/"
         }
     },
     "scripts": {
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi"
         ],
         "post-update-cmd": [
             "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
         ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
         "post-create-project-cmd": [
             "@php artisan key:generate --ansi"
         ]
     },
     "extra": {
         "laravel": {
             "dont-discover": []
         }
     },
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
         "sort-packages": true,
         "allow-plugins": {
             "pestphp/pest-plugin": true
         }
     },
     "minimum-stability": "stable",
     "prefer-stable": true
 }

config/app.php

Diff comments View file @ 02091c2

database/migrations/2023_05_16_081308_create_static_workers_table.php

Diff comments View file @ 02091c2

 <?php
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 return new class extends Migration
 {
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
         Schema::create('static_workers', function (Blueprint $table) {
             $table->id();
             $table->bigInteger('user_id')->nullable(false);
             $table->integer('lookin')->default(0);
-<<<<<<< HEAD
-            $table->string('month_year', 255)->nullable();
-=======
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             $table->integer('message')->default(0);
             $table->timestamps();
         });
     }
     /**
      * Reverse the migrations.
      *
      * @return void
      */
     public function down()
     {
         Schema::dropIfExists('static_workers');
     }
 };

database/migrations/2023_05_16_081330_create_static_ads_table.php

Diff comments View file @ 02091c2

 <?php
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 return new class extends Migration
 {
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
         Schema::create('static_ads', function (Blueprint $table) {
             $table->id();
             $table->bigInteger('ad_employer_id')->nullable(false);
             $table->integer('lookin')->default(0);
-<<<<<<< HEAD
-            $table->string('month_year', 255)->nullable();
-=======
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             $table->integer('message')->default(0);
             $table->timestamps();
         });
     }
     /**
      * Reverse the migrations.
      *
      * @return void
      */
     public function down()
     {
         Schema::dropIfExists('static_ads');
     }
 };

database/migrations/2023_05_16_092746_alter_ad_jobs_table.php

Diff comments View file @ 02091c2

 <?php
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 return new class extends Migration
 {
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
         Schema::create('ad_jobs', function (Blueprint $table) {
             $table->id();
-<<<<<<< HEAD
-            $table->bigInteger('ad_employer_id')->nullable(false);
-            $table->bigInteger('job_title_id')->nullable(false);
-=======
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             $table->timestamps();
         });
     }
     /**
      * Reverse the migrations.
      *
      * @return void
      */
     public function down()
     {
         Schema::dropIfExists('ad_jobs');
     }
 };

database/seeders/DatabaseSeeder.php

Diff comments View file @ 02091c2

 <?php
 namespace Database\Seeders;
 // use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 class DatabaseSeeder extends Seeder
 {
     /**
      * Seed the application's database.
      *
      * @return void
      */
     public function run()
     {
-<<<<<<< HEAD
-=======
         $this->call(EmployersMainSeeder::class);
         $this->command->info('Таблица работодатели на главной загружена!');
         $this->call(JobTitlesMainSeeder::class);
         $this->command->info('Таблица должности на главной загружена!');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
         // \App\Models\User::factory(10)->create();
         // \App\Models\User::factory()->create([
         //     'name' => 'Test User',
         //     'email' => 'test@example.com',
         // ]);
     }
 }

resources/views/admin/config.blade.php

Diff comments View file @ 02091c2

1	@extends('layout.admin', ['title' => 'Админка - Настройки'])	1	@extends('layout.admin', ['title' => 'Админка - Настройки'])
2		2
3	@section('content')	3	@section('content')
4	<<<<<<< HEAD
5	<h4
6	class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
7	>
8	Elements
9	</h4>
10	<div
11	class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
12	>
13	<label class="block text-sm">
14	<span class="text-gray-700 dark:text-gray-400">Name</span>
15	<input
16	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
17	placeholder="Jane Doe"
18	/>
19	</label>
20
21	<div class="mt-4 text-sm">
22	<span class="text-gray-700 dark:text-gray-400">
23	Account Type
24	</span>
25	<div class="mt-2">
26	<label
27	class="inline-flex items-center text-gray-600 dark:text-gray-400"
28	>
29	<input
30	type="radio"
31	class="text-purple-600 form-radio focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
32	name="accountType"
33	value="personal"
34	/>
35	<span class="ml-2">Personal</span>
36	</label>
37	<label
38	class="inline-flex items-center ml-6 text-gray-600 dark:text-gray-400"
39	>
40	<input
41	type="radio"
42	class="text-purple-600 form-radio focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
43	name="accountType"
44	value="busines"
45	/>
46	<span class="ml-2">Business</span>
47	</label>
48	</div>
49	</div>
50
51	<label class="block mt-4 text-sm">
52	<span class="text-gray-700 dark:text-gray-400">
53	Requested Limit
54	</span>
55	<select
56	class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
57	>
58	<option>$1,000</option>
59	<option>$5,000</option>
60	<option>$10,000</option>
61	<option>$25,000</option>
62	</select>
63	</label>
64
65	<label class="block mt-4 text-sm">
66	<span class="text-gray-700 dark:text-gray-400">
67	Multiselect
68	</span>
69	<select
70	class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-multiselect focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
71	multiple
72	>
73	<option>Option 1</option>
74	<option>Option 2</option>
75	<option>Option 3</option>
76	<option>Option 4</option>
77	<option>Option 5</option>
78	</select>
79	</label>
80
81	<label class="block mt-4 text-sm">
82	<span class="text-gray-700 dark:text-gray-400">Message</span>
83	<textarea
84	class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-textarea focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
85	rows="3"
86	placeholder="Enter some long form content."
87	></textarea>
88	</label>
89
90	<div class="flex mt-6 text-sm">
91	<label class="flex items-center dark:text-gray-400">
92	<input
93	type="checkbox"
94	class="text-purple-600 form-checkbox focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
95	/>
96	<span class="ml-2">
97	I agree to the
98	<span class="underline">privacy policy</span>
99	</span>
100	</label>
101	</div>
102	</div>
103
104	<!-- Validation inputs -->
105	<h4
106	class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
107	>
108	Validation
109	</h4>
110	<div
111	class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
112	>
113	<!-- Invalid input -->
114	<label class="block text-sm">
115	<span class="text-gray-700 dark:text-gray-400">
116	Invalid input
117	</span>
118	<input
119	class="block w-full mt-1 text-sm border-red-600 dark:text-gray-300 dark:bg-gray-700 focus:border-red-400 focus:outline-none focus:shadow-outline-red form-input"
120	placeholder="Jane Doe"
121	/>
122	<span class="text-xs text-red-600 dark:text-red-400">
123	Your password is too short.
124	</span>
125	</label>
126
127	<!-- Valid input -->
128	<label class="block mt-4 text-sm">
129	<span class="text-gray-700 dark:text-gray-400">
130	Valid input
131	</span>
132	<input
133	class="block w-full mt-1 text-sm border-green-600 dark:text-gray-300 dark:bg-gray-700 focus:border-green-400 focus:outline-none focus:shadow-outline-green form-input"
134	placeholder="Jane Doe"
135	/>
136	<span class="text-xs text-green-600 dark:text-green-400">
137	Your password is strong.
138	</span>
139	</label>
140
141	<!-- Helper text -->
142	<label class="block mt-4 text-sm">
143	<span class="text-gray-700 dark:text-gray-400">
144	Helper text
145	</span>
146	<input
147	class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
148	placeholder="Jane Doe"
149	/>
150	<span class="text-xs text-gray-600 dark:text-gray-400">
151	Your password must be at least 6 characters long.
152	</span>
153	</label>
154	</div>
155
156	<!-- Inputs with icons -->
157	<h4
158	class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
159	>
160	Icons
161	</h4>
162	<div
163	class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
164	>
165	<label class="block text-sm">
166	<span class="text-gray-700 dark:text-gray-400">Icon left</span>
167	<!-- focus-within sets the color for the icon when input is focused -->
168	<div
169	class="relative text-gray-500 focus-within:text-purple-600 dark:focus-within:text-purple-400"
170	>
171	<input
172	class="block w-full pl-10 mt-1 text-sm text-black dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
173	placeholder="Jane Doe"
174	/>
175	<div
176	class="absolute inset-y-0 flex items-center ml-3 pointer-events-none"
177	>
178	<svg
179	class="w-5 h-5"
180	aria-hidden="true"
181	fill="none"
182	stroke-linecap="round"
183	stroke-linejoin="round"
184	stroke-width="2"
185	viewBox="0 0 24 24"
186	stroke="currentColor"
187	>
188	<path
189	d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
190	></path>
191	</svg>
192	</div>
193	</div>
194	</label>
195
196	<label class="block mt-4 text-sm">
197	<span class="text-gray-700 dark:text-gray-400">Icon right</span>
198	<!-- focus-within sets the color for the icon when input is focused -->
199	<div
200	class="relative text-gray-500 focus-within:text-purple-600 dark:focus-within:text-purple-400"
201	>
202	<input
203	class="block w-full pr-10 mt-1 text-sm text-black dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
204	placeholder="Jane Doe"
205	/>
206	<div
207	class="absolute inset-y-0 right-0 flex items-center mr-3 pointer-events-none"
208	>
209	<svg
210	class="w-5 h-5"
211	aria-hidden="true"
212	fill="none"
213	stroke-linecap="round"
214	stroke-linejoin="round"
215	stroke-width="2"
216	viewBox="0 0 24 24"
217	stroke="currentColor"
218	>
219	<path
220	d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
221	></path>
222	</svg>
223	</div>
224	</div>
225	</label>
226	</div>
227
228	<!-- Inputs with buttons -->
229	<h4
230	class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
231	>
232	Buttons
233	</h4>
234	<div
235	class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
236	>
237	<label class="block text-sm">
238	<span class="text-gray-700 dark:text-gray-400">
239	Button left
240	</span>
241	<div class="relative">
242	<input
243	class="block w-full pl-20 mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
244	placeholder="Jane Doe"
245	/>
246	<button
247	class="absolute inset-y-0 px-4 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-l-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
248	>
249	Click
250	</button>
251	</div>
252	</label>
253
254	<label class="block mt-4 text-sm">
255	<span class="text-gray-700 dark:text-gray-400">
256	Button right
257	</span>
258	<div
259	class="relative text-gray-500 focus-within:text-purple-600"
260	>
261	<input
262	class="block w-full pr-20 mt-1 text-sm text-black dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
263	placeholder="Jane Doe"
264	/>
265	<button
266	class="absolute inset-y-0 right-0 px-4 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-r-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple"
267	>
268	Click
269	</button>
270	</div>
271	</label>
272	</div>
273	=======
274	<h4 class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300">	4	<h4 class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300">
275	Реквизиты сайта (конфигурация)	5	Реквизиты сайта (конфигурация)
276	</h4>	6	</h4>
277	<form action="" method="POST" enctype="multipart/form-data">	7	<form action="" method="POST" enctype="multipart/form-data">
278	@csrf	8	@csrf
279		9
280	<div class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800">	10	<div class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800">
281	<label class="block text-sm">	11	<label class="block text-sm">
282	<span class="text-gray-700 dark:text-gray-400">Имя компании</span>	12	<span class="text-gray-700 dark:text-gray-400">Имя компании</span>
283	<input name="name" id="name"	13	<input name="name" id="name"
284	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	14	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
285	placeholder="Имя компании" value="{{ old('name') ?? $config->name ?? '' }}"	15	placeholder="Имя компании" value="{{ old('name') ?? $config->name ?? '' }}"
286	/>	16	/>
287	@error('name')	17	@error('name')
288	<span class="text-xs text-red-600 dark:text-red-400">	18	<span class="text-xs text-red-600 dark:text-red-400">
289	{{ $message }}	19	{{ $message }}
290	</span>	20	</span>
291	@enderror	21	@enderror
292	</label><br>	22	</label><br>
293		23
294	<label class="block text-sm">	24	<label class="block text-sm">
295	<span class="text-gray-700 dark:text-gray-400">Адрес</span>	25	<span class="text-gray-700 dark:text-gray-400">Адрес</span>
296	<input name="address" id="address"	26	<input name="address" id="address"
297	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	27	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
298	placeholder="Адрес" value="{{ old('address') ?? $config->address ?? '' }}"	28	placeholder="Адрес" value="{{ old('address') ?? $config->address ?? '' }}"
299	/>	29	/>
300	@error('address')	30	@error('address')
301	<span class="text-xs text-red-600 dark:text-red-400">	31	<span class="text-xs text-red-600 dark:text-red-400">
302	{{ $message }}	32	{{ $message }}
303	</span>	33	</span>
304	@enderror	34	@enderror
305	</label><br>	35	</label><br>
306		36
307	<label class="block text-sm">	37	<label class="block text-sm">
308	<span class="text-gray-700 dark:text-gray-400">ФИО директора компании</span>	38	<span class="text-gray-700 dark:text-gray-400">ФИО директора компании</span>
309	<input name="fio_director" id="fio_director"	39	<input name="fio_director" id="fio_director"
310	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	40	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
311	placeholder="ФИО директора" value="{{ old('fio_director') ?? $config->fio_director ?? '' }}"	41	placeholder="ФИО директора" value="{{ old('fio_director') ?? $config->fio_director ?? '' }}"
312	/>	42	/>
313	@error('fio_director')	43	@error('fio_director')
314	<span class="text-xs text-red-600 dark:text-red-400">	44	<span class="text-xs text-red-600 dark:text-red-400">
315	{{ $message }}	45	{{ $message }}
316	</span>	46	</span>
317	@enderror	47	@enderror
318	</label><br>	48	</label><br>
319		49
320	<label class="block text-sm">	50	<label class="block text-sm">
321	<span class="text-gray-700 dark:text-gray-400">Email</span>	51	<span class="text-gray-700 dark:text-gray-400">Email</span>
322	<input name="email" id="email"	52	<input name="email" id="email"
323	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	53	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
324	placeholder="Почта" value="{{ old('email') ?? $config->email ?? '' }}"	54	placeholder="Почта" value="{{ old('email') ?? $config->email ?? '' }}"
325	/>	55	/>
326	@error('email')	56	@error('email')
327	<span class="text-xs text-red-600 dark:text-red-400">	57	<span class="text-xs text-red-600 dark:text-red-400">
328	{{ $message }}	58	{{ $message }}
329	</span>	59	</span>
330	@enderror	60	@enderror
331	</label><br>	61	</label><br>
332		62
333	<label class="block text-sm">	63	<label class="block text-sm">
334	<span class="text-gray-700 dark:text-gray-400">Телефон</span>	64	<span class="text-gray-700 dark:text-gray-400">Телефон</span>
335	<input name="telephone" id="telephone"	65	<input name="telephone" id="telephone"
336	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	66	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
337	placeholder="Телефон" value="{{ old('telephone') ?? $config->telephone ?? '' }}"	67	placeholder="Телефон" value="{{ old('telephone') ?? $config->telephone ?? '' }}"
338	/>	68	/>
339	@error('telephone')	69	@error('telephone')
340	<span class="text-xs text-red-600 dark:text-red-400">	70	<span class="text-xs text-red-600 dark:text-red-400">
341	{{ $message }}	71	{{ $message }}
342	</span>	72	</span>
343	@enderror	73	@enderror
344	</label><br>	74	</label><br>
345		75
346	<label class="block text-sm">	76	<label class="block text-sm">
347	<span class="text-gray-700 dark:text-gray-400">Сайт</span>	77	<span class="text-gray-700 dark:text-gray-400">Сайт</span>
348	<input name="site" id="site"	78	<input name="site" id="site"
349	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	79	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
350	placeholder="Сайт" value="{{ old('site') ?? $config->site ?? '' }}"	80	placeholder="Сайт" value="{{ old('site') ?? $config->site ?? '' }}"
351	/>	81	/>
352	@error('site')	82	@error('site')
353	<span class="text-xs text-red-600 dark:text-red-400">	83	<span class="text-xs text-red-600 dark:text-red-400">
354	{{ $message }}	84	{{ $message }}
355	</span>	85	</span>
356	@enderror	86	@enderror
357	</label><br>	87	</label><br>
358		88
359	<label class="block text-sm">	89	<label class="block text-sm">
360	<span class="text-gray-700 dark:text-gray-400">Телеграм</span>	90	<span class="text-gray-700 dark:text-gray-400">Телеграм</span>
361	<input name="telegram" id="telegram"	91	<input name="telegram" id="telegram"
362	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	92	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
363	placeholder="Телеграм линк" value="{{ old('telegram') ?? $config->telegram ?? '' }}"	93	placeholder="Телеграм линк" value="{{ old('telegram') ?? $config->telegram ?? '' }}"
364	/>	94	/>
365	@error('telegram')	95	@error('telegram')
366	<span class="text-xs text-red-600 dark:text-red-400">	96	<span class="text-xs text-red-600 dark:text-red-400">
367	{{ $message }}	97	{{ $message }}
368	</span>	98	</span>
369	@enderror	99	@enderror
370	</label><br>	100	</label><br>
371		101
372	<label class="block text-sm">	102	<label class="block text-sm">
373	<span class="text-gray-700 dark:text-gray-400">Вконтакте</span>	103	<span class="text-gray-700 dark:text-gray-400">Вконтакте</span>
374	<input name="vkontact" id="vkontact"	104	<input name="vkontact" id="vkontact"
375	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	105	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
376	placeholder="Вконтакте линк" value="{{ old('vkontact') ?? $config->vkontact ?? '' }}"	106	placeholder="Вконтакте линк" value="{{ old('vkontact') ?? $config->vkontact ?? '' }}"
377	/>	107	/>
378	@error('vkontact')	108	@error('vkontact')
379	<span class="text-xs text-red-600 dark:text-red-400">	109	<span class="text-xs text-red-600 dark:text-red-400">
380	{{ $message }}	110	{{ $message }}
381	</span>	111	</span>
382	@enderror	112	@enderror
383	</label><br>	113	</label><br>
384		114
385	<label class="block text-sm">	115	<label class="block text-sm">
386	<span class="text-gray-700 dark:text-gray-400">Лого</span>	116	<span class="text-gray-700 dark:text-gray-400">Лого</span>
387	<input name="logo" id="logo" type="file"	117	<input name="logo" id="logo" type="file"
388	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	118	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
389	placeholder="Лого" value="{{ old('logo') ?? $config->logo ?? '' }}"	119	placeholder="Лого" value="{{ old('logo') ?? $config->logo ?? '' }}"
390	/>	120	/>
391		121
392	@if (isset($config->logo))	122	@if (isset($config->logo))
393	<img src="<?=asset(Storage::url($config->logo))?>" width="150"/>	123	<img src="<?=asset(Storage::url($config->logo))?>" width="150"/>
394	@endif	124	@endif
395		125
396	@error('logo')	126	@error('logo')
397	<span class="text-xs text-red-600 dark:text-red-400">	127	<span class="text-xs text-red-600 dark:text-red-400">
398	{{ $message }}	128	{{ $message }}
399	</span>	129	</span>
400	@enderror	130	@enderror
401	</label><br>	131	</label><br>
402		132
403	<label class="block text-sm">	133	<label class="block text-sm">
404	<span class="text-gray-700 dark:text-gray-400">Картинка</span>	134	<span class="text-gray-700 dark:text-gray-400">Картинка</span>
405	<input name="image" id="image" type="file"	135	<input name="image" id="image" type="file"
406	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	136	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
407	placeholder="Картинка"	137	placeholder="Картинка"
408	/>	138	/>
409		139
410	@if (isset($config->image))	140	@if (isset($config->image))
411	<img src="<?=asset(Storage::url($config->image))?>" width="150"/>	141	<img src="<?=asset(Storage::url($config->image))?>" width="150"/>
412	@endif	142	@endif
413		143
414		144
415	@error('image')	145	@error('image')
416	<span class="text-xs text-red-600 dark:text-red-400">	146	<span class="text-xs text-red-600 dark:text-red-400">
417	{{ $message }}	147	{{ $message }}
418	</span>	148	</span>
419	@enderror	149	@enderror
420	</label><br>	150	</label><br>
421		151
422	<label class="block text-sm">	152	<label class="block text-sm">
423	<span class="text-gray-700 dark:text-gray-400">Карта</span>	153	<span class="text-gray-700 dark:text-gray-400">Карта</span>
424	<input name="map" id="map"	154	<input name="map" id="map"
425	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"	155	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
426	placeholder="Карта" value="{{ old('map') ?? $config->map ?? '' }}"	156	placeholder="Карта" value="{{ old('map') ?? $config->map ?? '' }}"
427	/>	157	/>
428	@error('map')	158	@error('map')
429	<span class="text-xs text-red-600 dark:text-red-400">	159	<span class="text-xs text-red-600 dark:text-red-400">
430	{{ $message }}	160	{{ $message }}
431	</span>	161	</span>
432	@enderror	162	@enderror
433	</label><br>	163	</label><br>
434		164
435	<label class="block text-sm">	165	<label class="block text-sm">
436	<span class="text-gray-700 dark:text-gray-400">Описание</span>	166	<span class="text-gray-700 dark:text-gray-400">Описание</span>
437	<textarea id="text" name="text"	167	<textarea id="text" name="text"
438	class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-textarea focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"	168	class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-textarea focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
439	rows="3"	169	rows="3"
440	placeholder="Описание"	170	placeholder="Описание"
441	>{{ old('text') ?? $config->text ?? '' }}</textarea>	171	>{{ old('text') ?? $config->text ?? '' }}</textarea>
442		172
443	@error('text')	173	@error('text')
444	<span class="text-xs text-red-600 dark:text-red-400">	174	<span class="text-xs text-red-600 dark:text-red-400">
445	{{ $message }}	175	{{ $message }}
446	</span>	176	</span>
447	@enderror	177	@enderror
448	</label><br>	178	</label><br>
449		179
450	<div class="flex flex-col flex-wrap mb-4 space-y-4 md:flex-row md:items-end md:space-x-4">	180	<div class="flex flex-col flex-wrap mb-4 space-y-4 md:flex-row md:items-end md:space-x-4">
451	<div>	181	<div>
452	<button class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">	182	<button class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
453	Сохранить	183	Сохранить
454	</button>	184	</button>
455	</div>	185	</div>
456	</div>	186	</div>
457	</div>	187	</div>
458	</form>	188	</form>
459	>>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
460	@endsection	189	@endsection
461		190

resources/views/admin/employer/index.blade.php

Diff comments View file @ 02091c2

 @extends('layout.admin', ['title' => 'Админка - Работодатели'])
 @section('script')
     <script>
         $(document).ready(function() {
             $(document).on('click', '.checkban', function () {
                 var this_ = $(this);
                 var value = this_.val();
                 var ajax_block = $('#ajax_block');
                 var bool = 0;
                 if(this.checked){
                     bool = 1;
                 } else {
                     bool = 0;
                 }
                 $.ajax({
                     type: "GET",
                     url: "{{ url()->full()}}",
                     data: "id=" + value + "&is_ban=" + bool,
                     success: function (data) {
                         console.log('Обновление таблицы пользователей ');
                         //data = JSON.parse(data);
-<<<<<<< HEAD
-                        console.log(data);
-=======
                         //console.log(data);
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         ajax_block.html(data);
                     },
                     headers: {
                         'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
                     },
                     error: function (data) {
                         console.log('Error: ' + data);
                     }
                 });
             });
         });
     </script>
 @endsection
-<<<<<<< HEAD
-=======
 @section('search')
     <div class="absolute inset-y-0 flex items-center pl-2">
         <svg
             class="w-4 h-4"
             aria-hidden="true"
             fill="currentColor"
             viewBox="0 0 20 20"
         >
             <path
                 fill-rule="evenodd"
                 d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z"
                 clip-rule="evenodd"
             ></path>
         </svg>
     </div>
     <form action="" method="POST">
         <div style="float:left;"><input
                 class="w-full pl-8 pr-2 text-sm text-gray-700 placeholder-gray-600 bg-gray-100 border-0 rounded-md dark:placeholder-gray-500 dark:focus:shadow-outline-gray dark:focus:placeholder-gray-600 dark:bg-gray-700 dark:text-gray-200 focus:placeholder-gray-500 focus:bg-white focus:border-purple-300 focus:outline-none focus:shadow-outline-purple form-input"
                 style="width: 400px"
                 type="text"
                 placeholder="Искать..."
                 aria-label="Search"
             /></div>
         <div style="float: left">
             <button type="submit" class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">Искать</button>
         </div>
     </form>
 @endsection
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 @section('content')
     <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
         <div class="w-full overflow-x-auto">
             <table class="w-full whitespace-no-wrap">
                 <thead>
                 <tr
                     class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
                 >
                     <th class="px-4 py-3">№</th>
                     <th class="px-4 py-3">Название компании</th>
                     <th class="px-4 py-3">Email/Телефон</th>
                     <th class="px-4 py-3">Имя</th>
                     <th class="px-4 py-3">Дата регистрации</th>
                     <th class="px-4 py-3">Изменить</th>
-<<<<<<< HEAD
-                    <th class="px-4 py-3">Блокировать</th>
-=======
                     <th class="px-4 py-3">Бан</th>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
                 @foreach($users as $user)
                     <tr class="text-gray-700 dark:text-gray-400">
                         <td class="px-4 py-3">
                             {{$user->id}}
                         </td>
                         <td class="px-4 py-3">
                             {{$user->name}}
                         </td>
                         <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <!--<div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>-->
                             <div>
                                 <p class="font-semibold">{{ empty($user->employers->email) ? $user->email : $user->employers->email }}</p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     {{ empty($user->employers->telephone) ? $user->telephone : $user->employers->telephone }}
                                 </p>
                             </div>
                         </div>
                         </td>
                         <td class="px-4 py-3 text-sm">
                             {{ $user->name_man }}
                         </td>
                         <td class="px-4 py-3 text-sm">
                             {{ $user->created_at }}
                         </td>
                         <td class="px-4 py-3 text-sm">
-<<<<<<< HEAD
-                            <a href="">Изменить</a>
-                        </td>
-                        <td class="px-4 py-3 text-sm">
-                            <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
-=======
                             @if ($user->id > 1)
                                 <a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>
                             @endif
                         </td>
                         <td class="px-4 py-3 text-sm">
                             @if ($user->id > 1)
                             <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                             @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         </td>
                     </tr>
                 @endforeach
                 </tbody>
             </table>
         </div>
         <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
             <?=$users->appends($_GET)->links('admin.pagginate'); ?>
         </div>
     </div>
 @endsection

resources/views/admin/employer/index_ajax.blade.php

Diff comments View file @ 02091c2

 <div class="w-full overflow-x-auto">
             <table class="w-full whitespace-no-wrap">
                 <thead>
                 <tr
                     class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
                 >
                     <th class="px-4 py-3">№</th>
                     <th class="px-4 py-3">Название компании</th>
                     <th class="px-4 py-3">Email/Телефон</th>
                     <th class="px-4 py-3">Имя</th>
                     <th class="px-4 py-3">Дата регистрации</th>
                     <th class="px-4 py-3">Изменить</th>
-<<<<<<< HEAD
-                    <th class="px-4 py-3">Блокировать</th>
-=======
                     <th class="px-4 py-3">Бан</th>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
                 @foreach($users as $user)
                     <tr class="text-gray-700 dark:text-gray-400">
                         <td class="px-4 py-3">
                             {{$user->id}}
                         </td>
                         <td class="px-4 py-3">
                             {{$user->name}}
                         </td>
                         <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <!--<div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>-->
                             <div>
                                 <p class="font-semibold">{{ empty($user->employers->email) ? $user->email : $user->employers->email }}</p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     {{ empty($user->employers->telephone) ? $user->telephone : $user->employers->telephone }}
                                 </p>
                             </div>
                         </div>
                         </td>
                         <td class="px-4 py-3 text-sm">
                             {{ $user->name_man }}
                         </td>
                         <td class="px-4 py-3 text-sm">
                             {{ $user->created_at }}
                         </td>
                         <td class="px-4 py-3 text-sm">
-<<<<<<< HEAD
-                            <a href="">Изменить</a>
-                        </td>
-                        <td class="px-4 py-3 text-sm">
-                            <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
-=======
                             @if ($user->id > 1)
                                 <a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>
                             @endif
                         </td>
                         <td class="px-4 py-3 text-sm">
                             @if ($user->id > 1)
                                 <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                             @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         </td>
                     </tr>
                 @endforeach
                 </tbody>
             </table>
         </div>
         <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
             <?//=$users->appends($_GET)->links('admin.pagginate'); ?>
             <?=$users->links('admin.pagginate'); ?>
         </div>

resources/views/admin/index.blade.php

Diff comments View file @ 02091c2

 @extends('layout.admin', ['title' => 'Админка - Главная страница'])
 @section('content')
     <div class="grid gap-6 mb-8 md:grid-cols-2 xl:grid-cols-4">
         <div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
             <div class="p-3 mr-4 text-orange-500 bg-orange-100 rounded-full dark:text-orange-100 dark:bg-orange-500">
                 <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                     <path
                         d="M13 6a3 3 0 11-6 0 3 3 0 016 0zM18 8a2 2 0 11-4 0 2 2 0 014 0zM14 15a4 4 0 00-8 0v3h8v-3zM6 8a2 2 0 11-4 0 2 2 0 014 0zM16 18v-3a5.972 5.972 0 00-.75-2.906A3.005 3.005 0 0119 15v3h-3zM4.75 12.094A5.973 5.973 0 004 15v3H1v-3a3 3 0 013.75-2.906z"></path>
                 </svg>
             </div>
             <div>
                 <p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
                     Всего пользователей
                 </p>
                 <p class="text-lg font-semibold text-gray-700 dark:text-gray-200">
                     {{ $all_user }}
                 </p>
             </div>
         </div>
         <div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
             <div class="p-3 mr-4 text-green-500 bg-green-100 rounded-full dark:text-green-100 dark:bg-green-500">
                 <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                     <path
                         fill-rule="evenodd"
                         d="M4 4a2 2 0 00-2 2v4a2 2 0 002 2V6h10a2 2 0 00-2-2H4zm2 6a2 2 0 012-2h8a2 2 0 012 2v4a2 2 0 01-2 2H8a2 2 0 01-2-2v-4zm6 4a2 2 0 100-4 2 2 0 000 4z"
                         clip-rule="evenodd"
                     ></path>
                 </svg>
             </div>
             <div>
                 <p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
                     Работодателей
                 </p>
                 <p class="text-lg font-semibold text-gray-700 dark:text-gray-200">
                     {{ $all_employer }}
                 </p>
             </div>
         </div>
         <div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
             <div class="p-3 mr-4 text-blue-500 bg-blue-100 rounded-full dark:text-blue-100 dark:bg-blue-500">
                 <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                     <path d="M3 1a1 1 0 000 2h1.22l.305 1.222a.997.997 0 00.01.042l1.358 5.43-.893.892C3.74 11.846 4.632 14 6.414 14H15a1 1 0 000-2H6.414l1-1H14a1 1 0 00.894-.553l3-6A1 1 0 0017 3H6.28l-.31-1.243A1 1 0 005 1H3zM16 16.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM6.5 18a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"></path>
                 </svg>
             </div>
             <div>
                 <p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
                     Соискателей
                 </p>
                 <p class="text-lg font-semibold text-gray-700 dark:text-gray-200">
                     {{$all_worker}}
                 </p>
             </div>
         </div>
         <div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
             <div class="p-3 mr-4 text-teal-500 bg-teal-100 rounded-full dark:text-teal-100 dark:bg-teal-500">
                 <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                     <path
                         fill-rule="evenodd"
                         d="M18 5v8a2 2 0 01-2 2h-5l-5 4v-4H4a2 2 0 01-2-2V5a2 2 0 012-2h12a2 2 0 012 2zM7 8H5v2h2V8zm2 0h2v2H9V8zm6 0h-2v2h2V8z"
                         clip-rule="evenodd"
                     ></path>
                 </svg>
             </div>
             <div>
                 <p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
                     Администраторы
                 </p>
                 <p class="text-lg font-semibold text-gray-700 dark:text-gray-200">
                     {{$all_admin}}
                 </p>
             </div>
         </div>
     </div>
     <!-- Таблицы -->
     <div class="w-full overflow-hidden rounded-lg shadow-xs">
         <div class="w-full overflow-x-auto">
             <table class="w-full whitespace-no-wrap">
                 <thead>
                 <tr
                     class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
                 >
                     <th class="px-4 py-3">Название</th>
                     <th class="px-4 py-3">Таблица</th>
                     <th class="px-4 py-3">Редактирование</th>
                     <th class="px-4 py-3">Дата</th>
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>
                             <div>
                                 <p class="font-semibold"><a href="{{ route('admin.users') }}">Пользователи</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Все пользователи сайта
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         users
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                         <!--<span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
                           Недоступно
                         </span>-->
                     </td>
                     <td class="px-4 py-3 text-sm">
                         май 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
                                 <p class="font-semibold"><a href="{{ route('admin.employers') }}">Работодатели</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Все работодатели сайта
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         employers
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         май 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
                                 <p class="font-semibold"><a href="{{ route('admin.workers') }}">Соискатели</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Все работники сайта
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         workers
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         май 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
                                 <p class="font-semibold"><a href="{{ route('admin.ad-employers') }}">Вакансии</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Все вакансии сайта
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         ad_employers
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         май 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
-<<<<<<< HEAD
-                                <p class="font-semibold"><a href="{{ route('admin.categories') }}">Категории</a></p>
-=======
                                 <p class="font-semibold"><a href="{{ route('admin.categories.index') }}">Категории</a></p>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Справочник категории (по умолчанию: река, море, река-море)
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         category
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         май 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
-<<<<<<< HEAD
-                                <p class="font-semibold"><a href="{{ route('admin.job-titles') }}">Должности</a></p>
-                                <p class="text-xs text-gray-600 dark:text-gray-400">
-                                    Все должности
-=======
                                 <p class="font-semibold"><a href="{{ route('admin.job-titles.index') }}">Должности</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Справочник должности (все должности проекта)
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         job_titles
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         май 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
-<<<<<<< HEAD
-=======
                                 <p class="font-semibold"><a href="{{ route('admin.infobloks.index') }}">Документы-Дипломы</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Справочник документы-дипломы (все блоки-документы необходимые соискателю)
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         infobloks
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         сентябрь 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                                 <p class="font-semibold"><a href="{{ route('admin.messages') }}">Сообщения</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Все сообщения сайта
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         messages
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
                           Недоступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         май 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
                                 <p class="font-semibold"><a href="{{ route('admin.groups') }}">Группы пользователей</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Группировка людей в именованные группы
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         group_users
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         май 2023
                     </td>
                 </tr>
-<<<<<<< HEAD
-=======
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
                                 <p class="font-semibold"><a href="{{ route('admin.roles') }}">Роли пользователей</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Роли людей (запреты и доступы) в системе
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         users
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         сентябрь 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
                                 <p class="font-semibold"><a href="{{ route('admin.statics') }}">Статистика</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Статистика соискателей и работодателей
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         static_workers, static_ads
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
                           Недоступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         сентябрь 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
                                 <p class="font-semibold"><a href="{{ route('admin.editor-site') }}">Редактор сайта</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Все редакторы системы
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         header_footer, job_titles_mains, employers_mains,<br> pages, seo, reclames, companies
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         сентябрь 2023
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
                                 <p class="font-semibold"><a href="{{ route('admin.answers') }}">Модерация</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Модерация отзывов о работодателе
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         answers
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           Доступно
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         сентябрь 2023
                     </td>
                 </tr>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 <!--<tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div
                                 class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                             >
                                 <img
                                     class="object-cover w-full h-full rounded-full"
                                     src="https://images.unsplash.com/photo-1551069613-1904dbdcda11?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                     alt=""
                                     loading="lazy"
                                 />
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>
                             <div>
                                 <p class="font-semibold">Sarah Curry</p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Designer
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         $ 86.00
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-red-700 bg-red-100 rounded-full dark:text-red-100 dark:bg-red-700"
                         >
                           Denied
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         6/10/2020
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div
                                 class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                             >
                                 <img
                                     class="object-cover w-full h-full rounded-full"
                                     src="https://images.unsplash.com/photo-1551006917-3b4c078c47c9?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                     alt=""
                                     loading="lazy"
                                 />
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>
                             <div>
                                 <p class="font-semibold">Rulia Joberts</p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Actress
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         $ 1276.45
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         6/10/2020
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div
                                 class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                             >
                                 <img
                                     class="object-cover w-full h-full rounded-full"
                                     src="https://images.unsplash.com/photo-1546456073-6712f79251bb?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                     alt=""
                                     loading="lazy"
                                 />
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>
                             <div>
                                 <p class="font-semibold">Wenzel Dashington</p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Actor
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         $ 863.45
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-gray-700 bg-gray-100 rounded-full dark:text-gray-100 dark:bg-gray-700"
                         >
                           Expired
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         6/10/2020
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div
                                 class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                             >
                                 <img
                                     class="object-cover w-full h-full rounded-full"
                                     src="https://images.unsplash.com/photo-1502720705749-871143f0e671?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&s=b8377ca9f985d80264279f277f3a67f5"
                                     alt=""
                                     loading="lazy"
                                 />
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>
                             <div>
                                 <p class="font-semibold">Dave Li</p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Influencer
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         $ 863.45
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         6/10/2020
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div
                                 class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                             >
                                 <img
                                     class="object-cover w-full h-full rounded-full"
                                     src="https://images.unsplash.com/photo-1531746020798-e6953c6e8e04?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                     alt=""
                                     loading="lazy"
                                 />
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>
                             <div>
                                 <p class="font-semibold">Maria Ramovic</p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Runner
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         $ 863.45
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         6/10/2020
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div
                                 class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                             >
                                 <img
                                     class="object-cover w-full h-full rounded-full"
                                     src="https://images.unsplash.com/photo-1566411520896-01e7ca4726af?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                     alt=""
                                     loading="lazy"
                                 />
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>
                             <div>
                                 <p class="font-semibold">Hitney Wouston</p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Singer
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         $ 863.45
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         6/10/2020
                     </td>
                 </tr>
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
                             <div
                                 class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                             >
                                 <img
                                     class="object-cover w-full h-full rounded-full"
                                     src="https://images.unsplash.com/flagged/photo-1570612861542-284f4c12e75f?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                     alt=""
                                     loading="lazy"
                                 />
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>
                             <div>
                                 <p class="font-semibold">Hans Burger</p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     10x Developer
                                 </p>
                             </div>
                         </div>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         $ 863.45
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                     </td>
                     <td class="px-4 py-3 text-sm">
                         6/10/2020
                     </td>
                 </tr>-->
                 </tbody>
             </table>
         </div>
     </div>
     <!-- Charts -->
     <!--<h2 class="my-6 text-2xl font-semibold text-gray-700 dark:text-gray-200">
         Графики
     </h2>
     <div class="grid gap-6 mb-8 md:grid-cols-2">
         <div
             class="min-w-0 p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800"
         >
             <h4 class="mb-4 font-semibold text-gray-800 dark:text-gray-300">
                 Revenue
             </h4>
             <canvas id="pie"></canvas>
             <div
                 class="flex justify-center mt-4 space-x-3 text-sm text-gray-600 dark:text-gray-400"
             >
                 <div class="flex items-center">
         <span
             class="inline-block w-3 h-3 mr-1 bg-blue-500 rounded-full"
         ></span>
                     <span>Shirts</span>
                 </div>
                 <div class="flex items-center">
         <span
             class="inline-block w-3 h-3 mr-1 bg-teal-600 rounded-full"
         ></span>
                     <span>Shoes</span>
                 </div>
                 <div class="flex items-center">
         <span
             class="inline-block w-3 h-3 mr-1 bg-purple-600 rounded-full"
         ></span>
                     <span>Bags</span>
                 </div>
             </div>
         </div>
         <div
             class="min-w-0 p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800"
         >
             <h4 class="mb-4 font-semibold text-gray-800 dark:text-gray-300">
                 Посещаемость сайта
             </h4>
             <canvas id="line"></canvas>
             <div
                 class="flex justify-center mt-4 space-x-3 text-sm text-gray-600 dark:text-gray-400"
             >
                 <div class="flex items-center">
         <span
             class="inline-block w-3 h-3 mr-1 bg-teal-600 rounded-full"
         ></span>
                     <span>Organic</span>
                 </div>
                 <div class="flex items-center">
         <span
             class="inline-block w-3 h-3 mr-1 bg-purple-600 rounded-full"
         ></span>
                     <span>Paid</span>
                 </div>
             </div>
         </div>
     </div>-->
 @endsection

resources/views/admin/profile.blade.php

Diff comments View file @ 02091c2

 @extends('layout.admin', ['title' => 'Админка - Профиль'])
 @section('content')
     <h4 class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300">
         Личные данные
     </h4>
-<<<<<<< HEAD
-=======
     <form method="POST" action="">
         @csrf
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     <div class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800">
         <label class="block text-sm">
             <span class="text-gray-700 dark:text-gray-400">Имя/Псевдоним/Имя компании</span>
             <input name="name" id="name"
                 class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                placeholder="Псевдоним для админки"
-=======
                 placeholder="Псевдоним для админки" value="{{ old('name') ?? $user->name ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('name')
             <span class="text-xs text-red-600 dark:text-red-400">
                   {{ $message }}
             </span>
             @enderror
         </label><br>
         <label class="block text-sm">
             <span class="text-gray-700 dark:text-gray-400">Email</span>
             <input name="email" id="email"
                    class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                   placeholder="Почта"
-=======
                    placeholder="Почта" value="{{ old('email') ?? $user->email ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('email')
             <span class="text-xs text-red-600 dark:text-red-400">
                   {{ $message }}
             </span>
             @enderror
         </label><br>
         <label class="block text-sm">
             <span class="text-gray-700 dark:text-gray-400">Телефон</span>
             <input name="telephone" id="telephone"
                    class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                   placeholder="Телефон"
-=======
                    placeholder="Телефон" value="{{ old('telephone') ?? $user->telephone ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('telephone')
             <span class="text-xs text-red-600 dark:text-red-400">
                   {{ $message }}
             </span>
             @enderror
         </label><br>
         <label class="block text-sm">
             <span class="text-gray-700 dark:text-gray-400">Фамилия</span>
             <input name="surname" id="surname"
                    class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                   placeholder="Фамилия"
-=======
                    placeholder="Фамилия" value="{{ old('surname') ?? $user->surname ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('surname')
             <span class="text-xs text-red-600 dark:text-red-400">
                   {{ $message }}
             </span>
             @enderror
         </label><br>
         <label class="block text-sm">
             <span class="text-gray-700 dark:text-gray-400">Имя человека</span>
             <input name="name_man" id="name_man"
                    class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                   placeholder="Имя человека"
-=======
                    placeholder="Имя человека" value="{{ old('name_man') ?? $user->name_man ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('name_man')
             <span class="text-xs text-red-600 dark:text-red-400">
                   {{ $message }}
             </span>
             @enderror
         </label><br>
         <label class="block text-sm">
             <span class="text-gray-700 dark:text-gray-400">Отчество</span>
             <input name="surname2" id="surname2"
                    class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                   placeholder="Отчество"
-=======
                    placeholder="Отчество" value="{{ old('surname2') ?? $user->surname2 ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('surname2')
             <span class="text-xs text-red-600 dark:text-red-400">
                   {{ $message }}
             </span>
             @enderror
         </label><br>
         <div class="mt-4 text-sm">
                 <span class="text-gray-700 dark:text-gray-400">
                   Тип пользователя
                 </span>
             <div class="mt-2">
                 <label class="inline-flex items-center text-gray-600 dark:text-gray-400">
                     <input
                         type="radio"
                         class="text-purple-600 form-radio focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
                         name="is_worker"
                         value="1"
-<<<<<<< HEAD
-=======
                         <? if ($user->is_worker == 1) echo "checked"; ?>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     />
                     <span class="ml-2">Работник</span>
                 </label>
                 <label class="inline-flex items-center ml-6 text-gray-600 dark:text-gray-400">
                     <input
                         type="radio"
                         class="text-purple-600 form-radio focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
                         name="is_worker"
-<<<<<<< HEAD
-                        value="0" checked
-=======
                         value="0"
                     <? if ($user->is_worker == 0) echo "checked"; ?>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     />
                     <span class="ml-2">Работодатель</span>
                 </label>
             </div>
         </div><br>
         <div class="flex flex-col flex-wrap mb-4 space-y-4 md:flex-row md:items-end md:space-x-4">
         <div>
-<<<<<<< HEAD
-            <button class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
-                Сохранить
-            </button>
-            <button class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
-                Сменить пароль
-            </button>
-        </div>
-        </div>
-=======
             <button type="submit" class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
                 Сохранить
             </button>
             <a href="{{ route('admin.password') }}" class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
                 Сменить пароль
             </a>
         </div>
         </div>
     </div>
     </form>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
         <!--
         <label class="block mt-4 text-sm">
                 <span class="text-gray-700 dark:text-gray-400">
                   Requested Limit
                 </span>
             <select
                 class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
             >
                 <option>$1,000</option>
                 <option>$5,000</option>
                 <option>$10,000</option>
                 <option>$25,000</option>
             </select>
         </label>
         <label class="block mt-4 text-sm">
                 <span class="text-gray-700 dark:text-gray-400">
                   Multiselect
                 </span>
             <select
                 class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-multiselect focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
                 multiple
             >
                 <option>Option 1</option>
                 <option>Option 2</option>
                 <option>Option 3</option>
                 <option>Option 4</option>
                 <option>Option 5</option>
             </select>
         </label>
         <label class="block mt-4 text-sm">
             <span class="text-gray-700 dark:text-gray-400">Message</span>
             <textarea
                 class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-textarea focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
                 rows="3"
                 placeholder="Enter some long form content."
             ></textarea>
         </label>
         <div class="flex mt-6 text-sm">
             <label class="flex items-center dark:text-gray-400">
                 <input
                     type="checkbox"
                     class="text-purple-600 form-checkbox focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
                 />
                 <span class="ml-2">
                     I agree to the
                     <span class="underline">privacy policy</span>
                   </span>
             </label>
         </div>
     </div>
     <!-- Validation inputs -->
     <!--<h4
         class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
     >
         Validation
     </h4>
     <div
         class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
     >
         <!-- Invalid input -->
         <!--<label class="block text-sm">
                 <span class="text-gray-700 dark:text-gray-400">
                   Invalid input
                 </span>
             <input
                 class="block w-full mt-1 text-sm border-red-600 dark:text-gray-300 dark:bg-gray-700 focus:border-red-400 focus:outline-none focus:shadow-outline-red form-input"
                 placeholder="Jane Doe"
             />
             <span class="text-xs text-red-600 dark:text-red-400">
                   Your password is too short.
                 </span>
         </label>
         <!-- Valid input -->
         <!--<label class="block mt-4 text-sm">
                 <span class="text-gray-700 dark:text-gray-400">
                   Valid input
                 </span>
             <input
                 class="block w-full mt-1 text-sm border-green-600 dark:text-gray-300 dark:bg-gray-700 focus:border-green-400 focus:outline-none focus:shadow-outline-green form-input"
                 placeholder="Jane Doe"
             />
             <span class="text-xs text-green-600 dark:text-green-400">
                   Your password is strong.
                 </span>
         </label>
         <!-- Helper text -->
         <!--<label class="block mt-4 text-sm">
                 <span class="text-gray-700 dark:text-gray-400">
                   Helper text
                 </span>
             <input
                 class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
                 placeholder="Jane Doe"
             />
             <span class="text-xs text-gray-600 dark:text-gray-400">
                   Your password must be at least 6 characters long.
                 </span>
         </label>
     </div>
     <!-- Inputs with icons -->
     <!--<h4
         class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
     >
         Icons
     </h4>
     <div
         class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
     >
         <label class="block text-sm">
             <span class="text-gray-700 dark:text-gray-400">Icon left</span>
             <!-- focus-within sets the color for the icon when input is focused -->
             <!--<div
                 class="relative text-gray-500 focus-within:text-purple-600 dark:focus-within:text-purple-400"
             >
                 <input
                     class="block w-full pl-10 mt-1 text-sm text-black dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
                     placeholder="Jane Doe"
                 />
                 <div
                     class="absolute inset-y-0 flex items-center ml-3 pointer-events-none"
                 >
                     <svg
                         class="w-5 h-5"
                         aria-hidden="true"
                         fill="none"
                         stroke-linecap="round"
                         stroke-linejoin="round"
                         stroke-width="2"
                         viewBox="0 0 24 24"
                         stroke="currentColor"
                     >
                         <path
                             d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
                         ></path>
                     </svg>
                 </div>
             </div>
         </label>
         <label class="block mt-4 text-sm">
             <span class="text-gray-700 dark:text-gray-400">Icon right</span>
             <!-- focus-within sets the color for the icon when input is focused -->
             <!--<div
                 class="relative text-gray-500 focus-within:text-purple-600 dark:focus-within:text-purple-400"
             >
                 <input
                     class="block w-full pr-10 mt-1 text-sm text-black dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
                     placeholder="Jane Doe"
                 />
                 <div
                     class="absolute inset-y-0 right-0 flex items-center mr-3 pointer-events-none"
                 >
                     <svg
                         class="w-5 h-5"
                         aria-hidden="true"
                         fill="none"
                         stroke-linecap="round"
                         stroke-linejoin="round"
                         stroke-width="2"
                         viewBox="0 0 24 24"
                         stroke="currentColor"
                     >
                         <path
                             d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
                         ></path>
                     </svg>
                 </div>
             </div>
         </label>
     </div>
     <!-- Inputs with buttons -->
     <!--<h4
         class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
     >
         Buttons
     </h4>
     <div
         class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
     >
         <label class="block text-sm">
                 <span class="text-gray-700 dark:text-gray-400">
                   Button left
                 </span>
             <div class="relative">
                 <input
                     class="block w-full pl-20 mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
                     placeholder="Jane Doe"
                 />
                 <button
                     class="absolute inset-y-0 px-4 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-l-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
                 >
                     Click
                 </button>
             </div>
         </label>
         <label class="block mt-4 text-sm">
                 <span class="text-gray-700 dark:text-gray-400">
                   Button right
                 </span>
             <div
                 class="relative text-gray-500 focus-within:text-purple-600"
             >
                 <input
                     class="block w-full pr-20 mt-1 text-sm text-black dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
                     placeholder="Jane Doe"
                 />
                 <button
                     class="absolute inset-y-0 right-0 px-4 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-r-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple"
                 >
                     Click
                 </button>
             </div>
         </label>
     </div>-->
 @endsection

resources/views/admin/users/index.blade.php

Diff comments View file @ 02091c2

-<<<<<<< HEAD
-@extends('layout.admin', ['title' => 'Админка - Пользователи системы'])
-=======
 @extends('layout.admin', ['title' => $title])
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 @section('script')
     <script>
         $(document).ready(function() {
-<<<<<<< HEAD
-            $(document).on('click', '.checkban', function () {
-                var this_ = $(this);
-                var value = this_.val();
-                var ajax_block = $('#ajax_block');
-                var bool = 0;
-=======
             $(document).on('click', '.check_click', function () {
                 var this_ = $(this);
                 var value = this_.val();
                 var field = this_.attr('data-field');
                 var ajax_block = $('#ajax_block');
                 var bool = 0;
                 var str_get = '';
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 if(this.checked){
                     bool = 1;
                 } else {
                     bool = 0;
                 }
-<<<<<<< HEAD
-=======
                 console.log(field);
                 str_get = "id=" + value + "&" + field + "=" + bool;
                 console.log(str_get);
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 $.ajax({
                     type: "GET",
                     url: "{{ url()->full()}}",
-<<<<<<< HEAD
-                    data: "id=" + value + "&is_ban=" + bool,
-                    success: function (data) {
-                        console.log('Обновление таблицы пользователей ');
-                        //data = JSON.parse(data);
-                        console.log(data);
-                        ajax_block.html(data);
-                    },
-                    headers: {
-                        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-                    },
-                    error: function (data) {
-                        console.log('Error: ' + data);
-                    }
-                });
-            });
-            $(document).on('click', '.checknew', function () {
-                var this_ = $(this);
-                var value = this_.val();
-                var ajax_block = $('#ajax_block');
-                var bool = 0;
-                if(this.checked){
-                    bool = 1;
-                } else {
-                    bool = 0;
-                }
-                $.ajax({
-                    type: "GET",
-                    url: "{{ url()->full()}}",
-                    data: "id=" + value + "&is_new=" + bool,
-                    success: function (data) {
-                        console.log('Обновление таблицы пользователей ');
-                        //data = JSON.parse(data);
-                        console.log(data);
-=======
                     data: str_get,
                     success: function (data) {
                         console.log('Обновление таблицы пользователей ');
                         //data = JSON.parse(data);
                         //console.log(data);
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         ajax_block.html(data);
                     },
                     headers: {
                         'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
                     },
                     error: function (data) {
                         console.log('Error: ' + data);
                     }
                 });
             });
         });
     </script>
 @endsection
-<<<<<<< HEAD
-=======
 @section('search')
     <div class="absolute inset-y-0 flex items-center pl-2">
         <svg
             class="w-4 h-4"
             aria-hidden="true"
             fill="currentColor"
             viewBox="0 0 20 20"
         >
             <path
                 fill-rule="evenodd"
                 d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z"
                 clip-rule="evenodd"
             ></path>
         </svg>
     </div>
     <form action="" method="POST">
         <div style="float:left;"><input
                 class="w-full pl-8 pr-2 text-sm text-gray-700 placeholder-gray-600 bg-gray-100 border-0 rounded-md dark:placeholder-gray-500 dark:focus:shadow-outline-gray dark:focus:placeholder-gray-600 dark:bg-gray-700 dark:text-gray-200 focus:placeholder-gray-500 focus:bg-white focus:border-purple-300 focus:outline-none focus:shadow-outline-purple form-input"
                 style="width: 400px"
                 type="text"
                 placeholder="Искать..."
                 aria-label="Search"
             /></div>
         <div style="float: left">
             <button type="submit" class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">Искать</button>
         </div>
     </form>
 @endsection
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 @section('content')
     <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
         <div class="w-full overflow-x-auto">
             <table class="w-full whitespace-no-wrap">
                 <thead>
                 <tr
                     class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
                 >
                     <th class="px-4 py-3">№</th>
                     <th class="px-4 py-3">Имя</th>
                     <th class="px-4 py-3">Email/логин</th>
                     <th class="px-4 py-3">Работодатель/работник/администратор</th>
-<<<<<<< HEAD
-                    <th class="px-4 py-3">Заблокированный</th>
-                    <th class="px-4 py-3">Новый</th>
-=======
                     <th class="px-4 py-3">Бан</th>
                     <th class="px-4 py-3">Новый</th>
                     @if ($id_admin == 1)
                     <th class="px-4 py-3">Админ</th>
                     @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     <th class="px-4 py-3">Дата регистрации</th>
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
                 @foreach($users as $user)
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                        {{$user->id}}
                     </td>
                     <td class="px-4 py-3">
                         <!--<div class="flex items-center text-sm">
                             <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>
                             <div>
                                 <p class="font-semibold"><a href="{{ route('admin.users') }}">Пользователи</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Все пользователи сайта
                                 </p>
                             </div>
                         </div>
                         -->
                         {{ $user->name }}
                     </td>
                     <td class="px-4 py-3 text-sm">
                         {{ $user->email }}
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           @if ($user->is_worker)
                               Работник
                            @else
                               Работодатель
                           @endif
                         </span>
                         @if ($user->admin)
                         <span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
                            Администратор
                         </span>
                         @endif
                     </td>
                     <td class="px-4 py-3 text-sm">
-<<<<<<< HEAD
-                        <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
-                    </td>
-                    <td class="px-4 py-3 text-sm">
-                        <input type="checkbox" class="checknew" value="{{$user->id}}" name="new_{{$user->id}}" {{ ($user->is_new) ? "checked" : "" }}/>
-                    </td>
-=======
                         @if ($user->id > 1)
                         <input type="checkbox" class="check_click" value="{{$user->id}}" data-field="is_ban" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                         @endif
                     </td>
                     <td class="px-4 py-3 text-sm">
                         <input type="checkbox" class="check_click" value="{{$user->id}}" data-field="is_new" name="new_{{$user->id}}" {{ ($user->is_new) ? "checked" : "" }}/>
                     </td>
                     @if ($id_admin == 1)
                         <td class="px-4 py-3 text-sm">
                             @if ($user->id > 1)
                                 <input type="checkbox" class="check_click" value="{{$user->id}}" data-field="admin" name="admin_{{$user->id}}" {{ ($user->admin) ? "checked" : "" }}/>
                             @endif
                         </td>
                     @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     <td class="px-4 py-3 text-sm">
                         {{ $user->created_at }}
                     </td>
                 </tr>
                 @endforeach
                 </tbody>
             </table>
         </div>
         <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
         <?//=$users->appends($_GET)->links('admin.pagginate'); ?>
         <?=$users->links('admin.pagginate'); ?>
         </div>
         <!--<div
             class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800"
         >
                 <span class="flex items-center col-span-3">
                   Showing 21-30 of 100
                 </span>
             <span class="col-span-2"></span>
             <span class="flex col-span-4 mt-2 sm:mt-auto sm:justify-end">
                   <nav aria-label="Table navigation">
                     <ul class="inline-flex items-center">
                       <li>
                         <button
                             class="px-3 py-1 rounded-md rounded-l-lg focus:outline-none focus:shadow-outline-purple"
                             aria-label="Previous"
                         >
                           <svg
                               aria-hidden="true"
                               class="w-4 h-4 fill-current"
                               viewBox="0 0 20 20"
                           >
                             <path
                                 d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
                                 clip-rule="evenodd"
                                 fill-rule="evenodd"
                             ></path>
                           </svg>
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           1
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           2
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 text-white transition-colors duration-150 bg-purple-600 border border-r-0 border-purple-600 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           3
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           4
                         </button>
                       </li>
                       <li>
                         <span class="px-3 py-1">...</span>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           8
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           9
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md rounded-r-lg focus:outline-none focus:shadow-outline-purple"
                             aria-label="Next"
                         >
                           <svg
                               class="w-4 h-4 fill-current"
                               aria-hidden="true"
                               viewBox="0 0 20 20"
                           >
                             <path
                                 d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
                                 clip-rule="evenodd"
                                 fill-rule="evenodd"
                             ></path>
                           </svg>
                         </button>
                       </li>
                     </ul>
                   </nav>
                 </span>
         </div>-->
     </div>
     <?//=$users->appends($_GET)->links('catalogs.paginate'); ?>
 @endsection

resources/views/admin/users/index_ajax.blade.php

Diff comments View file @ 02091c2

         <div class="w-full overflow-x-auto">
             <table class="w-full whitespace-no-wrap">
                 <thead>
                 <tr
                     class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
                 >
                     <th class="px-4 py-3">№</th>
                     <th class="px-4 py-3">Имя</th>
                     <th class="px-4 py-3">Email/логин</th>
                     <th class="px-4 py-3">Работодатель/работник/администратор</th>
-<<<<<<< HEAD
-                    <th class="px-4 py-3">Заблокированный</th>
-                    <th class="px-4 py-3">Новый</th>
-=======
                     <th class="px-4 py-3">Бан</th>
                     <th class="px-4 py-3">Новый</th>
                     @if ($id_admin == 1)
                         <th class="px-4 py-3">Админ</th>
                     @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     <th class="px-4 py-3">Дата регистрации</th>
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
                 @foreach($users as $user)
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                        {{$user->id}}
                     </td>
                     <td class="px-4 py-3">
                         {{ $user->name }}
                     </td>
                     <td class="px-4 py-3 text-sm">
                         {{ $user->email }}
                     </td>
                     <td class="px-4 py-3 text-xs">
                         <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                           @if ($user->is_worker)
                               Работник
                            @else
                               Работодатель
                           @endif
                         </span>
                         @if ($user->admin)
                         <span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
                            Администратор
                         </span>
                         @endif
                     </td>
                     <td class="px-4 py-3 text-sm">
-<<<<<<< HEAD
-                        <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
-                    </td>
-                    <td class="px-4 py-3 text-sm">
-                        <input type="checkbox" class="checknew" value="{{$user->id}}" name="new_{{$user->id}}" {{ ($user->is_new) ? "checked" : "" }}/>
-                    </td>
-=======
                        @if ($user->id > 1)
                         <input type="checkbox" class="check_click" value="{{$user->id}}" data-field="is_ban" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                        @endif
                     </td>
                     <td class="px-4 py-3 text-sm">
                         <input type="checkbox" class="check_click" value="{{$user->id}}" data-field="is_new" name="new_{{$user->id}}" {{ ($user->is_new) ? "checked" : "" }}/>
                     </td>
                     @if ($id_admin == 1)
                         <td class="px-4 py-3 text-sm">
                             @if ($user->id > 1)
                                 <input type="checkbox" class="check_click" value="{{$user->id}}" data-field="admin" name="admin_{{$user->id}}" {{ ($user->admin) ? "checked" : "" }}/>
                             @endif
                         </td>
                     @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     <td class="px-4 py-3 text-sm">
                         {{ $user->created_at }}
                     </td>
                 </tr>
                 @endforeach
                 </tbody>
             </table>
         </div>
         <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
         <?//=$users->appends($_GET)->links('admin.pagginate'); ?>
         <?=$users->links('admin.pagginate'); ?>
         </div>

resources/views/admin/worker/index.blade.php

Diff comments View file @ 02091c2

 @extends('layout.admin', ['title' => 'Админка - Работники'])
 @section('script')
     <script>
         $(document).ready(function() {
             $(document).on('click', '.checkban', function () {
                 var this_ = $(this);
                 var value = this_.val();
                 var ajax_block = $('#ajax_block');
                 var bool = 0;
                 if(this.checked){
                     bool = 1;
                 } else {
                     bool = 0;
                 }
                 $.ajax({
                     type: "GET",
                     url: "{{ url()->full()}}",
                     data: "id=" + value + "&is_ban=" + bool,
                     success: function (data) {
-<<<<<<< HEAD
-                        console.log('Обновление таблицы пользователей ');
-=======
                         console.log('Обновление таблицы работников ');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         //data = JSON.parse(data);
                         console.log(data);
                         ajax_block.html(data);
                     },
                     headers: {
                         'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
                     },
                     error: function (data) {
                         console.log('Error: ' + data);
                     }
                 });
             });
         });
     </script>
 @endsection
-<<<<<<< HEAD
-@section('content')
-    <div class="w-full overflow-hidden rounded-lg shadow-xs">
-=======
 @section('search')
     <div class="absolute inset-y-0 flex items-center pl-2">
         <svg
             class="w-4 h-4"
             aria-hidden="true"
             fill="currentColor"
             viewBox="0 0 20 20"
         >
             <path
                 fill-rule="evenodd"
                 d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z"
                 clip-rule="evenodd"
             ></path>
         </svg>
     </div>
     <form action="" method="POST">
         <div style="float:left;"><input
                 class="w-full pl-8 pr-2 text-sm text-gray-700 placeholder-gray-600 bg-gray-100 border-0 rounded-md dark:placeholder-gray-500 dark:focus:shadow-outline-gray dark:focus:placeholder-gray-600 dark:bg-gray-700 dark:text-gray-200 focus:placeholder-gray-500 focus:bg-white focus:border-purple-300 focus:outline-none focus:shadow-outline-purple form-input"
                 style="width: 400px"
                 type="text"
                 placeholder="Искать..."
                 aria-label="Search"
             /></div>
         <div style="float: left">
             <button type="submit" class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">Искать</button>
         </div>
     </form>
 @endsection
 @section('content')
     <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
         <div class="w-full overflow-x-auto">
             <table class="w-full whitespace-no-wrap">
                 <thead>
                 <tr
                     class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
                 >
                     <th class="px-4 py-3">№</th>
                     <th class="px-4 py-3">Имя</th>
                     <th class="px-4 py-3">Email/Телефон</th>
                     <th class="px-4 py-3">% заполнения анкеты</th>
                     <th class="px-4 py-3">Дата регистрации</th>
                     <th class="px-4 py-3">Изменить</th>
-<<<<<<< HEAD
-                    <th class="px-4 py-3">Блокировать</th>
-=======
                     <th class="px-4 py-3">Бан</th>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
                 @foreach($users as $user)
                     <tr class="text-gray-700 dark:text-gray-400">
                         <td class="px-4 py-3">
                             {{$user->id}}
                         </td>
                         <td class="px-4 py-3">
                             {{ !empty($user->name_man) ? $user->name_man : $user->name }}
                         </td>
                         <td class="px-4 py-3 text-sm">
                             <div class="flex items-center text-sm">
                                 <div>
                                     <p class="font-semibold">{{ empty($user->workers->email) ? $user->email : $user->workers->email }}</p>
                                     <p class="text-xs text-gray-600 dark:text-gray-400">
                                         {{ empty($user->workers->telephone) ? $user->telephone : $user->workers->telephone }}
                                     </p>
                                 </div>
                             </div>
                         </td>
                         <td class="px-4 py-3 text-xs">
                             @if (!empty($user->workers->persent_anketa))
                                 @if ($user->workers->persent_anketa > 40)
                                     <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                                     {{$user->workers->persent_anketa}}%
                                     </span>
                                 @else
                                     <span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
                                     {{$user->workers->persent_anketa}}%
                                 </span>
                                 @endif
                             @else
                                 <span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
                                 10%
                                 </span>
                             @endif
                         </td>
                         <td class="px-4 py-3 text-sm">
                             {{ $user->created_at }}
                         </td>
                         <td class="px-4 py-3 text-sm">
-<<<<<<< HEAD
-                            <a href="">Изменить</a>
-                        </td>
-                        <td class="px-4 py-3 text-sm">
-                            <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
-=======
                             @if ($user->id > 1)
                                 <a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>
                             @endif
                         </td>
                         <td class="px-4 py-3 text-sm">
                             @if ($user->id > 1)
                                 <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                             @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         </td>
                     </tr>
                 @endforeach
                 </tbody>
             </table>
         </div>
         <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
             <?=$users->appends($_GET)->links('admin.pagginate'); ?>
         </div>
         <!--<div
             class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800"
         >
                 <span class="flex items-center col-span-3">
                   Showing 21-30 of 100
                 </span>
             <span class="col-span-2"></span>
             <span class="flex col-span-4 mt-2 sm:mt-auto sm:justify-end">
                   <nav aria-label="Table navigation">
                     <ul class="inline-flex items-center">
                       <li>
                         <button
                             class="px-3 py-1 rounded-md rounded-l-lg focus:outline-none focus:shadow-outline-purple"
                             aria-label="Previous"
                         >
                           <svg
                               aria-hidden="true"
                               class="w-4 h-4 fill-current"
                               viewBox="0 0 20 20"
                           >
                             <path
                                 d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
                                 clip-rule="evenodd"
                                 fill-rule="evenodd"
                             ></path>
                           </svg>
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           1
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           2
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 text-white transition-colors duration-150 bg-purple-600 border border-r-0 border-purple-600 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           3
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           4
                         </button>
                       </li>
                       <li>
                         <span class="px-3 py-1">...</span>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           8
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           9
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md rounded-r-lg focus:outline-none focus:shadow-outline-purple"
                             aria-label="Next"
                         >
                           <svg
                               class="w-4 h-4 fill-current"
                               aria-hidden="true"
                               viewBox="0 0 20 20"
                           >
                             <path
                                 d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
                                 clip-rule="evenodd"
                                 fill-rule="evenodd"
                             ></path>
                           </svg>
                         </button>
                       </li>
                     </ul>
                   </nav>
                 </span>
         </div>-->
     </div>
     <?//=$users->appends($_GET)->links('catalogs.paginate'); ?>
 @endsection

resources/views/admin/worker/index_ajax.blade.php

Diff comments View file @ 02091c2

1	<<<<<<< HEAD
2	@extends('layout.admin', ['title' => 'Админка - Работники'])
3
4	@section('content')
5	<div class="w-full overflow-hidden rounded-lg shadow-xs">
6	<div class="w-full overflow-x-auto">
7	<table class="w-full whitespace-no-wrap">
8	<thead>
9	<tr
10	class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
11	>
12	<th class="px-4 py-3">№</th>
13	<th class="px-4 py-3">Имя</th>
14	<th class="px-4 py-3">Email/логин</th>
15	<th class="px-4 py-3">Работодатель/работник</th>
16	<th class="px-4 py-3">Дата регистрации</th>
17	</tr>
18	</thead>
19	<tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
20	@foreach($users as $user)
21	<tr class="text-gray-700 dark:text-gray-400">
22	<td class="px-4 py-3">
23	{{$user->id}}
24	</td>
25	<td class="px-4 py-3">
26	<!--<div class="flex items-center text-sm">
27	<div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
28	<div
29	class="absolute inset-0 rounded-full shadow-inner"
30	aria-hidden="true"
31	></div>
32	</div>
33	<div>
34	<p class="font-semibold"><a href="{{ route('admin.users') }}">Пользователи</a></p>
35	<p class="text-xs text-gray-600 dark:text-gray-400">
36	Все пользователи сайта
37	</p>
38	</div>
39	</div>
40	-->
41	{{ $user->name }}
42	</td>
43	<td class="px-4 py-3 text-sm">
44	{{ $user->email }}
45	</td>
46	<td class="px-4 py-3 text-xs">
47	<span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
48	@if ($user->is_worker)
49	Работник
50	@else
51	Работодатель
52	@endif
53	</span>
54	@if ($user->admin)
55	<span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
56	Администратор
57	</span>
58	@endif
59	</td>
60	<td class="px-4 py-3 text-sm">
61	{{ $user->created_at }}
62	</td>
63	</tr>
64	@endforeach
65	</tbody>
66	</table>
67	</div>
68
69	<div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
70	<?=$users->appends($_GET)->links('admin.pagginate'); ?>
71	</div>
72
73
74	<!--<div
75	class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800"
76	>
77	<span class="flex items-center col-span-3">
78	Showing 21-30 of 100
79	</span>
80	<span class="col-span-2"></span>
81
82	<span class="flex col-span-4 mt-2 sm:mt-auto sm:justify-end">
83	<nav aria-label="Table navigation">
84	<ul class="inline-flex items-center">
85	<li>
86	<button
87	class="px-3 py-1 rounded-md rounded-l-lg focus:outline-none focus:shadow-outline-purple"
88	aria-label="Previous"
89	>
90	<svg
91	aria-hidden="true"
92	class="w-4 h-4 fill-current"
93	viewBox="0 0 20 20"
94	>
95	<path
96	d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
97	clip-rule="evenodd"
98	fill-rule="evenodd"
99	></path>
100	</svg>
101	</button>
102	</li>
103	<li>
104	<button
105	class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
106	>
107	1
108	</button>
109	</li>
110	<li>
111	<button
112	class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
113	>
114	2
115	</button>
116	</li>
117	<li>
118	<button
119	class="px-3 py-1 text-white transition-colors duration-150 bg-purple-600 border border-r-0 border-purple-600 rounded-md focus:outline-none focus:shadow-outline-purple"
120	>
121	3
122	</button>
123	</li>
124	<li>
125	<button
126	class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
127	>
128	4
129	</button>
130	</li>
131	<li>
132	<span class="px-3 py-1">...</span>
133	</li>
134	<li>
135	<button
136	class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
137	>
138	8
139	</button>
140	</li>
141	<li>
142	<button
143	class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
144	>
145	9
146	</button>
147	</li>
148	<li>
149	<button
150	class="px-3 py-1 rounded-md rounded-r-lg focus:outline-none focus:shadow-outline-purple"
151	aria-label="Next"
152	>
153	<svg
154	class="w-4 h-4 fill-current"
155	aria-hidden="true"
156	viewBox="0 0 20 20"
157	>
158	<path
159	d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
160	clip-rule="evenodd"
161	fill-rule="evenodd"
162	></path>
163	</svg>
164	</button>
165	</li>
166	</ul>
167	</nav>
168	</span>
169	</div>-->
170	</div>
171
172	<?//=$users->appends($_GET)->links('catalogs.paginate'); ?>
173
174
175	@endsection
176	=======
177	<div class="w-full overflow-x-auto">	1	<div class="w-full overflow-x-auto">
178	<table class="w-full whitespace-no-wrap">	2	<table class="w-full whitespace-no-wrap">
179	<thead>	3	<thead>
180	<tr	4	<tr
181	class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"	5	class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
182	>	6	>
183	<th class="px-4 py-3">№</th>	7	<th class="px-4 py-3">№</th>
184	<th class="px-4 py-3">Имя</th>	8	<th class="px-4 py-3">Имя</th>
185	<th class="px-4 py-3">Email/Телефон</th>	9	<th class="px-4 py-3">Email/Телефон</th>
186	<th class="px-4 py-3">% заполнения анкеты</th>	10	<th class="px-4 py-3">% заполнения анкеты</th>
187	<th class="px-4 py-3">Дата регистрации</th>	11	<th class="px-4 py-3">Дата регистрации</th>
188	<th class="px-4 py-3">Изменить</th>	12	<th class="px-4 py-3">Изменить</th>
189	<th class="px-4 py-3">Бан</th>	13	<th class="px-4 py-3">Бан</th>
190	</tr>	14	</tr>
191	</thead>	15	</thead>
192	<tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">	16	<tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
193	@foreach($users as $user)	17	@foreach($users as $user)
194	<tr class="text-gray-700 dark:text-gray-400">	18	<tr class="text-gray-700 dark:text-gray-400">
195	<td class="px-4 py-3">	19	<td class="px-4 py-3">
196	{{$user->id}}	20	{{$user->id}}
197	</td>	21	</td>
198	<td class="px-4 py-3">	22	<td class="px-4 py-3">
199	{{ !empty($user->name_man) ? $user->name_man : $user->name }}	23	{{ !empty($user->name_man) ? $user->name_man : $user->name }}
200	</td>	24	</td>
201	<td class="px-4 py-3 text-sm">	25	<td class="px-4 py-3 text-sm">
202	<div class="flex items-center text-sm">	26	<div class="flex items-center text-sm">
203	<div>	27	<div>
204	<p class="font-semibold">{{ empty($user->workers->email) ? $user->email : $user->workers->email }}</p>	28	<p class="font-semibold">{{ empty($user->workers->email) ? $user->email : $user->workers->email }}</p>
205	<p class="text-xs text-gray-600 dark:text-gray-400">	29	<p class="text-xs text-gray-600 dark:text-gray-400">
206	{{ empty($user->workers->telephone) ? $user->telephone : $user->workers->telephone }}	30	{{ empty($user->workers->telephone) ? $user->telephone : $user->workers->telephone }}
207	</p>	31	</p>
208	</div>	32	</div>
209	</div>	33	</div>
210	</td>	34	</td>
211	<td class="px-4 py-3 text-xs">	35	<td class="px-4 py-3 text-xs">
212	@if (!empty($user->workers->persent_anketa))	36	@if (!empty($user->workers->persent_anketa))
213	@if ($user->workers->persent_anketa > 40)	37	@if ($user->workers->persent_anketa > 40)
214	<span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">	38	<span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
215	{{$user->workers->persent_anketa}}%	39	{{$user->workers->persent_anketa}}%
216	</span>	40	</span>
217	@else	41	@else
218	<span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">	42	<span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
219	{{$user->workers->persent_anketa}}%	43	{{$user->workers->persent_anketa}}%
220	</span>	44	</span>
221	@endif	45	@endif
222	@else	46	@else
223	<span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">	47	<span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
224	10%	48	10%
225	</span>	49	</span>
226	@endif	50	@endif
227	</td>	51	</td>
228	<td class="px-4 py-3 text-sm">	52	<td class="px-4 py-3 text-sm">
229	{{ $user->created_at }}	53	{{ $user->created_at }}
230	</td>	54	</td>
231	<td class="px-4 py-3 text-sm">	55	<td class="px-4 py-3 text-sm">
232	@if ($user->id > 1)	56	@if ($user->id > 1)
233	<a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>	57	<a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>
234	@endif	58	@endif
235	</td>	59	</td>
236	<td class="px-4 py-3 text-sm">	60	<td class="px-4 py-3 text-sm">
237	@if ($user->id > 1)	61	@if ($user->id > 1)
238	<input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>	62	<input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
239	@endif	63	@endif
240	</td>	64	</td>
241	</tr>	65	</tr>
242	@endforeach	66	@endforeach
243	</tbody>	67	</tbody>
244	</table>	68	</table>
245	</div>	69	</div>
246		70
247	<div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">	71	<div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
248	<?=$users->appends($_GET)->links('admin.pagginate'); ?>	72	<?=$users->appends($_GET)->links('admin.pagginate'); ?>
249	</div>	73	</div>
250	>>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
251		74

resources/views/layout/admin.blade.php

Diff comments View file @ 02091c2

 <!DOCTYPE html>
 <html :class="{ 'theme-dark': dark }" x-data="data()" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>{{$title}}</title>
     <link
         href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap"
         rel="stylesheet"
     />
     <link rel="stylesheet" href="{{ asset('./assets/css/tailwind.output.css')}}" />
     <script
         src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.x.x/dist/alpine.min.js"
         defer
     ></script>
     <script src="{{ asset('./assets/js/init-alpine.js') }}"></script>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.css"/>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.js" defer></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
     <script src="{{ asset('./assets/js/charts-lines.js') }}" defer></script>
     <script src="{{ asset('./assets/js/charts-pie.js') }}" defer></script>
 </head>
 <body>
 <div class="flex h-screen bg-gray-50 dark:bg-gray-900" :class="{ 'overflow-hidden': isSideMenuOpen }">
     <!-- Desktop sidebar -->
     <aside
         class="z-20 hidden w-64 overflow-y-auto bg-white dark:bg-gray-800 md:block flex-shrink-0"
     >
         <div class="py-4 text-gray-500 dark:text-gray-400">
-<<<<<<< HEAD
-            <a
-                class="ml-6 text-lg font-bold text-gray-800 dark:text-gray-200"
-                href="{{ route('admin.index') }}"
-            >
-=======
             <a class="ml-6 text-lg font-bold text-gray-800 dark:text-gray-200"
                 href="{{ route('admin.index') }}">
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 Админка
             </a>
             <ul class="mt-6">
                 <li class="relative px-6 py-3">
               <span
                   class="absolute inset-y-0 left-0 w-1 bg-purple-600 rounded-tr-lg rounded-br-lg"
                   aria-hidden="true"
               ></span>
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold text-gray-800 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 dark:text-gray-100"
                         href="{{ route('admin.index') }}"
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"
                             ></path>
                         </svg>
                         <span class="ml-4">Главная страница</span>
                     </a>
                 </li>
             </ul>
             <ul>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.users') }}"
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
                             ></path>
                         </svg>
                         <span class="ml-4">Пользователи</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.employers') }}"
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10"
                             ></path>
                         </svg>
                         <span class="ml-4">Работодатели</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.workers') }}"
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M11 3.055A9.001 9.001 0 1020.945 13H11V3.055z"
                             ></path>
                             <path d="M20.488 9H15V3.512A9.025 9.025 0 0120.488 9z"></path>
                         </svg>
                         <span class="ml-4">Соискатели</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.ad-employers') }}"
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
                             ></path>
                         </svg>
                         <span class="ml-4">Вакансии</span>
                     </a>
                 </li>
-<<<<<<< HEAD
-                <li class="relative px-6 py-3">
-                    <a
-                        class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                        href="{{ route('admin.categories') }}"
-=======
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.messages') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path
-                                d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"
-                            ></path>
-                        </svg>
-                        <span class="ml-4">Категории</span>
-=======
                             <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
                         </svg>
                         <span class="ml-4">Сообщения</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-<<<<<<< HEAD
-                        href="{{ route('admin.job-titles') }}"
-=======
                         href="{{ route('admin.groups') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
-                        </svg>
-                        <span class="ml-4">Должности</span>
-=======
                             <path
                                 d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
                             ></path>
                         </svg>
                         <span class="ml-4">Группы пользователей</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                        href="{{ route('admin.roles') }}">
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
                             ></path>
                         </svg>
                         <span class="ml-4">Роли пользователей</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-<<<<<<< HEAD
-                        href="{{ route('admin.messages') }}"
-=======
                         href="{{ route('admin.statics') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
-                        </svg>
-                        <span class="ml-4">Сообщения</span>
-=======
                             <path
                                 d="M11 3.055A9.001 9.001 0 1020.945 13H11V3.055z"
                             ></path>
                             <path d="M20.488 9H15V3.512A9.025 9.025 0 0120.488 9z"></path>
                         </svg>
                         <span class="ml-4">Статистика</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-<<<<<<< HEAD
-                        href="{{ route('admin.groups') }}"
-=======
                         href="{{ route('admin.answers') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path
-                                d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
-                            ></path>
-                        </svg>
-                        <span class="ml-4">Группы пользователей</span>
-                    </a>
-                </li>
-=======
                             <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
                         </svg>
                         <span class="ml-4">Модерация</span>
                     </a>
                 </li>
                 <!-- Справочники -->
                 <li class="relative px-6 py-3" x-data="{ open1: false }">
                     <button
                         class="inline-flex items-center justify-between w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         @click="open1=!open1"
                         aria-haspopup="true">
                 <span class="inline-flex items-center">
                   <svg
                       class="w-5 h-5"
                       aria-hidden="true"
                       fill="none"
                       stroke-linecap="round"
                       stroke-linejoin="round"
                       stroke-width="2"
                       viewBox="0 0 24 24"
                       stroke="currentColor">
                     <path
                         d="M4 5a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM4 13a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1v-6zM16 13a1 1 0 011-1h2a1 1 0 011 1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-6z"
                     ></path>
                   </svg>
                   <span class="ml-4">Справочники</span>
                 </span>
                         <svg
                             class="w-4 h-4"
                             aria-hidden="true"
                             fill="currentColor"
                             viewBox="0 0 20 20"
                         >
                             <path
                                 fill-rule="evenodd"
                                 d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
                                 clip-rule="evenodd"
                             ></path>
                         </svg>
                     </button>
                     <template x-if="open1">
                         <ul
                             x-transition:enter="transition-all ease-in-out duration-300"
                             x-transition:enter-start="opacity-25 max-h-0"
                             x-transition:enter-end="opacity-100 max-h-xl"
                             x-transition:leave="transition-all ease-in-out duration-300"
                             x-transition:leave-start="opacity-100 max-h-xl"
                             x-transition:leave-end="opacity-0 max-h-0"
                             class="p-2 mt-2 space-y-2 overflow-hidden text-sm font-medium text-gray-500 rounded-md shadow-inner bg-gray-50 dark:text-gray-400 dark:bg-gray-900"
                             aria-label="submenu"
                         >
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.job-titles.index') }}">Должности</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.categories.index') }}">Категории</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.infobloks.index') }}">Блоки-Дипломы</a>
                             </li>
                         </ul>
                     </template>
                 </li>
                 <!-- Редактор -->
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 <li class="relative px-6 py-3">
                     <button
                         class="inline-flex items-center justify-between w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         @click="togglePagesMenu"
-<<<<<<< HEAD
-                        aria-haspopup="true"
-                    >
-=======
                         aria-haspopup="true">
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 <span class="inline-flex items-center">
                   <svg
                       class="w-5 h-5"
                       aria-hidden="true"
                       fill="none"
                       stroke-linecap="round"
                       stroke-linejoin="round"
                       stroke-width="2"
                       viewBox="0 0 24 24"
-<<<<<<< HEAD
-                      stroke="currentColor"
-                  >
-=======
                       stroke="currentColor">
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     <path
                         d="M4 5a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM4 13a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1v-6zM16 13a1 1 0 011-1h2a1 1 0 011 1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-6z"
                     ></path>
                   </svg>
-<<<<<<< HEAD
-                  <span class="ml-4">Страницы</span>
-=======
                   <span class="ml-4">Редактор</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 </span>
                         <svg
                             class="w-4 h-4"
                             aria-hidden="true"
                             fill="currentColor"
                             viewBox="0 0 20 20"
                         >
                             <path
                                 fill-rule="evenodd"
                                 d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
                                 clip-rule="evenodd"
                             ></path>
                         </svg>
                     </button>
                     <template x-if="isPagesMenuOpen">
                         <ul
                             x-transition:enter="transition-all ease-in-out duration-300"
                             x-transition:enter-start="opacity-25 max-h-0"
                             x-transition:enter-end="opacity-100 max-h-xl"
                             x-transition:leave="transition-all ease-in-out duration-300"
                             x-transition:leave-start="opacity-100 max-h-xl"
                             x-transition:leave-end="opacity-0 max-h-0"
                             class="p-2 mt-2 space-y-2 overflow-hidden text-sm font-medium text-gray-500 rounded-md shadow-inner bg-gray-50 dark:text-gray-400 dark:bg-gray-900"
                             aria-label="submenu"
                         >
-<<<<<<< HEAD
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/login.html">Login</a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/create-account.html">
-                                    Create account
-                                </a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/forgot-password.html">
-                                    Forgot password
-                                </a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/404.html">404</a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/blank.html">Blank</a>
-=======
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.editor-site') }}">Редактор сайта</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.edit-blocks') }}">Шапка-футер сайта</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.reclames') }}">Реклама</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.editor-seo') }}">SEO сайта</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.editor-pages') }}">Редактор страниц</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.job-titles-main') }}">Должности на главной</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.employers-main') }}">Работодатели на главной</a>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                             </li>
                         </ul>
                     </template>
                 </li>
-<<<<<<< HEAD
-=======
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             </ul>
             <!--<div class="px-6 my-6">
                 <button
                     class="flex items-center justify-between w-full px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-lg active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple"
                 >
                     Create account
                     <span class="ml-2" aria-hidden="true">+</span>
                 </button>
             </div>-->
         </div>
     </aside>
     <!-- Mobile sidebar -->
     <!-- Backdrop -->
     <div
         x-show="isSideMenuOpen"
         x-transition:enter="transition ease-in-out duration-150"
         x-transition:enter-start="opacity-0"
         x-transition:enter-end="opacity-100"
         x-transition:leave="transition ease-in-out duration-150"
         x-transition:leave-start="opacity-100"
         x-transition:leave-end="opacity-0"
         class="fixed inset-0 z-10 flex items-end bg-black bg-opacity-50 sm:items-center sm:justify-center"
     ></div>
     <aside
         class="fixed inset-y-0 z-20 flex-shrink-0 w-64 mt-16 overflow-y-auto bg-white dark:bg-gray-800 md:hidden"
         x-show="isSideMenuOpen"
         x-transition:enter="transition ease-in-out duration-150"
         x-transition:enter-start="opacity-0 transform -translate-x-20"
         x-transition:enter-end="opacity-100"
         x-transition:leave="transition ease-in-out duration-150"
         x-transition:leave-start="opacity-100"
         x-transition:leave-end="opacity-0 transform -translate-x-20"
         @click.away="closeSideMenu"
         @keydown.escape="closeSideMenu"
     >
         <div class="py-4 text-gray-500 dark:text-gray-400">
             <a
                 class="ml-6 text-lg font-bold text-gray-800 dark:text-gray-200"
                 href="{{ route('admin.index') }}"
             >
                 Админка
             </a>
             <ul class="mt-6">
                 <li class="relative px-6 py-3">
               <span
                   class="absolute inset-y-0 left-0 w-1 bg-purple-600 rounded-tr-lg rounded-br-lg"
                   aria-hidden="true"
               ></span>
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold text-gray-800 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 dark:text-gray-100"
                         href="{{ route('admin.index') }}"
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"
                             ></path>
                         </svg>
                         <span class="ml-4">Главная страница</span>
                     </a>
                 </li>
             </ul>
             <ul>
                 <li class="relative px-6 py-3">
                     <a class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.users') }}">
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
                             ></path>
                         </svg>
                         <span class="ml-4">Пользователи</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.employers') }}"
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10"
                             ></path>
                         </svg>
                         <span class="ml-4">Работодатели</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.workers') }}"
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M11 3.055A9.001 9.001 0 1020.945 13H11V3.055z"
                             ></path>
                             <path d="M20.488 9H15V3.512A9.025 9.025 0 0120.488 9z"></path>
                         </svg>
                         <span class="ml-4">Соискатели</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.ad-employers') }}"
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
                             ></path>
                         </svg>
                         <span class="ml-4">Вакансии</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-<<<<<<< HEAD
-                        href="{{ route('admin.categories') }}"
-=======
                         href="{{ route('admin.messages') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path
-                                d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"
-                            ></path>
-                        </svg>
-                        <span class="ml-4">Категории</span>
-                    </a>
-                </li>
-                <li class="relative px-6 py-3">
-                    <a
-                        class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                        href="{{ route('admin.job-titles') }}"
-                    >
-=======
                             <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
                         </svg>
                         <span class="ml-4">Сообщения</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                        href="{{ route('admin.groups') }}">
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
                             <path
                                 d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
                             ></path>
                         </svg>
                         <span class="ml-4">Группы пользователей</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                        href="{{ route('admin.roles') }}">
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
-                        </svg>
-                        <span class="ml-4">Должности</span>
-=======
                             <path
                                 d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
                             ></path>
                         </svg>
                         <span class="ml-4">Роли пользователей</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-<<<<<<< HEAD
-                        href="{{ route('admin.messages') }}"
-=======
                         href="{{ route('admin.statics') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
-                        </svg>
-                        <span class="ml-4">Сообщения</span>
-                    </a>
-                </li>
-                <li class="relative px-6 py-3">
-                    <a class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                       href="{{ route('admin.groups') }}">
-=======
                             <path
                                 d="M11 3.055A9.001 9.001 0 1020.945 13H11V3.055z"
                             ></path>
                             <path d="M20.488 9H15V3.512A9.025 9.025 0 0120.488 9z"></path>
                         </svg>
                         <span class="ml-4">Статистика</span>
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.messages') }}"
                     >
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
                             fill="none"
                             stroke-linecap="round"
                             stroke-linejoin="round"
                             stroke-width="2"
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path
-                                d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
-                            ></path>
-                        </svg>
-                        <span class="ml-4">Группы пользователей</span>
-                    </a>
-                </li>
-=======
                             <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
                         </svg>
                         <span class="ml-4">Сообщения</span>
                     </a>
                 </li>
                 <!-- Справочники -->
                 <li class="relative px-6 py-3" x-data="{ open2: false }">
                     <button
                         class="inline-flex items-center justify-between w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         @click="open2=!open2"
                         aria-haspopup="true">
                 <span class="inline-flex items-center">
                   <svg
                       class="w-5 h-5"
                       aria-hidden="true"
                       fill="none"
                       stroke-linecap="round"
                       stroke-linejoin="round"
                       stroke-width="2"
                       viewBox="0 0 24 24"
                       stroke="currentColor">
                     <path
                         d="M4 5a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM4 13a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1v-6zM16 13a1 1 0 011-1h2a1 1 0 011 1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-6z"
                     ></path>
                   </svg>
                   <span class="ml-4">Справочники</span>
                 </span>
                         <svg
                             class="w-4 h-4"
                             aria-hidden="true"
                             fill="currentColor"
                             viewBox="0 0 20 20"
                         >
                             <path
                                 fill-rule="evenodd"
                                 d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
                                 clip-rule="evenodd"
                             ></path>
                         </svg>
                     </button>
                     <template x-if="open2">
                         <ul
                             x-transition:enter="transition-all ease-in-out duration-300"
                             x-transition:enter-start="opacity-25 max-h-0"
                             x-transition:enter-end="opacity-100 max-h-xl"
                             x-transition:leave="transition-all ease-in-out duration-300"
                             x-transition:leave-start="opacity-100 max-h-xl"
                             x-transition:leave-end="opacity-0 max-h-0"
                             class="p-2 mt-2 space-y-2 overflow-hidden text-sm font-medium text-gray-500 rounded-md shadow-inner bg-gray-50 dark:text-gray-400 dark:bg-gray-900"
                             aria-label="submenu"
                         >
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.job-titles.index') }}">Должности</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.categories.index') }}">Категории</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.infobloks.index') }}">Блоки-Дипломы</a>
                             </li>
                         </ul>
                     </template>
                 </li>
                 <!-- Редактор -->
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 <li class="relative px-6 py-3">
                     <button
                         class="inline-flex items-center justify-between w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         @click="togglePagesMenu"
                         aria-haspopup="true"
                     >
                 <span class="inline-flex items-center">
                   <svg
                       class="w-5 h-5"
                       aria-hidden="true"
                       fill="none"
                       stroke-linecap="round"
                       stroke-linejoin="round"
                       stroke-width="2"
                       viewBox="0 0 24 24"
                       stroke="currentColor"
                   >
                     <path
                         d="M4 5a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM4 13a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1v-6zM16 13a1 1 0 011-1h2a1 1 0 011 1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-6z"
                     ></path>
                   </svg>
-<<<<<<< HEAD
-                  <span class="ml-4">Страницы</span>
-=======
                   <span class="ml-4">Редактор</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 </span>
                         <svg
                             class="w-4 h-4"
                             aria-hidden="true"
                             fill="currentColor"
                             viewBox="0 0 20 20"
                         >
                             <path
                                 fill-rule="evenodd"
                                 d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
                                 clip-rule="evenodd"
                             ></path>
                         </svg>
                     </button>
                     <template x-if="isPagesMenuOpen">
                         <ul
                             x-transition:enter="transition-all ease-in-out duration-300"
                             x-transition:enter-start="opacity-25 max-h-0"
                             x-transition:enter-end="opacity-100 max-h-xl"
                             x-transition:leave="transition-all ease-in-out duration-300"
                             x-transition:leave-start="opacity-100 max-h-xl"
                             x-transition:leave-end="opacity-0 max-h-0"
                             class="p-2 mt-2 space-y-2 overflow-hidden text-sm font-medium text-gray-500 rounded-md shadow-inner bg-gray-50 dark:text-gray-400 dark:bg-gray-900"
                             aria-label="submenu"
                         >
-<<<<<<< HEAD
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/login.html">Login</a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/create-account.html">
-                                    Create account
-                                </a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/forgot-password.html">
-                                    Forgot password
-                                </a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/404.html">404</a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/blank.html">Blank</a>
-                            </li>
-=======
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.editor-site') }}">Редактор сайта</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.edit-blocks') }}">Шапка-футер сайта</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.reclames') }}">Реклама</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.editor-seo') }}">SEO сайта</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.editor-pages') }}">Редактор страниц</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.job-titles-main') }}">Должности на главной</a>
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.employers-main') }}">Работодатели на главной</a>
                             </li>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         </ul>
                     </template>
                 </li>
             </ul>
             <!--<div class="px-6 my-6">
                 <button class="flex items-center justify-between px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-lg active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
                     Create account
                     <span class="ml-2" aria-hidden="true">+</span>
                 </button>
             </div>-->
         </div>
     </aside>
     <div class="flex flex-col flex-1 w-full">
         <header class="z-10 py-4 bg-white shadow-md dark:bg-gray-800">
             <div
                 class="container flex items-center justify-between h-full px-6 mx-auto text-purple-600 dark:text-purple-300"
             >
                 <!-- Mobile hamburger -->
                 <button
                     class="p-1 mr-5 -ml-1 rounded-md md:hidden focus:outline-none focus:shadow-outline-purple"
                     @click="toggleSideMenu"
                     aria-label="Menu"
                 >
                     <svg
                         class="w-6 h-6"
                         aria-hidden="true"
                         fill="currentColor"
                         viewBox="0 0 20 20"
                     >
                         <path
                             fill-rule="evenodd"
                             d="M3 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 10a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 15a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z"
                             clip-rule="evenodd"
                         ></path>
                     </svg>
                 </button>
                 <!-- Search input -->
                 <div class="flex justify-center flex-1 lg:mr-32">
                     <div
                         class="relative w-full max-w-xl mr-6 focus-within:text-purple-500"
                     >
-<<<<<<< HEAD
-                        <div class="absolute inset-y-0 flex items-center pl-2">
-                            <svg
-                                class="w-4 h-4"
-                                aria-hidden="true"
-                                fill="currentColor"
-                                viewBox="0 0 20 20"
-                            >
-                                <path
-                                    fill-rule="evenodd"
-                                    d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z"
-                                    clip-rule="evenodd"
-                                ></path>
-                            </svg>
-                        </div>
-                        <input
-                            class="w-full pl-8 pr-2 text-sm text-gray-700 placeholder-gray-600 bg-gray-100 border-0 rounded-md dark:placeholder-gray-500 dark:focus:shadow-outline-gray dark:focus:placeholder-gray-600 dark:bg-gray-700 dark:text-gray-200 focus:placeholder-gray-500 focus:bg-white focus:border-purple-300 focus:outline-none focus:shadow-outline-purple form-input"
-                            type="text"
-                            placeholder="Искать..."
-                            aria-label="Search"
-                        />
-=======
                         @yield('search')
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     </div>
                 </div>
                 <ul class="flex items-center flex-shrink-0 space-x-6">
                     <!-- Theme toggler -->
                     <li class="flex">
                         <button
                             class="rounded-md focus:outline-none focus:shadow-outline-purple"
                             @click="toggleTheme"
                             aria-label="Toggle color mode"
                         >
                             <template x-if="!dark">
                                 <svg
                                     class="w-5 h-5"
                                     aria-hidden="true"
                                     fill="currentColor"
                                     viewBox="0 0 20 20"
                                 >
                                     <path
                                         d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z"
                                     ></path>
                                 </svg>
                             </template>
                             <template x-if="dark">
                                 <svg
                                     class="w-5 h-5"
                                     aria-hidden="true"
                                     fill="currentColor"
                                     viewBox="0 0 20 20"
                                 >
                                     <path
                                         fill-rule="evenodd"
                                         d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z"
                                         clip-rule="evenodd"
                                     ></path>
                                 </svg>
                             </template>
                         </button>
                     </li>
                     <!-- Notifications menu -->
                     <li class="relative">
                         <button
                             class="relative align-middle rounded-md focus:outline-none focus:shadow-outline-purple"
                             @click="toggleNotificationsMenu"
                             @keydown.escape="closeNotificationsMenu"
                             aria-label="Notifications"
                             aria-haspopup="true"
                         >
                             <svg
                                 class="w-5 h-5"
                                 aria-hidden="true"
                                 fill="currentColor"
                                 viewBox="0 0 20 20"
                             >
                                 <path
                                     d="M10 2a6 6 0 00-6 6v3.586l-.707.707A1 1 0 004 14h12a1 1 0 00.707-1.707L16 11.586V8a6 6 0 00-6-6zM10 18a3 3 0 01-3-3h6a3 3 0 01-3 3z"
                                 ></path>
                             </svg>
                             <!-- Notification badge -->
                             <span
                                 aria-hidden="true"
                                 class="absolute top-0 right-0 inline-block w-3 h-3 transform translate-x-1 -translate-y-1 bg-red-600 border-2 border-white rounded-full dark:border-gray-800"
                             ></span>
                         </button>
                         <template x-if="isNotificationsMenuOpen">
                             <ul
                                 x-transition:leave="transition ease-in duration-150"
                                 x-transition:leave-start="opacity-100"
                                 x-transition:leave-end="opacity-0"
                                 @click.away="closeNotificationsMenu"
                                 @keydown.escape="closeNotificationsMenu"
                                 class="absolute right-0 w-56 p-2 mt-2 space-y-2 text-gray-600 bg-white border border-gray-100 rounded-md shadow-md dark:text-gray-300 dark:border-gray-700 dark:bg-gray-700"
                             >
                                 <li class="flex">
                                     <a
                                         class="inline-flex items-center justify-between w-full px-2 py-1 text-sm font-semibold transition-colors duration-150 rounded-md hover:bg-gray-100 hover:text-gray-800 dark:hover:bg-gray-800 dark:hover:text-gray-200"
                                         href="#"
                                     >
                                         <span>Сообщения</span>
                                         <span
                                             class="inline-flex items-center justify-center px-2 py-1 text-xs font-bold leading-none text-red-600 bg-red-100 rounded-full dark:text-red-100 dark:bg-red-600"
                                         >
                                         13
                         </span>
                                     </a>
                                 </li>
                                 <li class="flex">
                                     <a
                                         class="inline-flex items-center justify-between w-full px-2 py-1 text-sm font-semibold transition-colors duration-150 rounded-md hover:bg-gray-100 hover:text-gray-800 dark:hover:bg-gray-800 dark:hover:text-gray-200"
                                         href="#"
                                     >
                                         <span>Логи</span>
                                     </a>
                                 </li>
                             </ul>
                         </template>
                     </li>
                     <!-- Profile menu -->
                     <li class="relative">
                         <button
                             class="align-middle rounded-full focus:shadow-outline-purple focus:outline-none"
                             @click="toggleProfileMenu"
                             @keydown.escape="closeProfileMenu"
                             aria-label="Account"
                             aria-haspopup="true"
                         >
                             <img
                                 class="object-cover w-8 h-8 rounded-full"
                                 src="{{ asset('assets/img/profile.jpg') }}"
                                 alt=""
                                 aria-hidden="true"
                             />
                         </button>
                         <template x-if="isProfileMenuOpen">
                             <ul
                                 x-transition:leave="transition ease-in duration-150"
                                 x-transition:leave-start="opacity-100"
                                 x-transition:leave-end="opacity-0"
                                 @click.away="closeProfileMenu"
                                 @keydown.escape="closeProfileMenu"
                                 class="absolute right-0 w-56 p-2 mt-2 space-y-2 text-gray-600 bg-white border border-gray-100 rounded-md shadow-md dark:border-gray-700 dark:text-gray-300 dark:bg-gray-700"
                                 aria-label="submenu"
                             >
                                 <li class="flex">
                                     <a
                                         class="inline-flex items-center w-full px-2 py-1 text-sm font-semibold transition-colors duration-150 rounded-md hover:bg-gray-100 hover:text-gray-800 dark:hover:bg-gray-800 dark:hover:text-gray-200"
                                         href="{{ route('admin.profile') }}"
                                     >
                                         <svg
                                             class="w-4 h-4 mr-3"
                                             aria-hidden="true"
                                             fill="none"
                                             stroke-linecap="round"
                                             stroke-linejoin="round"
                                             stroke-width="2"
                                             viewBox="0 0 24 24"
                                             stroke="currentColor"
                                         >
                                             <path
                                                 d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"
                                             ></path>
                                         </svg>
                                         <span>Профиль</span>
                                     </a>
                                 </li>
                                 <li class="flex">
                                     <a
                                         class="inline-flex items-center w-full px-2 py-1 text-sm font-semibold transition-colors duration-150 rounded-md hover:bg-gray-100 hover:text-gray-800 dark:hover:bg-gray-800 dark:hover:text-gray-200"
                                         href="{{ route('admin.config') }}"
                                     >
                                         <svg
                                             class="w-4 h-4 mr-3"
                                             aria-hidden="true"
                                             fill="none"
                                             stroke-linecap="round"
                                             stroke-linejoin="round"
                                             stroke-width="2"
                                             viewBox="0 0 24 24"
                                             stroke="currentColor"
                                         >
                                             <path
                                                 d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"
                                             ></path>
                                             <path d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"></path>
                                         </svg>
                                         <span>Настройки</span>
                                     </a>
                                 </li>
                                 <li class="flex">
                                     <a
                                         class="inline-flex items-center w-full px-2 py-1 text-sm font-semibold transition-colors duration-150 rounded-md hover:bg-gray-100 hover:text-gray-800 dark:hover:bg-gray-800 dark:hover:text-gray-200"
                                         href="{{ route('admin.logout') }}"
                                     >
                                         <svg
                                             class="w-4 h-4 mr-3"
                                             aria-hidden="true"
                                             fill="none"
                                             stroke-linecap="round"
                                             stroke-linejoin="round"
                                             stroke-width="2"
                                             viewBox="0 0 24 24"
                                             stroke="currentColor"
                                         >
                                             <path
                                                 d="M11 16l-4-4m0 0l4-4m-4 4h14m-5 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h7a3 3 0 013 3v1"
                                             ></path>
                                         </svg>
                                         <span>Выход</span>
                                     </a>
                                 </li>
                             </ul>
                         </template>
                     </li>
                 </ul>
             </div>
         </header>
         <main class="h-full overflow-y-auto">
             <div class="container px-6 mx-auto grid">
                 <h2
                     class="my-6 text-2xl font-semibold text-gray-700 dark:text-gray-200"
                 >
                     {{$title}}
                 </h2>
                 <!-- CTA -->
                 <a
                     class="flex items-center justify-between p-4 mb-8 text-sm font-semibold text-purple-100 bg-purple-600 rounded-lg shadow-md focus:outline-none focus:shadow-outline-purple"
                     href="{{ route('admin.admin-users') }}"
                 >
                     <div class="flex items-center">
                         <svg
                             class="w-5 h-5 mr-2"
                             fill="currentColor"
                             viewBox="0 0 20 20"
                         >
                             <path
                                 d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z"
                             ></path>
                         </svg>
                         <span>Вход в админку только для пользователей-админов</span>
                     </div>
                     <span>Список админов &RightArrow;</span>
                 </a>
-<<<<<<< HEAD
-=======
                 @if ($message = Session::get('success'))
                     <section>
                         <div class="alert alert-success alert-dismissible mt-0" role="alert">
                             <button type="button" class="close" data-dismiss="alert" aria-label="Закрыть">
                                 <span aria-hidden="true">&times;</span>
                             </button>
                             {{ $message }}
                         </div>
                     </section>
                 @endif
                 @if ($errors->any())
                     <section>
                         <div class="alert alert-danger alert-dismissible mt-4" role="alert">
                             <button type="button" class="close" data-dismiss="alert" aria-label="Закрыть">
                                 <span aria-hidden="true">&times;</span>
                             </button>
                             <ul class="mb-0">
                                 @foreach ($errors->all() as $error)
                                     <li>{{ $error }}</li>
                                 @endforeach
                             </ul>
                         </div>
                     </section>
               @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                @yield('content')
                 <!-- Cards
                 <div class="grid gap-6 mb-8 md:grid-cols-2 xl:grid-cols-4">
                     <div
                         class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800"
                     >
                         <div
                             class="p-3 mr-4 text-orange-500 bg-orange-100 rounded-full dark:text-orange-100 dark:bg-orange-500"
                         >
                             <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                                 <path
                                     d="M13 6a3 3 0 11-6 0 3 3 0 016 0zM18 8a2 2 0 11-4 0 2 2 0 014 0zM14 15a4 4 0 00-8 0v3h8v-3zM6 8a2 2 0 11-4 0 2 2 0 014 0zM16 18v-3a5.972 5.972 0 00-.75-2.906A3.005 3.005 0 0119 15v3h-3zM4.75 12.094A5.973 5.973 0 004 15v3H1v-3a3 3 0 013.75-2.906z"
                                 ></path>
                             </svg>
                         </div>
                         <div>
                             <p
                                 class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400"
                             >
                                 Total clients
                             </p>
                             <p
                                 class="text-lg font-semibold text-gray-700 dark:text-gray-200"
                             >
                                 6389
                             </p>
                         </div>
                     </div>
                     <div
                         class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800"
                     >
                         <div
                             class="p-3 mr-4 text-green-500 bg-green-100 rounded-full dark:text-green-100 dark:bg-green-500"
                         >
                             <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                                 <path
                                     fill-rule="evenodd"
                                     d="M4 4a2 2 0 00-2 2v4a2 2 0 002 2V6h10a2 2 0 00-2-2H4zm2 6a2 2 0 012-2h8a2 2 0 012 2v4a2 2 0 01-2 2H8a2 2 0 01-2-2v-4zm6 4a2 2 0 100-4 2 2 0 000 4z"
                                     clip-rule="evenodd"
                                 ></path>
                             </svg>
                         </div>
                         <div>
                             <p
                                 class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400"
                             >
                                 Account balance
                             </p>
                             <p
                                 class="text-lg font-semibold text-gray-700 dark:text-gray-200"
                             >
                                 $ 46,760.89
                             </p>
                         </div>
                     </div>
                     <div
                         class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800"
                     >
                         <div
                             class="p-3 mr-4 text-blue-500 bg-blue-100 rounded-full dark:text-blue-100 dark:bg-blue-500"
                         >
                             <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                                 <path
                                     d="M3 1a1 1 0 000 2h1.22l.305 1.222a.997.997 0 00.01.042l1.358 5.43-.893.892C3.74 11.846 4.632 14 6.414 14H15a1 1 0 000-2H6.414l1-1H14a1 1 0 00.894-.553l3-6A1 1 0 0017 3H6.28l-.31-1.243A1 1 0 005 1H3zM16 16.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM6.5 18a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"
                                 ></path>
                             </svg>
                         </div>
                         <div>
                             <p
                                 class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400"
                             >
                                 New sales
                             </p>
                             <p
                                 class="text-lg font-semibold text-gray-700 dark:text-gray-200"
                             >
                                 376
                             </p>
                         </div>
                     </div>
                     <div
                         class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800"
                     >
                         <div
                             class="p-3 mr-4 text-teal-500 bg-teal-100 rounded-full dark:text-teal-100 dark:bg-teal-500"
                         >
                             <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                                 <path
                                     fill-rule="evenodd"
                                     d="M18 5v8a2 2 0 01-2 2h-5l-5 4v-4H4a2 2 0 01-2-2V5a2 2 0 012-2h12a2 2 0 012 2zM7 8H5v2h2V8zm2 0h2v2H9V8zm6 0h-2v2h2V8z"
                                     clip-rule="evenodd"
                                 ></path>
                             </svg>
                         </div>
                         <div>
                             <p
                                 class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400"
                             >
                                 Pending contacts
                             </p>
                             <p
                                 class="text-lg font-semibold text-gray-700 dark:text-gray-200"
                             >
                                 35
                             </p>
                         </div>
                     </div>
                 </div>
                 -->
                 <!-- New Table
                 <div class="w-full overflow-hidden rounded-lg shadow-xs">
                     <div class="w-full overflow-x-auto">
                         <table class="w-full whitespace-no-wrap">
                             <thead>
                             <tr
                                 class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
                             >
                                 <th class="px-4 py-3">Client</th>
                                 <th class="px-4 py-3">Amount</th>
                                 <th class="px-4 py-3">Status</th>
                                 <th class="px-4 py-3">Date</th>
                             </tr>
                             </thead>
                             <tbody
                                 class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800"
                             >
                             <tr class="text-gray-700 dark:text-gray-400">
                                 <td class="px-4 py-3">
                                     <div class="flex items-center text-sm">
                                         <div
                                             class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                                         >
                                             <img
                                                 class="object-cover w-full h-full rounded-full"
                                                 src="https://images.unsplash.com/flagged/photo-1570612861542-284f4c12e75f?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                                 alt=""
                                                 loading="lazy"
                                             />
                                             <div
                                                 class="absolute inset-0 rounded-full shadow-inner"
                                                 aria-hidden="true"
                                             ></div>
                                         </div>
                                         <div>
                                             <p class="font-semibold">Hans Burger</p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">
                                                 10x Developer
                                             </p>
                                         </div>
                                     </div>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     $ 863.45
                                 </td>
                                 <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     6/10/2020
                                 </td>
                             </tr>
                             <tr class="text-gray-700 dark:text-gray-400">
                                 <td class="px-4 py-3">
                                     <div class="flex items-center text-sm">
                                         <div
                                             class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                                         >
                                             <img
                                                 class="object-cover w-full h-full rounded-full"
                                                 src="https://images.unsplash.com/photo-1494790108377-be9c29b29330?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&facepad=3&fit=facearea&s=707b9c33066bf8808c934c8ab394dff6"
                                                 alt=""
                                                 loading="lazy"
                                             />
                                             <div
                                                 class="absolute inset-0 rounded-full shadow-inner"
                                                 aria-hidden="true"
                                             ></div>
                                         </div>
                                         <div>
                                             <p class="font-semibold">Jolina Angelie</p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">
                                                 Unemployed
                                             </p>
                                         </div>
                                     </div>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     $ 369.95
                                 </td>
                                 <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600"
                         >
                           Pending
                         </span>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     6/10/2020
                                 </td>
                             </tr>
                             <tr class="text-gray-700 dark:text-gray-400">
                                 <td class="px-4 py-3">
                                     <div class="flex items-center text-sm">
                                         <div
                                             class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                                         >
                                             <img
                                                 class="object-cover w-full h-full rounded-full"
                                                 src="https://images.unsplash.com/photo-1551069613-1904dbdcda11?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                                 alt=""
                                                 loading="lazy"
                                             />
                                             <div
                                                 class="absolute inset-0 rounded-full shadow-inner"
                                                 aria-hidden="true"
                                             ></div>
                                         </div>
                                         <div>
                                             <p class="font-semibold">Sarah Curry</p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">
                                                 Designer
                                             </p>
                                         </div>
                                     </div>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     $ 86.00
                                 </td>
                                 <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-red-700 bg-red-100 rounded-full dark:text-red-100 dark:bg-red-700"
                         >
                           Denied
                         </span>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     6/10/2020
                                 </td>
                             </tr>
                             <tr class="text-gray-700 dark:text-gray-400">
                                 <td class="px-4 py-3">
                                     <div class="flex items-center text-sm">
                                         <div
                                             class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                                         >
                                             <img
                                                 class="object-cover w-full h-full rounded-full"
                                                 src="https://images.unsplash.com/photo-1551006917-3b4c078c47c9?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                                 alt=""
                                                 loading="lazy"
                                             />
                                             <div
                                                 class="absolute inset-0 rounded-full shadow-inner"
                                                 aria-hidden="true"
                                             ></div>
                                         </div>
                                         <div>
                                             <p class="font-semibold">Rulia Joberts</p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">
                                                 Actress
                                             </p>
                                         </div>
                                     </div>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     $ 1276.45
                                 </td>
                                 <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     6/10/2020
                                 </td>
                             </tr>
                             <tr class="text-gray-700 dark:text-gray-400">
                                 <td class="px-4 py-3">
                                     <div class="flex items-center text-sm">
                                         <div
                                             class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                                         >
                                             <img
                                                 class="object-cover w-full h-full rounded-full"
                                                 src="https://images.unsplash.com/photo-1546456073-6712f79251bb?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                                 alt=""
                                                 loading="lazy"
                                             />
                                             <div
                                                 class="absolute inset-0 rounded-full shadow-inner"
                                                 aria-hidden="true"
                                             ></div>
                                         </div>
                                         <div>
                                             <p class="font-semibold">Wenzel Dashington</p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">
                                                 Actor
                                             </p>
                                         </div>
                                     </div>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     $ 863.45
                                 </td>
                                 <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-gray-700 bg-gray-100 rounded-full dark:text-gray-100 dark:bg-gray-700"
                         >
                           Expired
                         </span>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     6/10/2020
                                 </td>
                             </tr>
                             <tr class="text-gray-700 dark:text-gray-400">
                                 <td class="px-4 py-3">
                                     <div class="flex items-center text-sm">
                                         <div
                                             class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                                         >
                                             <img
                                                 class="object-cover w-full h-full rounded-full"
                                                 src="https://images.unsplash.com/photo-1502720705749-871143f0e671?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&s=b8377ca9f985d80264279f277f3a67f5"
                                                 alt=""
                                                 loading="lazy"
                                             />
                                             <div
                                                 class="absolute inset-0 rounded-full shadow-inner"
                                                 aria-hidden="true"
                                             ></div>
                                         </div>
                                         <div>
                                             <p class="font-semibold">Dave Li</p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">
                                                 Influencer
                                             </p>
                                         </div>
                                     </div>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     $ 863.45
                                 </td>
                                 <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     6/10/2020
                                 </td>
                             </tr>
                             <tr class="text-gray-700 dark:text-gray-400">
                                 <td class="px-4 py-3">
                                     <div class="flex items-center text-sm">
                                         <div
                                             class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                                         >
                                             <img
                                                 class="object-cover w-full h-full rounded-full"
                                                 src="https://images.unsplash.com/photo-1531746020798-e6953c6e8e04?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                                 alt=""
                                                 loading="lazy"
                                             />
                                             <div
                                                 class="absolute inset-0 rounded-full shadow-inner"
                                                 aria-hidden="true"
                                             ></div>
                                         </div>
                                         <div>
                                             <p class="font-semibold">Maria Ramovic</p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">
                                                 Runner
                                             </p>
                                         </div>
                                     </div>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     $ 863.45
                                 </td>
                                 <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     6/10/2020
                                 </td>
                             </tr>
                             <tr class="text-gray-700 dark:text-gray-400">
                                 <td class="px-4 py-3">
                                     <div class="flex items-center text-sm">
                                         <div
                                             class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                                         >
                                             <img
                                                 class="object-cover w-full h-full rounded-full"
                                                 src="https://images.unsplash.com/photo-1566411520896-01e7ca4726af?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                                 alt=""
                                                 loading="lazy"
                                             />
                                             <div
                                                 class="absolute inset-0 rounded-full shadow-inner"
                                                 aria-hidden="true"
                                             ></div>
                                         </div>
                                         <div>
                                             <p class="font-semibold">Hitney Wouston</p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">
                                                 Singer
                                             </p>
                                         </div>
                                     </div>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     $ 863.45
                                 </td>
                                 <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     6/10/2020
                                 </td>
                             </tr>
                             <tr class="text-gray-700 dark:text-gray-400">
                                 <td class="px-4 py-3">
                                     <div class="flex items-center text-sm">
                                         <div
                                             class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                                         >
                                             <img
                                                 class="object-cover w-full h-full rounded-full"
                                                 src="https://images.unsplash.com/flagged/photo-1570612861542-284f4c12e75f?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjE3Nzg0fQ"
                                                 alt=""
                                                 loading="lazy"
                                             />
                                             <div
                                                 class="absolute inset-0 rounded-full shadow-inner"
                                                 aria-hidden="true"
                                             ></div>
                                         </div>
                                         <div>
                                             <p class="font-semibold">Hans Burger</p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">
                                                 10x Developer
                                             </p>
                                         </div>
                                     </div>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     $ 863.45
                                 </td>
                                 <td class="px-4 py-3 text-xs">
                         <span
                             class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100"
                         >
                           Approved
                         </span>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
                                     6/10/2020
                                 </td>
                             </tr>
                             </tbody>
                         </table>
                     </div>
                     <div
                         class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800"
                     >
                 <span class="flex items-center col-span-3">
                   Showing 21-30 of 100
                 </span>
                         <span class="col-span-2"></span>
                         <span class="flex col-span-4 mt-2 sm:mt-auto sm:justify-end">
                   <nav aria-label="Table navigation">
                     <ul class="inline-flex items-center">
                       <li>
                         <button
                             class="px-3 py-1 rounded-md rounded-l-lg focus:outline-none focus:shadow-outline-purple"
                             aria-label="Previous"
                         >
                           <svg
                               aria-hidden="true"
                               class="w-4 h-4 fill-current"
                               viewBox="0 0 20 20"
                           >
                             <path
                                 d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
                                 clip-rule="evenodd"
                                 fill-rule="evenodd"
                             ></path>
                           </svg>
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           1
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           2
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 text-white transition-colors duration-150 bg-purple-600 border border-r-0 border-purple-600 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           3
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           4
                         </button>
                       </li>
                       <li>
                         <span class="px-3 py-1">...</span>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           8
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
                         >
                           9
                         </button>
                       </li>
                       <li>
                         <button
                             class="px-3 py-1 rounded-md rounded-r-lg focus:outline-none focus:shadow-outline-purple"
                             aria-label="Next"
                         >
                           <svg
                               class="w-4 h-4 fill-current"
                               aria-hidden="true"
                               viewBox="0 0 20 20"
                           >
                             <path
                                 d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
                                 clip-rule="evenodd"
                                 fill-rule="evenodd"
                             ></path>
                           </svg>
                         </button>
                       </li>
                     </ul>
                   </nav>
                 </span>
                     </div>
                 </div>
                 -->
                 <!-- Charts -->
                 <!--
                 <h2 class="my-6 text-2xl font-semibold text-gray-700 dark:text-gray-200">
                     Графики
                 </h2>
                 <div class="grid gap-6 mb-8 md:grid-cols-2">
                     <div
                         class="min-w-0 p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800"
                     >
                         <h4 class="mb-4 font-semibold text-gray-800 dark:text-gray-300">
                             Revenue
                         </h4>
                         <canvas id="pie"></canvas>
                         <div
                             class="flex justify-center mt-4 space-x-3 text-sm text-gray-600 dark:text-gray-400"
                         >
                             <div class="flex items-center">
                     <span
                         class="inline-block w-3 h-3 mr-1 bg-blue-500 rounded-full"
                     ></span>
                                 <span>Shirts</span>
                             </div>
                             <div class="flex items-center">
                     <span
                         class="inline-block w-3 h-3 mr-1 bg-teal-600 rounded-full"
                     ></span>
                                 <span>Shoes</span>
                             </div>
                             <div class="flex items-center">
                     <span
                         class="inline-block w-3 h-3 mr-1 bg-purple-600 rounded-full"
                     ></span>
                                 <span>Bags</span>
                             </div>
                         </div>
                     </div>
                     <div
                         class="min-w-0 p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800"
                     >
                         <h4 class="mb-4 font-semibold text-gray-800 dark:text-gray-300">
                             Traffic
                         </h4>
                         <canvas id="line"></canvas>
                         <div
                             class="flex justify-center mt-4 space-x-3 text-sm text-gray-600 dark:text-gray-400"
                         >
                             <div class="flex items-center">
                     <span
                         class="inline-block w-3 h-3 mr-1 bg-teal-600 rounded-full"
                     ></span>
                                 <span>Organic</span>
                             </div>
                             <div class="flex items-center">
                     <span
                         class="inline-block w-3 h-3 mr-1 bg-purple-600 rounded-full"
                     ></span>
                                 <span>Paid</span>
                             </div>
                         </div>
                     </div>
                 </div>
                 -->
             </div>
         </main>
     </div>
 </div>
 </body>
 @yield('script')
 </html>

routes/web.php

Diff comments View file @ 02091c2

 <?php
 use App\Http\Controllers\Admin\AdminController;
-<<<<<<< HEAD
-use App\Http\Controllers\Admin\EmployersController;
-=======
 use App\Http\Controllers\Admin\CategoryController;
 use App\Http\Controllers\Admin\EmployersController;
 use App\Http\Controllers\Admin\InfoBloksController;
 use App\Http\Controllers\Admin\JobTitlesController;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 use App\Http\Controllers\Admin\UsersController;
 use App\Http\Controllers\Admin\WorkersController;
 use App\Http\Controllers\Auth\LoginController;
 use App\Http\Controllers\Auth\RegisterController;
-<<<<<<< HEAD
-=======
 use App\Http\Controllers\CKEditorController;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 use App\Models\User;
 use App\Http\Controllers\MainController;
 use App\Http\Controllers\HomeController;
 use Illuminate\Support\Facades\Route;
-<<<<<<< HEAD
-=======
 use App\Http\Controllers\Admin\CompanyController;
 use App\Http\Controllers\Admin\Ad_EmployersController;
 use App\Http\Controllers\Admin\MsgAnswersController;
 use App\Http\Controllers\Admin\GroupsController;
 use App\Http\Controllers\PagesController;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 /*
 |--------------------------------------------------------------------------
 | Web Routes
 |--------------------------------------------------------------------------
 |
 | Here is where you can register web routes for your application. These
 | routes are loaded by the RouteServiceProvider within a group which
 | contains the "web" middleware group. Now create something great!
 |
 */
 /*
 Route::get('/', function () {
     return view('welcome');
 })->name('index');
 */
 Route::get('/', [MainController::class, 'index'])->name('index');
 //Роуты авторизации, регистрации, восстановления, аутентификации
 Auth::routes(['verify' => true]);
 //Личный кабинет пользователя
 Route::get('/home', [HomeController::class, 'index'])->name('home');
 /*
 Route::post('resend/verification-email', function (\Illuminate\Http\Request $request) {
     $user = User::where('email',$request->input('email'))->first();
     $user->sendEmailVerificationNotification();
     return 'your response';
 })->middleware('throttle:6,1')->name('verification.resend');
 */
 // Авторизация, регистрация в админку
 Route::group([
     'as' => 'admin.', // имя маршрута, например auth.index
     'prefix' => 'admin', // префикс маршрута, например auth/index
     'middleware' => ['guest'],
 ], function () {
 // Форма регистрации
     Route::get('register', [AdminController::class, 'register'])->name('register');
 // Создание пользователя
     Route::post('register', [AdminController::class, 'create'])->name('create');
 //Форма входа
     Route::get('login', [AdminController::class, 'login'])->name('login');
 // аутентификация
     Route::post('login', [AdminController::class, 'autenticate'])->name('auth');
 });
 // Личный кабинет админки
 Route::group([
     'as' => 'admin.', // имя маршрута, например auth.index
     'prefix' => 'admin', // префикс маршрута, например auth/index
     'middleware' => ['auth'], ['admin'],
 ], function() {
     // выход
     Route::get('logout', [AdminController::class, 'logout'])->name('logout');
     // кабинет главная страница
     Route::get('cabinet', [AdminController::class, 'index'])->name('index');
-<<<<<<< HEAD
-    // кабинет профиль
-    Route::get('profile', [AdminController::class, 'profile'])->name('profile');
-    // кабинет настройки
-    Route::get('config', [AdminController::class, 'config'])->name('config');
-=======
     // кабинет профиль админа - форма
     Route::get('profile', [AdminController::class, 'profile'])->name('profile');
    // кабинет профиль админа - сохранение формы
     Route::post('profile', [AdminController::class, 'store_profile'])->name('store_profile');
     // кабинет профиль - форма пароли
     Route::get('password', [AdminController::class, 'profile_password'])->name('password');
     // кабинет профиль - сохранение формы пароля
     Route::post('password', [AdminController::class, 'profile_password_new'])->name('password');
     // кабинет профиль пользователя - форма
     Route::get('user-profile/{user}', [AdminController::class, 'profile_user'])->name('user-profile');
     // кабинет профиль пользователя - сохранение формы
     Route::post('user-profile/{user}', [AdminController::class, 'store_profile_user'])->name('user-store_profile');
     // кабинет профиль работодатель - форма
     Route::get('employer-profile/{employer}', [EmployersController::class, 'form_update_employer'])->name('employer-profile');
     // кабинет профиль работодатель - сохранение формы
     Route::post('employer-profile/{employer}', [EmployersController::class, 'update_employer'])->name('update-employer-profile');
     // кабинет профиль работник - форма
     Route::post('worker-profile/{worker}', [WorkersController::class, 'form_update_worker'])->name('worker-profile');
     // кабинет настройки сайта - форма
     Route::get('config', [AdminController::class, 'config_form'])->name('config');
     // кабинет настройки сайта сохранение формы
     Route::post('config', [AdminController::class, 'store_config'])->name('store_config');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     // кабинет - пользователи
     Route::get('users', [UsersController::class, 'index'])->name('users');
     // кабинет - пользователи
     Route::get('admin-users', [AdminController::class, 'index_admin'])->name('admin-users');
     // кабинет - работодатели
     Route::get('employers', [EmployersController::class, 'index'])->name('employers');
     // кабинет - соискатели
     Route::get('workers', [WorkersController::class, 'index'])->name('workers');
     // кабинет - вакансии
-<<<<<<< HEAD
-    Route::get('ad-employers', [AdminController::class, 'index'])->name('ad-employers');
-    // кабинет - категории
-    Route::get('categories', [AdminController::class, 'index'])->name('categories');
-    // кабинет - должности
-    Route::get('job-titles', [AdminController::class, 'index'])->name('job-titles');
-    // кабинет - сообщения
-    Route::get('messages', [AdminController::class, 'index'])->name('messages');
-    // кабинет - группы пользователей
-    Route::get('groups', [AdminController::class, 'index'])->name('groups');
-    // кабинет - список админов
-    Route::get('group-admin', [AdminController::class, 'index'])->name('group-admin');
-});
-=======
     Route::get('ad-employers', [Ad_EmployersController::class, 'index'])->name('ad-employers');
     // кабинет - категории
     //Route::get('categories', [AdminController::class, 'index'])->name('categories');
     /*
      * CRUD-операции над Справочником Категории
      */
     Route::resource('categories', CategoryController::class, ['except' => ['show']]);
     //Route::get('job-titles', [AdminController::class, 'index'])->name('job-titles');
     /*
     * кабинет - CRUD-операции по справочнику должности
      *
      */
     Route::resource('job-titles', JobTitlesController::class, ['except' => ['show']]);
     // кабинет - сообщения
     Route::get('messages', [MsgAnswersController::class, 'messages'])->name('messages');
     /*
      * Расписанный подход в описании каждой директорий групп пользователей.
      */
     // кабинет - группы пользователей
     Route::get('groups', [GroupsController::class, 'index'])->name('groups');
     // кабинет - добавление форма группы пользователей
     Route::get('groups/add', [GroupsController::class, 'add'])->name('add-group');
     // кабинет - сохранение формы группы пользователей
     Route::post('groups/add', [GroupsController::class, 'store'])->name('add-group-store');
     // кабинет - редактирование форма группы пользователей
     Route::get('groups/edit/{group}', [GroupsController::class, 'edit'])->name('edit-group');
     // кабинет - сохранение редактированной формы группы пользователей
     Route::post('groups/edit/{group}', [GroupsController::class, 'update'])->name('update-group');
    // кабинет - удаление группы пользователей
     Route::delete('groups/delete/{group}', [GroupsController::class, 'destroy'])->name('delete-group');
     // кабинет - список админов
     Route::get('group-admin', [AdminController::class, 'index'])->name('group-admin');
     /////редактор////// кабинет - редактор сайта////////////////////////
     Route::get('editor-site', function() {
         return view('admin.editor.index');
     })->name('editor-site');
     // кабинет - редактор шапки-футера сайта
     Route::get('edit-blocks', [CompanyController::class, 'editblocks'])->name('edit-blocks');
     // кабинет - редактор должности на главной
     Route::get('job-titles-main', [CompanyController::class, 'job_titles_main'])->name('job-titles-main');
     // кабинет - редактор работодатели на главной
     Route::get('employers-main', [CompanyController::class, 'employers_main'])->name('employers-main');
     // кабинет - редактор seo-сайта
     Route::get('editor-seo', [CompanyController::class, 'editor_seo'])->name('editor-seo');
     Route::get('editor-seo/add', [CompanyController::class, 'editor_seo_add'])->name('add-seo');
     Route::post('editor-seo/add', [CompanyController::class, 'editor_seo_store'])->name('add-seo-store');
     Route::get('editor-seo/edit/{page}', [CompanyController::class, 'editor_seo_edit'])->name('edit-seo');
     Route::put('editor-seo/edit/{page}', [CompanyController::class, 'editor_seo_update'])->name('update-seo');
     Route::delete('editor-seo/delete/{page}', [CompanyController::class, 'editor_seo_destroy'])->name('delete-seo');
     // кабинет - редактор страниц
     Route::get('editor-pages', [CompanyController::class, 'editor_pages'])->name('editor-pages');
     // кабинет - добавление страницы
     Route::get('editor-pages/add', [CompanyController::class, 'editor_pages_add'])->name('add-page');
     // кабинет - сохранение формы страницы
     Route::post('editor-page/add', [CompanyController::class, 'editor_pages_store'])->name('add-page-store');
     // кабинет - редактирование форма страницы
     Route::get('editor-pages/edit/{page}', [CompanyController::class, 'editor_pages_edit'])->name('edit-page');
     // кабинет - сохранение редактированной формы страницы
     Route::put('editor-pages/edit/{page}', [CompanyController::class, 'editor_pages_update'])->name('update-page');
     // кабинет - удаление страницы
     Route::delete('editor-pages/delete/{page}', [CompanyController::class, 'editor_pages_destroy'])->name('delete-page');
     // кабинет - реклама сайта
     Route::get('reclames', [CompanyController::class, 'reclames'])->name('reclames');
     ////////////////////////////////////////////////////////////////////////
     // кабинет - отзывы о работодателе для модерации
     Route::get('answers', [EmployersController::class, 'answers'])->name('answers');
     // Общая страница статистики
     Route::get('statics', function () {
         return view('admin.static.index');
     })->name('statics');
     // кабинет - статистика работников
     Route::get('static-workers', [WorkersController::class, 'static_workers'])->name('static-workers');
     // кабинет - статистика вакансий работодателя
     Route::get('static-ads', [EmployersController::class, 'static_ads'])->name('static-ads');
     // кабинет - справочник - блоки информации (дипломы и документы) для резюме работника
     /*
      * CRUD-операции над справочником дипломы и документы
      */
     //Route::get('infobloks', [WorkersController::class, 'infobloks'])->name('infobloks');
     Route::resource('infobloks', InfoBloksController::class, ['except' => ['show']]);
     // кабинет - роли пользователя
     Route::get('roles', [UsersController::class, 'roles'])->name('roles');
 });
 Route::post('ckeditor/upload', [CKEditorController::class, 'upload'])->name('ckeditor.image-upload');
 Route::get('pages/{pages:slug}', [PagesController::class, 'pages'])->name('page');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b

storage/app/.gitignore 100644 → 100755

Diff comments View file @ 02091c2

1	*	1	*
2	!public/	2	!public/
3	!.gitignore	3	!.gitignore
4		4

storage/app/public/.gitignore 100644 → 100755

Diff comments View file @ 02091c2

1	*	1	*
2	!.gitignore	2	!.gitignore
3		3

storage/framework/.gitignore 100644 → 100755

Diff comments View file @ 02091c2

1	compiled.php	1	compiled.php
2	config.php	2	config.php
3	down	3	down
4	events.scanned.php	4	events.scanned.php
5	maintenance.php	5	maintenance.php
6	routes.php	6	routes.php
7	routes.scanned.php	7	routes.scanned.php
8	schedule-*	8	schedule-*
9	services.json	9	services.json
10		10

storage/framework/cache/.gitignore 100644 → 100755

Diff comments View file @ 02091c2

1	*	1	*
2	!data/	2	!data/
3	!.gitignore	3	!.gitignore
4		4

storage/framework/cache/data/.gitignore 100644 → 100755

Diff comments View file @ 02091c2

1	*	1	*
2	!.gitignore	2	!.gitignore
3		3

storage/framework/sessions/.gitignore 100644 → 100755

Diff comments View file @ 02091c2

1	*	1	*
2	!.gitignore	2	!.gitignore
3		3

storage/framework/testing/.gitignore 100644 → 100755

Diff comments View file @ 02091c2

1	*	1	*
2	!.gitignore	2	!.gitignore
3		3

storage/framework/views/.gitignore 100644 → 100755

Diff comments View file @ 02091c2

1	*	1	*
2	!.gitignore	2	!.gitignore
3		3

storage/logs/.gitignore 100644 → 100755

Diff comments View file @ 02091c2

1	*	1	*
2	!.gitignore	2	!.gitignore
3		3

1	<?php	1	<?php
2		2
3	use Illuminate\Support\Facades\Facade;	3	use Illuminate\Support\Facades\Facade;
4		4
5	return [	5	return [
6		6
7	/*	7	/*
8	\|--------------------------------------------------------------------------	8	\|--------------------------------------------------------------------------
9	\| Application Name	9	\| Application Name
10	\|--------------------------------------------------------------------------	10	\|--------------------------------------------------------------------------
11	\|	11	\|
12	\| This value is the name of your application. This value is used when the	12	\| This value is the name of your application. This value is used when the
13	\| framework needs to place the application's name in a notification or	13	\| framework needs to place the application's name in a notification or
14	\| any other location as required by the application or its packages.	14	\| any other location as required by the application or its packages.
15	\|	15	\|
16	*/	16	*/
17		17
18	'name' => env('APP_NAME', 'Laravel'),	18	'name' => env('APP_NAME', 'Laravel'),
19		19
20	/*	20	/*
21	\|--------------------------------------------------------------------------	21	\|--------------------------------------------------------------------------
22	\| Application Environment	22	\| Application Environment
23	\|--------------------------------------------------------------------------	23	\|--------------------------------------------------------------------------
24	\|	24	\|
25	\| This value determines the "environment" your application is currently	25	\| This value determines the "environment" your application is currently
26	\| running in. This may determine how you prefer to configure various	26	\| running in. This may determine how you prefer to configure various
27	\| services the application utilizes. Set this in your ".env" file.	27	\| services the application utilizes. Set this in your ".env" file.
28	\|	28	\|
29	*/	29	*/
30		30
31	'env' => env('APP_ENV', 'production'),	31	'env' => env('APP_ENV', 'production'),
32		32
33	/*	33	/*
34	\|--------------------------------------------------------------------------	34	\|--------------------------------------------------------------------------
35	\| Application Debug Mode	35	\| Application Debug Mode
36	\|--------------------------------------------------------------------------	36	\|--------------------------------------------------------------------------
37	\|	37	\|
38	\| When your application is in debug mode, detailed error messages with	38	\| When your application is in debug mode, detailed error messages with
39	\| stack traces will be shown on every error that occurs within your	39	\| stack traces will be shown on every error that occurs within your
40	\| application. If disabled, a simple generic error page is shown.	40	\| application. If disabled, a simple generic error page is shown.
41	\|	41	\|
42	*/	42	*/
43		43
44	'debug' => (bool) env('APP_DEBUG', false),	44	'debug' => (bool) env('APP_DEBUG', false),
45		45
46	/*	46	/*
47	\|--------------------------------------------------------------------------	47	\|--------------------------------------------------------------------------
48	\| Application URL	48	\| Application URL
49	\|--------------------------------------------------------------------------	49	\|--------------------------------------------------------------------------
50	\|	50	\|
51	\| This URL is used by the console to properly generate URLs when using	51	\| This URL is used by the console to properly generate URLs when using
52	\| the Artisan command line tool. You should set this to the root of	52	\| the Artisan command line tool. You should set this to the root of
53	\| your application so that it is used when running Artisan tasks.	53	\| your application so that it is used when running Artisan tasks.
54	\|	54	\|
55	*/	55	*/
56		56
57	'url' => env('APP_URL', 'http://localhost'),	57	'url' => env('APP_URL', 'http://localhost'),
58		58
59	'asset_url' => env('ASSET_URL'),	59	'asset_url' => env('ASSET_URL'),
60		60
61	/*	61	/*
62	\|--------------------------------------------------------------------------	62	\|--------------------------------------------------------------------------
63	\| Application Timezone	63	\| Application Timezone
64	\|--------------------------------------------------------------------------	64	\|--------------------------------------------------------------------------
65	\|	65	\|
66	\| Here you may specify the default timezone for your application, which	66	\| Here you may specify the default timezone for your application, which
67	\| will be used by the PHP date and date-time functions. We have gone	67	\| will be used by the PHP date and date-time functions. We have gone
68	\| ahead and set this to a sensible default for you out of the box.	68	\| ahead and set this to a sensible default for you out of the box.
69	\|	69	\|
70	*/	70	*/
71		71
72	'timezone' => 'UTC',	72	'timezone' => 'UTC',
73		73
74	/*	74	/*
75	\|--------------------------------------------------------------------------	75	\|--------------------------------------------------------------------------
76	\| Application Locale Configuration	76	\| Application Locale Configuration
77	\|--------------------------------------------------------------------------	77	\|--------------------------------------------------------------------------
78	\|	78	\|
79	\| The application locale determines the default locale that will be used	79	\| The application locale determines the default locale that will be used
80	\| by the translation service provider. You are free to set this value	80	\| by the translation service provider. You are free to set this value
81	\| to any of the locales which will be supported by the application.	81	\| to any of the locales which will be supported by the application.
82	\|	82	\|
83	*/	83	*/
84		84
85	'locale' => 'en',	85	'locale' => 'en',
86		86
87	/*	87	/*
88	\|--------------------------------------------------------------------------	88	\|--------------------------------------------------------------------------
89	\| Application Fallback Locale	89	\| Application Fallback Locale
90	\|--------------------------------------------------------------------------	90	\|--------------------------------------------------------------------------
91	\|	91	\|
92	\| The fallback locale determines the locale to use when the current one	92	\| The fallback locale determines the locale to use when the current one
93	\| is not available. You may change the value to correspond to any of	93	\| is not available. You may change the value to correspond to any of
94	\| the language folders that are provided through your application.	94	\| the language folders that are provided through your application.
95	\|	95	\|
96	*/	96	*/
97		97
98	'fallback_locale' => 'en',	98	'fallback_locale' => 'en',
99		99
100	/*	100	/*
101	\|--------------------------------------------------------------------------	101	\|--------------------------------------------------------------------------
102	\| Faker Locale	102	\| Faker Locale
103	\|--------------------------------------------------------------------------	103	\|--------------------------------------------------------------------------
104	\|	104	\|
105	\| This locale will be used by the Faker PHP library when generating fake	105	\| This locale will be used by the Faker PHP library when generating fake
106	\| data for your database seeds. For example, this will be used to get	106	\| data for your database seeds. For example, this will be used to get
107	\| localized telephone numbers, street address information and more.	107	\| localized telephone numbers, street address information and more.
108	\|	108	\|
109	*/	109	*/
110		110
111	'faker_locale' => 'en_US',	111	'faker_locale' => 'en_US',
112		112
113	/*	113	/*
114	\|--------------------------------------------------------------------------	114	\|--------------------------------------------------------------------------
115	\| Encryption Key	115	\| Encryption Key
116	\|--------------------------------------------------------------------------	116	\|--------------------------------------------------------------------------
117	\|	117	\|
118	\| This key is used by the Illuminate encrypter service and should be set	118	\| This key is used by the Illuminate encrypter service and should be set
119	\| to a random, 32 character string, otherwise these encrypted strings	119	\| to a random, 32 character string, otherwise these encrypted strings
120	\| will not be safe. Please do this before deploying an application!	120	\| will not be safe. Please do this before deploying an application!
121	\|	121	\|
122	*/	122	*/
123		123
124	'key' => env('APP_KEY'),	124	'key' => env('APP_KEY'),
125		125
126	'cipher' => 'AES-256-CBC',	126	'cipher' => 'AES-256-CBC',
127		127
128	/*	128	/*
129	\|--------------------------------------------------------------------------	129	\|--------------------------------------------------------------------------
130	\| Maintenance Mode Driver	130	\| Maintenance Mode Driver
131	\|--------------------------------------------------------------------------	131	\|--------------------------------------------------------------------------
132	\|	132	\|
133	\| These configuration options determine the driver used to determine and	133	\| These configuration options determine the driver used to determine and
134	\| manage Laravel's "maintenance mode" status. The "cache" driver will	134	\| manage Laravel's "maintenance mode" status. The "cache" driver will
135	\| allow maintenance mode to be controlled across multiple machines.	135	\| allow maintenance mode to be controlled across multiple machines.
136	\|	136	\|
137	\| Supported drivers: "file", "cache"	137	\| Supported drivers: "file", "cache"
138	\|	138	\|
139	*/	139	*/
140		140
141	'maintenance' => [	141	'maintenance' => [
142	'driver' => 'file',	142	'driver' => 'file',
143	// 'store' => 'redis',	143	// 'store' => 'redis',
144	],	144	],
145		145
146	/*	146	/*
147	\|--------------------------------------------------------------------------	147	\|--------------------------------------------------------------------------
148	\| Autoloaded Service Providers	148	\| Autoloaded Service Providers
149	\|--------------------------------------------------------------------------	149	\|--------------------------------------------------------------------------
150	\|	150	\|
151	\| The service providers listed here will be automatically loaded on the	151	\| The service providers listed here will be automatically loaded on the
152	\| request to your application. Feel free to add your own services to	152	\| request to your application. Feel free to add your own services to
153	\| this array to grant expanded functionality to your applications.	153	\| this array to grant expanded functionality to your applications.
154	\|	154	\|
155	*/	155	*/
156		156
157	'providers' => [	157	'providers' => [
158		158
159	/*	159	/*
160	* Laravel Framework Service Providers...	160	* Laravel Framework Service Providers...
161	*/	161	*/
162	Illuminate\Auth\AuthServiceProvider::class,	162	Illuminate\Auth\AuthServiceProvider::class,
163	Illuminate\Broadcasting\BroadcastServiceProvider::class,	163	Illuminate\Broadcasting\BroadcastServiceProvider::class,
164	Illuminate\Bus\BusServiceProvider::class,	164	Illuminate\Bus\BusServiceProvider::class,
165	Illuminate\Cache\CacheServiceProvider::class,	165	Illuminate\Cache\CacheServiceProvider::class,
166	Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,	166	Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
167	Illuminate\Cookie\CookieServiceProvider::class,	167	Illuminate\Cookie\CookieServiceProvider::class,
168	Illuminate\Database\DatabaseServiceProvider::class,	168	Illuminate\Database\DatabaseServiceProvider::class,
169	Illuminate\Encryption\EncryptionServiceProvider::class,	169	Illuminate\Encryption\EncryptionServiceProvider::class,
170	Illuminate\Filesystem\FilesystemServiceProvider::class,	170	Illuminate\Filesystem\FilesystemServiceProvider::class,
171	Illuminate\Foundation\Providers\FoundationServiceProvider::class,	171	Illuminate\Foundation\Providers\FoundationServiceProvider::class,
172	Illuminate\Hashing\HashServiceProvider::class,	172	Illuminate\Hashing\HashServiceProvider::class,
173	Illuminate\Mail\MailServiceProvider::class,	173	Illuminate\Mail\MailServiceProvider::class,
174	Illuminate\Notifications\NotificationServiceProvider::class,	174	Illuminate\Notifications\NotificationServiceProvider::class,
175	Illuminate\Pagination\PaginationServiceProvider::class,	175	Illuminate\Pagination\PaginationServiceProvider::class,
176	Illuminate\Pipeline\PipelineServiceProvider::class,	176	Illuminate\Pipeline\PipelineServiceProvider::class,
177	Illuminate\Queue\QueueServiceProvider::class,	177	Illuminate\Queue\QueueServiceProvider::class,
178	Illuminate\Redis\RedisServiceProvider::class,	178	Illuminate\Redis\RedisServiceProvider::class,
179	Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,	179	Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
180	Illuminate\Session\SessionServiceProvider::class,	180	Illuminate\Session\SessionServiceProvider::class,
181	Illuminate\Translation\TranslationServiceProvider::class,	181	Illuminate\Translation\TranslationServiceProvider::class,
182	Illuminate\Validation\ValidationServiceProvider::class,	182	Illuminate\Validation\ValidationServiceProvider::class,
183	Illuminate\View\ViewServiceProvider::class,	183	Illuminate\View\ViewServiceProvider::class,
184		184
185	/*	185	/*
186	* Package Service Providers...	186	* Package Service Providers...
187	*/	187	*/
188		188
189	/*	189	/*
190	* Application Service Providers...	190	* Application Service Providers...
191	*/	191	*/
192	App\Providers\AppServiceProvider::class,	192	App\Providers\AppServiceProvider::class,
193	App\Providers\AuthServiceProvider::class,	193	App\Providers\AuthServiceProvider::class,
194	// App\Providers\BroadcastServiceProvider::class,	194	// App\Providers\BroadcastServiceProvider::class,
195	App\Providers\EventServiceProvider::class,	195	App\Providers\EventServiceProvider::class,
196	App\Providers\RouteServiceProvider::class,	196	App\Providers\RouteServiceProvider::class,
197	<<<<<<< HEAD
198
199	=======
200	App\Providers\MyServiceProvider::class,	197	App\Providers\MyServiceProvider::class,
201	>>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b	198
202	],	199	],
203		200
204	/*	201	/*
205	\|--------------------------------------------------------------------------	202	\|--------------------------------------------------------------------------
206	\| Class Aliases	203	\| Class Aliases
207	\|--------------------------------------------------------------------------	204	\|--------------------------------------------------------------------------
208	\|	205	\|
209	\| This array of class aliases will be registered when this application	206	\| This array of class aliases will be registered when this application
210	\| is started. However, feel free to register as many as you wish as	207	\| is started. However, feel free to register as many as you wish as
211	\| the aliases are "lazy" loaded so they don't hinder performance.	208	\| the aliases are "lazy" loaded so they don't hinder performance.
212	\|	209	\|
213	*/	210	*/
214		211
215	'aliases' => Facade::defaultAliases()->merge([	212	'aliases' => Facade::defaultAliases()->merge([
216	// 'ExampleClass' => App\Example\ExampleClass::class,	213	// 'ExampleClass' => App\Example\ExampleClass::class,
217	])->toArray(),	214	])->toArray(),
218		215
219	];	216	];
220		217