Floating page content bugfix and prevent incompatable image uploads. Fixes #26.

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 3e82bb4c0016547b74d593945bf7bbe9a401bf48..fd790157034dc3e3800742abaf8b139c77903ab6 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -110,7 +110,11 @@ class ImageController extends Controller
     public function upload(Request $request)
     {
         $this->checkPermission('image-create');
     public function upload(Request $request)
     {
         $this->checkPermission('image-create');

+        $this->validate($request, [
+            'file' => 'image|mimes:jpeg,gif,png'
+        ]);

         $imageUpload = $request->file('file');
         $imageUpload = $request->file('file');

+

         $name = str_replace(' ', '-', $imageUpload->getClientOriginalName());
         $storageName = substr(sha1(time()), 0, 10) . '-' . $name;
         $imagePath = '/uploads/images/' . Date('Y-m-M') . '/';
         $name = str_replace(' ', '-', $imageUpload->getClientOriginalName());
         $storageName = substr(sha1(time()), 0, 10) . '-' . $name;
         $imagePath = '/uploads/images/' . Date('Y-m-M') . '/';

diff --git a/resources/assets/js/components/image-manager.vue b/resources/assets/js/components/image-manager.vue
index a77c4ac8e56a162ef3c3ea2d6de9899f9fdeb495..b1c805f8f5c502affe900a5b575036f4a39b2cd2 100644 (file)
--- a/resources/assets/js/components/image-manager.vue
+++ b/resources/assets/js/components/image-manager.vue
@@ -110,6 +110,12 @@
                                 dz.removeFile(file);
                             });
                         });
                                 dz.removeFile(file);
                             });
                         });

+                        this.on('error', function(file, errorMessage, xhr) {
+                            if(errorMessage.file) {
+                                $(file.previewElement).find('[data-dz-errormessage]').text(errorMessage.file[0]);
+                            }
+                            console.log(errorMessage);
+                        });

                     }
                 });
             },
                     }
                 });
             },

diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index 68b7da2b94713450050377e49bfb3a257fe708e1..9d3ab03c063334a80daf3c72777ff54e2d1a19bd 100644 (file)
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -19,12 +19,16 @@
   max-width: 840px;
   overflow-wrap: break-word;
   .align-left {
   max-width: 840px;
   overflow-wrap: break-word;
   .align-left {

-    float: left !important;

     text-align: left;
     text-align: left;

+  }
+  img.align-left, table.align-left {
+    float: left !important;

     margin: $-xs $-s $-xs 0;
   }
   .align-right {
     float: right !important;
     margin: $-xs $-s $-xs 0;
   }
   .align-right {
     float: right !important;

+  }
+  img.align-right, table.align-right {

     text-align: right;
     margin: $-xs 0 $-xs $-s;
   }
     text-align: right;
     margin: $-xs 0 $-xs $-s;
   }