Merge pull request #3420 from codeeu/dev

Dev

Author: bernardhanna

app/Nova/DreamJobRoleModel.php

@@ -7,7 +7,7 @@
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\Number;
 use Laravel\Nova\Fields\Text;
-use Laravel\Nova\Fields\Textarea;
+use Laravel\Nova\Fields\Trix;
 use Laravel\Nova\Http\Requests\NovaRequest;
 
 class DreamJobRoleModel extends Resource
@@ -45,7 +45,7 @@ public function fields(Request $request): array
             Text::make('Slug', 'slug')
                 ->rules('required', 'max:255', 'unique:dream_job_role_models,slug,{{resourceId}}')
                 ->help('Used in URL, e.g. anny-tubbs'),
-            Textarea::make('Role', 'role')->rules('required'),
+            Trix::make('Role', 'role')->rules('required'),
 
             Text::make('Image URL', 'image')
                 ->rules('required', 'max:2048')
@@ -54,8 +54,10 @@ public function fields(Request $request): array
                 ->rules('required', 'max:8')
                 ->help('Flag code used by existing assets, e.g. be, fr, gr'),
 
-            Textarea::make('Description 1', 'description1')->nullable(),
-            Textarea::make('Description 2', 'description2')->nullable(),
+            Trix::make('Description 1', 'description1')->nullable()
+                ->help('Supports rich text formatting, links, and lists.'),
+            Trix::make('Description 2', 'description2')->nullable()
+                ->help('Supports rich text formatting, links, and lists.'),
 
             Text::make('Profile Link', 'link')->nullable()->rules('nullable', 'max:2048'),
             Text::make('Video Embed URL', 'video')->nullable()->rules('nullable', 'max:2048'),

resources/views/static/dream-jobs-in-digital-role.blade.php

@@ -278,16 +278,18 @@
                     </h2>
                     <img class="shadow-lg rounded w-12 h-9" width="48" src="/images/flags/{{ $item['country'] }}-flag.svg" />
                 </div>
-                <p class="text-[22px] md:text-3xl text-[#333E48] font-medium font-['Montserrat'] p-0 mb-6">{{ $item['role'] }}</p>
+                <div class="text-[22px] md:text-3xl text-[#333E48] font-medium font-['Montserrat'] p-0 mb-6 [&_p]:p-0 [&_p]:m-0 [&_div]:p-0 [&_div]:m-0">
+                    {!! $item['role'] !!}
+                </div>
                 <div class="flex flex-col tablet:flex-row gap-6 xl:gap-12">
                     <div class="w-full tablet:w-1/3 xl:w-1/3">
                         <img class="rounded-xl mb-6 w-full" src="{{ $item['image'] }}" />
-                        <p class="font-normal text-2xl p-0 mb-6">
-                            {{ $item['description1'] }}
-                        </p>
-                        <p class="text-[#333E48] font-normal text-xl p-0 mb-6">
-                            {{ $item['description2'] }}
-                        </p>
+                        <div class="font-normal text-2xl p-0 mb-6 [&_p]:p-0 [&_p]:m-0 [&_p]:mb-6 [&_p:last-child]:mb-0 [&_div]:p-0 [&_div]:m-0 [&_div]:mb-6 [&_div:last-child]:mb-0">
+                            {!! $item['description1'] !!}
+                        </div>
+                        <div class="text-[#333E48] font-normal text-xl p-0 mb-6 [&_p]:p-0 [&_p]:m-0 [&_p]:mb-6 [&_p:last-child]:mb-0 [&_div]:p-0 [&_div]:m-0 [&_div]:mb-6 [&_div:last-child]:mb-0">
+                            {!! $item['description2'] !!}
+                        </div>
                         <p class="text-[#333E48] font-normal text-xl p-0 mb-6">
                             Check out the career journey here: <a class="text-dark-blue underline" href="{{ $item['link'] }}" target="_blank">{{ $item['first_name'] }} {{ $item['last_name'] }}</a>
                         </p>