wip #3753

diff --git a/composer.json b/composer.json
index 530215404cb136ea590ebc1c173e3260a2c370c0..7a87adfa2219e35599bef04ea62220eb082e0092 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Gaspertrix\\Backpack\\DropzoneField\\": "src"
+            "Gaspertrix\\Backpack\\DropzoneField\\": "src/app"
         }
     },
     "autoload-dev": {

diff --git a/src/DropzoneFieldServiceProvider.php b/src/DropzoneFieldServiceProvider.php
deleted file mode 100644 (file)
index a62ffd8..0000000
--- a/src/DropzoneFieldServiceProvider.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Gaspertrix\Backpack\DropzoneField;
-
-use Illuminate\Support\ServiceProvider;
-
-class DropzoneFieldServiceProvider extends ServiceProvider
-{
-    protected $commands = [
-        \Gaspertrix\Backpack\DropzoneField\App\Console\Commands\Install::class,
-    ];
-
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        if ($this->app->runningInConsole()) {
-            $this->commands($this->commands);
-        }
-
-        // publish field
-        $this->publishes([__DIR__.'/resources/views' => resource_path('views/vendor/backpack/crud')], 'views');
-
-        // publish public assets
-        $this->publishes([__DIR__ . '/public' => public_path('vendor/gaspertrix/laravel-backpack-dropzone-field')], 'public');
-    }
-
-    /**
-     * Register any package services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
-}

diff --git a/src/Traits/HandleAjaxMedia.php b/src/Traits/HandleAjaxMedia.php
deleted file mode 100644 (file)
index ed497ae..0000000
--- a/src/Traits/HandleAjaxMedia.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Gaspertrix\Backpack\DropzoneField\Traits;
-
-use Spatie\MediaLibrary\MediaCollections\Models\Media;
-use Illuminate\Http\Request;
-
-trait HandleAjaxMedia
-{
-    /**
-     * Add file from the current request to the medialibrary
-     *
-     * @param  Request $request [description]
-     * @param  int $id [description]
-     * @return [type]           [description]
-     */
-    public function uploadMedia(Request $request, $id)
-    {
-        $entry = $this->crud->getEntry($id);
-        $media = $entry->addMediaFromRequest('file')->toMediaCollection($request->input('collection'));
-
-        return response()->json([
-            'success' => true,
-            'message' => 'Media successfully uploaded',
-            'media' => $media,
-        ]);
-    }
-
-    /**
-     * Delete file from the medialibrary
-     *
-     * @param  Request $request [description]
-     * @param  int $id [description]
-     * @param  int $mediaId [description]
-     * @return [type]           [description]
-     */
-    public function deleteMedia(Request $request, $id, $mediaId)
-    {
-        $media = Media::findOrFail($mediaId);
-        $media->delete();
-
-        return response()->json([
-            'success' => true,
-            'message' => 'Media successfully deleted'
-        ]);
-    }
-
-    /**
-     * Delete file from the medialibrary
-     *
-     * @param  Request $request [description]
-     * @param  int $id [description]
-     * @return [type]           [description]
-     */
-    public function reorderMedia(Request $request, $id)
-    {
-        Media::setNewOrder($request->input('ids'));
-
-        return response()->json([
-            'success' => true
-        ]);
-    }
-}

diff --git a/src/app/Console/Commands/Install.php b/src/app/Console/Commands/Install.php
index 1943ecdbd41d7744440caed5216472f2864c0683..2183fa9f4dab5cb186d5034b1d7ced3e148604ce 100644 (file)
--- a/src/app/Console/Commands/Install.php
+++ b/src/app/Console/Commands/Install.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Gaspertrix\Backpack\DropzoneField\App\Console\Commands;
+namespace Gaspertrix\Backpack\DropzoneField\Console\Commands;
 
 use Illuminate\Console\Command;
 use Symfony\Component\Process\Process;

diff --git a/src/app/DropzoneFieldServiceProvider.php b/src/app/DropzoneFieldServiceProvider.php
new file mode 100644 (file)
index 0000000..ef280b4
--- /dev/null
+++ b/src/app/DropzoneFieldServiceProvider.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Gaspertrix\Backpack\DropzoneField;
+
+use Illuminate\Support\ServiceProvider;
+
+class DropzoneFieldServiceProvider extends ServiceProvider
+{
+    protected $commands = [
+        \Gaspertrix\Backpack\DropzoneField\Console\Commands\Install::class,
+    ];
+
+    /**
+     * Perform post-registration booting of services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        if ($this->app->runningInConsole()) {
+            $this->commands($this->commands);
+        }
+
+        // publish field
+        $this->publishes([__DIR__ . '/../resources/views' => resource_path('views/vendor/backpack/crud')], 'views');
+
+        // publish public assets
+        $this->publishes([__DIR__ . '/../public' => public_path('vendor/gaspertrix/laravel-backpack-dropzone-field')], 'public');
+    }
+
+    /**
+     * Register any package services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+}

diff --git a/src/app/Traits/HandleAjaxMedia.php b/src/app/Traits/HandleAjaxMedia.php
new file mode 100644 (file)
index 0000000..ed497ae
--- /dev/null
+++ b/src/app/Traits/HandleAjaxMedia.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Gaspertrix\Backpack\DropzoneField\Traits;
+
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
+use Illuminate\Http\Request;
+
+trait HandleAjaxMedia
+{
+    /**
+     * Add file from the current request to the medialibrary
+     *
+     * @param  Request $request [description]
+     * @param  int $id [description]
+     * @return [type]           [description]
+     */
+    public function uploadMedia(Request $request, $id)
+    {
+        $entry = $this->crud->getEntry($id);
+        $media = $entry->addMediaFromRequest('file')->toMediaCollection($request->input('collection'));
+
+        return response()->json([
+            'success' => true,
+            'message' => 'Media successfully uploaded',
+            'media' => $media,
+        ]);
+    }
+
+    /**
+     * Delete file from the medialibrary
+     *
+     * @param  Request $request [description]
+     * @param  int $id [description]
+     * @param  int $mediaId [description]
+     * @return [type]           [description]
+     */
+    public function deleteMedia(Request $request, $id, $mediaId)
+    {
+        $media = Media::findOrFail($mediaId);
+        $media->delete();
+
+        return response()->json([
+            'success' => true,
+            'message' => 'Media successfully deleted'
+        ]);
+    }
+
+    /**
+     * Delete file from the medialibrary
+     *
+     * @param  Request $request [description]
+     * @param  int $id [description]
+     * @return [type]           [description]
+     */
+    public function reorderMedia(Request $request, $id)
+    {
+        Media::setNewOrder($request->input('ids'));
+
+        return response()->json([
+            'success' => true
+        ]);
+    }
+}