Commit 330dc3881004c08dedb59dd449c1ad0fba517aad

Authored by Андрей Ларионов
1 parent 3ea0de9fd7

Коммит обновление от четверга 6 июня

Showing 7 changed files with 44 additions and 13 deletions Side-by-side Diff

app/Http/Controllers/EmployerController.php
... ... @@ -302,7 +302,7 @@ class EmployerController extends Controller
302 302 $vac_emp->updated_at = $up;
303 303 $vac_emp->save();
304 304  
305   - return redirect()->route('employer.vacancy_list');
  305 + return redirect()->back(); //route('employer.vacancy_list');
306 306 // начало конца
307 307 }
308 308  
... ... @@ -477,7 +477,7 @@ class EmployerController extends Controller
477 477 } else {
478 478 $user = $this->create($params);
479 479 event(new Registered($user));
480   -
  480 +
481 481 Mail::to(env('EMAIL_ADMIN'))->send(new MailCreateEmployer($params));
482 482  
483 483 Auth::guard()->login($user);
app/Http/Requests/PagesRequest.php
... ... @@ -54,11 +54,9 @@ class PagesRequest extends FormRequest
54 54 ],
55 55 'anons' => [
56 56 'required',
57   - 'min:50',
58 57 ],
59   - 'text' => [
  58 + 'text2' => [
60 59 'required',
61   - 'min:255',
62 60 ],
63 61 'image' => [
64 62 'mimes:jpeg,jpg,png',
app/Models/pages.php
... ... @@ -16,5 +16,6 @@ class pages extends Model
16 16 'anons',
17 17 'author',
18 18 'image',
  19 + 'text2'
19 20 ];
20 21 }
database/migrations/2024_06_06_092618_alter_table_pages.php
... ... @@ -0,0 +1,32 @@
  1 +<?php
  2 +
  3 +use Illuminate\Database\Migrations\Migration;
  4 +use Illuminate\Database\Schema\Blueprint;
  5 +use Illuminate\Support\Facades\Schema;
  6 +
  7 +return new class extends Migration
  8 +{
  9 + /**
  10 + * Run the migrations.
  11 + *
  12 + * @return void
  13 + */
  14 + public function up()
  15 + {
  16 + Schema::table('pages', function (Blueprint $table) {
  17 + $table->longText('text2')->nullable(true);
  18 + });
  19 + }
  20 +
  21 + /**
  22 + * Reverse the migrations.
  23 + *
  24 + * @return void
  25 + */
  26 + public function down()
  27 + {
  28 + Schema::table('pages', function (Blueprint $table) {
  29 + $table->dropColumn('text2');
  30 + });
  31 + }
  32 +};
resources/views/admin/pages/form.blade.php
... ... @@ -86,9 +86,9 @@
86 86  
87 87 <label class="block text-sm">
88 88 <span class="text-gray-700 dark:text-gray-400">Текст</span>
89   - <textarea class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-textarea focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray ckeditor" name="text" placeholder="Текст (html)" required
90   - rows="10">{{ old('text') ?? $page->text ?? '' }}</textarea>
91   - @error('text')
  89 + <textarea class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-textarea focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray ckeditor" name="text2" placeholder="Текст (html)" required
  90 + rows="10">{{ old('text2') ?? $page->text2 ?? '' }}</textarea>
  91 + @error('text2')
92 92 <span class="text-xs text-red-600 dark:text-red-400">
93 93 {{ $message }}
94 94 </span>
... ... @@ -139,7 +139,7 @@
139 139 <script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>
140 140 <script>
141 141 CKEDITOR.replace( 'anons');
142   - CKEDITOR.replace( 'text', {
  142 + CKEDITOR.replace( 'text2', {
143 143 filebrowserUploadUrl: "{{route('ckeditor.image-upload', ['_token' => csrf_token() ])}}",
144 144 filebrowserImageUploadUrl: "{{ route('ckeditor.image-upload', ['_token' => csrf_token() ])}}",
145 145 filebrowserUploadMethod: 'form'
resources/views/employers/menu.blade.php
... ... @@ -60,14 +60,14 @@
60 60 </i>
61 61 <span>Мои вакансии</span>
62 62 </a>
63   - <a href="{{ route('employer.answers', ['employer' => $id_employer]) }}" class="cabinet__menu-item @if ($item==4) active @endif">
  63 + <!-- <a href="{ route('employer.answers', ['employer' => $id_employer]) }}" class="cabinet__menu-item if ($item==4) active endif">
64 64 <i>
65 65 <svg>
66   - <use xlink:href="{{ asset('images/sprite.svg#cabinet-4') }}"></use>
  66 + <use xlink:href="{ asset('images/sprite.svg#cabinet-4') }}"></use>
67 67 </svg>
68 68 </i>
69 69 <span>Отклики на вакансию</span>
70   - </a>
  70 + </a>-->
71 71 <a href="{{ route('employer.messages', ['type_message' => 'input']) }}" class="cabinet__menu-item @if ($item==5) active @endif">
72 72 <i>
73 73 <svg>
resources/views/pages.blade.php
... ... @@ -29,7 +29,7 @@
29 29 <div class="container">
30 30 <div class="main__content">
31 31 <div class="main__content-item">
32   - {!! $page->text !!}
  32 + {!! $page->text2 !!}
33 33 </div>
34 34 </div>
35 35 </div>