Skip to content

Commit 5ac38e8

Browse files
RohosRohos
committed
Add prefix route on config, change routes hardcode
1 parent 3ba0a6f commit 5ac38e8

File tree

7 files changed

+72
-31
lines changed

7 files changed

+72
-31
lines changed

‎src/config/lfm.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// For laravel 5.2, please set to ['web', 'auth']
1313
'middlewares' => ['auth'],
1414

15+
// Add prefix for routes
16+
'prefix' => 'laravel-filemanager',
17+
1518
// Allow multi_user mode or not.
1619
// If true, laravel-filemanager create private folders for each signed-in user.
1720
'allow_multi_user' => true,

‎src/lang/ru/lfm.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
'title-size' => 'Размер',
2525
'title-type' => 'Тип',
2626
'title-modified' => 'Изменен',
27-
'title-action' => 'Дийствие',
27+
'title-action' => 'Действие',
2828

2929
'type-folder' => 'Папка',
3030

‎src/routes.php‎

Lines changed: 55 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,78 @@
11
<?php
22
$middlewares = \Config::get('lfm.middlewares');
3+
$prefix = \Config::get('lfm.prefix');
34
array_push($middlewares, '\Unisharp\Laravelfilemanager\middleware\MultiUser');
4-
5+
//, 'as' => 'admin.'
56
// make sure authenticated
6-
Route::group(array('middleware' => $middlewares, 'prefix' => 'laravel-filemanager'), function ()
7+
Route::group(array('middleware' => $middlewares, 'prefix' => $prefix, 'as' => 'unisharp.lfm.'), function ()
78
{
89
// Show LFM
9-
Route::get('/', 'Unisharp\Laravelfilemanager\controllers\LfmController@show');
10+
Route::get('/', [
11+
'uses' => 'Unisharp\Laravelfilemanager\controllers\LfmController@show',
12+
'as' => 'show'
13+
]);
1014

1115
// upload
12-
Route::any('/upload', 'Unisharp\Laravelfilemanager\controllers\UploadController@upload');
16+
Route::any('/upload', [
17+
'uses' => 'Unisharp\Laravelfilemanager\controllers\UploadController@upload',
18+
'as' => 'upload'
19+
]);
1320

1421
// list images & files
15-
Route::get('/jsonitems', 'Unisharp\Laravelfilemanager\controllers\ItemsController@getItems');
22+
Route::get('/jsonitems', [
23+
'uses' => 'Unisharp\Laravelfilemanager\controllers\ItemsController@getItems',
24+
'as' => 'getItems'
25+
]);
1626

1727
// folders
18-
Route::get('/newfolder', 'Unisharp\Laravelfilemanager\controllers\FolderController@getAddfolder');
19-
Route::get('/deletefolder', 'Unisharp\Laravelfilemanager\controllers\FolderController@getDeletefolder');
20-
Route::get('/folders', 'Unisharp\Laravelfilemanager\controllers\FolderController@getFolders');
28+
Route::get('/newfolder',[
29+
'uses' => 'Unisharp\Laravelfilemanager\controllers\FolderController@getAddfolder',
30+
'as' => 'getAddfolder'
31+
]);
32+
Route::get('/deletefolder', [
33+
'uses' => 'Unisharp\Laravelfilemanager\controllers\FolderController@getDeletefolder',
34+
'as' => 'getDeletefolder'
35+
]);
36+
Route::get('/folders', [
37+
'uses' => 'Unisharp\Laravelfilemanager\controllers\FolderController@getFolders',
38+
'as' => 'getFolders'
39+
]);
2140

2241
// crop
23-
Route::get('/crop', 'Unisharp\Laravelfilemanager\controllers\CropController@getCrop');
24-
Route::get('/cropimage', 'Unisharp\Laravelfilemanager\controllers\CropController@getCropimage');
42+
Route::get('/crop', [
43+
'uses' => 'Unisharp\Laravelfilemanager\controllers\CropController@getCrop',
44+
'as' => 'getCrop'
45+
]);
46+
Route::get('/cropimage', [
47+
'uses' => 'Unisharp\Laravelfilemanager\controllers\CropController@getCropimage',
48+
'as' => 'getCropimage'
49+
]);
2550

2651
// rename
27-
Route::get('/rename', 'Unisharp\Laravelfilemanager\controllers\RenameController@getRename');
52+
Route::get('/rename', [
53+
'uses' => 'Unisharp\Laravelfilemanager\controllers\RenameController@getRename',
54+
'as' => 'getRename'
55+
]);
2856

2957
// scale/resize
30-
Route::get('/resize', 'Unisharp\Laravelfilemanager\controllers\ResizeController@getResize');
31-
Route::get('/doresize', 'Unisharp\Laravelfilemanager\controllers\ResizeController@performResize');
58+
Route::get('/resize', [
59+
'uses' => 'Unisharp\Laravelfilemanager\controllers\ResizeController@getResize',
60+
'as' => 'getResize'
61+
]);
62+
Route::get('/doresize', [
63+
'uses' => 'Unisharp\Laravelfilemanager\controllers\ResizeController@performResize',
64+
'as' => 'performResize'
65+
]);
3266

3367
// download
34-
Route::get('/download', 'Unisharp\Laravelfilemanager\controllers\DownloadController@getDownload');
68+
Route::get('/download', [
69+
'uses' => 'Unisharp\Laravelfilemanager\controllers\DownloadController@getDownload',
70+
'as' => 'getDownload'
71+
]);
3572

3673
// delete
37-
Route::get('/delete', 'Unisharp\Laravelfilemanager\controllers\DeleteController@getDelete');
74+
Route::get('/delete', [
75+
'uses' => 'Unisharp\Laravelfilemanager\controllers\DeleteController@getDelete',
76+
'as' => 'getDelete'
77+
]);
3878
});

‎src/views/crop.blade.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<br>
1212
<button class="btn btn-primary" onclick="performCrop()">{{ Lang::get('laravel-filemanager::lfm.btn-crop') }}</button>
1313
<button class="btn btn-info" onclick="loadItems()">{{ Lang::get('laravel-filemanager::lfm.btn-cancel') }}</button>
14-
<form action="{{url('/laravel-filemanager/crop')}}" role='form' name='cropForm' id='cropForm' mathod='post'>
14+
<form action="{{ route('unisharp.lfm.getCrop') }}" role='form' name='cropForm' id='cropForm' mathod='post'>
1515
<input type="hidden" id="img" name="img" value="{{ $img }}">
1616
<input type="hidden" id="working_dir" name="working_dir" value="{{ $working_dir }}">
1717
<input type="hidden" id="dataX" name="dataX">
@@ -31,7 +31,6 @@
3131
$dataY = $('#dataY'),
3232
$dataHeight = $('#dataHeight'),
3333
$dataWidth = $('#dataWidth');
34-
3534
$('.crop-container > img').cropper({
3635
//aspectRatio: 16 / 9,
3736
preview: ".img-preview",
@@ -45,12 +44,11 @@
4544
}
4645
});
4746
});
48-
4947
function performCrop() {
5048
$.ajax({
5149
type: "GET",
5250
dataType: "text",
53-
url: "laravel-filemanager/cropimage",
51+
url: "{{ route('unisharp.lfm.getCropimage') }}",
5452
data: {
5553
img: '{{ $img }}',
5654
working_dir: $("#working_dir").val(),
@@ -65,4 +63,4 @@ function performCrop() {
6563
loadItems();
6664
});
6765
}
68-
</script>
66+
</script>

‎src/views/index.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<h4 class="modal-title" id="myModalLabel">{{ Lang::get('laravel-filemanager::lfm.title-upload') }}</h4>
110110
</div>
111111
<div class="modal-body">
112-
<form action="{{url('/laravel-filemanager/upload')}}" role='form' id='uploadForm' name='uploadForm' method='post' enctype='multipart/form-data'>
112+
<form action="{{ route('unisharp.lfm.upload') }}" role='form' id='uploadForm' name='uploadForm' method='post' enctype='multipart/form-data'>
113113
<div class="form-group" id="attachment">
114114
<label for='upload' class='control-label'>{{ Lang::get('laravel-filemanager::lfm.message-choose') }}</label>
115115
<div class="controls">

‎src/views/resize.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function doResize() {
7474
$.ajax({
7575
type: "GET",
7676
dataType: "text",
77-
url: "laravel-filemanager/doresize",
77+
url: "{{ route('unisharp.lfm.performResize') }}",
7878
data: {
7979
img: '{{ $img }}',
8080
working_dir: $("#working_dir").val(),

‎src/views/script.blade.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function loadFolders() {
112112
$.ajax({
113113
type: 'GET',
114114
dataType: 'html',
115-
url: 'laravel-filemanager/folders',
115+
url: '{{ route("unisharp.lfm.getFolders") }}',
116116
data: {
117117
working_dir: $('#working_dir').val(),
118118
show_list: $('#show_list').val(),
@@ -131,7 +131,7 @@ function loadItems() {
131131
$.ajax({
132132
type: 'GET',
133133
dataType: 'html',
134-
url: 'laravel-filemanager/jsonitems',
134+
url: '{{ route("unisharp.lfm.getItems") }}',
135135
data: {
136136
working_dir: working_dir,
137137
show_list: $('#show_list').val(),
@@ -150,7 +150,7 @@ function createFolder(folder_name) {
150150
$.ajax({
151151
type: 'GET',
152152
dataType: 'text',
153-
url: 'laravel-filemanager/newfolder',
153+
url: '{{ route("unisharp.lfm.getAddfolder") }}',
154154
data: {
155155
name: folder_name,
156156
working_dir: $('#working_dir').val(),
@@ -177,7 +177,7 @@ function rename(item_name) {
177177
$.ajax({
178178
type: 'GET',
179179
dataType: 'text',
180-
url: 'laravel-filemanager/rename',
180+
url: '{{ route("unisharp.lfm.getRename") }}',
181181
data: {
182182
file: item_name,
183183
working_dir: $('#working_dir').val(),
@@ -204,7 +204,7 @@ function trash(item_name) {
204204
$.ajax({
205205
type: 'GET',
206206
dataType: 'text',
207-
url: 'laravel-filemanager/delete',
207+
url: '{{ route("unisharp.lfm.getDelete") }}',
208208
data: {
209209
working_dir: $('#working_dir').val(),
210210
items: item_name,
@@ -229,7 +229,7 @@ function cropImage(image_name) {
229229
$.ajax({
230230
type: 'GET',
231231
dataType: 'text',
232-
url: 'laravel-filemanager/crop',
232+
url: '{{ route("unisharp.lfm.getCrop") }}',
233233
data: {
234234
img: image_name,
235235
working_dir: $('#working_dir').val(),
@@ -246,7 +246,7 @@ function resizeImage(image_name) {
246246
$.ajax({
247247
type: 'GET',
248248
dataType: 'text',
249-
url: 'laravel-filemanager/resize',
249+
url: '{{ route("unisharp.lfm.getResize") }}',
250250
data: {
251251
img: image_name,
252252
working_dir: $('#working_dir').val(),
@@ -260,7 +260,7 @@ function resizeImage(image_name) {
260260
}
261261
262262
function download(file_name) {
263-
location.href = 'laravel-filemanager/download?'
263+
location.href = '{{ route("unisharp.lfm.getDownload") }}?'
264264
+ 'working_dir='
265265
+ $('#working_dir').val()
266266
+ '&type='

0 commit comments

Comments
 (0)