w0bm/Gw0bm
4
0
Fork 0
Code Pull Requests Activity

MORE LAYOUTgit add public/mobile public/nojs/ public/shoop.png resources/views/layout1/apply.blade.php resources/views/layout1/nojs.blade.php resources/views/layout1/tos.blade.php resources/views/layout4/ resources/views/layout5!

Browse Source
This commit is contained in:
noxy
2019-09-02 19:15:37 +00:00
parent 8dd96f7d11
commit 4c21480392
201 changed files with 33473 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/UserController.php
View File

@@ -342,10 +342,15 @@ class UserController extends Controller
return redirect()->back()->with('error', 'Video not found on user');
}
$sfw = $vid->tags->contains(function($key, $tag) {
return $tag->normalized === 'sfw';
});
return view('video', [
'video' => $vid,
'related' => $user,
'banner' => Banner::getRandom($vid->isSfw())
'banner' => Banner::getRandom($vid->isSfw()),
'sfw' => $sfw
]);
}
@@ -378,10 +383,15 @@ class UserController extends Controller
return redirect()->back()->with('error', 'Video not found on user');
}
$sfw = $vid->tags->contains(function($key, $tag) {
return $tag->normalized === 'sfw';
});
return view('video', [
'video' => $vid,
'related' => $user,
'banner' => Banner::getRandom($vid->isSfw())
'banner' => Banner::getRandom($vid->isSfw()),
'sfw' => $sfw,
]);
}
public function setLayout(Request $request) {

3
app/Http/Controllers/VideoController.php
View File

@@ -167,7 +167,8 @@ class VideoController extends Controller
return view('video', [
'video' => $video,
'banner' => Banner::getRandom($sfw)
'banner' => Banner::getRandom($sfw),
'sfw' => $sfw
]);
}

BIN
app/Http/Controllers/tmp/test.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 675 KiB

After

Width:  |  Height:  |  Size: 444 KiB

21
app/Http/routes.php
View File

@@ -73,7 +73,7 @@ Route::group(['prefix' => 'api'], function() {
return response(['message' => 'Video not found'], 404);
}
return $res;
})->where('id', '[0-9]+');
})->where('id', '[0-9]+')->middleware('auth');
Route::post('{id}/delete', 'VideoController@destroy')->where('id', '[0-9]+');
Route::post('{id}/tag', 'VideoController@tag')->where('id', '[0-9]+');
Route::post('{id}/untag', 'VideoController@untag')->where('id', '[0-9]+');
@@ -84,13 +84,13 @@ Route::group(['prefix' => 'api'], function() {
});
Route::group(["middleware" => "theme"], function() {
Route::post('report/{id}', 'ReportController@report'); // added by klee
Route::get('messages', 'MessageController@page');
Route::post('report/{id}', 'ReportController@report')->middleware('auth'); // added by klee
Route::get('messages', 'MessageController@page')->middleware('auth');
Route::get('user/{username}', 'UserController@show')->middleware('auth');
Route::get('user/{username}/uploads', 'UserController@random')->middleware('auth');
Route::get('user/{username}/uploads/{id}', 'UserController@play')->where('id', '[0-9]+')->middleware('auth');
Route::get('user/{username}/uploads/{id}', 'UserController@play')->where('id', '[0-9]+');
Route::get('user/{username}/favs', 'UserController@random_fav')->middleware('auth');
Route::get('user/{username}/favs/{id}', 'UserController@play_fav')->where('id', '[0-9]+')->middleware('auth');
Route::get('user/{username}/favs/{id}', 'UserController@play_fav')->where('id', '[0-9]+');
Route::get('user/{username}/favs/index', 'UserController@show_favs')->middleware('auth');
Route::get('user/{username}/comments', 'UserController@show_comments')->middleware('auth');
Route::get('logout', 'UserController@logout');
@@ -102,12 +102,13 @@ Route::group(["middleware" => "theme"], function() {
Route::post('index/{id}', 'VideoController@update')->middleware('auth');
Route::get('upload', 'VideoController@create')->middleware('auth');
Route::get('categories', 'CategoryController@index')->middleware('auth');
Route::get('webm', function() { return view('webm'); });
Route::get('about', function() { return view('about'); });
Route::get('webm', function() { return view('webm'); })->middleware('auth');
Route::get('about', function() { return view('about'); })->middleware('auth');
Route::get('irc', function() { return view('irc'); });
Route::get('rules', function() { return view('rules'); });
Route::get('rules', function() { return view('rules'); })->middleware('auth');
Route::get('contact', function() { return view('contact'); });
Route::get('privacy', function() { return view('privacy'); });
Route::get('terms', function() { return view('tos'); })->middleware('auth');
Route::get('privacy', function() { return view('privacy'); })->middleware('auth');
Route::get('stats', function() {
return view('stats', [
'user_count' => \App\Models\User::count(),
@@ -118,7 +119,7 @@ Route::group(["middleware" => "theme"], function() {
'newest_user' => \App\Models\User::orderBy('id', 'DESC')->first()->username,
'dirsize' => shell_exec("(du -sh " . public_path() . "/b | cut -f1)")
]);
});
})->middleware('auth');
Route::get('/latest', function () {
Session::reflash();