Skip to content

Commit

Permalink
v3.6.5
Browse files Browse the repository at this point in the history
  • Loading branch information
ctf0 committed Mar 4, 2020
1 parent e609444 commit 9e3469e
Show file tree
Hide file tree
Showing 38 changed files with 874 additions and 890 deletions.
4 changes: 2 additions & 2 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 3
daysUntilStale: 2
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
daysUntilClose: 5
# Issues with these labels will never be considered stale
exemptLabels:
- enhancement
Expand Down
132 changes: 5 additions & 127 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<p align="center">
<img alt="main" src="https://user-images.githubusercontent.com/7388088/70385131-c0937e80-1993-11ea-9513-cb5c90f4281b.png"/>
<img alt="card" src="https://user-images.githubusercontent.com/7388088/46549215-892dcb80-c8d1-11e8-8c23-d8bbfe7a10cc.jpg"/>
<img alt="card" src="https://user-images.githubusercontent.com/7388088/75881844-8fa6d680-5e28-11ea-8a38-09bbce94d68e.png"/>
<img alt="img-filter" src="https://user-images.githubusercontent.com/7388088/46004313-dda3a080-c0b2-11e8-814a-af5b3953846f.jpg"/>
<img alt="img-diff" src="https://user-images.githubusercontent.com/7388088/46004311-dd0b0a00-c0b2-11e8-82f1-d6c75235690f.jpg"/>
</p>
Expand Down Expand Up @@ -45,7 +45,7 @@
- [install dependencies](https://github.com/ctf0/Laravel-Media-Manager/wiki/Packages-In-Use)

```bash
yarn add vue vue-ls vue-infinite-loading vue-image-compare2 vue-tippy@v1 vue2-filters vue-input-autowidth vue-notif vue-clipboard2 vue-awesome@v2 vue-touch@next vue-focuspoint-component axios dropzone cropperjs keycode lottie-web plyr fuse.js music-metadata-browser idb-keyval
yarn add vue vue-ls vue-infinite-loading vue-image-compare2 vue-tippy@v2 vue2-filters vue-input-autowidth vue-notif vue-clipboard2 vue-awesome@v2 vue-touch@next vue-focuspoint-component axios dropzone cropperjs keycode lottie-web plyr fuse.js music-metadata-browser idb-keyval
yarn add worker-loader --dev
```

Expand All @@ -70,130 +70,7 @@

## Config

- **config/mediaManager.php**

```php
return [
/*
* ignore any file starts with "."
*/
'ignore_files' => '/^\..*/',

/*
* filesystem disk
*/
'storage_disk' => env('FILESYSTEM_DRIVER', 'public'),

/*
* manager controller
*/
'controller' => '\ctf0\MediaManager\App\Controllers\MediaController',

/*
* remove any file special chars except
* dot .
* dash -
* underscore _
* single quote ''
* white space
* parentheses ()
* comma ,
*/
'allowed_fileNames_chars' => '\._\-\'\s\(\),',

/*
* remove any folder special chars except
* dash -
* underscore _
* white space
*
* to add & nest folders in one go add '\/'
*/
'allowed_folderNames_chars' => '_-\s',

/*
* disallow uploading files with the following mimetypes
* https://www.iana.org/assignments/media-types/media-types.xhtml
*/
'unallowed_mimes' => ['php', 'java'],

/*
* extra mime-types
*/
'extended_mimes' => [
// any extra mime-types that doesnt have "image" in it
'image' => [
'binary/octet-stream', // aws
],

// any extra mime-types that doesnt have "compressed" in it
'archive' => [
'application/x-tar',
'application/zip',
],
],

/*
* when file names gets cleand up
*
* put here any global function that
* doesnt take arguments
*/
'sanitized_text' => 'uniqid',

/*
* display file last modification time as
* http://carbon.nesbot.com/docs/#api-formatting
*/
'last_modified_format' => 'toDateString',

/*
* hide file extension in files list
*/
'hide_files_ext' => true,

/*
* in-order to get the folder items count & size
* we need to recursively get all the files inside the folders
* which could make the request take longer
*/
'get_folder_info' => true,

/*
* do you want to enable broadcasting the changes
* made by one user to others ?
*
* "laravel-echo" must be installed
*/
'enable_broadcasting' => false,

/*
* show "an itunes like" content ratio bar
*/
'show_ratio_bar' => true,

/*
* preview and remove files b4 uploading
*/
'preview_files_before_upload' => true,

/*
* Database connection
*/
'database_connection' => env('DB_CONNECTION'),

/*
* Locked items table name (defaults to "locked")
*/
'table_locked' => 'locked',

/*
* loaded chunk amount "pagination"
*/
'pagination_amount' => 50,
];

```
- [**config/mediaManager.php**](https://github.com/ctf0/Laravel-Media-Manager/blob/master/src/config/mediaManager.php)

<br>

Expand All @@ -213,6 +90,7 @@
- toggle between `random/original` names for uploaded files
- [asynchronous Updates](https://github.com/ctf0/Laravel-Media-Manager/wiki/Async-Update-The-Manager)
- bulk selection
- bookmark visited directories for quicker navigation
- change item/s visibility
- update the page url on navigation
- show audio files info **"artist, album, year, etc.."**
Expand Down Expand Up @@ -263,7 +141,7 @@
>\- to stop interfering with other `keydown` events you can toggle the manager listener through<br>
>`EventHub.fire('disable-global-keys', true/false)`.

<br>
<br>

| navigation | button | keyboard | click / tap | touch |
|----------------------|-----------------------------------------------------|------------------|------------------------------|---------------------------------|
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"require": {
"php": "~7.0",
"illuminate/support": "^5.4 || ^6.0",
"illuminate/support": "^5.4 || ^6.0 || ^7.0",
"maennchen/zipstream-php": "~1.0",
"ctf0/package-changelog": "*",
"jhofm/flysystem-iterator": "^2.2"
Expand Down
3 changes: 0 additions & 3 deletions logs/v3.6.2.txt

This file was deleted.

7 changes: 7 additions & 0 deletions logs/v3.6.5.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- update vue-tippy to v2
- update the preview card design
- update laravel to v7
- centralize translation keys to be called from the main component instead of having them everywhere
- fix namespace typo
- remove comments from scss files
- update rdme
22 changes: 11 additions & 11 deletions src/App/Controllers/MediaController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@

use App\Http\Controllers\Controller;
use Jhofm\FlysystemIterator\Plugin\IteratorPlugin;
use ctf0\MediaManager\App\Controllers\Moduels\Lock;
use ctf0\MediaManager\App\Controllers\Moduels\Move;
use ctf0\MediaManager\App\Controllers\Moduels\Utils;
use ctf0\MediaManager\App\Controllers\Moduels\Delete;
use ctf0\MediaManager\App\Controllers\Moduels\Rename;
use ctf0\MediaManager\App\Controllers\Moduels\Upload;
use ctf0\MediaManager\App\Controllers\Moduels\Download;
use ctf0\MediaManager\App\Controllers\Moduels\NewFolder;
use ctf0\MediaManager\App\Controllers\Moduels\GetContent;
use ctf0\MediaManager\App\Controllers\Moduels\Visibility;
use ctf0\MediaManager\App\Controllers\Moduels\GlobalSearch;
use ctf0\MediaManager\App\Controllers\Modules\Lock;
use ctf0\MediaManager\App\Controllers\Modules\Move;
use ctf0\MediaManager\App\Controllers\Modules\Utils;
use ctf0\MediaManager\App\Controllers\Modules\Delete;
use ctf0\MediaManager\App\Controllers\Modules\Rename;
use ctf0\MediaManager\App\Controllers\Modules\Upload;
use ctf0\MediaManager\App\Controllers\Modules\Download;
use ctf0\MediaManager\App\Controllers\Modules\NewFolder;
use ctf0\MediaManager\App\Controllers\Modules\GetContent;
use ctf0\MediaManager\App\Controllers\Modules\Visibility;
use ctf0\MediaManager\App\Controllers\Modules\GlobalSearch;

class MediaController extends Controller
{
Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/Modules/Delete.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

use Illuminate\Http\Request;
use ctf0\MediaManager\App\Events\MediaFileOpsNotifications;
Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/Modules/Download.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

use ZipStream\ZipStream;
use Illuminate\Http\Request;
Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/Modules/GetContent.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

use Illuminate\Http\Request;

Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/Modules/GlobalSearch.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

trait GlobalSearch
{
Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/Modules/Lock.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

use Illuminate\Http\Request;
use ctf0\MediaManager\App\Events\MediaFileOpsNotifications;
Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/Modules/Move.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

use Exception;
use Illuminate\Support\Str;
Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/Modules/NewFolder.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

use Illuminate\Http\Request;
use ctf0\MediaManager\App\Events\MediaFileOpsNotifications;
Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/Modules/Rename.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

use Exception;
use Illuminate\Http\Request;
Expand Down
4 changes: 2 additions & 2 deletions src/App/Controllers/Modules/Upload.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

use Exception;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use ctf0\MediaManager\App\Events\MediaFileOpsNotifications;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use ctf0\MediaManager\App\Events\MediaFileOpsNotifications;

trait Upload
{
Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/Modules/Utils.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

use Carbon\Carbon;
use Illuminate\Support\Collection;
Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/Modules/Visibility.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace ctf0\MediaManager\App\Controllers\Moduels;
namespace ctf0\MediaManager\App\Controllers\Modules;

use Illuminate\Http\Request;
use ctf0\MediaManager\App\Events\MediaFileOpsNotifications;
Expand Down
6 changes: 3 additions & 3 deletions src/config/mediaManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
*
* to add & nest folders in one go add '\/'
*/
'allowed_folderNames_chars' => '_-\s',
'allowed_folderNames_chars' => '_\-\s',

/*
* disallow uploading files with the following mimetypes
Expand Down Expand Up @@ -100,7 +100,7 @@
'show_ratio_bar' => true,

/*
* preview and remove files b4 uploading
* preview files b4 uploading
*/
'preview_files_before_upload' => true,

Expand All @@ -110,7 +110,7 @@
'database_connection' => env('DB_CONNECTION'),

/*
* Locked items table name (defaults to "locked")
* Locked items table name
*/
'table_locked' => 'locked',

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div v-tippy="{arrow: true, theme: 'mm'}"
:title="filterName">
<section v-if="!isControlable">
<button v-tippy="{html: '#contentpopup2', interactive: true, trigger: 'click', theme: 'mm'}"
<button v-tippy="{html: '#contentpopup2', interactive: true, reactive: true, trigger: 'click', theme: 'mm', arrow: true}"
:class="{'is-active': isUsed()}"
:disabled="processing"
class="btn-plain">
Expand Down
7 changes: 2 additions & 5 deletions src/resources/assets/js/components/image/editor/main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export default {
props: [
'file',
'noScroll',
'translations',
'trans',
'route'
],
data() {
Expand Down Expand Up @@ -436,7 +436,7 @@ export default {
saveToDisk(data) {
const parent = this.$parent
parent.toggleLoading()
parent.showNotif(parent.trans('stand_by'), 'info')
parent.showNotif(trans('stand_by'), 'info')
axios.post(this.route, {
data: data,
Expand Down Expand Up @@ -491,9 +491,6 @@ export default {
dragModeIs(val) {
return this.dragMode == val
},
trans(val) {
return this.translations[val]
},
onDblClick(e) {
this.dragMode = e.target.dataset.cropperAction || this.dragMode
},
Expand Down
Loading

0 comments on commit 9e3469e

Please sign in to comment.