merge master

Modules/Core/Repositories/BaseRepository.php

@@ -99,6 +99,22 @@ interface BaseRepository
      */
     public function clearCache();
 
+    /**
+     * Add where statement to current builder
+     *
+     * @param string $field
+     * @param string|int $value
+     * @param string $operator
+     */
+    public function where(string $field, $value, string $operator = null);
+
+    /**
+     * Eager relationship(s) loading
+     *
+     * @param array|string $relationships
+     */
+    public function with($relationships);
+
     /**
      * @param string $field
      * @param array $values

Modules/Core/Repositories/Cache/BaseCacheDecorator.php

@@ -228,5 +228,24 @@ abstract class BaseCacheDecorator implements BaseRepository
     public function whereIn(string $field, array $values)
     {
         return $this->repository->whereIn($field, $values);
+
+    /**
+     * @inheritdoc
+     */
+    public function where(string $field, $value, string $operator = null)
+    {
+        return $this->remember(function () use ($field, $value, $operator) {
+            return $this->repository->where($field, $value, $operator);
+        });
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function with($relationships)
+    {
+        return $this->remember(function () use ($relationships) {
+            return $this->repository->with($relationships);
+        });
     }
 }

Modules/Core/Repositories/Eloquent/EloquentBaseRepository.php

@@ -192,6 +192,28 @@ abstract class EloquentBaseRepository implements BaseRepository
         return true;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function where(string $field, $value, string $operator = null)
+    {
+        if ($operator === null) {
+            $operator = '=';
+        } else {
+            list($value, $operator) = [$operator, $value];
+        }
+
+        return $this->model->where($field, $operator, $value);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function with($relationships)
+    {
+        return $this->model->with($relationships);
+    }
+
     /**
      * @param string $field
      * @param array $values
@@ -200,4 +222,5 @@ abstract class EloquentBaseRepository implements BaseRepository
     {
         return $this->model->whereIn($field, $values);
     }
+
 }

Modules/Media/Assets/js/components/MediaList.vue

@@ -19,25 +19,38 @@
                 </div>
                 <div class="box box-primary">
                     <div class="box-body">
+                        <upload-zone v-if="showUploadZone" :parent-id="folderId"></upload-zone>
                         <div class="tool-bar el-row" style="padding-bottom: 20px;">
-                            <div class="actions el-col el-col-14">
+                            <div class="actions el-col el-col-19">
                                 <new-folder :parent-id="folderId"></new-folder>
-                                <upload-button :parent-id="folderId"></upload-button>
-                                <el-button-group style="width: 30%">
-                                    <el-button type="warning"
+                                <div style="margin: 0 15px;">
+                                    <el-button
+                                        type="primary"
+                                        @click="toggleUploadZone"
+                                    >
+                                        {{ trans('media.upload file') }}
+                                    </el-button>
+                                </div>
+                                <el-button-group>
+                                    <el-button
+                                        type="warning"
                                         :disabled="selectedMedia.length === 0"
                                         @click="showMoveMedia"
-                                               >{{ trans('core.move') }}
+                                    >
+                                        {{ trans('core.move') }}
                                     </el-button>
-                                    <el-button type="danger" :disabled="selectedMedia.length === 0"
-                                        @click.prevent="batchDelete" :loading="filesAreDeleting">
+                                    <el-button
+                                        type="danger"
+                                        :disabled="selectedMedia.length === 0"
+                                        @click.prevent="batchDelete"
+                                        :loading="filesAreDeleting"
+                                    >
                                         {{ trans('core.button.delete') }}
                                     </el-button>
                                 </el-button-group>
                             </div>
                             <div class="search el-col el-col-5">
-                                <el-input prefix-icon="el-icon-search" @keyup.native="performSearch" v-model="searchQuery">
-                                </el-input>
+                                <el-input prefix-icon="el-icon-search" @keyup.native="performSearch" v-model="searchQuery"></el-input>
                             </div>
                         </div>
                         <el-row>
@@ -56,35 +69,27 @@
                             ref="mediaTable"
                             v-loading.body="tableIsLoading"
                             @sort-change="handleSortChange"
-                                @selection-change="handleSelectionChange">
-                            <el-table-column
-                                    type="selection"
-                                    width="55">
-                            </el-table-column>
+                            @selection-change="handleSelectionChange"
+                        >
+                            <el-table-column type="selection" width="55"></el-table-column>
                             <el-table-column label="" width="150">
                                 <template slot-scope="scope">
                                     <img :src="scope.row.small_thumb" alt="" v-if="scope.row.is_image"/>
-                                    <i :class="`fa ${scope.row.fa_icon}`" style="font-size: 38px;"
-                                       v-if="! scope.row.is_image && ! scope.row.is_folder"></i>
-                                    <i class="fa fa-folder" style="font-size: 38px;"
-                                       v-if="scope.row.is_folder"></i>
+                                    <i :class="`fa ${scope.row.fa_icon}`" style="font-size: 38px;" v-if="! scope.row.is_image && ! scope.row.is_folder"></i>
+                                    <i class="fa fa-folder" style="font-size: 38px;" v-if="scope.row.is_folder"></i>
                                 </template>
                             </el-table-column>
-
                             <el-table-column prop="filename" :label="trans('media.table.filename')" sortable="custom">
                                 <template slot-scope="scope">
                                     <strong v-if="scope.row.is_folder" style="cursor: pointer;" @click="enterFolder(scope)">
                                         {{ scope.row.filename }}
                                     </strong>
                                     <span v-else>
-                                        <a href="#"
-                                           @click.prevent="goToEdit(scope)">{{ scope.row.filename }}</a>
+                                        <a href="#" @click.prevent="goToEdit(scope)">{{ scope.row.filename }}</a>
                                     </span>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="created_at" :label="trans('core.table.created at')" sortable="custom"
-                                             width="150">
-                            </el-table-column>
+                            <el-table-column prop="created_at" :label="trans('core.table.created at')" sortable="custom" width="150"></el-table-column>
                             <el-table-column prop="actions" label="" width="150">
                                 <template slot-scope="scope">
                                     <div class="pull-right">
@@ -92,17 +97,21 @@
                                             type="primary"
                                             size="small"
                                             @click.prevent="insertMedia(scope)"
-                                                v-if="singleModal && ! scope.row.is_folder">
+                                            v-if="singleModal && ! scope.row.is_folder"
+                                        >
                                             {{ trans('media.insert') }}
                                         </el-button>
                                         <div v-if="! singleModal">
                                             <el-button-group>
-                                                <edit-button :to="{name: 'admin.media.media.edit', params: {mediaId: scope.row.id}}"
-                                                             v-if="! scope.row.is_folder"></edit-button>
+                                                <edit-button
+                                                    :to="{name: 'admin.media.media.edit', params: {mediaId: scope.row.id}}"
+                                                    v-if="! scope.row.is_folder"
+                                                ></edit-button>
                                                 <el-button
                                                     size="mini"
                                                     @click.prevent="showEditFolder(scope.row)"
-                                                        v-if="scope.row.is_folder && canEditFolders">
+                                                    v-if="scope.row.is_folder && canEditFolders"
+                                                >
                                                     <i class="fa fa-pencil"></i>
                                                 </el-button>
                                                 <delete-button :scope="scope" :rows="data"></delete-button>
@@ -120,8 +129,8 @@
                                 :page-sizes="[10, 20, 50, 100]"
                                 :page-size="parseInt(meta.per_page)"
                                 layout="total, sizes, prev, pager, next, jumper"
-                                    :total="meta.total">
-                            </el-pagination>
+                                :total="meta.total"
+                            ></el-pagination>
                         </div>
                     </div>
                 </div>
@@ -135,14 +144,14 @@
 <script>
     import axios from 'axios';
     import NewFolder from './NewFolder.vue';
-    import UploadButton from './UploadButton.vue';
+    import UploadZone from './UploadZone';
     import RenameFolder from './RenameFolder.vue';
     import MoveMediaDialog from './MoveMediaDialog.vue';
 
     export default {
         components: {
             'new-folder': NewFolder,
-            'upload-button': UploadButton,
+            'upload-zone': UploadZone,
             'rename-folder': RenameFolder,
             'move-dialog': MoveMediaDialog,
         },
@@ -169,6 +178,7 @@
                 folderBreadcrumb: [
                     { id: 0, name: 'Home' },
                 ],
+                showUploadZone: false,
                 filesAreDeleting: false,
                 canEditFolders: true,
             };
@@ -190,7 +200,6 @@
                         this.data = response.data.data;
                         this.meta = response.data.meta;
                         this.links = response.data.links;
-
                         this.order_meta.order_by = properties.order_by;
                         this.order_meta.order = properties.order;
                     });
@@ -209,6 +218,7 @@
                     this.folderBreadcrumb = [
                         { id: 0, name: 'Home' },
                     ];
+
                     return;
                 }
                 axios.get(route('api.media.folders.breadcrumb', { folder: folderId }))
@@ -249,6 +259,9 @@
             handleSelectionChange(selectedMedia) {
                 this.selectedMedia = selectedMedia;
             },
+            toggleUploadZone() {
+                this.showUploadZone = !this.showUploadZone;
+            },
             showEditFolder(scope) {
                 this.$events.emit('editFolderWasClicked', scope);
             },

Modules/Media/Assets/js/components/UploadZone.vue

 <template>
-    <div class="row">
-        <div class="col-xs-12">
     <el-upload
         class="media-upload"
         drag
         :action="uploadUrl"
-                    :on-preview="handlePreview"
-                    :on-remove="handleRemove"
-                    :on-success="handleSuccess"
-                    :file-list="fileList"
-                    :headers="requestHeaders"
-                    multiple>
+        list-type="picture"
+        :show-file-list="false"
+        :http-request="uploadFile"
+        multiple
+    >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">Drop file here or <em>click to upload</em></div>
     </el-upload>
-        </div>
-    </div>
 </template>
 
 <script>
+    import axios from 'axios';
+
     export default {
+        props: {
+            parentId: { type: Number },
+        },
         data() {
             return {
-                fileList: [],
+                fileIsUploading: false,
             };
         },
         computed: {
             uploadUrl() {
                 return route('api.media.store').domain + route('api.media.store').url;
             },
-            requestHeaders() {
-                const userApiToken = document.head.querySelector('meta[name="user-api-token"]');
-                return {
-                    Authorization: `Bearer ${userApiToken.content}`,
-                };
-            },
         },
         methods: {
-            handleSuccess(response) {
+            uploadFile(event) {
+                this.fileIsUploading = true;
+                const data = new FormData();
+                data.append('parent_id', this.parentId);
+                data.append('file', event.file);
+                axios.post(route('api.media.store'), data).then((response) => {
                     this.$events.emit('fileWasUploaded', response);
-                this.fileList = [];
+                    this.$message({
+                        type: 'success',
+                        message: this.trans('media.file uploaded'),
+                    });
+                    this.fileIsUploading = false;
+                }, (error) => {
+                    console.log(error.response.data);
+                    this.fileIsUploading = false;
+                    this.$notify.error({
+                        title: 'Error',
+                        message: error.response.data.errors.file[0],
+                    });
+                });
             },
-            handlePreview() {},
-            handleRemove() {},
         },
-        mounted() {},
     };
 </script>
 <style>
+    .media-upload {
+        margin-bottom: 10px;
+    }
+
     .el-upload__input {
         display: none !important;
     }
-    .el-upload--text {
-        display: block;
+
+    .el-upload--picture, .el-upload--picture-card {
+        width: 100%;
+        height: 175px;
+        line-height: 100px;
+        border: none;
     }
+
     .el-upload-dragger {
         width: 100%;
+        height: 100%;
     }
-    .media-upload {
-        margin-bottom: 10px;
+
+    .el-upload-dragger .el-upload__text {
+        position: absolute;
+        bottom: 0;
+        width: 100%;
+    }
+
+    .el-upload--text {
+        display: block;
     }
 </style>

Modules/Translation/Resources/lang/media/en/media.php

@@ -38,6 +38,7 @@ return [
     'create resource' => 'Create media',
     'edit resource' => 'Edit media',
     'destroy resource' => 'Delete media',
+    'file uploaded' => 'File uploaded successfully',
     'file too large' => 'File is too large. Must be below :size MB.',
     'some files not moved' => 'Some files were not moved',
     'files moved successfully' => 'Files moved successfully',

Modules/User/Repositories/Sentinel/SentinelAuthentication.php

@@ -123,7 +123,7 @@ class SentinelAuthentication implements Authentication
      * @param $permission
      * @return bool
      */
-    public function hasAccess($permission)
+    public function hasAccess($permission) : bool
     {
         if (! Sentinel::check()) {
             return false;
@@ -136,7 +136,7 @@ class SentinelAuthentication implements Authentication
      * Check if the user is logged in
      * @return bool
      */
-    public function check()
+    public function check() : bool
     {
         $user = Sentinel::check();
 
@@ -153,14 +153,14 @@ class SentinelAuthentication implements Authentication
      */
     public function user()
     {
-        return Sentinel::check();
+        return Sentinel::getUser();
     }
 
     /**
      * Get the ID for the currently authenticated user
      * @return int
      */
-    public function id()
+    public function id() : int
     {
         $user = $this->user();
 

Modules/Workshop/Scaffold/Module/stubs/module-service-provider.stub

@@ -2,6 +2,7 @@
 
 namespace Modules\$MODULE$\Providers;
 
+use Illuminate\Database\Eloquent\Factory as EloquentFactory;
 use Illuminate\Support\ServiceProvider;
 use Modules\Core\Traits\CanPublishConfiguration;
 use Modules\Core\Events\BuildingSidebar;
@@ -31,6 +32,8 @@ class $MODULE$ServiceProvider extends ServiceProvider
         $this->app['events']->listen(LoadingBackendTranslations::class, function (LoadingBackendTranslations $event) {
             // append translations
         });
+
+        $this->registerEloquentFactoriesFrom(__DIR__ . '/../Database/factories');
     }
 
     public function boot()
@@ -54,4 +57,15 @@ class $MODULE$ServiceProvider extends ServiceProvider
     {
 // add bindings
     }
+
+    /**
+     * Register factories.
+     *
+     * @param  string  $path
+     * @return void
+     */
+    protected function registerEloquentFactoriesFrom($path)
+    {
+        $this->app->make(EloquentFactory::class)->load($path);
+    }
 }