Merge pull request #24 from nadja97/master

Pages from (many to many relationship) to (one to many relationship)

Author: nadja97

app/Http/Controllers/Admin/Pages/PageContentController.php

@@ -7,12 +7,29 @@
 use App\Http\Requests;
 use App\Models\Content;
 use App\Models\PageContent;
+use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
 use App\Http\Controllers\Admin\AdminController;
 use Titan\Models\Traits\ImageThumb;
 
 class PageContentController extends AdminController
 {
+
+    /**
+     * Display a listing of content.
+     *
+     * @param Page $page
+     * @return Response
+     */
+    public function index(Page $page)
+    {
+        save_resource_url();
+
+        $page->load('sections');
+
+        return $this->view('pages.components.page_components')->with('page', $page);
+    }
+
     /**
      * Show the form for creating a new content.
      *
@@ -21,12 +38,35 @@ class PageContentController extends AdminController
      */
     public function create(Page $page)
     {
-        // create new content (used to link media and documents to)
-        $item = PageContent::create();
-
         return $this->view('pages.components.content')
-            ->with('page', $page)
-            ->with('item', $item);
+            ->with('page', $page);
+    }
+
+    /**
+     * Store a newly created news in storage.
+     *
+     * @param Request $request
+     * @return array
+     */
+    public function store(Request $request)
+    {
+
+        if (is_null(request()->file('media'))) {
+            $attributes = request()->validate(array_except(PageContent::$rules, 'media'),
+                PageContent::$messages);
+        }
+        else {
+            $attributes = request()->validate(PageContent::$rules, PageContent::$messages);
+
+            $media = $this->moveAndCreatePhoto($attributes['media']);
+            if ($media) {
+                $attributes['media'] = $media;
+            }
+        }
+
+        $pageContent = $this->createEntry(PageContent::class, $attributes);
+
+        return redirect('admin/pages/'.$request->page_id.'/sections/content/'.$pageContent->id.'/edit');
     }
 
     /**
@@ -38,6 +78,7 @@ public function create(Page $page)
      */
     public function edit(Page $page, PageContent $content)
     {
+
         return $this->view('pages.components.content')
             ->with('page', $page)
             ->with('item', $content);
@@ -68,11 +109,48 @@ public function update(Page $page, PageContent $content)
         unset($attributes['page_id']);
         $item = $this->updateEntry($content, $attributes);
 
-        $page->attachComponent($item);
+        return redirect_to_resource();
+    }
+
+    /**
+     * Remove the specified content from storage.
+     *
+     * @param Page        $page
+     * @param PageContent $section
+     * @return Response
+     * @internal param $page_section
+     */
+    public function destroy(Page $page, PageContent $section)
+    {
+        // delete page_content
+        $this->deleteEntry($section, request());
+
+        log_activity('Page Component Deleted', 'A Page Content was successfully removed from the Page', $section);
 
         return redirect_to_resource();
     }
 
+    /**
+     * @param Page $page
+     * @return array
+     */
+    public function updateOrder(Page $page)
+    {
+        $items = json_decode(request('list'), true);
+
+        foreach ($items as $key => $item) {
+
+            $row = PageContent::find($item['id']);
+            if($row) {
+                $row->update([
+                    'list_order' => ($key + 1)
+                ]);
+            }
+        }
+
+        return ['result' => 'success'];
+    }
+
     /**
      * Save Image in Storage, crop image and save in public/uploads/images
      * @param UploadedFile $file

app/Http/Controllers/Admin/Pages/SectionsController.php

@@ -71,15 +71,15 @@ public static function getAllList()
      */
     public function sections()
     {
-        return $this->hasMany(PageSection::class, 'page_id', 'id')->orderBy('list_order');
+        return $this->hasMany(PageContent::class, 'page_id', 'id')->orderBy('list_order');
     }
 
     /**
      * Get the components
      */
     public function components()
     {
-        return $this->hasMany(PageSection::class, 'page_id', 'id')->orderBy('list_order');
+        return $this->hasMany(PageContent::class, 'page_id', 'id')->orderBy('list_order');
     }
 
     /**
@@ -97,27 +97,4 @@ public function pageContent()
     {
         return $this->belongsToMany(PageContent::class);
     }
-
-    /**
-     * Create and Attach a page component to this page
-     * @param $item
-     * @return bool
-     */
-    public function attachComponent($item)
-    {
-        // if already attached
-        $found = PageSection::where('page_id', $this->id)
-            ->where('component_id', $item->id)
-            ->where('component_type', get_class($item))
-            ->first();
-        if ($found) {
-            return true;
-        }
-
-        PageSection::create([
-            'page_id'        => $this->id,
-            'component_id'   => $item->id,
-            'component_type' => get_class($item),
-        ]);
-    }
 }

app/Models/Page.php

@@ -67,6 +67,14 @@ public function getSummaryAttribute()
      */
     public function pages()
     {
-        return $this->belongsToMany(Page::class);
+        return $this->belongsTo(Page::class);
+    }
+
+    /**
+     * Get the Page many to many
+     */
+    public function component()
+    {
+        return $this->belongsTo(Page::class);
     }
 }