diff --git a/app/Http/Controllers/VideoController.php b/app/Http/Controllers/VideoController.php index 79d803a..eeabe1f 100644 --- a/app/Http/Controllers/VideoController.php +++ b/app/Http/Controllers/VideoController.php @@ -38,6 +38,23 @@ class VideoController extends Controller ]); } + public function main(Request $request) { + if($request->has('q')){ + $needle = trim($request->input('q')); + return view('main', [ + 'videos' => Video::filtered()->withAnyTagsFuzzy($needle) + ->orderBy('id', 'desc') + ->paginate(55)->appends(['q' => $needle]), + 'categories' => Category::all(), + 'q' => $needle + ]); + } + return view('main', [ + 'videos' => Video::filtered()->orderBy('id', 'DESC')->paginate(55), + 'categories' => Category::all() + ]); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/tmp/test.png b/app/Http/Controllers/tmp/test.png index c3bc82a..737f91b 100644 Binary files a/app/Http/Controllers/tmp/test.png and b/app/Http/Controllers/tmp/test.png differ diff --git a/app/Http/routes.php b/app/Http/routes.php index 79a0882..b504d09 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -99,6 +99,7 @@ Route::group(["middleware" => "theme"], function() { 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'); Route::post('index/{id}', 'VideoController@update')->middleware('auth'); Route::get('upload', 'VideoController@create')->middleware('auth'); Route::get('categories', 'CategoryController@index')->middleware('auth'); diff --git a/public/small_404.gif b/public/small_404.gif new file mode 100644 index 0000000..7caeb61 Binary files /dev/null and b/public/small_404.gif differ diff --git a/resources/views/layout1/main.blade.php b/resources/views/layout1/main.blade.php new file mode 100644 index 0000000..22cc90b --- /dev/null +++ b/resources/views/layout1/main.blade.php @@ -0,0 +1,33 @@ +@extends('profilelayout') +@section('content') +
+
+ + {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!} +
+
+ +
+ @foreach($videos as $video) + file); + ?> +
+ + @if(file_exists('/home/sirx/web/devw0bm/w0bm.com/public/thumbs/beta/'.$thumb.'.png')) + + + +@else + + {{$video->tesThumb()}} +@endif + +
+ @endforeach +
+ +
+ {!! $videos->render() !!} +
+@endsection diff --git a/resources/views/layout1/partials/navigation.blade.php b/resources/views/layout1/partials/navigation.blade.php index d6d50ab..ba04871 100644 --- a/resources/views/layout1/partials/navigation.blade.php +++ b/resources/views/layout1/partials/navigation.blade.php @@ -7,7 +7,7 @@ - + w0bm.com diff --git a/resources/views/layout1/video.blade.php b/resources/views/layout1/video.blade.php index 6228a00..aac6634 100644 --- a/resources/views/layout1/video.blade.php +++ b/resources/views/layout1/video.blade.php @@ -2,6 +2,12 @@ @section('content') @if(auth()->check()) + +@if(file_exists(public_path() . 'thumbs/beta/{{$video->file}}' . '.png')) +@else +{{$video->tesThumb()}} +@endif +
@@ -78,7 +84,7 @@ data-placement="top" data-trigger="hover" data-html="true" - title="Download Video" + title="Download" data-content="
    diff --git a/resources/views/layout2/main.blade.php b/resources/views/layout2/main.blade.php index a1835ed..484ff29 100644 --- a/resources/views/layout2/main.blade.php +++ b/resources/views/layout2/main.blade.php @@ -1,21 +1,26 @@ @extends('profilelayout') @section('novidcontent') -