Floating page content bugfix and prevent incompatable image uploads. …

…Fixes #26.
rosetta-ai · Dec 1, 2015 · 9969698 · 9969698
1 parent b498b60
commit 9969698
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
@@ -110,7 +110,11 @@ public function getThumbnail($image, $width = 220, $height = 220, $keepRatio = f
     public function upload(Request $request)
     {
         $this->checkPermission('image-create');
+        $this->validate($request, [
+            'file' => 'image|mimes:jpeg,gif,png'
+        ]);
         $imageUpload = $request->file('file');
+
         $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
@@ -110,6 +110,12 @@
                                 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
@@ -19,12 +19,16 @@
   max-width: 840px;
   overflow-wrap: break-word;
   .align-left {
-    float: left !important;
     text-align: left;
+  }
+  img.align-left, table.align-left {
+    float: left !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;
   }