Page controller rebase

ttimot24 · Sep 30, 2024 · b4c73bc · b4c73bc
1 parent 9aeaedf
commit b4c73bc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/app/Controllers/PageController.php b/app/Controllers/PageController.php
@@ -4,10 +4,9 @@
 
 use App\Controllers\Trait\UploadsImage;
 use Illuminate\Http\Request;
-use App\Libs\Controller;
+use Illuminate\Routing\Controller;
 use App\Model\Page;
 
-// TODO
 class PageController extends Controller
 {
 
@@ -39,13 +38,10 @@ public function index(Request $request)
             return response()->json($pages);
         }
 
-        // TODO
-        $this->view->js('resources/js/dragndrop.js');
-
         return view('pages.index', [
             'all_pages' => $pages,
             'visible_pages' => Page::where('visibility', 1)->count(),
-            'home_page' => Page::find($this->request->settings['home_page']),
+            'home_page' => Page::find($request->settings['home_page']),
         ]);
     }
 
@@ -56,8 +52,6 @@ public function index(Request $request)
      */
     public function create(Request $request)
     {
-        // TODO
-        $this->view->js('resources/js/pages.js');
 
         return view('pages.form', [
             'all_page' => Page::all(),
@@ -84,11 +78,11 @@ public function store(Request $request)
 
         $this->uploadImage($page);
 
-        if ($page->save()) {
+        if($page->save()) {
             return redirect(route("page.edit", ['page' => $page]))->withMessage(['success' => trans('message.successfully_created_page')]);
-        } else {
-            return redirect()->back()->withMessage(['danger' => trans('message.something_went_wrong')]);
-        }
+        } 
+
+        return redirect()->back()->withMessage(['danger' => trans('message.something_went_wrong')]);
     }
 
     /**
@@ -114,8 +108,6 @@ public function show(Request $request, Page $page)
      */
     public function edit(Request $request, Page $page)
     {
-        // TODO
-        $this->view->js('resources/js/pages.js');
 
         return view('pages.form', [
             'page' => $page,
@@ -146,9 +138,9 @@ public function update(Request $request, Page $page)
 
         if ($page->save()) {
             return redirect(route("page.edit", ['page' => $page]))->withMessage(['success' => trans('message.successfully_updated_page')]);
-        } else {
-            return redirect()->back()->withMessage(['danger' => trans('message.something_went_wrong')]);
-        }
+        } 
+
+        return redirect()->back()->withMessage(['danger' => trans('message.something_went_wrong')]);
     }
 
 
@@ -157,9 +149,9 @@ public function setHomePage($id)
 
         if (\App\Model\Settings::where("setting", "home_page")->update(['value' => $id])) {
             return redirect()->back()->withMessage(['success' => trans('message.successfully_set_homepage')]);
-        } else {
-            return redirect()->back()->withMessage(['danger' => trans('message.something_went_wrong')]);
-        }
+        } 
+
+        return redirect()->back()->withMessage(['danger' => trans('message.something_went_wrong')]);
     }
 
 
@@ -176,13 +168,9 @@ public function destroy(Page $page)
             return redirect(route("page.index"))->withMessage(['success' => trans('message.successfully_deleted_page')]);
         }
 
-
         return redirect(route("page.index"))->withMessage(['danger' => trans('message.something_went_wrong')]);
     }
 
-
-
-
     public function reorder()
     {
 

diff --git a/app/View/pages/form.blade.php b/app/View/pages/form.blade.php
@@ -1,4 +1,4 @@
-@extends('layout', ['title' => isset($page)? trans('page.edit_page') : trans('page.new_page')])
+@extends('layout', ['title' => isset($page)? trans('page.edit_page') : trans('page.new_page'), 'js' => array_merge($js, ['resources/js/pages.js'])])
 
 @section('content')
     <div class='container main-container'>

diff --git a/app/View/pages/index.blade.php b/app/View/pages/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layout', ['title' => trans('page.pages'), 'js' => ['resources/js/dragndrop.js'] ])
+@extends('layout', ['title' => trans('page.pages'), 'js' => array_merge($js, ['resources/js/dragndrop.js']) ])
 
 @section('content')
     <div class='container main-container'>