Merge pull request #2 from ARCANESOFT/develop

Updating the media vuejs assets & Other stuff
ARCANESOFT · Dec 17, 2016 · ae8d2ea · ae8d2ea
2 parents ba3d7bc + 601ab9e
commit ae8d2ea
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 48 deletions.
diff --git a/config/sidebar/main.php b/config/sidebar/main.php
@@ -6,7 +6,7 @@
 return [
     'title'       => 'Media',
     'name'        => 'media',
-    'route'       => 'media::foundation.index',
+    'route'       => 'admin::media.index',
     'icon'        => 'fa fa-fw fa-picture-o',
     'roles'       => [Role::ADMINISTRATOR],
     'permissions' => [],

diff --git a/resources/assets/js/Config.js b/resources/assets/js/Config.js
@@ -6,7 +6,15 @@ const config = {
         'image/jpeg',
         'image/png',
         'image/svg+xml'
-    ]
+    ],
+
+    "default-icon": "fa-file-pdf-o",
+
+    icons: {
+        "application/pdf": "fa-file-pdf-o",
+        "application/vnd.ms-excel": "fa-file-excel-o",
+        "text/plain": "fa-file-text-o"
+    }
 };
 
 export default config;
diff --git a/resources/assets/js/MediaManager.vue b/resources/assets/js/MediaManager.vue
@@ -54,34 +54,26 @@
                 >
                     <div class="media-icon">
                         <i class="fa fa-fw fa-folder-o" v-if="isMediaDirectory(media)"></i>
-                        <div class="media-image"
-                             v-if="isMediaImage(media)"
+
+                        <div v-if="isMediaImage(media)"
                              :style="'background-image: url(' + media.url + ');'"
+                             class="media-image"
                         ></div>
+
+                        <i v-if="isMediaNotImage(media)" :class="getMediaFileIcon(media)" class="fa fa-fw"></i>
                     </div>
                     <div class="media-details">
                         <h4 class="media-name">{{ media.name }}</h4>
                     </div>
                 </a>
-                <!--<a class="media-item media-file"-->
-                   <!--v-for="file in files"-->
-                   <!--:class="{selected: file.name == selected.name}"-->
-                   <!--@click="selectMedia(file.name, 'file')">-->
-                    <!--<div class="media-icon">-->
-                        <!--<div class="media-image" :style="'background-image: url(' + file.url + ');'"></div>-->
-                    <!--</div>-->
-                    <!--<div class="media-details">-->
-                        <!--<h4 class="media-name">{{ file.name }}</h4>-->
-                    <!--</div>-->
-                <!--</a>-->
             </div>
             <div class="media-status-bar">
 
             </div>
             <transition name="fade">
                 <div class="media-loader" v-show="loading">
                     <i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw"></i>
-                    <p>LOADING&hellip;</p>
+                    <p>{{ loadingText }}</p>
                 </div>
             </transition>
         </div>
@@ -99,6 +91,12 @@
     import eventHub from './../../../shared/EventHub'
 
     export default {
+        props: {
+            loadingText: {
+                type: String,
+                default: "LOADING..."
+            },
+        },
         data () {
             return {
                 breadcrumbs: [],
@@ -185,8 +183,8 @@
                 this.breadcrumbs = [];
                 this.resetSelected();
 
-                this.$http.get(config.endpoint + '/all').then((response) => {
-                    this.medias = response.body.data;
+                axios.get(config.endpoint + '/all').then((response) => {
+                    this.medias = response.data.data;
                     this.loading = false;
                 });
             },
@@ -209,6 +207,15 @@
 
                 return _.indexOf(config.supportedImages, media.mimetype) >= 0;
             },
+            isMediaNotImage(media) {
+                return ! (this.isMediaDirectory(media) || this.isMediaImage(media));
+            },
+
+            getMediaFileIcon(media) {
+                return _.has(config.icons, media.mimetype)
+                    ? config.icons[media.mimetype]
+                    : config['default-icon'];
+            },
 
             openMedia(media) {
                 if (this.isMediaDirectory(media)) {
@@ -225,8 +232,8 @@
                 this.resetSelected();
                 this.loading = true;
 
-                this.$http.get(config.endpoint + '/all?location=' + location).then((response) => {
-                    this.medias  = response.body.data;
+                axios.get(config.endpoint + '/all?location=' + location).then((response) => {
+                    this.medias  = response.data.data;
                     this.loading = false;
                 });
             },
@@ -291,7 +298,7 @@
     }
 </script>
 
-<style lang="sass-loader" rel="stylesheet/scss">
+<style lang="sass-loader" rel="stylesheet/scss" scoped>
     $container-height: 400px;
     $base-color: #4da7e8;
 
@@ -370,6 +377,12 @@
                             font-size: 14px;
                             font-weight: 600;
                             line-height: 1.4em;
+
+                            -webkit-touch-callout: none;
+                            -webkit-user-select: none;
+                            -moz-user-select: none;
+                            -ms-user-select: none;
+                            user-select: none;
                         }
                     }
                 }

diff --git a/resources/assets/js/Modals/CreateFolderModal.vue b/resources/assets/js/Modals/CreateFolderModal.vue
@@ -43,8 +43,7 @@
         },
         methods: {
             createFolder() {
-                this.$http
-                    .post(config.endpoint + '/create', {
+                axios.post(config.endpoint + '/create', {
                         name: this.newDirectory,
                         location: this.location
                     })

diff --git a/resources/assets/js/Modals/DeleteMediaModal.vue b/resources/assets/js/Modals/DeleteMediaModal.vue
@@ -41,8 +41,7 @@
         },
         methods: {
             deleteFolder() {
-                this.$http
-                    .post(config.endpoint + '/delete', {
+                axios.post(config.endpoint + '/delete', {
                         media: this.media
                     })
                     .then((response) => {

diff --git a/resources/assets/js/Modals/RenameMediaModal.vue b/resources/assets/js/Modals/RenameMediaModal.vue
@@ -44,8 +44,7 @@
         methods: {
             renameFolder() {
                 if (this.isDirty) {
-                    this.$http
-                        .post(config.endpoint + '/rename', {
+                    axios.post(config.endpoint + '/rename', {
                             location: this.location,
                             media:    this.media,
                             newName:  this.newName

diff --git a/resources/assets/js/Modals/UploadMediaModal.vue b/resources/assets/js/Modals/UploadMediaModal.vue
@@ -53,8 +53,7 @@
                 });
             },
             upload() {
-                this.$http
-                    .post(config.endpoint + '/upload', this.formData)
+                axios.post(config.endpoint + '/upload', this.formData)
                     .then((response) => {
                         if (response.data.status == 'success') {
                             this.$parent.refreshDirectory();

diff --git a/src/Http/Controllers/Controller.php → src/Http/Controllers/Admin/Controller.php b/src/Http/Controllers/Controller.php → src/Http/Controllers/Admin/Controller.php
@@ -1,12 +1,12 @@
-<?php namespace Arcanesoft\Media\Http\Controllers;
+<?php namespace Arcanesoft\Media\Http\Controllers\Admin;
 
 use Arcanesoft\Core\Bases\FoundationController as BaseController;
 use Arcanesoft\Core\Traits\Notifyable;
 
 /**
  * Class     Controller
  *
- * @package  Arcanesoft\Auth\Http\Controllers\Foundation
+ * @package  Arcanesoft\Media\Http\Controllers\Admin
  * @author   ARCANEDEV <[email protected]>
  */
 abstract class Controller extends BaseController
@@ -39,6 +39,6 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->addBreadcrumbRoute('Media', 'media::foundation.index');
+        $this->addBreadcrumbRoute('Media', 'admin::media.index');
     }
 }
diff --git a/src/Http/Controllers/MediasController.php → ...tp/Controllers/Admin/MediasController.php b/src/Http/Controllers/MediasController.php → ...tp/Controllers/Admin/MediasController.php
@@ -1,5 +1,6 @@
-<?php namespace Arcanesoft\Media\Http\Controllers;
+<?php namespace Arcanesoft\Media\Http\Controllers\Admin;
 
+use Arcanesoft\Media\Http\Controllers\Admin\Controller;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
@@ -8,7 +9,7 @@
 /**
  * Class     MediasController
  *
- * @package  Arcanesoft\Media\Http\Controllers
+ * @package  Arcanesoft\Media\Http\Controllers\Admin
  * @author   ARCANEDEV <[email protected]>
  */
 class MediasController extends Controller

diff --git a/src/Http/Routes/MediaRoutes.php → src/Http/Routes/Admin/MediaRoutes.php b/src/Http/Routes/MediaRoutes.php → src/Http/Routes/Admin/MediaRoutes.php
@@ -1,4 +1,4 @@
-<?php namespace Arcanesoft\Media\Http\Routes;
+<?php namespace Arcanesoft\Media\Http\Routes\Admin;
 
 use Arcanedev\Support\Bases\RouteRegister;
 use Illuminate\Contracts\Routing\Registrar;
@@ -28,20 +28,22 @@ public function map(Registrar $router)
         $this->registerApiRoutes();
     }
 
+    /**
+     * Register the media api routes.
+     */
     private function registerApiRoutes()
     {
         // TODO: Adding ajax middleware
         $this->group(['prefix' => 'api', 'as' => 'api.'], function () {
-            // media::foundation.api.get
+            // admin::media.api.get
             $this->get('all', 'MediasController@getAll')->name('get');
-            // media::foundation.api.upload
+            // admin::media.api.upload
             $this->post('upload', 'MediasController@uploadMedia')->name('upload');
-            // media::foundation.api.delete
+            // admin::media.api.delete
             $this->post('rename', 'MediasController@renameMedia')->name('rename');
-            // media::foundation.api.delete
+            // admin::media.api.delete
             $this->post('delete', 'MediasController@deleteMedia')->name('delete');
-
-            // media::foundation.api.create
+            // admin::media.api.create
             $this->post('create', 'MediasController@createDirectory')->name('create');
         });
     }

diff --git a/src/Providers/PackagesServiceProvider.php b/src/Providers/PackagesServiceProvider.php
@@ -2,7 +2,13 @@
 
 use Arcanedev\Support\ServiceProvider;
 
+/**
+ * Class     PackagesServiceProvider
+ *
+ * @package  Arcanesoft\Media\Providers
+ * @author   ARCANEDEV <[email protected]>
+ */
 class PackagesServiceProvider extends ServiceProvider
 {
-
+    //
 }
diff --git a/src/Providers/RouteServiceProvider.php b/src/Providers/RouteServiceProvider.php
@@ -40,25 +40,30 @@ public function getFoundationAuthPrefix()
     /**
      * Define the routes for the application.
      *
-     * @param  \Illuminate\Contracts\Routing\Registrar $router
+     * @param  \Illuminate\Contracts\Routing\Registrar  $router
      */
     public function map(Router $router)
     {
-        $this->mapFoundationRoutes($router);
+        $this->mapAdminRoutes($router);
     }
 
-    private function mapFoundationRoutes(Router $router)
+    /**
+     * Register the admin routes.
+     *
+     * @param  \Illuminate\Contracts\Routing\Registrar  $router
+     */
+    private function mapAdminRoutes(Router $router)
     {
         $attributes = array_merge($this->getFoundationRouteGroup(), [
-            'as'        => 'media::foundation.',
-            'namespace' => 'Arcanesoft\\Media\\Http\\Controllers',
+            'as'        => 'admin::media.',
+            'namespace' => 'Arcanesoft\\Media\\Http\\Controllers\\Admin',
         ]);
 
         $router->group(array_merge(
             $attributes,
             ['prefix' => $this->getFoundationAuthPrefix()]
         ), function (Router $router) {
-            Routes\MediaRoutes::register($router);
+            Routes\Admin\MediaRoutes::register($router);
         });
     }
 }