From 144eb69cad245734610e0efb6341b0bade78cacc Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 29 Sep 2015 21:25:03 +0100
Subject: [PATCH] Added 404 page and extra tests

---
 app/Repos/BookRepo.php               |  7 +++++--
 resources/views/books/sort.blade.php | 22 ++++++++++++----------
 resources/views/errors/404.blade.php |  9 +++++++++
 resources/views/public.blade.php     |  2 +-
 tests/EntityTest.php                 |  8 ++++++++
 5 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 resources/views/errors/404.blade.php

diff --git a/app/Repos/BookRepo.php b/app/Repos/BookRepo.php
index 9d37cf952..aacf96b06 100644
--- a/app/Repos/BookRepo.php
+++ b/app/Repos/BookRepo.php
@@ -91,9 +91,12 @@ class BookRepo
 
     public function findSuitableSlug($name, $currentId = false)
     {
-        $slug = Str::slug($name);
+        $originalSlug = Str::slug($name);
+        $slug = $originalSlug;
+        $count = 2;
         while($this->doesSlugExist($slug, $currentId)) {
-            $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);
+            $slug = $originalSlug . '-' . $count;
+            $count++;
         }
         return $slug;
     }
diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php
index f5c847fe2..e4e68d662 100644
--- a/resources/views/books/sort.blade.php
+++ b/resources/views/books/sort.blade.php
@@ -11,16 +11,18 @@
 
             </div>
 
-            <div class="col-md-4">
-                <h3>Show Other Books</h3>
-                @foreach($books as $otherBook)
-                    @if($otherBook->id !== $book->id)
-                    <div id="additional-books">
-                        <a href="/books/{{ $otherBook->slug }}/sort-item" class="text-book"><i class="zmdi zmdi-book"></i>{{ $otherBook->name }}</a>
-                    </div>
-                    @endif
-                @endforeach
-            </div>
+            @if(count($books) > 1)
+                <div class="col-md-4">
+                    <h3>Show Other Books</h3>
+                    @foreach($books as $otherBook)
+                        @if($otherBook->id !== $book->id)
+                        <div id="additional-books">
+                            <a href="/books/{{ $otherBook->slug }}/sort-item" class="text-book"><i class="zmdi zmdi-book"></i>{{ $otherBook->name }}</a>
+                        </div>
+                        @endif
+                    @endforeach
+                </div>
+            @endif
 
         </div>
 
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
new file mode 100644
index 000000000..8f66e2d01
--- /dev/null
+++ b/resources/views/errors/404.blade.php
@@ -0,0 +1,9 @@
+@extends('public')
+
+@section('content')
+
+
+    <h1>Page Not Found</h1>
+    <p>The page you were looking for could not be found.</p>
+
+@stop
\ No newline at end of file
diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php
index f252ce38c..73c8384fc 100644
--- a/resources/views/public.blade.php
+++ b/resources/views/public.blade.php
@@ -37,7 +37,7 @@
                     <div class="links text-center">
                         @yield('header-buttons')
                     </div>
-                    @if($signedIn)
+                    @if(isset($signedIn) && $signedIn)
                         <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
                         <div class="dropdown-container" data-dropdown>
                                 <span class="user-name" data-dropdown-toggle>
diff --git a/tests/EntityTest.php b/tests/EntityTest.php
index ddbed731e..493f99cac 100644
--- a/tests/EntityTest.php
+++ b/tests/EntityTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\DB;
+
 class EntityTest extends TestCase
 {
 
@@ -113,6 +115,12 @@ class EntityTest extends TestCase
             ->seePageIs('/books/my-first-book')
             ->see($book->name)->see($book->description);
 
+        // Ensure duplicate names are given different slugs
+        $this->asAdmin()
+            ->visit('/books/create')
+            ->submitForm('Save Book', $book->toArray())
+            ->seePageIs('/books/my-first-book-2');
+
         $book = \BookStack\Book::where('slug', '=', 'my-first-book')->first();
         return $book;
     }