Commit c6c0e4a0a8419560f532e709e81232d2b81cd23e

Authored by Андрей Ларионов

Merge branch 'master' of http://gitlab.nologostudio.ru/alarionov/rekamore-su into septembe

Showing 19 changed files Side-by-side Diff

app/Console/Commands/DeleteExpiredAutoliftOptions.php
... ... @@ -16,14 +16,10 @@ class DeleteExpiredAutoliftOptions extends Command
16 16 {
17 17 EmployerAutoliftOption::query()
18 18 ->whereRaw('`updated_at` < DATE_SUB(NOW(), INTERVAL `days_repeat` DAY)')
19   - ->update([
20   - 'is_enabled' => false
21   - ]);
  19 + ->delete();
22 20 WorkerAutoliftOption::query()
23 21 ->whereRaw('`updated_at` < DATE_SUB(NOW(), INTERVAL `days_repeat` DAY)')
24   - ->update([
25   - 'is_enabled' => false
26   - ]);
  22 + ->delete();
27 23 return Command::SUCCESS;
28 24 }
29 25 }
app/Console/Commands/DispatchResumeLiftJobCommand.php
... ... @@ -2,9 +2,7 @@
2 2  
3 3 namespace App\Console\Commands;
4 4  
5   -use App\Jobs\LiftVacancyJob;
6   -use App\Jobs\SendVacancyToTelegramJob;
7   -use App\Models\EmployerAutoliftOption;
  5 +use App\Jobs\LiftResumeJob;
8 6 use App\Models\WorkerAutoliftOption;
9 7 use Illuminate\Console\Command;
10 8  
... ... @@ -35,11 +33,10 @@ class DispatchResumeLiftJobCommand extends Command
35 33 ->orWhere('time_send_second', $now)
36 34 ->orWhere('time_send_third', $now);
37 35 });
38   -
39 36 })
40 37 ->get();
41 38  
42   - LiftVacancyJob::dispatch($workers->pluck('worker_id')->toArray());
  39 + LiftResumeJob::dispatch($workers->pluck('worker_id')->toArray());
43 40  
44 41 return Command::SUCCESS;
45 42 }
app/Http/Controllers/EmployerController.php
... ... @@ -264,9 +264,10 @@ class EmployerController extends Controller
264 264 // Сохранение-редактирование записи
265 265 public function vacancy_save_me(VacancyRequestEdit $request, Ad_employer $ad_employer) {
266 266 $params = $request->all();
267   - $params_job["job_title_id"] = $params['job_title_id'];
268 267  
269 268 $ad_employer->update($params);
  269 + $ad_employer->active_is = 1;
  270 + $ad_employer->save();
270 271 $ad_employer->jobs()->sync($request->get('job_title_id'));
271 272  
272 273 $id = Auth()->user()->id;
... ... @@ -811,7 +812,7 @@ class EmployerController extends Controller
811 812 'employer_id' => $employer->id,
812 813 ],
813 814 [
814   - 'is_enabled' => $request->get('is_enabled') === 'on',
  815 + 'is_enabled' => $request->get('is_enabled') === 'true',
815 816 'times_per_day' => $request->get('times_per_day'),
816 817 'days_repeat' => $request->get('days_repeat'),
817 818 'time_send_first' => $request->get('time_send_first'),
app/Http/Controllers/WorkerController.php
... ... @@ -1111,7 +1111,7 @@ class WorkerController extends Controller
1111 1111 'worker_id' => $worker->id,
1112 1112 ],
1113 1113 [
1114   - 'is_enabled' => $request->get('is_enabled') === 'on',
  1114 + 'is_enabled' => $request->get('is_enabled') === 'true',
1115 1115 'times_per_day' => $request->get('times_per_day'),
1116 1116 'days_repeat' => $request->get('days_repeat'),
1117 1117 'time_send_first' => $request->get('time_send_first'),
app/Jobs/LiftResumeJob.php
... ... @@ -2,7 +2,6 @@
2 2  
3 3 namespace App\Jobs;
4 4  
5   -use App\Models\Ad_employer;
6 5 use App\Models\Worker;
7 6 use Illuminate\Bus\Queueable;
8 7 use Illuminate\Contracts\Queue\ShouldQueue;
app/Jobs/LiftVacancyJob.php
... ... @@ -23,7 +23,10 @@ class LiftVacancyJob implements ShouldQueue
23 23 public function handle()
24 24 {
25 25 Ad_employer::query()
26   - ->whereIn('id', $this->employerIds)
  26 + ->whereIn('employer_id', $this->employerIds)
  27 + ->where('autolift_site', 1)
  28 + ->where('active_is', 1)
  29 + ->where('is_remove', 0)
27 30 ->update([
28 31 'updated_at' => now()
29 32 ]);
app/Jobs/SendVacancyToTelegramJob.php
... ... @@ -30,7 +30,10 @@ class SendVacancyToTelegramJob implements ShouldQueue
30 30 public function handle(): void
31 31 {
32 32 $vacancies = Ad_employer::query()
33   - ->whereIn('id', $this->employerIds)
  33 + ->whereIn('employer_id', $this->employerIds)
  34 + ->where('autosend_tg', 1)
  35 + ->where('active_is', 1)
  36 + ->where('is_remove', 0)
34 37 ->get();
35 38  
36 39 foreach ($vacancies as $vacancy) {
... ... @@ -90,7 +90,7 @@ return [
90 90 'users' => [
91 91 'provider' => 'users',
92 92 'table' => 'password_resets',
93   - 'expire' => 60,
  93 + 'expire' => 60 * 24,
94 94 'throttle' => 60,
95 95 ],
96 96 ],
public/images/sprite.svg
... ... @@ -31,6 +31,15 @@
31 31 <rect y="12.25" width="20" height="1.75" rx="0.875" fill="currentColor"/>
32 32 </symbol>
33 33  
  34 + <symbol id="user_alt" width="24" height="24" viewBox="0 0 22 22" fill="none">
  35 + <path d="M3.6665 16.4997C3.6665 15.5272 4.05281 14.5946 4.74045 13.9069C5.42808 13.2193 6.36071 12.833 7.33317 12.833H14.6665C15.639 12.833 16.5716 13.2193 17.2592 13.9069C17.9469 14.5946 18.3332 15.5272 18.3332 16.4997C18.3332 16.9859 18.14 17.4522 17.7962 17.796C17.4524 18.1399 16.9861 18.333 16.4998 18.333H5.49984C5.01361 18.333 4.54729 18.1399 4.20347 17.796C3.85966 17.4522 3.6665 16.9859 3.6665 16.4997Z" stroke="#377D87" stroke-width="1.5" stroke-linejoin="round"/>
  36 + <path d="M11 9.1665C12.5188 9.1665 13.75 7.93529 13.75 6.4165C13.75 4.89772 12.5188 3.6665 11 3.6665C9.48122 3.6665 8.25 4.89772 8.25 6.4165C8.25 7.93529 9.48122 9.1665 11 9.1665Z" stroke="#377D87" stroke-width="1.5"/>
  37 + </symbol>
  38 +
  39 + <symbol id="settings" width="24" height="24" viewBox="0 0 21 21" fill="none">
  40 + <path d="M12.6786 4.21274L13.4249 4.13812L13.4241 4.1303L13.4232 4.1225L12.6786 4.21274ZM12.6786 4.21272L11.9323 4.28734L11.9331 4.29517L11.9341 4.30297L12.6786 4.21272ZM12.7538 4.75943L12.0378 4.98271L12.0378 4.98271L12.7538 4.75943ZM14.173 5.34729L13.8246 4.68312L13.8246 4.68312L14.173 5.34729ZM14.6128 5.01388L14.1379 4.43341L14.1379 4.43341L14.6128 5.01388ZM14.8572 4.8263L14.4667 4.18593L14.4667 4.18593L14.8572 4.8263ZM15.9807 4.88233L16.4329 4.28399L16.4329 4.28399L15.9807 4.88233ZM16.2051 5.09327L15.6748 5.6236L15.6748 5.62361L16.2051 5.09327ZM16.907 5.79524L17.4374 5.26491L17.4374 5.26491L16.907 5.79524ZM17.118 6.0197L17.7164 5.56752L17.7164 5.56752L17.118 6.0197ZM17.174 7.14315L17.8144 7.53356L17.8144 7.53355L17.174 7.14315ZM16.9865 7.38749L17.5559 7.87559L17.5615 7.86906L17.5669 7.86242L16.9865 7.38749ZM16.9864 7.38751L16.417 6.89942L16.4114 6.90594L16.406 6.91258L16.9864 7.38751ZM16.653 7.82742L17.3172 8.17579L17.3172 8.17579L16.653 7.82742ZM17.2408 9.24656L17.0175 9.96254L17.0175 9.96254L17.2408 9.24656ZM17.7876 9.32181L17.713 10.0681L17.713 10.0681L17.7876 9.32181ZM18.093 9.36193L18.2698 8.63306L18.2698 8.63306L18.093 9.36193ZM18.8478 10.196L19.5907 10.0926L19.5907 10.0926L18.8478 10.196ZM18.8478 11.8044L19.5907 11.9076L19.5907 11.9076L18.8478 11.8044ZM18.0929 12.6385L18.2696 13.3674L18.2696 13.3674L18.0929 12.6385ZM17.7877 12.6786L17.8623 13.4249L17.8623 13.4249L17.7877 12.6786ZM17.2413 12.7538L17.0182 12.0377L17.0182 12.0377L17.2413 12.7538ZM16.6534 14.1732L17.3175 13.8247L17.3175 13.8247L16.6534 14.1732ZM16.9865 14.6125L16.406 15.0875L16.406 15.0875L16.9865 14.6125ZM17.1738 14.8565L16.5335 15.2471L16.5335 15.2471L17.1738 14.8565ZM17.1178 15.9803L17.716 16.4326L17.716 16.4326L17.1178 15.9803ZM16.9071 16.2045L16.3767 15.6741L16.3767 15.6741L16.9071 16.2045ZM16.2049 16.9066L16.7352 17.437L16.7352 17.437L16.2049 16.9066ZM16.2049 16.9066L16.7352 17.437L16.7352 17.437L16.2049 16.9066ZM15.9806 17.1175L16.4328 17.7158L16.4328 17.7158L15.9806 17.1175ZM14.857 17.1735L14.4665 17.8139L14.4665 17.8139L14.857 17.1735ZM14.6128 16.986L15.0877 16.4056L15.0755 16.3955L15.0628 16.386L14.6128 16.986ZM14.6128 16.986L14.1379 17.5665L14.1501 17.5765L14.1628 17.586L14.6128 16.986ZM14.1731 16.6527L13.8247 17.3169L13.8247 17.3169L14.1731 16.6527ZM12.7539 17.2406L13.4699 17.4638L13.4699 17.4638L12.7539 17.2406ZM12.6786 17.7874L13.4228 17.8804L13.424 17.8712L13.4249 17.862L12.6786 17.7874ZM12.6786 17.7874L11.9344 17.6944L11.9333 17.7036L11.9324 17.7128L12.6786 17.7874ZM12.6385 18.0931L11.9096 17.9163L11.9096 17.9163L12.6385 18.0931ZM11.8045 18.8478L11.9079 19.5906L11.9079 19.5906L11.8045 18.8478ZM10.196 18.8478L10.0926 19.5907L10.0926 19.5907L10.196 18.8478ZM9.36193 18.093L8.63306 18.2698L8.63306 18.2698L9.36193 18.093ZM9.32181 17.7876L8.57371 17.841L8.57447 17.8517L8.57553 17.8622L9.32181 17.7876ZM9.3218 17.7876L10.0699 17.7342L10.0685 17.7143L10.066 17.6946L9.3218 17.7876ZM9.3218 17.7876L8.57553 17.8622L8.57645 17.8714L8.57759 17.8806L9.3218 17.7876ZM9.24657 17.2408L8.53057 17.4641L8.53057 17.4641L9.24657 17.2408ZM7.82738 16.653L7.47899 15.9888L7.47898 15.9888L7.82738 16.653ZM7.38759 16.9864L6.91266 16.4059L6.90305 16.4138L6.89371 16.4219L7.38759 16.9864ZM7.38756 16.9864L7.86249 17.5669L7.8721 17.559L7.88144 17.5508L7.38756 16.9864ZM7.14332 17.1739L6.75289 16.5335L6.75289 16.5335L7.14332 17.1739ZM6.0198 17.1179L6.47201 16.5195L6.47201 16.5195L6.0198 17.1179ZM5.79541 16.907L6.32575 16.3766L6.31514 16.366L6.30412 16.3559L5.79541 16.907ZM5.7954 16.907L5.26507 17.4373L5.27568 17.4479L5.28669 17.4581L5.7954 16.907ZM5.09336 16.2049L5.62369 15.6746L5.61566 15.6665L5.60739 15.6588L5.09336 16.2049ZM5.09335 16.2049L4.56302 16.7352L4.57105 16.7433L4.57933 16.7511L5.09335 16.2049ZM4.88249 15.9806L4.28417 16.4328L4.28417 16.4328L4.88249 15.9806ZM4.82645 14.857L4.1861 14.4665L4.1861 14.4666L4.82645 14.857ZM5.01396 14.6128L4.43349 14.1378L4.43349 14.1378L5.01396 14.6128ZM5.3473 14.1731L6.01146 14.5215L6.01146 14.5215L5.3473 14.1731ZM4.75944 12.7538L4.9827 12.0378L4.9827 12.0378L4.75944 12.7538ZM4.21277 12.6786L4.2874 11.9323L4.28739 11.9323L4.21277 12.6786ZM3.90743 12.6385L4.08416 11.9096L4.08416 11.9096L3.90743 12.6385ZM3.1526 11.8044L3.89545 11.7011L3.89545 11.7011L3.1526 11.8044ZM3.14307 11.4966L3.89307 11.4966L3.89307 11.4966L3.14307 11.4966ZM3.14307 10.5039L2.39307 10.5039L2.39307 10.5039L3.14307 10.5039ZM3.15261 10.1959L2.40977 10.0925L2.40977 10.0925L3.15261 10.1959ZM3.90735 9.36195L3.73057 8.63308L3.73057 8.63308L3.90735 9.36195ZM4.21285 9.3218L4.28748 10.0681L4.28748 10.0681L4.21285 9.3218ZM4.75989 9.24651L4.98325 9.96248L4.98325 9.96248L4.75989 9.24651ZM5.34768 7.82746L6.01189 7.47914L6.01189 7.47914L5.34768 7.82746ZM5.01402 7.38731L4.41402 7.83731L4.42352 7.84998L4.43355 7.86224L5.01402 7.38731ZM5.01401 7.38731L5.61401 6.93731L5.5939 6.9105L5.57148 6.88558L5.01401 7.38731ZM5.01401 7.3873L4.43354 7.86223L4.44472 7.8759L4.45654 7.88902L5.01401 7.3873ZM4.82623 7.1427L5.46665 6.75237L5.46665 6.75237L4.82623 7.1427ZM4.88225 6.01944L5.48066 6.47156L5.48066 6.47155L4.88225 6.01944ZM5.0934 5.79478L5.62373 6.32511L5.62373 6.32511L5.0934 5.79478ZM5.79522 5.09295L5.26489 4.56262L5.26489 4.56262L5.79522 5.09295ZM6.01971 4.88196L6.47189 5.48032L6.47189 5.48032L6.01971 4.88196ZM7.14314 4.82592L6.75275 5.46631L6.75275 5.46631L7.14314 4.82592ZM7.3876 5.01361L6.91267 5.59408L6.91268 5.59408L7.3876 5.01361ZM7.82732 5.34697L7.47884 6.0111L7.82732 5.34697ZM9.24664 4.75907L8.53063 4.53587L8.53063 4.53587L9.24664 4.75907ZM9.32182 4.21266L8.57685 4.12501L8.57554 4.13803L9.32182 4.21266ZM9.32182 4.21265L10.0668 4.30029L10.0681 4.28727L9.32182 4.21265ZM9.36191 3.90751L8.63301 3.73084L8.63301 3.73085L9.36191 3.90751ZM10.1961 3.15259L10.0928 2.40973L10.0928 2.40973L10.1961 3.15259ZM11.8044 3.1526L11.7011 3.89545L11.7011 3.89545L11.8044 3.1526ZM12.6385 3.90744L11.9096 4.08416L11.9096 4.08416L12.6385 3.90744ZM13.4232 4.1225L13.4232 4.12247L11.9341 4.30297L11.9341 4.30299L13.4232 4.1225ZM13.4698 4.53616C13.4747 4.55189 13.4699 4.54279 13.4599 4.46578C13.4504 4.39212 13.4403 4.29257 13.4249 4.13812L11.9323 4.28737C11.9576 4.53984 11.9786 4.79264 12.0378 4.98271L13.4698 4.53616ZM13.8246 4.68312C13.6864 4.75563 13.5163 4.68516 13.4698 4.53616L12.0378 4.98271C12.3631 6.0257 13.5539 6.51898 14.5214 6.01145L13.8246 4.68312ZM14.1379 4.43341C14.0178 4.53171 13.9403 4.59502 13.8814 4.64037C13.8199 4.68778 13.81 4.69078 13.8246 4.68312L14.5214 6.01145C14.6977 5.91896 14.8914 5.75503 15.0878 5.59435L14.1379 4.43341ZM14.4667 4.18593C14.3523 4.25571 14.2425 4.34782 14.1379 4.43341L15.0878 5.59435C15.1523 5.54154 15.1904 5.51048 15.2196 5.48769C15.2471 5.46637 15.2522 5.46384 15.2476 5.46667L14.4667 4.18593ZM16.4329 4.28399C15.8597 3.85085 15.0801 3.81197 14.4667 4.18593L15.2476 5.46667C15.3352 5.41325 15.4466 5.4188 15.5285 5.48068L16.4329 4.28399ZM16.7354 4.56295C16.6398 4.46738 16.5398 4.36482 16.4329 4.28399L15.5285 5.48068C15.5241 5.4774 15.529 5.48043 15.5542 5.50437C15.581 5.52995 15.6158 5.56464 15.6748 5.6236L16.7354 4.56295ZM17.4374 5.26491L16.7354 4.56294L15.6748 5.62361L16.3767 6.32557L17.4374 5.26491ZM17.7164 5.56752C17.6355 5.46055 17.533 5.36049 17.4374 5.26491L16.3767 6.32557C16.4357 6.38454 16.4704 6.4193 16.496 6.44618C16.5199 6.47134 16.5229 6.47622 16.5197 6.47189L17.7164 5.56752ZM17.8144 7.53355C18.1884 6.9202 18.1495 6.14062 17.7164 5.56752L16.5197 6.47189C16.5815 6.55376 16.5871 6.66513 16.5337 6.75275L17.8144 7.53355ZM17.5669 7.86242C17.6525 7.7578 17.7446 7.64803 17.8144 7.53356L16.5337 6.75274C16.5365 6.74811 16.534 6.75327 16.5126 6.78068C16.4899 6.80998 16.4588 6.84802 16.406 6.91257L17.5669 7.86242ZM17.5559 7.87561L17.5559 7.87559L16.417 6.8994L16.417 6.89942L17.5559 7.87561ZM17.3172 8.17579C17.3095 8.19038 17.3125 8.18051 17.3599 8.11898C17.4053 8.06013 17.4686 7.98262 17.5669 7.86244L16.406 6.91258C16.2453 7.10902 16.0813 7.30269 15.9888 7.47905L17.3172 8.17579ZM17.4641 8.53057C17.3151 8.48411 17.2447 8.314 17.3172 8.17579L15.9888 7.47905C15.4813 8.4465 15.9746 9.63726 17.0175 9.96254L17.4641 8.53057ZM17.8623 8.57553C17.7078 8.56008 17.6082 8.55005 17.5345 8.5405C17.4575 8.53053 17.4484 8.52567 17.4641 8.53057L17.0175 9.96254C17.2076 10.0218 17.4605 10.0428 17.713 10.0681L17.8623 8.57553ZM18.2698 8.63306C18.1395 8.60146 17.9967 8.58898 17.8623 8.57553L17.713 10.0681C17.796 10.0764 17.8448 10.0813 17.8817 10.0859C17.9161 10.0902 17.9216 10.0921 17.9163 10.0908L18.2698 8.63306ZM19.5907 10.0926C19.4917 9.38111 18.9679 8.80235 18.2698 8.63306L17.9163 10.0908C18.016 10.115 18.0908 10.1977 18.105 10.2993L19.5907 10.0926ZM19.6074 10.5038C19.6074 10.3687 19.6091 10.2254 19.5907 10.0926L18.105 10.2993C18.1042 10.2939 18.1055 10.2995 18.1064 10.3342C18.1073 10.3713 18.1074 10.4205 18.1074 10.5038H19.6074ZM19.6074 11.4967V10.5038H18.1074V11.4967H19.6074ZM19.5907 11.9076C19.6091 11.7749 19.6074 11.6318 19.6074 11.4967H18.1074C18.1074 11.58 18.1073 11.6291 18.1064 11.6662C18.1055 11.7009 18.1042 11.7065 18.105 11.7011L19.5907 11.9076ZM18.2696 13.3674C18.9679 13.1981 19.4917 12.6193 19.5907 11.9076L18.105 11.7011C18.0908 11.8027 18.016 11.8854 17.9162 11.9096L18.2696 13.3674ZM17.8623 13.4249C17.9967 13.4114 18.1394 13.399 18.2696 13.3674L17.9163 11.9096C17.9215 11.9083 17.9161 11.9102 17.8816 11.9145C17.8448 11.9191 17.796 11.924 17.713 11.9323L17.8623 13.4249ZM17.4645 13.4698C17.4488 13.4747 17.4578 13.4698 17.5348 13.4599C17.6084 13.4503 17.7079 13.4403 17.8623 13.4249L17.713 11.9323C17.4607 11.9576 17.2081 11.9785 17.0182 12.0377L17.4645 13.4698ZM17.3175 13.8247C17.2449 13.6864 17.3154 13.5162 17.4645 13.4698L17.0182 12.0377C15.9749 12.3628 15.4815 13.5541 15.9893 14.5217L17.3175 13.8247ZM17.5669 14.1376C17.4687 14.0176 17.4055 13.9402 17.3602 13.8814C17.3128 13.8199 17.3098 13.8101 17.3175 13.8247L15.9893 14.5217C16.0817 14.6978 16.2455 14.8913 16.406 15.0875L17.5669 14.1376ZM17.8141 14.466C17.7444 14.3517 17.6524 14.2421 17.5669 14.1376L16.406 15.0875C16.4587 15.1519 16.4898 15.1899 16.5125 15.2192C16.5338 15.2465 16.5363 15.2517 16.5335 15.2471L17.8141 14.466ZM17.716 16.4326C18.1494 15.8594 18.1883 15.0795 17.8141 14.466L16.5335 15.2471C16.587 15.3347 16.5814 15.4461 16.5195 15.528L17.716 16.4326ZM17.4374 16.7348C17.5329 16.6393 17.6353 16.5394 17.716 16.4326L16.5195 15.528C16.5228 15.5237 16.5198 15.5285 16.4958 15.5537C16.4703 15.5805 16.4356 15.6152 16.3767 15.6741L17.4374 16.7348ZM16.7352 17.437L17.4374 16.7348L16.3767 15.6741L15.6746 16.3763L16.7352 17.437ZM16.7352 17.437L16.7352 17.437L15.6746 16.3763L15.6746 16.3763L16.7352 17.437ZM16.4328 17.7158C16.5397 17.635 16.6397 17.5325 16.7352 17.437L15.6746 16.3763C15.6156 16.4352 15.5809 16.4699 15.554 16.4955C15.5289 16.5194 15.524 16.5224 15.5283 16.5192L16.4328 17.7158ZM14.4665 17.8139C15.0799 18.1879 15.8597 18.149 16.4328 17.7158L15.5283 16.5192C15.4465 16.5811 15.3351 16.5866 15.2474 16.5332L14.4665 17.8139ZM14.1379 17.5665C14.2424 17.6521 14.3521 17.7441 14.4665 17.8139L15.2474 16.5332C15.2521 16.536 15.2469 16.5335 15.2195 16.5122C15.1903 16.4894 15.1522 16.4584 15.0877 16.4056L14.1379 17.5665ZM14.1628 17.586L14.1628 17.586L15.0628 16.386L15.0628 16.386L14.1628 17.586ZM13.8247 17.3169C13.8101 17.3092 13.82 17.3122 13.8815 17.3596C13.9403 17.4049 14.0177 17.4682 14.1379 17.5665L15.0877 16.4056C14.8914 16.2449 14.6978 16.081 14.5215 15.9886L13.8247 17.3169ZM13.4699 17.4638C13.5163 17.3148 13.6865 17.2444 13.8247 17.3169L14.5215 15.9886C13.554 15.481 12.3631 15.9743 12.0379 17.0174L13.4699 17.4638ZM13.4249 17.862C13.4404 17.7075 13.4504 17.6079 13.4599 17.5343C13.4699 17.4572 13.4748 17.4481 13.4699 17.4638L12.0379 17.0173C11.9786 17.2074 11.9576 17.4602 11.9324 17.7128L13.4249 17.862ZM13.4228 17.8804L13.4228 17.8804L11.9344 17.6944L11.9344 17.6944L13.4228 17.8804ZM13.4228 17.8805L13.4228 17.8804L11.9344 17.6944L11.9344 17.6944L13.4228 17.8805ZM13.3673 18.2699C13.3989 18.1395 13.4114 17.9967 13.4249 17.8621L11.9324 17.7128C11.924 17.7959 11.9191 17.8448 11.9145 17.8816C11.9102 17.9161 11.9083 17.9216 11.9096 17.9163L13.3673 18.2699ZM11.9079 19.5906C12.6193 19.4916 13.198 18.9679 13.3673 18.2699L11.9096 17.9163C11.8854 18.016 11.8027 18.0908 11.7011 18.105L11.9079 19.5906ZM11.4965 19.6074C11.6317 19.6074 11.7751 19.6091 11.9079 19.5906L11.7011 18.105C11.7065 18.1042 11.7009 18.1055 11.6662 18.1064C11.6291 18.1073 11.5799 18.1074 11.4965 18.1074V19.6074ZM10.5038 19.6074H11.4965V18.1074H10.5038V19.6074ZM10.0926 19.5907C10.2254 19.6091 10.3687 19.6074 10.5038 19.6074V18.1074C10.4205 18.1074 10.3713 18.1073 10.3342 18.1064C10.2995 18.1055 10.2939 18.1042 10.2993 18.105L10.0926 19.5907ZM8.63306 18.2698C8.80236 18.9679 9.38111 19.4917 10.0926 19.5907L10.2993 18.105C10.1977 18.0908 10.115 18.016 10.0908 17.9163L8.63306 18.2698ZM8.57553 17.8622C8.58898 17.9967 8.60147 18.1395 8.63306 18.2698L10.0908 17.9163C10.0921 17.9216 10.0902 17.9161 10.0859 17.8817C10.0813 17.8448 10.0764 17.796 10.0681 17.713L8.57553 17.8622ZM8.57371 17.841L8.57371 17.841L10.0699 17.7342L10.0699 17.7342L8.57371 17.841ZM8.57759 17.8806L8.5776 17.8806L10.066 17.6946L10.066 17.6946L8.57759 17.8806ZM8.53057 17.4641C8.52567 17.4484 8.53053 17.4575 8.5405 17.5345C8.55004 17.6082 8.56008 17.7077 8.57553 17.8622L10.0681 17.713C10.0428 17.4604 10.0218 17.2076 9.96256 17.0175L8.53057 17.4641ZM8.17578 17.3171C8.31399 17.2446 8.48411 17.3151 8.53057 17.4641L9.96256 17.0175C9.6373 15.9746 8.44647 15.4813 7.47899 15.9888L8.17578 17.3171ZM7.86251 17.5668C7.98266 17.4685 8.06015 17.4052 8.11899 17.3599C8.1805 17.3125 8.19037 17.3095 8.17578 17.3171L7.47898 15.9888C7.30266 16.0813 7.10904 16.2452 6.91266 16.4059L7.86251 17.5668ZM7.88144 17.5508L7.88146 17.5508L6.89371 16.4219L6.89368 16.422L7.88144 17.5508ZM7.53375 17.8143C7.64818 17.7445 7.75792 17.6524 7.86249 17.5669L6.91264 16.4059C6.84812 16.4587 6.81009 16.4897 6.78081 16.5125C6.75341 16.5338 6.74825 16.5364 6.75289 16.5335L7.53375 17.8143ZM5.56759 17.7162C6.14072 18.1494 6.92036 18.1882 7.53375 17.8143L6.75289 16.5335C6.66526 16.587 6.55388 16.5814 6.47201 16.5195L5.56759 17.7162ZM5.26508 17.4373C5.36063 17.5328 5.46066 17.6354 5.56759 17.7162L6.47201 16.5195C6.47634 16.5228 6.47146 16.5198 6.44632 16.4958C6.41945 16.4703 6.38469 16.4356 6.32575 16.3766L5.26508 17.4373ZM5.28669 17.4581L5.2867 17.4581L6.30412 16.3559L6.30411 16.3558L5.28669 17.4581ZM4.56303 16.7352L5.26507 17.4373L6.32573 16.3766L5.62369 15.6746L4.56303 16.7352ZM4.57933 16.7511L4.57934 16.7511L5.60739 15.6588L5.60738 15.6588L4.57933 16.7511ZM4.28417 16.4328C4.36497 16.5397 4.46749 16.6397 4.56302 16.7352L5.62368 15.6746C5.56475 15.6156 5.53007 15.5809 5.5045 15.554C5.48057 15.5289 5.47754 15.524 5.48081 15.5283L4.28417 16.4328ZM4.1861 14.4666C3.81208 15.08 3.85097 15.8596 4.28417 16.4328L5.48081 15.5283C5.41893 15.4465 5.41337 15.3351 5.46681 15.2474L4.1861 14.4666ZM4.43349 14.1378C4.34793 14.2424 4.25587 14.3521 4.1861 14.4665L5.4668 15.2474C5.46398 15.2521 5.4665 15.2469 5.48782 15.2195C5.51059 15.1902 5.54164 15.1522 5.59442 15.0877L4.43349 14.1378ZM4.68314 13.8246C4.6908 13.81 4.6878 13.8199 4.6404 13.8814C4.59506 13.9402 4.53177 14.0177 4.43349 14.1378L5.59442 15.0877C5.75507 14.8913 5.91898 14.6978 6.01146 14.5215L4.68314 13.8246ZM4.53618 13.4698C4.68518 13.5163 4.75565 13.6864 4.68314 13.8246L6.01146 14.5215C6.51902 13.554 6.02573 12.3631 4.9827 12.0378L4.53618 13.4698ZM4.13814 13.4249C4.29259 13.4403 4.39214 13.4504 4.4658 13.4599C4.54281 13.4699 4.5519 13.4747 4.53618 13.4698L4.9827 12.0378C4.79265 11.9786 4.53985 11.9576 4.2874 11.9323L4.13814 13.4249ZM3.7307 13.3674C3.86096 13.399 4.00368 13.4114 4.13814 13.4249L4.28739 11.9323C4.20443 11.924 4.15558 11.9191 4.11876 11.9145C4.08431 11.9102 4.07888 11.9083 4.08416 11.9096L3.7307 13.3674ZM2.40975 11.9077C2.50872 12.6193 3.03252 13.1981 3.73071 13.3674L4.08416 11.9096C3.98442 11.8854 3.90959 11.8027 3.89545 11.7011L2.40975 11.9077ZM2.39307 11.4966C2.39307 11.6317 2.39129 11.775 2.40975 11.9077L3.89545 11.7011C3.8962 11.7065 3.89489 11.7009 3.89403 11.6662C3.89312 11.6291 3.89307 11.58 3.89307 11.4966L2.39307 11.4966ZM2.39307 10.5039L2.39307 11.4966L3.89307 11.4966L3.89307 10.5039L2.39307 10.5039ZM2.40977 10.0925C2.39129 10.2254 2.39307 10.3687 2.39307 10.5039L3.89307 10.5039C3.89307 10.4205 3.89312 10.3714 3.89403 10.3342C3.89489 10.2995 3.8962 10.2939 3.89545 10.2993L2.40977 10.0925ZM3.73057 8.63308C3.0325 8.80239 2.50879 9.38109 2.40977 10.0925L3.89545 10.2993C3.9096 10.1977 3.98441 10.115 4.08414 10.0908L3.73057 8.63308ZM4.13823 8.57552C4.00369 8.58898 3.8609 8.60147 3.73057 8.63308L4.08414 10.0908C4.07886 10.0921 4.0843 10.0902 4.11876 10.0859C4.1556 10.0813 4.20448 10.0764 4.28748 10.0681L4.13823 8.57552ZM4.53652 8.53055C4.55226 8.52564 4.54316 8.5305 4.4661 8.54048C4.39239 8.55003 4.29277 8.56007 4.13823 8.57552L4.28748 10.0681C4.54011 10.0428 4.79307 10.0218 4.98325 9.96248L4.53652 8.53055ZM4.68347 8.17579C4.75594 8.31398 4.68549 8.48407 4.53652 8.53055L4.98325 9.96248C6.02603 9.63716 6.5192 8.44654 6.01189 7.47914L4.68347 8.17579ZM4.43355 7.86224C4.53193 7.98249 4.5953 8.06005 4.64068 8.11894C4.68814 8.18052 4.69113 8.19039 4.68347 8.17579L6.01189 7.47914C5.91936 7.30271 5.7553 7.10894 5.59448 6.91238L4.43355 7.86224ZM4.41401 7.83731L4.41402 7.83731L5.61402 6.93731L5.61401 6.93731L4.41401 7.83731ZM4.45654 7.88902L4.45654 7.88903L5.57148 6.88558L5.57148 6.88558L4.45654 7.88902ZM4.1858 7.53303C4.25564 7.64761 4.34785 7.7575 4.43354 7.86223L5.59448 6.91237C5.54161 6.84776 5.51051 6.80966 5.4877 6.78034C5.46635 6.75289 5.46382 6.74772 5.46665 6.75237L4.1858 7.53303ZM4.28384 5.56732C3.85089 6.14036 3.81202 6.91975 4.1858 7.53303L5.46665 6.75237C5.41325 6.66476 5.41881 6.55342 5.48066 6.47156L4.28384 5.56732ZM4.56306 5.26445C4.4674 5.36011 4.36474 5.46026 4.28384 5.56732L5.48066 6.47155C5.47738 6.4759 5.48041 6.471 5.50437 6.44583C5.52998 6.41893 5.5647 6.38413 5.62372 6.32511L4.56306 5.26445ZM4.56307 5.26445L4.56306 5.26445L5.62372 6.32511L5.62373 6.32511L4.56307 5.26445ZM5.26489 4.56262L4.56307 5.26445L5.62373 6.32511L6.32555 5.62328L5.26489 4.56262ZM5.56754 4.28359C5.46056 4.36444 5.36049 4.46703 5.26489 4.56262L6.32555 5.62328C6.38453 5.5643 6.4193 5.52961 6.44618 5.50401C6.47134 5.48007 6.47623 5.47704 6.47189 5.48032L5.56754 4.28359ZM7.53353 4.18554C6.92019 3.81163 6.14064 3.85051 5.56754 4.28359L6.47189 5.48032C6.55376 5.41845 6.66513 5.41289 6.75275 5.46631L7.53353 4.18554ZM7.86253 4.43314C7.75786 4.3475 7.64803 4.25534 7.53353 4.18554L6.75275 5.46631C6.7481 5.46347 6.75326 5.466 6.7807 5.48735C6.81002 5.51015 6.84809 5.54123 6.91267 5.59408L7.86253 4.43314ZM8.17579 4.68284C8.19039 4.6905 8.18053 4.68751 8.119 4.64009C8.06016 4.59474 7.98267 4.53143 7.86253 4.43314L6.91268 5.59408C7.10905 5.75475 7.30263 5.91864 7.47884 6.0111L8.17579 4.68284ZM8.53063 4.53587C8.48417 4.68489 8.31402 4.75537 8.17579 4.68284L7.47884 6.0111C8.44641 6.5188 9.63748 6.02544 9.96266 4.98226L8.53063 4.53587ZM8.57554 4.13803C8.56011 4.2924 8.55008 4.3919 8.54055 4.46552C8.53058 4.5425 8.52573 4.55158 8.53063 4.53587L9.96266 4.98227C10.0219 4.79229 10.0429 4.53962 10.0681 4.28729L8.57554 4.13803ZM8.57696 4.12501L8.57696 4.12503L10.0667 4.30029L10.0667 4.30028L8.57696 4.12501ZM8.63301 3.73085C8.60146 3.86102 8.58898 4.00364 8.57554 4.13802L10.0681 4.28727C10.0764 4.20437 10.0813 4.15555 10.0859 4.11876C10.0902 4.08433 10.0921 4.0789 10.0908 4.08417L8.63301 3.73085ZM10.0928 2.40973C9.38115 2.50866 8.80226 3.03255 8.63301 3.73084L10.0908 4.08418C10.115 3.98442 10.1977 3.90958 10.2993 3.89545L10.0928 2.40973ZM10.5037 2.39307C10.3687 2.39307 10.2255 2.39129 10.0928 2.40973L10.2993 3.89545C10.294 3.8962 10.2996 3.89488 10.3342 3.89403C10.3713 3.89312 10.4204 3.89307 10.5037 3.89307V2.39307ZM11.4966 2.39307H10.5037V3.89307H11.4966V2.39307ZM11.9077 2.40975C11.775 2.39129 11.6317 2.39307 11.4966 2.39307V3.89307C11.58 3.89307 11.6291 3.89312 11.6662 3.89403C11.7009 3.89489 11.7065 3.8962 11.7011 3.89545L11.9077 2.40975ZM13.3674 3.73072C13.1981 3.03252 12.6193 2.50872 11.9077 2.40975L11.7011 3.89545C11.8027 3.90959 11.8854 3.98442 11.9096 4.08416L13.3674 3.73072ZM13.4249 4.1381C13.4114 4.00365 13.399 3.86096 13.3674 3.73071L11.9096 4.08416C11.9083 4.07888 11.9102 4.08432 11.9145 4.11876C11.9191 4.15556 11.924 4.2044 11.9323 4.28734L13.4249 4.1381ZM13.3931 11.0002C13.3931 12.3217 12.3217 13.3931 11.0002 13.3931V14.8931C13.1502 14.8931 14.8931 13.1502 14.8931 11.0002H13.3931ZM11.0002 8.60735C12.3217 8.60735 13.3931 9.67867 13.3931 11.0002H14.8931C14.8931 8.85024 13.1502 7.10735 11.0002 7.10735V8.60735ZM8.60735 11.0002C8.60735 9.67867 9.67867 8.60735 11.0002 8.60735V7.10735C8.85024 7.10735 7.10735 8.85024 7.10735 11.0002H8.60735ZM11.0002 13.3931C9.67867 13.3931 8.60735 12.3217 8.60735 11.0002H7.10735C7.10735 13.1502 8.85024 14.8931 11.0002 14.8931V13.3931Z" fill="#377D87"/>
  41 + </symbol>
  42 +
34 43 <symbol id="cross" viewBox="0 0 20 19" fill="none">
35 44 <path d="M1.99997 17.9199L18.5566 2" stroke="currentColor" stroke-width="2.16" stroke-linecap="round" stroke-linejoin="round"/>
36 45 <path d="M1.99997 2.00017L18.5566 17.92" stroke="currentColor" stroke-width="2.16" stroke-linecap="round" stroke-linejoin="round"/>
resources/views/admin/message/index.blade.php
... ... @@ -189,7 +189,7 @@
189 189 <input type="file" class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700
190 190 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple
191 191 dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
192   - id="file" name="file">
  192 + id="file" name="file" accept=".pdf, .doc, .docx">
193 193 @error('file')
194 194 <span class="text-xs text-red-600 dark:text-red-400">
195 195 {{ $message }}
resources/views/admin/message/index2.blade.php
... ... @@ -153,7 +153,7 @@
153 153 <input type="file" class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700
154 154 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple
155 155 dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
156   - id="file" name="file">
  156 + id="file" name="file" accept=".pdf, .doc, .docx">
157 157 @error('file')
158 158 <span class="text-xs text-red-600 dark:text-red-400">
159 159 {{ $message }}
resources/views/employers/dialog.blade.php
... ... @@ -282,7 +282,7 @@
282 282 <form action="{{ route('employer.test123') }}" class="chatbox__bottom" enctype="multipart/form-data" method="POST" >
283 283 @csrf
284 284 <label class="chatbox__bottom-file">
285   - <input id="file" name="file" type="file">
  285 + <input id="file" name="file" type="file" accept=".pdf, .doc, .docx">
286 286 <svg>
287 287 <use xlink:href="{{ asset('images/sprite.svg#clip') }}"></use>
288 288 </svg>
resources/views/employers/edit_vacancy.blade.php
... ... @@ -121,34 +121,6 @@
121 121 @enderror
122 122 </div>
123 123 </div>
124   - <!--<div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group" style="">
125   - <label class="form-group__label">Категория (локация)</label>
126   - <div class="form-group__item">
127   - <div class="select">
128   - <select class="js-select2" name="category_id" id="category_id">
129   - php $i = 1 endphp
130   - if ($Positions->count())
131   - foreach($Positions as $j)
132   - if ($i == 1) <option> Выберите категорию из списка</option>
133   - else
134   - <option value=" $j->id }}" if ($ad_employer->category_id == $j->id) selected endif>$j->name }}</option>
135   - endif
136   - php $i++ endphp
137   - endforeach
138   - endif
139   - </select>
140   - error('category_id')
141   - <span class="text-xs text-red-600 dark:text-red-400">
142   - $message }}
143   - </span>
144   - enderror
145   - </div>
146   - </div>
147   - </div>-->
148   -
149   - <!--foreach ($ad_employer->jobs_code as $it_um)
150   - <pre> print_r($it_um) }}</pre>
151   - endforeach-->
152 124 <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
153 125 <label class="form-group__label">Редактирование должностей</label>
154 126 <div class="form-group__item">
... ... @@ -184,29 +156,10 @@
184 156 @enderror
185 157 </div>
186 158 </div>
187   -
188   - <!--<div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
189   - <h4 class="form-group__label">Редактирование должностей</h4>
190   - <div class="form-group__item">
191   - <a href=" route('employer.add_job_in_vac', ['ad_employer' => $ad_employer->id]) }}" class="button">Добавить</a>
192   -
193   - if ($ad_employer->jobs->count())
194   - foreach ($ad_employer->jobs as $key => $it_um)
195   - <p>if (isset($ad_employer->jobs_code[$key]))
196   - <a href=" route('employer.edit_job_in_vac', ['ad_job' => $ad_employer->jobs_code[$key]->id, 'ad_employer' => $ad_employer->id, 'job_title_id' => $it_um->id]) }}" style="text-decoration: underline">$it_um->name}}</a>
197   - <a href=" route('employer.delete_job_in_vac', ['ad_job' => $ad_employer->jobs_code[$key]->id]) }}" style="text-decoration: underline">(Del)</a>
198   - endif
199   - </p>
200   - endforeach
201   - else
202   - Нет связанных <br> с вакансией должностей
203   - endif
204   - </div>
205   - </div>-->
206 159 </div>
207 160  
208 161 <a class="button cabinet__submit" href="{{ route('employer.vacancy_list') }}">Назад</a>
209   - <button type="submit" class="button cabinet__submit">Опубликовать</button>
  162 + <button type="submit" class="button cabinet__submit">Сохранить и опубликовать</button>
210 163 </div>
211 164 </form>
212 165 </div>
resources/views/employers/menu.blade.php
... ... @@ -21,7 +21,7 @@
21 21 <a href="{{ route('employer.cabinet') }}" class="cabinet__menu-item @if ($item==1) active @endif">
22 22 <i>
23 23 <svg>
24   - <use xlink:href="{{ asset('images/sprite.svg#cabinet-1') }}"></use>
  24 + <use xlink:href="{{ asset('images/sprite.svg#user_alt') }}"></use>
25 25 </svg>
26 26 </i>
27 27 <span>Профиль</span>
... ... @@ -134,7 +134,7 @@
134 134 <a style="background-color: white" class="nav-button cabinet__menu-item">
135 135 <i>
136 136 <svg>
137   - <use xlink:href="{{ asset('images/sprite.svg#cabinet-11') }}"></use>
  137 + <use xlink:href="{{ asset('images/sprite.svg#settings') }}"></use>
138 138 </svg>
139 139 </i>
140 140 <span>Настройки</span>
resources/views/modals/send_admin.blade.php
... ... @@ -14,7 +14,7 @@
14 14 <div class="modal__form-item">
15 15 <div class="file">
16 16 <label class="file__input">
17   - <input type="file">
  17 + <input type="file" accept=".pdf, .doc, .docx">
18 18 <span class="button button_light">
19 19 <svg>
20 20 <use xlink:href="images/sprite.svg#share"></use>
resources/views/modals/send_employer.blade.php
... ... @@ -28,7 +28,7 @@
28 28 <div class="modal__form-item">
29 29 <div class="file">
30 30 <label class="file__input">
31   - <input type="file" name="file" id="file">
  31 + <input type="file" name="file" id="file" accept=".pdf, .doc, .docx">
32 32 <span class="button button_light">
33 33 <svg>
34 34 <use xlink:href="{{ asset('images/sprite.svg#share') }}"></use>
resources/views/modals/send_worker.blade.php
... ... @@ -6,13 +6,10 @@
6 6 });
7 7  
8 8 $(document).on('change', '#btn_send_file', function() {
9   -
10   - var send_name = $('#send_name');
11   - var send_name_val = send_name.val();
12   - var send_name_file = $('#send_name_file');
13   -
14   - send_name_file.html(send_name_val);
15   -
  9 + let dirArray = $(this).val().split('\\')
  10 + console.log(dirArray)
  11 + $('#send_name_file3').html(dirArray[dirArray.length - 1])
  12 + console.log($('#send_name_file3').html())
16 13 });
17 14 </script>
18 15 <div id="send3" class="modal">
... ... @@ -29,8 +26,8 @@
29 26 </div>
30 27 <div class="modal__form-item">
31 28 <div class="file">
32   - <label class="file__input" id="btn_send_file" name="btn_send_file">
33   - <input type="file" name="file" id="send_name">
  29 + <label class="file__input">
  30 + <input type="file" name="file" id="btn_send_file" accept=".pdf, .doc, .docx">
34 31 <span class="button button_light">
35 32 <svg>
36 33 <use xlink:href="{{ asset('images/sprite.svg#share') }}"></use>
... ... @@ -45,7 +42,7 @@
45 42 <svg>
46 43 <use xlink:href="{{ asset('images/sprite.svg#clip') }}"></use>
47 44 </svg>
48   - <span id="send_name_file" name="send_name_file"></span>
  45 + <span id="send_name_file3"></span>
49 46 </div>
50 47 <button type="button" class="file__list-item-right js-parent-remove">
51 48 <svg>
resources/views/modals/send_worker_new.blade.php
... ... @@ -30,7 +30,7 @@
30 30 <div class="modal__form-item">
31 31 <div class="file">
32 32 <label class="file__input" id="btn_send_file" name="btn_send_file">
33   - <input type="file" name="send_file" id="send_name">
  33 + <input type="file" name="send_file" id="send_name" accept=".pdf, .doc, .docx">
34 34 <span class="button button_light">
35 35 <svg>
36 36 <use xlink:href="{{ asset('images/sprite.svg#share') }}"></use>
resources/views/workers/dialog.blade.php
... ... @@ -303,7 +303,7 @@
303 303 <form action="{{ route('worker.test123') }}" class="chatbox__bottom" enctype="multipart/form-data" method="POST" >
304 304 @csrf
305 305 <label class="chatbox__bottom-file">
306   - <input id="file" name="file" type="file">
  306 + <input id="file" name="file" type="file" accept=".pdf, .doc, .docx">
307 307 <svg>
308 308 <use xlink:href="{{ asset('images/sprite.svg#clip') }}"></use>
309 309 </svg>