Added Tagging, Update to Laravel 5.5, Enabled Video
This commit is contained in:
@@ -6,9 +6,8 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
|
||||
use Illuminate\Routing\Controller as BaseController;
|
||||
use Illuminate\Foundation\Validation\ValidatesRequests;
|
||||
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
||||
use Illuminate\Foundation\Auth\Access\AuthorizesResources;
|
||||
|
||||
class Controller extends BaseController
|
||||
{
|
||||
use AuthorizesRequests, AuthorizesResources, DispatchesJobs, ValidatesRequests;
|
||||
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
|
||||
}
|
||||
|
@@ -77,6 +77,7 @@ class PhotoController extends Controller
|
||||
|
||||
return redirect()->action('PhotoController@duplicates','?page='.$request->input('page'));
|
||||
}
|
||||
|
||||
public function info($id)
|
||||
{
|
||||
return view('photo.view', ['photo'=> Photo::findOrFail($id)]);
|
||||
|
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
|
||||
use App\Http\Requests;
|
||||
use App\Model\Video;
|
||||
use App\Jobs\VideoDelete;
|
||||
use App\Helpers\VideoStream;
|
||||
|
||||
class VideoController extends Controller
|
||||
{
|
||||
@@ -34,13 +35,11 @@ class VideoController extends Controller
|
||||
return redirect()->action('VideoController@info',[$id]);
|
||||
}
|
||||
|
||||
//@todo
|
||||
public function deletes()
|
||||
{
|
||||
return view('video.deletereview',['videos'=>Video::where('remove',1)->paginate(2)]);
|
||||
}
|
||||
|
||||
//@todo
|
||||
public function deletesUpdate(Request $request)
|
||||
{
|
||||
foreach ($request->input('video') as $id)
|
||||
@@ -54,13 +53,11 @@ class VideoController extends Controller
|
||||
return redirect()->action('VideoController@deletes',$request->input('pagenext') ? '?page='.$request->input('pagenext') : NULL);
|
||||
}
|
||||
|
||||
//@todo
|
||||
public function duplicates($id=NULL)
|
||||
{
|
||||
return view('video.duplicates',['videos'=>is_null($id) ? Video::notRemove()->where('duplicate',1)->paginate(1) : Video::where('id',$id)->paginate(1)]);
|
||||
}
|
||||
|
||||
//@todo
|
||||
public function duplicatesUpdate(Request $request)
|
||||
{
|
||||
foreach ($request->input('video') as $id)
|
||||
@@ -99,9 +96,8 @@ class VideoController extends Controller
|
||||
return redirect()->action('VideoController@info',[$id]);
|
||||
}
|
||||
|
||||
//@todo
|
||||
public function view($id)
|
||||
{
|
||||
return response(Video::findOrFail($id)->image())->header('Content-Type','video/mov');
|
||||
(new VideoStream(Video::findOrFail($id)->file_path()))->start();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user