Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
fe133a4b
Unverified
Commit
fe133a4b
authored
Nov 07, 2018
by
Christian Giupponi
Committed by
GitHub
Nov 07, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2 from AsgardCms/master
Merge from AsgardCMS
parents
f61d8660
f6df9b81
Changes
10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
257 additions
and
215 deletions
+257
-215
BaseRepository.php
Modules/Core/Repositories/BaseRepository.php
+16
-0
BaseCacheDecorator.php
Modules/Core/Repositories/Cache/BaseCacheDecorator.php
+20
-0
EloquentBaseRepository.php
...les/Core/Repositories/Eloquent/EloquentBaseRepository.php
+22
-0
NamespacedEntity.php
Modules/Core/Traits/NamespacedEntity.php
+2
-7
MediaList.vue
Modules/Media/Assets/js/components/MediaList.vue
+72
-59
UploadZone.vue
Modules/Media/Assets/js/components/UploadZone.vue
+59
-34
TaggableInterface.php
Modules/Tag/Contracts/TaggableInterface.php
+21
-35
TaggableTrait.php
Modules/Tag/Traits/TaggableTrait.php
+30
-80
media.php
Modules/Translation/Resources/lang/media/en/media.php
+1
-0
module-service-provider.stub
...rkshop/Scaffold/Module/stubs/module-service-provider.stub
+14
-0
No files found.
Modules/Core/Repositories/BaseRepository.php
View file @
fe133a4b
...
@@ -98,4 +98,20 @@ interface BaseRepository
...
@@ -98,4 +98,20 @@ interface BaseRepository
* @return bool
* @return bool
*/
*/
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
);
}
}
Modules/Core/Repositories/Cache/BaseCacheDecorator.php
View file @
fe133a4b
...
@@ -220,4 +220,24 @@ abstract class BaseCacheDecorator implements BaseRepository
...
@@ -220,4 +220,24 @@ abstract class BaseCacheDecorator implements BaseRepository
$this
->
entityName
$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
...
@@ -191,4 +191,26 @@ 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
);
}
}
}
Modules/Core/Traits/NamespacedEntity.php
View file @
fe133a4b
...
@@ -6,21 +6,16 @@ trait NamespacedEntity
...
@@ -6,21 +6,16 @@ trait NamespacedEntity
{
{
/**
/**
* Returns the entity namespace.
* Returns the entity namespace.
*
* @return string
*/
*/
public
static
function
getEntityNamespace
()
public
static
function
getEntityNamespace
()
:
string
{
{
return
isset
(
static
::
$entityNamespace
)
?
static
::
$entityNamespace
:
get_called_class
();
return
isset
(
static
::
$entityNamespace
)
?
static
::
$entityNamespace
:
get_called_class
();
}
}
/**
/**
* Sets the entity namespace.
* Sets the entity namespace.
*
* @param string $namespace
* @return void
*/
*/
public
static
function
setEntityNamespace
(
$namespace
)
public
static
function
setEntityNamespace
(
string
$namespace
)
{
{
static
::
$entityNamespace
=
$namespace
;
static
::
$entityNamespace
=
$namespace
;
}
}
...
...
Modules/Media/Assets/js/components/MediaList.vue
View file @
fe133a4b
This diff is collapsed.
Click to expand it.
Modules/Media/Assets/js/components/UploadZone.vue
View file @
fe133a4b
<
template
>
<
template
>
<div
class=
"row"
>
<div
class=
"col-xs-12"
>
<el-upload
<el-upload
class=
"media-upload"
class=
"media-upload"
drag
drag
:action=
"uploadUrl"
:action=
"uploadUrl"
:on-preview=
"handlePreview"
list-type=
"picture"
:on-remove=
"handleRemove"
:show-file-list=
"false"
:on-success=
"handleSuccess"
:http-request=
"uploadFile"
:file-list=
"fileList"
multiple
:headers=
"requestHeaders"
>
multiple
>
<i
class=
"el-icon-upload"
></i>
<i
class=
"el-icon-upload"
></i>
<div
class=
"el-upload__text"
>
Drop file here or
<em>
click to upload
</em></div>
<div
class=
"el-upload__text"
>
Drop file here or
<em>
click to upload
</em></div>
</el-upload>
</el-upload>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
axios
from
'
axios
'
;
export
default
{
export
default
{
props
:
{
parentId
:
{
type
:
Number
},
},
data
()
{
data
()
{
return
{
return
{
file
List
:
[]
,
file
IsUploading
:
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
.
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
.
$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
>
</
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/Tag/Contracts/TaggableInterface.php
View file @
fe133a4b
...
@@ -3,102 +3,88 @@
...
@@ -3,102 +3,88 @@
namespace
Modules\Tag\Contracts
;
namespace
Modules\Tag\Contracts
;
use
Illuminate\Database\Eloquent\Builder
;
use
Illuminate\Database\Eloquent\Builder
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Relations\MorphToMany
;
interface
TaggableInterface
interface
TaggableInterface
{
{
/**
/**
* The Eloquent tag entity name.
* The Eloquent tag entity name.
* @var string
*/
*/
public
static
function
getEntityNamespace
();
public
static
function
getEntityNamespace
()
:
string
;
/**
/**
* Returns the Eloquent tags entity name.
* Returns the Eloquent tags entity name.
* @return string
*/
*/
public
static
function
getTagsModel
();
public
static
function
getTagsModel
()
:
string
;
/**
/**
* Sets the Eloquent tags entity name.
* 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)
* Get all the entities with the given tag(s)
* Optionally specify the column on which
* Optionally specify the column on which
* to perform the search operation.
* to perform the search operation.
*
@param \Illuminate\Database\Eloquent\Builder $query
*
* @param string|array $tags
* @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)
* Get all the entities with one of the given tag(s)
* Optionally specify the column on which
* Optionally specify the column on which
* to perform the search operation.
* to perform the search operation.
*
@param \Illuminate\Database\Eloquent\Builder $query
*
* @param string|array $tags
* @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
* 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.
* 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.
* Creates a new model instance.
* @return \Illuminate\Database\Eloquent\Model
*/
*/
public
static
function
createTagsModel
();
public
static
function
createTagsModel
()
:
Model
;
/**
/**
* Syncs the given tags.
* Syncs the given tags.
*
* @param string|array $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
* Detaches multiple tags from the entity or if no tags are
* passed, removes all the attached tags from the entity.
* passed, removes all the attached tags from the entity.
*
* @param string|array|null $tags
* @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.
* 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.
* Attaches multiple tags to the entity.
*
* @param string|array $tags
* @param string|array $tags
* @return bool
*/
*/
public
function
tag
(
$tags
);
public
function
tag
(
$tags
)
:
bool
;
/**
/**
* Attaches the given tag to the entity.
* 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 @@
...
@@ -3,42 +3,29 @@
namespace
Modules\Tag\Traits
;
namespace
Modules\Tag\Traits
;
use
Illuminate\Database\Eloquent\Builder
;
use
Illuminate\Database\Eloquent\Builder
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Relations\MorphToMany
;
use
Modules\Tag\Entities\Tag
;
use
Modules\Tag\Entities\Tag
;
trait
TaggableTrait
trait
TaggableTrait
{
{
/**
* {@inheritdoc}
*/
protected
static
$tagsModel
=
Tag
::
class
;
protected
static
$tagsModel
=
Tag
::
class
;
/**
public
static
function
getTagsModel
()
:
string
* {@inheritdoc}
*/
public
static
function
getTagsModel
()
{
{
return
static
::
$tagsModel
;
return
static
::
$tagsModel
;
}
}
/**
public
static
function
setTagsModel
(
string
$model
)
* {@inheritdoc}
*/
public
static
function
setTagsModel
(
$model
)
{
{
static
::
$tagsModel
=
$model
;
static
::
$tagsModel
=
$model
;
}
}
/**
public
function
scopeWhereTag
(
Builder
$query
,
$tags
,
string
$type
=
'slug'
)
:
Builder
* {@inheritdoc}
*/
public
function
scopeWhereTag
(
Builder
$query
,
$tags
,
$type
=
'slug'
)
{
{
if
(
is_string
(
$tags
)
===
true
)
{
$tags
=
[
$tags
];
}
$query
->
with
(
'translations'
);
$query
->
with
(
'translations'
);
foreach
(
$tags
as
$tag
)
{
foreach
(
array_wrap
(
$tags
)
as
$tag
)
{
$query
->
whereHas
(
'tags'
,
function
(
Builder
$query
)
use
(
$type
,
$tag
)
{
$query
->
whereHas
(
'tags'
,
function
(
Builder
$query
)
use
(
$type
,
$tag
)
{
$query
->
whereHas
(
'translations'
,
function
(
Builder
$query
)
use
(
$type
,
$tag
)
{
$query
->
whereHas
(
'translations'
,
function
(
Builder
$query
)
use
(
$type
,
$tag
)
{
$query
->
where
(
$type
,
$tag
);
$query
->
where
(
$type
,
$tag
);
...
@@ -49,14 +36,10 @@ trait TaggableTrait
...
@@ -49,14 +36,10 @@ trait TaggableTrait
return
$query
;
return
$query
;
}
}
/**
public
function
scopeWithTag
(
Builder
$query
,
$tags
,
string
$type
=
'slug'
)
:
Builder
* {@inheritdoc}
*/
public
function
scopeWithTag
(
Builder
$query
,
$tags
,
$type
=
'slug'
)
{
{
if
(
is_string
(
$tags
)
===
true
)
{
$tags
=
array_wrap
(
$tags
);
$tags
=
[
$tags
];
}
$query
->
with
(
'translations'
);
$query
->
with
(
'translations'
);
return
$query
->
whereHas
(
'tags'
,
function
(
Builder
$query
)
use
(
$type
,
$tags
)
{
return
$query
->
whereHas
(
'tags'
,
function
(
Builder
$query
)
use
(
$type
,
$tags
)
{
...
@@ -66,43 +49,31 @@ trait TaggableTrait
...
@@ -66,43 +49,31 @@ trait TaggableTrait
});
});
}
}
/**
public
function
tags
()
:
MorphToMany
* {@inheritdoc}
*/
public
function
tags
()
{
{
return
$this
->
morphToMany
(
static
::
$tagsModel
,
'taggable'
,
'tag__tagged'
,
'taggable_id'
,
'tag_id'
);
return
$this
->
morphToMany
(
static
::
$tagsModel
,
'taggable'
,
'tag__tagged'
,
'taggable_id'
,
'tag_id'
);
}
}
/**
public
static
function
createTagsModel
()
:
Model
* {@inheritdoc}
*/
public
static
function
createTagsModel
()
{
{
return
new
static
::
$tagsModel
;
return
new
static
::
$tagsModel
;
}
}
/**
public
static
function
allTags
()
:
Builder
* {@inheritdoc}
*/
public
static
function
allTags
()
{
{
$instance
=
new
static
;
$instance
=
new
static
;
return
$instance
->
createTagsModel
()
->
with
(
'translations'
)
->
whereNamespace
(
$instance
->
getEntityClassName
());
return
self
::
createTagsModel
()
->
with
(
'translations'
)
->
where
(
'namespace'
,
$instance
->
getEntityClassName
());
}
}
/**
public
function
setTags
(
$tags
,
string
$type
=
'slug'
)
:
bool
* {@inheritdoc}
*/
public
function
setTags
(
$tags
,
$type
=
'slug'
)
{
{
if
(
empty
(
$tags
))
{
if
(
empty
(
$tags
))
{
$tags
=
[];
$tags
=
[];
}
}
// Get the current entity 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
// Prepare the tags to be added and removed
$tagsToAdd
=
array_diff
(
$tags
,
$entityTags
);
$tagsToAdd
=
array_diff
(
$tags
,
$entityTags
);
...
@@ -121,25 +92,18 @@ trait TaggableTrait
...
@@ -121,25 +92,18 @@ trait TaggableTrait
return
true
;
return
true
;
}
}
/**
public
function
tag
(
$tags
)
:
bool
* {@inheritdoc}
*/
public
function
tag
(
$tags
)
{
{
foreach
(
$tags
as
$tag
)
{
foreach
(
array_wrap
(
$tags
)
as
$tag
)
{
$this
->
addTag
(
$tag
);
$this
->
addTag
(
$tag
);
}
}
return
true
;
return
true
;
}
}
/**
public
function
addTag
(
string
$name
)
* {@inheritdoc}
*/
public
function
addTag
(
$name
)
{
{
$tag
=
$this
->
createTagsModel
()
->
where
(
'namespace'
,
$this
->
getEntityClassName
())
$tag
=
self
::
allTags
()
->
with
(
'translations'
)
->
whereHas
(
'translations'
,
function
(
Builder
$q
)
use
(
$name
)
{
->
whereHas
(
'translations'
,
function
(
Builder
$q
)
use
(
$name
)
{
$q
->
where
(
'slug'
,
$this
->
generateTagSlug
(
$name
));
$q
->
where
(
'slug'
,
$this
->
generateTagSlug
(
$name
));
})
->
first
();
})
->
first
();
...
@@ -157,17 +121,14 @@ trait TaggableTrait
...
@@ -157,17 +121,14 @@ trait TaggableTrait
$tag
->
save
();
$tag
->
save
();
}
}
if
(
$this
->
tags
->
contains
(
$tag
->
id
)
===
false
)
{
if
(
$this
->
tags
()
->
get
()
->
contains
(
$tag
->
id
)
===
false
)
{
$this
->
tags
()
->
attach
(
$tag
);
$this
->
tags
()
->
attach
(
$tag
);
}
}
}
}
/**
public
function
untag
(
$tags
=
null
)
:
bool
* {@inheritdoc}
*/
public
function
untag
(
$tags
=
null
)
{
{
$tags
=
$tags
?:
$this
->
tags
->
pluck
(
'name'
)
->
all
();
$tags
=
$tags
?:
$this
->
tags
()
->
get
()
->
pluck
(
'name'
)
->
all
();
foreach
(
$tags
as
$tag
)
{
foreach
(
$tags
as
$tag
)
{
$this
->
removeTag
(
$tag
);
$this
->
removeTag
(
$tag
);
...
@@ -176,14 +137,9 @@ trait TaggableTrait
...
@@ -176,14 +137,9 @@ trait TaggableTrait
return
true
;
return
true
;
}
}
/**
public
function
removeTag
(
string
$name
)
* {@inheritdoc}
*/
public
function
removeTag
(
$name
)
{
{
$tag
=
$this
->
createTagsModel
()
$tag
=
self
::
allTags
()
->
where
(
'namespace'
,
$this
->
getEntityClassName
())
->
with
(
'translations'
)
->
whereHas
(
'translations'
,
function
(
Builder
$q
)
use
(
$name
)
{
->
whereHas
(
'translations'
,
function
(
Builder
$q
)
use
(
$name
)
{
$q
->
where
(
'slug'
,
$this
->
generateTagSlug
(
$name
));
$q
->
where
(
'slug'
,
$this
->
generateTagSlug
(
$name
));
})
->
first
();
})
->
first
();
...
@@ -193,10 +149,7 @@ trait TaggableTrait
...
@@ -193,10 +149,7 @@ trait TaggableTrait
}
}
}
}
/**
protected
function
getEntityClassName
()
:
string
* {@inheritdoc}
*/
protected
function
getEntityClassName
()
{
{
if
(
isset
(
static
::
$entityNamespace
))
{
if
(
isset
(
static
::
$entityNamespace
))
{
return
static
::
$entityNamespace
;
return
static
::
$entityNamespace
;
...
@@ -205,24 +158,21 @@ trait TaggableTrait
...
@@ -205,24 +158,21 @@ trait TaggableTrait
return
$this
->
tags
()
->
getMorphClass
();
return
$this
->
tags
()
->
getMorphClass
();
}
}
/**
public
function
generateTagSlug
(
$name
,
$separator
=
'-'
)
:
string
* {@inheritdoc}
*/
public
function
generateTagSlug
(
$name
,
$separator
=
'-'
)
{
{
// Convert all dashes/underscores into separator
// Convert all dashes/underscores into separator
$flip
=
$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'
// 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.
// 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
// 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
);
return
trim
(
$name
,
$separator
);
}
}
...
...
Modules/Translation/Resources/lang/media/en/media.php
View file @
fe133a4b
...
@@ -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/Workshop/Scaffold/Module/stubs/module-service-provider.stub
View file @
fe133a4b
...
@@ -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
);
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment