Skip to content

P
Platform
Unverified Commit fe133a4b authored by Christian Giupponi's avatar Christian Giupponi Committed by GitHub
Browse files
Options

Merge pull request #2 from AsgardCms/master 

Merge from AsgardCMS
parents f61d8660 f6df9b81
Show whitespace changes
Inline Side-by-side
Showing with 257 additions and 215 deletions
Modules/Core/Repositories/BaseRepository.php
View file @ fe133a4b
......@@ -98,4 +98,20 @@ interface BaseRepository
* @return bool
*/
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);
}
Modules/Core/Repositories/Cache/BaseCacheDecorator.php
View file @ fe133a4b
......@@ -220,4 +220,24 @@ abstract class BaseCacheDecorator implements BaseRepository
$this->entityName
);
}
/**
* @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 @ fe133a4b
......@@ -191,4 +191,26 @@ 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);
}
}
Modules/Core/Traits/NamespacedEntity.php
View file @ fe133a4b
......@@ -6,21 +6,16 @@ trait NamespacedEntity
{
/**
* Returns the entity namespace.
*
* @return string
*/
public static function getEntityNamespace()
public static function getEntityNamespace(): string
{
return isset(static::$entityNamespace) ? static::$entityNamespace : get_called_class();
}
/**
* Sets the entity namespace.
*
* @param string $namespace
* @return void
*/
public static function setEntityNamespace($namespace)
public static function setEntityNamespace(string $namespace)
{
static::$entityNamespace = $namespace;
}
......
Modules/Media/Assets/js/components/MediaList.vue
View file @ fe133a4b
......@@ -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
View file @ fe133a4b
<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/Tag/Contracts/TaggableInterface.php
View file @ fe133a4b
......@@ -3,102 +3,88 @@
namespace Modules\Tag\Contracts;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphToMany;
interface TaggableInterface
{
/**
* The Eloquent tag entity name.
* @var string
*/
public static function getEntityNamespace();
public static function getEntityNamespace(): string;
/**
* Returns the Eloquent tags entity name.
* @return string
*/
public static function getTagsModel();
public static function getTagsModel(): string;
/**
* Sets the Eloquent tags entity name.
* @param string $model
* @return void
*/
public static function setTagsModel($model);
public static function setTagsModel(string $model);
/**
* Get all the entities with the given tag(s)
* Optionally specify the column on which
* to perform the search operation.
* @param \Illuminate\Database\Eloquent\Builder $query
*
* @param string|array $tags
* @param string $type
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeWhereTag(Builder $query, $tags, $type = 'slug');
public function scopeWhereTag(Builder $query, $tags, string $type = 'slug'): Builder;
/**
* Get all the entities with one of the given tag(s)
* Optionally specify the column on which
* to perform the search operation.
* @param \Illuminate\Database\Eloquent\Builder $query
*
* @param string|array $tags
* @param string $type
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeWithTag(Builder $query, $tags, $type = 'slug');
public function scopeWithTag(Builder $query, $tags, string $type = 'slug'): Builder;
/**
* Define the eloquent morphMany relationship
* @return \Illuminate\Database\Eloquent\Relations\MorphToMany
*/
public function tags();
public function tags(): MorphToMany;
/**
* Returns all the tags under the current entity namespace.
* @return \Illuminate\Database\Eloquent\Builder
*/
public static function allTags();
public static function allTags(): Builder;
/**
* Creates a new model instance.
* @return \Illuminate\Database\Eloquent\Model
*/
public static function createTagsModel();
public static function createTagsModel(): Model;
/**
* Syncs the given tags.
*
* @param string|array $tags
* @param string $type
* @return bool
*/
public function setTags($tags, $type = 'name');
public function setTags($tags, string $type = 'name'): bool;
/**
* Detaches multiple tags from the entity or if no tags are
* passed, removes all the attached tags from the entity.
*
* @param string|array|null $tags
* @return bool
*/
public function untag($tags = null);
public function untag($tags = null): bool;
/**
* Detaches the given tag from the entity.
* @param string $name
* @return void
*/
public function removeTag($name);
public function removeTag(string $name);
/**
* Attaches multiple tags to the entity.
*
* @param string|array $tags
* @return bool
*/
public function tag($tags);
public function tag($tags): bool;
/**
* Attaches the given tag to the entity.
* @param string $name
* @return void
*/
public function addTag($name);
public function addTag(string $name);
}
Modules/Tag/Traits/TaggableTrait.php
View file @ fe133a4b
......@@ -3,42 +3,29 @@
namespace Modules\Tag\Traits;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphToMany;
use Modules\Tag\Entities\Tag;
trait TaggableTrait
{
/**
* {@inheritdoc}
*/
protected static $tagsModel = Tag::class;
/**
* {@inheritdoc}
*/
public static function getTagsModel()
public static function getTagsModel(): string
{
return static::$tagsModel;
}
/**
* {@inheritdoc}
*/
public static function setTagsModel($model)
public static function setTagsModel(string $model)
{
static::$tagsModel = $model;
}
/**
* {@inheritdoc}
*/
public function scopeWhereTag(Builder $query, $tags, $type = 'slug')
public function scopeWhereTag(Builder $query, $tags, string $type = 'slug'): Builder
{
if (is_string($tags) === true) {
$tags = [$tags];
}
$query->with('translations');
foreach ($tags as $tag) {
foreach (array_wrap($tags) as $tag) {
$query->whereHas('tags', function (Builder $query) use ($type, $tag) {
$query->whereHas('translations', function (Builder $query) use ($type, $tag) {
$query->where($type, $tag);
......@@ -49,14 +36,10 @@ trait TaggableTrait
return $query;
}
/**
* {@inheritdoc}
*/
public function scopeWithTag(Builder $query, $tags, $type = 'slug')
public function scopeWithTag(Builder $query, $tags, string $type = 'slug'): Builder
{
if (is_string($tags) === true) {
$tags = [$tags];
}
$tags = array_wrap($tags);
$query->with('translations');
return $query->whereHas('tags', function (Builder $query) use ($type, $tags) {
......@@ -66,43 +49,31 @@ trait TaggableTrait
});
}
/**
* {@inheritdoc}
*/
public function tags()
public function tags(): MorphToMany
{
return $this->morphToMany(static::$tagsModel, 'taggable', 'tag__tagged', 'taggable_id', 'tag_id');
}
/**
* {@inheritdoc}
*/
public static function createTagsModel()
public static function createTagsModel(): Model
{
return new static::$tagsModel;
}
/**
* {@inheritdoc}
*/
public static function allTags()
public static function allTags(): Builder
{
$instance = new static;
return $instance->createTagsModel()->with('translations')->whereNamespace($instance->getEntityClassName());
return self::createTagsModel()->with('translations')->where('namespace', $instance->getEntityClassName());
}
/**
* {@inheritdoc}
*/
public function setTags($tags, $type = 'slug')
public function setTags($tags, string $type = 'slug'): bool
{
if (empty($tags)) {
$tags = [];
}
// Get the current entity tags
$entityTags = $this->tags->pluck($type)->all();
$entityTags = $this->tags()->get()->pluck($type)->all();
// Prepare the tags to be added and removed
$tagsToAdd = array_diff($tags, $entityTags);
......@@ -121,25 +92,18 @@ trait TaggableTrait
return true;
}
/**
* {@inheritdoc}
*/
public function tag($tags)
public function tag($tags): bool
{
foreach ($tags as $tag) {
foreach (array_wrap($tags) as $tag) {
$this->addTag($tag);
}
return true;
}
/**
* {@inheritdoc}
*/
public function addTag($name)
public function addTag(string $name)
{
$tag = $this->createTagsModel()->where('namespace', $this->getEntityClassName())
->with('translations')
$tag = self::allTags()
->whereHas('translations', function (Builder $q) use ($name) {
$q->where('slug', $this->generateTagSlug($name));
})->first();
......@@ -157,17 +121,14 @@ trait TaggableTrait
$tag->save();
}
if ($this->tags->contains($tag->id) === false) {
if ($this->tags()->get()->contains($tag->id) === false) {
$this->tags()->attach($tag);
}
}
/**
* {@inheritdoc}
*/
public function untag($tags = null)
public function untag($tags = null): bool
{
$tags = $tags ?: $this->tags->pluck('name')->all();
$tags = $tags ?: $this->tags()->get()->pluck('name')->all();
foreach ($tags as $tag) {
$this->removeTag($tag);
......@@ -176,14 +137,9 @@ trait TaggableTrait
return true;
}
/**
* {@inheritdoc}
*/
public function removeTag($name)
public function removeTag(string $name)
{
$tag = $this->createTagsModel()
->where('namespace', $this->getEntityClassName())
->with('translations')
$tag = self::allTags()
->whereHas('translations', function (Builder $q) use ($name) {
$q->where('slug', $this->generateTagSlug($name));
})->first();
......@@ -193,10 +149,7 @@ trait TaggableTrait
}
}
/**
* {@inheritdoc}
*/
protected function getEntityClassName()
protected function getEntityClassName(): string
{
if (isset(static::$entityNamespace)) {
return static::$entityNamespace;
......@@ -205,24 +158,21 @@ trait TaggableTrait
return $this->tags()->getMorphClass();
}
/**
* {@inheritdoc}
*/
public function generateTagSlug($name, $separator = '-')
public function generateTagSlug($name, $separator = '-'): string
{
// Convert all dashes/underscores into separator
$flip = $separator == '-' ? '_' : '-';
$name = preg_replace('!['.preg_quote($flip).']+!u', $separator, $name);
$name = preg_replace('![' . preg_quote($flip, '!') . ']+!u', $separator, $name);
// Replace @ with the word 'at'
$name = str_replace('@', $separator.'at'.$separator, $name);
$name = str_replace('@', $separator . 'at' . $separator, $name);
// Remove all characters that are not the separator, letters, numbers, or whitespace.
$name = preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', mb_strtolower($name));
$name = preg_replace('![^' . preg_quote($separator, '!') . '\pL\pN\s]+!u', '', mb_strtolower($name));
// Replace all separator characters and whitespace by a single separator
$name = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $name);
$name = preg_replace('![' . preg_quote($separator, '!') . '\s]+!u', $separator, $name);
return trim($name, $separator);
}
......
Modules/Translation/Resources/lang/media/en/media.php
View file @ fe133a4b
......@@ -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/Workshop/Scaffold/Module/stubs/module-service-provider.stub
View file @ fe133a4b
......@@ -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);
}
}
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