Skip to content

P
Platform
Commit 5abd4e02 authored by Silvio Gratani's avatar Silvio Gratani
Browse files
Options

merge master

parents 639c2744 a475153c
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 97 deletions
Modules/Core/Repositories/BaseRepository.php
View file @ 5abd4e02
...@@ -99,6 +99,22 @@ interface BaseRepository ...@@ -99,6 +99,22 @@ interface BaseRepository
*/ */
public function clearCache(); 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 string $field
* @param array $values * @param array $values
......
Modules/Core/Repositories/Cache/BaseCacheDecorator.php
View file @ 5abd4e02
...@@ -228,5 +228,24 @@ abstract class BaseCacheDecorator implements BaseRepository ...@@ -228,5 +228,24 @@ abstract class BaseCacheDecorator implements BaseRepository
public function whereIn(string $field, array $values) public function whereIn(string $field, array $values)
{ {
return $this->repository->whereIn($field, $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
View file @ 5abd4e02
...@@ -192,6 +192,28 @@ abstract class EloquentBaseRepository implements BaseRepository ...@@ -192,6 +192,28 @@ abstract class EloquentBaseRepository implements BaseRepository
return true; 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 string $field
* @param array $values * @param array $values
...@@ -200,4 +222,5 @@ abstract class EloquentBaseRepository implements BaseRepository ...@@ -200,4 +222,5 @@ abstract class EloquentBaseRepository implements BaseRepository
{ {
return $this->model->whereIn($field, $values); return $this->model->whereIn($field, $values);
} }
} }
Modules/Media/Assets/js/components/MediaList.vue
View file @ 5abd4e02
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="row" style="margin-top: -35px;"> <div class="row" style="margin-top: -35px;">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="sc-table"> <div class="sc-table">
<div class="el-row"> <div class="el-row">
<div class="title"> <div class="title">
<h4 v-if="singleModal">{{ trans('media.choose file') }}</h4> <h4 v-if="singleModal">{{ trans('media.choose file') }}</h4>
<h3 v-if="! singleModal">{{ trans('media.title.media') }}</h3> <h3 v-if="! singleModal">{{ trans('media.title.media') }}</h3>
...@@ -19,25 +19,38 @@ ...@@ -19,25 +19,38 @@
</div> </div>
<div class="box box-primary"> <div class="box box-primary">
<div class="box-body"> <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="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> <new-folder :parent-id="folderId"></new-folder>
<upload-button :parent-id="folderId"></upload-button> <div style="margin: 0 15px;">
<el-button-group style="width: 30%"> <el-button
<el-button type="warning" type="primary"
:disabled="selectedMedia.length === 0" @click="toggleUploadZone"
@click="showMoveMedia" >
>{{ trans('core.move') }} {{ trans('media.upload file') }}
</el-button> </el-button>
<el-button type="danger" :disabled="selectedMedia.length === 0" </div>
@click.prevent="batchDelete" :loading="filesAreDeleting"> <el-button-group>
<el-button
type="warning"
:disabled="selectedMedia.length === 0"
@click="showMoveMedia"
>
{{ trans('core.move') }}
</el-button>
<el-button
type="danger"
:disabled="selectedMedia.length === 0"
@click.prevent="batchDelete"
:loading="filesAreDeleting"
>
{{ trans('core.button.delete') }} {{ trans('core.button.delete') }}
</el-button> </el-button>
</el-button-group> </el-button-group>
</div> </div>
<div class="search el-col el-col-5"> <div class="search el-col el-col-5">
<el-input prefix-icon="el-icon-search" @keyup.native="performSearch" v-model="searchQuery"> <el-input prefix-icon="el-icon-search" @keyup.native="performSearch" v-model="searchQuery"></el-input>
</el-input>
</div> </div>
</div> </div>
<el-row> <el-row>
...@@ -50,59 +63,55 @@ ...@@ -50,59 +63,55 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table <el-table
:data="data" :data="data"
stripe stripe
style="width: 100%" style="width: 100%"
ref="mediaTable" ref="mediaTable"
v-loading.body="tableIsLoading" v-loading.body="tableIsLoading"
@sort-change="handleSortChange" @sort-change="handleSortChange"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange"
<el-table-column >
type="selection" <el-table-column type="selection" width="55"></el-table-column>
width="55">
</el-table-column>
<el-table-column label="" width="150"> <el-table-column label="" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<img :src="scope.row.small_thumb" alt="" v-if="scope.row.is_image"/> <img :src="scope.row.small_thumb" alt="" v-if="scope.row.is_image"/>
<i :class="`fa ${scope.row.fa_icon}`" style="font-size: 38px;" <i :class="`fa ${scope.row.fa_icon}`" style="font-size: 38px;" v-if="! scope.row.is_image && ! scope.row.is_folder"></i>
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 fa-folder" style="font-size: 38px;"
v-if="scope.row.is_folder"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="filename" :label="trans('media.table.filename')" sortable="custom"> <el-table-column prop="filename" :label="trans('media.table.filename')" sortable="custom">
<template slot-scope="scope"> <template slot-scope="scope">
<strong v-if="scope.row.is_folder" style="cursor: pointer;" @click="enterFolder(scope)"> <strong v-if="scope.row.is_folder" style="cursor: pointer;" @click="enterFolder(scope)">
{{ scope.row.filename }} {{ scope.row.filename }}
</strong> </strong>
<span v-else> <span v-else>
<a href="#" <a href="#" @click.prevent="goToEdit(scope)">{{ scope.row.filename }}</a>
@click.prevent="goToEdit(scope)">{{ scope.row.filename }}</a>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="created_at" :label="trans('core.table.created at')" sortable="custom" <el-table-column prop="created_at" :label="trans('core.table.created at')" sortable="custom" width="150"></el-table-column>
width="150">
</el-table-column>
<el-table-column prop="actions" label="" width="150"> <el-table-column prop="actions" label="" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="pull-right"> <div class="pull-right">
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
@click.prevent="insertMedia(scope)" @click.prevent="insertMedia(scope)"
v-if="singleModal && ! scope.row.is_folder"> v-if="singleModal && ! scope.row.is_folder"
>
{{ trans('media.insert') }} {{ trans('media.insert') }}
</el-button> </el-button>
<div v-if="! singleModal"> <div v-if="! singleModal">
<el-button-group> <el-button-group>
<edit-button :to="{name: 'admin.media.media.edit', params: {mediaId: scope.row.id}}" <edit-button
v-if="! scope.row.is_folder"></edit-button> :to="{name: 'admin.media.media.edit', params: {mediaId: scope.row.id}}"
v-if="! scope.row.is_folder"
></edit-button>
<el-button <el-button
size="mini" size="mini"
@click.prevent="showEditFolder(scope.row)" @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> <i class="fa fa-pencil"></i>
</el-button> </el-button>
<delete-button :scope="scope" :rows="data"></delete-button> <delete-button :scope="scope" :rows="data"></delete-button>
...@@ -114,14 +123,14 @@ ...@@ -114,14 +123,14 @@
</el-table> </el-table>
<div class="pagination-wrap" style="text-align: center; padding-top: 20px;"> <div class="pagination-wrap" style="text-align: center; padding-top: 20px;">
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="meta.current_page" :current-page.sync="meta.current_page"
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="parseInt(meta.per_page)" :page-size="parseInt(meta.per_page)"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="meta.total"> :total="meta.total"
</el-pagination> ></el-pagination>
</div> </div>
</div> </div>
</div> </div>
...@@ -135,14 +144,14 @@ ...@@ -135,14 +144,14 @@
<script> <script>
import axios from 'axios'; import axios from 'axios';
import NewFolder from './NewFolder.vue'; import NewFolder from './NewFolder.vue';
import UploadButton from './UploadButton.vue'; import UploadZone from './UploadZone';
import RenameFolder from './RenameFolder.vue'; import RenameFolder from './RenameFolder.vue';
import MoveMediaDialog from './MoveMediaDialog.vue'; import MoveMediaDialog from './MoveMediaDialog.vue';
export default { export default {
components: { components: {
'new-folder': NewFolder, 'new-folder': NewFolder,
'upload-button': UploadButton, 'upload-zone': UploadZone,
'rename-folder': RenameFolder, 'rename-folder': RenameFolder,
'move-dialog': MoveMediaDialog, 'move-dialog': MoveMediaDialog,
}, },
...@@ -169,6 +178,7 @@ ...@@ -169,6 +178,7 @@
folderBreadcrumb: [ folderBreadcrumb: [
{ id: 0, name: 'Home' }, { id: 0, name: 'Home' },
], ],
showUploadZone: false,
filesAreDeleting: false, filesAreDeleting: false,
canEditFolders: true, canEditFolders: true,
}; };
...@@ -190,7 +200,6 @@ ...@@ -190,7 +200,6 @@
this.data = response.data.data; this.data = response.data.data;
this.meta = response.data.meta; this.meta = response.data.meta;
this.links = response.data.links; this.links = response.data.links;
this.order_meta.order_by = properties.order_by; this.order_meta.order_by = properties.order_by;
this.order_meta.order = properties.order; this.order_meta.order = properties.order;
}); });
...@@ -209,6 +218,7 @@ ...@@ -209,6 +218,7 @@
this.folderBreadcrumb = [ this.folderBreadcrumb = [
{ id: 0, name: 'Home' }, { id: 0, name: 'Home' },
]; ];
return; return;
} }
axios.get(route('api.media.folders.breadcrumb', { folder: folderId })) axios.get(route('api.media.folders.breadcrumb', { folder: folderId }))
...@@ -249,6 +259,9 @@ ...@@ -249,6 +259,9 @@
handleSelectionChange(selectedMedia) { handleSelectionChange(selectedMedia) {
this.selectedMedia = selectedMedia; this.selectedMedia = selectedMedia;
}, },
toggleUploadZone() {
this.showUploadZone = !this.showUploadZone;
},
showEditFolder(scope) { showEditFolder(scope) {
this.$events.emit('editFolderWasClicked', scope); this.$events.emit('editFolderWasClicked', scope);
}, },
...@@ -269,15 +282,15 @@ ...@@ -269,15 +282,15 @@
}, },
batchDelete() { batchDelete() {
this.$confirm(this.trans('core.modal.confirmation-message'), this.trans('core.modal.title'), { this.$confirm(this.trans('core.modal.confirmation-message'), this.trans('core.modal.title'), {
confirmButtonText: this.trans('core.button.delete'), confirmButtonText: this.trans('core.button.delete'),
cancelButtonText: this.trans('core.button.cancel'), cancelButtonText: this.trans('core.button.cancel'),
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
this.filesAreDeleting = true; this.filesAreDeleting = true;
axios.post(route('api.media.media.batch-destroy'), { axios.post(route('api.media.media.batch-destroy'), {
files: this.selectedMedia, files: this.selectedMedia,
}) })
.then((response) => { .then((response) => {
this.$message({ this.$message({
type: 'success', type: 'success',
......
Modules/Media/Assets/js/components/UploadZone.vue
View file @ 5abd4e02
<template> <template>
<div class="row"> <el-upload
<div class="col-xs-12"> class="media-upload"
<el-upload drag
class="media-upload" :action="uploadUrl"
drag list-type="picture"
:action="uploadUrl" :show-file-list="false"
:on-preview="handlePreview" :http-request="uploadFile"
:on-remove="handleRemove" multiple
:on-success="handleSuccess" >
:file-list="fileList" <i class="el-icon-upload"></i>
:headers="requestHeaders" <div class="el-upload__text">Drop file here or <em>click to upload</em></div>
multiple> </el-upload>
<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> </template>
<script> <script>
import axios from 'axios';
export default { export default {
props: {
parentId: { type: Number },
},
data() { data() {
return { return {
fileList: [], fileIsUploading: false,
}; };
}, },
computed: { computed: {
uploadUrl() { uploadUrl() {
return route('api.media.store').domain + route('api.media.store').url; 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: { methods: {
handleSuccess(response) { uploadFile(event) {
this.$events.emit('fileWasUploaded', response); this.fileIsUploading = true;
this.fileList = []; 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.$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> </script>
<style> <style>
.media-upload {
margin-bottom: 10px;
}
.el-upload__input { .el-upload__input {
display: none !important; 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 { .el-upload-dragger {
width: 100%; 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> </style>
Modules/Translation/Resources/lang/media/en/media.php
View file @ 5abd4e02
...@@ -38,6 +38,7 @@ return [ ...@@ -38,6 +38,7 @@ return [
'create resource' => 'Create media', 'create resource' => 'Create media',
'edit resource' => 'Edit media', 'edit resource' => 'Edit media',
'destroy resource' => 'Delete media', 'destroy resource' => 'Delete media',
'file uploaded' => 'File uploaded successfully',
'file too large' => 'File is too large. Must be below :size MB.', 'file too large' => 'File is too large. Must be below :size MB.',
'some files not moved' => 'Some files were not moved', 'some files not moved' => 'Some files were not moved',
'files moved successfully' => 'Files moved successfully', 'files moved successfully' => 'Files moved successfully',
......
Modules/User/Repositories/Sentinel/SentinelAuthentication.php
View file @ 5abd4e02
...@@ -123,7 +123,7 @@ class SentinelAuthentication implements Authentication ...@@ -123,7 +123,7 @@ class SentinelAuthentication implements Authentication
* @param $permission * @param $permission
* @return bool * @return bool
*/ */
public function hasAccess($permission) public function hasAccess($permission) : bool
{ {
if (! Sentinel::check()) { if (! Sentinel::check()) {
return false; return false;
...@@ -136,7 +136,7 @@ class SentinelAuthentication implements Authentication ...@@ -136,7 +136,7 @@ class SentinelAuthentication implements Authentication
* Check if the user is logged in * Check if the user is logged in
* @return bool * @return bool
*/ */
public function check() public function check() : bool
{ {
$user = Sentinel::check(); $user = Sentinel::check();
...@@ -153,14 +153,14 @@ class SentinelAuthentication implements Authentication ...@@ -153,14 +153,14 @@ class SentinelAuthentication implements Authentication
*/ */
public function user() public function user()
{ {
return Sentinel::check(); return Sentinel::getUser();
} }
/** /**
* Get the ID for the currently authenticated user * Get the ID for the currently authenticated user
* @return int * @return int
*/ */
public function id() public function id() : int
{ {
$user = $this->user(); $user = $this->user();
......
Modules/Workshop/Scaffold/Module/stubs/module-service-provider.stub
View file @ 5abd4e02
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace Modules\$MODULE$\Providers; namespace Modules\$MODULE$\Providers;
use Illuminate\Database\Eloquent\Factory as EloquentFactory;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Modules\Core\Traits\CanPublishConfiguration; use Modules\Core\Traits\CanPublishConfiguration;
use Modules\Core\Events\BuildingSidebar; use Modules\Core\Events\BuildingSidebar;
...@@ -31,6 +32,8 @@ class $MODULE$ServiceProvider extends ServiceProvider ...@@ -31,6 +32,8 @@ class $MODULE$ServiceProvider extends ServiceProvider
$this->app['events']->listen(LoadingBackendTranslations::class, function (LoadingBackendTranslations $event) { $this->app['events']->listen(LoadingBackendTranslations::class, function (LoadingBackendTranslations $event) {
// append translations // append translations
}); });
$this->registerEloquentFactoriesFrom(__DIR__ . '/../Database/factories');
} }
public function boot() public function boot()
...@@ -54,4 +57,15 @@ class $MODULE$ServiceProvider extends ServiceProvider ...@@ -54,4 +57,15 @@ class $MODULE$ServiceProvider extends ServiceProvider
{ {
// add bindings // add bindings
} }
/**
* Register factories.
*
* @param string $path
* @return void
*/
protected function registerEloquentFactoriesFrom($path)
{
$this->app->make(EloquentFactory::class)->load($path);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023