w0bm/Gw0bm
4
0
Fork 0
Code Pull Requests Activity

some css tweaks and other minor improvements/fixes

Browse Source
This commit is contained in:
noxy
2019-11-27 15:23:48 +00:00
parent 5fc7bf3036
commit 50ba00431b
35 changed files with 880 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,8 +145,8 @@ class UserController extends Controller
$validator = \Validator::make($request->all(), [
'username' => 'required|unique:users|min:3|max:25|alpha_num',
'email' => 'required|email|unique:users|confirmed',
'password' => 'required|min:6|confirmed'
//'g-recaptcha-response' => 'required|recaptcha'
'password' => 'required|min:6|confirmed',
'captcha' => 'required|captcha'
]);
if($validator->fails()) {
@@ -368,6 +368,31 @@ class UserController extends Controller
]);
}
public function bestof() {
$user = UserFavorite::where('username', '=', sirx)->first();
if (!$user) {
return redirect()->back()->with('error', 'Unknown username');
}
$vid = $user->videos()->filtered()->find($id);
if (!$vid) {
return redirect()->back()->with('error', 'Video not found on user');
}
$sfw = $vid->tags->contains(function($key, $tag) {
return $tag->normalized === 'sfw';
});
return view('best', [
'video' => $vid,
'related' => $user,
'banner' => Banner::getRandom($vid->isSfw()),
'sfw' => $sfw,
]);
}
// TODO: Cleanup. less Repetion between random and random_vav/play and play_fav
// Only difference are the redirect urls and the Base Model
public function random_fav($username) {

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

@@ -22,6 +22,7 @@ class VideoController extends Controller
* @return Response
*/
public function index(Request $request) {
if($request->has('q')){
$needle = trim($request->input('q'));
return view('index', [
@@ -29,12 +30,13 @@ class VideoController extends Controller
->orderBy('id', 'asc')
->paginate(20)->appends(['q' => $needle]),
'categories' => Category::all(),
'q' => $needle
'q' => $needle,
]);
}
return view('index', [
'videos' => Video::filtered()->orderBy('id', 'ASC')->paginate(20),
'categories' => Category::all()
'categories' => Category::all(),
]);
}
@@ -74,7 +76,8 @@ class VideoController extends Controller
*/
public function store(Request $request)
{
/*var_dump($request->hasFile('file'));*/ if(!$request->hasFile('file') || !$request->has('category') || !$request->has('tags'))
/*var_dump($request->hasFile('file'));*/
if(!$request->hasFile('file') || !$request->has('category') || !$request->has('tags'))
return new JsonResponse(['error' => 'invalid_request']);
$tags = $request->get('tags');

6
app/Http/Controllers/rulezController.php
View File

@@ -20,6 +20,12 @@ class rulezController extends Controller
return view('rulez', ['rules' => Rulez::all(), 'uploadrules' => Rulez::where('zuordnung', '=', 'Upload')->get(), 'tagrules' => Rulez::where('zuordnung', '=', 'Tagging')->get(), 'generalrules' => Rulez::where('zuordnung', '=', 'General')->get(), 'commentrules' => Rulez::where('zuordnung', '=', 'Commenting')->get()]);
}
public function gib()
{
$storagePath = storage_path('app/vidz/1572221426860.webm');
return ($storagePath)->response();
}
/**
* Show the form for creating a new resource.
*

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 134 KiB

51
app/Http/routes.php
View File

@@ -36,11 +36,11 @@ Route::group(['prefix' => 'api'], function() {
// /api/comments
Route::group(['prefix' => 'comments'], function() {
Route::get('/', 'CommentController@index');
Route::get('/{id}', 'CommentController@show')->where('id', '[0-9]+');
Route::post('{id}/edit', 'CommentController@update')->where('id', '[0-9]+');
Route::post('{id}/delete', 'CommentController@destroy')->where('id', '[0-9]+');
Route::post('{id}/restore', 'CommentController@restore')->where('id', '[0-9]+');
Route::get('/', 'CommentController@index')->middleware('auth');
Route::get('/{id}', 'CommentController@show')->where('id', '[0-9]+')->middleware('auth');
Route::post('{id}/edit', 'CommentController@update')->where('id', '[0-9]+')->middleware('auth');
Route::post('{id}/delete', 'CommentController@destroy')->where('id', '[0-9]+')->middleware('auth');
Route::post('{id}/restore', 'CommentController@restore')->where('id', '[0-9]+')->middleware('auth');
});
// /api/user
@@ -55,7 +55,7 @@ Route::group(['prefix' => 'api'], function() {
return \App\Models\Video::getRandom()->with(['category', 'user' => function($query) {
$query->addSelect('username', 'id');
}])->first();
});
})->middleware('auth');
@@ -79,7 +79,7 @@ Route::group(['prefix' => 'api'], function() {
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]+');
Route::post('upload', 'VideoController@store')->middleware('auth.basic');
Route::post('upload', 'VideoController@store')->middleware('auth');
});
Route::post('upload', 'VideoController@store');
@@ -97,13 +97,14 @@ Route::group(["middleware" => "theme"], function() {
Route::get('user/{username}/uploads', 'UserController@random')->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('best', 'UserController@bestof')->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');
Route::post('login', 'UserController@login');
Route::get('register', 'UserController@create');
//Route::post('register', 'UserController@store');
Route::post('register', 'UserController@store');
Route::get('activate/{token}', 'UserController@activate');
Route::get('index', 'VideoController@index')->middleware('auth');
Route::get('main', 'VideoController@main')->middleware('auth');
@@ -113,11 +114,12 @@ Route::group(["middleware" => "theme"], function() {
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', 'rulezController@index')->middleware('auth');
Route::get('rules', 'rulezController@index');
#Route::get('tos', function() { return view('tos'); });
#Route::get('rulez', 'rulezController@index')->middleware('auth');
Route::get('todo', function() { return view('todo'); })->middleware('auth');
Route::get('contact', function() { return view('contact'); });
Route::get('terms', function() { return view('tos'); })->middleware('auth');
#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', [
@@ -154,6 +156,29 @@ Route::group(["middleware" => "theme"], function() {
Route::get('{id}/fav', 'VideoController@favorite')->where('id', '[0-9]+');
Route::post('{id}', 'CommentController@store')->where('id', '[0-9]+');
Route::get('{shortname}', 'CategoryController@showVideo')->where('shortname', '[a-z][a-z0-9]+')->middleware('auth');
Route::get('{shortname}/{id}', 'CategoryController@showVideo')->where(['shortname' => '[a-z][a-z0-9]+', 'id' => '[0-9]+'])->middleware('auth');
});
##Category View
Route::get('{shortname}', 'CategoryController@showVideo')->where('shortname', '[a-z][a-z0-9]+');
Route::get('{shortname}/{id}', 'CategoryController@showVideo')->where(['shortname' => '[a-z][a-z0-9]+', 'id' => '[0-9]+']);
Route::any('captcha-test', function() {
if (request()->getMethod() == 'POST') {
$rules = ['captcha' => 'required|captcha'];
$validator = validator()->make(request()->all(), $rules);
if ($validator->fails()) {
echo '<p style="color: #ff0000;">Incorrect!</p>';
} else {
echo '<p style="color: #00ff30;">Matched :)</p>';
}
}
$form = '<form method="post" action="captcha-test">';
$form .= '<input type="hidden" name="_token" value="' . csrf_token() . '">';
$form .= '<p>' . captcha_img() . '</p>';
$form .= '<p><input type="text" name="captcha"></p>';
$form .= '<p><button type="submit" name="check">Check</button></p>';
$form .= '</form>';
return $form;
});
});