vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.5.12 Added the last things to the preview function, its all working now

Browse Source
This commit is contained in:
Neerholt
2021-04-19 14:42:03 +02:00
parent 493a8aeb34
commit 19fdb63ad2
10 changed files with 73 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/EventController.php
+6 -1
View File
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use App\Event;
use App\News;
use App\Notification;
use App\Resource;
use App\UserEvent;
use App\User;
use Illuminate\Http\Request;
@@ -288,7 +289,11 @@ class EventController extends Controller
}
public function previewPages(Request $request){
$event = Event::find($request->preview);
if(!Resource::find($request->preview)){
$event = Event::find($request->preview);
}else{
$event = Event::where('events.id', '=', $request->preview)->join('resources', 'resources.id', '=', 'events.resource_id')->first();
}
$convertToJsonArray = json_encode($event);
return $convertToJsonArray;
}
skolehjem/app/Http/Controllers/GuideController.php
+6 -1
View File
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Guide;
use App\News;
use App\Resource;
use Illuminate\Http\Response;
use Illuminate\Http\Request;
use tidy;
@@ -277,7 +278,11 @@ class GuideController extends Controller
}
public function previewPages(Request $request){
$event = Guide::find($request->preview);
if(!Resource::find($request->preview)){
$event = Guide::find($request->preview);
}else{
$event = Guide::where('guides.id', '=', $request->preview)->join('resources', 'resources.id', '=', 'events.resource_id')->first();
}
$convertToJsonArray = json_encode($event);
return $convertToJsonArray;
}
skolehjem/app/Http/Controllers/RootController.php
+16 -15
View File
@@ -22,25 +22,26 @@ class RootController extends Controller
}
public function index() {
$perPage = 5;
if (File::exists(public_path('uploads'))) {
foreach (File::allFiles(public_path('uploads')) as $file) {
$resource = Resource::query()->where('filename', '=', '/uploads/' . $file->getFilename())->get();
foreach (File::allFiles(public_path('uploads')) as $file) {
$resource = Resource::query()->where('filename', '=', '/uploads/' . $file->getFilename())->get();
if(count($resource) < 1)
unlink(public_path() . '/uploads/' . $file->getFilename());
else {
$events = Event::query()->where('resource_id', '=', $resource[0]->id)->get();
$news = News::query()->where('resource_id', '=', $resource[0]->id)->get();
$guides = Guide::query()->where('resource_id', '=', $resource[0]->id)->get();
$users = User::query()->where('resource_id', '=', $resource[0]->id)->get();
if(count($events) < 1 && count($news) < 1 && count($guides) < 1 && count($users) < 1) {
$resource[0]->delete();
if(count($resource) < 1)
unlink(public_path() . '/uploads/' . $file->getFilename());
else {
$events = Event::query()->where('resource_id', '=', $resource[0]->id)->get();
$news = News::query()->where('resource_id', '=', $resource[0]->id)->get();
$guides = Guide::query()->where('resource_id', '=', $resource[0]->id)->get();
$users = User::query()->where('resource_id', '=', $resource[0]->id)->get();
if(count($events) < 1 && count($news) < 1 && count($guides) < 1 && count($users) < 1) {
$resource[0]->delete();
unlink(public_path() . '/uploads/' . $file->getFilename());
}
}
}
}
} else
File::makeDirectory(public_path('uploads'), 0777, true, true);
//All news
$newsCollection = News::query()->orderBy('id', 'desc')->get();