From 02091c25ac61098c4f125c725575f7892b37d26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=20=D0=9B=D0=B0=D1=80?= =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Tue, 12 Sep 2023 16:39:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A2=D1=80=D0=B5=D1=82=D1=8C=D0=B5=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B8=D1?= =?UTF-8?q?=81=D1=82=D0=B5=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/EmployersController.php | 8 - app/Http/Controllers/Admin/UsersController.php | 15 -- app/Http/Controllers/Admin/WorkersController.php | 6 - app/Models/Ad_employer.php | 3 - app/Models/Category.php | 3 - app/Models/Employer.php | 6 - app/Models/Group_user.php | 3 - app/Models/Job_title.php | 3 - app/Models/Message.php | 3 - app/Models/User.php | 19 -- app/Models/Worker.php | 6 - composer.json | 4 - config/app.php | 5 +- ...23_05_16_081308_create_static_workers_table.php | 4 - .../2023_05_16_081330_create_static_ads_table.php | 4 - .../2023_05_16_092746_alter_ad_jobs_table.php | 5 - database/seeders/DatabaseSeeder.php | 3 - resources/views/admin/config.blade.php | 271 -------------------- resources/views/admin/employer/index.blade.php | 18 -- .../views/admin/employer/index_ajax.blade.php | 11 - resources/views/admin/index.blade.php | 17 -- resources/views/admin/profile.blade.php | 45 ---- resources/views/admin/users/index.blade.php | 70 ----- resources/views/admin/users/index_ajax.blade.php | 13 - resources/views/admin/worker/index.blade.php | 20 -- resources/views/admin/worker/index_ajax.blade.php | 177 ------------- resources/views/layout/admin.blade.php | 216 ---------------- routes/web.php | 38 --- 28 files changed, 1 insertion(+), 995 deletions(-) mode change 100644 => 100755 storage/app/.gitignore mode change 100644 => 100755 storage/app/public/.gitignore mode change 100644 => 100755 storage/framework/.gitignore mode change 100644 => 100755 storage/framework/cache/.gitignore mode change 100644 => 100755 storage/framework/cache/data/.gitignore mode change 100644 => 100755 storage/framework/sessions/.gitignore mode change 100644 => 100755 storage/framework/testing/.gitignore mode change 100644 => 100755 storage/framework/views/.gitignore mode change 100644 => 100755 storage/logs/.gitignore diff --git a/app/Http/Controllers/Admin/EmployersController.php b/app/Http/Controllers/Admin/EmployersController.php index 5ef6a60..a3dfb36 100644 --- a/app/Http/Controllers/Admin/EmployersController.php +++ b/app/Http/Controllers/Admin/EmployersController.php @@ -3,17 +3,12 @@ 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 { @@ -31,8 +26,6 @@ class EmployersController extends Controller return view('admin.employer.index', compact('users')); } } -<<<<<<< HEAD -======= public function form_update_employer(Employer $employer) { return view('admin.employer.edit', compact('employer')); @@ -119,5 +112,4 @@ class EmployersController extends Controller } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/app/Http/Controllers/Admin/UsersController.php b/app/Http/Controllers/Admin/UsersController.php index 6d9372b..57bbbd3 100644 --- a/app/Http/Controllers/Admin/UsersController.php +++ b/app/Http/Controllers/Admin/UsersController.php @@ -5,19 +5,13 @@ 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'); @@ -27,14 +21,6 @@ class UsersController extends Controller $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')); @@ -56,5 +42,4 @@ class UsersController extends Controller return view('admin.users.roles.index', compact('users')); } } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/app/Http/Controllers/Admin/WorkersController.php b/app/Http/Controllers/Admin/WorkersController.php index 9ac8498..9c287d7 100644 --- a/app/Http/Controllers/Admin/WorkersController.php +++ b/app/Http/Controllers/Admin/WorkersController.php @@ -4,10 +4,7 @@ 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 @@ -27,8 +24,6 @@ class WorkersController extends Controller return view('admin.worker.index', compact('users')); } } -<<<<<<< HEAD -======= public function form_update_worker(Worker $worker) { return view('admin.worker.edit'); @@ -39,5 +34,4 @@ class WorkersController extends Controller return; } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/app/Models/Ad_employer.php b/app/Models/Ad_employer.php index 610d06b..2bd9d4d 100644 --- a/app/Models/Ad_employer.php +++ b/app/Models/Ad_employer.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model; class Ad_employer extends Model { use HasFactory; -<<<<<<< HEAD -======= protected $fillable = [ 'name', @@ -51,5 +49,4 @@ class Ad_employer extends Model public function scopeActive($query) { return $query->where('is_remove', '=', '0'); } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/app/Models/Category.php b/app/Models/Category.php index 3ce6823..5434c3e 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model; class Category extends Model { use HasFactory; -<<<<<<< HEAD -======= protected $fillable = [ 'name', @@ -19,5 +17,4 @@ class Category extends Model public function scopeActive($query) { return $query->where('is_remove', '=', '0'); } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/app/Models/Employer.php b/app/Models/Employer.php index 6c7a341..78cc299 100644 --- a/app/Models/Employer.php +++ b/app/Models/Employer.php @@ -21,15 +21,12 @@ class Employer extends Model 'address', 'map', 'site', -<<<<<<< HEAD -======= 'coord', 'plus', 'is_remove', 'oficial_status', 'social_is', 'sending_is', ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b ]; /* @@ -39,8 +36,6 @@ class Employer extends Model return $this->belongsTo(User::class, 'user_id'); } -<<<<<<< HEAD -======= /* * Связь Работодателя с вакансиями */ @@ -52,5 +47,4 @@ class Employer extends Model return $query->where('is_remove', '=', '0'); } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/app/Models/Group_user.php b/app/Models/Group_user.php index 40dce84..4a135c9 100644 --- a/app/Models/Group_user.php +++ b/app/Models/Group_user.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model; class Group_user extends Model { use HasFactory; -<<<<<<< HEAD -======= protected $fillable = [ 'name_group', @@ -45,5 +43,4 @@ class Group_user extends Model return $query->where('is_remove', '=', '0'); } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/app/Models/Job_title.php b/app/Models/Job_title.php index e2b366b..ff9bb38 100644 --- a/app/Models/Job_title.php +++ b/app/Models/Job_title.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model; class Job_title extends Model { use HasFactory; -<<<<<<< HEAD -======= protected $fillable = [ 'name', @@ -34,5 +32,4 @@ class Job_title extends Model public function scopeActive($query) { return $query->where('is_remove', '=', '0'); } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/app/Models/Message.php b/app/Models/Message.php index 1086f93..fcb867d 100644 --- a/app/Models/Message.php +++ b/app/Models/Message.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model; class Message extends Model { use HasFactory; -<<<<<<< HEAD -======= /* * Связь таблицы Message с таблицей User (Отправитель) @@ -31,5 +29,4 @@ class Message extends Model public function response() { return $this->hasMany(ad_response::class); } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/app/Models/User.php b/app/Models/User.php index eea8cbb..d12dbf4 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -59,11 +59,7 @@ class User extends Authenticatable * users - employers */ public function employers() { -<<<<<<< HEAD - return $this->hasMany(Employer::class); -======= return $this->hasMany(Employer::class, 'user_id'); ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } /* @@ -71,17 +67,6 @@ class User extends Authenticatable * 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'); } @@ -92,7 +77,6 @@ class User extends Authenticatable */ public function ingroup() { return $this->belongsToMany(Group_user::class, 'group_works'); ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } /* @@ -111,8 +95,6 @@ class User extends Authenticatable return $this->hasMany(Static_worker::class); } -<<<<<<< HEAD -======= /* * Связь модели Юзеры (users) с моделью Группы пользователей (Group_works) один-ко-многим @@ -124,6 +106,5 @@ class User extends Authenticatable public function scopeActive($query) { return $query->where('is_remove', '=', '0'); } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/app/Models/Worker.php b/app/Models/Worker.php index 5b11206..d5ab505 100644 --- a/app/Models/Worker.php +++ b/app/Models/Worker.php @@ -39,12 +39,9 @@ class Worker extends Model 'text', 'address', 'city', -<<<<<<< HEAD -======= 'coord', 'file', 'is_remove', ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b ]; /* @@ -53,11 +50,8 @@ class Worker extends Model public function users() { return $this->belongsTo(User::class, 'user_id'); } -<<<<<<< HEAD -======= public function scopeActive($query) { return $query->where('is_remove', '=', '0'); } ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b } diff --git a/composer.json b/composer.json index d9d44f9..5593579 100644 --- a/composer.json +++ b/composer.json @@ -14,12 +14,8 @@ "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", diff --git a/config/app.php b/config/app.php index 39cb54e..fa866cd 100644 --- a/config/app.php +++ b/config/app.php @@ -194,11 +194,8 @@ return [ // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, -<<<<<<< HEAD - -======= App\Providers\MyServiceProvider::class, ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b + ], /* diff --git a/database/migrations/2023_05_16_081308_create_static_workers_table.php b/database/migrations/2023_05_16_081308_create_static_workers_table.php index b8b3730..201ee02 100644 --- a/database/migrations/2023_05_16_081308_create_static_workers_table.php +++ b/database/migrations/2023_05_16_081308_create_static_workers_table.php @@ -17,10 +17,6 @@ return new class extends Migration $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(); }); diff --git a/database/migrations/2023_05_16_081330_create_static_ads_table.php b/database/migrations/2023_05_16_081330_create_static_ads_table.php index 7fe6d7a..aed2843 100644 --- a/database/migrations/2023_05_16_081330_create_static_ads_table.php +++ b/database/migrations/2023_05_16_081330_create_static_ads_table.php @@ -17,10 +17,6 @@ return new class extends Migration $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(); }); diff --git a/database/migrations/2023_05_16_092746_alter_ad_jobs_table.php b/database/migrations/2023_05_16_092746_alter_ad_jobs_table.php index a9c47e3..83389dd 100644 --- a/database/migrations/2023_05_16_092746_alter_ad_jobs_table.php +++ b/database/migrations/2023_05_16_092746_alter_ad_jobs_table.php @@ -15,11 +15,6 @@ return new class extends Migration { 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(); }); } diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 6b42ca2..dcb8859 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -14,8 +14,6 @@ class DatabaseSeeder extends Seeder */ public function run() { -<<<<<<< HEAD -======= $this->call(EmployersMainSeeder::class); $this->command->info('Таблица работодатели на главной загружена!'); @@ -23,7 +21,6 @@ class DatabaseSeeder extends Seeder $this->command->info('Таблица должности на главной загружена!'); ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b // \App\Models\User::factory(10)->create(); // \App\Models\User::factory()->create([ diff --git a/resources/views/admin/config.blade.php b/resources/views/admin/config.blade.php index 2c0eecd..b3b25de 100644 --- a/resources/views/admin/config.blade.php +++ b/resources/views/admin/config.blade.php @@ -1,276 +1,6 @@ @extends('layout.admin', ['title' => 'Админка - Настройки']) @section('content') -<<<<<<< HEAD -

- Elements -

-
- - -
- - Account Type - -
- - -
-
- - - - - - - -
- -
-
- - -

- Validation -

-
- - - - - - - - -
- - -

- Icons -

-
- - - -
- - -

- Buttons -

-
- - - -
-=======

Реквизиты сайта (конфигурация)

@@ -456,5 +186,4 @@ ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b @endsection diff --git a/resources/views/admin/employer/index.blade.php b/resources/views/admin/employer/index.blade.php index e500afb..5471ebb 100644 --- a/resources/views/admin/employer/index.blade.php +++ b/resources/views/admin/employer/index.blade.php @@ -22,11 +22,7 @@ success: function (data) { console.log('Обновление таблицы пользователей '); //data = JSON.parse(data); -<<<<<<< HEAD - console.log(data); -======= //console.log(data); ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b ajax_block.html(data); }, headers: { @@ -42,8 +38,6 @@ @endsection -<<<<<<< HEAD -======= @section('search')
@endsection ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b @section('content')
@@ -88,11 +81,7 @@ Имя Дата регистрации Изменить -<<<<<<< HEAD - Блокировать -======= Бан ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b @@ -128,12 +117,6 @@ {{ $user->created_at }} -<<<<<<< HEAD - Изменить - - - is_ban) ? "checked" : "" }}/> -======= @if ($user->id > 1) Изменить @endif @@ -142,7 +125,6 @@ @if ($user->id > 1) is_ban) ? "checked" : "" }}/> @endif ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b @endforeach diff --git a/resources/views/admin/employer/index_ajax.blade.php b/resources/views/admin/employer/index_ajax.blade.php index 6906e43..4b39960 100644 --- a/resources/views/admin/employer/index_ajax.blade.php +++ b/resources/views/admin/employer/index_ajax.blade.php @@ -10,11 +10,7 @@ Имя Дата регистрации Изменить -<<<<<<< HEAD - Блокировать -======= Бан ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b @@ -50,12 +46,6 @@ {{ $user->created_at }} -<<<<<<< HEAD - Изменить - - - is_ban) ? "checked" : "" }}/> -======= @if ($user->id > 1) Изменить @endif @@ -64,7 +54,6 @@ @if ($user->id > 1) is_ban) ? "checked" : "" }}/> @endif ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b @endforeach diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 826d609..9a1dbcb 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -214,11 +214,7 @@
-<<<<<<< HEAD -

Категории

-=======

Категории

->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b

Справочник категории (по умолчанию: река, море, река-море)

@@ -245,15 +241,9 @@
-<<<<<<< HEAD -

Должности

-

- Все должности -=======

Должности

Справочник должности (все должности проекта) ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b

@@ -278,8 +268,6 @@
-<<<<<<< HEAD -=======

Документы-Дипломы

Справочник документы-дипломы (все блоки-документы необходимые соискателю) @@ -307,7 +295,6 @@

->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b

Сообщения

Все сообщения сайта @@ -355,9 +342,6 @@ -<<<<<<< HEAD - -=======

@@ -464,7 +448,6 @@ сентябрь 2023 ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b - {{ $user->name }} - - - {{ $user->email }} - - - - @if ($user->is_worker) - Работник - @else - Работодатель - @endif - - @if ($user->admin) - - Администратор - - @endif - - - {{ $user->created_at }} - - - @endforeach - - -
- -
- appends($_GET)->links('admin.pagginate'); ?> -
- - - -
- - appends($_GET)->links('catalogs.paginate'); ?> - - -@endsection -=======
@@ -247,4 +71,3 @@
appends($_GET)->links('admin.pagginate'); ?>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b diff --git a/resources/views/layout/admin.blade.php b/resources/views/layout/admin.blade.php index 6262d1b..40d0f23 100644 --- a/resources/views/layout/admin.blade.php +++ b/resources/views/layout/admin.blade.php @@ -27,15 +27,8 @@ class="z-20 hidden w-64 overflow-y-auto bg-white dark:bg-gray-800 md:block flex-shrink-0" >
-<<<<<<< HEAD - -======= ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b Админка -<<<<<<< HEAD -======= ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
    • ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b @@ -1010,31 +820,8 @@
    -<<<<<<< HEAD -
    - -
    - -======= @yield('search') ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b