Merge pull request #2 from tracepath/master

Update to Laravel 5.8
Thanks @tracepath 
Sorry for not maintaining this app myself, I didn't realize it was used
This commit is contained in:
Axel 2019-10-03 10:34:55 +02:00 committed by GitHub
commit 4c7b5d40a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 5775 additions and 2846 deletions

View file

@ -0,0 +1,13 @@
<?php
namespace app\Http\Controllers;
use Illuminate\Http\Request;
class UserController extends Controller
{
function getUser(Request $request)
{
return $request->user();
}
}

View file

@ -0,0 +1,22 @@
<?php
namespace app\Http\Controllers;
use Illuminate\Http\Request;
class WebController extends Controller
{
function homepage(Request $request)
{
if (Upload::canUpload($request->ip()) !== true) {
return view('cannotupload', [
'u' => $request->get('u')
]);
} else {
return redirect()->route('upload.create');
}
}
}

View file

@ -5,14 +5,14 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.4.*",
"laravel/tinker": "~1.0"
"php": "^7.1.3",
"laravel/framework": "5.8.*",
"laravel/tinker": "^1.0"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.7"
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^7.5"
},
"autoload": {
"classmap": [

2603
composer.lock generated

File diff suppressed because it is too large Load diff

3
public/css/app.css vendored

File diff suppressed because one or more lines are too long

5917
public/js/vendor.js vendored

File diff suppressed because it is too large Load diff

View file

@ -13,6 +13,4 @@ use Illuminate\Http\Request;
|
*/
Route::middleware('auth:api')->get('/user', function (Request $request) {
return $request->user();
});
Route::middleware('auth:api')->get('/user', "UserController@getUser");

View file

@ -12,7 +12,3 @@ use Illuminate\Foundation\Inspiring;
| simple approach to interacting with each command's IO methods.
|
*/
Artisan::command('inspire', function () {
$this->comment(Inspiring::quote());
})->describe('Display an inspiring quote');

View file

@ -13,54 +13,43 @@ use Illuminate\Http\Request;
|
*/
Route::get('/', function(Request $request) {
Route::get('/', "WebController@homepage")->name('homepage');
if (Upload::canUpload($request->ip()) !== true) {
return view('cannotupload', [
'u' => $request->get('u')
]);
}
else {
return redirect()->route('upload.create');
}
})->name('homepage');
Route::prefix('upload')->middleware(['web', 'upload'])->group(function() {
Route::prefix('upload')->middleware(['web', 'upload'])->group(function () {
Route::get('/', [
'uses' => 'UploadController@create',
'as' => 'upload.create'
'uses' => 'UploadController@create',
'as' => 'upload.create'
]);
Route::post('/file', [
'uses' => 'UploadController@store',
'as' => 'upload.store'
'uses' => 'UploadController@store',
'as' => 'upload.store'
]);
Route::post('/complete', [
'uses' => 'UploadController@complete',
'as' => 'upload.complete'
'uses' => 'UploadController@complete',
'as' => 'upload.complete'
]);
});
Route::prefix('bundle')->group(function() {
Route::prefix('bundle')->group(function () {
Route::get('/{bundle}', [
'uses' => 'BundleController@preview',
'as' => 'bundle.preview'
'uses' => 'BundleController@preview',
'as' => 'bundle.preview'
]);
Route::get('/{bundle}/download', [
'uses' => 'BundleController@download',
'as' => 'bundle.download'
'uses' => 'BundleController@download',
'as' => 'bundle.download'
]);
Route::get('/{bundle}/file/{file}/download', [
'uses' => 'BundleController@download',
'as' => 'file.download'
'uses' => 'BundleController@download',
'as' => 'file.download'
]);
Route::get('/{bundle}/delete', [
'uses' => 'BundleController@delete',
'as' => 'bundle.delete'
'uses' => 'BundleController@delete',
'as' => 'bundle.delete'
]);
});