fixes

5balloons · Jan 27, 2023 · f082b92 · f082b92
1 parent 555016a
commit f082b92
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/resources/dist/js/smart-banner.js b/resources/dist/js/smart-banner.js
@@ -8,7 +8,16 @@ fetch('/smart-banner-auto-placements')
           if(placement.selector){
             var adSelector = document.querySelector(placement.selector);
             if(adSelector){
-              let adBody = "<div class=\"smart-banner-temp\" banner-slug=\""+ad.slug+"\">"+ad.body+"</div>"
+              let adBody = '';
+              if(ad.adType == 'HTML'){
+                adBody = "<div class=\"smart-banner-temp\" banner-slug=\""+ad.slug+"\">"+ad.body+"</div>"
+              }else if(ad.adType == 'IMAGE'){
+                adBody = "<div class=\"smart-banner-temp\" banner-slug=\""+ad.slug+"\">\
+                         <a href=\""+ad.imageUrl+"\" target=\"_blank\">\
+                          <img src=\""+ad.image+"\" alt=\""+ad.imageAlt+"\" />\
+                         </a>\
+                         </div>"
+              }
               adSelector.insertAdjacentHTML(placement.position, adBody);
             }
           }

diff --git a/resources/views/smart-ad-manager/edit.blade.php b/resources/views/smart-ad-manager/edit.blade.php
@@ -130,12 +130,19 @@ class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:bor
 
                       <div x-data="{
                             placements: [
-                              @foreach(json_decode($smartAd->placements) as $placement)
-                              {
-                                position: '{{$placement->position}}',
-                                selector: '{{$placement->selector}}'
-                              },
+                              @isset($smartAd->placements)
+                                @foreach(json_decode($smartAd->placements) as $placement)
+                                {
+                                  position: '{{$placement->position}}',
+                                  selector: '{{$placement->selector}}'
+                                },
                               @endforeach
+                              @else
+                                {
+                                  position: '',
+                                  selector: ''
+                                }
+                              @endisset
                             ],
                             addNewPlacement() {
                                 this.placements.push({

diff --git a/src/Http/Controllers/SmartAdManagerController.php b/src/Http/Controllers/SmartAdManagerController.php
@@ -42,7 +42,7 @@ public function store(StoreSmartAdRequest $request){
             'image' => isset($imagePath) ? $imagePath : null,
             'imageUrl' => $request->imageUrl,
             'imageAlt' => $request->imageAlt,
-            'placements' => $request->placements,
+            'placements' => !empty(json_decode($request->placements)[0]->selector) ? $request->placements : null,
         ]);
         return redirect("/smart-ad-manager/ads/{$smartAd->id}")->with(['message' => 'Ad Created', 'color' => 'green']);
     }