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

Download as
Browse Code »

Commit 02091c25ac61098c4f125c725575f7892b37d26e

Authored by Андрей Ларионов
1 parent e878fca705
Exists in master

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

Showing 37 changed files with 1 additions and 995 deletions Side-by-side Diff

app/Http/Controllers/Admin/EmployersController.php
Diff comments   View file @ 02091c2
... ... @@ -3,17 +3,12 @@
3 3 namespace App\Http\Controllers\Admin;
4 4  
5 5 use App\Http\Controllers\Controller;
6   -<<<<<<< HEAD
7   -use App\Models\User;
8   -use Illuminate\Http\Request;
9   -=======
10 6 use App\Models\Answer;
11 7 use App\Models\Employer;
12 8 use App\Models\User;
13 9 use Illuminate\Http\Request;
14 10 use Illuminate\Support\Facades\Storage;
15 11 use Illuminate\Support\Facades\Validator;
16   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
17 12  
18 13 class EmployersController extends Controller
19 14 {
... ... @@ -31,8 +26,6 @@ class EmployersController extends Controller
31 26 return view('admin.employer.index', compact('users'));
32 27 }
33 28 }
34   -<<<<<<< HEAD
35   -=======
36 29  
37 30 public function form_update_employer(Employer $employer) {
38 31 return view('admin.employer.edit', compact('employer'));
... ... @@ -119,5 +112,4 @@ class EmployersController extends Controller
119 112 }
120 113  
121 114  
122   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
123 115 }
app/Http/Controllers/Admin/UsersController.php
Diff comments   View file @ 02091c2
... ... @@ -5,19 +5,13 @@ namespace App\Http\Controllers\Admin;
5 5 use App\Http\Controllers\Controller;
6 6 use App\Models\User;
7 7 use Illuminate\Http\Request;
8   -<<<<<<< HEAD
9   -=======
10 8 use Illuminate\Support\Facades\Auth;
11   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
12 9  
13 10 class UsersController extends Controller
14 11 {
15 12 public function index(Request $request) {
16   -<<<<<<< HEAD
17   -=======
18 13 $title = 'Админка - Пользователи системы';
19 14 $id_admin = Auth::user()->id;
20   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
21 15 if ($request->ajax()) {
22 16 $user = User::find($request->id);
23 17 $request->offsetUnset('id');
... ... @@ -27,14 +21,6 @@ class UsersController extends Controller
27 21 $users = User::query()->paginate(15);
28 22  
29 23 if ($request->ajax()) {
30   -<<<<<<< HEAD
31   - return view('admin.users.index_ajax', compact('users'));
32   - } else {
33   - return view('admin.users.index', compact('users'));
34   - }
35   - }
36   -
37   -=======
38 24 return view('admin.users.index_ajax', compact('users', 'id_admin'));
39 25 } else {
40 26 return view('admin.users.index', compact('users', 'title', 'id_admin'));
... ... @@ -56,5 +42,4 @@ class UsersController extends Controller
56 42 return view('admin.users.roles.index', compact('users'));
57 43 }
58 44 }
59   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
60 45 }
app/Http/Controllers/Admin/WorkersController.php
Diff comments   View file @ 02091c2
... ... @@ -4,10 +4,7 @@ namespace App\Http\Controllers\Admin;
4 4  
5 5 use App\Http\Controllers\Controller;
6 6 use App\Models\User;
7   -<<<<<<< HEAD
8   -=======
9 7 use App\Models\Worker;
10   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
11 8 use Illuminate\Http\Request;
12 9  
13 10 class WorkersController extends Controller
... ... @@ -27,8 +24,6 @@ class WorkersController extends Controller
27 24 return view('admin.worker.index', compact('users'));
28 25 }
29 26 }
30   -<<<<<<< HEAD
31   -=======
32 27  
33 28 public function form_update_worker(Worker $worker) {
34 29 return view('admin.worker.edit');
... ... @@ -39,5 +34,4 @@ class WorkersController extends Controller
39 34 return;
40 35 }
41 36  
42   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
43 37 }
app/Models/Ad_employer.php
Diff comments   View file @ 02091c2
... ... @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model;
8 8 class Ad_employer extends Model
9 9 {
10 10 use HasFactory;
11   -<<<<<<< HEAD
12   -=======
13 11  
14 12 protected $fillable = [
15 13 'name',
... ... @@ -51,5 +49,4 @@ class Ad_employer extends Model
51 49 public function scopeActive($query) {
52 50 return $query->where('is_remove', '=', '0');
53 51 }
54   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
55 52 }
app/Models/Category.php
Diff comments   View file @ 02091c2
... ... @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model;
8 8 class Category extends Model
9 9 {
10 10 use HasFactory;
11   -<<<<<<< HEAD
12   -=======
13 11  
14 12 protected $fillable = [
15 13 'name',
... ... @@ -19,5 +17,4 @@ class Category extends Model
19 17 public function scopeActive($query) {
20 18 return $query->where('is_remove', '=', '0');
21 19 }
22   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
23 20 }
app/Models/Employer.php
Diff comments   View file @ 02091c2
... ... @@ -21,15 +21,12 @@ class Employer extends Model
21 21 'address',
22 22 'map',
23 23 'site',
24   -<<<<<<< HEAD
25   -=======
26 24 'coord',
27 25 'plus',
28 26 'is_remove',
29 27 'oficial_status',
30 28 'social_is',
31 29 'sending_is',
32   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
33 30 ];
34 31  
35 32 /*
... ... @@ -39,8 +36,6 @@ class Employer extends Model
39 36 return $this->belongsTo(User::class, 'user_id');
40 37 }
41 38  
42   -<<<<<<< HEAD
43   -=======
44 39 /*
45 40 * Связь Работодателя с вакансиями
46 41 */
... ... @@ -52,5 +47,4 @@ class Employer extends Model
52 47 return $query->where('is_remove', '=', '0');
53 48 }
54 49  
55   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
56 50 }
app/Models/Group_user.php
Diff comments   View file @ 02091c2
... ... @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model;
8 8 class Group_user extends Model
9 9 {
10 10 use HasFactory;
11   -<<<<<<< HEAD
12   -=======
13 11  
14 12 protected $fillable = [
15 13 'name_group',
... ... @@ -45,5 +43,4 @@ class Group_user extends Model
45 43 return $query->where('is_remove', '=', '0');
46 44 }
47 45  
48   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
49 46 }
app/Models/Job_title.php
Diff comments   View file @ 02091c2
... ... @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model;
8 8 class Job_title extends Model
9 9 {
10 10 use HasFactory;
11   -<<<<<<< HEAD
12   -=======
13 11  
14 12 protected $fillable = [
15 13 'name',
... ... @@ -34,5 +32,4 @@ class Job_title extends Model
34 32 public function scopeActive($query) {
35 33 return $query->where('is_remove', '=', '0');
36 34 }
37   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
38 35 }
app/Models/Message.php
Diff comments   View file @ 02091c2
... ... @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model;
8 8 class Message extends Model
9 9 {
10 10 use HasFactory;
11   -<<<<<<< HEAD
12   -=======
13 11  
14 12 /*
15 13 * Связь таблицы Message с таблицей User (Отправитель)
... ... @@ -31,5 +29,4 @@ class Message extends Model
31 29 public function response() {
32 30 return $this->hasMany(ad_response::class);
33 31 }
34   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
35 32 }
... ... @@ -59,11 +59,7 @@ class User extends Authenticatable
59 59 * users - employers
60 60 */
61 61 public function employers() {
62   -<<<<<<< HEAD
63   - return $this->hasMany(Employer::class);
64   -=======
65 62 return $this->hasMany(Employer::class, 'user_id');
66   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
67 63 }
68 64  
69 65 /*
... ... @@ -71,17 +67,6 @@ class User extends Authenticatable
71 67 * users - workers
72 68 */
73 69 public function workers() {
74   -<<<<<<< HEAD
75   - return $this->hasMany(Worker::class);
76   - }
77   -
78   - /*
79   - * Связь Пользователей системы с группами юзеров
80   - * users - group_users
81   - */
82   - public function groups() {
83   - return $this->hasMany(Group_user::class);
84   -=======
85 70 return $this->hasMany(Worker::class, 'user_id');
86 71 }
87 72  
... ... @@ -92,7 +77,6 @@ class User extends Authenticatable
92 77 */
93 78 public function ingroup() {
94 79 return $this->belongsToMany(Group_user::class, 'group_works');
95   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
96 80 }
97 81  
98 82 /*
... ... @@ -111,8 +95,6 @@ class User extends Authenticatable
111 95 return $this->hasMany(Static_worker::class);
112 96 }
113 97  
114   -<<<<<<< HEAD
115   -=======
116 98 /*
117 99 * Связь модели Юзеры (users) с моделью Группы пользователей (Group_works)
118 100 один-ко-многим
... ... @@ -124,6 +106,5 @@ class User extends Authenticatable
124 106 public function scopeActive($query) {
125 107 return $query->where('is_remove', '=', '0');
126 108 }
127   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
128 109  
129 110 }
app/Models/Worker.php
Diff comments   View file @ 02091c2
... ... @@ -39,12 +39,9 @@ class Worker extends Model
39 39 'text',
40 40 'address',
41 41 'city',
42   -<<<<<<< HEAD
43   -=======
44 42 'coord',
45 43 'file',
46 44 'is_remove',
47   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
48 45 ];
49 46  
50 47 /*
... ... @@ -53,11 +50,8 @@ class Worker extends Model
53 50 public function users() {
54 51 return $this->belongsTo(User::class, 'user_id');
55 52 }
56   -<<<<<<< HEAD
57   -=======
58 53  
59 54 public function scopeActive($query) {
60 55 return $query->where('is_remove', '=', '0');
61 56 }
62   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
63 57 }
... ... @@ -14,12 +14,8 @@
14 14 "laravel/framework": "^9.19",
15 15 "laravel/sanctum": "^3.0",
16 16 "laravel/tinker": "^2.7",
17   -<<<<<<< HEAD
18   - "laravel/ui": "^4.2"
19   -=======
20 17 "laravel/ui": "^4.2",
21 18 "ext-http": "*"
22   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
23 19 },
24 20 "require-dev": {
25 21 "fakerphp/faker": "^1.9.1",
... ... @@ -194,11 +194,8 @@ return [
194 194 // App\Providers\BroadcastServiceProvider::class,
195 195 App\Providers\EventServiceProvider::class,
196 196 App\Providers\RouteServiceProvider::class,
197   -<<<<<<< HEAD
198   -
199   -=======
200 197 App\Providers\MyServiceProvider::class,
201   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
  198 +
202 199 ],
203 200  
204 201 /*
database/migrations/2023_05_16_081308_create_static_workers_table.php
Diff comments   View file @ 02091c2
... ... @@ -17,10 +17,6 @@ return new class extends Migration
17 17 $table->id();
18 18 $table->bigInteger('user_id')->nullable(false);
19 19 $table->integer('lookin')->default(0);
20   -<<<<<<< HEAD
21   - $table->string('month_year', 255)->nullable();
22   -=======
23   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
24 20 $table->integer('message')->default(0);
25 21 $table->timestamps();
26 22 });
database/migrations/2023_05_16_081330_create_static_ads_table.php
Diff comments   View file @ 02091c2
... ... @@ -17,10 +17,6 @@ return new class extends Migration
17 17 $table->id();
18 18 $table->bigInteger('ad_employer_id')->nullable(false);
19 19 $table->integer('lookin')->default(0);
20   -<<<<<<< HEAD
21   - $table->string('month_year', 255)->nullable();
22   -=======
23   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
24 20 $table->integer('message')->default(0);
25 21 $table->timestamps();
26 22 });
database/migrations/2023_05_16_092746_alter_ad_jobs_table.php
Diff comments   View file @ 02091c2
... ... @@ -15,11 +15,6 @@ return new class extends Migration
15 15 {
16 16 Schema::create('ad_jobs', function (Blueprint $table) {
17 17 $table->id();
18   -<<<<<<< HEAD
19   - $table->bigInteger('ad_employer_id')->nullable(false);
20   - $table->bigInteger('job_title_id')->nullable(false);
21   -=======
22   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
23 18 $table->timestamps();
24 19 });
25 20 }
database/seeders/DatabaseSeeder.php
Diff comments   View file @ 02091c2
... ... @@ -14,8 +14,6 @@ class DatabaseSeeder extends Seeder
14 14 */
15 15 public function run()
16 16 {
17   -<<<<<<< HEAD
18   -=======
19 17 $this->call(EmployersMainSeeder::class);
20 18 $this->command->info('Таблица работодатели на главной загружена!');
21 19  
... ... @@ -23,7 +21,6 @@ class DatabaseSeeder extends Seeder
23 21 $this->command->info('Таблица должности на главной загружена!');
24 22  
25 23  
26   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
27 24 // \App\Models\User::factory(10)->create();
28 25  
29 26 // \App\Models\User::factory()->create([
resources/views/admin/config.blade.php
Diff comments   View file @ 02091c2
1 1 @extends('layout.admin', ['title' => 'Админка - Настройки'])
2 2  
3 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 4 <h4 class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300">
275 5 Реквизиты сайта (конфигурация)
276 6 </h4>
... ... @@ -456,5 +186,4 @@
456 186 </div>
457 187 </div>
458 188 </form>
459   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
460 189 @endsection
resources/views/admin/employer/index.blade.php
Diff comments   View file @ 02091c2
... ... @@ -22,11 +22,7 @@
22 22 success: function (data) {
23 23 console.log('Обновление таблицы пользователей ');
24 24 //data = JSON.parse(data);
25   -<<<<<<< HEAD
26   - console.log(data);
27   -=======
28 25 //console.log(data);
29   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
30 26 ajax_block.html(data);
31 27 },
32 28 headers: {
... ... @@ -42,8 +38,6 @@
42 38 </script>
43 39 @endsection
44 40  
45   -<<<<<<< HEAD
46   -=======
47 41 @section('search')
48 42 <div class="absolute inset-y-0 flex items-center pl-2">
49 43 <svg
... ... @@ -73,7 +67,6 @@
73 67 </form>
74 68 @endsection
75 69  
76   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
77 70 @section('content')
78 71 <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
79 72 <div class="w-full overflow-x-auto">
... ... @@ -88,11 +81,7 @@
88 81 <th class="px-4 py-3">Имя</th>
89 82 <th class="px-4 py-3">Дата регистрации</th>
90 83 <th class="px-4 py-3">Изменить</th>
91   -<<<<<<< HEAD
92   - <th class="px-4 py-3">Блокировать</th>
93   -=======
94 84 <th class="px-4 py-3">Бан</th>
95   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
96 85 </tr>
97 86 </thead>
98 87 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
... ... @@ -128,12 +117,6 @@
128 117 {{ $user->created_at }}
129 118 </td>
130 119 <td class="px-4 py-3 text-sm">
131   -<<<<<<< HEAD
132   - <a href="">Изменить</a>
133   - </td>
134   - <td class="px-4 py-3 text-sm">
135   - <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
136   -=======
137 120 @if ($user->id > 1)
138 121 <a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>
139 122 @endif
... ... @@ -142,7 +125,6 @@
142 125 @if ($user->id > 1)
143 126 <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
144 127 @endif
145   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
146 128 </td>
147 129 </tr>
148 130 @endforeach
resources/views/admin/employer/index_ajax.blade.php
Diff comments   View file @ 02091c2
... ... @@ -10,11 +10,7 @@
10 10 <th class="px-4 py-3">Имя</th>
11 11 <th class="px-4 py-3">Дата регистрации</th>
12 12 <th class="px-4 py-3">Изменить</th>
13   -<<<<<<< HEAD
14   - <th class="px-4 py-3">Блокировать</th>
15   -=======
16 13 <th class="px-4 py-3">Бан</th>
17   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
18 14 </tr>
19 15 </thead>
20 16 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
... ... @@ -50,12 +46,6 @@
50 46 {{ $user->created_at }}
51 47 </td>
52 48 <td class="px-4 py-3 text-sm">
53   -<<<<<<< HEAD
54   - <a href="">Изменить</a>
55   - </td>
56   - <td class="px-4 py-3 text-sm">
57   - <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
58   -=======
59 49 @if ($user->id > 1)
60 50 <a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>
61 51 @endif
... ... @@ -64,7 +54,6 @@
64 54 @if ($user->id > 1)
65 55 <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
66 56 @endif
67   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
68 57 </td>
69 58 </tr>
70 59 @endforeach
resources/views/admin/index.blade.php
Diff comments   View file @ 02091c2
... ... @@ -214,11 +214,7 @@
214 214 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
215 215 </div>
216 216 <div>
217   -<<<<<<< HEAD
218   - <p class="font-semibold"><a href="{{ route('admin.categories') }}">Категории</a></p>
219   -=======
220 217 <p class="font-semibold"><a href="{{ route('admin.categories.index') }}">Категории</a></p>
221   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
222 218 <p class="text-xs text-gray-600 dark:text-gray-400">
223 219 Справочник категории (по умолчанию: река, море, река-море)
224 220 </p>
... ... @@ -245,15 +241,9 @@
245 241 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
246 242 </div>
247 243 <div>
248   -<<<<<<< HEAD
249   - <p class="font-semibold"><a href="{{ route('admin.job-titles') }}">Должности</a></p>
250   - <p class="text-xs text-gray-600 dark:text-gray-400">
251   - Все должности
252   -=======
253 244 <p class="font-semibold"><a href="{{ route('admin.job-titles.index') }}">Должности</a></p>
254 245 <p class="text-xs text-gray-600 dark:text-gray-400">
255 246 Справочник должности (все должности проекта)
256   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
257 247 </p>
258 248 </div>
259 249 </div>
... ... @@ -278,8 +268,6 @@
278 268 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
279 269 </div>
280 270 <div>
281   -<<<<<<< HEAD
282   -=======
283 271 <p class="font-semibold"><a href="{{ route('admin.infobloks.index') }}">Документы-Дипломы</a></p>
284 272 <p class="text-xs text-gray-600 dark:text-gray-400">
285 273 Справочник документы-дипломы (все блоки-документы необходимые соискателю)
... ... @@ -307,7 +295,6 @@
307 295 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
308 296 </div>
309 297 <div>
310   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
311 298 <p class="font-semibold"><a href="{{ route('admin.messages') }}">Сообщения</a></p>
312 299 <p class="text-xs text-gray-600 dark:text-gray-400">
313 300 Все сообщения сайта
... ... @@ -355,9 +342,6 @@
355 342 </td>
356 343 </tr>
357 344  
358   -<<<<<<< HEAD
359   -
360   -=======
361 345 <tr class="text-gray-700 dark:text-gray-400">
362 346 <td class="px-4 py-3">
363 347 <div class="flex items-center text-sm">
... ... @@ -464,7 +448,6 @@
464 448 сентябрь 2023
465 449 </td>
466 450 </tr>
467   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
468 451  
469 452 <!--<tr class="text-gray-700 dark:text-gray-400">
470 453 <td class="px-4 py-3">
resources/views/admin/profile.blade.php
Diff comments   View file @ 02091c2
... ... @@ -4,21 +4,14 @@
4 4 <h4 class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300">
5 5 Личные данные
6 6 </h4>
7   -<<<<<<< HEAD
8   -=======
9 7 <form method="POST" action="">
10 8 @csrf
11   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
12 9 <div class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800">
13 10 <label class="block text-sm">
14 11 <span class="text-gray-700 dark:text-gray-400">Имя/Псевдоним/Имя компании</span>
15 12 <input name="name" id="name"
16 13 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   -<<<<<<< HEAD
18   - placeholder="Псевдоним для админки"
19   -=======
20 14 placeholder="Псевдоним для админки" value="{{ old('name') ?? $user->name ?? '' }}"
21   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
22 15 />
23 16 @error('name')
24 17 <span class="text-xs text-red-600 dark:text-red-400">
... ... @@ -31,11 +24,7 @@
31 24 <span class="text-gray-700 dark:text-gray-400">Email</span>
32 25 <input name="email" id="email"
33 26 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"
34   -<<<<<<< HEAD
35   - placeholder="Почта"
36   -=======
37 27 placeholder="Почта" value="{{ old('email') ?? $user->email ?? '' }}"
38   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
39 28 />
40 29 @error('email')
41 30 <span class="text-xs text-red-600 dark:text-red-400">
... ... @@ -48,11 +37,7 @@
48 37 <span class="text-gray-700 dark:text-gray-400">Телефон</span>
49 38 <input name="telephone" id="telephone"
50 39 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"
51   -<<<<<<< HEAD
52   - placeholder="Телефон"
53   -=======
54 40 placeholder="Телефон" value="{{ old('telephone') ?? $user->telephone ?? '' }}"
55   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
56 41 />
57 42 @error('telephone')
58 43 <span class="text-xs text-red-600 dark:text-red-400">
... ... @@ -65,11 +50,7 @@
65 50 <span class="text-gray-700 dark:text-gray-400">Фамилия</span>
66 51 <input name="surname" id="surname"
67 52 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"
68   -<<<<<<< HEAD
69   - placeholder="Фамилия"
70   -=======
71 53 placeholder="Фамилия" value="{{ old('surname') ?? $user->surname ?? '' }}"
72   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
73 54 />
74 55 @error('surname')
75 56 <span class="text-xs text-red-600 dark:text-red-400">
... ... @@ -82,11 +63,7 @@
82 63 <span class="text-gray-700 dark:text-gray-400">Имя человека</span>
83 64 <input name="name_man" id="name_man"
84 65 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"
85   -<<<<<<< HEAD
86   - placeholder="Имя человека"
87   -=======
88 66 placeholder="Имя человека" value="{{ old('name_man') ?? $user->name_man ?? '' }}"
89   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
90 67 />
91 68 @error('name_man')
92 69 <span class="text-xs text-red-600 dark:text-red-400">
... ... @@ -99,11 +76,7 @@
99 76 <span class="text-gray-700 dark:text-gray-400">Отчество</span>
100 77 <input name="surname2" id="surname2"
101 78 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"
102   -<<<<<<< HEAD
103   - placeholder="Отчество"
104   -=======
105 79 placeholder="Отчество" value="{{ old('surname2') ?? $user->surname2 ?? '' }}"
106   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
107 80 />
108 81 @error('surname2')
109 82 <span class="text-xs text-red-600 dark:text-red-400">
... ... @@ -123,10 +96,7 @@
123 96 class="text-purple-600 form-radio focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
124 97 name="is_worker"
125 98 value="1"
126   -<<<<<<< HEAD
127   -=======
128 99 <? if ($user->is_worker == 1) echo "checked"; ?>
129   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
130 100 />
131 101 <span class="ml-2">Работник</span>
132 102 </label>
... ... @@ -135,12 +105,8 @@
135 105 type="radio"
136 106 class="text-purple-600 form-radio focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
137 107 name="is_worker"
138   -<<<<<<< HEAD
139   - value="0" checked
140   -=======
141 108 value="0"
142 109 <? if ($user->is_worker == 0) echo "checked"; ?>
143   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
144 110 />
145 111 <span class="ml-2">Работодатель</span>
146 112 </label>
... ... @@ -149,16 +115,6 @@
149 115  
150 116 <div class="flex flex-col flex-wrap mb-4 space-y-4 md:flex-row md:items-end md:space-x-4">
151 117 <div>
152   -<<<<<<< HEAD
153   - <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">
154   - Сохранить
155   - </button>
156   - <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">
157   - Сменить пароль
158   - </button>
159   - </div>
160   - </div>
161   -=======
162 118 <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">
163 119 Сохранить
164 120 </button>
... ... @@ -169,7 +125,6 @@
169 125 </div>
170 126 </div>
171 127 </form>
172   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
173 128 <!--
174 129 <label class="block mt-4 text-sm">
175 130 <span class="text-gray-700 dark:text-gray-400">
resources/views/admin/users/index.blade.php
Diff comments   View file @ 02091c2
1   -<<<<<<< HEAD
2   -@extends('layout.admin', ['title' => 'Админка - Пользователи системы'])
3   -=======
4 1 @extends('layout.admin', ['title' => $title])
5   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
6 2  
7 3 @section('script')
8 4 <script>
9 5 $(document).ready(function() {
10   -<<<<<<< HEAD
11   - $(document).on('click', '.checkban', function () {
12   - var this_ = $(this);
13   - var value = this_.val();
14   - var ajax_block = $('#ajax_block');
15   - var bool = 0;
16   -=======
17 6 $(document).on('click', '.check_click', function () {
18 7 var this_ = $(this);
19 8 var value = this_.val();
... ... @@ -21,67 +10,24 @@
21 10 var ajax_block = $('#ajax_block');
22 11 var bool = 0;
23 12 var str_get = '';
24   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
25 13  
26 14 if(this.checked){
27 15 bool = 1;
28 16 } else {
29 17 bool = 0;
30 18 }
31   -<<<<<<< HEAD
32   -=======
33 19 console.log(field);
34 20 str_get = "id=" + value + "&" + field + "=" + bool;
35 21 console.log(str_get);
36   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
37 22  
38 23 $.ajax({
39 24 type: "GET",
40 25 url: "{{ url()->full()}}",
41   -<<<<<<< HEAD
42   - data: "id=" + value + "&is_ban=" + bool,
43   - success: function (data) {
44   - console.log('Обновление таблицы пользователей ');
45   - //data = JSON.parse(data);
46   - console.log(data);
47   - ajax_block.html(data);
48   - },
49   - headers: {
50   - 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
51   - },
52   - error: function (data) {
53   - console.log('Error: ' + data);
54   - }
55   - });
56   - });
57   -
58   - $(document).on('click', '.checknew', function () {
59   - var this_ = $(this);
60   - var value = this_.val();
61   - var ajax_block = $('#ajax_block');
62   - var bool = 0;
63   -
64   - if(this.checked){
65   - bool = 1;
66   - } else {
67   - bool = 0;
68   - }
69   -
70   - $.ajax({
71   - type: "GET",
72   - url: "{{ url()->full()}}",
73   - data: "id=" + value + "&is_new=" + bool,
74   - success: function (data) {
75   - console.log('Обновление таблицы пользователей ');
76   - //data = JSON.parse(data);
77   - console.log(data);
78   -=======
79 26 data: str_get,
80 27 success: function (data) {
81 28 console.log('Обновление таблицы пользователей ');
82 29 //data = JSON.parse(data);
83 30 //console.log(data);
84   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
85 31 ajax_block.html(data);
86 32 },
87 33 headers: {
... ... @@ -96,8 +42,6 @@
96 42 </script>
97 43 @endsection
98 44  
99   -<<<<<<< HEAD
100   -=======
101 45 @section('search')
102 46 <div class="absolute inset-y-0 flex items-center pl-2">
103 47 <svg
... ... @@ -127,7 +71,6 @@
127 71 </form>
128 72 @endsection
129 73  
130   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
131 74 @section('content')
132 75 <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
133 76 <div class="w-full overflow-x-auto">
... ... @@ -140,16 +83,11 @@
140 83 <th class="px-4 py-3">Имя</th>
141 84 <th class="px-4 py-3">Email/логин</th>
142 85 <th class="px-4 py-3">Работодатель/работник/администратор</th>
143   -<<<<<<< HEAD
144   - <th class="px-4 py-3">Заблокированный</th>
145   - <th class="px-4 py-3">Новый</th>
146   -=======
147 86 <th class="px-4 py-3">Бан</th>
148 87 <th class="px-4 py-3">Новый</th>
149 88 @if ($id_admin == 1)
150 89 <th class="px-4 py-3">Админ</th>
151 90 @endif
152   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
153 91 <th class="px-4 py-3">Дата регистрации</th>
154 92 </tr>
155 93 </thead>
... ... @@ -195,13 +133,6 @@
195 133 @endif
196 134 </td>
197 135 <td class="px-4 py-3 text-sm">
198   -<<<<<<< HEAD
199   - <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
200   - </td>
201   - <td class="px-4 py-3 text-sm">
202   - <input type="checkbox" class="checknew" value="{{$user->id}}" name="new_{{$user->id}}" {{ ($user->is_new) ? "checked" : "" }}/>
203   - </td>
204   -=======
205 136 @if ($user->id > 1)
206 137 <input type="checkbox" class="check_click" value="{{$user->id}}" data-field="is_ban" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
207 138 @endif
... ... @@ -219,7 +150,6 @@
219 150 </td>
220 151 @endif
221 152  
222   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
223 153 <td class="px-4 py-3 text-sm">
224 154 {{ $user->created_at }}
225 155 </td>
resources/views/admin/users/index_ajax.blade.php
Diff comments   View file @ 02091c2
... ... @@ -8,16 +8,11 @@
8 8 <th class="px-4 py-3">Имя</th>
9 9 <th class="px-4 py-3">Email/логин</th>
10 10 <th class="px-4 py-3">Работодатель/работник/администратор</th>
11   -<<<<<<< HEAD
12   - <th class="px-4 py-3">Заблокированный</th>
13   - <th class="px-4 py-3">Новый</th>
14   -=======
15 11 <th class="px-4 py-3">Бан</th>
16 12 <th class="px-4 py-3">Новый</th>
17 13 @if ($id_admin == 1)
18 14 <th class="px-4 py-3">Админ</th>
19 15 @endif
20   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
21 16 <th class="px-4 py-3">Дата регистрации</th>
22 17 </tr>
23 18 </thead>
... ... @@ -48,13 +43,6 @@
48 43 @endif
49 44 </td>
50 45 <td class="px-4 py-3 text-sm">
51   -<<<<<<< HEAD
52   - <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
53   - </td>
54   - <td class="px-4 py-3 text-sm">
55   - <input type="checkbox" class="checknew" value="{{$user->id}}" name="new_{{$user->id}}" {{ ($user->is_new) ? "checked" : "" }}/>
56   - </td>
57   -=======
58 46 @if ($user->id > 1)
59 47 <input type="checkbox" class="check_click" value="{{$user->id}}" data-field="is_ban" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
60 48 @endif
... ... @@ -71,7 +59,6 @@
71 59 </td>
72 60 @endif
73 61  
74   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
75 62 <td class="px-4 py-3 text-sm">
76 63 {{ $user->created_at }}
77 64 </td>
resources/views/admin/worker/index.blade.php
Diff comments   View file @ 02091c2
... ... @@ -20,11 +20,7 @@
20 20 url: "{{ url()->full()}}",
21 21 data: "id=" + value + "&is_ban=" + bool,
22 22 success: function (data) {
23   -<<<<<<< HEAD
24   - console.log('Обновление таблицы пользователей ');
25   -=======
26 23 console.log('Обновление таблицы работников ');
27   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
28 24 //data = JSON.parse(data);
29 25 console.log(data);
30 26 ajax_block.html(data);
... ... @@ -42,10 +38,6 @@
42 38 </script>
43 39 @endsection
44 40  
45   -<<<<<<< HEAD
46   -@section('content')
47   - <div class="w-full overflow-hidden rounded-lg shadow-xs">
48   -=======
49 41 @section('search')
50 42 <div class="absolute inset-y-0 flex items-center pl-2">
51 43 <svg
... ... @@ -77,7 +69,6 @@
77 69  
78 70 @section('content')
79 71 <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
80   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
81 72 <div class="w-full overflow-x-auto">
82 73 <table class="w-full whitespace-no-wrap">
83 74 <thead>
... ... @@ -90,11 +81,7 @@
90 81 <th class="px-4 py-3">% заполнения анкеты</th>
91 82 <th class="px-4 py-3">Дата регистрации</th>
92 83 <th class="px-4 py-3">Изменить</th>
93   -<<<<<<< HEAD
94   - <th class="px-4 py-3">Блокировать</th>
95   -=======
96 84 <th class="px-4 py-3">Бан</th>
97   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
98 85 </tr>
99 86 </thead>
100 87 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
... ... @@ -137,12 +124,6 @@
137 124 {{ $user->created_at }}
138 125 </td>
139 126 <td class="px-4 py-3 text-sm">
140   -<<<<<<< HEAD
141   - <a href="">Изменить</a>
142   - </td>
143   - <td class="px-4 py-3 text-sm">
144   - <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
145   -=======
146 127 @if ($user->id > 1)
147 128 <a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>
148 129 @endif
... ... @@ -151,7 +132,6 @@
151 132 @if ($user->id > 1)
152 133 <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
153 134 @endif
154   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
155 135 </td>
156 136 </tr>
157 137 @endforeach
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 1 <div class="w-full overflow-x-auto">
178 2 <table class="w-full whitespace-no-wrap">
179 3 <thead>
... ... @@ -247,4 +71,3 @@
247 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 72 <?=$users->appends($_GET)->links('admin.pagginate'); ?>
249 73 </div>
250   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
resources/views/layout/admin.blade.php
Diff comments   View file @ 02091c2
... ... @@ -27,15 +27,8 @@
27 27 class="z-20 hidden w-64 overflow-y-auto bg-white dark:bg-gray-800 md:block flex-shrink-0"
28 28 >
29 29 <div class="py-4 text-gray-500 dark:text-gray-400">
30   -<<<<<<< HEAD
31   - <a
32   - class="ml-6 text-lg font-bold text-gray-800 dark:text-gray-200"
33   - href="{{ route('admin.index') }}"
34   - >
35   -=======
36 30 <a class="ml-6 text-lg font-bold text-gray-800 dark:text-gray-200"
37 31 href="{{ route('admin.index') }}">
38   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
39 32 Админка
40 33 </a>
41 34 <ul class="mt-6">
... ... @@ -156,18 +149,11 @@
156 149 <span class="ml-4">Вакансии</span>
157 150 </a>
158 151 </li>
159   -<<<<<<< HEAD
160   - <li class="relative px-6 py-3">
161   - <a
162   - class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
163   - href="{{ route('admin.categories') }}"
164   -=======
165 152  
166 153 <li class="relative px-6 py-3">
167 154 <a
168 155 class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
169 156 href="{{ route('admin.messages') }}"
170   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
171 157 >
172 158 <svg
173 159 class="w-5 h-5"
... ... @@ -179,27 +165,15 @@
179 165 viewBox="0 0 24 24"
180 166 stroke="currentColor"
181 167 >
182   -<<<<<<< HEAD
183   - <path
184   - 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"
185   - ></path>
186   - </svg>
187   - <span class="ml-4">Категории</span>
188   -=======
189 168 <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
190 169 </svg>
191 170 <span class="ml-4">Сообщения</span>
192   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
193 171 </a>
194 172 </li>
195 173 <li class="relative px-6 py-3">
196 174 <a
197 175 class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
198   -<<<<<<< HEAD
199   - href="{{ route('admin.job-titles') }}"
200   -=======
201 176 href="{{ route('admin.groups') }}"
202   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
203 177 >
204 178 <svg
205 179 class="w-5 h-5"
... ... @@ -211,11 +185,6 @@
211 185 viewBox="0 0 24 24"
212 186 stroke="currentColor"
213 187 >
214   -<<<<<<< HEAD
215   - <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
216   - </svg>
217   - <span class="ml-4">Должности</span>
218   -=======
219 188 <path
220 189 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"
221 190 ></path>
... ... @@ -241,17 +210,12 @@
241 210 ></path>
242 211 </svg>
243 212 <span class="ml-4">Роли пользователей</span>
244   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
245 213 </a>
246 214 </li>
247 215 <li class="relative px-6 py-3">
248 216 <a
249 217 class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
250   -<<<<<<< HEAD
251   - href="{{ route('admin.messages') }}"
252   -=======
253 218 href="{{ route('admin.statics') }}"
254   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
255 219 >
256 220 <svg
257 221 class="w-5 h-5"
... ... @@ -263,28 +227,18 @@
263 227 viewBox="0 0 24 24"
264 228 stroke="currentColor"
265 229 >
266   -<<<<<<< HEAD
267   - <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
268   - </svg>
269   - <span class="ml-4">Сообщения</span>
270   -=======
271 230 <path
272 231 d="M11 3.055A9.001 9.001 0 1020.945 13H11V3.055z"
273 232 ></path>
274 233 <path d="M20.488 9H15V3.512A9.025 9.025 0 0120.488 9z"></path>
275 234 </svg>
276 235 <span class="ml-4">Статистика</span>
277   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
278 236 </a>
279 237 </li>
280 238 <li class="relative px-6 py-3">
281 239 <a
282 240 class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
283   -<<<<<<< HEAD
284   - href="{{ route('admin.groups') }}"
285   -=======
286 241 href="{{ route('admin.answers') }}"
287   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
288 242 >
289 243 <svg
290 244 class="w-5 h-5"
... ... @@ -296,15 +250,6 @@
296 250 viewBox="0 0 24 24"
297 251 stroke="currentColor"
298 252 >
299   -<<<<<<< HEAD
300   - <path
301   - 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"
302   - ></path>
303   - </svg>
304   - <span class="ml-4">Группы пользователей</span>
305   - </a>
306   - </li>
307   -=======
308 253 <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
309 254 </svg>
310 255 <span class="ml-4">Модерация</span>
... ... @@ -372,17 +317,11 @@
372 317  
373 318  
374 319 <!-- Редактор -->
375   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
376 320 <li class="relative px-6 py-3">
377 321 <button
378 322 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"
379 323 @click="togglePagesMenu"
380   -<<<<<<< HEAD
381   - aria-haspopup="true"
382   - >
383   -=======
384 324 aria-haspopup="true">
385   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
386 325 <span class="inline-flex items-center">
387 326 <svg
388 327 class="w-5 h-5"
... ... @@ -392,21 +331,12 @@
392 331 stroke-linejoin="round"
393 332 stroke-width="2"
394 333 viewBox="0 0 24 24"
395   -<<<<<<< HEAD
396   - stroke="currentColor"
397   - >
398   -=======
399 334 stroke="currentColor">
400   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
401 335 <path
402 336 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"
403 337 ></path>
404 338 </svg>
405   -<<<<<<< HEAD
406   - <span class="ml-4">Страницы</span>
407   -=======
408 339 <span class="ml-4">Редактор</span>
409   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
410 340 </span>
411 341 <svg
412 342 class="w-4 h-4"
... ... @@ -432,36 +362,6 @@
432 362 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"
433 363 aria-label="submenu"
434 364 >
435   -<<<<<<< HEAD
436   - <li
437   - class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
438   - >
439   - <a class="w-full" href="pages/login.html">Login</a>
440   - </li>
441   - <li
442   - class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
443   - >
444   - <a class="w-full" href="pages/create-account.html">
445   - Create account
446   - </a>
447   - </li>
448   - <li
449   - class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
450   - >
451   - <a class="w-full" href="pages/forgot-password.html">
452   - Forgot password
453   - </a>
454   - </li>
455   - <li
456   - class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
457   - >
458   - <a class="w-full" href="pages/404.html">404</a>
459   - </li>
460   - <li
461   - class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
462   - >
463   - <a class="w-full" href="pages/blank.html">Blank</a>
464   -=======
465 365 <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
466 366 <a class="w-full" href="{{ route('admin.editor-site') }}">Редактор сайта</a>
467 367 </li>
... ... @@ -482,15 +382,11 @@
482 382 </li>
483 383 <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
484 384 <a class="w-full" href="{{ route('admin.employers-main') }}">Работодатели на главной</a>
485   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
486 385 </li>
487 386 </ul>
488 387 </template>
489 388 </li>
490   -<<<<<<< HEAD
491   -=======
492 389  
493   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
494 390 </ul>
495 391 <!--<div class="px-6 my-6">
496 392 <button
... ... @@ -652,11 +548,7 @@
652 548 <li class="relative px-6 py-3">
653 549 <a
654 550 class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
655   -<<<<<<< HEAD
656   - href="{{ route('admin.categories') }}"
657   -=======
658 551 href="{{ route('admin.messages') }}"
659   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
660 552 >
661 553 <svg
662 554 class="w-5 h-5"
... ... @@ -668,20 +560,6 @@
668 560 viewBox="0 0 24 24"
669 561 stroke="currentColor"
670 562 >
671   -<<<<<<< HEAD
672   - <path
673   - 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"
674   - ></path>
675   - </svg>
676   - <span class="ml-4">Категории</span>
677   - </a>
678   - </li>
679   - <li class="relative px-6 py-3">
680   - <a
681   - class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
682   - href="{{ route('admin.job-titles') }}"
683   - >
684   -=======
685 563 <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
686 564 </svg>
687 565 <span class="ml-4">Сообщения</span>
... ... @@ -710,7 +588,6 @@
710 588 <li class="relative px-6 py-3">
711 589 <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"
712 590 href="{{ route('admin.roles') }}">
713   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
714 591 <svg
715 592 class="w-5 h-5"
716 593 aria-hidden="true"
... ... @@ -721,27 +598,17 @@
721 598 viewBox="0 0 24 24"
722 599 stroke="currentColor"
723 600 >
724   -<<<<<<< HEAD
725   - <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
726   - </svg>
727   - <span class="ml-4">Должности</span>
728   -=======
729 601 <path
730 602 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"
731 603 ></path>
732 604 </svg>
733 605 <span class="ml-4">Роли пользователей</span>
734   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
735 606 </a>
736 607 </li>
737 608 <li class="relative px-6 py-3">
738 609 <a
739 610 class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
740   -<<<<<<< HEAD
741   - href="{{ route('admin.messages') }}"
742   -=======
743 611 href="{{ route('admin.statics') }}"
744   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
745 612 >
746 613 <svg
747 614 class="w-5 h-5"
... ... @@ -753,16 +620,6 @@
753 620 viewBox="0 0 24 24"
754 621 stroke="currentColor"
755 622 >
756   -<<<<<<< HEAD
757   - <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
758   - </svg>
759   - <span class="ml-4">Сообщения</span>
760   - </a>
761   - </li>
762   - <li class="relative px-6 py-3">
763   - <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"
764   - href="{{ route('admin.groups') }}">
765   -=======
766 623 <path
767 624 d="M11 3.055A9.001 9.001 0 1020.945 13H11V3.055z"
768 625 ></path>
... ... @@ -776,7 +633,6 @@
776 633 class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
777 634 href="{{ route('admin.messages') }}"
778 635 >
779   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
780 636 <svg
781 637 class="w-5 h-5"
782 638 aria-hidden="true"
... ... @@ -787,15 +643,6 @@
787 643 viewBox="0 0 24 24"
788 644 stroke="currentColor"
789 645 >
790   -<<<<<<< HEAD
791   - <path
792   - 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"
793   - ></path>
794   - </svg>
795   - <span class="ml-4">Группы пользователей</span>
796   - </a>
797   - </li>
798   -=======
799 646 <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
800 647 </svg>
801 648 <span class="ml-4">Сообщения</span>
... ... @@ -863,7 +710,6 @@
863 710  
864 711  
865 712 <!-- Редактор -->
866   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
867 713 <li class="relative px-6 py-3">
868 714 <button
869 715 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"
... ... @@ -885,11 +731,7 @@
885 731 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"
886 732 ></path>
887 733 </svg>
888   -<<<<<<< HEAD
889   - <span class="ml-4">Страницы</span>
890   -=======
891 734 <span class="ml-4">Редактор</span>
892   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
893 735 </span>
894 736 <svg
895 737 class="w-4 h-4"
... ... @@ -915,37 +757,6 @@
915 757 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"
916 758 aria-label="submenu"
917 759 >
918   -<<<<<<< HEAD
919   - <li
920   - class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
921   - >
922   - <a class="w-full" href="pages/login.html">Login</a>
923   - </li>
924   - <li
925   - class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
926   - >
927   - <a class="w-full" href="pages/create-account.html">
928   - Create account
929   - </a>
930   - </li>
931   - <li
932   - class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
933   - >
934   - <a class="w-full" href="pages/forgot-password.html">
935   - Forgot password
936   - </a>
937   - </li>
938   - <li
939   - class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
940   - >
941   - <a class="w-full" href="pages/404.html">404</a>
942   - </li>
943   - <li
944   - class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
945   - >
946   - <a class="w-full" href="pages/blank.html">Blank</a>
947   - </li>
948   -=======
949 760 <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
950 761 <a class="w-full" href="{{ route('admin.editor-site') }}">Редактор сайта</a>
951 762 </li>
... ... @@ -968,7 +779,6 @@
968 779 <a class="w-full" href="{{ route('admin.employers-main') }}">Работодатели на главной</a>
969 780 </li>
970 781  
971   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
972 782 </ul>
973 783 </template>
974 784 </li>
... ... @@ -1010,31 +820,8 @@
1010 820 <div
1011 821 class="relative w-full max-w-xl mr-6 focus-within:text-purple-500"
1012 822 >
1013   -<<<<<<< HEAD
1014   - <div class="absolute inset-y-0 flex items-center pl-2">
1015   - <svg
1016   - class="w-4 h-4"
1017   - aria-hidden="true"
1018   - fill="currentColor"
1019   - viewBox="0 0 20 20"
1020   - >
1021   - <path
1022   - fill-rule="evenodd"
1023   - 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"
1024   - clip-rule="evenodd"
1025   - ></path>
1026   - </svg>
1027   - </div>
1028   - <input
1029   - 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"
1030   - type="text"
1031   - placeholder="Искать..."
1032   - aria-label="Search"
1033   - />
1034   -=======
1035 823  
1036 824 @yield('search')
1037   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
1038 825 </div>
1039 826 </div>
1040 827 <ul class="flex items-center flex-shrink-0 space-x-6">
... ... @@ -1257,8 +1044,6 @@
1257 1044 <span>Список админов &RightArrow;</span>
1258 1045 </a>
1259 1046  
1260   -<<<<<<< HEAD
1261   -=======
1262 1047 @if ($message = Session::get('success'))
1263 1048 <section>
1264 1049 <div class="alert alert-success alert-dismissible mt-0" role="alert">
... ... @@ -1285,7 +1070,6 @@
1285 1070 </section>
1286 1071 @endif
1287 1072  
1288   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
1289 1073 @yield('content')
1290 1074  
1291 1075 <!-- Cards
1 1 <?php
2 2  
3 3 use App\Http\Controllers\Admin\AdminController;
4   -<<<<<<< HEAD
5   -use App\Http\Controllers\Admin\EmployersController;
6   -=======
7 4 use App\Http\Controllers\Admin\CategoryController;
8 5 use App\Http\Controllers\Admin\EmployersController;
9 6 use App\Http\Controllers\Admin\InfoBloksController;
10 7 use App\Http\Controllers\Admin\JobTitlesController;
11   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
12 8 use App\Http\Controllers\Admin\UsersController;
13 9 use App\Http\Controllers\Admin\WorkersController;
14 10 use App\Http\Controllers\Auth\LoginController;
15 11 use App\Http\Controllers\Auth\RegisterController;
16   -<<<<<<< HEAD
17   -=======
18 12 use App\Http\Controllers\CKEditorController;
19   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
20 13 use App\Models\User;
21 14 use App\Http\Controllers\MainController;
22 15 use App\Http\Controllers\HomeController;
23 16 use Illuminate\Support\Facades\Route;
24   -<<<<<<< HEAD
25   -=======
26 17 use App\Http\Controllers\Admin\CompanyController;
27 18 use App\Http\Controllers\Admin\Ad_EmployersController;
28 19 use App\Http\Controllers\Admin\MsgAnswersController;
29 20 use App\Http\Controllers\Admin\GroupsController;
30 21 use App\Http\Controllers\PagesController;
31 22  
32   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
33 23  
34 24 /*
35 25 |--------------------------------------------------------------------------
... ... @@ -94,13 +84,6 @@ Route::group([
94 84  
95 85 // кабинет главная страница
96 86 Route::get('cabinet', [AdminController::class, 'index'])->name('index');
97   -<<<<<<< HEAD
98   - // кабинет профиль
99   - Route::get('profile', [AdminController::class, 'profile'])->name('profile');
100   - // кабинет настройки
101   - Route::get('config', [AdminController::class, 'config'])->name('config');
102   -
103   -=======
104 87  
105 88 // кабинет профиль админа - форма
106 89 Route::get('profile', [AdminController::class, 'profile'])->name('profile');
... ... @@ -130,7 +113,6 @@ Route::group([
130 113 Route::get('config', [AdminController::class, 'config_form'])->name('config');
131 114 // кабинет настройки сайта сохранение формы
132 115 Route::post('config', [AdminController::class, 'store_config'])->name('store_config');
133   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
134 116  
135 117 // кабинет - пользователи
136 118 Route::get('users', [UsersController::class, 'index'])->name('users');
... ... @@ -145,25 +127,6 @@ Route::group([
145 127 Route::get('workers', [WorkersController::class, 'index'])->name('workers');
146 128  
147 129 // кабинет - вакансии
148   -<<<<<<< HEAD
149   - Route::get('ad-employers', [AdminController::class, 'index'])->name('ad-employers');
150   -
151   - // кабинет - категории
152   - Route::get('categories', [AdminController::class, 'index'])->name('categories');
153   -
154   - // кабинет - должности
155   - Route::get('job-titles', [AdminController::class, 'index'])->name('job-titles');
156   -
157   - // кабинет - сообщения
158   - Route::get('messages', [AdminController::class, 'index'])->name('messages');
159   -
160   - // кабинет - группы пользователей
161   - Route::get('groups', [AdminController::class, 'index'])->name('groups');
162   -
163   - // кабинет - список админов
164   - Route::get('group-admin', [AdminController::class, 'index'])->name('group-admin');
165   -});
166   -=======
167 130 Route::get('ad-employers', [Ad_EmployersController::class, 'index'])->name('ad-employers');
168 131  
169 132 // кабинет - категории
... ... @@ -273,4 +236,3 @@ Route::group([
273 236 Route::post('ckeditor/upload', [CKEditorController::class, 'upload'])->name('ckeditor.image-upload');
274 237  
275 238 Route::get('pages/{pages:slug}', [PagesController::class, 'pages'])->name('page');
276   ->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
storage/app/.gitignore 100644 → 100755
Diff comments   View file @ 02091c2
File mode changed
storage/app/public/.gitignore 100644 → 100755
Diff comments   View file @ 02091c2
File mode changed
storage/framework/.gitignore 100644 → 100755
Diff comments   View file @ 02091c2
File mode changed
storage/framework/cache/.gitignore 100644 → 100755
Diff comments   View file @ 02091c2
File mode changed
storage/framework/cache/data/.gitignore 100644 → 100755
Diff comments   View file @ 02091c2
File mode changed
storage/framework/sessions/.gitignore 100644 → 100755
Diff comments   View file @ 02091c2
File mode changed
storage/framework/testing/.gitignore 100644 → 100755
Diff comments   View file @ 02091c2
File mode changed
storage/framework/views/.gitignore 100644 → 100755
Diff comments   View file @ 02091c2
File mode changed
storage/logs/.gitignore 100644 → 100755
Diff comments   View file @ 02091c2
File mode changed