Made chapters functional and cleaned design features

app/Book.php

@@ -31,7 +31,7 @@ class Book extends Model
 
     public function children()
     {
-        $pages = $this->pages()->get();
+        $pages = $this->pages()->where('chapter_id', '=', 0)->get();
         $chapters = $this->chapters()->get();
         $children = $pages->merge($chapters);
         return $children->sortBy('priority');

app/Chapter.php

@@ -12,7 +12,7 @@ class Chapter extends Model
         return $this->belongsTo('Oxbow\Book');
     }
 
-    public function children()
+    public function pages()
     {
         return $this->hasMany('Oxbow\Page')->orderBy('priority', 'ASC');
     }
@@ -22,4 +22,9 @@ class Chapter extends Model
         return '/books/' . $this->book->slug . '/chapter/' . $this->slug;
     }
 
+    public function getExcerpt($length = 100)
+    {
+        return strlen($this->description) > $length ? substr($this->description, 0, $length-3) . '...' : $this->description;
+    }
+
 }

app/Http/Controllers/PageController.php

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Oxbow\Http\Requests;
 use Oxbow\Repos\BookRepo;
+use Oxbow\Repos\ChapterRepo;
 use Oxbow\Repos\PageRepo;
 
 class PageController extends Controller
@@ -14,16 +15,19 @@ class PageController extends Controller
 
     protected $pageRepo;
     protected $bookRepo;
+    protected $chapterRepo;
 
     /**
      * PageController constructor.
-     * @param $pageRepo
-     * @param $bookRepo
+     * @param PageRepo $pageRepo
+     * @param BookRepo $bookRepo
+     * @param ChapterRepo $chapterRepo
      */
-    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo)
+    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo)
     {
         $this->pageRepo = $pageRepo;
         $this->bookRepo = $bookRepo;
+        $this->chapterRepo = $chapterRepo;
     }
 
 
@@ -41,14 +45,15 @@ class PageController extends Controller
      * Show the form for creating a new resource.
      *
      * @param $bookSlug
-     * @param bool $pageSlug
+     * @param bool $chapterSlug
      * @return Response
+     * @internal param bool $pageSlug
      */
-    public function create($bookSlug, $pageSlug = false)
+    public function create($bookSlug, $chapterSlug = false)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $pageSlug ? $this->pageRepo->getBySlug($pageSlug, $book->id) : false;
-        return view('pages/create', ['book' => $book, 'parentPage' => $page]);
+        $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false;
+        return view('pages/create', ['book' => $book, 'chapter' => $chapter]);
     }
 
     /**
@@ -67,15 +72,12 @@ class PageController extends Controller
         ]);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->newFromInput($request->all());
-        $slug = Str::slug($page->name);
-        while($this->pageRepo->countBySlug($slug, $book->id) > 0) {
-            $slug .= '1';
-        }
-        $page->slug = $slug;
+
+        $page->slug = $this->pageRepo->findSuitableSlug($page->name, $book->id);
         $page->priority = $this->bookRepo->getNewPriority($book);
 
-        if($request->has('parent')) {
-            $page->page_id = $request->get('parent');
+        if($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) {
+            $page->chapter_id = $request->get('chapter');
         }
 
         $page->book_id = $book->id;
@@ -95,9 +97,8 @@ class PageController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
-        $breadCrumbs = $this->pageRepo->getBreadCrumbs($page);
         //dd($sidebarBookTree);
-        return view('pages/show', ['page' => $page, 'breadCrumbs' => $breadCrumbs, 'book' => $book]);
+        return view('pages/show', ['page' => $page, 'book' => $book]);
     }
 
     /**
@@ -111,7 +112,7 @@ class PageController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
-        return view('pages/edit', ['page' => $page]);
+        return view('pages/edit', ['page' => $page, 'book' => $book]);
     }
 
     /**
@@ -127,10 +128,7 @@ class PageController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $page->fill($request->all());
-        $slug = Str::slug($page->name);
-        while($this->pageRepo->countBySlug($slug, $book->id) > 0 && $slug != $pageSlug) {
-            $slug .= '1';
-        }
+        $page->slug = $this->pageRepo->findSuitableSlug($page->name, $book->id, $page->id);
         $page->text = strip_tags($page->html);
         $page->save();
         return redirect($page->getUrl());
@@ -170,19 +168,36 @@ class PageController extends Controller
     public function sortPages($bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
-        $tree = $this->bookRepo->getTree($book);
-        return view('pages/sort', ['book' => $book, 'tree' => $tree]);
+        return view('pages/sort', ['book' => $book]);
     }
 
+    /**
+     * Saves an array of sort mapping to pages and chapters.
+     *
+     * @param $bookSlug
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
     public function savePageSort($bookSlug, Request $request)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
+        // Return if no map sent
         if(!$request->has('sort-tree')) {
             return redirect($book->getUrl());
         }
 
+        // Sort pages and chapters
         $sortMap = json_decode($request->get('sort-tree'));
-        $this->pageRepo->applySortMap($sortMap, $book->id);
+        foreach($sortMap as $index => $bookChild) {
+            $id = $bookChild->id;
+            $isPage = $bookChild->type == 'page';
+            $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);
+            $model->priority = $index;
+            if($isPage) {
+                $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter;
+            }
+            $model->save();
+        }
         return redirect($book->getUrl());
     }
 

app/Http/routes.php

@@ -28,12 +28,12 @@ Route::group(['prefix' => 'books'], function() {
     Route::get('/{bookSlug}/sort', 'PageController@sortPages');
     Route::put('/{bookSlug}/sort', 'PageController@savePageSort');
     Route::get('/{bookSlug}/page/{pageSlug}', 'PageController@show');
-    Route::get('/{bookSlug}/page/{pageSlug}/create', 'PageController@create');
     Route::get('/{bookSlug}/page/{pageSlug}/edit', 'PageController@edit');
     Route::get('/{bookSlug}/page/{pageSlug}/delete', 'PageController@showDelete');
     Route::put('/{bookSlug}/page/{pageSlug}', 'PageController@update');
     Route::delete('/{bookSlug}/page/{pageSlug}', 'PageController@destroy');
 
+    Route::get('/{bookSlug}/chapter/{chapterSlug}/create-page', 'PageController@create');
     Route::get('/{bookSlug}/chapter/create', 'ChapterController@create');
     Route::post('/{bookSlug}/chapter/create', 'ChapterController@store');
     Route::get('/{bookSlug}/chapter/{chapterSlug}', 'ChapterController@show');

app/Page.php

@@ -22,6 +22,16 @@ class Page extends Model
         return $this->belongsTo('Oxbow\Book');
     }
 
+    public function chapter()
+    {
+        return $this->belongsTo('Oxbow\Chapter');
+    }
+
+    public function hasChapter()
+    {
+        return $this->chapter()->count() > 0;
+    }
+
     public function parent()
     {
         return $this->belongsTo('Oxbow\Page', 'page_id');
@@ -32,4 +42,9 @@ class Page extends Model
         return '/books/' . $this->book->slug . '/page/' . $this->slug;
     }
 
+    public function getExcerpt($length = 100)
+    {
+        return strlen($this->text) > $length ? substr($this->text, 0, $length-3) . '...' : $this->text;
+    }
+
 }

app/Repos/ChapterRepo.php

@@ -18,6 +18,11 @@ class ChapterRepo
         $this->chapter = $chapter;
     }
 
+    public function idExists($id)
+    {
+        return $this->chapter->where('id', '=', $id)->count() > 0;
+    }
+
     public function getById($id)
     {
         return $this->chapter->findOrFail($id);

app/Repos/PageRepo.php

@@ -17,6 +17,11 @@ class PageRepo
         $this->page = $page;
     }
 
+    public function idExists($id)
+    {
+        return $this->page->where('page_id', '=', $id)->count() > 0;
+    }
+
     public function getById($id)
     {
         return $this->page->findOrFail($id);
@@ -59,41 +64,38 @@ class PageRepo
         return $query->get();
     }
 
-    public function getBreadCrumbs($page)
+    /**
+     * Checks if a slug exists within a book already.
+     * @param $slug
+     * @param $bookId
+     * @param bool|false $currentId
+     * @return bool
+     */
+    public function doesSlugExist($slug, $bookId, $currentId = false)
     {
-        $tree = [];
-        $cPage = $page;
-        while($cPage->parent && $cPage->parent->id !== 0) {
-            $cPage = $cPage->parent;
-            $tree[] = $cPage;
+        $query = $this->page->where('slug', '=', $slug)->where('book_id', '=', $bookId);
+        if($currentId) {
+            $query = $query->where('id', '!=', $currentId);
         }
-        return count($tree) > 0 ? array_reverse($tree) : false;
+        return $query->count() > 0;
     }
 
     /**
-     * Gets the pages at the top of the page hierarchy.
+     * Gets a suitable slug for the resource
+     *
+     * @param $name
      * @param $bookId
+     * @param bool|false $currentId
+     * @return string
      */
-    private function getTopLevelPages($bookId)
+    public function findSuitableSlug($name, $bookId, $currentId = false)
     {
-        return $this->page->where('book_id', '=', $bookId)->where('chapter_id', '=', 0)->orderBy('priority')->get();
+        $slug = Str::slug($name);
+        while($this->doesSlugExist($slug, $bookId, $currentId)) {
+            $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);
+        }
+        return $slug;
     }
 
-    /**
-     * Applies a sort map to all applicable pages.
-     * @param $sortMap
-     * @param $bookId
-     */
-    public function applySortMap($sortMap, $bookId)
-    {
-        foreach($sortMap as $index => $map) {
-            $page = $this->getById($map->id);
-            if($page->book_id === $bookId) {
-                $page->page_id = $map->parent;
-                $page->priority = $index;
-                $page->save();
-            }
-        }
-    }
 
 }