Applied required changes

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 9c1154281be3f47b01ed10ab8efbd73c5db2daee..7aa434a805c6393cf2e93cf44dcb53fd4c042b6c 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -41,7 +41,7 @@ class BookController extends Controller
         $popular = $this->entityRepo->getPopular('book', 3, 0);
         $books_display = $this->currentUser->books_display;
         $this->setPageTitle('Books');
-        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'books_display' => $books_display]);
+        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'books_display' => $books_display] );
     }
 
     /**

diff --git a/app/User.php b/app/User.php
index 24eca12f31c2f5d9d665830b7089c88fa6076b27..703322cbd269c5dfb80fcf164e5900f10be60d6d 100644 (file)
--- a/app/User.php
+++ b/app/User.php
@@ -22,7 +22,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      * The attributes that are mass assignable.
      * @var array
      */
-    protected $fillable = ['name', 'email', 'image_id', 'books_display'];
+    protected $fillable = ['name', 'email', 'image_id', 'books_display' ];
 
     /**
      * The attributes excluded from the model's JSON form.

diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 62ac94b606d91605c50b70a1d8b8b768335aebca..ce605b7cd495100c4ffa862fc5ad03a6fc6c3789 100644 (file)
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -17,8 +17,8 @@ class CreateUsersTable extends Migration
             $table->string('name');
             $table->string('email')->unique();
             $table->string('password', 60);
-            $table->rememberToken();
             $table->string('books_display')->default('grid');
+            $table->rememberToken();
             $table->nullableTimestamps();
         });
 

diff --git a/database/migrations/2015_07_12_114933_create_books_table.php b/database/migrations/2015_07_12_114933_create_books_table.php
index b8a6c9829f43e9d30c9f3cc7bd1983fee793d6f9..b87b99db22293331f8a9dc815d9aed02ff565acc 100644 (file)
--- a/database/migrations/2015_07_12_114933_create_books_table.php
+++ b/database/migrations/2015_07_12_114933_create_books_table.php
@@ -23,8 +23,8 @@ class CreateBooksTable extends Migration
             $table->string('name');
             $table->string('slug')->indexed();
             $table->text('description');
-            $table->nullableTimestamps();
             $table->string('image');
+            $table->nullableTimestamps();
         });
     }
 

diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss
index bfa95fc1e45ff8c842a7e42b2de1826eb525bc61..4f9c16efb91e5c11192bf7deb1b2cc1b0733a901 100644 (file)
--- a/resources/assets/sass/styles.scss
+++ b/resources/assets/sass/styles.scss
@@ -276,6 +276,32 @@ $btt-size: 40px;
 
 
 
+.galleryItem {
+  width: 22%;
+  padding: 5px;
+  float: left;
+  height: 330px;
+  margin: 2% 1% 2% 1%;
+  overflow: hidden;
+  border: 1px solid #9e9e9e;
+  h3 {
+    font-size: 1.2em;
+    text-align: center;
+  }
+  p {
+    font-size: 0.8em;
+    text-align: center;
+  }
+  img {
+    height: 192px;
+    width: 120px;
+    margin-top: 5%;
+  }
+  &.collapse {
+    height: 130px;
+  }
+}
+
 .galleryItem {
   width: 22%;
   padding: 5px;