Added new page drafts and started image entity attaching

Closes #80.

app/Repos/BookRepo.php

@@ -213,15 +213,27 @@ class BookRepo extends EntityRepo
         $chapters = $chapterQuery->get();
         $children = $pages->merge($chapters);
         $bookSlug = $book->slug;
+
         $children->each(function ($child) use ($bookSlug) {
             $child->setAttribute('bookSlug', $bookSlug);
             if ($child->isA('chapter')) {
                 $child->pages->each(function ($page) use ($bookSlug) {
                     $page->setAttribute('bookSlug', $bookSlug);
                 });
+                $child->pages = $child->pages->sortBy(function($child, $key) {
+                    $score = $child->priority;
+                    if ($child->draft) $score -= 100;
+                    return $score;
+                });
             }
         });
-        return $children->sortBy('priority');
+
+        // Sort items with drafts first then by priority.
+        return $children->sortBy(function($child, $key) {
+            $score = $child->priority;
+            if ($child->isA('page') && $child->draft) $score -= 100;
+            return $score;
+        });
     }
 
     /**

app/Repos/ChapterRepo.php

@@ -66,7 +66,13 @@ class ChapterRepo extends EntityRepo
      */
     public function getChildren(Chapter $chapter)
     {
-        return $this->restrictionService->enforcePageRestrictions($chapter->pages())->get();
+        $pages = $this->restrictionService->enforcePageRestrictions($chapter->pages())->get();
+        // Sort items with drafts first then by priority.
+        return $pages->sortBy(function($child, $key) {
+            $score = $child->priority;
+            if ($child->draft) $score -= 100;
+            return $score;
+        });
     }
 
     /**

app/Repos/EntityRepo.php

@@ -5,6 +5,7 @@ use BookStack\Chapter;
 use BookStack\Entity;
 use BookStack\Page;
 use BookStack\Services\RestrictionService;
+use BookStack\User;
 
 class EntityRepo
 {
@@ -79,7 +80,7 @@ class EntityRepo
     public function getRecentlyCreatedPages($count = 20, $page = 0, $additionalQuery = false)
     {
         $query = $this->restrictionService->enforcePageRestrictions($this->page)
-            ->orderBy('created_at', 'desc');
+            ->orderBy('created_at', 'desc')->where('draft', '=', false);
         if ($additionalQuery !== false && is_callable($additionalQuery)) {
             $additionalQuery($query);
         }
@@ -112,9 +113,24 @@ class EntityRepo
     public function getRecentlyUpdatedPages($count = 20, $page = 0)
     {
         return $this->restrictionService->enforcePageRestrictions($this->page)
+            ->where('draft', '=', false)
             ->orderBy('updated_at', 'desc')->skip($page * $count)->take($count)->get();
     }
 
+    /**
+     * Get draft pages owned by the current user.
+     * @param int $count
+     * @param int $page
+     */
+    public function getUserDraftPages($count = 20, $page = 0)
+    {
+        $user = auth()->user();
+        return $this->page->where('draft', '=', true)
+            ->where('created_by', '=', $user->id)
+            ->orderBy('updated_at', 'desc')
+            ->skip($count * $page)->take($count)->get();
+    }
+
     /**
      * Updates entity restrictions from a request
      * @param $request

app/Repos/PageRepo.php

@@ -1,8 +1,8 @@
 <?php namespace BookStack\Repos;
 
-
 use Activity;
 use BookStack\Book;
+use BookStack\Chapter;
 use BookStack\Exceptions\NotFoundException;
 use Carbon\Carbon;
 use DOMDocument;
@@ -12,6 +12,7 @@ use BookStack\PageRevision;
 
 class PageRepo extends EntityRepo
 {
+
     protected $pageRevision;
 
     /**
@@ -26,21 +27,27 @@ class PageRepo extends EntityRepo
 
     /**
      * Base query for getting pages, Takes restrictions into account.
+     * @param bool $allowDrafts
      * @return mixed
      */
-    private function pageQuery()
+    private function pageQuery($allowDrafts = false)
     {
-        return $this->restrictionService->enforcePageRestrictions($this->page, 'view');
+        $query = $this->restrictionService->enforcePageRestrictions($this->page, 'view');
+        if (!$allowDrafts) {
+            $query = $query->where('draft', '=', false);
+        }
+        return $query;
     }
 
     /**
      * Get a page via a specific ID.
      * @param $id
+     * @param bool $allowDrafts
      * @return mixed
      */
-    public function getById($id)
+    public function getById($id, $allowDrafts = false)
     {
-        return $this->pageQuery()->findOrFail($id);
+        return $this->pageQuery($allowDrafts)->findOrFail($id);
     }
 
     /**
@@ -123,6 +130,47 @@ class PageRepo extends EntityRepo
         return $page;
     }
 
+
+    /**
+     * Publish a draft page to make it a normal page.
+     * Sets the slug and updates the content.
+     * @param Page $draftPage
+     * @param array $input
+     * @return Page
+     */
+    public function publishDraft(Page $draftPage, array $input)
+    {
+        $draftPage->fill($input);
+
+        $draftPage->slug = $this->findSuitableSlug($draftPage->name, $draftPage->book->id);
+        $draftPage->html = $this->formatHtml($input['html']);
+        $draftPage->text = strip_tags($draftPage->html);
+        $draftPage->draft = false;
+
+        $draftPage->save();
+        return $draftPage;
+    }
+
+    /**
+     * Get a new draft page instance.
+     * @param Book $book
+     * @param Chapter|null $chapter
+     * @return static
+     */
+    public function getDraftPage(Book $book, $chapter)
+    {
+        $page = $this->page->newInstance();
+        $page->name = 'New Page';
+        $page->created_by = auth()->user()->id;
+        $page->updated_by = auth()->user()->id;
+        $page->draft = true;
+
+        if ($chapter) $page->chapter_id = $chapter->id;
+
+        $book->pages()->save($page);
+        return $page;
+    }
+
     /**
      * Formats a page's html to be tagged correctly
      * within the system.
@@ -342,6 +390,24 @@ class PageRepo extends EntityRepo
         return $draft;
     }
 
+    /**
+     * Update a draft page.
+     * @param Page $page
+     * @param array $data
+     * @return Page
+     */
+    public function updateDraftPage(Page $page, $data = [])
+    {
+        $page->fill($data);
+
+        if (isset($data['html'])) {
+            $page->text = strip_tags($data['html']);
+        }
+
+        $page->save();
+        return $page;
+    }
+
     /**
      * The base query for getting user update drafts.
      * @param Page $page